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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/polymer/v1_0/components-chromium/paper-fab/paper-fab.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
« no previous file with comments | « third_party/polymer/v1_0/components-chromium/paper-fab/bower.json ('k') | third_party/polymer/v1_0/components-chromium/paper-fab/paper-fab-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-fab/paper-fab.html
diff --git a/third_party/polymer/v1_0/components-chromium/paper-fab/paper-fab.html b/third_party/polymer/v1_0/components-chromium/paper-fab/paper-fab.html
index aa0b7c0c374bd7838fae5ae1ed76c5e5241590e3..d23bf017100cbd494a227b742c53f38db0d721c9 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-fab/paper-fab.html
+++ b/third_party/polymer/v1_0/components-chromium/paper-fab/paper-fab.html
@@ -16,7 +16,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<link rel="import" href="../paper-behaviors/paper-button-behavior.html">
<!--
-Material Design: <a href="http://www.google.com/design/spec/components/buttons.html">Button</a>
+Material design: [Floating Action Button](https://www.google.com/design/spec/components/buttons-floating-action-button.html)
`paper-fab` is a floating action button. It contains an image placed in the center and
comes in two sizes: regular size and a smaller size by applying the attribute `mini`. When
@@ -47,6 +47,7 @@ Custom property | Description | Default
`--paper-fab` | Mixin applied to the button | `{}`
`--paper-fab-mini` | Mixin applied to a mini button | `{}`
`--paper-fab-disabled` | Mixin applied to a disabled button | `{}`
+`--paper-fab-iron-icon` | Mixin applied to the iron-icon within the button | `{}`
@group Paper Elements
@demo demo/index.html
@@ -54,63 +55,59 @@ Custom property | Description | Default
-->
</head><body><dom-module id="paper-fab">
- <style>
-
- :host {
- display: inline-block;
- position: relative;
- outline: none;
- -moz-user-select: none;
- -ms-user-select: none;
- -webkit-user-select: none;
- -webkit-tap-highlight-color: rgba(0,0,0,0);
- user-select: none;
- cursor: pointer;
-
- box-sizing: border-box;
- min-width: 0;
- width: 56px;
- height: 56px;
- background: var(--paper-fab-background, --accent-color);
- color: var(--text-primary-color);
- border-radius: 50%;
- padding: 16px;
-
- z-index: 0;
-
- @apply(--paper-fab);
- }
-
- :host([mini]) {
- width: 40px;
- height: 40px;
- padding: 8px;
-
- @apply(--paper-fab-mini);
- }
-
- :host([disabled]) {
- color: var(--paper-fab-disabled-text, --paper-grey-500);
- background: var(--paper-fab-disabled-background, --paper-grey-300);
- @apply(--paper-fab-disabled);
- }
-
- paper-material {
- border-radius: inherit;
- @apply(--layout-fit);
- @apply(--layout-vertical);
- @apply(--layout-center-center);
- }
-
- .keyboard-focus {
- background: var(--paper-fab-keyboard-focus-background, --paper-pink-900);
- }
- </style>
- <template>
- <paper-ripple></paper-ripple>
- <paper-material class$="[[_computeContentClass(receivedFocusFromKeyboard)]]" elevation="[[_elevation]]" animated="">
- <iron-icon id="icon" src="[[src]]" icon="[[icon]]"></iron-icon>
- </paper-material>
+ <template strip-whitespace="">
+ <style include="paper-material">
+
+ :host {
+ display: inline-block;
+ position: relative;
+ outline: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ -webkit-user-select: none;
+ -webkit-tap-highlight-color: rgba(0,0,0,0);
+ user-select: none;
+ cursor: pointer;
+
+ box-sizing: border-box;
+ min-width: 0;
+ width: 56px;
+ height: 56px;
+ background: var(--paper-fab-background, --accent-color);
+ color: var(--text-primary-color);
+ border-radius: 50%;
+ padding: 16px;
+
+ z-index: 0;
+
+ @apply(--layout-vertical);
+ @apply(--layout-center-center);
+ @apply(--paper-fab);
+ }
+
+ :host([mini]) {
+ width: 40px;
+ height: 40px;
+ padding: 8px;
+
+ @apply(--paper-fab-mini);
+ }
+
+ :host([disabled]) {
+ color: var(--paper-fab-disabled-text, --paper-grey-500);
+ background: var(--paper-fab-disabled-background, --paper-grey-300);
+ @apply(--paper-fab-disabled);
+ }
+
+ iron-icon {
+ @apply(--paper-fab-iron-icon);
+ }
+
+ :host(.keyboard-focus) {
+ background: var(--paper-fab-keyboard-focus-background, --paper-pink-900);
+ }
+ </style>
+ <iron-icon id="icon" src="[[src]]" icon="[[icon]]"></iron-icon>
</template>
</dom-module>
<script src="paper-fab-extracted.js"></script></body></html>
« no previous file with comments | « third_party/polymer/v1_0/components-chromium/paper-fab/bower.json ('k') | third_party/polymer/v1_0/components-chromium/paper-fab/paper-fab-extracted.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698