Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

BUGFIX:Trac#7196 - Fixed styling issues with CMS page settings. #394

Merged
merged 1 commit into from

2 participants

@jbridson

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

@chillu
Owner

This changes the order of all checkbox fields retrieved by the "small" field holder (= contained in field group). So a bigger change than the commit indicates. Its actually a desired change, as it reverts the markup to the same that was generated in 2.4. Will refactored the field holder logic for 3.0, and judging from his commit messages, this was a mistake rather than a desired markup ordering change.

@chillu chillu merged commit db9806a into silverstripe:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 2, 2012
This page is out of date. Refresh to see the latest.
View
6 admin/css/screen.css
@@ -560,6 +560,12 @@ form.import-form label.left { width: 250px; }
/** -------------------------------------------- Page Edit Controller -------------------------------------------- */
.cms-container .CMSMain.CMSPageEditController { margin-left: -1px; }
+/** -------------------------------------------- Page Settings Controller -------------------------------------------- */
+.cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .optionset li { white-space: nowrap; padding-top: 8px; }
+.cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .optionset li label { padding-left: 2px; }
+.cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .fieldgroup .fieldgroup-field { width: 216px; padding-left: 0; }
+.cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .TreeDropdownField .treedropdownfield-toggle-panel-link { border-left: none; background: none; background-image: none; }
+
/** This file defines the jstree base styling (see http://jstree.com), as well as any customizations (see bottom of file). The styles are usually added through jstree.js on DOM load, but we need it earlier in order to correctly display the uninitialized tree. */
.cms .jstree ul, .TreeDropdownField .treedropdownfield-panel .jstree ul { display: block; margin: 0; padding: 0; background: none; list-style-type: none; }
.cms .jstree li, .TreeDropdownField .treedropdownfield-panel .jstree li { display: block; margin: 0; padding: 0; list-style-type: none; display: block; min-height: 18px; line-height: 18px; white-space: nowrap; margin-left: 18px; min-width: 18px; }
View
25 admin/scss/_style.scss
@@ -1594,3 +1594,28 @@ form.import-form {
// Fix pixel gap between nav tree and main page header
margin-left:-1px;
}
+
+/** --------------------------------------------
+ * 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
12 css/UnitTesting.css
@@ -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; }
View
6 templates/forms/CheckboxField_holder_small.ss
@@ -1,5 +1,5 @@
+$Field
+
<% if $Title %>
<label class="checkboxfield-small" <% if ID %>for="$ID"<% end_if %>>$Title</label>
-<% end_if %>
-
-$Field
+<% end_if %>
Something went wrong with that request. Please try again.