Title: [171737] branches/safari-600.1-branch/Source/WebInspectorUI
Revision
171737
Author
lforsch...@apple.com
Date
2014-07-29 01:49:05 -0700 (Tue, 29 Jul 2014)

Log Message

Merged r171716.  <rdar://problem/17835401>

Modified Paths

Diff

Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (171736 => 171737)


--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog	2014-07-29 08:47:13 UTC (rev 171736)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog	2014-07-29 08:49:05 UTC (rev 171737)
@@ -1,3 +1,22 @@
+2014-07-29  Lucas Forschler  <lforsch...@apple.com>
+
+        Merge r171716
+
+    2014-07-28  Timothy Hatcher  <timo...@apple.com>
+
+            Web Inspector: Unexpected dark border on selected but window inactive timeline
+            https://bugs.webkit.org/show_bug.cgi?id=135360
+
+            Update the border-top colors for the item adjacent to the selected item.
+
+            Reviewed by Joseph Pecoraro.
+
+            * UserInterface/Views/TimelineSidebarPanel.css:
+            (.sidebar > .panel.navigation.timeline > .timelines-content li.item.selected + li.item):
+            (.sidebar > .panel.navigation.timeline > .timelines-content :focus li.item.selected + li.item):
+            (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content li.item.selected + li.item):
+            (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content :focus li.item.selected + li.item):
+
 2014-07-28  Matthew Hanson  <matthew_han...@apple.com>
 
         Merge r171645. <rdar://problem/17818693>

Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css (171736 => 171737)


--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css	2014-07-29 08:47:13 UTC (rev 171736)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css	2014-07-29 08:49:05 UTC (rev 171737)
@@ -166,10 +166,22 @@
 }
 
 .sidebar > .panel.navigation.timeline > .timelines-content li.item.selected + li.item {
+    border-top-color: rgb(185, 184, 185);
+}
+
+body.window-inactive .sidebar > .panel.navigation.timeline > .timelines-content li.item.selected + li.item {
+    border-top-color: rgb(212, 212, 212);
+}
+
+.sidebar > .panel.navigation.timeline > .timelines-content :focus li.item.selected + li.item {
+    border-top-color: rgb(0, 128, 252);
+}
+
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content li.item.selected + li.item {
     border-top-color: rgb(120, 139, 168);
 }
 
-.sidebar > .panel.navigation.timeline > .timelines-content :focus li.item.selected + li.item {
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content :focus li.item.selected + li.item {
     border-top-color: rgb(107, 130, 164);
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to