Bug 1446830 - WIP Part 2 - Move label rules from minimal-xul.css into xul.css draft
authorBrian Grinstead <bgrinstead@mozilla.com>
Sun, 18 Mar 2018 16:08:03 -0700
changeset 769186 39f980c5ab5aa969e43921dfbf5caee8dd163182
parent 769185 2ac32275121593cc525ea006cfd4f7075dc11299
push id103062
push userbgrinstead@mozilla.com
push dateSun, 18 Mar 2018 23:13:26 +0000
bugs1446830
milestone61.0a1
Bug 1446830 - WIP Part 2 - Move label rules from minimal-xul.css into xul.css MozReview-Commit-ID: 11RsDq1ZfZs
dom/xul/nsXULElement.cpp
toolkit/content/minimal-xul.css
toolkit/content/xul.css
--- a/dom/xul/nsXULElement.cpp
+++ b/dom/xul/nsXULElement.cpp
@@ -687,17 +687,16 @@ static inline bool XULElementsRulesInMin
          aTag == nsGkAtoms::scrollbarbutton ||
          aTag == nsGkAtoms::scrollcorner ||
          aTag == nsGkAtoms::slider ||
          aTag == nsGkAtoms::thumb ||
          aTag == nsGkAtoms::scale ||
          // other
          aTag == nsGkAtoms::datetimebox ||
          aTag == nsGkAtoms::resizer ||
-         aTag == nsGkAtoms::label ||
          aTag == nsGkAtoms::videocontrols;
 }
 
 #ifdef DEBUG
 /**
  * Returns true if aElement is a XUL element created by the video controls
  * binding. HTML <video> and <audio> bindings pull in this binding. This
  * binding creates lots of different types of XUL elements.
--- a/toolkit/content/minimal-xul.css
+++ b/toolkit/content/minimal-xul.css
@@ -23,59 +23,31 @@
 
 * {
   -moz-user-focus: ignore;
   -moz-user-select: none;
   display: -moz-box;
   box-sizing: border-box;
 }
 
-:root {
-  text-rendering: optimizeLegibility;
-  -moz-control-character-visibility: visible;
-}
-
 :root:-moz-locale-dir(rtl) {
   direction: rtl;
 }
 
 /* hide the content and destroy the frame */
 [hidden="true"] {
   display: none;
 }
 
 /* hide the content, but don't destroy the frames */
 [collapsed="true"],
 [moz-collapsed="true"] {
   visibility: collapse;
 }
 
-/********** label **********/
-
-description {
-  -moz-binding: url("chrome://global/content/bindings/text.xml#text-base");
-}
-
-label {
-  -moz-binding: url("chrome://global/content/bindings/text.xml#text-label");
-}
-
-label.text-link, label[onclick] {
-  -moz-binding: url("chrome://global/content/bindings/text.xml#text-link");
-  -moz-user-focus: normal;
-}
-
-label[control], label.radio-label, label.checkbox-label, label.toolbarbutton-multiline-text {
-  -moz-binding: url("chrome://global/content/bindings/text.xml#label-control");
-}
-
-html|span.accesskey {
-  text-decoration: underline;
-}
-
 /********** resizer **********/
 
 resizer {
   -moz-binding: url("chrome://global/content/bindings/resizer.xml#resizer");
   position: relative;
   z-index: 2147483647;
 }
 
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -20,16 +20,18 @@
  */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
 @namespace xbl url("http://www.mozilla.org/xbl"); /* namespace for XBL elements */
 
 :root {
   --animation-easing-function: cubic-bezier(.07, .95, 0, 1);
+  text-rendering: optimizeLegibility;
+  -moz-control-character-visibility: visible;
 }
 
 /* ::::::::::
    :: Rules for 'hiding' portions of the chrome for special
    :: kinds of windows (not JUST browser windows) with toolbars
    ::::: */
 
 window[chromehidden~="menubar"] .chromeclass-menubar,
@@ -95,16 +97,39 @@ page {
 }
 
 /******** box *******/
 
 vbox {
   -moz-box-orient: vertical;
 }
 
+/********** label **********/
+
+description {
+  -moz-binding: url("chrome://global/content/bindings/text.xml#text-base");
+}
+
+label {
+  -moz-binding: url("chrome://global/content/bindings/text.xml#text-label");
+}
+
+label.text-link, label[onclick] {
+  -moz-binding: url("chrome://global/content/bindings/text.xml#text-link");
+  -moz-user-focus: normal;
+}
+
+label[control], label.radio-label, label.checkbox-label, label.toolbarbutton-multiline-text {
+  -moz-binding: url("chrome://global/content/bindings/text.xml#label-control");
+}
+
+html|span.accesskey {
+  text-decoration: underline;
+}
+
 /********** button **********/
 
 button {
   -moz-binding: url("chrome://global/content/bindings/button.xml#button");
 }
 
 button[type="repeat"] {
   -moz-binding: url("chrome://global/content/bindings/button.xml#button-repeat");