third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox.html - Issue 1766433002: Roll Polymer to 1.3.1

Unified Diff: third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox.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

« no previous file with comments | « third_party/polymer/v1_0/components-chromium/paper-checkbox/bower.json ('k') | third_party/polymer/v1_0/components-chromium/paper-dialog-behavior/.bower.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox.html

diff --git a/third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox.html b/third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox.html

index 4ef8a47cec3e6578dcd6ee7ec2b9168342c90b68..caba70f2892f2f7dd6b72a3925cfae6c2e0fc333 100644

--- a/third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox.html

+++ b/third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox.html

@@ -8,7 +8,6 @@ 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

--><html><head><link rel="import" href="../polymer/polymer.html">

-<link rel="import" href="../paper-styles/color.html">

<!--

@@ -40,7 +39,7 @@ Custom property | Description | Default

`--paper-checkbox-checkmark-color` | Checkmark color | `white`

`--paper-checkbox-label-color` | Label color | `--primary-text-color`

`--paper-checkbox-label-spacing` | Spacing between the label and the checkbox | `8px`

-`--paper-checkbox-error-color` | Checkbox color when invalid | `--google-red-500`

+`--paper-checkbox-error-color` | Checkbox color when invalid | `--error-color`

`--paper-checkbox-size` | Size of the checkbox | `18px`

This element applies the mixin `--paper-font-common-base` but does not import `paper-styles/typography.html`.

@@ -58,6 +57,7 @@ In order to apply the `Roboto` font to this element, make sure you've imported `

cursor: pointer;

--calculated-paper-checkbox-size: var(--paper-checkbox-size, 18px);

@apply(--paper-font-common-base);

+ line-height: 0;

}

:host(:focus) {

@@ -169,7 +169,7 @@ In order to apply the `Roboto` font to this element, make sure you've imported `

vertical-align: middle;

padding-left: var(--paper-checkbox-label-spacing, 8px);

white-space: normal;

- pointer-events: none;

+ line-height: normal;

color: var(--paper-checkbox-label-color, --primary-text-color);

}

@@ -183,9 +183,6 @@ In order to apply the `Roboto` font to this element, make sure you've imported `

}

/* disabled state */

- :host([disabled]) {

- pointer-events: none;

- }

:host([disabled]) #checkbox {

opacity: 0.5;

@@ -203,7 +200,7 @@ In order to apply the `Roboto` font to this element, make sure you've imported `

/* invalid state */

#checkbox.invalid:not(.checked) {

- border-color: var(--paper-checkbox-error-color, --google-red-500);

+ border-color: var(--paper-checkbox-error-color, --error-color);

}

</style>