| 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/classe
s/iron-flex-layout.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.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 23 matching lines...) Expand all Loading... |
| 34 } | 34 } |
| 35 </style> | 35 </style> |
| 36 <settings-animated-pages id="pages" section="appearance"> | 36 <settings-animated-pages id="pages" section="appearance"> |
| 37 <neon-animatable route-path="default"> | 37 <neon-animatable route-path="default"> |
| 38 <if expr="chromeos"> | 38 <if expr="chromeos"> |
| 39 <div class="settings-box first two-line" id="wallpaperButton" | 39 <div class="settings-box first two-line" id="wallpaperButton" |
| 40 on-tap="openWallpaperManager_" actionable | 40 on-tap="openWallpaperManager_" actionable |
| 41 hidden="[[!pageVisibility.setWallpaper]]"> | 41 hidden="[[!pageVisibility.setWallpaper]]"> |
| 42 <div class="start"> | 42 <div class="start"> |
| 43 $i18n{setWallpaper} | 43 $i18n{setWallpaper} |
| 44 <div class="secondary">$i18n{openWallpaperApp}</div> | 44 <div class="secondary" id="wallpaperSecondary"> |
| 45 $i18n{openWallpaperApp} |
| 46 </div> |
| 45 </div> | 47 </div> |
| 46 <button class="icon-external" is="paper-icon-button-light"></button> | 48 <button class="icon-external" is="paper-icon-button-light" |
| 49 aria-label="$i18n{setWallpaper}" |
| 50 aria-describedby="wallpaperSecondary"></button> |
| 47 </div> | 51 </div> |
| 48 <div class="settings-box two-line" | 52 <div class="settings-box two-line" |
| 49 hidden="[[!pageVisibility.setTheme]]"> | 53 hidden="[[!pageVisibility.setTheme]]"> |
| 50 </if> | 54 </if> |
| 51 <if expr="not chromeos"> | 55 <if expr="not chromeos"> |
| 52 <div class="settings-box two-line first" | 56 <div class="settings-box two-line first" |
| 53 hidden="[[!pageVisibility.setTheme]]"> | 57 hidden="[[!pageVisibility.setTheme]]"> |
| 54 </if> | 58 </if> |
| 55 <div class="start two-line" on-tap="onThemesTap_" actionable> | 59 <div class="start two-line" on-tap="onThemesTap_" actionable> |
| 56 <div class="flex"> | 60 <div class="flex"> |
| 57 <div>$i18n{themes}</div> | 61 $i18n{themes} |
| 58 <div class="secondary">[[themeSublabel_]]</div> | 62 <div class="secondary" id="themesSecondary"> |
| 63 [[themeSublabel_]] |
| 64 </div> |
| 59 </div> | 65 </div> |
| 60 <button class="icon-external" is="paper-icon-button-light"></button> | 66 <button class="icon-external" is="paper-icon-button-light" |
| 67 aria-label="$i18n{themes}" |
| 68 aria-describedby="themesSecondary"></button> |
| 61 </div> | 69 </div> |
| 62 <if expr="not is_linux or chromeos"> | 70 <if expr="not is_linux or chromeos"> |
| 63 <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> | 71 <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> |
| 64 <div class="secondary-action"> | 72 <div class="secondary-action"> |
| 65 <paper-button id="useDefault" on-tap="onUseDefaultTap_" | 73 <paper-button id="useDefault" on-tap="onUseDefaultTap_" |
| 66 class="secondary-button"> | 74 class="secondary-button"> |
| 67 $i18n{resetToDefaultTheme} | 75 $i18n{resetToDefaultTheme} |
| 68 </paper-button> | 76 </paper-button> |
| 69 </div> | 77 </div> |
| 70 </template> | 78 </template> |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 </if> | 157 </if> |
| 150 <div class="start">$i18n{fontSize}</div> | 158 <div class="start">$i18n{fontSize}</div> |
| 151 <settings-dropdown-menu id="defaultFontSize" | 159 <settings-dropdown-menu id="defaultFontSize" |
| 152 pref="{{prefs.webkit.webprefs.default_font_size}}" | 160 pref="{{prefs.webkit.webprefs.default_font_size}}" |
| 153 menu-options="[[fontSizeOptions_]]"> | 161 menu-options="[[fontSizeOptions_]]"> |
| 154 </settings-dropdown-menu> | 162 </settings-dropdown-menu> |
| 155 </div> | 163 </div> |
| 156 <div id="customize-fonts-subpage-trigger" class="settings-box two-line" | 164 <div id="customize-fonts-subpage-trigger" class="settings-box two-line" |
| 157 on-tap="onCustomizeFontsTap_" actionable> | 165 on-tap="onCustomizeFontsTap_" actionable> |
| 158 <div class="start"> | 166 <div class="start"> |
| 159 <div>$i18n{customizeFonts}</div> | 167 $i18n{customizeFonts} |
| 160 <div class="secondary">$i18n{chooseFonts}</div> | 168 <div class="secondary" id="fontsSecondary">$i18n{chooseFonts}</div> |
| 161 </div> | 169 </div> |
| 162 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 170 <button class="subpage-arrow" is="paper-icon-button-light" |
| 171 aria-label="$i18n{customizeFonts}" |
| 172 aria-describedby="fontsSecondary"></button> |
| 163 </div> | 173 </div> |
| 164 <div class="settings-box" | 174 <div class="settings-box" |
| 165 hidden="[[!pageVisibility.pageZoom]]"> | 175 hidden="[[!pageVisibility.pageZoom]]"> |
| 166 <div class="start">$i18n{pageZoom}</div> | 176 <div class="start">$i18n{pageZoom}</div> |
| 167 <div class="md-select-wrapper"> | 177 <div class="md-select-wrapper"> |
| 168 <select id="zoomLevel" class="md-select" | 178 <select id="zoomLevel" class="md-select" |
| 169 on-change="onZoomLevelChange_"> | 179 on-change="onZoomLevelChange_"> |
| 170 <template is="dom-repeat" items="[[pageZoomLevels_]]"> | 180 <template is="dom-repeat" items="[[pageZoomLevels_]]"> |
| 171 <option value="[[item]]" | 181 <option value="[[item]]" |
| 172 selected$="[[zoomValuesEqual_(item, defaultZoom_)]]"> | 182 selected$="[[zoomValuesEqual_(item, defaultZoom_)]]"> |
| (...skipping 10 matching lines...) Expand all Loading... |
| 183 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" | 193 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" |
| 184 page-title="$i18n{customizeFonts}"> | 194 page-title="$i18n{customizeFonts}"> |
| 185 <settings-appearance-fonts-page prefs="{{prefs}}"> | 195 <settings-appearance-fonts-page prefs="{{prefs}}"> |
| 186 </settings-appearance-fonts-page> | 196 </settings-appearance-fonts-page> |
| 187 </settings-subpage> | 197 </settings-subpage> |
| 188 </template> | 198 </template> |
| 189 </settings-animated-pages> | 199 </settings-animated-pages> |
| 190 </template> | 200 </template> |
| 191 <script src="appearance_page.js"></script> | 201 <script src="appearance_page.js"></script> |
| 192 </dom-module> | 202 </dom-module> |
| OLD | NEW |