Merge pull request #246 from silverstripe-scienceninjas/trac-6853

BUGFIX: #6853 Necessary styles required to complement work on same-index...
This commit is contained in:
Ingo Schommer 2012-03-15 15:40:38 -07:00
commit e70c9b7d13
3 changed files with 10 additions and 2 deletions

View File

@ -155,7 +155,7 @@ form.small .field label.left, .field.small label.left { width: 112px; }
form.small .field .middleColumn, .field.small .middleColumn { margin-left: 120px; }
form.small .field input.text, form.small .field textarea, form.small .field select, form.small .field .TreeDropdownField, .field.small input.text, .field.small textarea, .field.small select, .field.small .TreeDropdownField { width: auto; }
.field { /* TreeDropdowns */ /* dropdowns */ /* chzn override */ /* Date Fields */ }
.field { /* TreeDropdowns */ /* dropdowns */ /* chzn override */ /* Date Fields */ /* Hides borders in settings/access. Activated from JS */ }
.field .TreeDropdownField { padding: 0; }
.field .TreeDropdownField .treedropdownfield-panel { border: 1px solid #b3b3b3; border-top: none; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -o-border-bottom-left-radius: 4px; -ms-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -o-border-bottom-right-radius: 4px; -ms-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
.field .TreeDropdownField.treedropdownfield-open-tree { -moz-border-radius-bottomleft: 0; -webkit-border-bottom-left-radius: 0; -o-border-bottom-left-radius: 0; -ms-border-bottom-left-radius: 0; -khtml-border-bottom-left-radius: 0; border-bottom-left-radius: 0; -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; -o-border-bottom-right-radius: 0; -ms-border-bottom-right-radius: 0; -khtml-border-bottom-right-radius: 0; border-bottom-right-radius: 0; }
@ -167,6 +167,7 @@ form.small .field input.text, form.small .field textarea, form.small .field sele
.field .chzn-container-single .chzn-single div { width: 24px; }
.field .chzn-container-single .chzn-single div b { background-position: 4px 0px; }
.field input.hasDatepicker { width: 50%; max-width: 96px; }
.field.remove-splitter { border-bottom: none; box-shadow: none; }
/** ---------------------------------------------------- Buttons ---------------------------------------------------- */
.cms .Actions > *, .cms .cms-actions-row > * { display: block; float: left; margin-right: 8px; }
@ -410,7 +411,7 @@ form.member-profile-form .ui-corner-all, form.member-profile-form .ui-corner-top
.cms .cms-content-fields .aligned-right-label { margin-left: 184px; padding: 8px 0; }
/** -------------------------------------------- "Settings" Form -------------------------------------------- */
#CanViewType .optionset li, #CanEditType .optionset li, #CanCreateTopLevelType .optionset li { float: none; width: auto; }
#CanViewType .optionset li, #CanEditType .optionset li, #CanCreateTopLevelType .optionset li { float: none; width: auto; white-space: nowrap; }
#ViewerGroups select, #EditorGroups select, #CreateTopLevelGroups select { width: 512px; }

View File

@ -220,6 +220,12 @@ form.small .field, .field.small {
width: 50%;
max-width: ($grid-x * 12);
}
/* Hides borders in settings/access. Activated from JS */
&.remove-splitter {
border-bottom: none;
box-shadow: none;
}
}
/** ----------------------------------------------------

View File

@ -929,6 +929,7 @@ form.member-profile-form {
// All options on their own line
float: none;
width: auto;
white-space: nowrap;
}
}
#ViewerGroups, #EditorGroups, #CreateTopLevelGroups {