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

Thu, 08 Oct 2015 15:20:07 -0700

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

Diff

Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (190749 => 190750)


--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog	2015-10-08 22:18:49 UTC (rev 190749)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog	2015-10-08 22:19:22 UTC (rev 190750)
@@ -1,5 +1,44 @@
 2015-10-08  Lucas Forschler  <[email protected]>
 
+        Merge r188173. rdar://problem/22801999
+
+    2015-08-07  Nikita Vasilyev  <[email protected]>
+
+            Web Inspector: Simplify OS-specific CSS class names
+            https://bugs.webkit.org/show_bug.cgi?id=147794
+
+            Replace "body:not(.el-capitan)" with ".legacy-mac".
+            Replace "body.el-capitan" with ".latest-mac".
+
+            Reviewed by Timothy Hatcher.
+
+            * UserInterface/Base/Main.js:
+            (WebInspector.contentLoaded):
+            * UserInterface/Views/Toolbar.css:
+            (body.legacy-mac .toolbar .dashboard-container):
+            (body.legacy-mac .toolbar .search-bar > input[type="search"]):
+            (body.legacy-mac .toolbar .search-bar > input[type="search"]:focus):
+            (body.legacy-mac .toolbar .item.button:active):
+            (body.window-inactive.legacy-mac .toolbar .dashboard-container):
+            (body.latest-mac .toolbar .dashboard-container):
+            (body.latest-mac .toolbar .search-bar > input[type="search"]):
+            (body.latest-mac .toolbar .search-bar > input[type="search"]:focus):
+            (@media (-webkit-min-device-pixel-ratio: 2)):
+            (body.latest-mac .toolbar .item.button:active):
+            (body.latest-mac.window-inactive .toolbar .dashboard-container):
+            (body:not(.el-capitan) .toolbar .dashboard-container): Deleted.
+            (body:not(.el-capitan) .toolbar .search-bar > input[type="search"]): Deleted.
+            (body:not(.el-capitan) .toolbar .search-bar > input[type="search"]:focus): Deleted.
+            (body:not(.el-capitan) .toolbar .item.button:active): Deleted.
+            (body.window-inactive:not(.el-capitan) .toolbar .dashboard-container): Deleted.
+            (body.el-capitan .toolbar .dashboard-container): Deleted.
+            (body.el-capitan .toolbar .search-bar > input[type="search"]): Deleted.
+            (body.el-capitan .toolbar .search-bar > input[type="search"]:focus): Deleted.
+            (body.el-capitan .toolbar .item.button:active): Deleted.
+            (body.el-capitan.window-inactive .toolbar .dashboard-container): Deleted.
+
+2015-10-08  Lucas Forschler  <[email protected]>
+
         Merge r187715. rdar://problem/22801999
 
     2015-08-01  Nikita Vasilyev  <[email protected]>

Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js (190749 => 190750)


--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js	2015-10-08 22:18:49 UTC (rev 190749)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js	2015-10-08 22:19:22 UTC (rev 190750)
@@ -190,9 +190,14 @@
     document.body.classList.add(WebInspector.Platform.name + "-platform");
     if (WebInspector.Platform.isNightlyBuild)
         document.body.classList.add("nightly-build");
-    if (WebInspector.Platform.version.name)
-        document.body.classList.add(WebInspector.Platform.version.name);
 
+    if (WebInspector.Platform.name === "mac") {
+        if (WebInspector.Platform.version.release >= 11)
+            document.body.classList.add("latest-mac");
+        else
+            document.body.classList.add("legacy-mac");
+    }
+
     document.body.classList.add(this.debuggableType);
 
     // Create the user interface elements.

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


--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.css	2015-10-08 22:18:49 UTC (rev 190749)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.css	2015-10-08 22:19:22 UTC (rev 190750)
@@ -114,9 +114,9 @@
     margin-left: 4px;
 }
 
-body:not(.el-capitan) .toolbar .item.button,
-body:not(.el-capitan) .toolbar .search-bar > input[type="search"],
-body:not(.el-capitan) .toolbar .dashboard-container {
+body.legacy-mac .toolbar .item.button,
+body.legacy-mac .toolbar .search-bar > input[type="search"],
+body.legacy-mac .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(.el-capitan) .toolbar .search-bar > input[type="search"] {
+body.legacy-mac .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(.el-capitan) .toolbar .search-bar > input[type="search"]:focus {
+body.legacy-mac .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(.el-capitan) .toolbar .item.button:active {
+body.legacy-mac .toolbar .item.button:active {
     border-top-color: hsl(0, 0%, 94%);
     background-color: hsl(0, 0%, 89%);
 }
 
-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 {
+body.window-inactive.legacy-mac .toolbar .item.button,
+body.window-inactive.legacy-mac .toolbar .search-bar > input[type="search"],
+body.window-inactive.legacy-mac .toolbar .dashboard-container {
     border: 1px solid hsl(0, 0%, 86%);
     background-color: hsl(0, 0%, 96%);
     box-shadow: none;
 }
 
-body.el-capitan .toolbar .item.button,
-body.el-capitan .toolbar .search-bar > input[type="search"],
-body.el-capitan .toolbar .dashboard-container {
+body.latest-mac .toolbar .item.button,
+body.latest-mac .toolbar .search-bar > input[type="search"],
+body.latest-mac .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.el-capitan .toolbar .search-bar > input[type="search"] {
+body.latest-mac .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.el-capitan .toolbar .search-bar > input[type="search"]:focus {
+body.latest-mac .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.el-capitan .toolbar .item.button,
-    body.el-capitan .toolbar .search-bar > input[type="search"],
-    body.el-capitan .toolbar .dashboard-container {
+    body.latest-mac .toolbar .item.button,
+    body.latest-mac .toolbar .search-bar > input[type="search"],
+    body.latest-mac .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.el-capitan .toolbar .item.button:active {
+body.latest-mac .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.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 {
+body.latest-mac.window-inactive .toolbar .item.button,
+body.latest-mac.window-inactive .toolbar .search-bar > input[type="search"],
+body.latest-mac.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.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 {
+    body.latest-mac.window-inactive .toolbar .item.button,
+    body.latest-mac.window-inactive .toolbar .search-bar > input[type="search"],
+    body.latest-mac.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