Changeset 189011 in webkit

Timestamp:

Aug 26, 2015 9:40:50 PM (9 years ago)

Author:

Nikita Vasilyev

Message:

Web Inspector: [Regression] [Mavericks]: Undocked Web Inspector toolbar is two different colors and has extra space
​https://bugs.webkit.org/show_bug.cgi?id=148510

Make body element transparent and remove extra padding above the toolbar only for OS X Mavericks.

Reviewed by Timothy Hatcher.

• UserInterface/Base/Main.js:

(WebInspector.contentLoaded):

• UserInterface/Views/Main.css:

(body:not(.mavericks)):
(body): Deleted.

• UserInterface/Views/Toolbar.css:

(body:not(.mavericks) .toolbar):
(body.window-inactive:not(.mavericks) .toolbar):
(body.mac-platform:not(.docked, .mavericks) .toolbar):
(.toolbar): Deleted.
(body.window-inactive .toolbar): Deleted.
(body.mac-platform:not(.docked) .toolbar): Deleted.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Views/Main.css (modified) (2 diffs)
• UserInterface/Views/Toolbar.css (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-08-26  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: [Regression] [Mavericks]: Undocked Web Inspector toolbar is two different colors and has extra space
+        https://bugs.webkit.org/show_bug.cgi?id=148510
+
+        Make body element transparent and remove extra padding above the toolbar only for OS X Mavericks.
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Base/Main.js:
+        (WebInspector.contentLoaded):
+        * UserInterface/Views/Main.css:
+        (body:not(.mavericks)):
+        (body): Deleted.
+        * UserInterface/Views/Toolbar.css:
+        (body:not(.mavericks) .toolbar):
+        (body.window-inactive:not(.mavericks) .toolbar):
+        (body.mac-platform:not(.docked, .mavericks) .toolbar):
+        (.toolbar): Deleted.
+        (body.window-inactive .toolbar): Deleted.
+        (body.mac-platform:not(.docked) .toolbar): Deleted.
+
 2015-08-26  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -196 +196 @@
 
     if (WebInspector.Platform.name === "mac") {
+        document.body.classList.add(WebInspector.Platform.version.name);
+
         if (WebInspector.Platform.version.release >= 11)
             document.body.classList.add("latest-mac");

trunk/Source/WebInspectorUI/UserInterface/Views/Main.css

@@ -35 +35 @@
     font-size: 11px;
 
-    background-color: white;
-
     position: absolute;
     top: 0;
@@ -56 +54 @@
 
     tab-size: 4; /* FIXME: This should be controlled by a setting. <rdar://problem/10593948> */
+}
+
+body:not(.mavericks) {
+    background-color: white;
 }
 

trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css

@@ -30 +30 @@
     overflow: hidden;
 
-    background-image: linear-gradient(to bottom, hsl(0, 0%, 92%), hsl(0, 0%, 87%));
-    box-shadow: inset hsla(0, 0%, 100%, 0.5) 0 1px 1px;
-
     outline: none;
 
@@ -40 +37 @@
 }
 
-body.window-inactive .toolbar {
+body:not(.mavericks) .toolbar {
+    background-image: linear-gradient(to bottom, hsl(0, 0%, 92%), hsl(0, 0%, 87%));
+    box-shadow: inset hsla(0, 0%, 100%, 0.5) 0 1px 1px;
+}
+
+body.window-inactive:not(.mavericks) .toolbar {
     background-image: none;
     background-color: hsl(0, 0%, 96%);
 }
 
-body.mac-platform:not(.docked) .toolbar {
+body.mac-platform:not(.docked, .mavericks) .toolbar {
     padding-top: 21px;
     height: 54px;