| Index: ui/webui/resources/cr_elements/cr_slider/cr_slider.html
|
| diff --git a/ui/webui/resources/cr_elements/cr_slider/cr_slider.html b/ui/webui/resources/cr_elements/cr_slider/cr_slider.html
|
| index 890950bff35192b0b2f2dbaf7f8aa15024199950..a3ccd79cd21ddb9b5f2f99e71b99170a889519f9 100644
|
| --- a/ui/webui/resources/cr_elements/cr_slider/cr_slider.html
|
| +++ b/ui/webui/resources/cr_elements/cr_slider/cr_slider.html
|
| @@ -1,10 +1,24 @@
|
| -<link rel="import" href="chrome://resources/html/assert.html">
|
| <link rel="import" href="chrome://resources/html/polymer.html">
|
| +<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_behavior.html">
|
| +<link rel="import" href="chrome://resources/html/assert.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slider.html">
|
|
|
| <dom-module id="cr-slider">
|
| <template>
|
| <style>
|
| + :host {
|
| + display: inline-flex;
|
| + }
|
| +
|
| + cr-policy-pref-indicator {
|
| + -webkit-margin-start: var(--checkbox-spacing);
|
| + align-self: center;
|
| + }
|
| +
|
| + #labels[disabled] {
|
| + color: var(--paper-grey-400);
|
| + }
|
| +
|
| div.outer {
|
| align-items: stretch;
|
| display: flex;
|
| @@ -41,12 +55,16 @@
|
| width: 100%;
|
| }
|
| </style>
|
| + <template is="dom-if" if="[[pref.controlledBy]]" restamp>
|
| + <cr-policy-pref-indicator pref="[[pref]]"></cr-policy-pref-indicator>
|
| + </template>
|
| <div class="outer">
|
| - <paper-slider id="slider" disabled="[[disabled]]" snaps
|
| + <paper-slider id="slider"
|
| + disabled$="[[disabled_]]" snaps
|
| on-immediate-value-changed="onSliderChanged_" max="[[max]]"
|
| min="[[min]]">
|
| </paper-slider>
|
| - <div id="labels">
|
| + <div id="labels" disabled$="[[disabled_]]">
|
| <div id="label-begin">[[labelMin]]</div>
|
| <div id="label-end">[[labelMax]]</div>
|
| </div>
|
|
|