Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: third_party/polymer/v1_0/components-chromium/paper-toolbar/paper-toolbar.html

Issue 2158913007: Roll Polymer from 1.5.0 -> 1.6.0 to pick up native CSS custom props (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/polymer/v1_0/components-chromium/paper-toolbar/paper-toolbar.html
diff --git a/third_party/polymer/v1_0/components-chromium/paper-toolbar/paper-toolbar.html b/third_party/polymer/v1_0/components-chromium/paper-toolbar/paper-toolbar.html
index b0eaf6b2076b48032c7e88ddebc5ad75ab4211f5..25292ca769e7e18d465277329245a8579e7260eb 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-toolbar/paper-toolbar.html
+++ b/third_party/polymer/v1_0/components-chromium/paper-toolbar/paper-toolbar.html
@@ -218,29 +218,28 @@ be used as the label of the toolbar via `aria-labelledby`.
pointer-events: none;
@apply(--layout-flex);
- @apply(--paper-toolbar-title);
}
- /**
- * TODO: Refactor these selectors
- * Work in progress.
- */
- .toolbar-tools > ::content paper-icon-button[icon=menu] {
- margin-right: 24px;
- }
-
- .toolbar-tools > ::content > .title,
- .toolbar-tools > ::content[select=".middle"] > .title,
- .toolbar-tools > ::content[select=".bottom"] > .title {
+ .toolbar-tools > ::content > .title {
margin-left: 56px;
}
- .toolbar-tools > ::content > paper-icon-button + .title,
- .toolbar-tools > ::content[select=".middle"] paper-icon-button + .title,
- .toolbar-tools > ::content[select=".bottom"] paper-icon-button + .title {
+ .toolbar-tools > ::content > paper-icon-button + .title {
margin-left: 0;
}
+ /**
+ * The --paper-toolbar-title mixin is applied here instead of above to
+ * fix the issue with margin-left being ignored due to css ordering.
+ */
+ .toolbar-tools > ::content .title {
+ @apply(--paper-toolbar-title);
+ }
+
+ .toolbar-tools > ::content paper-icon-button[icon=menu] {
+ margin-right: 24px;
+ }
+
.toolbar-tools > ::content > .fit {
position: absolute;
top: auto;

Powered by Google App Engine
This is Rietveld 408576698