diff options
Diffstat (limited to 'chromium/chrome/browser/resources/md_extensions/toolbar.html')
| -rw-r--r-- | chromium/chrome/browser/resources/md_extensions/toolbar.html | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/chromium/chrome/browser/resources/md_extensions/toolbar.html b/chromium/chrome/browser/resources/md_extensions/toolbar.html index 67ab5ed89e8..14c8b33ce20 100644 --- a/chromium/chrome/browser/resources/md_extensions/toolbar.html +++ b/chromium/chrome/browser/resources/md_extensions/toolbar.html @@ -19,9 +19,9 @@ <style include="cr-hidden-style paper-button-style"> :host { /* The constant is the height of the tallest control. */ - --button-row-height: calc(var(--margin-bottom) + 36px); + --button-row-height: calc(2 * var(--padding-top-bottom) + 36px); --drawer-transition: 0.3s cubic-bezier(.25, .1, .25, 1); - --margin-bottom: 4px; + --padding-top-bottom: 8px; --toolbar-color: var(--md-toolbar-color); } @@ -46,6 +46,8 @@ } #devDrawer { + background: white; + border-bottom: 1px solid var(--google-grey-300); height: 0; overflow: hidden; position: relative; @@ -58,11 +60,9 @@ #buttonStrip { -webkit-margin-end: auto; - -webkit-margin-start: auto; - background: var(--toolbar-color); - margin-bottom: var(--margin-bottom); + -webkit-margin-start: 24px; + padding: var(--padding-top-bottom) 0; position: absolute; - text-align: center; top: calc(var(--button-row-height) * -1); transition: top var(--drawer-transition); /* Prevent selection of the blank space between buttons. */ @@ -72,11 +72,6 @@ #buttonStrip paper-button { -webkit-margin-end: 16px; - color: white; - /* Increase contrast compared to default values. */ - --paper-button-flat-keyboard-focus: { - background: rgba(0, 0, 0, .3); - }; } .more-actions { @@ -98,13 +93,10 @@ white-space: nowrap; } </style> - <cr-toolbar page-name="$i18n{toolbarTitle}" - search-prompt="$i18n{search}" - clear-label="$i18n{clearSearch}" - menu-label="$i18n{mainMenu}" - show-menu="[[!isGuest]]" show-search="[[!isGuest]]" + <cr-toolbar page-name="$i18n{toolbarTitle}" search-prompt="$i18n{search}" + clear-label="$i18n{clearSearch}" menu-label="$i18n{mainMenu}" show-menu narrow-threshold="1000"> - <div class="more-actions" hidden$="[[isGuest]]"> + <div class="more-actions"> <span id="devModeLabel">$i18n{toolbarDevMode}</span> <cr-tooltip-icon hidden$="[[!devModeControlledByPolicy]]" tooltip-text="$i18n{controlledSettingPolicy}" @@ -131,9 +123,6 @@ title="$i18n{toolbarUpdateNowTooltip}"> $i18n{toolbarUpdateNow} </paper-button> - <cr-toast> - <div>[[toastLabel_]]</div> - </cr-toast> <if expr="chromeos"> <paper-button id="kioskExtensions" on-click="onKioskTap_" hidden$="[[!kioskEnabled]]"> @@ -142,6 +131,9 @@ </if> </div> </div> + <cr-toast> + <div>[[toastLabel_]]</div> + </cr-toast> </template> <script src="toolbar.js"></script> </dom-module> |