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

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

Issue 2829373003: [MD settings] change spacing between controlledBy icon and control (Closed)
Patch Set: merge with master Created 3 years, 7 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
« no previous file with comments | « no previous file | ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_search_field.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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="pref_control_behavior.html"> 6 <link rel="import" href="pref_control_behavior.html">
7 <link rel="import" href="../i18n_setup.html"> 7 <link rel="import" href="../i18n_setup.html">
8 <link rel="import" href="../settings_shared_css.html"> 8 <link rel="import" href="../settings_shared_css.html">
9 9
10 <dom-module id="controlled-button"> 10 <dom-module id="controlled-button">
(...skipping 11 matching lines...) Expand all
22 pointer-events: none; 22 pointer-events: none;
23 } 23 }
24 24
25 cr-policy-pref-indicator { 25 cr-policy-pref-indicator {
26 /* Enable pointer events for the indicator so :hover works. Disable 26 /* Enable pointer events for the indicator so :hover works. Disable
27 * clicks/taps via onIndicatorTap_ so outer on-tap doesn't trigger. */ 27 * clicks/taps via onIndicatorTap_ so outer on-tap doesn't trigger. */
28 pointer-events: all; 28 pointer-events: all;
29 } 29 }
30 30
31 :host(:not([end-justified])) cr-policy-pref-indicator { 31 :host(:not([end-justified])) cr-policy-pref-indicator {
32 -webkit-margin-start: var(--justify-margin); 32 -webkit-margin-end: calc(
33 var(--cr-control-spacing) - var(--justify-margin));
34 -webkit-margin-start: var(--cr-control-spacing);
33 } 35 }
34 36
35 :host([end-justified]) cr-policy-pref-indicator { 37 :host([end-justified]) cr-policy-pref-indicator {
36 -webkit-margin-end: var(--justify-margin); 38 -webkit-margin-end: var(--cr-control-spacing);
39 -webkit-margin-start: calc(
40 var(--cr-control-spacing) - var(--justify-margin));
37 order: -1; 41 order: -1;
38 } 42 }
39 </style> 43 </style>
40 44
41 <paper-button disabled="[[enforced_]]">[[label]]</paper-button> 45 <paper-button disabled="[[enforced_]]">[[label]]</paper-button>
42 46
43 <template is="dom-if" if="[[hasPrefPolicyIndicator(pref.*)]]" restamp> 47 <template is="dom-if" if="[[hasPrefPolicyIndicator(pref.*)]]" restamp>
44 <cr-policy-pref-indicator pref="[[pref]]" on-tap="onIndicatorTap_" 48 <cr-policy-pref-indicator pref="[[pref]]" on-tap="onIndicatorTap_"
45 icon-aria-label="[[label]]"> 49 icon-aria-label="[[label]]">
46 </cr-policy-pref-indicator> 50 </cr-policy-pref-indicator>
47 </template> 51 </template>
48 52
49 </template> 53 </template>
50 <script src="controlled_button.js"></script> 54 <script src="controlled_button.js"></script>
51 </dom-module> 55 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_search_field.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698