Index: chrome/browser/resources/settings/controls/settings_toggle_button.html |
diff --git a/chrome/browser/resources/settings/controls/settings_toggle_button.html b/chrome/browser/resources/settings/controls/settings_toggle_button.html |
index b4bc473a2588da1f30b11b510e1c98a33abef222..160efc67dae02978a9044ddb9e860082f22d8979 100644 |
--- a/chrome/browser/resources/settings/controls/settings_toggle_button.html |
+++ b/chrome/browser/resources/settings/controls/settings_toggle_button.html |
@@ -28,18 +28,16 @@ |
min-height: var(--settings-row-min-height); |
} |
- paper-toggle-button, |
+ #labelWrapper, |
+ ::content .more-actions, |
cr-policy-pref-indicator { |
-webkit-margin-start: var(--settings-control-spacing); |
} |
stevenjb
2017/03/14 20:56:39
This appears to be incorrect:
* .more-actions is n
Dan Beam
2017/03/14 21:53:41
yup, was a merge conflict:
https://codereview.chro
|
- |
- ::content .more-actions { |
- -webkit-margin-end: 10px; |
- } |
</style> |
<div id="outerRow" noSubLabel$="[[!subLabel]]"> |
- <div class="flex" on-tap="onLabelWrapperTap_" |
- actionable$="[[!controlDisabled_(disabled, pref.*)]]"> |
+ <div class="flex" id="labelWrapper" on-tap="onLabelWrapperTap_" |
+ actionable$="[[!controlDisabled_(disabled, pref.*)]]" |
+ hidden="[[!label]]"> |
<div id="label" class="label">[[label]]</div> |
<div class="secondary label">[[subLabel]]</div> |
</div> |