Title: [137133] trunk/Source/WebCore
Revision
137133
Author
pfeld...@chromium.org
Date
2012-12-10 03:47:16 -0800 (Mon, 10 Dec 2012)

Log Message

Web Inspector: adds an option to remove toolbar icons.
https://bugs.webkit.org/show_bug.cgi?id=95654

Reviewed by Vsevolod Vlasov.

- removes compact mode in favor or dock-to-bottom
- introduces setting for hiding toolbar icons

* inspector/front-end/DockController.js:
(WebInspector.DockController.prototype._toggleDockState):
* inspector/front-end/Settings.js:
(WebInspector.ExperimentsSettings):
* inspector/front-end/Toolbar.js:
(WebInspector.Toolbar.prototype.setDockedToBottom):
(WebInspector.Toolbar.prototype._toolbarDragStart):
(WebInspector.Toolbar.prototype._toolbarDrag):
* inspector/front-end/helpScreen.css:
(body.dock-to-bottom .help-content):
* inspector/front-end/inspector.css:
(body.dock-to-bottom #toolbar):
(body.no-toolbar-icons #toolbar):
(body.dock-to-bottom.port-qt #toolbar):
(body.dock-to-bottom.inactive #toolbar):
(body.no-toolbar-icons .toolbar-item.toggleable):
(body.dock-to-bottom .toolbar-item.toggleable):
(body.dock-to-bottom .toolbar-icon):
(body.no-toolbar-icons .toolbar-icon):
(body.no-toolbar-icons #main):
(body.dock-to-bottom .toolbar-icon.custom-toolbar-icon):
(body.dock-to-bottom .toolbar-item:active .toolbar-icon):
(body.dock-to-bottom .toolbar-label):
(body.dock-to-bottom #search-toolbar-label):
(body.no-toolbar-icons .toolbar-label):
(body.no-toolbar-icons #toolbar-dropdown):
(#toolbar-dropdown .scrollable-content):
(#toolbar-dropdown .toolbar-item.toggleable:hover):
(body.no-toolbar-icons #toolbar-dropdown .toolbar-label):
(body.no-toolbar-icons #toolbar-dropdown .toolbar-item):
(body.dock-to-bottom .toolbar-item.resources .toolbar-icon):
(body.dock-to-bottom .toolbar-item.network .toolbar-icon):
(body.dock-to-bottom .toolbar-item.scripts .toolbar-icon):
(body.dock-to-bottom .toolbar-item.timeline .toolbar-icon):
(body.dock-to-bottom .toolbar-item.profiles .toolbar-icon):
(body.dock-to-bottom .toolbar-item.audits .toolbar-icon):
(body.dock-to-bottom .toolbar-item.console .toolbar-icon):
(body.dock-to-bottom.port-qt .toolbar-item.close-left, body.dock-to-bottom.port-qt .toolbar-item.close-right):
(body.dock-to-bottom #main):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (137132 => 137133)


--- trunk/Source/WebCore/ChangeLog	2012-12-10 11:39:42 UTC (rev 137132)
+++ trunk/Source/WebCore/ChangeLog	2012-12-10 11:47:16 UTC (rev 137133)
@@ -1,3 +1,53 @@
+2012-12-08  Pavel Feldman  <pfeld...@chromium.org>
+
+        Web Inspector: adds an option to remove toolbar icons.
+        https://bugs.webkit.org/show_bug.cgi?id=95654
+
+        Reviewed by Vsevolod Vlasov.
+
+        - removes compact mode in favor or dock-to-bottom
+        - introduces setting for hiding toolbar icons
+
+        * inspector/front-end/DockController.js:
+        (WebInspector.DockController.prototype._toggleDockState):
+        * inspector/front-end/Settings.js:
+        (WebInspector.ExperimentsSettings):
+        * inspector/front-end/Toolbar.js:
+        (WebInspector.Toolbar.prototype.setDockedToBottom):
+        (WebInspector.Toolbar.prototype._toolbarDragStart):
+        (WebInspector.Toolbar.prototype._toolbarDrag):
+        * inspector/front-end/helpScreen.css:
+        (body.dock-to-bottom .help-content):
+        * inspector/front-end/inspector.css:
+        (body.dock-to-bottom #toolbar):
+        (body.no-toolbar-icons #toolbar):
+        (body.dock-to-bottom.port-qt #toolbar):
+        (body.dock-to-bottom.inactive #toolbar):
+        (body.no-toolbar-icons .toolbar-item.toggleable):
+        (body.dock-to-bottom .toolbar-item.toggleable):
+        (body.dock-to-bottom .toolbar-icon):
+        (body.no-toolbar-icons .toolbar-icon):
+        (body.no-toolbar-icons #main):
+        (body.dock-to-bottom .toolbar-icon.custom-toolbar-icon):
+        (body.dock-to-bottom .toolbar-item:active .toolbar-icon):
+        (body.dock-to-bottom .toolbar-label):
+        (body.dock-to-bottom #search-toolbar-label):
+        (body.no-toolbar-icons .toolbar-label):
+        (body.no-toolbar-icons #toolbar-dropdown):
+        (#toolbar-dropdown .scrollable-content):
+        (#toolbar-dropdown .toolbar-item.toggleable:hover):
+        (body.no-toolbar-icons #toolbar-dropdown .toolbar-label):
+        (body.no-toolbar-icons #toolbar-dropdown .toolbar-item):
+        (body.dock-to-bottom .toolbar-item.resources .toolbar-icon):
+        (body.dock-to-bottom .toolbar-item.network .toolbar-icon):
+        (body.dock-to-bottom .toolbar-item.scripts .toolbar-icon):
+        (body.dock-to-bottom .toolbar-item.timeline .toolbar-icon):
+        (body.dock-to-bottom .toolbar-item.profiles .toolbar-icon):
+        (body.dock-to-bottom .toolbar-item.audits .toolbar-icon):
+        (body.dock-to-bottom .toolbar-item.console .toolbar-icon):
+        (body.dock-to-bottom.port-qt .toolbar-item.close-left, body.dock-to-bottom.port-qt .toolbar-item.close-right):
+        (body.dock-to-bottom #main):
+
 2012-12-10  Kent Tamura  <tk...@chromium.org>
 
         Refactoring: Remove HTMLFormControlElement::autofocus

Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js (137132 => 137133)


--- trunk/Source/WebCore/English.lproj/localizedStrings.js	2012-12-10 11:39:42 UTC (rev 137132)
+++ trunk/Source/WebCore/English.lproj/localizedStrings.js	2012-12-10 11:47:16 UTC (rev 137133)
@@ -816,3 +816,5 @@
 localizedStrings["Maximum Time"] = "Maximum Time";
 localizedStrings["Standard Deviation"] = "Standard Deviation";
 localizedStrings["Time by category"] = "Time by category";
+localizedStrings["Show toolbar icons"] = "Show toolbar icons";
+localizedStrings["Appearance"] = "Appearance";

Modified: trunk/Source/WebCore/inspector/front-end/DockController.js (137132 => 137133)


--- trunk/Source/WebCore/inspector/front-end/DockController.js	2012-12-10 11:39:42 UTC (rev 137132)
+++ trunk/Source/WebCore/inspector/front-end/DockController.js	2012-12-10 11:47:16 UTC (rev 137133)
@@ -41,6 +41,7 @@
         this._dockToggleButton.makeLongClickEnabled(this._createDockOptions.bind(this));
 
     this.setDockSide(WebInspector.queryParamsObject["dockSide"] || "bottom");
+    WebInspector.settings.showToolbarIcons.addChangeListener(this._updateUI.bind(this));
 }
 
 WebInspector.DockController.State = {
@@ -93,20 +94,27 @@
         case WebInspector.DockController.State.DockedToBottom:
             body.removeStyleClass("undocked");
             body.removeStyleClass("dock-to-right");
-            this.setCompactMode(true);
+            body.addStyleClass("dock-to-bottom");
             break;
         case WebInspector.DockController.State.DockedToRight: 
             body.removeStyleClass("undocked");
             body.addStyleClass("dock-to-right");
-            this.setCompactMode(false);
+            body.removeStyleClass("dock-to-bottom");
             break;
         case WebInspector.DockController.State.Undocked: 
             body.addStyleClass("undocked");
             body.removeStyleClass("dock-to-right");
-            this.setCompactMode(false);
+            body.removeStyleClass("dock-to-bottom");
             break;
         }
 
+        if (WebInspector.toolbar)
+            WebInspector.toolbar.setDockedToBottom(this._dockSide === WebInspector.DockController.State.DockedToBottom);
+        if (WebInspector.settings.showToolbarIcons.get())
+            document.body.addStyleClass("show-toolbar-icons");
+        else
+            document.body.removeStyleClass("show-toolbar-icons");
+
         if (this._isDockingUnavailable) {
             this._dockToggleButton.state = "undock";
             this._dockToggleButton.setEnabled(false);
@@ -168,28 +176,5 @@
         case "undock": action = "" break;
         }
         InspectorFrontendHost.requestSetDockSide(action);
-    },
-
-    /**
-     * @return {boolean}
-     */
-    isCompactMode: function()
-    {
-        return this._isCompactMode;
-    },
-
-    /**
-     * @param {boolean} isCompactMode
-     */
-    setCompactMode: function(isCompactMode)
-    {
-        var body = document.body;
-        this._isCompactMode = isCompactMode;
-        if (WebInspector.toolbar)
-            WebInspector.toolbar.setCompactMode(isCompactMode);
-        if (isCompactMode)
-            body.addStyleClass("compact");
-        else
-            body.removeStyleClass("compact");
     }
 }

Modified: trunk/Source/WebCore/inspector/front-end/Settings.js (137132 => 137133)


--- trunk/Source/WebCore/inspector/front-end/Settings.js	2012-12-10 11:39:42 UTC (rev 137132)
+++ trunk/Source/WebCore/inspector/front-end/Settings.js	2012-12-10 11:47:16 UTC (rev 137133)
@@ -114,6 +114,7 @@
     this.showCpuOnTimelineRuler = this.createSetting("showCpuOnTimelineRuler", false);
     this.showMetricsRulers = this.createSetting("showMetricsRulers", false);
     this.emulatedCSSMedia = this.createSetting("emulatedCSSMedia", "print");
+    this.showToolbarIcons = this.createSetting("showToolbarIcons", false);
 
     // If there are too many breakpoints in a storage, it is likely due to a recent bug that caused
     // periodical breakpoints duplication leading to inspector slowness.

Modified: trunk/Source/WebCore/inspector/front-end/SettingsScreen.js (137132 => 137133)


--- trunk/Source/WebCore/inspector/front-end/SettingsScreen.js	2012-12-10 11:39:42 UTC (rev 137132)
+++ trunk/Source/WebCore/inspector/front-end/SettingsScreen.js	2012-12-10 11:47:16 UTC (rev 137133)
@@ -268,6 +268,9 @@
     this._disableJSCheckbox = disableJSElement.getElementsByTagName("input")[0];
     this._updateScriptDisabledCheckbox();
 
+    p = this._appendSection(WebInspector.UIString("Appearance"));
+    p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Show toolbar icons"), WebInspector.settings.showToolbarIcons));
+
     p = this._appendSection(WebInspector.UIString("Elements"));
     p.appendChild(this._createRadioSetting(WebInspector.UIString("Color format"), [
         [ WebInspector.Color.Format.Original, WebInspector.UIString("As authored") ],

Modified: trunk/Source/WebCore/inspector/front-end/Toolbar.js (137132 => 137133)


--- trunk/Source/WebCore/inspector/front-end/Toolbar.js	2012-12-10 11:39:42 UTC (rev 137132)
+++ trunk/Source/WebCore/inspector/front-end/Toolbar.js	2012-12-10 11:47:16 UTC (rev 137133)
@@ -99,9 +99,9 @@
     /**
      * @param {boolean} isCompactMode
      */
-    setCompactMode: function(isCompactMode)
+    setDockedToBottom: function(dockedToBottom)
     {
-        this._isCompactMode = isCompactMode;
+        this._isDockedToBottom = dockedToBottom;
     },
 
     /**
@@ -109,7 +109,7 @@
      */
     _toolbarDragStart: function(event)
     {
-        if ((!this._isCompactMode && WebInspector.platformFlavor() !== WebInspector.PlatformFlavor.MacLeopard && WebInspector.platformFlavor() !== WebInspector.PlatformFlavor.MacSnowLeopard) || WebInspector.port() == "qt")
+        if ((!this._isDockedToBottom && WebInspector.platformFlavor() !== WebInspector.PlatformFlavor.MacLeopard && WebInspector.platformFlavor() !== WebInspector.PlatformFlavor.MacSnowLeopard) || WebInspector.port() == "qt")
             return false;
 
         var target = event.target;
@@ -132,7 +132,7 @@
 
     _toolbarDrag: function(event)
     {
-        if (this._isCompactMode) {
+        if (this._isDockedToBottom) {
             var height = window.innerHeight - (event.screenY - this.element.lastScreenY);
 
             InspectorFrontendHost.setAttachedWindowHeight(height);
@@ -183,7 +183,7 @@
     {
         this._setDropdownVisible(false);
 
-        if (this.element.scrollHeight > this.element.clientHeight)
+        if (this.element.scrollHeight > this.element.offsetHeight)
             this._dropdownButton.removeStyleClass("hidden");
         else
             this._dropdownButton.addStyleClass("hidden");
@@ -240,7 +240,7 @@
         var toolbarItems = this._toolbar.element.querySelectorAll(".toolbar-item.toggleable");
 
         for (var i = 0; i < toolbarItems.length; ++i) {
-            if (toolbarItems[i].offsetTop > 0)
+            if (toolbarItems[i].offsetTop > 1)
                 this._contentElement.appendChild(this._toolbar._createPanelToolbarItem(toolbarItems[i].panelDescriptor));
         }
     },

Modified: trunk/Source/WebCore/inspector/front-end/helpScreen.css (137132 => 137133)


--- trunk/Source/WebCore/inspector/front-end/helpScreen.css	2012-12-10 11:39:42 UTC (rev 137132)
+++ trunk/Source/WebCore/inspector/front-end/helpScreen.css	2012-12-10 11:47:16 UTC (rev 137133)
@@ -86,7 +86,7 @@
     right: 8px;
 }
 
-body.compact .help-content {
+body.dock-to-bottom .help-content {
     margin-bottom: 8px;
 }
 

Modified: trunk/Source/WebCore/inspector/front-end/inspector.css (137132 => 137133)


--- trunk/Source/WebCore/inspector/front-end/inspector.css	2012-12-10 11:39:42 UTC (rev 137132)
+++ trunk/Source/WebCore/inspector/front-end/inspector.css	2012-12-10 11:47:16 UTC (rev 137133)
@@ -52,15 +52,23 @@
     top: 0;
     left: 0;
     right: 0;
-    height: 56px;
-    padding: 0 5px;
+    height: 24px;
     background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(191, 191, 191)), to(rgb(151, 151, 151)));
+    padding-top: 1px;
     border-bottom: 1px solid rgb(80, 80, 80);
     -webkit-box-orient: horizontal;
     -webkit-background-origin: padding;
     -webkit-background-clip: padding;
 }
 
+body.show-toolbar-icons #toolbar {
+    height: 56px;
+}
+
+body.show-toolbar-icons.dock-to-bottom #toolbar {
+    height: 34px;
+}
+
 body.inactive #toolbar {
     background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(233, 233, 233)), to(rgb(207, 207, 207)));
     border-bottom: 1px solid rgb(64%, 64%, 64%);
@@ -71,18 +79,18 @@
     background: transparent;
 }
 
-body.compact #toolbar {
-    height: 34px;
+body.dock-to-bottom #toolbar {
+    padding-top: 0;
     border-top: 1px solid rgb(100, 100, 100);
     cursor: ns-resize;
     padding-left: 0;
 }
 
-body.compact.port-qt #toolbar {
+body.dock-to-bottom.port-qt #toolbar {
     cursor: auto;
 }
 
-body.compact.inactive #toolbar {
+body.dock-to-bottom.inactive #toolbar {
     border-top: 1px solid rgb(64%, 64%, 64%);
 }
 
@@ -94,12 +102,16 @@
     border-color: transparent;
 }
 
-.toolbar-item.toggleable {
+body:not(.show-toolbar-icons) .toolbar-item {
+    height: 22px;
+}
+
+body.show-toolbar-icons .toolbar-item.toggleable {
     padding-top: 4px;
     padding-bottom: 4px;
 }
 
-body.compact .toolbar-item.toggleable {
+body.show-toolbar-icons.dock-to-bottom .toolbar-item.toggleable {
   margin: 1px 0;
   padding-bottom: 2px;
 }
@@ -112,21 +124,29 @@
 }
 
 .toolbar-icon {
-    display: inline-block;
+    display: none;
     width: 32px;
     height: 32px;
     background-image: url(Images/toolbarIcons.png);
     vertical-align: top;
 }
 
-body.compact .toolbar-icon {
+body.dock-to-bottom .toolbar-icon {
     width: 24px;
     height: 24px;
     vertical-align: middle;
     background-image: url(Images/toolbarIconsSmall.png);
 }
 
-body.compact .toolbar-icon.custom-toolbar-icon {
+body.show-toolbar-icons .toolbar-icon {
+    display: inline-block;
+}
+
+body.show-toolbar-icons #main {
+    top: 24px;
+}
+
+body.dock-to-bottom .toolbar-icon.custom-toolbar-icon {
     background-position-x: -32px;
 }
 
@@ -134,30 +154,31 @@
     background-position-y: 32px;
 }
 
-body.compact .toolbar-item:active .toolbar-icon {
+body.dock-to-bottom .toolbar-item:active .toolbar-icon {
     background-position-y: 24px;
 }
 
 .toolbar-label {
-    line-height: 15px;
+    line-height: 22px;
     font-size: 11px;
     font-family: Lucida Grande, sans-serif;
     text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;
-    position: relative;
-    top: 1px;
 }
 
+body.show-toolbar-icons .toolbar-label {
+    line-height: 15px;
+}
 .toolbar-item.toggleable:active .toolbar-label {
     text-shadow: none;
 }
 
-body.compact .toolbar-label {
+body.show-toolbar-icons.dock-to-bottom .toolbar-label {
     display: inline-block;
     margin-left: 3px;
     top: 0;
 }
 
-body.compact #search-toolbar-label {
+body.dock-to-bottom #search-toolbar-label {
     display: none;
 }
 
@@ -175,13 +196,11 @@
     background-color: transparent;
     -webkit-border-radius: 5px;
     text-shadow: none;
+    cursor: default;
     margin: 0;
-    position: relative;
-    top: 1px;
-
     /* A line height of 0 allows precise text positioning using padding. */
     line-height: 0;
-    padding: 9px 6px 11px;
+    padding: 10px 6px 11px;
 }
 
 #toolbar-dropdown-arrow.dropdown-visible {
@@ -201,11 +220,14 @@
     z-index: 1000;
     -webkit-box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.4);
     border: 1px solid rgb(128, 128, 128);
-    padding: 4px;
     background-color: inherit;
     background-image: inherit;
 }
 
+body.show-toolbar-icons #toolbar-dropdown {
+    padding: 4px;
+}
+
 body.undocked.platform-mac-leopard #toolbar-dropdown,
 body.undocked.platform-mac-snowleopard #toolbar-dropdown {
     background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(191, 191, 191)), to(rgb(151, 151, 151)));
@@ -215,41 +237,46 @@
     display: -webkit-box;
     -webkit-box-orient: vertical;
     -webkit-box-align: start;
+    padding-right: 0;
 }
 
 #toolbar-dropdown .toolbar-item {
     display: -webkit-box;
     -webkit-box-orient: horizontal;
-    margin: 0px 2px;
-    padding: 4px;
     width: 100%;
     border: 1px solid rgba(0, 0, 0, 0);
 }
 
+body.show-toolbar-icons #toolbar-dropdown .toolbar-item {
+    position: relative;
+    left: -2px;
+    margin: 0px 2px;
+    padding: 4px;
+}
+
 #toolbar-dropdown .toolbar-item.toggleable.toggled-on {
     border: 1px solid rgba(100, 100, 120, 0.4);
     -webkit-border-image: none;
     background: -webkit-gradient(linear, left top, left bottom, from(rgba(128, 128, 128, 0.6)), to(rgba(128, 128, 128, 0.6)), color-stop(20%, rgba(158, 158, 158, 0.2)), color-stop(80%, rgba(158, 158, 158, 0.2)));
 }
 
-#toolbar-dropdown .toolbar-item:hover {
-    -webkit-border-image: none;
-    border: 1px solid rgba(100, 100, 120, 0.8);
+#toolbar-dropdown .toolbar-item.toggleable:hover {
+    background: -webkit-gradient(linear, left top, left bottom, from(rgba(128, 128, 128, 0.6)), to(rgba(128, 128, 128, 0.3)), color-stop(20%, rgba(158, 158, 158, 0.2)), color-stop(80%, rgba(158, 158, 158, 0.1)));
 }
 
-#toolbar-dropdown .toolbar-item.toggleable.toggled-on:hover {
-    border: 1px solid rgba(100, 100, 120, 1);
-}
-
 #toolbar-dropdown .toolbar-icon {
     margin-right: 0.5em;
 }
 
 #toolbar-dropdown .toolbar-label {
-    line-height: 32px;
+    line-height: 22px;
     top: 0;
 }
 
+body.show-toolbar-icons #toolbar-dropdown .toolbar-label {
+    line-height: 32px;
+}
+
 .scrollable-content {
     position: static;
     height: 100%;
@@ -412,7 +439,7 @@
     background-position-x: -32px;
 }
 
-body.compact .toolbar-item.resources .toolbar-icon {
+body.dock-to-bottom .toolbar-item.resources .toolbar-icon {
     background-position-x: -24px;
 }
 
@@ -420,7 +447,7 @@
     background-position-x: -64px;
 }
 
-body.compact .toolbar-item.network .toolbar-icon {
+body.dock-to-bottom .toolbar-item.network .toolbar-icon {
     background-position-x: -48px;
 }
 
@@ -428,7 +455,7 @@
     background-position-x: -96px;
 }
 
-body.compact .toolbar-item.scripts .toolbar-icon {
+body.dock-to-bottom .toolbar-item.scripts .toolbar-icon {
     background-position-x: -72px;
 }
 
@@ -436,7 +463,7 @@
     background-position-x: -128px;
 }
 
-body.compact .toolbar-item.timeline .toolbar-icon {
+body.dock-to-bottom .toolbar-item.timeline .toolbar-icon {
     background-position-x: -96px;
 }
 
@@ -444,7 +471,7 @@
     background-position-x: -160px;
 }
 
-body.compact .toolbar-item.profiles .toolbar-icon {
+body.dock-to-bottom .toolbar-item.profiles .toolbar-icon {
     background-position-x: -120px;
 }
 
@@ -452,7 +479,7 @@
     background-position-x: -192px;
 }
 
-body.compact .toolbar-item.audits .toolbar-icon {
+body.dock-to-bottom .toolbar-item.audits .toolbar-icon {
     background-position-x: -144px;
 }
 
@@ -460,7 +487,7 @@
     background-position-x: -224px;
 }
 
-body.compact .toolbar-item.console .toolbar-icon {
+body.dock-to-bottom .toolbar-item.console .toolbar-icon {
     background-position-x: -168px;
 }
 
@@ -469,9 +496,6 @@
     height: 14px;
     background-image: url(Images/closeButtons.png);
     background-position: 0 0;
-    background-color: transparent;
-    border: 0 none transparent;
-    padding: 0;
 }
 
 #close-button-left:hover, #close-button-right:hover {
@@ -486,11 +510,11 @@
     float: left;
 }
 
-body.detached .toolbar-item.close-left, body.detached .toolbar-item.close-right {
+body.undocked .toolbar-item.close-left, body.undocked .toolbar-item.close-right {
     display: none;
 }
 
-body.compact.port-qt .toolbar-item.close-left, body.compact.port-qt .toolbar-item.close-right {
+body.dock-to-bottom.port-qt .toolbar-item.close-left, body.dock-to-bottom.port-qt .toolbar-item.close-right {
     display: none;
 }
 
@@ -506,16 +530,17 @@
     display: none;
 }
 
-.toolbar-item.close-left {
+.toolbar-item.close-left, .toolbar-item.close-right {
   display: -webkit-box;
   -webkit-box-align: center;
   height: 100%;
+  cursor: default;
 }
 
 #main {
     position: absolute;
     z-index: 1;
-    top: 56px;
+    top: 24px;
     left: 0;
     right: 0;
     bottom: 0;
@@ -523,7 +548,11 @@
     background-color: white;
 }
 
-body.compact #main {
+body.show-toolbar-icons #main {
+    top: 56px;
+}
+
+body.show-toolbar-icons.dock-to-bottom #main {
     top: 34px;
 }
 
@@ -741,7 +770,7 @@
     background-color: rgba(0, 0, 0, 0.75);
 }
 
-body.detached .alternate-status-bar-buttons-bar {
+body.undocked .alternate-status-bar-buttons-bar {
     margin-left: 1px;
 }
 

Modified: trunk/Source/WebCore/inspector/front-end/inspector.html (137132 => 137133)


--- trunk/Source/WebCore/inspector/front-end/inspector.html	2012-12-10 11:39:42 UTC (rev 137132)
+++ trunk/Source/WebCore/inspector/front-end/inspector.html	2012-12-10 11:47:16 UTC (rev 137133)
@@ -174,10 +174,10 @@
 </head>
 <body class="undocked" id="-webkit-web-inspector">
     <div id="toolbar">
-        <div class="toolbar-item close-left"><button id="close-button-left"></button></div>
+        <div class="toolbar-item close-left"><div id="close-button-left"></div></div>
         <div id="toolbar-controls">
-            <div class="toolbar-item"><button id="toolbar-dropdown-arrow">&raquo;</button></div>
-            <div class="toolbar-item close-right"><button id="close-button-right"></button></div>
+            <div class="toolbar-item"><div id="toolbar-dropdown-arrow">&raquo;</div></div>
+            <div class="toolbar-item close-right"><div id="close-button-right"></div></div>
         </div>
     </div>
     <div id="main">
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to