Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1862213002: Roll third_party/polymer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete appearance_browsertest.js, result of a previous bad merge. Created 4 years, 8 months 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
« no previous file with comments | « third_party/polymer/v1_0/components-chromium/paper-menu-button/compiled_resources2.gyp ('k') | third_party/polymer/v1_0/components-chromium/paper-menu-button/paper-menu-button-extracted.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/polymer/v1_0/components-chromium/paper-menu-button/paper-menu-button.html
diff --git a/third_party/polymer/v1_0/components-chromium/paper-menu-button/paper-menu-button.html b/third_party/polymer/v1_0/components-chromium/paper-menu-button/paper-menu-button.html
index 6eb8aca2d76317c94e6c4c425b33efcdb6c2e29e..f33ea7cc52b4522ef47da127e5751de6eb20f56e 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-menu-button/paper-menu-button.html
+++ b/third_party/polymer/v1_0/components-chromium/paper-menu-button/paper-menu-button.html
@@ -7,13 +7,13 @@ 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-dropdown/iron-dropdown.html">
<link rel="import" href="../iron-a11y-keys-behavior/iron-a11y-keys-behavior.html">
<link rel="import" href="../iron-behaviors/iron-control-state.html">
-<link rel="import" href="../paper-material/paper-material.html">
-<link rel="import" href="../paper-styles/default-theme.html">
+<link rel="import" href="../iron-dropdown/iron-dropdown.html">
<link rel="import" href="../neon-animation/animations/fade-in-animation.html">
<link rel="import" href="../neon-animation/animations/fade-out-animation.html">
+<link rel="import" href="../paper-styles/default-theme.html">
+<link rel="import" href="../paper-styles/shadow.html">
<link rel="import" href="paper-menu-button-animations.html">
<!--
@@ -48,7 +48,7 @@ The following custom properties and mixins are also available for styling:
Custom property | Description | Default
----------------|-------------|----------
-`--paper-menu-button-dropdown-background` | Background color of the paper-menu-button dropdown | `#fff`
+`--paper-menu-button-dropdown-background` | Background color of the paper-menu-button dropdown | `--primary-background-color`
`--paper-menu-button` | Mixin applied to the paper-menu-button | `{}`
`--paper-menu-button-disabled` | Mixin applied to the paper-menu-button when disabled | `{}`
`--paper-menu-button-dropdown` | Mixin applied to the paper-menu-button dropdown | `{}`
@@ -59,54 +59,61 @@ Custom property | Description | Default
-->
</head><body><dom-module id="paper-menu-button">
- <style>
- :host {
- display: inline-block;
- position: relative;
- padding: 8px;
- outline: none;
-
- @apply(--paper-menu-button);
- }
-
- :host([disabled]) {
- cursor: auto;
- color: var(--disabled-text-color);
-
- @apply(--paper-menu-button-disabled);
- }
-
- :host([vertical-align="top"]) paper-material {
- margin-bottom: 20px;
- margin-top: -10px;
- top: 10px;
- }
-
- :host([vertical-align="bottom"]) paper-material {
- bottom: 10px;
- margin-bottom: -10px;
- margin-top: 20px;
- }
-
- iron-dropdown {
- @apply(--paper-menu-button-dropdown);
- }
-
- .dropdown-content {
- border-radius: 2px;
- background-color: var(--paper-menu-button-dropdown-background, --primary-background-color);
- @apply(--paper-menu-button-content);
- }
- </style>
<template>
- <div id="trigger" on-tap="open">
+ <style>
+ :host {
+ display: inline-block;
+ position: relative;
+ padding: 8px;
+ outline: none;
+
+ @apply(--paper-menu-button);
+ }
+
+ :host([disabled]) {
+ cursor: auto;
+ color: var(--disabled-text-color);
+
+ @apply(--paper-menu-button-disabled);
+ }
+
+ iron-dropdown {
+ @apply(--paper-menu-button-dropdown);
+ }
+
+ .dropdown-content {
+ @apply(--shadow-elevation-2dp);
+
+ position: relative;
+ border-radius: 2px;
+ background-color: var(--paper-menu-button-dropdown-background, --primary-background-color);
+
+ @apply(--paper-menu-button-content);
+ }
+
+ :host([vertical-align="top"]) .dropdown-content {
+ margin-bottom: 20px;
+ margin-top: -10px;
+ top: 10px;
+ }
+
+ :host([vertical-align="bottom"]) .dropdown-content {
+ bottom: 10px;
+ margin-bottom: -10px;
+ margin-top: 20px;
+ }
+ </style>
+
+ <div id="trigger" on-tap="toggle">
<content select=".dropdown-trigger"></content>
</div>
- <iron-dropdown id="dropdown" opened="{{opened}}" horizontal-align="[[horizontalAlign]]" vertical-align="[[verticalAlign]]" horizontal-offset="[[horizontalOffset]]" vertical-offset="[[verticalOffset]]" open-animation-config="[[openAnimationConfig]]" close-animation-config="[[closeAnimationConfig]]" no-animations="[[noAnimations]]" focus-target="[[_dropdownContent]]">
- <paper-material class="dropdown-content">
+
+ <iron-dropdown id="dropdown" opened="{{opened}}" horizontal-align="[[horizontalAlign]]" vertical-align="[[verticalAlign]]" horizontal-offset="[[horizontalOffset]]" vertical-offset="[[verticalOffset]]" open-animation-config="[[openAnimationConfig]]" close-animation-config="[[closeAnimationConfig]]" no-animations="[[noAnimations]]" focus-target="[[_dropdownContent]]" on-iron-overlay-canceled="__onIronOverlayCanceled">
+ <div class="dropdown-content">
<content id="content" select=".dropdown-content"></content>
- </paper-material>
+ </div>
</iron-dropdown>
</template>
-</dom-module>
+
+ </dom-module>
<script src="paper-menu-button-extracted.js"></script></body></html>
« no previous file with comments | « third_party/polymer/v1_0/components-chromium/paper-menu-button/compiled_resources2.gyp ('k') | third_party/polymer/v1_0/components-chromium/paper-menu-button/paper-menu-button-extracted.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698