From b2ffc40bc47a56c69b03b8226685e6d1e0e4b68b Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Thu, 14 Sep 2017 16:36:26 +0200 Subject: [PATCH] Backed out changeset 6fdcf075106c (bug 1397325) for failing browser-chrome's browser_parsable_css.js. r=backout --- .../linux/preferences/in-content/dialog.css | 2 +- .../preferences/in-content/preferences.css | 18 --------------- .../osx/preferences/in-content/dialog.css | 2 +- .../preferences/in-content/preferences.css | 18 --------------- .../themes/osx/preferences/preferences.css | 6 +++++ .../windows/preferences/in-content/dialog.css | 2 +- .../preferences/in-content/preferences.css | 18 --------------- .../themes/linux/global/in-content/common.css | 15 ++++++++++++ .../themes/osx/global/in-content/common.css | 23 ++++++++++++++++++- .../themes/shared/in-content/common.inc.css | 2 ++ .../windows/global/in-content/common.css | 15 ++++++++++++ 11 files changed, 63 insertions(+), 58 deletions(-) diff --git a/browser/themes/linux/preferences/in-content/dialog.css b/browser/themes/linux/preferences/in-content/dialog.css index 6586bcd6b2a4..21f6b33dae1f 100644 --- a/browser/themes/linux/preferences/in-content/dialog.css +++ b/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 diff --git a/browser/themes/linux/preferences/in-content/preferences.css b/browser/themes/linux/preferences/in-content/preferences.css index f80d01809d44..8c349734cc4a 100644 --- a/browser/themes/linux/preferences/in-content/preferences.css +++ b/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; diff --git a/browser/themes/osx/preferences/in-content/dialog.css b/browser/themes/osx/preferences/in-content/dialog.css index 4cb16b94627c..e1972e341274 100644 --- a/browser/themes/osx/preferences/in-content/dialog.css +++ b/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 diff --git a/browser/themes/osx/preferences/in-content/preferences.css b/browser/themes/osx/preferences/in-content/preferences.css index 35e221f7b734..0311fe6c61bb 100644 --- a/browser/themes/osx/preferences/in-content/preferences.css +++ b/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; diff --git a/browser/themes/osx/preferences/preferences.css b/browser/themes/osx/preferences/preferences.css index 62b7a6f03cb6..d70b3a15cce9 100644 --- a/browser/themes/osx/preferences/preferences.css +++ b/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; } diff --git a/browser/themes/windows/preferences/in-content/dialog.css b/browser/themes/windows/preferences/in-content/dialog.css index 8ea69d263e3f..21f6b33dae1f 100644 --- a/browser/themes/windows/preferences/in-content/dialog.css +++ b/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 diff --git a/browser/themes/windows/preferences/in-content/preferences.css b/browser/themes/windows/preferences/in-content/preferences.css index fb71e6c8ff70..0f7e63070278 100644 --- a/browser/themes/windows/preferences/in-content/preferences.css +++ b/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; } diff --git a/toolkit/themes/linux/global/in-content/common.css b/toolkit/themes/linux/global/in-content/common.css index fa6a1d671e08..2c8d1c85c7bd 100644 --- a/toolkit/themes/linux/global/in-content/common.css +++ b/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; +} diff --git a/toolkit/themes/osx/global/in-content/common.css b/toolkit/themes/osx/global/in-content/common.css index 531e6e013993..aa80a539bcc9 100644 --- a/toolkit/themes/osx/global/in-content/common.css +++ b/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; +} diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css index ec15bd61ed02..125adddbcdc7 100644 --- a/toolkit/themes/shared/in-content/common.inc.css +++ b/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 */ diff --git a/toolkit/themes/windows/global/in-content/common.css b/toolkit/themes/windows/global/in-content/common.css index 4e0197ae7c88..3a8983b26593 100644 --- a/toolkit/themes/windows/global/in-content/common.css +++ b/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; +}