| Index: polymer_1.2.3/bower_components/paper-menu/paper-menu.html
|
| diff --git a/polymer_1.0.4/bower_components/paper-menu/paper-menu.html b/polymer_1.2.3/bower_components/paper-menu/paper-menu.html
|
| similarity index 64%
|
| copy from polymer_1.0.4/bower_components/paper-menu/paper-menu.html
|
| copy to polymer_1.2.3/bower_components/paper-menu/paper-menu.html
|
| index 45ecd722c55336b6e078e59851868ea1a5af38e4..10e562b40852abc62900f5cbf11ad3118390e986 100644
|
| --- a/polymer_1.0.4/bower_components/paper-menu/paper-menu.html
|
| +++ b/polymer_1.2.3/bower_components/paper-menu/paper-menu.html
|
| @@ -9,10 +9,15 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
| -->
|
|
|
| <link rel="import" href="../polymer/polymer.html">
|
| +<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
|
| <link rel="import" href="../iron-menu-behavior/iron-menu-behavior.html">
|
| -<link rel="import" href="../paper-styles/paper-styles.html">
|
| +<link rel="import" href="../paper-styles/default-theme.html">
|
| +<link rel="import" href="../paper-styles/color.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.
|
|
|
| @@ -21,8 +26,15 @@ is highlighted, and the selected item has bolded text.
|
| <paper-item>Item 2</paper-item>
|
| </paper-menu>
|
|
|
| +An initial selection can be specified with the `selected` attribute.
|
| +
|
| + <paper-menu selected="0">
|
| + <paper-item>Item 1</paper-item>
|
| + <paper-item>Item 2</paper-item>
|
| + </paper-menu>
|
| +
|
| Make a multi-select menu with the `multi` attribute. Items in a multi-select menu can be deselected,
|
| -and multiple item can be selected.
|
| +and multiple items can be selected.
|
|
|
| <paper-menu multi>
|
| <paper-item>Item 1</paper-item>
|
| @@ -36,7 +48,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 | `{}`
|
| @@ -57,77 +69,34 @@ of a menu item will also focus it.
|
| -->
|
|
|
| <dom-module id="paper-menu">
|
| + <template>
|
| + <style include="paper-menu-shared-styles"></style>
|
| + <style>
|
| + :host {
|
| + display: block;
|
| + padding: 8px 0;
|
|
|
| - <style>
|
| -
|
| - :host {
|
| - display: block;
|
| - padding: 8px 0;
|
| -
|
| - background: var(--paper-menu-background-color, --primary-background-color);
|
| - color: var(--paper-menu-color, --primary-text-color);
|
| -
|
| - @apply(--paper-menu);
|
| - }
|
| -
|
| - /* need a wrapper element to make this higher specificity than the :host rule in paper-item */
|
| - .content > ::content > .iron-selected {
|
| - font-weight: bold;
|
| -
|
| - @apply(--paper-menu-selected-item);
|
| - }
|
| -
|
| - .content > ::content > [disabled] {
|
| - color: var(--paper-menu-disabled-color, --disabled-text-color);
|
| - }
|
| -
|
| - .content > ::content > *:focus {
|
| - position: relative;
|
| - outline: 0;
|
| -
|
| - @apply(--paper-menu-colored-focused-item);
|
| - }
|
| -
|
| - .content > ::content > *:focus:after {
|
| - @apply(--layout-fit);
|
| - background: currentColor;
|
| - /* FIXME move to paper-styles for next widget */
|
| - opacity: 0.12;
|
| - content: '';
|
| -
|
| - @apply(--paper-menu-colored-focused-item-after);
|
| - }
|
| -
|
| - .content > ::content > *[colored]:focus:after {
|
| - opacity: 0.26;
|
| - }
|
| + background: var(--paper-menu-background-color, --primary-background-color);
|
| + color: var(--paper-menu-color, --primary-text-color);
|
|
|
| - </style>
|
| + @apply(--paper-menu);
|
| + }
|
| + </style>
|
|
|
| - <template>
|
| -
|
| - <div class="content">
|
| + <div class="selectable-content">
|
| <content></content>
|
| </div>
|
| -
|
| </template>
|
|
|
| + <script>
|
| + (function() {
|
| + Polymer({
|
| + is: 'paper-menu',
|
| +
|
| + behaviors: [
|
| + Polymer.IronMenuBehavior
|
| + ]
|
| + });
|
| + })();
|
| + </script>
|
| </dom-module>
|
| -
|
| -<script>
|
| -
|
| -(function() {
|
| -
|
| - Polymer({
|
| -
|
| - is: 'paper-menu',
|
| -
|
| - behaviors: [
|
| - Polymer.IronMenuBehavior
|
| - ]
|
| -
|
| - });
|
| -
|
| -})();
|
| -
|
| -</script>
|
|
|