OLD | NEW |
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
2 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 2 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
8 <link rel="import" href="appearance_browser_proxy.html"> | 8 <link rel="import" href="appearance_browser_proxy.html"> |
9 <link rel="import" href="../controls/controlled_radio_button.html"> | 9 <link rel="import" href="../controls/controlled_radio_button.html"> |
10 <link rel="import" href="../controls/extension_controlled_indicator.html"> | 10 <link rel="import" href="../controls/extension_controlled_indicator.html"> |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 <div class="secondary" id="themesSecondary"> | 68 <div class="secondary" id="themesSecondary"> |
69 [[themeSublabel_]] | 69 [[themeSublabel_]] |
70 </div> | 70 </div> |
71 </div> | 71 </div> |
72 <button class="icon-external" is="paper-icon-button-light" | 72 <button class="icon-external" is="paper-icon-button-light" |
73 actionable aria-label="$i18n{themes}" | 73 actionable aria-label="$i18n{themes}" |
74 aria-describedby="themesSecondary"></button> | 74 aria-describedby="themesSecondary"></button> |
75 </a> | 75 </a> |
76 <if expr="not is_linux or chromeos"> | 76 <if expr="not is_linux or chromeos"> |
77 <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> | 77 <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> |
78 <div class="secondary-action"> | 78 <div class="separator"></div> |
79 <paper-button id="useDefault" on-tap="onUseDefaultTap_" | 79 <paper-button id="useDefault" on-tap="onUseDefaultTap_" |
80 class="secondary-button"> | 80 class="secondary-button"> |
81 $i18n{resetToDefaultTheme} | 81 $i18n{resetToDefaultTheme} |
82 </paper-button> | 82 </paper-button> |
83 </div> | |
84 </template> | 83 </template> |
85 </if> | 84 </if> |
86 <if expr="is_linux and not chromeos"> | 85 <if expr="is_linux and not chromeos"> |
87 <div class="secondary-action" hidden="[[!showThemesSecondary_( | 86 <div class="layout horizontal center" hidden="[[!showThemesSecondary_( |
88 prefs.extensions.theme.id.value, useSystemTheme_)]]"> | 87 prefs.extensions.theme.id.value, useSystemTheme_)]]" |
| 88 id="themesSecondaryActions"> |
| 89 <div class="separator"></div> |
89 <template is="dom-if" if="[[showUseClassic_( | 90 <template is="dom-if" if="[[showUseClassic_( |
90 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> | 91 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> |
91 <paper-button id="useDefault" on-tap="onUseDefaultTap_" | 92 <paper-button id="useDefault" on-tap="onUseDefaultTap_" |
92 class="secondary-button"> | 93 class="secondary-button"> |
93 $i18n{useClassicTheme} | 94 $i18n{useClassicTheme} |
94 </paper-button> | 95 </paper-button> |
95 </template> | 96 </template> |
96 <template is="dom-if" if="[[showUseSystem_( | 97 <template is="dom-if" if="[[showUseSystem_( |
97 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> | 98 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> |
98 <paper-button id="useSystem" on-tap="onUseSystemTap_" | 99 <paper-button id="useSystem" on-tap="onUseSystemTap_" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 on-tap="onCustomizeFontsTap_" actionable> | 171 on-tap="onCustomizeFontsTap_" actionable> |
171 <div class="start"> | 172 <div class="start"> |
172 $i18n{customizeFonts} | 173 $i18n{customizeFonts} |
173 </div> | 174 </div> |
174 <button class="subpage-arrow" is="paper-icon-button-light" | 175 <button class="subpage-arrow" is="paper-icon-button-light" |
175 aria-label="$i18n{customizeFonts}"></button> | 176 aria-label="$i18n{customizeFonts}"></button> |
176 </div> | 177 </div> |
177 <div class="settings-box" hidden="[[!pageVisibility.pageZoom]]"> | 178 <div class="settings-box" hidden="[[!pageVisibility.pageZoom]]"> |
178 <div id="pageZoom" class="start">$i18n{pageZoom}</div> | 179 <div id="pageZoom" class="start">$i18n{pageZoom}</div> |
179 <div class="md-select-wrapper"> | 180 <div class="md-select-wrapper"> |
180 <select id="zoomLevel" class="md-select" aria-labelledy="pageZoom" | 181 <select id="zoomLevel" class="md-select" aria-labelledby="pageZoom" |
181 on-change="onZoomLevelChange_"> | 182 on-change="onZoomLevelChange_"> |
182 <template is="dom-repeat" items="[[pageZoomLevels_]]"> | 183 <template is="dom-repeat" items="[[pageZoomLevels_]]"> |
183 <option value="[[item]]" | 184 <option value="[[item]]" |
184 selected="[[zoomValuesEqual_(item, defaultZoom_)]]"> | 185 selected="[[zoomValuesEqual_(item, defaultZoom_)]]"> |
185 [[formatZoom_(item)]]% | 186 [[formatZoom_(item)]]% |
186 </option> | 187 </option> |
187 </template> | 188 </template> |
188 </select> | 189 </select> |
189 <span class="md-select-underline"></span> | 190 <span class="md-select-underline"></span> |
190 </div> | 191 </div> |
191 </div> | 192 </div> |
192 </neon-animatable> | 193 </neon-animatable> |
193 <template is="dom-if" route-path="/fonts"> | 194 <template is="dom-if" route-path="/fonts"> |
194 <settings-subpage | 195 <settings-subpage |
195 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" | 196 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" |
196 page-title="$i18n{customizeFonts}"> | 197 page-title="$i18n{customizeFonts}"> |
197 <settings-appearance-fonts-page prefs="{{prefs}}"> | 198 <settings-appearance-fonts-page prefs="{{prefs}}"> |
198 </settings-appearance-fonts-page> | 199 </settings-appearance-fonts-page> |
199 </settings-subpage> | 200 </settings-subpage> |
200 </template> | 201 </template> |
201 </settings-animated-pages> | 202 </settings-animated-pages> |
202 </template> | 203 </template> |
203 <script src="appearance_page.js"></script> | 204 <script src="appearance_page.js"></script> |
204 </dom-module> | 205 </dom-module> |
OLD | NEW |