third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu.html - Issue 1468623004: Update Polymer from 1.2.1 -> 1.2.3

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

Issue 1468623004: Update Polymer from 1.2.1 -> 1.2.3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@travis-yml

Patch Set: local-state.html Created 5 years, 1 month 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

« components/proximity_auth/webui/resources/local-state.html ('K') | « third_party/polymer/v1_0/components-chromium/paper-menu/hero.svg ('k') | third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu-extracted.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu.html

diff --git a/third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu.html b/third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu.html

index cceef31abbd77e2be057320444f6fc8e5ebad624..c9bda3534f99c8f1da62a5956a20298267ac6167 100644

--- a/third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu.html

+++ b/third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu.html

@@ -7,10 +7,14 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI

Code distributed by Google as part of the polymer project is also

subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt

--><html><head><link rel="import" href="../polymer/polymer.html">

+<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">

-<link rel="import" href="../paper-styles/paper-styles.html">

+<link rel="import" href="../paper-styles/default-theme.html">

+<link rel="import" href="paper-menu-shared-styles.html">

<!--

+Material design: [Menus](https://www.google.com/design/spec/components/menus.html)

`<paper-menu>` implements an accessible menu control with Material Design styling. The focused item

is highlighted, and the selected item has bolded text.

@@ -41,7 +45,7 @@ The following custom properties and mixins are available for styling:

Custom property | Description | Default

----------------|-------------|----------

`--paper-menu-background-color` | Menu background color | `--primary-background-color`

-`--paper-menu-color` | Menu foreground color | `--primary-text-color`

+`--paper-menu-color` | Menu foreground color | `--primary-text-color`

`--paper-menu-disabled-color` | Foreground color for a disabled item | `--disabled-text-color`

`--paper-menu` | Mixin applied to the menu | `{}`

`--paper-menu-selected-item` | Mixin applied to the selected item | `{}`

@@ -62,27 +66,24 @@ of a menu item will also focus it.

-->

</head><body><dom-module id="paper-menu">

- <link rel="import" type="css" href="paper-menu-shared.css">

- <style>

- :host {

- display: block;

- padding: 8px 0;

+ <template>

+ <style include="paper-menu-shared-styles"></style>

+ <style>

+ :host {

+ display: block;

+ padding: 8px 0;

- background: var(--paper-menu-background-color, --primary-background-color);

- color: var(--paper-menu-color, --primary-text-color);

+ background: var(--paper-menu-background-color, --primary-background-color);

+ color: var(--paper-menu-color, --primary-text-color);

- @apply(--paper-menu);

- }

- </style>

- <template>

+ @apply(--paper-menu);

+ }

+ </style>

</div>

</template>

-</dom-module>

+ </dom-module>