Bug 1247214 - "Context menus in about:preferences have wonky fonts". r=jaws
authorKatie Broida <kbroida>
Mon, 11 Apr 2016 12:10:00 +0200
changeset 292652 4eea4fcaf4954dbfd293cd57ee8990f4681ab155
parent 292651 f8d9ebe00b58ad12c354358314ea5acdb60d474a
child 292653 9bf63783f4dd7f77182b592d6526f7193858a703
push id18648
push usercbook@mozilla.com
push dateTue, 12 Apr 2016 08:51:05 +0000
treeherderfx-team@4eea4fcaf495 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1247214
milestone48.0a1
Bug 1247214 - "Context menus in about:preferences have wonky fonts". r=jaws
browser/themes/linux/preferences/in-content/dialog.css
browser/themes/osx/preferences/in-content/dialog.css
browser/themes/windows/preferences/in-content/dialog.css
toolkit/themes/shared/in-content/common.inc.css
--- a/browser/themes/linux/preferences/in-content/dialog.css
+++ b/browser/themes/linux/preferences/in-content/dialog.css
@@ -1,13 +1,13 @@
 /* - This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %include ../../../shared/incontentprefs/dialog.inc.css
 
-label,
+label:not(.menu-text),
 textbox,
 description,
 .tab-text,
 caption > label {
   font-size: 1.2em;
 }
--- a/browser/themes/osx/preferences/in-content/dialog.css
+++ b/browser/themes/osx/preferences/in-content/dialog.css
@@ -4,17 +4,17 @@
 
 %include ../../../shared/incontentprefs/dialog.inc.css
 
 prefwindow,
 .windowDialog {
   font: message-box !important;
 }
 
-label,
+label:not(.menu-text),
 textbox,
 description,
 .tab-text,
 caption > label {
   font-size: 1.3em;
 }
 
 button {
--- a/browser/themes/windows/preferences/in-content/dialog.css
+++ b/browser/themes/windows/preferences/in-content/dialog.css
@@ -1,13 +1,13 @@
 /* - This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %include ../../../shared/incontentprefs/dialog.inc.css
 
-label,
+label:not(.menu-text),
 textbox,
 description,
 .tab-text,
 caption > label {
   font-size: 1.2em;
 }
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -100,17 +100,17 @@ xul|groupbox {
   -moz-appearance: none;
   border: none;
   margin: 15px 0 0;
   -moz-padding-start: 0;
   -moz-padding-end: 0;
   font-size: 1.25rem;
 }
 
-xul|groupbox xul|label:not(.menu-text),
+xul|groupbox xul|label:not(.menu-accel):not(.menu-text),
 xul|groupbox xul|description {
   /* !important needed to override toolkit !important rule */
   -moz-margin-start: 0 !important;
   -moz-margin-end: 0 !important;
 }
 
 /* tabpanels and tabs */