Permalink
Browse files

Merge pull request #394 from silverstripe-big-o/sapphire

---

Set the input to the left and label on the right in CheckboxFieldHolder_Small.ss for consistancy with checkbox set field.

Conflicts:
	admin/scss/_style.scss
  • Loading branch information...
2 parents ca789ef + db9806a commit 30153d4538f1b5e692266fc03cd17d2edd8cf858 @chillu chillu committed May 2, 2012
Showing with 35 additions and 6 deletions.
  1. +6 −0 admin/css/screen.css
  2. +23 −0 admin/scss/_style.scss
  3. +6 −6 css/UnitTesting.css
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -1716,4 +1716,27 @@ form.import-form {
}
}
+/** --------------------------------------------
+ * Page Settings Controller
+ * -------------------------------------------- */
+.cms-container .CMSMain.CMSPageSettingsController {
+ .tab#Root_Settings {
+ .optionset li {
+ white-space:nowrap;
+ padding-top:$grid-y;
+ label {
+ padding-left:2px;
+ }
+ }
+ .fieldgroup .fieldgroup-field {
+ width:$grid-x*27;
+ padding-left:0;
+ }
+ .TreeDropdownField .treedropdownfield-toggle-panel-link {
+ border-left:none;
+ background:none;
+ background-image:none;
+ }
+ }
+}
View
@@ -8,17 +8,17 @@ table.details tr { background: #eeeee0; }
p { line-height: 1.5em; margin-top: 0.5em; margin-bottom: 1.0em; }
-h1 { margin: 0px 0px 5px; font: 165% verdana,arial,helvetica; }
+h1 { margin: 0px 0px 5px; font: 165% verdana, arial, helvetica; }
-h2 { margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica; }
+h2 { margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana, arial, helvetica; }
-h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica; }
+h3 { margin-bottom: 0.5em; font: bold 115% verdana, arial, helvetica; }
-h4 { margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica; }
+h4 { margin-bottom: 0.5em; font: bold 100% verdana, arial, helvetica; }
-h5 { margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica; }
+h5 { margin-bottom: 0.5em; font: bold 100% verdana, arial, helvetica; }
-h6 { margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica; }
+h6 { margin-bottom: 0.5em; font: bold 100% verdana, arial, helvetica; }
.Error { font-weight: bold; color: red; }

0 comments on commit 30153d4

Please sign in to comment.