OLD | NEW |
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/iron-icon/iron-icon.htm
l"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior
/iron-resizable-behavior.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior
/iron-resizable-behavior.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable-behavior.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable-behavior.html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp
le.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp
le.html"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi
nner.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi
nner.html"> |
8 <link rel="import" href="../icons.html"> | 8 <link rel="import" href="../icons.html"> |
9 <link rel="import" href="../route.html"> | 9 <link rel="import" href="../route.html"> |
10 <link rel="import" href="settings_subpage_search.html"> | 10 <link rel="import" href="settings_subpage_search.html"> |
11 <link rel="import" href="../settings_shared_css.html"> | 11 <link rel="import" href="../settings_shared_css.html"> |
12 | 12 |
13 <dom-module id="settings-subpage"> | 13 <dom-module id="settings-subpage"> |
14 <template> | 14 <template> |
15 <style include="settings-shared"> | 15 <style include="settings-shared"> |
(...skipping 11 matching lines...) Expand all Loading... |
27 #learnMore { | 27 #learnMore { |
28 @apply(--cr-paper-icon-button-margin); | 28 @apply(--cr-paper-icon-button-margin); |
29 align-items: center; | 29 align-items: center; |
30 display: flex; | 30 display: flex; |
31 height: var(--cr-icon-ripple-size); | 31 height: var(--cr-icon-ripple-size); |
32 justify-content: center; | 32 justify-content: center; |
33 position: relative; /* Needed for paper-ripple. */ | 33 position: relative; /* Needed for paper-ripple. */ |
34 width: var(--cr-icon-ripple-size); | 34 width: var(--cr-icon-ripple-size); |
35 } | 35 } |
36 | 36 |
37 paper-icon-button { | 37 button[is='paper-icon-button-light'] { |
38 /* Centers the ripple on the icon with appropriate margin on right. */ | 38 /* Centers the ripple on the icon with appropriate margin on right. */ |
39 -webkit-margin-end: 10px; | 39 -webkit-margin-end: 10px; |
40 -webkit-margin-start: -10px; | 40 -webkit-margin-start: -10px; |
41 } | 41 } |
42 | 42 |
43 paper-spinner { | 43 paper-spinner { |
44 @apply(--cr-icon-height-width); | 44 @apply(--cr-icon-height-width); |
45 } | 45 } |
46 | 46 |
47 h1 { | 47 h1 { |
48 color: var(--settings-nav-grey); | 48 color: var(--settings-nav-grey); |
49 flex: 1; /* Push other items to the end. */ | 49 flex: 1; /* Push other items to the end. */ |
50 font-size: 107.6923%; /* Go to 14px from 13px */ | 50 font-size: 107.6923%; /* Go to 14px from 13px */ |
51 font-weight: 500; | 51 font-weight: 500; |
52 } | 52 } |
53 | 53 |
54 settings-subpage-search { | 54 settings-subpage-search { |
55 /* Keep normal icon spacing from subpage-title-extra controls. */ | 55 /* Keep normal icon spacing from subpage-title-extra controls. */ |
56 -webkit-margin-start: 16px; | 56 -webkit-margin-start: 16px; |
57 } | 57 } |
58 </style> | 58 </style> |
59 <div class="settings-box first" id="headerLine"> | 59 <div class="settings-box first" id="headerLine"> |
60 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_" | 60 <button is="paper-icon-button-light" on-tap="onTapBack_" |
61 aria-label="$i18n{back}"> | 61 aria-label="$i18n{back}"> |
62 </paper-icon-button> | 62 <iron-icon icon="settings:arrow-back"></iron-icon> |
| 63 </button> |
63 <h1>[[pageTitle]]</h1> | 64 <h1>[[pageTitle]]</h1> |
64 <content select=".subpage-title-extra"></content> | 65 <content select=".subpage-title-extra"></content> |
65 <template is="dom-if" if="[[learnMoreUrl]]"> | 66 <template is="dom-if" if="[[learnMoreUrl]]"> |
66 <a id="learnMore" aria-label="$i18n{learnMore}" | 67 <a id="learnMore" aria-label="$i18n{learnMore}" |
67 href="[[learnMoreUrl]]" target="_blank"> | 68 href="[[learnMoreUrl]]" target="_blank"> |
68 <iron-icon icon="settings:help-outline"></iron-icon> | 69 <iron-icon icon="settings:help-outline"></iron-icon> |
69 <paper-ripple class="circle" center></paper-ripple> | 70 <paper-ripple class="circle" center></paper-ripple> |
70 </a> | 71 </a> |
71 </template> | 72 </template> |
72 <template is="dom-if" if="[[searchLabel]]"> | 73 <template is="dom-if" if="[[searchLabel]]"> |
73 <settings-subpage-search label="[[searchLabel]]" | 74 <settings-subpage-search label="[[searchLabel]]" |
74 on-search-changed="onSearchChanged_"> | 75 on-search-changed="onSearchChanged_"> |
75 </settings-subpage-search> | 76 </settings-subpage-search> |
76 </template> | 77 </template> |
77 <template is="dom-if" if="[[showSpinner]]"> | 78 <template is="dom-if" if="[[showSpinner]]"> |
78 <paper-spinner active></paper-spinner> | 79 <paper-spinner active></paper-spinner> |
79 </template> | 80 </template> |
80 </div> | 81 </div> |
81 <content></content> | 82 <content></content> |
82 </template> | 83 </template> |
83 <script src="settings_subpage.js"></script> | 84 <script src="settings_subpage.js"></script> |
84 </dom-module> | 85 </dom-module> |
OLD | NEW |