Diff
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172073 => 172074)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-05 21:06:55 UTC (rev 172073)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-05 21:08:41 UTC (rev 172074)
@@ -1,5 +1,49 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r171940
+
+ 2014-08-01 Jonathan Wells <jonowe...@apple.com>
+
+ Web Inspector: Timeline header height doesn't match style updates.
+ https://bugs.webkit.org/show_bug.cgi?id=135516
+
+ Reviewed by Timothy Hatcher.
+
+ Update the timeline header height to match the updates
+ to the navigation bars in other panels made in
+ https://bugs.webkit.org/show_bug.cgi?id=135445. Also
+ update the shadows on some of the search bars.
+
+ * UserInterface/Views/FilterBar.css:
+ (.filter-bar > input[type="search"]):
+ (body.mac-platform.legacy .filter-bar > input[type="search"]):
+ * UserInterface/Views/FindBanner.css:
+ (.find-banner > input[type="search"]):
+ (body.mac-platform.legacy .find-banner > input[type="search"]):
+ * UserInterface/Views/LogContentView.css:
+ (.search-bar.log-search-bar > input[type="search"]):
+ (body.mac-platform.legacy .search-bar.log-search-bar > input[type="search"]):
+ Remove inset shadows on search bars.
+
+ * UserInterface/Views/TimelineSidebarPanel.css:
+ (.sidebar > .panel.navigation.timeline > .status-bar):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar):
+ (.sidebar > .panel.navigation.timeline > .status-bar > .record-glyph):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph):
+ (.sidebar > .panel.navigation.timeline > .status-bar > .record-status):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-status):
+ (.sidebar > .panel.navigation.timeline > .title-bar.timelines):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .title-bar.timelines):
+ (.sidebar > .panel.navigation.timeline > .title-bar.timeline-events):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .title-bar.timeline-events):
+ (.sidebar > .panel.navigation.timeline > .timelines-content):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content):
+ (.sidebar > .panel.navigation.timeline > .empty-content-placeholder):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .empty-content-placeholder):
+ Update the height of the timeline status bar.
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r171908
2014-07-31 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FilterBar.css (172073 => 172074)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FilterBar.css 2014-08-05 21:06:55 UTC (rev 172073)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FilterBar.css 2014-08-05 21:08:41 UTC (rev 172074)
@@ -49,7 +49,6 @@
border: 1px solid rgba(0, 0, 0, 0.25);
border-radius: 3px;
background-color: rgba(255, 255, 255, 0.2);
- box-shadow: inset rgba(0, 0, 0, 0.1) 0 1px 0;
background-clip: padding-box;
height: 22px;
@@ -58,6 +57,7 @@
body.mac-platform.legacy .filter-bar > input[type="search"] {
border: 1px solid rgba(0, 0, 0, 0.35);
border-radius: 10px;
+ box-shadow: inset rgba(0, 0, 0, 0.1) 0 1px 0;
height: 19px;
transition: background-color 200ms ease-in-out;
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.css (172073 => 172074)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2014-08-05 21:06:55 UTC (rev 172073)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2014-08-05 21:08:41 UTC (rev 172074)
@@ -88,6 +88,9 @@
border: 1px solid rgb(146, 146, 146);
border-radius: 4px;
background-color: white;
+}
+
+body.mac-platform.legacy .find-banner > input[type="search"] {
box-shadow: inset rgba(0, 0, 0, 0.1) 0 1px 0;
}
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.css (172073 => 172074)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.css 2014-08-05 21:06:55 UTC (rev 172073)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.css 2014-08-05 21:08:41 UTC (rev 172074)
@@ -415,8 +415,13 @@
.search-bar.log-search-bar > input[type="search"] {
width: 150px;
border: 1px solid rgba(0, 0, 0, 0.35);
+ padding-left: 4px;
}
+body.mac-platform.legacy .search-bar.log-search-bar > input[type="search"] {
+ padding-left: 0;
+}
+
.search-in-progress .console-item.filtered-out-by-search {
display: none;
}
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css (172073 => 172074)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2014-08-05 21:06:55 UTC (rev 172073)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2014-08-05 21:08:41 UTC (rev 172074)
@@ -28,13 +28,17 @@
top: 0;
left: 0;
right: 0;
- height: 22px;
+ height: 29px;
border-bottom: 1px solid rgb(179, 179, 179);
}
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar {
+ height: 22px;
+}
+
.sidebar > .panel.navigation.timeline > .status-bar > .record-glyph {
position: absolute;
- top: 0;
+ top: 3px;
left: 5px;
width: 21px;
height: 21px;
@@ -52,6 +56,10 @@
background-size: 21px 21px;
}
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph {
+ top: 0;
+}
+
.sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.recording {
background-image: -webkit-image-set(url(../Images/Recording.png) 1x, url(../Images/record...@2x.png) 2x);
}
@@ -74,7 +82,7 @@
.sidebar > .panel.navigation.timeline > .status-bar > .record-status {
position: absolute;
- top: 0;
+ top: 3px;
right: 21px;
left: 27px;
@@ -87,6 +95,10 @@
text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;
}
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-status {
+ top: 0;
+}
+
.sidebar > .panel.navigation.timeline > .title-bar {
position: absolute;
left: 0;
@@ -117,18 +129,26 @@
}
.sidebar > .panel.navigation.timeline > .title-bar.timelines {
+ top: 29px;
+}
+
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .title-bar.timelines {
top: 22px;
}
.sidebar > .panel.navigation.timeline > .title-bar.timeline-events {
height: 23px;
border-top: 1px solid rgb(179, 179, 179);
+ top: 159px;
+}
+
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .title-bar.timeline-events {
top: 152px;
}
.sidebar > .panel.navigation.timeline > .timelines-content {
position: absolute;
- top: 44px;
+ top: 51px;
height: 108px;
left: 0;
right: 0;
@@ -136,6 +156,10 @@
overflow: hidden;
}
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content {
+ top: 44px;
+}
+
.sidebar > .panel.navigation.timeline > .timelines-content .close-button {
margin-top: 2px;
width: 12px;
@@ -191,6 +215,11 @@
.sidebar > .panel.navigation.timeline > .content,
.sidebar > .panel.navigation.timeline > .empty-content-placeholder {
+ top: 182px;
+}
+
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .content,
+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .empty-content-placeholder {
top: 175px;
}
