Web Inspector: [Regression] [Mavericks]: Undocked Web Inspector toolbar is two differ...
authornvasilyev@apple.com <nvasilyev@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Aug 2015 04:40:50 +0000 (04:40 +0000)
committernvasilyev@apple.com <nvasilyev@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Aug 2015 04:40:50 +0000 (04:40 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/UserInterface/Base/Main.js
Source/WebInspectorUI/UserInterface/Views/Main.css
Source/WebInspectorUI/UserInterface/Views/Toolbar.css

index 2783120..4512555 100644 (file)
@@ -1,3 +1,25 @@
+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>
 
         Web Inspector: Uncaught exception in CSS Completion - TypeError: undefined is not an object (evaluating 'this._values[middleIndex].startsWith')
index 5ed6d37..5d10abb 100644 (file)
@@ -195,6 +195,8 @@ WebInspector.contentLoaded = function()
         document.body.classList.add("nightly-build");
 
     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");
         else
index fc9973f..8f2e153 100644 (file)
@@ -34,8 +34,6 @@ body {
     font-family: -apple-system, sans-serif;
     font-size: 11px;
 
-    background-color: white;
-
     position: absolute;
     top: 0;
     left: 0;
@@ -57,6 +55,10 @@ body {
     tab-size: 4; /* FIXME: This should be controlled by a setting. <rdar://problem/10593948> */
 }
 
+body:not(.mavericks) {
+    background-color: white;
+}
+
 body.docked.bottom {
     border-top: 1px solid hsl(0, 0%, 78%);
 }
index 70a9755..497c3a9 100644 (file)
@@ -29,9 +29,6 @@
     white-space: nowrap;
     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;
 
     padding-top: 3px;
     height: 36px;
 }
 
-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;
 }