Title: [172567] branches/safari-600.1-branch/Source/WebInspectorUI
- Revision
- 172567
- Author
- lforsch...@apple.com
- Date
- 2014-08-13 21:10:01 -0700 (Wed, 13 Aug 2014)
Log Message
Merged r172527. <rdar://problem/17999511>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172566 => 172567)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-14 04:07:18 UTC (rev 172566)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-14 04:10:01 UTC (rev 172567)
@@ -1,5 +1,25 @@
2014-08-13 Lucas Forschler <lforsch...@apple.com>
+ Merge r172527
+
+ 2014-08-13 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Timeline Close buttons can use polish for new and legacy styles
+ https://bugs.webkit.org/show_bug.cgi?id=135870
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Images/Legacy/Close.svg:
+ Ensure this has fill colors in tree selections.
+
+ * UserInterface/Views/TimelineSidebarPanel.css:
+ (.sidebar > .panel.navigation.timeline > .timelines-content .close-button):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content .close-button):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .content .item > .status > .status-button):
+ Size the close-button for the top overviews differently in new styles (14x14) and legacy (12x12).
+
+2014-08-13 Lucas Forschler <lforsch...@apple.com>
+
Merge r172526
2014-08-13 Timothy Hatcher <timo...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/Close.svg (172566 => 172567)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/Close.svg 2014-08-14 04:07:18 UTC (rev 172566)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/Legacy/Close.svg 2014-08-14 04:10:01 UTC (rev 172567)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright © 2013 Apple Inc. All rights reserved. -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 14">
- <path class="stroked" d="M 12.949219 10.535156 L 11.535156 11.949219 L 8 8.414062 L 4.464844 11.949219 L 3.050781 10.535156 L 6.585938 7 L 3.050781 3.464844 L 4.464844 2.050781 L 8 5.585938 L 11.535156 2.050781 L 12.949219 3.464844 L 9.414062 7 Z"/>
+ <path class="filled" d="M 12.949219 10.535156 L 11.535156 11.949219 L 8 8.414062 L 4.464844 11.949219 L 3.050781 10.535156 L 6.585938 7 L 3.050781 3.464844 L 4.464844 2.050781 L 8 5.585938 L 11.535156 2.050781 L 12.949219 3.464844 L 9.414062 7 Z"/>
</svg>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css (172566 => 172567)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2014-08-14 04:07:18 UTC (rev 172566)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2014-08-14 04:10:01 UTC (rev 172567)
@@ -173,16 +173,22 @@
overflow: hidden;
}
+.sidebar > .panel.navigation.timeline > .timelines-content .close-button {
+ margin-top: 1px;
+ width: 14px;
+ height: 14px;
+
+ visibility: hidden;
+}
+
body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content {
top: 44px;
}
-.sidebar > .panel.navigation.timeline > .timelines-content .close-button {
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content .close-button {
margin-top: 2px;
width: 12px;
height: 12px;
-
- visibility: hidden;
}
.sidebar > .panel.navigation.timeline > .timelines-content li.item .icon {
@@ -240,6 +246,12 @@
right: -16px;
}
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .content .item > .status > .status-button {
+ width: 12px;
+ height: 12px;
+ margin-top: 2px;
+}
+
.sidebar > .panel.navigation.timeline > .content > .stripe-background {
position: absolute;
top: 0;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
