Bug 1013718 - In-content preferences: correctly align the class indent. r=jaws
authorRichard Marti <richard.marti@gmail.com>
Wed, 28 May 2014 23:35:11 +0200
changeset 185548 8056d7248fb01a8d18ffdc2e5aa525b31afbd745
parent 185547 27c882b46de9ceab286fabb2c89882676342b90d
child 185549 a699d2eb74771b3c3359b4e2ad100d1c53a99089
push id7040
push userryanvm@gmail.com
push dateThu, 29 May 2014 12:52:35 +0000
treeherderfx-team@7634c7b7e9e9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1013718
milestone32.0a1
Bug 1013718 - In-content preferences: correctly align the class indent. r=jaws
browser/components/preferences/in-content/advanced.xul
browser/themes/osx/preferences/in-content/preferences.css
browser/themes/shared/incontentprefs/preferences.css
browser/themes/windows/preferences/in-content/preferences.css
--- a/browser/components/preferences/in-content/advanced.xul
+++ b/browser/components/preferences/in-content/advanced.xul
@@ -202,17 +202,18 @@
                   label="&alwaysCheckDefault.label;" accesskey="&alwaysCheckDefault.accesskey;"
                   flex="1"/>
         <hbox class="indent">
           <deck id="setDefaultPane">
             <button id="setDefaultButton"
                     label="&setDefault.label;" accesskey="&setDefault.accesskey;"
                     oncommand="gAdvancedPane.setDefaultBrowser();"
                     preference="pref.general.disable_button.default_browser"/>
-            <description>&isDefault.label;</description>
+            <label id="isDefaultLabel"
+                   value="&isDefault.label;"/>
           </deck>
         </hbox>
       </groupbox>
 #endif
     </tabpanel>
 #ifdef MOZ_DATA_REPORTING
     <!-- Data Choices -->
     <tabpanel id="dataChoicesPanel" orient="vertical">
--- a/browser/themes/osx/preferences/in-content/preferences.css
+++ b/browser/themes/osx/preferences/in-content/preferences.css
@@ -14,16 +14,24 @@ menulist:not([editable="true"]) > .menul
   margin-top: 1px;
   margin-bottom: 1px;
 }
 
 .help-button > .button-box > .button-icon {
   -moz-margin-start: 0;
 }
 
+.checkbox-icon {
+  margin-right: 0;
+}
+
+.radio-icon {
+  -moz-margin-end: 0;
+}
+
 .numberbox-input-box {
   -moz-appearance: none;
   border-width: 0;
 }
 
 spinbuttons {
   -moz-appearance: none;
 }
--- a/browser/themes/shared/incontentprefs/preferences.css
+++ b/browser/themes/shared/incontentprefs/preferences.css
@@ -842,8 +842,12 @@ description > html|a {
 
 #telemetryLearnMore,
 #FHRLearnMore,
 #crashReporterLearnMore {
   /* center the links */
   margin-top: 8px;
   margin-bottom: 8px;
 }
+
+.indent {
+  -moz-margin-start: 33px;
+}
--- a/browser/themes/windows/preferences/in-content/preferences.css
+++ b/browser/themes/windows/preferences/in-content/preferences.css
@@ -4,16 +4,26 @@
 
 %include ../../../shared/incontentprefs/preferences.css
 
 menulist:not([editable="true"]) > .menulist-dropmarker {
   margin-top: 1px;
   margin-bottom: 1px;
 }
 
+checkbox {
+  -moz-padding-start: 0;
+}
+
 radio {
   -moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
   -moz-margin-start: 0;
+  -moz-padding-start: 0;
+}
+
+.radio-icon,
+.checkbox-icon {
+  -moz-margin-end: 0;
 }
 
 .actionsMenu > .menulist-label-box > .menulist-icon {
   -moz-margin-end: 9px;
 }