Title: [201179] branches/safari-602.1.32-branch/Source/WebInspectorUI
- Revision
- 201179
- Author
- [email protected]
- Date
- 2016-05-19 13:40:54 -0700 (Thu, 19 May 2016)
Log Message
Merge r201177. rdar://problem/26373969
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (201178 => 201179)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-19 20:23:39 UTC (rev 201178)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-19 20:40:54 UTC (rev 201179)
@@ -1,5 +1,28 @@
2016-05-19 Babak Shafiei <[email protected]>
+ Merge r201177. rdar://problem/26373969
+
+ 2016-05-19 Timothy Hatcher <[email protected]>
+
+ Web Inspector: Timelines "Edit" button should be right-aligned
+ https://bugs.webkit.org/show_bug.cgi?id=157909
+ rdar://problem/26373969
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ButtonNavigationItem.css:
+ (.navigation-bar .item.button.text-only): Deleted height: auto. Now inherited.
+ * UserInterface/Views/NavigationBar.css:
+ (.navigation-bar .item): Change height to auto to support any NavigationBar height.
+ This is needed since the Timelines tab has a shorter NavigationBar height, and
+ flexible items were overflowing.
+ * UserInterface/Views/TextNavigationItem.css:
+ (.navigation-bar .item.text): Deleted height: auto. Now inherited.
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview): Add a FlexibleSpaceNavigationItem before the Edit button.
+
+2016-05-19 Babak Shafiei <[email protected]>
+
Merge r201102. rdar://problem/26339922
2016-05-18 Nikita Vasilyev <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.css (201178 => 201179)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.css 2016-05-19 20:23:39 UTC (rev 201178)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.css 2016-05-19 20:40:54 UTC (rev 201179)
@@ -38,7 +38,6 @@
border: 1px solid transparent;
border-radius: 3px;
text-align: center;
- height: auto;
}
.navigation-bar .item.button > .glyph {
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/NavigationBar.css (201178 => 201179)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/NavigationBar.css 2016-05-19 20:23:39 UTC (rev 201178)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/NavigationBar.css 2016-05-19 20:40:54 UTC (rev 201179)
@@ -43,6 +43,6 @@
align-items: center;
flex-wrap: wrap;
- height: 28px;
+ height: auto;
outline: none;
}
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TextNavigationItem.css (201178 => 201179)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TextNavigationItem.css 2016-05-19 20:23:39 UTC (rev 201178)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TextNavigationItem.css 2016-05-19 20:40:54 UTC (rev 201179)
@@ -31,5 +31,4 @@
line-height: 11px;
color: hsl(0, 0%, 18%);
text-align: center;
- height: auto;
}
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (201178 => 201179)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-05-19 20:23:39 UTC (rev 201178)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-05-19 20:40:54 UTC (rev 201179)
@@ -64,6 +64,7 @@
let instrumentsNavigationBar = new WebInspector.NavigationBar;
instrumentsNavigationBar.element.classList.add("timelines");
+ instrumentsNavigationBar.addNavigationItem(new WebInspector.FlexibleSpaceNavigationItem);
instrumentsNavigationBar.addNavigationItem(this._editInstrumentsButton);
this.addSubview(instrumentsNavigationBar);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
