Backed out changeset 35b992d5c335 (bug 1250323) because browser_rules_pseudo_lock_options.js is still busted
authorWes Kocher <wkocher@mozilla.com>
Thu, 03 Mar 2016 12:44:21 -0800
changeset 286599 215615d0cae17243c34945812d76215d10ebf66f
parent 286598 a328633a812bba1402fe3166d1a364418303be45
child 286600 24c1ce7bb2ab82ee6147402df76b3f3a715f8128
push id17977
push userkwierso@gmail.com
push dateThu, 03 Mar 2016 20:44:39 +0000
treeherderfx-team@215615d0cae1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1250323
milestone47.0a1
backs out35b992d5c3355bd3fbb62937a31bb57266df0897
Backed out changeset 35b992d5c335 (bug 1250323) because browser_rules_pseudo_lock_options.js is still busted MozReview-Commit-ID: G5F3LZHAw2P
devtools/client/inspector/inspector.xul
devtools/client/themes/computed.css
devtools/client/themes/fonts.css
devtools/client/themes/rules.css
--- a/devtools/client/inspector/inspector.xul
+++ b/devtools/client/inspector/inspector.xul
@@ -188,43 +188,39 @@
              crop="end"
              hidden="true"/>
         <tab id="sidebar-tab-layoutview"
              label="&layoutViewTitle;"
              crop="end"/>
       </tabs>
       <tabpanels flex="1">
         <tabpanel id="sidebar-panel-ruleview" class="devtools-monospace theme-sidebar inspector-tabpanel">
-          <html:div id="ruleview-toolbar-container" class="devtools-toolbar">
-            <html:div id="ruleview-toolbar">
-              <html:div class="devtools-searchbox">
-                <html:input id="ruleview-searchbox"
-                            class="devtools-searchinput devtools-rule-searchbox"
-                            type="search"
-                            placeholder="&filterStylesPlaceholder;"/>
-                <html:button id="ruleview-searchinput-clear" class="devtools-searchinput-clear"></html:button>
-              </html:div>
-              <html:div id="ruleview-command-toolbar">
-                <html:button id="ruleview-add-rule-button" title="&addRuleButtonTooltip;" class="devtools-button"></html:button>
-                <html:button id="pseudo-class-panel-toggle" title="&togglePseudoClassPanel;" class="devtools-button"></html:button>
-              </html:div>
+          <html:div id="ruleview-toolbar" class="devtools-toolbar devtools-sidebar-toolbar">
+            <html:div class="devtools-searchbox">
+              <html:input id="ruleview-searchbox"
+                          class="devtools-searchinput devtools-rule-searchbox"
+                          type="search"
+                          placeholder="&filterStylesPlaceholder;"/>
+              <html:button id="ruleview-searchinput-clear" class="devtools-searchinput-clear"></html:button>
             </html:div>
-            <html:div id="pseudo-class-panel" hidden="true">
-              <html:label><html:input id="pseudo-hover-toggle" type="checkbox" value=":hover" tabindex="-1" />:hover</html:label>
-              <html:label><html:input id="pseudo-active-toggle" type="checkbox" value=":active" tabindex="-1" />:active</html:label>
-              <html:label><html:input id="pseudo-focus-toggle" type="checkbox" value=":focus" tabindex="-1" />:focus</html:label>
+            <html:button id="ruleview-add-rule-button" title="&addRuleButtonTooltip;" class="devtools-button"></html:button>
+            <html:button id="pseudo-class-panel-toggle" title="&togglePseudoClassPanel;" class="devtools-button"></html:button>
           </html:div>
+          <html:div id="pseudo-class-panel" class="devtools-toolbar devtools-sidebar-toolbar" hidden="true" tabindex="-1">
+            <html:label><html:input id="pseudo-hover-toggle" type="checkbox" value=":hover" tabindex="-1" />:hover</html:label>
+            <html:label><html:input id="pseudo-active-toggle" type="checkbox" value=":active" tabindex="-1" />:active</html:label>
+            <html:label><html:input id="pseudo-focus-toggle" type="checkbox" value=":focus" tabindex="-1" />:focus</html:label>
           </html:div>
 
           <html:div id="ruleview-container" class="ruleview">
           </html:div>
         </tabpanel>
 
         <tabpanel id="sidebar-panel-computedview" class="devtools-monospace theme-sidebar inspector-tabpanel">
-          <html:div class="devtools-toolbar">
+          <html:div class="devtools-toolbar devtools-sidebar-toolbar">
             <html:div class="devtools-searchbox">
               <html:input id="computedview-searchbox"
                           class="devtools-searchinput devtools-rule-searchbox"
                           type="search"
                           placeholder="&filterStylesPlaceholder;"/>
               <html:button id="computedview-searchinput-clear" class="devtools-searchinput-clear"></html:button>
             </html:div>
             <checkbox id="browser-style-checkbox"
@@ -237,17 +233,17 @@
           </html:div>
 
           <html:div id="noResults" hidden="">
             &noPropertiesFound;
           </html:div>
         </tabpanel>
 
         <tabpanel id="sidebar-panel-fontinspector" class="devtools-monospace theme-sidebar inspector-tabpanel">
-          <html:div class="devtools-toolbar">
+          <html:div class="devtools-toolbar devtools-sidebar-toolbar">
             <html:div class="devtools-searchbox">
               <html:input id="font-preview-text-input"
                           class="devtools-textinput"
                           type="search"
                           placeholder="&previewHint;"/>
             </html:div>
           </html:div>
 
--- a/devtools/client/themes/computed.css
+++ b/devtools/client/themes/computed.css
@@ -9,20 +9,16 @@
   flex-direction: column;
   width: 100%;
   /* Bug 1243598 - Reduce the container height by the tab height to make room
      for the tabs above. */
   height: calc(100% - 24px);
   position: absolute;
 }
 
-#sidebar-panel-computedview > .devtools-toolbar {
-  display: flex;
-}
-
 #browser-style-checkbox {
   /* Bug 1200073 - extra space before the browser styles checkbox so
      they aren't squished together in a small window. */
   -moz-margin-start: 5px;
 }
 
 #propertyContainer {
   -moz-user-select: text;
@@ -141,16 +137,21 @@
 .onlyuserstyles {
   cursor: pointer;
 }
 
 .legendKey {
   margin: 0 5px;
 }
 
+#root .devtools-toolbar {
+  width: 100%;
+  display: flex;
+}
+
 .link {
   padding: 0 3px;
   cursor: pointer;
   float: right;
 }
 
 /* Take away these two :visited rules to get a core dumper     */
 /* See https://bugzilla.mozilla.org/show_bug.cgi?id=575675#c30 */
--- a/devtools/client/themes/fonts.css
+++ b/devtools/client/themes/fonts.css
@@ -9,20 +9,16 @@
   padding-bottom: 20px;
   width: 100%;
   /* Bug 1243598 - Reduce the container height by the tab height to make room
      for the tabs above. */
   height: calc(100% - 24px);
   position: absolute;
 }
 
-#sidebar-panel-fontinspector > .devtools-toolbar {
-  display: flex;
-}
-
 #font-container {
   overflow: auto;
   flex: auto;
 }
 
 #all-fonts {
   padding: 0;
   margin: 0;
--- a/devtools/client/themes/rules.css
+++ b/devtools/client/themes/rules.css
@@ -8,82 +8,66 @@
   --rule-filter-icon: url(images/magnifying-glass-light.png);
 }
 
 .theme-dark {
   --rule-highlight-background-color: #594724;
   --rule-filter-icon: url(images/magnifying-glass.png);
 }
 
-/* Rule View Tabpanel */
-
 #sidebar-panel-ruleview {
   margin: 0;
   display: flex;
   flex-direction: column;
   width: 100%;
   /* Bug 1243598 - Reduce the container height by the tab height to make room
      for the tabs above. */
   height: calc(100% - 24px);
   position: absolute;
 }
 
-/* Rule View Toolbar */
-
-#ruleview-toolbar-container {
-  display: flex;
-  flex-direction: column;
-  height: auto;
-}
-
-#ruleview-toolbar {
-  display: flex;
-  height: 23px;
-}
-
-#ruleview-toolbar > .devtools-searchbox:first-child {
-  -moz-padding-start: 0px;
-}
-
-#ruleview-command-toolbar {
-  display: flex;
-}
-
-#pseudo-class-panel {
-  display: flex;
-  height: 24px;
-  overflow: hidden;
-  transition: height 150ms ease;
-}
-
-#pseudo-class-panel[hidden] {
-  height: 0px;
-}
-
-#pseudo-class-panel > label {
-  -moz-user-select: none;
-  flex-grow: 1;
-  display: flex;
-  align-items: center;
-}
-
-/* Rule View Container */
-
 #ruleview-container {
   -moz-user-select: text;
   overflow: auto;
   flex: auto;
 }
 
 #ruleview-container.non-interactive {
   pointer-events: none;
   visibility: collapse;
   transition: visibility 0.25s;
 }
 
+.devtools-sidebar-toolbar {
+  display: flex;
+}
+
+#pseudo-class-panel {
+  position: relative;
+  margin-top: -1px;
+  margin-bottom: -1px;
+  overflow-y: hidden;
+  max-height: 24px;
+  outline: 0 !important;
+  transition-property: max-height;
+  transition-duration: 150ms;
+  transition-timing-function: ease;
+}
+
+#pseudo-class-panel[hidden] {
+  max-height: 0px;
+}
+
+#pseudo-class-panel > label {
+  -moz-user-select: none;
+  flex-grow: 1;
+  display: flex;
+  align-items: center;
+}
+
 .ruleview-code {
   direction: ltr;
 }
 
 .ruleview-property:not(:hover) > .ruleview-enableproperty {
   pointer-events: none;
 }