Backed out changeset 6fdcf075106c (bug 1397325) for failing browser-chrome's browser_parsable_css.js. r=backout

browser/themes/linux/preferences/in-content/dialog.css

@@ -9,7 +9,7 @@ textbox,
 description,
 .tab-text,
 caption > label {
-  font-size: 1.11rem;
+  font-size: 1.2rem;
 }
 
 /* Create a separate rule to unset these styles on .tree-input instead of

browser/themes/linux/preferences/in-content/preferences.css

@@ -4,24 +4,6 @@
 
 %include ../../../shared/incontentprefs/preferences.inc.css
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-html|html *,
-page *,
-window * {
-  font-size: 1.11rem;
-}
-
-xul|caption > xul|label:not(.dialogTitle) {
-  font-size: 1.27rem;
-}
-
-.tip-caption,
-.help-button {
-  font-size: 1rem;
-}
-
 .treecol-sortdirection {
   /* override the Linux only toolkit rule */
   -moz-appearance: none;

browser/themes/osx/preferences/in-content/dialog.css

@@ -14,7 +14,7 @@ textbox,
 description,
 .tab-text,
 caption > label {
-  font-size: 1.36rem;
+  font-size: 1.3rem;
 }
 
 /* Create a separate rule to unset these styles on .tree-input instead of

browser/themes/osx/preferences/in-content/preferences.css

@@ -4,24 +4,6 @@
 
 %include ../../../shared/incontentprefs/preferences.inc.css
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-html|html *,
-page *,
-window * {
-  font-size: 1.36rem;
-}
-
-caption > label:not(.dialogTitle) {
-  font-size: 1.55rem;
-}
-
-.tip-caption,
-.help-button {
-  font-size: 1.18rem;
-}
-
 .actionsMenu > .menulist-label-box > .menulist-icon {
   margin-top: 2px;
   margin-inline-start: 2px;

browser/themes/osx/preferences/preferences.css

@@ -7,6 +7,9 @@
 
 %include ../../../../toolkit/themes/osx/global/shared.inc
 
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
 .windowDialog {
   padding: 12px;
   font: -moz-dialog;
@@ -14,6 +17,9 @@
 
 /* ----- APPLICATIONS PREFPANE ----- */
 description {
+  font: small-caption;
+  font-weight: normal;
+  line-height: 1.3em;
   margin-bottom: 4px !important;
 }
 

browser/themes/windows/preferences/in-content/dialog.css

@@ -9,7 +9,7 @@ textbox,
 description,
 .tab-text,
 caption > label {
-  font-size: 1.25rem;
+  font-size: 1.2rem;
 }
 
 /* Create a separate rule to unset these styles on .tree-input instead of

browser/themes/windows/preferences/in-content/preferences.css

@@ -4,24 +4,6 @@
 
 %include ../../../shared/incontentprefs/preferences.inc.css
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-html|html *,
-page *,
-window * {
-  font-size: 1.25rem;
-}
-
-xul|caption > xul|label:not(.dialogTitle) {
-  font-size: 1.42rem;
-}
-
-.tip-caption,
-.help-button {
-  font-size: 1.08rem;
-}
-
 .actionsMenu > .menulist-label-box > .menulist-icon {
   margin-inline-end: 9px;
 }

toolkit/themes/linux/global/in-content/common.css

@@ -117,6 +117,12 @@ xul|treechildren::-moz-tree-row(selected) {
   background-color: var(--in-content-item-selected);
 }
 
+html|html *,
+xul|page *,
+xul|window * {
+  font-size: 1.11rem;
+}
+
 *|*.header-name {
   font-size: 1.64rem;
 }
@@ -124,3 +130,12 @@ xul|treechildren::-moz-tree-row(selected) {
 *|*.category-name {
   font-size: 1.19rem;
 }
+
+xul|caption > xul|label:not(.dialogTitle) {
+  font-size: 1.27rem;
+}
+
+.tip-caption,
+.help-button {
+  font-size: 1rem;
+}

toolkit/themes/osx/global/in-content/common.css

@@ -14,6 +14,13 @@ xul|tab[visuallyselected] {
   text-shadow: none;
 }
 
+xul|button,
+html|button,
+xul|colorpicker[type="button"],
+xul|menulist {
+  margin-top: 3px;
+}
+
 xul|button,
 html|button {
   /* use the same margin of other elements for the alignment */
@@ -70,7 +77,6 @@ xul|*.numberbox-input-box {
 }
 
 xul|description {
-  font-size: 1.25rem;
   line-height: 22px;
 }
 
@@ -123,6 +129,12 @@ xul|textbox[type="search"]:not([searchbutton]) > .textbox-input-box > .textbox-s
   margin-inline-end: 5px;
 }
 
+html|html *,
+xul|page *,
+xul|window * {
+  font-size: 1.36rem;
+}
+
 *|*.header-name {
   font-size: 2rem;
 }
@@ -130,3 +142,12 @@ xul|textbox[type="search"]:not([searchbutton]) > .textbox-input-box > .textbox-s
 *|*.category-name {
   font-size: 1.45rem;
 }
+
+xul|caption > xul|label:not(.dialogTitle) {
+  font-size: 1.55rem;
+}
+
+.tip-caption,
+.help-button {
+  font-size: 1.18rem;
+}

toolkit/themes/shared/in-content/common.inc.css

@@ -174,6 +174,8 @@ xul|*.tab-text {
 
 html|button {
   padding: 3px;
+  /* override forms.css */
+  font: inherit;
 }
 
 /* xul buttons and menulists */

toolkit/themes/windows/global/in-content/common.css

@@ -78,6 +78,12 @@ html|input[type="checkbox"]:-moz-focusring + html|label:before {
   }
 }
 
+html|html *,
+xul|page *,
+xul|window * {
+  font-size: 1.25rem;
+}
+
 *|*.header-name {
   font-size: 1.83rem;
 }
@@ -85,3 +91,12 @@ html|input[type="checkbox"]:-moz-focusring + html|label:before {
 *|*.category-name {
   font-size: 1.33rem;
 }
+
+xul|caption > xul|label:not(.dialogTitle) {
+  font-size: 1.42rem;
+}
+
+.tip-caption,
+.help-button {
+  font-size: 1.08rem;
+}