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

Unified Diff: third_party/polymer/v0_8/components/paper-icon-button/paper-icon-button.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-icon-button/paper-icon-button.html
diff --git a/third_party/polymer/v0_8/components/paper-icon-button/paper-icon-button.html b/third_party/polymer/v0_8/components/paper-icon-button/paper-icon-button.html
index 71a1d25b07cd3c3dc3e414c0da77ffc67ccf8c86..99d8d8886e4b0b85d76c95542332f98fbe7a4e27 100644
--- a/third_party/polymer/v0_8/components/paper-icon-button/paper-icon-button.html
+++ b/third_party/polymer/v0_8/components/paper-icon-button/paper-icon-button.html
@@ -8,9 +8,21 @@ 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
-->
-<!--
-@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/iron-flex-layout.html">
+<link rel="import" href="../paper-styles/default-theme.html">
+<link rel="import" href="../paper-behaviors/paper-button-behavior.html">
+<link rel="import" href="../paper-behaviors/paper-radio-button-behavior.html">
+<link rel="import" href="../paper-ripple/paper-ripple.html">
+<style is="custom-style">
+ :root {
+ --paper-icon-button-disabled-text: var(--disabled-text-color);
+ }
+</style>
+
+<!--
Material Design: <a href="http://www.google.com/design/spec/components/buttons.html">Buttons</a>
`paper-icon-button` is a button with an image placed at the center. When the user touches
@@ -31,8 +43,7 @@ Example:
<paper-icon-button icon="favorite"></paper-icon-button>
<paper-icon-button src="star.png"></paper-icon-button>
-Styling
--------
+###Styling
Style the button with CSS as you would a normal DOM element. If you are using the icons
provided by `iron-icons`, they will inherit the foreground color of the button.
@@ -50,25 +61,23 @@ customize the color using this selector:
The opacity of the ripple is not customizable via CSS.
-@element paper-icon-button
-@homepage github.io
--->
+The following custom properties and mixins are available for styling:
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../iron-icon/iron-icon.html">
-<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
-<link rel="import" href="../paper-styles/default-theme.html">
-<link rel="import" href="../paper-behaviors/paper-button-behavior.html">
-<link rel="import" href="../paper-ripple/paper-ripple.html">
+Custom property | Description | Default
+----------------|-------------|----------
+`--paper-icon-button-disabled-text` | The color of the disabled button | `--primary-text-color`
+`--paper-icon-button-ink-color` | Selected/focus ripple color | `--default-primary-color`
+`--paper-icon-button` | Mixin for a button | `{}`
+`--paper-icon-button-disabled` | Mixin for a disabled button | `{}`
-<style is="x-style">
- * {
- --paper-icon-button-disabled-text: var(--disabled-text-color);
- }
-</style>
+@group Paper Elements
+@element paper-icon-button
+@demo demo/index.html
+-->
<dom-module id="paper-icon-button">
<style>
+
:host {
display: inline-block;
position: relative;
@@ -81,19 +90,23 @@ The opacity of the ripple is not customizable via CSS.
cursor: pointer;
z-index: 0;
- mixin(--paper-icon-button);
+ @apply(--paper-icon-button);
+ }
+
+ :host #ink {
+ color: var(--paper-icon-button-ink-color, --primary-text-color);
+ opacity: 0.6;
}
:host([disabled]) {
- color: var(--paper-icon-button-disabled-text);
+ color: var(--paper-icon-button-disabled-text, #fff);
pointer-events: none;
cursor: auto;
-
- mixin(--paper-icon-button-disabled);
+ @apply(--paper-icon-button-disabled);
}
</style>
<template>
- <paper-ripple class="circle" recenters></paper-ripple>
+ <paper-ripple id="ink" class="circle" center></paper-ripple>
<iron-icon id="icon" src="[[src]]" icon="[[icon]]"></iron-icon>
</template>
</dom-module>
@@ -102,11 +115,10 @@ The opacity of the ripple is not customizable via CSS.
is: 'paper-icon-button',
behaviors: [
- Polymer.PaperButtonBehavior
+ Polymer.PaperButtonBehavior,
+ Polymer.PaperRadioButtonBehavior
],
- enableCustomStyleProperties: true,
-
properties: {
/**
* The URL of an image for the icon. If the src property is specified,
@@ -127,4 +139,3 @@ The opacity of the ripple is not customizable via CSS.
}
});
</script>
-

Powered by Google App Engine
This is Rietveld 408576698