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

Unified Diff: lib/src/paper-fab/paper-fab.html

Issue 1418513006: update elements and fix some bugs (Closed) Base URL: git@github.com:dart-lang/polymer_elements.git@master
Patch Set: code review updates 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 | « lib/src/paper-dropdown-menu/test/paper-dropdown-menu.html ('k') | lib/src/paper-fab/test/a11y.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/paper-fab/paper-fab.html
diff --git a/lib/src/paper-fab/paper-fab.html b/lib/src/paper-fab/paper-fab.html
index a680a74d077ec70c51c6606f72fe8ec672aba51e..31fd9037431e15f7c7b1642d3a68612c02ea124b 100644
--- a/lib/src/paper-fab/paper-fab.html
+++ b/lib/src/paper-fab/paper-fab.html
@@ -9,16 +9,16 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
-->
<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="../iron-icon/iron-icon.html">
+<link rel="import" href="../paper-behaviors/paper-button-behavior.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">
+<link rel="import" href="../paper-styles/color.html">
+<link rel="import" href="../paper-styles/default-theme.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
@@ -49,6 +49,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
@@ -56,65 +57,62 @@ Custom property | Description | Default
-->
<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);
- }
+ <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;
+ :host([mini]) {
+ width: 40px;
+ height: 40px;
+ padding: 8px;
- @apply(--paper-fab-mini);
- }
+ @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);
- }
+ :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);
- }
+ iron-icon {
+ @apply(--paper-fab-iron-icon);
+ }
- .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>
+ :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>
Polymer({
is: 'paper-fab',
@@ -163,15 +161,6 @@ Custom property | Description | Default
value: false,
reflectToAttribute: true
}
- },
-
- _computeContentClass: function(receivedFocusFromKeyboard) {
- var className = 'content';
- if (receivedFocusFromKeyboard) {
- className += ' keyboard-focus';
- }
- return className;
}
-
});
</script>
« no previous file with comments | « lib/src/paper-dropdown-menu/test/paper-dropdown-menu.html ('k') | lib/src/paper-fab/test/a11y.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698