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

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

Issue 1401633002: Update Polymer from 1.1.4 -> 1.1.5 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dzhioev@ review Created 5 years, 2 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
Index: third_party/polymer/v1_0/components-chromium/paper-button/paper-button.html
diff --git a/third_party/polymer/v1_0/components-chromium/paper-button/paper-button.html b/third_party/polymer/v1_0/components-chromium/paper-button/paper-button.html
index c153d502f4c14c048b25b316660426015bda1124..215f560708608273898d1f21fb8aab9ee7397d0d 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-button/paper-button.html
+++ b/third_party/polymer/v1_0/components-chromium/paper-button/paper-button.html
@@ -13,8 +13,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
<!--
-
-Material Design: <a href="http://www.google.com/design/spec/components/buttons.html">Buttons</a>
+Material design: [Buttons](https://www.google.com/design/spec/components/buttons.html)
`paper-button` is a button. When the user touches the button, a ripple effect emanates
from the point of contact. It may be flat or raised. A raised button is styled with a
@@ -74,9 +73,9 @@ Custom property | Description | Default
-->
</head><body><dom-module id="paper-button">
- <template>
+ <template strip-whitespace="">
- <style>
+ <style include="paper-material">
:host {
display: inline-block;
position: relative;
@@ -100,12 +99,12 @@ Custom property | Description | Default
@apply(--paper-button);
}
- :host([raised]) .keyboard-focus {
+ :host([raised].keyboard-focus) {
font-weight: bold;
@apply(--paper-button-raised-keyboard-focus);
}
- :host(:not([raised])) .keyboard-focus {
+ :host(:not([raised]).keyboard-focus) {
font-weight: bold;
@apply(--paper-button-flat-keyboard-focus);
}
@@ -119,32 +118,15 @@ Custom property | Description | Default
@apply(--paper-button-disabled);
}
- :host([noink]) paper-ripple {
- display: none;
- }
-
paper-ripple {
color: var(--paper-button-ink-color);
}
- paper-material {
- border-radius: inherit;
- @apply(--layout-fit);
- }
-
- .content > ::content * {
+ :host > ::content * {
text-transform: inherit;
}
</style>
-
- <paper-ripple></paper-ripple>
-
- <paper-material elevation="[[_elevation]]" animated=""></paper-material>
-
- <div class$="[[_computeContentClass(receivedFocusFromKeyboard)]]">
- <content></content>
- </div>
-
+ <content></content>
</template>
</dom-module>

Powered by Google App Engine
This is Rietveld 408576698