<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190751] branches/safari-601-branch/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190751">190751</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-10-08 15:25:49 -0700 (Thu, 08 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189011">r189011</a>. rdar://problem/22801999
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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceBaseMainjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsMaincss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Main.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsToolbarcss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (190750 => 190751)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-10-08 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r189011. rdar://problem/22801999
+
+ 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-10-08 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r188173. rdar://problem/22801999
</span><span class="cx">
</span><span class="cx"> 2015-08-07 Nikita Vasilyev <nvasilyev@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js (190750 => 190751)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -192,6 +192,8 @@
</span><span class="cx"> document.body.classList.add("nightly-build");
</span><span class="cx">
</span><span class="cx"> if (WebInspector.Platform.name === "mac") {
</span><ins>+ document.body.classList.add(WebInspector.Platform.version.name);
+
</ins><span class="cx"> if (WebInspector.Platform.version.release >= 11)
</span><span class="cx"> document.body.classList.add("latest-mac");
</span><span class="cx"> else
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsMaincss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Main.css (190750 => 190751)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx"> font-family: -webkit-system-font, sans-serif;
</span><span class="cx"> font-size: 11px;
</span><span class="cx">
</span><del>- background-color: white;
-
</del><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span><span class="cx"> left: 0;
</span><span class="lines">@@ -57,6 +55,10 @@
</span><span class="cx"> tab-size: 4; /* FIXME: This should be controlled by a setting. <rdar://problem/10593948> */
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+body:not(.mavericks) {
+ background-color: white;
+}
+
</ins><span class="cx"> body.docked.bottom {
</span><span class="cx"> border-top: 1px solid rgb(200, 200, 200);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsToolbarcss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.css (190750 => 190751)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,9 +29,6 @@
</span><span class="cx"> white-space: nowrap;
</span><span class="cx"> overflow: hidden;
</span><span class="cx">
</span><del>- 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;
-
</del><span class="cx"> outline: none;
</span><span class="cx">
</span><span class="cx"> padding-top: 3px;
</span><span class="lines">@@ -39,12 +36,17 @@
</span><span class="cx"> height: 36px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.window-inactive .toolbar {
</del><ins>+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 {
</ins><span class="cx"> background-image: none;
</span><span class="cx"> background-color: rgb(246, 246, 246);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform:not(.docked) .toolbar {
</del><ins>+body.mac-platform:not(.docked, .mavericks) .toolbar {
</ins><span class="cx"> padding-top: 21px;
</span><span class="cx"> height: 54px;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>