| 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..28200326d9545b53e8d4504805e5f8b19c79a8cb 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;
|
| @@ -40,20 +40,28 @@
|
| width: 32px;
|
| }
|
|
|
| - :host(:not([show-menu])) #menuButton {
|
| - display: none;
|
| - }
|
| -
|
| #centeredContent {
|
| -webkit-margin-start: var(--cr-toolbar-field-margin, 0);
|
| - -webkit-padding-end: 12px;
|
| display: flex;
|
| flex: 1 1 0;
|
| justify-content: center;
|
| }
|
|
|
| + :host([narrow_]) #centeredContent {
|
| + -webkit-padding-end: var(--cr-toolbar-field-end-padding, 12px);
|
| + }
|
| +
|
| + :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 +73,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="[[showMenu]]">
|
| + <paper-icon-button id="menuButton" icon="cr:menu" on-tap="onMenuTap_"
|
| + title="[[menuLabel]]">
|
| + </paper-icon-button>
|
| + </template>
|
| <h1>[[pageName]]</h1>
|
| </div>
|
|
|
| @@ -80,6 +90,10 @@
|
| <iron-media-query query="(max-width: 900px)" query-matches="{{narrow_}}">
|
| </iron-media-query>
|
| </div>
|
| +
|
| + <div id="rightContent">
|
| + <content select=".more-actions"></content>
|
| + </div>
|
| </template>
|
| <script src="cr_toolbar.js"></script>
|
| </dom-module>
|
|
|