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

Side by Side Diff: chrome/browser/resources/settings/controls/settings_toggle_button.html

Issue 2617533003: MD Settings: change most checkboxes to toggles (leave dialogs alone) (Closed)
Patch Set: fix tests Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
3 <link rel="import" href="/controls/settings_boolean_control_behavior.html"> 3 <link rel="import" href="/controls/settings_boolean_control_behavior.html">
4 <link rel="import" href="/settings_shared_css.html"> 4 <link rel="import" href="/settings_shared_css.html">
5 5
6 <dom-module id="settings-toggle-button"> 6 <dom-module id="settings-toggle-button">
7 <template> 7 <template>
8 <style include="settings-shared"> 8 <style include="settings-shared">
9 #outerRow { 9 #outerRow {
10 align-items: center; 10 align-items: center;
11 display: flex; 11 display: flex;
12 min-height: var(--settings-row-two-line-min-height); 12 min-height: var(--settings-row-two-line-min-height);
13 width: 100%; 13 width: 100%;
14 } 14 }
15 15
16 #outerRow[noSubLabel] { 16 #outerRow[noSubLabel] {
17 min-height: var(--settings-row-min-height); 17 min-height: var(--settings-row-min-height);
18 } 18 }
19 19
20 paper-toggle-button:not([checked]) .secondary { 20 paper-toggle-button:not([checked]) .secondary {
21 @apply(--settings-secondary-unchecked); 21 @apply(--settings-secondary-unchecked);
22 } 22 }
23 23
24 paper-toggle-button,
24 cr-policy-pref-indicator { 25 cr-policy-pref-indicator {
25 -webkit-margin-end: var(--checkbox-spacing); 26 -webkit-margin-start: var(--checkbox-spacing);
27 }
28
29 ::content .more-actions {
30 -webkit-margin-end: 10px;
26 } 31 }
27 </style> 32 </style>
28 <div id="outerRow" noSubLabel$="[[!subLabel]]"> 33 <div id="outerRow" noSubLabel$="[[!subLabel]]">
29 <div class="flex" on-tap="onLabelWrapperTap_" 34 <div class="flex" on-tap="onLabelWrapperTap_"
30 actionable$="[[!controlDisabled_(disabled, pref)]]"> 35 actionable$="[[!controlDisabled_(disabled, pref)]]">
31 <div>[[label]]</div> 36 <div>[[label]]</div>
32 <div class="secondary">[[subLabel]]</div> 37 <div class="secondary">[[subLabel]]</div>
33 </div> 38 </div>
39 <content selector=".more-actions"></content>
34 <template is="dom-if" if="[[pref.controlledBy]]"> 40 <template is="dom-if" if="[[pref.controlledBy]]">
35 <cr-policy-pref-indicator pref="[[pref]]"></cr-policy-pref-indicator> 41 <cr-policy-pref-indicator pref="[[pref]]"></cr-policy-pref-indicator>
36 </template> 42 </template>
37 <paper-toggle-button id="control" checked="{{checked}}" 43 <paper-toggle-button id="control" checked="{{checked}}"
38 disabled="[[controlDisabled_(disabled, pref)]]"> 44 disabled="[[controlDisabled_(disabled, pref)]]">
39 </paper-toggle-button> 45 </paper-toggle-button>
40 </div> 46 </div>
41 </template> 47 </template>
42 <script src="settings_toggle_button.js"></script> 48 <script src="settings_toggle_button.js"></script>
43 </dom-module> 49 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698