Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/assert.html"> | 1 <link rel="import" href="chrome://resources/html/assert.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid er.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-slider/paper-slid er.html"> |
| 4 | 4 |
| 5 <dom-module id="cr-slider"> | 5 <dom-module id="cr-slider"> |
| 6 <template> | 6 <template> |
| 7 <style> | 7 <style> |
| 8 :host { | |
| 9 display: inline-flex; | |
| 10 } | |
| 11 | |
| 12 cr-policy-pref-indicator, | |
| 13 paper-slider { | |
| 14 -webkit-margin-start: var(--checkbox-spacing); | |
|
dschuyler
2017/03/07 23:01:11
Imo, checkbox-spacing needs to be renamed. I'm pla
stevenjb
2017/03/07 23:11:48
I'm fine either way, but sgtm.
| |
| 15 align-self: center; | |
| 16 } | |
| 17 | |
| 18 #labels[disabled] { | |
| 19 color: var(--paper-grey-400); | |
| 20 } | |
| 21 | |
| 8 div.outer { | 22 div.outer { |
| 9 align-items: stretch; | 23 align-items: stretch; |
| 10 display: flex; | 24 display: flex; |
| 11 flex-direction: column; | 25 flex-direction: column; |
| 12 margin: 8px 0; | 26 margin: 8px 0; |
| 13 min-width: 200px; | 27 min-width: 200px; |
| 14 } | 28 } |
| 15 | 29 |
| 16 #labels { | 30 #labels { |
| 17 display: flex; | 31 display: flex; |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 34 | 48 |
| 35 paper-slider { | 49 paper-slider { |
| 36 /* Make the slider bar always grey. */ | 50 /* Make the slider bar always grey. */ |
| 37 --paper-slider-active-color: var(--paper-grey-400); | 51 --paper-slider-active-color: var(--paper-grey-400); |
| 38 /* Make the knob always blue. */ | 52 /* Make the knob always blue. */ |
| 39 --paper-slider-knob-start-color: var(--google-blue-700); | 53 --paper-slider-knob-start-color: var(--google-blue-700); |
| 40 --paper-slider-knob-start-border-color: var(--google-blue-700); | 54 --paper-slider-knob-start-border-color: var(--google-blue-700); |
| 41 width: 100%; | 55 width: 100%; |
| 42 } | 56 } |
| 43 </style> | 57 </style> |
| 58 <template is="dom-if" if="[[pref.controlledBy]]" restamp> | |
| 59 <cr-policy-pref-indicator pref="[[pref]]"></cr-policy-pref-indicator> | |
| 60 </template> | |
| 44 <div class="outer"> | 61 <div class="outer"> |
| 45 <paper-slider id="slider" disabled="[[disabled]]" snaps | 62 <paper-slider id="slider" |
| 63 disabled$="[[shouldDisableSlider_(pref.*)]]" snaps | |
| 46 on-immediate-value-changed="onSliderChanged_" max="[[max]]" | 64 on-immediate-value-changed="onSliderChanged_" max="[[max]]" |
| 47 min="[[min]]"> | 65 min="[[min]]"> |
| 48 </paper-slider> | 66 </paper-slider> |
| 49 <div id="labels"> | 67 <div id="labels" disabled$="[[shouldDisableSlider_(pref.*)]]"> |
|
dschuyler
2017/03/07 23:01:11
I'm a bit reluctant to call shouldDisableSlider_ i
stevenjb
2017/03/07 23:11:48
You can use a computed property, e.g. 'disableSlid
dschuyler
2017/03/08 21:50:11
Done.
| |
| 50 <div id="label-begin">[[labelMin]]</div> | 68 <div id="label-begin">[[labelMin]]</div> |
| 51 <div id="label-end">[[labelMax]]</div> | 69 <div id="label-end">[[labelMax]]</div> |
| 52 </div> | 70 </div> |
| 53 </div> | 71 </div> |
| 54 </template> | 72 </template> |
| 55 <script src="chrome://resources/cr_elements/cr_slider/cr_slider.js"></script> | 73 <script src="chrome://resources/cr_elements/cr_slider/cr_slider.js"></script> |
| 56 </dom-module> | 74 </dom-module> |
| OLD | NEW |