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

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

Issue 1766433002: Roll Polymer to 1.3.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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-toggle-button/paper-toggle-button.html
diff --git a/third_party/polymer/v1_0/components-chromium/paper-toggle-button/paper-toggle-button.html b/third_party/polymer/v1_0/components-chromium/paper-toggle-button/paper-toggle-button.html
index d511e65f169db714b4c46def9d3e5f1046e090cb..cbdd752002e274f9239fea49b45b98ce1108281f 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-toggle-button/paper-toggle-button.html
+++ b/third_party/polymer/v1_0/components-chromium/paper-toggle-button/paper-toggle-button.html
@@ -10,7 +10,6 @@ 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">
<link rel="import" href="../paper-styles/color.html">
<link rel="import" href="../paper-styles/default-theme.html">
-<link rel="import" href="../paper-ripple/paper-ripple.html">
<link rel="import" href="../paper-behaviors/paper-checked-element-behavior.html">
<!--
@@ -32,9 +31,9 @@ Custom property | Description | Default
`--paper-toggle-button-unchecked-bar-color` | Slider color when the input is not checked | `#000000`
`--paper-toggle-button-unchecked-button-color` | Button color when the input is not checked | `--paper-grey-50`
`--paper-toggle-button-unchecked-ink-color` | Selected/focus ripple color when the input is not checked | `--dark-primary-color`
-`--paper-toggle-button-checked-bar-color` | Slider button color when the input is checked | `--default-primary-color`
-`--paper-toggle-button-checked-button-color` | Button color when the input is checked | `--default-primary-color`
-`--paper-toggle-button-checked-ink-color` | Selected/focus ripple color when the input is checked | `--default-primary-color`
+`--paper-toggle-button-checked-bar-color` | Slider button color when the input is checked | `--primary-color`
+`--paper-toggle-button-checked-button-color` | Button color when the input is checked | `--primary-color`
+`--paper-toggle-button-checked-ink-color` | Selected/focus ripple color when the input is checked | `--primary-color`
`--paper-toggle-button-unchecked-bar` | Mixin applied to the slider when the input is not checked | `{}`
`--paper-toggle-button-unchecked-button` | Mixin applied to the slider button when the input is not checked | `{}`
`--paper-toggle-button-checked-bar` | Mixin applied to the slider when the input is checked | `{}`
@@ -42,6 +41,9 @@ Custom property | Description | Default
`--paper-toggle-button-label-color` | Label color | `--primary-text-color`
`--paper-toggle-button-label-spacing` | Spacing between the label and the button | `8px`
+This element applies the mixin `--paper-font-common-base` but does not import `paper-styles/typography.html`.
+In order to apply the `Roboto` font to this element, make sure you've imported `paper-styles/typography.html`.
+
@group Paper Elements
@element paper-toggle-button
@hero hero.svg
@@ -56,6 +58,7 @@ Custom property | Description | Default
display: inline-block;
@apply(--layout-horizontal);
@apply(--layout-center);
+ @apply(--paper-font-common-base);
}
:host([disabled]) {
@@ -75,6 +78,7 @@ Custom property | Description | Default
opacity: 0.4;
transition: background-color linear .08s;
background-color: var(--paper-toggle-button-unchecked-bar-color, #000000);
+
@apply(--paper-toggle-button-unchecked-bar);
}
@@ -89,6 +93,7 @@ Custom property | Description | Default
transition: transform linear .08s, background-color linear .08s;
will-change: transform;
background-color: var(--paper-toggle-button-unchecked-button-color, --paper-grey-50);
+
@apply(--paper-toggle-button-unchecked-button);
}
@@ -99,7 +104,8 @@ Custom property | Description | Default
:host([checked]:not([disabled])) .toggle-bar {
opacity: 0.5;
- background-color: var(--paper-toggle-button-checked-bar-color, --default-primary-color);
+ background-color: var(--paper-toggle-button-checked-bar-color, --primary-color);
+
@apply(--paper-toggle-button-checked-bar);
}
@@ -114,7 +120,8 @@ Custom property | Description | Default
}
:host([checked]:not([disabled])) .toggle-button {
- background-color: var(--paper-toggle-button-checked-button-color, --default-primary-color);
+ background-color: var(--paper-toggle-button-checked-button-color, --primary-color);
+
@apply(--paper-toggle-button-checked-button);
}
@@ -135,7 +142,7 @@ Custom property | Description | Default
}
:host([checked]) .toggle-ink {
- color: var(--paper-toggle-button-checked-ink-color, --default-primary-color);
+ color: var(--paper-toggle-button-checked-ink-color, --primary-color);
}
.toggle-container {
@@ -153,7 +160,6 @@ Custom property | Description | Default
display: inline-block;
vertical-align: middle;
padding-left: var(--paper-toggle-button-label-spacing, 8px);
- white-space: normal;
pointer-events: none;
color: var(--paper-toggle-button-label-color, --primary-text-color);
}

Powered by Google App Engine
This is Rietveld 408576698