[webkit-changes] [190748] branches/safari-601-branch/Source/WebInspectorUI

Thu, 08 Oct 2015 15:16:39 -0700

Title: [190748] branches/safari-601-branch/Source/WebInspectorUI

Diff

Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (190747 => 190748)


--- 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)
@@ -1,5 +1,42 @@
 2015-10-08  Lucas Forschler  <[email protected]>
 
+        Merge r187715. rdar://problem/22801999
+
+    2015-08-01  Nikita Vasilyev  <[email protected]>
+
+            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  <[email protected]>
+
         Merge r188378. rdar://problem/22801980
 
     2015-08-12  Joseph Pecoraro  <[email protected]>

Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Platform.js (190747 => 190748)


--- 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)
@@ -42,22 +42,22 @@
     var osVersionMatch = / Mac OS X (\d+)_(\d+)/.exec(navigator.appVersion);
     if (osVersionMatch && osVersionMatch[1] === "10") {
         WebInspector.Platform.version.base = 10;
+        WebInspector.Platform.version.release = parseInt(osVersionMatch[2]);
         switch(osVersionMatch[2]) {
+            case "11":
+                WebInspector.Platform.version.name = "el-capitan";
+                break;
             case "10":
                 WebInspector.Platform.version.name = "yosemite";
-                WebInspector.Platform.version.release = 10;
                 break;
             case "9":
                 WebInspector.Platform.version.name = "mavericks";
-                WebInspector.Platform.version.release = 9;
                 break;
             case "8":
                 WebInspector.Platform.version.name = "mountain-lion";
-                WebInspector.Platform.version.release = 8;
                 break;
             default:
                 WebInspector.Platform.version.name = "unknown-mac";
-                WebInspector.Platform.version.release = parseInt(osVersionMatch[2]);
                 break;
         }
     }

Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.css (190747 => 190748)


--- 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)
@@ -114,9 +114,9 @@
     margin-left: 4px;
 }
 
-body:not(.unknown-mac) .toolbar .item.button,
-body:not(.unknown-mac) .toolbar .search-bar > input[type="search"],
-body:not(.unknown-mac) .toolbar .dashboard-container {
+body:not(.el-capitan) .toolbar .item.button,
+body:not(.el-capitan) .toolbar .search-bar > input[type="search"],
+body:not(.el-capitan) .toolbar .dashboard-container {
     background-color: hsl(0, 0%, 99%);
     border: 1px solid transparent;
     border-top-color: hsl(0, 0%, 100%);
@@ -124,31 +124,31 @@
     border-radius: 4px;
 }
 
-body:not(.unknown-mac) .toolbar .search-bar > input[type="search"] {
+body:not(.el-capitan) .toolbar .search-bar > input[type="search"] {
     box-shadow: 0 0 0 7px hsla(211, 96%, 48%, 0);
     transition: box-shadow .25s cubic-bezier(0.165, 0.840, 0.440, 1) /* easeOutQuart */;
 }
 
-body:not(.unknown-mac) .toolbar .search-bar > input[type="search"]:focus {
+body:not(.el-capitan) .toolbar .search-bar > input[type="search"]:focus {
     box-shadow: hsla(0, 0%, 0%, 0.15) 0 1px 0, 0 0 0 3px hsla(211, 96%, 48%, 0.4);
 }
 
-body:not(.unknown-mac) .toolbar .item.button:active {
+body:not(.el-capitan) .toolbar .item.button:active {
     border-top-color: hsl(0, 0%, 94%);
     background-color: hsl(0, 0%, 89%);
 }
 
-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 {
+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 {
     border: 1px solid hsl(0, 0%, 86%);
     background-color: hsl(0, 0%, 96%);
     box-shadow: none;
 }
 
-body.unknown-mac .toolbar .item.button,
-body.unknown-mac .toolbar .search-bar > input[type="search"],
-body.unknown-mac .toolbar .dashboard-container {
+body.el-capitan .toolbar .item.button,
+body.el-capitan .toolbar .search-bar > input[type="search"],
+body.el-capitan .toolbar .dashboard-container {
     background-image: linear-gradient(hsl(0, 0%, 99%), hsl(0, 0%, 94%));
     box-shadow: hsla(0, 0%, 0%, 0.3) 0 1px 1px -1px;
 
@@ -158,33 +158,33 @@
     border-bottom-color: hsl(0, 0%, 76%);
 }
 
-body.unknown-mac .toolbar .search-bar > input[type="search"] {
+body.el-capitan .toolbar .search-bar > input[type="search"] {
     box-shadow: hsla(0, 0%, 0%, 0.3) 0 1px 1px -1px, 0 0 0 7px hsla(211, 96%, 48%, 0);
     transition: box-shadow .25s cubic-bezier(0.165, 0.840, 0.440, 1) /* easeOutQuart */;
 }
 
-body.unknown-mac .toolbar .search-bar > input[type="search"]:focus {
+body.el-capitan .toolbar .search-bar > input[type="search"]:focus {
     box-shadow: hsla(0, 0%, 0%, 0.15) 0 1px 0, 0 0 0 3px hsla(211, 96%, 48%, 0.4);
 }
 
 @media (-webkit-min-device-pixel-ratio: 2) {
-    body.unknown-mac .toolbar .item.button,
-    body.unknown-mac .toolbar .search-bar > input[type="search"],
-    body.unknown-mac .toolbar .dashboard-container {
+    body.el-capitan .toolbar .item.button,
+    body.el-capitan .toolbar .search-bar > input[type="search"],
+    body.el-capitan .toolbar .dashboard-container {
         border: 0.5px solid hsl(0, 0%, 78%);
         border-top-color: hsl(0, 0%, 80%);
         border-bottom-color: hsl(0, 0%, 65%);
     }
 }
 
-body.unknown-mac .toolbar .item.button:active {
+body.el-capitan .toolbar .item.button:active {
     background-image: linear-gradient(hsl(0, 0%, 89%), hsl(0, 0%, 86%));
     box-shadow: hsla(0, 0%, 0%, 0.3) 0 1px 1px -1px, inset 0 1px 1px -1px white;
 }
 
-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 {
+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 {
     opacity: 0.65;
     border-color: hsla(0, 0%, 0%, 0.15);
     background-color: transparent;
@@ -192,9 +192,9 @@
 }
 
 @media (-webkit-min-device-pixel-ratio: 2) {
-    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 {
+    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 {
         box-shadow: inset 0 0 1px 0 hsla(0, 0%, 0%, 0.1);
     }
 }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to