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-button/paper-butt on.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_be havior.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_be havior.html"> |
5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> |
6 <link rel="import" href="/controls/pref_control_behavior.html"> | 6 <link rel="import" href="/controls/pref_control_behavior.html"> |
7 <link rel="import" href="/settings_shared_css.html"> | 7 <link rel="import" href="/settings_shared_css.html"> |
8 | 8 |
9 <dom-module id="controlled-button"> | 9 <dom-module id="controlled-button"> |
10 <template> | 10 <template> |
11 <style include="settings-shared"> | 11 <style include="settings-shared"> |
12 :host { | 12 :host { |
13 align-items: center; | 13 align-items: center; |
14 display: flex; | 14 display: flex; |
15 --justify-margin: 18px; | |
15 } | 16 } |
16 | 17 |
17 :host([controlled_]) { | 18 :host([controlled_]) { |
18 /* Disable pointer events for this whole element, as outer on-tap gets | 19 /* Disable pointer events for this whole element, as outer on-tap gets |
19 * triggered when clicking/tapping anywhere in :host. */ | 20 * triggered when clicking/tapping anywhere in :host. */ |
20 pointer-events: none; | 21 pointer-events: none; |
21 } | 22 } |
22 | 23 |
23 cr-policy-pref-indicator { | 24 cr-policy-pref-indicator { |
24 -webkit-margin-start: var(--checkbox-spacing); | |
25 /* Enable pointer events for the indicator so :hover works. Disable | 25 /* Enable pointer events for the indicator so :hover works. Disable |
26 * clicks/taps via onIndicatorTap_ so outer on-tap doesn't trigger. */ | 26 * clicks/taps via onIndicatorTap_ so outer on-tap doesn't trigger. */ |
27 pointer-events: all; | 27 pointer-events: all; |
28 } | 28 } |
29 | |
30 :host(:not([end-justified])) cr-policy-pref-indicator { | |
31 -webkit-margin-start: var(--justify-margin); | |
32 } | |
33 | |
34 :host([end-justified]) cr-policy-pref-indicator { | |
35 -webkit-margin-end: var(--justify-margin); | |
36 order: -1; | |
dschuyler
2017/01/07 02:12:20
I'm not familiar with order: -1 to be sure it's co
Dan Beam
2017/01/07 02:14:18
trust me, it's magical
| |
37 } | |
29 </style> | 38 </style> |
30 | 39 |
31 <paper-button disabled="[[controlled_]]"> | 40 <paper-button disabled="[[controlled_]]"> |
32 <content></content> | 41 <content></content> |
33 </paper-button> | 42 </paper-button> |
34 | 43 |
35 <template is="dom-if" if="[[controlled_]]"> | 44 <template is="dom-if" if="[[controlled_]]"> |
36 <cr-policy-pref-indicator pref="[[pref]]" on-tap="onIndicatorTap_"> | 45 <cr-policy-pref-indicator pref="[[pref]]" on-tap="onIndicatorTap_"> |
37 </cr-policy-pref-indicator> | 46 </cr-policy-pref-indicator> |
38 </template> | 47 </template> |
39 | 48 |
40 </template> | 49 </template> |
41 <script src="/controls/controlled_button.js"></script> | 50 <script src="/controls/controlled_button.js"></script> |
42 </dom-module> | 51 </dom-module> |
OLD | NEW |