| 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 d3713236a537222b2cb15f7d5c1c6ea35c6cfeaf..b0eaf6b2076b48032c7e88ddebc5ad75ab4211f5 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
|
| @@ -1,4 +1,5 @@
|
| <!--
|
| +@license
|
| Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
|
| This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
|
| The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
|
| @@ -103,6 +104,9 @@ be used as the label of the toolbar via `aria-labelledby`.
|
| <template>
|
| <style>
|
| :host {
|
| + --calculated-paper-toolbar-height: var(--paper-toolbar-height, 64px);
|
| + --calculated-paper-toolbar-sm-height: var(--paper-toolbar-sm-height, 56px);
|
| +
|
| /* technical */
|
| display: block;
|
| position: relative;
|
| @@ -110,7 +114,7 @@ be used as the label of the toolbar via `aria-labelledby`.
|
| -moz-box-sizing: border-box;
|
|
|
| /* size */
|
| - height: var(--paper-toolbar-height, 64px);
|
| + height: var(--calculated-paper-toolbar-height);
|
|
|
| background: var(--paper-toolbar-background, --primary-color);
|
| color: var(--paper-toolbar-color, --dark-theme-text-color);
|
| @@ -124,18 +128,18 @@ be used as the label of the toolbar via `aria-labelledby`.
|
| }
|
|
|
| :host(.medium-tall) {
|
| - height: calc(var(--paper-toolbar-height, 64px) * 2);
|
| + height: calc(var(--calculated-paper-toolbar-height) * 2);
|
| @apply(--paper-toolbar-medium);
|
| }
|
|
|
| :host(.tall) {
|
| - height: calc(var(--paper-toolbar-height, 64px) * 3);
|
| + height: calc(var(--calculated-paper-toolbar-height) * 3);
|
| @apply(--paper-toolbar-tall);
|
| }
|
|
|
| .toolbar-tools {
|
| position: relative;
|
| - height: var(--paper-toolbar-height, 64px);
|
| + height: var(--calculated-paper-toolbar-height);
|
| padding: 0 16px;
|
| pointer-events: none;
|
| @apply(--layout-horizontal);
|
| @@ -149,19 +153,19 @@ be used as the label of the toolbar via `aria-labelledby`.
|
|
|
| @media (max-width: 600px) {
|
| :host {
|
| - height: var(--paper-toolbar-sm-height, 56px);
|
| + height: var(--calculated-paper-toolbar-sm-height);
|
| }
|
|
|
| :host(.medium-tall) {
|
| - height: calc(var(--paper-toolbar-sm-height, 56px) * 2);
|
| + height: calc(var(--calculated-paper-toolbar-sm-height) * 2);
|
| }
|
|
|
| :host(.tall) {
|
| - height: calc(var(--paper-toolbar-sm-height, 56px) * 3);
|
| + height: calc(var(--calculated-paper-toolbar-sm-height) * 3);
|
| }
|
|
|
| .toolbar-tools {
|
| - height: var(--paper-toolbar-sm-height, 56px);
|
| + height: var(--calculated-paper-toolbar-sm-height);
|
| }
|
| }
|
|
|
|
|