Index: third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.html |
diff --git a/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.html b/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.html |
index 57610256ea64d02e5e443681eccb7744f58dabc7..e444196fa06b02e4938b4bfb7246d6ecd8f788a2 100644 |
--- a/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.html |
+++ b/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.html |
@@ -1,11 +1,11 @@ |
<!-- |
@license |
Copyright (c) 2015 The Polymer Project Authors. All rights reserved. |
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE |
-The complete set of authors may be found at http://polymer.github.io/AUTHORS |
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS |
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt |
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt |
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt |
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 |
+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/paper-styles.html"> |
<link rel="import" href="../paper-progress/paper-progress.html"> |
@@ -13,6 +13,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN |
<link rel="import" href="../paper-behaviors/paper-inky-focus-behavior.html"> |
<link rel="import" href="../paper-ripple/paper-ripple.html"> |
<link rel="import" href="../iron-a11y-keys-behavior/iron-a11y-keys-behavior.html"> |
+<link rel="import" href="../iron-range-behavior/iron-range-behavior.html"> |
<link rel="import" href="../iron-form-element-behavior/iron-form-element-behavior.html"> |
<!-- |
@@ -31,49 +32,21 @@ Example: |
<paper-slider min="10" max="200" value="110"></paper-slider> |
-Styling slider: |
+### Styling |
-To change the slider progress bar color: |
+The following custom properties and mixins are available for styling: |
- paper-slider { |
- --paper-slider-active-color: #0f9d58; |
- } |
- |
-To change the slider knob color: |
- |
- paper-slider { |
- --paper-slider-knob-color: #0f9d58; |
- } |
- |
-To change the slider pin color: |
- |
- paper-slider { |
- --paper-slider-pin-color: #0f9d58; |
- } |
- |
-To change the slider pin's font color: |
- |
- paper-slider { |
- --paper-slider-pin-font-color: #0f9d58; |
- } |
- |
-To change the slider secondary progress bar color: |
- |
- paper-slider { |
- --paper-slider-secondary-color: #0f9d58; |
- } |
- |
-To change the slider disabled active color: |
- |
- paper-slider { |
- --paper-slider-disabled-active-color: #ccc; |
- } |
- |
-To change the slider disabled secondary progress bar color: |
- |
- paper-slider { |
- --paper-slider-disabled-secondary-color: #ccc; |
- } |
+Custom property | Description | Default |
+----------------|-------------|---------- |
+`--paper-slider-bar-color` | The background color of the slider | `transparent` |
+`--paper-slider-active-color` | The progress bar color | `--google-blue-700` |
+`--paper-slider-secondary-color` | The secondary progress bar color | `--google-blue-300` |
+`--paper-slider-knob-color` | The knob color | `--google-blue-700` |
+`--paper-slider-disabled-knob-color` | The disabled knob color | `--google-grey-500` |
+`--paper-slider-pin-color` | The pin color | `--google-blue-700` |
+`--paper-slider-font-color` | The pin's text color | `#fff` |
+`--paper-slider-disabled-active-color` | The disabled progress bar color | `--google-grey-500` |
+`--paper-slider-disabled-secondary-color` | The disabled secondary progress bar color | `--google-grey-300` |
@group Paper Elements |
@element paper-slider |
@@ -102,7 +75,7 @@ To change the slider disabled secondary progress bar color: |
</template> |
<div id="sliderKnob" class="center-justified center horizontal layout" on-down="_knobdown" on-up="_resetKnob" on-track="_onTrack" on-transitionend="_knobTransitionEnd"> |
- <paper-ripple id="ink" class="circle" center=""></paper-ripple> |
+ <paper-ripple id="ink" class="circle" center="" hidden$="[[!receivedFocusFromKeyboard]]"></paper-ripple> |
<div id="sliderKnobInner" value$="[[immediateValue]]"></div> |
</div> |
</div> |