Backed out changeset 43484a1523e0 (bug 1330827) for build bustage (duplicate file). r=backout on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 23 Jan 2017 16:26:52 +0100
changeset 465491 7a028e8ce38da08bafce87c21a471608596d0fd0
parent 465490 43484a1523e01a71a67a9a1abeeb96222f7d0245
child 465492 9cc3519d91b845ac13ae2cf42fa14a3b01e4582b
push id42606
push usergsquelart@mozilla.com
push dateTue, 24 Jan 2017 05:22:29 +0000
reviewersbackout
bugs1330827
milestone53.0a1
backs out43484a1523e01a71a67a9a1abeeb96222f7d0245
Backed out changeset 43484a1523e0 (bug 1330827) for build bustage (duplicate file). r=backout on a CLOSED TREE
browser/installer/allowed-dupes.mn
devtools/client/jsonview/converter-child.js
devtools/client/shared/components/tabs/tabbar.css
devtools/client/shared/components/tabs/tabs.css
devtools/client/themes/moz.build
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -43,17 +43,16 @@ browser/chrome/devtools/modules/devtools
 browser/chrome/devtools/modules/devtools/client/inspector/inspector.xhtml
 browser/chrome/devtools/modules/devtools/client/jsonview/css/controls.png
 browser/chrome/devtools/modules/devtools/client/jsonview/css/controls@2x.png
 browser/chrome/devtools/modules/devtools/client/memory/initializer.js
 browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/readdir.js
 browser/chrome/devtools/modules/devtools/client/shared/frame-script-utils.js
 browser/chrome/devtools/modules/devtools/client/shared/theme-switching.js
 browser/chrome/devtools/modules/devtools/client/themes/common.css
-browser/chrome/devtools/modules/devtools/client/themes/toolbars.css
 browser/chrome/devtools/modules/devtools/client/themes/variables.css
 browser/chrome/devtools/skin/common.css
 browser/chrome/devtools/skin/images/command-scratchpad.svg
 browser/chrome/devtools/skin/images/controls.png
 browser/chrome/devtools/skin/images/controls@2x.png
 browser/chrome/devtools/skin/images/debugger-blackbox.svg
 browser/chrome/devtools/skin/images/debugger-prettyprint.svg
 browser/chrome/devtools/skin/images/filetypes/store.svg
--- a/devtools/client/jsonview/converter-child.js
+++ b/devtools/client/jsonview/converter-child.js
@@ -209,17 +209,16 @@ Converter.prototype = {
   },
 
   toHTML: function (json, headers, title) {
     let themeClassName = "theme-" + JsonViewUtils.getCurrentTheme();
     let clientBaseUrl = "resource://devtools/client/";
     let baseUrl = clientBaseUrl + "jsonview/";
     let themeVarsUrl = clientBaseUrl + "themes/variables.css";
     let commonUrl = clientBaseUrl + "themes/common.css";
-    let toolbarsUrl = clientBaseUrl + "themes/toolbars.css";
 
     let os;
     let platform = Services.appinfo.OS;
     if (platform.startsWith("WINNT")) {
       os = "win";
     } else if (platform.startsWith("Darwin")) {
       os = "mac";
     } else {
@@ -234,18 +233,16 @@ Converter.prototype = {
       "<html platform=\"" + os + "\" class=\"" + themeClassName +
         "\" dir=\"" + dir + "\">" +
       "<head><title>" + this.htmlEncode(title) + "</title>" +
       "<base href=\"" + this.htmlEncode(baseUrl) + "\">" +
       "<link rel=\"stylesheet\" type=\"text/css\" href=\"" +
         themeVarsUrl + "\">" +
       "<link rel=\"stylesheet\" type=\"text/css\" href=\"" +
         commonUrl + "\">" +
-      "<link rel=\"stylesheet\" type=\"text/css\" href=\"" +
-        toolbarsUrl + "\">" +
       "<link rel=\"stylesheet\" type=\"text/css\" href=\"css/main.css\">" +
       "<script data-main=\"viewer-config\" src=\"lib/require.js\"></script>" +
       "</head><body>" +
       "<div id=\"content\"></div>" +
       "<div id=\"json\">" + this.htmlEncode(json) + "</div>" +
       "<div id=\"headers\">" + this.htmlEncode(headers) + "</div>" +
       "</body></html>";
   },
--- a/devtools/client/shared/components/tabs/tabbar.css
+++ b/devtools/client/shared/components/tabs/tabbar.css
@@ -24,16 +24,20 @@
   height: 23px;
 }
 
 /* Firebug theme is using slightly different height. */
 .theme-firebug .tabs .tabs-navigation {
   height: 28px;
 }
 
+.tabs .tabs-menu-item a {
+  cursor: default;
+}
+
 /* The tab takes entire horizontal space and individual tabs
   should stretch accordingly. Use flexbox for the behavior.
   Use also `overflow: hidden` so, 'overflow' and 'underflow'
   events are fired (it's utilized by the all-tabs-menu). */
 .tabs .tabs-navigation .tabs-menu {
   overflow: hidden;
   display: flex;
 }
--- a/devtools/client/shared/components/tabs/tabs.css
+++ b/devtools/client/shared/components/tabs/tabs.css
@@ -25,20 +25,16 @@
   display: block;
   color: #A9A9A9;
   padding: 4px 8px;
   border: 1px solid transparent;
   text-decoration: none;
   white-space: nowrap;
 }
 
-.tabs .tabs-menu-item a {
-  cursor: default;
-}
-
 /* Make sure panel content takes entire vertical space.
   (minus the height of the tab bar) */
 .tabs .panels {
   height: calc(100% - 24px);
 }
 
 .tabs .tab-panel {
   height: 100%;
--- a/devtools/client/themes/moz.build
+++ b/devtools/client/themes/moz.build
@@ -6,11 +6,10 @@
 
 DIRS += [
     'audio',
 ]
 
 DevToolsModules(
     'common.css',
     'splitters.css',
-    'toolbars.css',
     'variables.css',
 )