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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1336623003: [MD settings] updating polymer to 1.1.13 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed Polymer.IronCheckedElementBehavior name Created 5 years, 3 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/paper-checkbox.css ('k') | third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox-extracted.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 c98d20c957d6db23b65535c66a9dc995df2dab0c..7c3df09c9941daf1642084013f329365fd5be18d 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
@@ -9,8 +9,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
--><html><head><link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../paper-ripple/paper-ripple.html">
<link rel="import" href="../paper-styles/default-theme.html">
+<link rel="import" href="../paper-styles/color.html">
<link rel="import" href="../paper-behaviors/paper-inky-focus-behavior.html">
-
+<link rel="import" href="../iron-checked-element-behavior/iron-checked-element-behavior.html">
<!--
`paper-checkbox` is a button that can be either checked or unchecked. User
@@ -38,24 +39,171 @@ Custom property | Description | Default
`--paper-checkbox-checked-ink-color` | Selected/focus ripple color when the input is checked | `--default-primary-color`
`--paper-checkbox-checkmark-color` | Checkmark color | `white`
`--paper-checkbox-label-color` | Label color | `--primary-text-color`
+`--paper-checkbox-error-color` | Checkbox color when invalid | `--google-red-500`
@demo demo/index.html
-->
</head><body><dom-module id="paper-checkbox">
- <link rel="import" type="css" href="paper-checkbox.css">
-
<template>
+ <style>
+ :host {
+ display: inline-block;
+ white-space: nowrap;
+ }
+
+ :host(:focus) {
+ outline: none;
+ }
+
+ .hidden {
+ display: none;
+ }
+
+ #checkboxContainer {
+ display: inline-block;
+ position: relative;
+ width: 18px;
+ height: 18px;
+ cursor: pointer;
+ -webkit-transform: translateZ(0);
+ transform: translateZ(0);
+ vertical-align: middle;
+ background-color: var(--paper-checkbox-unchecked-background-color, transparent);
+ }
+
+ :host #ink {
+ position: absolute;
+ top: -15px;
+ left: -15px;
+ width: 48px;
+ height: 48px;
+ color: var(--paper-checkbox-unchecked-ink-color, --primary-text-color);
+ opacity: 0.6;
+ pointer-events: none;
+ }
+
+ :host #ink[checked] {
+ color: var(--paper-checkbox-checked-ink-color, --default-primary-color);
+ }
+
+ :host #checkbox {
+ position: relative;
+ box-sizing: border-box;
+ height: 100%;
+ border: solid 2px;
+ border-color: var(--paper-checkbox-unchecked-color, --primary-text-color);
+ border-radius: 2px;
+ pointer-events: none;
+ -webkit-transition: background-color 140ms, border-color 140ms;
+ transition: background-color 140ms, border-color 140ms;
+ }
+
+ /* checkbox checked animations */
+ #checkbox.checked #checkmark {
+ -webkit-animation: checkmark-expand 140ms ease-out forwards;
+ animation: checkmark-expand 140ms ease-out forwards;
+ }
+
+ @-webkit-keyframes checkmark-expand {
+ 0% {
+ top: 9px;
+ left: 6px;
+ width: 0px;
+ height: 0px;
+ }
+ 100% {
+ top: -1px;
+ left: 4px;
+ width: 5px;
+ height: 10px;
+ }
+ }
+
+ @keyframes checkmark-expand {
+ 0% {
+ top: 9px;
+ left: 6px;
+ width: 0px;
+ height: 0px;
+ }
+ 100% {
+ top: -1px;
+ left: 4px;
+ width: 5px;
+ height: 10px;
+ }
+ }
+
+ :host #checkbox.checked {
+ background-color: var(--paper-checkbox-checked-color, --default-primary-color);
+ border-color: var(--paper-checkbox-checked-color, --default-primary-color);
+ }
+
+ :host #checkmark {
+ -webkit-transform: rotate(45deg);
+ transform: rotate(45deg);
+ position: absolute;
+ top: -1px;
+ left: 4px;
+ width: 5px;
+ height: 10px;
+ border-style: solid;
+ border-top: none;
+ border-left: none;
+ border-right-width: 2px;
+ border-bottom-width: 2px;
+ border-color: var(--paper-checkbox-checkmark-color, white);
+ }
+
+ /* label */
+ #checkboxLabel {
+ position: relative;
+ display: inline-block;
+ vertical-align: middle;
+ padding-left: 8px;
+ white-space: normal;
+ pointer-events: none;
+ color: var(--paper-checkbox-label-color, --primary-text-color);
+ }
+
+ #checkboxLabel[hidden] {
+ display: none;
+ }
+
+ /* disabled state */
+ :host([disabled]) {
+ pointer-events: none;
+ }
+
+ :host([disabled]) #checkbox {
+ opacity: 0.5;
+ border-color: var(--paper-checkbox-unchecked-color, --primary-text-color);
+ }
+
+ :host([disabled][checked]) #checkbox {
+ background-color: var(--paper-checkbox-unchecked-color, --primary-text-color);
+ opacity: 0.5;
+ }
+
+ :host([disabled]) #checkboxLabel {
+ opacity: 0.65;
+ }
+
+ /* invalid state */
+ #checkbox.invalid:not(.checked) {
+ border-color: var(--paper-checkbox-error-color, --google-red-500);
+ }
+ </style>
<div id="checkboxContainer">
<paper-ripple id="ink" class="circle" center="" checked$="[[checked]]"></paper-ripple>
- <div id="checkbox" class$="[[_computeCheckboxClass(checked)]]">
+ <div id="checkbox" class$="[[_computeCheckboxClass(checked, invalid)]]">
<div id="checkmark" class$="[[_computeCheckmarkClass(checked)]]"></div>
</div>
</div>
- <div id="checkboxLabel" aria-hidden="true"><content></content></div>
-
+ <div id="checkboxLabel"><content></content></div>
</template>
</dom-module>
« no previous file with comments | « third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox.css ('k') | third_party/polymer/v1_0/components-chromium/paper-checkbox/paper-checkbox-extracted.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698