chrome/browser/resources/settings/controls/controlled_button.html - Issue 2668163002: MD Settings: Fix styles in several places.

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

Issue 2668163002: MD Settings: Fix styles in several places. (Closed)

Patch Set: remove rule-line on spell check page Created 3 years, 10 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:

« no previous file with comments | « no previous file | chrome/browser/resources/settings/controls/controlled_button.js » ('j') | chrome/browser/resources/settings/downloads_page/downloads_page.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_indicat or_behavior.html">	4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat or_behavior.html">

5 <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_be havior.html">

6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">	6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">

7 <link rel="import" href="pref_control_behavior.html">	7 <link rel="import" href="pref_control_behavior.html">

8 <link rel="import" href="../i18n_setup.html">	8 <link rel="import" href="../i18n_setup.html">

9 <link rel="import" href="../settings_shared_css.html">	9 <link rel="import" href="../settings_shared_css.html">

10	10

(...skipping 21 matching lines...) Expand all Loading...
32 :host(:not([end-justified])) cr-policy-pref-indicator {	32 :host(:not([end-justified])) cr-policy-pref-indicator {

33 -webkit-margin-start: var(--justify-margin);	33 -webkit-margin-start: var(--justify-margin);

34 }	34 }

35	35

36 :host([end-justified]) cr-policy-pref-indicator {	36 :host([end-justified]) cr-policy-pref-indicator {

37 -webkit-margin-end: var(--justify-margin);	37 -webkit-margin-end: var(--justify-margin);

38 order: -1;	38 order: -1;

39 }	39 }

40 </style>	40 </style>

41	41

42 <paper-button disabled="[[controlled_]]">	42 <template is="dom-if" if="[[iconClass]]">
	tommycli 2017/02/01 22:54:48 The controlled-button changes seem odd. I think yo The controlled-button changes seem odd. I think you should break it out into a separate CL... so I can approve the rest of this one.
43 <content></content>	43 <button is="paper-icon-button-light" disabled="[[controlled_]]"

44 </paper-button>	44 actionable class$="{{iconClass}}"></button>

	45 </template>

	46

	47 <template is="dom-if" if="[[!iconClass]]">

	48 <paper-button disabled="[[controlled_]]">

	49 <content></content>

	50 </paper-button>

	51 </template>

45	52

46 <template is="dom-if" if="[[showIndicator_(pref)]]" restamp>	53 <template is="dom-if" if="[[showIndicator_(pref)]]" restamp>

47 <cr-policy-pref-indicator pref="[[pref]]" on-tap="onIndicatorTap_">	54 <cr-policy-pref-indicator pref="[[pref]]" on-tap="onIndicatorTap_">

48 </cr-policy-pref-indicator>	55 </cr-policy-pref-indicator>

49 </template>	56 </template>

50	57

51 </template>	58 </template>

52 <script src="controlled_button.js"></script>	59 <script src="controlled_button.js"></script>

53 </dom-module>	60 </dom-module>

OLD	NEW