Skip to content

Commit

Permalink
Fixed loading button icons, various paddings and margins
Browse files Browse the repository at this point in the history
  • Loading branch information
colintucker committed Oct 3, 2016
1 parent 00d501e commit 3f91025
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 9 deletions.
34 changes: 29 additions & 5 deletions css/moderno.css
Original file line number Diff line number Diff line change
Expand Up @@ -601,12 +601,12 @@ fieldset.switch-states .switch .slide-button {
}

.cms-content-fields .ui-tabs-nav li {
margin-left: 0px;
margin: 0 auto !important;
}

.cms-content-fields .ui-tabs-nav li.first a {
margin-left: 0px;
padding-left: 0px;
margin-left: 0;
padding-left: 0;
}

.ui-tabs .ui-tabs-nav li {
Expand Down Expand Up @@ -820,6 +820,10 @@ fieldset.switch-states .switch .slide-button {
margin: 16px 16px 0;
}

div.ModelAdmin .cms-edit-form > .message {
margin: 0 0 16px;
}

.CMSPageHistoryController .ui-tabs-panel .message {
margin: 0 0 10px;
}
Expand Down Expand Up @@ -897,6 +901,14 @@ fieldset.switch-states .switch .slide-button {
padding: 8px 0 0;
}

.field.CompositeField .middleColumn.fieldgroup {
padding: 0;
}

#Root_Settings .field.CompositeField .middleColumn.fieldgroup {
padding-top: 8px;
}

.field .middleColumn.fieldgroup::after {
content: "";
display: table;
Expand Down Expand Up @@ -938,6 +950,13 @@ fieldset.switch-states .switch .slide-button {
padding-bottom: 12px;
}

.ss-toggle .ui-accordion-content > h2,
.ss-toggle .ui-accordion-content > h3,
.ss-toggle .ui-accordion-content > h4,
.ss-toggle .ui-accordion-content > h5 {
padding: 0 12px;
}

.ss-toggle .ui-accordion-content .field:last-child {
border-bottom: 0;
}
Expand Down Expand Up @@ -1697,10 +1716,15 @@ div.Actions > input.ss-ui-button {
padding-left: 0;
}

.cms .button-no-style button.loading i.fa,
.cms button.loading i.fa,
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.loading i.fa {
display: inline-block !important;
margin-right: 2px;
margin-right: 2px !important;
}

.cms button.loading,
.cms .ss-ui-button.loading {
color: #fff !important;
}

.cms .ss-ui-button[class*="font-icon-"]:hover,
Expand Down
2 changes: 1 addition & 1 deletion css/moderno.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions javascript/moderno.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@

// Create Animated Icons for Buttons:

$("#ActionMenus_MoreOptions > button").entwine({
$(".cms .ss-ui-button > .ui-button-text").entwine({

onadd: function() {
onmatch: function() {

this.prepend('<i class="fa fa-refresh fa-spin" style="display: none"></i>');
this.prepend('<i class="fa fa-refresh fa-spin" style="display: none"></i> ');

}

Expand Down

0 comments on commit 3f91025

Please sign in to comment.