Chromium Code Reviews| Index: ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html |
| diff --git a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html |
| index 08a1cd6c8f164017c03a44c92b6edb5c30460356..da0d8f66a6d2d4b0617b0b09d6e3a698387c7545 100644 |
| --- a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html |
| +++ b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html |
| @@ -14,8 +14,8 @@ |
| } |
| h1 { |
| - @apply(--layout-flex); |
| -webkit-margin-start: 6px; |
| + flex: 1; |
| font-size: 123%; |
| font-weight: 400; |
| text-overflow: ellipsis; |
| @@ -46,14 +46,23 @@ |
| #centeredContent { |
| -webkit-margin-start: var(--cr-toolbar-field-margin, 0); |
| - -webkit-padding-end: 12px; |
| + -webkit-padding-end: var(--cr-toolbar-field-end-padding, 12px); |
| display: flex; |
| flex: 1 1 0; |
| justify-content: center; |
| } |
| + :host(:not([narrow_])) h1 { |
| + @apply(--cr-toolbar-header-wide); |
| + } |
| + |
| :host(:not([narrow_])) #leftContent { |
| max-width: calc((100% - var(--cr-toolbar-field-width) - 18px) / 2); |
| + @apply(--cr-toolbar-left-content-wide); |
| + } |
| + |
| + :host(:not([narrow_])) #rightContent { |
| + @apply(--cr-toolbar-right-content-wide); |
| } |
| :host([narrow_]) #centeredContent { |
| @@ -65,9 +74,11 @@ |
| } |
| </style> |
| <div id="leftContent"> |
| - <paper-icon-button id="menuButton" icon="cr:menu" on-tap="onMenuTap_" |
| - title="[[menuLabel]]"> |
| - </paper-icon-button> |
| + <template is="dom-if" if="[[menuLabel]]"> |
|
tsergeant
2016/08/24 01:09:37
We already have the button hiding from the [show-m
Dan Beam
2016/08/24 02:48:03
Acknowledged.
|
| + <paper-icon-button id="menuButton" icon="cr:menu" on-tap="onMenuTap_" |
| + title="[[menuLabel]]"> |
| + </paper-icon-button> |
| + </template> |
| <h1>[[pageName]]</h1> |
| </div> |
| @@ -80,6 +91,10 @@ |
| <iron-media-query query="(max-width: 900px)" query-matches="{{narrow_}}"> |
| </iron-media-query> |
| </div> |
| + |
| + <div id="rightContent"> |
| + <content select=".more-actions"></content> |
|
tsergeant
2016/08/24 01:09:37
Cool, I was just about to implement something simi
Dan Beam
2016/08/24 02:48:03
Acknowledged.
|
| + </div> |
| </template> |
| <script src="cr_toolbar.js"></script> |
| </dom-module> |