Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (190750 => 190751)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 22:19:22 UTC (rev 190750)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 22:25:49 UTC (rev 190751)
@@ -1,5 +1,31 @@
2015-10-08 Lucas Forschler <[email protected]>
+ Merge r189011. rdar://problem/22801999
+
+ 2015-08-26 Nikita Vasilyev <[email protected]>
+
+ 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-10-08 Lucas Forschler <[email protected]>
+
Merge r188173. rdar://problem/22801999
2015-08-07 Nikita Vasilyev <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js (190750 => 190751)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-10-08 22:19:22 UTC (rev 190750)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-10-08 22:25:49 UTC (rev 190751)
@@ -192,6 +192,8 @@
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
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Main.css (190750 => 190751)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Main.css 2015-10-08 22:19:22 UTC (rev 190750)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Main.css 2015-10-08 22:25:49 UTC (rev 190751)
@@ -34,8 +34,6 @@
font-family: -webkit-system-font, sans-serif;
font-size: 11px;
- background-color: white;
-
position: absolute;
top: 0;
left: 0;
@@ -57,6 +55,10 @@
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 rgb(200, 200, 200);
}
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.css (190750 => 190751)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.css 2015-10-08 22:19:22 UTC (rev 190750)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.css 2015-10-08 22:25:49 UTC (rev 190751)
@@ -29,9 +29,6 @@
white-space: nowrap;
overflow: hidden;
- background-image: linear-gradient(to bottom, rgb(237, 237, 237), rgb(222, 222, 222));
- box-shadow: inset rgba(255, 255, 255, 0.5) 0 1px 1px;
-
outline: none;
padding-top: 3px;
@@ -39,12 +36,17 @@
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: rgb(246, 246, 246);
}
-body.mac-platform:not(.docked) .toolbar {
+body.mac-platform:not(.docked, .mavericks) .toolbar {
padding-top: 21px;
height: 54px;
}
