| 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 23 matching lines...) Expand all Loading... |
| 34 --paper-input-container: { | 34 --paper-input-container: { |
| 35 width: 200px; | 35 width: 200px; |
| 36 }; | 36 }; |
| 37 width: 100%; /* Pushes policy indicators to end. */ | 37 width: 100%; /* Pushes policy indicators to end. */ |
| 38 } | 38 } |
| 39 </style> | 39 </style> |
| 40 <settings-animated-pages id="pages" section="appearance" | 40 <settings-animated-pages id="pages" section="appearance" |
| 41 focus-config="[[focusConfig_]]"> | 41 focus-config="[[focusConfig_]]"> |
| 42 <neon-animatable route-path="default"> | 42 <neon-animatable route-path="default"> |
| 43 <if expr="chromeos"> | 43 <if expr="chromeos"> |
| 44 <div class="settings-box first two-line" id="wallpaperButton" | 44 <div class="settings-box first two-line" id="setWallpaper" |
| 45 on-tap="openWallpaperManager_" actionable | 45 on-tap="openWallpaperManager_" actionable |
| 46 hidden="[[!pageVisibility.setWallpaper]]"> | 46 hidden="[[!showPage_(pageVisibility.setWallpaper)]]"> |
| 47 <div class="start"> | 47 <div class="start"> |
| 48 $i18n{setWallpaper} | 48 $i18n{setWallpaper} |
| 49 <div class="secondary" id="wallpaperSecondary"> | 49 <div class="secondary" id="wallpaperSecondary"> |
| 50 $i18n{openWallpaperApp} | 50 $i18n{openWallpaperApp} |
| 51 </div> | 51 </div> |
| 52 </div> | 52 </div> |
| 53 <button class="icon-external" is="paper-icon-button-light" | 53 <button class="icon-external" is="paper-icon-button-light" |
| 54 aria-label="$i18n{setWallpaper}" | 54 aria-label="$i18n{setWallpaper}" |
| 55 aria-describedby="wallpaperSecondary"></button> | 55 aria-describedby="wallpaperSecondary"></button> |
| 56 </div> | 56 </div> |
| 57 <div class="settings-box two-line" | 57 <div id="setTheme" class="settings-box two-line" |
| 58 hidden="[[!pageVisibility.setTheme]]"> | 58 hidden="[[!showPage_(pageVisibility.setTheme)]]"> |
| 59 </if> | 59 </if> |
| 60 <if expr="not chromeos"> | 60 <if expr="not chromeos"> |
| 61 <div class="settings-box two-line first" | 61 <div id="setTheme" class="settings-box two-line first" |
| 62 hidden="[[!pageVisibility.setTheme]]"> | 62 hidden="[[!showPage_(pageVisibility.setTheme)]]"> |
| 63 </if> | 63 </if> |
| 64 <a class="start two-line inherit-color no-outline" tabindex="-1" | 64 <a class="start two-line inherit-color no-outline" tabindex="-1" |
| 65 target="_blank" href$="[[getThemeHref_(themeUrl_)]]"> | 65 target="_blank" href$="[[getThemeHref_(themeUrl_)]]"> |
| 66 <div class="flex"> | 66 <div class="flex"> |
| 67 $i18n{themes} | 67 $i18n{themes} |
| 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" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 97 <template is="dom-if" if="[[showUseSystem_( | 97 <template is="dom-if" if="[[showUseSystem_( |
| 98 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> | 98 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> |
| 99 <paper-button id="useSystem" on-tap="onUseSystemTap_" | 99 <paper-button id="useSystem" on-tap="onUseSystemTap_" |
| 100 class="secondary-button"> | 100 class="secondary-button"> |
| 101 $i18n{useSystemTheme} | 101 $i18n{useSystemTheme} |
| 102 </paper-button> | 102 </paper-button> |
| 103 </template> | 103 </template> |
| 104 </div> | 104 </div> |
| 105 </if> | 105 </if> |
| 106 </div> | 106 </div> |
| 107 <div class="settings-box" | 107 <div id="homeButton" class="settings-box" |
| 108 hidden="[[!pageVisibility.homeButton]]"> | 108 hidden="[[!showPage_(pageVisibility.homeButton)]]"> |
| 109 <settings-toggle-button class="start" elide-label | 109 <settings-toggle-button class="start" elide-label |
| 110 pref="{{prefs.browser.show_home_button}}" | 110 pref="{{prefs.browser.show_home_button}}" |
| 111 label="$i18n{showHomeButton}" | 111 label="$i18n{showHomeButton}" |
| 112 sub-label="[[getShowHomeSubLabel_( | 112 sub-label="[[getShowHomeSubLabel_( |
| 113 prefs.browser.show_home_button.value, | 113 prefs.browser.show_home_button.value, |
| 114 prefs.homepage_is_newtabpage.value, | 114 prefs.homepage_is_newtabpage.value, |
| 115 prefs.homepage.value)]]"> | 115 prefs.homepage.value)]]"> |
| 116 </settings-toggle-button> | 116 </settings-toggle-button> |
| 117 </div> | 117 </div> |
| 118 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> | 118 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> |
| 119 <div class="list-frame" hidden="[[!pageVisibility.homeButton]]"> | 119 <div class="list-frame" |
| 120 hidden="[[!showPage_(pageVisibility.homeButton)]]"> |
| 120 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}"> | 121 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}"> |
| 121 <controlled-radio-button class="list-item" name="true" | 122 <controlled-radio-button class="list-item" name="true" |
| 122 pref="[[prefs.homepage_is_newtabpage]]" | 123 pref="[[prefs.homepage_is_newtabpage]]" |
| 123 label="$i18n{homePageNtp}" no-extension-indicator> | 124 label="$i18n{homePageNtp}" no-extension-indicator> |
| 124 </controlled-radio-button> | 125 </controlled-radio-button> |
| 125 <controlled-radio-button id="custom-input" class="list-item" | 126 <controlled-radio-button id="custom-input" class="list-item" |
| 126 name="false" pref="[[prefs.homepage_is_newtabpage]]" | 127 name="false" pref="[[prefs.homepage_is_newtabpage]]" |
| 127 no-extension-indicator> | 128 no-extension-indicator> |
| 128 <!-- TODO(dbeam): this can show double indicators when both | 129 <!-- TODO(dbeam): this can show double indicators when both |
| 129 homepage and whether to use the NTP as the homepage are | 130 homepage and whether to use the NTP as the homepage are |
| 130 managed. --> | 131 managed. --> |
| 131 <home-url-input id="customHomePage" pref="{{prefs.homepage}}" | 132 <home-url-input id="customHomePage" pref="{{prefs.homepage}}" |
| 132 can-tab="[[!prefs.homepage_is_newtabpage.value]]"> | 133 can-tab="[[!prefs.homepage_is_newtabpage.value]]"> |
| 133 </home-url-input> | 134 </home-url-input> |
| 134 </controlled-radio-button> | 135 </controlled-radio-button> |
| 135 <template is="dom-if" if="[[prefs.homepage.extensionId]]"> | 136 <template is="dom-if" if="[[prefs.homepage.extensionId]]"> |
| 136 <extension-controlled-indicator | 137 <extension-controlled-indicator |
| 137 extension-id="[[prefs.homepage.extensionId]]" | 138 extension-id="[[prefs.homepage.extensionId]]" |
| 138 extension-can-be-disabled="[[ | 139 extension-can-be-disabled="[[ |
| 139 prefs.homepage.extensionCanBeDisabled]]" | 140 prefs.homepage.extensionCanBeDisabled]]" |
| 140 extension-name="[[prefs.homepage.controlledByName]]" | 141 extension-name="[[prefs.homepage.controlledByName]]" |
| 141 on-disable-extension="onDisableExtension_"> | 142 on-disable-extension="onDisableExtension_"> |
| 142 </extension-controlled-indicator> | 143 </extension-controlled-indicator> |
| 143 </template> | 144 </template> |
| 144 </settings-radio-group> | 145 </settings-radio-group> |
| 145 </div> | 146 </div> |
| 146 </template> | 147 </template> |
| 147 <div class="settings-box" | 148 <div id="bookmarksBar" class="settings-box" |
| 148 hidden="[[!pageVisibility.bookmarksBar]]"> | 149 hidden="[[!showPage_(pageVisibility.bookmarksBar)]]"> |
| 149 <settings-toggle-button class="start" | 150 <settings-toggle-button class="start" |
| 150 pref="{{prefs.bookmark_bar.show_on_all_tabs}}" | 151 pref="{{prefs.bookmark_bar.show_on_all_tabs}}" |
| 151 label="$i18n{showBookmarksBar}"> | 152 label="$i18n{showBookmarksBar}"> |
| 152 </settings-toggle-button> | 153 </settings-toggle-button> |
| 153 </div> | 154 </div> |
| 154 <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]"> | 155 <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]"> |
| 155 <if expr="is_linux and not chromeos"> | 156 <if expr="is_linux and not chromeos"> |
| 156 <settings-toggle-button class="start" | 157 <settings-toggle-button class="start" |
| 157 pref="{{prefs.browser.custom_chrome_frame}}" | 158 pref="{{prefs.browser.custom_chrome_frame}}" |
| 158 label="$i18n{showWindowDecorations}" | 159 label="$i18n{showWindowDecorations}" |
| 159 inverted> | 160 inverted> |
| 160 </settings-toggle-button> | 161 </settings-toggle-button> |
| 161 </div> | 162 </div> |
| 162 <div class="settings-box"> | 163 <div class="settings-box"> |
| 163 </if> | 164 </if> |
| 164 <div class="start">$i18n{fontSize}</div> | 165 <div class="start">$i18n{fontSize}</div> |
| 165 <settings-dropdown-menu id="defaultFontSize" label="$i18n{fontSize}" | 166 <settings-dropdown-menu id="defaultFontSize" label="$i18n{fontSize}" |
| 166 pref="{{prefs.webkit.webprefs.default_font_size}}" | 167 pref="{{prefs.webkit.webprefs.default_font_size}}" |
| 167 menu-options="[[fontSizeOptions_]]"> | 168 menu-options="[[fontSizeOptions_]]"> |
| 168 </settings-dropdown-menu> | 169 </settings-dropdown-menu> |
| 169 </div> | 170 </div> |
| 170 <div id="customize-fonts-subpage-trigger" class="settings-box" | 171 <div id="customize-fonts-subpage-trigger" class="settings-box" |
| 171 on-tap="onCustomizeFontsTap_" actionable> | 172 on-tap="onCustomizeFontsTap_" actionable> |
| 172 <div class="start"> | 173 <div class="start"> |
| 173 $i18n{customizeFonts} | 174 $i18n{customizeFonts} |
| 174 </div> | 175 </div> |
| 175 <button class="subpage-arrow" is="paper-icon-button-light" | 176 <button class="subpage-arrow" is="paper-icon-button-light" |
| 176 aria-label="$i18n{customizeFonts}"></button> | 177 aria-label="$i18n{customizeFonts}"></button> |
| 177 </div> | 178 </div> |
| 178 <div class="settings-box" hidden="[[!pageVisibility.pageZoom]]"> | 179 <div class="settings-box" |
| 180 hidden="[[!showPage_(pageVisibility.pageZoom)]]"> |
| 179 <div id="pageZoom" class="start">$i18n{pageZoom}</div> | 181 <div id="pageZoom" class="start">$i18n{pageZoom}</div> |
| 180 <div class="md-select-wrapper"> | 182 <div class="md-select-wrapper"> |
| 181 <select id="zoomLevel" class="md-select" aria-labelledby="pageZoom" | 183 <select id="zoomLevel" class="md-select" aria-labelledby="pageZoom" |
| 182 on-change="onZoomLevelChange_"> | 184 on-change="onZoomLevelChange_"> |
| 183 <template is="dom-repeat" items="[[pageZoomLevels_]]"> | 185 <template is="dom-repeat" items="[[pageZoomLevels_]]"> |
| 184 <option value="[[item]]" | 186 <option value="[[item]]" |
| 185 selected="[[zoomValuesEqual_(item, defaultZoom_)]]"> | 187 selected="[[zoomValuesEqual_(item, defaultZoom_)]]"> |
| 186 [[formatZoom_(item)]]% | 188 [[formatZoom_(item)]]% |
| 187 </option> | 189 </option> |
| 188 </template> | 190 </template> |
| 189 </select> | 191 </select> |
| 190 <span class="md-select-underline"></span> | 192 <span class="md-select-underline"></span> |
| 191 </div> | 193 </div> |
| 192 </div> | 194 </div> |
| 193 </neon-animatable> | 195 </neon-animatable> |
| 194 <template is="dom-if" route-path="/fonts"> | 196 <template is="dom-if" route-path="/fonts"> |
| 195 <settings-subpage | 197 <settings-subpage |
| 196 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" | 198 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" |
| 197 page-title="$i18n{customizeFonts}"> | 199 page-title="$i18n{customizeFonts}"> |
| 198 <settings-appearance-fonts-page prefs="{{prefs}}"> | 200 <settings-appearance-fonts-page prefs="{{prefs}}"> |
| 199 </settings-appearance-fonts-page> | 201 </settings-appearance-fonts-page> |
| 200 </settings-subpage> | 202 </settings-subpage> |
| 201 </template> | 203 </template> |
| 202 </settings-animated-pages> | 204 </settings-animated-pages> |
| 203 </template> | 205 </template> |
| 204 <script src="appearance_page.js"></script> | 206 <script src="appearance_page.js"></script> |
| 205 </dom-module> | 207 </dom-module> |
| OLD | NEW |