Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(progressbar): custom style functino and revert center-atom style #178

Merged
merged 4 commits into from
Jan 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion _config.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,11 @@ fonts: Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "
# You can find demos on http://github.hubspot.com/pace/docs/welcome
# Warning: Line color mustn't delete or not define!
# style available values:
# barber-shop, big-counter, bounce, center-circle, center-radar, center-simple,
# barber-shop, big-counter, bounce, center-atom, center-circle, center-radar, center-simple,
# corner-indicator, fill-left, fill-left-nocolor, flat-top, loading-bar, macosx
# Or you can use your own style,just set the style value to "custom",
# and put your own css style to source/css/pace/custom.css
# document can be find on:
pace:
style:
color: "#29d"
Expand Down
1 change: 1 addition & 0 deletions layout/_partial/config_css.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
border-color: <%= theme.pace.color %> transparent transparent;
}
</style>
<% } else if(theme.pace.style === 'mycss') { %>
<% } else { %>
<style>
.pace .pace-progress {
Expand Down
2 changes: 2 additions & 0 deletions layout/_partial/import_pace.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
<%- css('css/pace/loading-bar') %>
<% } else if(theme.pace.style === 'macosx') { %>
<%- css('css/pace/macosx') %>
<% } else if(theme.pace.style === 'custom') { %>
<%- css('css/pace/custom.css') %>
<% } else { %>
<%- css('css/pace/minimal') %>
<% } %>
6 changes: 3 additions & 3 deletions source/css/pace/center-atom.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
.pace .pace-progress {
z-index: 2000;
position: absolute;
height: 60px;
width: 100px;
height: 100px;
width: 83px;

-webkit-transform: translate3d(0, 0, 0) !important;
-ms-transform: translate3d(0, 0, 0) !important;
Expand All @@ -41,7 +41,7 @@
font-size: 14px;
font-weight: 100;
line-height: 1;
padding: 20% 0 7px;
padding: 16% 0 7px;
width: 50%;
height: 40%;
margin: 10px 0 0 30px;
Expand Down
Empty file added source/css/pace/custom.css
Empty file.