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

Unified Diff: ui/webui/resources/cr_elements/cr_slider/cr_slider.html

Issue 2737083002: [MD settings] show icon when slider controlled by something (Closed)
Patch Set: touch up Created 3 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
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..cca2724927ee2237ac9dd406b43cdcbbde9ab6c7 100644
--- a/ui/webui/resources/cr_elements/cr_slider/cr_slider.html
+++ b/ui/webui/resources/cr_elements/cr_slider/cr_slider.html
@@ -5,6 +5,20 @@
<dom-module id="cr-slider">
<template>
<style>
+ :host {
+ display: inline-flex;
+ }
+
+ cr-policy-pref-indicator,
+ paper-slider {
+ -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.
+ 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$="[[shouldDisableSlider_(pref.*)]]" snaps
on-immediate-value-changed="onSliderChanged_" max="[[max]]"
min="[[min]]">
</paper-slider>
- <div id="labels">
+ <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.
<div id="label-begin">[[labelMin]]</div>
<div id="label-end">[[labelMax]]</div>
</div>

Powered by Google App Engine
This is Rietveld 408576698