<!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>[190748] 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/190748">190748</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-10-08 15:16:03 -0700 (Thu, 08 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187715">r187715</a>. rdar://problem/22801999</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceBasePlatformjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Platform.js</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 (190747 => 190748)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 22:08:08 UTC (rev 190747)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 22:16:03 UTC (rev 190748)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2015-10-08 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187715. rdar://problem/22801999
+
+ 2015-08-01 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Replace "unknown-mac" CSS class with "el-capitan"
+ https://bugs.webkit.org/show_bug.cgi?id=147524
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Platform.js:
+ No need to repeat WebInspector.Platform.version.release for every possible case.
+
+ * UserInterface/Views/Toolbar.css:
+ (body:not(.el-capitan) .toolbar .dashboard-container):
+ (body:not(.el-capitan) .toolbar .search-bar > input[type="search"]):
+ (body:not(.el-capitan) .toolbar .search-bar > input[type="search"]:focus):
+ (body:not(.el-capitan) .toolbar .item.button:active):
+ (body.window-inactive:not(.el-capitan) .toolbar .dashboard-container):
+ (body.el-capitan .toolbar .dashboard-container):
+ (body.el-capitan .toolbar .search-bar > input[type="search"]):
+ (body.el-capitan .toolbar .search-bar > input[type="search"]:focus):
+ (@media (-webkit-min-device-pixel-ratio: 2)):
+ (body.el-capitan .toolbar .item.button:active):
+ (body.el-capitan.window-inactive .toolbar .dashboard-container):
+ (body:not(.unknown-mac) .toolbar .dashboard-container): Deleted.
+ (body:not(.unknown-mac) .toolbar .search-bar > input[type="search"]): Deleted.
+ (body:not(.unknown-mac) .toolbar .search-bar > input[type="search"]:focus): Deleted.
+ (body:not(.unknown-mac) .toolbar .item.button:active): Deleted.
+ (body.window-inactive:not(.unknown-mac) .toolbar .dashboard-container): Deleted.
+ (body.unknown-mac .toolbar .dashboard-container): Deleted.
+ (body.unknown-mac .toolbar .search-bar > input[type="search"]): Deleted.
+ (body.unknown-mac .toolbar .search-bar > input[type="search"]:focus): Deleted.
+ (body.unknown-mac .toolbar .item.button:active): Deleted.
+ (body.unknown-mac.window-inactive .toolbar .dashboard-container): Deleted.
+
+2015-10-08 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r188378. rdar://problem/22801980
</span><span class="cx">
</span><span class="cx"> 2015-08-12 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBasePlatformjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Platform.js (190747 => 190748)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Platform.js 2015-10-08 22:08:08 UTC (rev 190747)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Platform.js 2015-10-08 22:16:03 UTC (rev 190748)
</span><span class="lines">@@ -42,22 +42,22 @@
</span><span class="cx"> var osVersionMatch = / Mac OS X (\d+)_(\d+)/.exec(navigator.appVersion);
</span><span class="cx"> if (osVersionMatch && osVersionMatch[1] === "10") {
</span><span class="cx"> WebInspector.Platform.version.base = 10;
</span><ins>+ WebInspector.Platform.version.release = parseInt(osVersionMatch[2]);
</ins><span class="cx"> switch(osVersionMatch[2]) {
</span><ins>+ case "11":
+ WebInspector.Platform.version.name = "el-capitan";
+ break;
</ins><span class="cx"> case "10":
</span><span class="cx"> WebInspector.Platform.version.name = "yosemite";
</span><del>- WebInspector.Platform.version.release = 10;
</del><span class="cx"> break;
</span><span class="cx"> case "9":
</span><span class="cx"> WebInspector.Platform.version.name = "mavericks";
</span><del>- WebInspector.Platform.version.release = 9;
</del><span class="cx"> break;
</span><span class="cx"> case "8":
</span><span class="cx"> WebInspector.Platform.version.name = "mountain-lion";
</span><del>- WebInspector.Platform.version.release = 8;
</del><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> WebInspector.Platform.version.name = "unknown-mac";
</span><del>- WebInspector.Platform.version.release = parseInt(osVersionMatch[2]);
</del><span class="cx"> break;
</span><span class="cx"> }
</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 (190747 => 190748)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.css 2015-10-08 22:08:08 UTC (rev 190747)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.css 2015-10-08 22:16:03 UTC (rev 190748)
</span><span class="lines">@@ -114,9 +114,9 @@
</span><span class="cx"> margin-left: 4px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body:not(.unknown-mac) .toolbar .item.button,
-body:not(.unknown-mac) .toolbar .search-bar > input[type="search"],
-body:not(.unknown-mac) .toolbar .dashboard-container {
</del><ins>+body:not(.el-capitan) .toolbar .item.button,
+body:not(.el-capitan) .toolbar .search-bar > input[type="search"],
+body:not(.el-capitan) .toolbar .dashboard-container {
</ins><span class="cx"> background-color: hsl(0, 0%, 99%);
</span><span class="cx"> border: 1px solid transparent;
</span><span class="cx"> border-top-color: hsl(0, 0%, 100%);
</span><span class="lines">@@ -124,31 +124,31 @@
</span><span class="cx"> border-radius: 4px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body:not(.unknown-mac) .toolbar .search-bar > input[type="search"] {
</del><ins>+body:not(.el-capitan) .toolbar .search-bar > input[type="search"] {
</ins><span class="cx"> box-shadow: 0 0 0 7px hsla(211, 96%, 48%, 0);
</span><span class="cx"> transition: box-shadow .25s cubic-bezier(0.165, 0.840, 0.440, 1) /* easeOutQuart */;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body:not(.unknown-mac) .toolbar .search-bar > input[type="search"]:focus {
</del><ins>+body:not(.el-capitan) .toolbar .search-bar > input[type="search"]:focus {
</ins><span class="cx"> box-shadow: hsla(0, 0%, 0%, 0.15) 0 1px 0, 0 0 0 3px hsla(211, 96%, 48%, 0.4);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body:not(.unknown-mac) .toolbar .item.button:active {
</del><ins>+body:not(.el-capitan) .toolbar .item.button:active {
</ins><span class="cx"> border-top-color: hsl(0, 0%, 94%);
</span><span class="cx"> background-color: hsl(0, 0%, 89%);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.window-inactive:not(.unknown-mac) .toolbar .item.button,
-body.window-inactive:not(.unknown-mac) .toolbar .search-bar > input[type="search"],
-body.window-inactive:not(.unknown-mac) .toolbar .dashboard-container {
</del><ins>+body.window-inactive:not(.el-capitan) .toolbar .item.button,
+body.window-inactive:not(.el-capitan) .toolbar .search-bar > input[type="search"],
+body.window-inactive:not(.el-capitan) .toolbar .dashboard-container {
</ins><span class="cx"> border: 1px solid hsl(0, 0%, 86%);
</span><span class="cx"> background-color: hsl(0, 0%, 96%);
</span><span class="cx"> box-shadow: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.unknown-mac .toolbar .item.button,
-body.unknown-mac .toolbar .search-bar > input[type="search"],
-body.unknown-mac .toolbar .dashboard-container {
</del><ins>+body.el-capitan .toolbar .item.button,
+body.el-capitan .toolbar .search-bar > input[type="search"],
+body.el-capitan .toolbar .dashboard-container {
</ins><span class="cx"> background-image: linear-gradient(hsl(0, 0%, 99%), hsl(0, 0%, 94%));
</span><span class="cx"> box-shadow: hsla(0, 0%, 0%, 0.3) 0 1px 1px -1px;
</span><span class="cx">
</span><span class="lines">@@ -158,33 +158,33 @@
</span><span class="cx"> border-bottom-color: hsl(0, 0%, 76%);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.unknown-mac .toolbar .search-bar > input[type="search"] {
</del><ins>+body.el-capitan .toolbar .search-bar > input[type="search"] {
</ins><span class="cx"> box-shadow: hsla(0, 0%, 0%, 0.3) 0 1px 1px -1px, 0 0 0 7px hsla(211, 96%, 48%, 0);
</span><span class="cx"> transition: box-shadow .25s cubic-bezier(0.165, 0.840, 0.440, 1) /* easeOutQuart */;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.unknown-mac .toolbar .search-bar > input[type="search"]:focus {
</del><ins>+body.el-capitan .toolbar .search-bar > input[type="search"]:focus {
</ins><span class="cx"> box-shadow: hsla(0, 0%, 0%, 0.15) 0 1px 0, 0 0 0 3px hsla(211, 96%, 48%, 0.4);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @media (-webkit-min-device-pixel-ratio: 2) {
</span><del>- body.unknown-mac .toolbar .item.button,
- body.unknown-mac .toolbar .search-bar > input[type="search"],
- body.unknown-mac .toolbar .dashboard-container {
</del><ins>+ body.el-capitan .toolbar .item.button,
+ body.el-capitan .toolbar .search-bar > input[type="search"],
+ body.el-capitan .toolbar .dashboard-container {
</ins><span class="cx"> border: 0.5px solid hsl(0, 0%, 78%);
</span><span class="cx"> border-top-color: hsl(0, 0%, 80%);
</span><span class="cx"> border-bottom-color: hsl(0, 0%, 65%);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.unknown-mac .toolbar .item.button:active {
</del><ins>+body.el-capitan .toolbar .item.button:active {
</ins><span class="cx"> background-image: linear-gradient(hsl(0, 0%, 89%), hsl(0, 0%, 86%));
</span><span class="cx"> box-shadow: hsla(0, 0%, 0%, 0.3) 0 1px 1px -1px, inset 0 1px 1px -1px white;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.unknown-mac.window-inactive .toolbar .item.button,
-body.unknown-mac.window-inactive .toolbar .search-bar > input[type="search"],
-body.unknown-mac.window-inactive .toolbar .dashboard-container {
</del><ins>+body.el-capitan.window-inactive .toolbar .item.button,
+body.el-capitan.window-inactive .toolbar .search-bar > input[type="search"],
+body.el-capitan.window-inactive .toolbar .dashboard-container {
</ins><span class="cx"> opacity: 0.65;
</span><span class="cx"> border-color: hsla(0, 0%, 0%, 0.15);
</span><span class="cx"> background-color: transparent;
</span><span class="lines">@@ -192,9 +192,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @media (-webkit-min-device-pixel-ratio: 2) {
</span><del>- body.unknown-mac.window-inactive .toolbar .item.button,
- body.unknown-mac.window-inactive .toolbar .search-bar > input[type="search"],
- body.unknown-mac.window-inactive .toolbar .dashboard-container {
</del><ins>+ body.el-capitan.window-inactive .toolbar .item.button,
+ body.el-capitan.window-inactive .toolbar .search-bar > input[type="search"],
+ body.el-capitan.window-inactive .toolbar .dashboard-container {
</ins><span class="cx"> box-shadow: inset 0 0 1px 0 hsla(0, 0%, 0%, 0.1);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>