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

Unified Diff: third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu-shared-styles.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
Index: third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu-shared-styles.html
diff --git a/third_party/polymer/v1_0/components-chromium/paper-item/paper-item-shared-styles.html b/third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu-shared-styles.html
similarity index 54%
copy from third_party/polymer/v1_0/components-chromium/paper-item/paper-item-shared-styles.html
copy to third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu-shared-styles.html
index 0bc190dd2902ea81454dee99a68a20a629dc4f99..680655e1872cb72d43a989dce1145b0069926572 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-item/paper-item-shared-styles.html
+++ b/third_party/polymer/v1_0/components-chromium/paper-menu/paper-menu-shared-styles.html
@@ -8,38 +8,38 @@ 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
-->
-<dom-module id="paper-item-shared-styles">
+<dom-module id="paper-menu-shared-styles">
<template>
<style>
- :host {
- display: block;
- min-height: var(--paper-item-min-height, 48px);
- padding: 0px 16px;
- }
+ /* need a wrapper element to make this higher specificity than the :host rule in paper-item */
+ .selectable-content > ::content > .iron-selected {
+ font-weight: bold;
- :host(.iron-selected) {
- font-weight: var(--paper-item-selected-weight, bold);
- @apply(--paper-item-selected);
+ @apply(--paper-menu-selected-item);
}
- :host([disabled]) {
- color: var(--paper-item-disabled-color, --disabled-text-color);
- @apply(--paper-item-disabled);
+ .selectable-content > ::content > [disabled] {
+ color: var(--paper-menu-disabled-color, --disabled-text-color);
}
- :host(:focus) {
+ .selectable-content > ::content > *:focus {
position: relative;
outline: 0;
- @apply(--paper-item-focused);
+
+ @apply(--paper-menu-focused-item);
}
- :host(:focus):before {
+ .selectable-content > ::content > *:focus:after {
@apply(--layout-fit);
- content: '';
background: currentColor;
opacity: var(--dark-divider-opacity);
+ content: '';
+
+ @apply(--paper-menu-focused-item-after);
+ }
- @apply(--paper-item-focused-before);
+ .selectable-content > ::content > *[colored]:focus:after {
+ opacity: 0.26;
}
</style>
</template>

Powered by Google App Engine
This is Rietveld 408576698