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

Unified Diff: third_party/polymer/v0_8/components/paper-fab/paper-fab.html

Issue 1162563004: Upgrade to 1.0 and switch clients to dom-repeat where needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a layout import and remove the gzipped webanimation in reproduce.sh Created 5 years, 7 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/v0_8/components/paper-fab/paper-fab.html
diff --git a/third_party/polymer/v0_8/components/paper-fab/paper-fab.html b/third_party/polymer/v0_8/components/paper-fab/paper-fab.html
index 09e0a849b6b494a341069a446700641b26e4730e..16e5de18818ce80c6f27d0809631670e19e3bf8a 100644
--- a/third_party/polymer/v0_8/components/paper-fab/paper-fab.html
+++ b/third_party/polymer/v0_8/components/paper-fab/paper-fab.html
@@ -8,9 +8,16 @@ 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
-->
-<!--
-@group Paper Elements
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-icon/iron-icon.html">
+<link rel="import" href="../iron-flex-layout/classes/iron-flex-layout.html">
+<link rel="import" href="../paper-styles/default-theme.html">
+<link rel="import" href="../paper-styles/color.html">
+<link rel="import" href="../paper-material/paper-material.html">
+<link rel="import" href="../paper-ripple/paper-ripple.html">
+<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>
`paper-fab` is a floating action button. It contains an image placed in the center and
@@ -28,44 +35,25 @@ Example:
<paper-fab mini icon="favorite"></paper-fab>
<paper-fab src="star.png"></paper-fab>
-Styling
--------
-Style the button with CSS as you would a normal DOM element. If you are using the icons
-provided by `iron-icons`, the icon will inherit the foreground color of the button.
+### Styling
- /* make a blue "cloud" button */
- <paper-fab icon="cloud" style="color: blue;"></paper-fab>
+The following custom properties and mixins are available for styling:
-By default, the ripple is the same color as the foreground at 25% opacity. You may
-customize the color using this selector:
+Custom property | Description | Default
+----------------|-------------|----------
+`--paper-fab-background` | The background color of the button | `--paper-indigo-500`
+`--paper-fab-disabled-background` | The background color of the button when it's disabled | `--paper-grey-300`
+`--paper-fab-disabled-text` | The text color of the button when it's disabled | `--paper-grey-500`
+`--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 | `{}`
- /* make #my-button use a blue ripple instead of foreground color */
- #my-button::shadow #ripple {
- color: blue;
- }
-
-The opacity of the ripple is not customizable via CSS.
+@group Paper Elements
+@demo demo/index.html
-@element paper-fab
-@status unstable
-->
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../iron-icon/iron-icon.html">
-<link rel="import" href="../iron-flex-layout/classes/iron-flex-layout.html">
-<link rel="import" href="../paper-styles/default-theme.html">
-<link rel="import" href="../paper-material/paper-material.html">
-<link rel="import" href="../paper-ripple/paper-ripple.html">
-<link rel="import" href="../paper-behaviors/paper-button-behavior.html">
-
-<style is="x-style">
- * {
- --paper-fab-disabled-text: #c9c9c9;
- --paper-fab-disabled-background: var(--accent-color);
- }
-</style>
-
<dom-module id="paper-fab">
<style>
@@ -83,14 +71,14 @@ The opacity of the ripple is not customizable via CSS.
min-width: 0;
width: 56px;
height: 56px;
- background: var(--accent-color);
+ background: var(--paper-fab-background, --paper-indigo-500);
color: var(--text-primary-color);
border-radius: 50%;
padding: 16px;
z-index: 0;
- mixin(--paper-fab);
+ @apply(--paper-fab);
}
:host([mini]) {
@@ -98,13 +86,13 @@ The opacity of the ripple is not customizable via CSS.
height: 40px;
padding: 8px;
- mixin(--paper-fab-mini);
+ @apply(--paper-fab-mini);
}
:host([disabled]) {
- color: var(--paper-fab-disabled-text);
-
- mixin(--paper-fab-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 {
@@ -122,8 +110,6 @@ The opacity of the ripple is not customizable via CSS.
Polymer({
is: 'paper-fab',
- enableCustomStyleProperties: true,
-
behaviors: [
Polymer.PaperButtonBehavior
],
@@ -168,5 +154,6 @@ The opacity of the ripple is not customizable via CSS.
value: false
}
}
+
});
</script>

Powered by Google App Engine
This is Rietveld 408576698