| 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"> |
| 11 <link rel="import" href="../controls/settings_dropdown_menu.html"> | 11 <link rel="import" href="../controls/settings_dropdown_menu.html"> |
| 12 <link rel="import" href="../controls/settings_input.html"> | 12 <link rel="import" href="../controls/settings_input.html"> |
| 13 <link rel="import" href="../controls/settings_radio_group.html"> | 13 <link rel="import" href="../controls/settings_radio_group.html"> |
| 14 <link rel="import" href="../controls/settings_toggle_button.html"> | 14 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 15 <link rel="import" href="../route.html"> | 15 <link rel="import" href="../route.html"> |
| 16 <link rel="import" href="../settings_page/settings_animated_pages.html"> | 16 <link rel="import" href="../settings_page/settings_animated_pages.html"> |
| 17 <link rel="import" href="../settings_page/settings_subpage.html"> | 17 <link rel="import" href="../settings_page/settings_subpage.html"> |
| 18 <link rel="import" href="../settings_shared_css.html"> | 18 <link rel="import" href="../settings_shared_css.html"> |
| 19 <link rel="import" href="../settings_vars_css.html"> | 19 <link rel="import" href="../settings_vars_css.html"> |
| 20 <link rel="import" href="appearance_fonts_page.html"> | 20 <link rel="import" href="appearance_fonts_page.html"> |
| 21 | 21 |
| 22 <dom-module id="settings-appearance-page"> | 22 <dom-module id="settings-appearance-page"> |
| 23 <template> | 23 <template> |
| 24 <style include="settings-shared md-select"> | 24 <style include="settings-shared md-select"> |
| 25 .secondary-button ~ .secondary-button { | 25 .secondary-button ~ .secondary-button { |
| 26 -webkit-margin-start: 12px; | 26 -webkit-margin-start: 12px; |
| 27 } | 27 } |
| 28 |
| 29 #customHomePage { |
| 30 width: 200px; |
| 31 } |
| 28 </style> | 32 </style> |
| 29 <settings-animated-pages id="pages" section="appearance"> | 33 <settings-animated-pages id="pages" section="appearance"> |
| 30 <neon-animatable route-path="default"> | 34 <neon-animatable route-path="default"> |
| 31 <if expr="chromeos"> | 35 <if expr="chromeos"> |
| 32 <div class="settings-box first two-line" id="wallpaperButton" | 36 <div class="settings-box first two-line" id="wallpaperButton" |
| 33 on-tap="openWallpaperManager_" actionable | 37 on-tap="openWallpaperManager_" actionable |
| 34 hidden="[[!pageVisibility.setWallpaper]]"> | 38 hidden="[[!pageVisibility.setWallpaper]]"> |
| 35 <div class="start"> | 39 <div class="start"> |
| 36 $i18n{setWallpaper} | 40 $i18n{setWallpaper} |
| 37 <div class="secondary" id="wallpaperSecondary"> | 41 <div class="secondary" id="wallpaperSecondary"> |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 </template> | 93 </template> |
| 90 </div> | 94 </div> |
| 91 </if> | 95 </if> |
| 92 </div> | 96 </div> |
| 93 <div class="settings-box" | 97 <div class="settings-box" |
| 94 hidden="[[!pageVisibility.homeButton]]"> | 98 hidden="[[!pageVisibility.homeButton]]"> |
| 95 <settings-toggle-button class="start" elide-label | 99 <settings-toggle-button class="start" elide-label |
| 96 pref="{{prefs.browser.show_home_button}}" | 100 pref="{{prefs.browser.show_home_button}}" |
| 97 label="$i18n{showHomeButton}" | 101 label="$i18n{showHomeButton}" |
| 98 sub-label="[[getShowHomeSubLabel_( | 102 sub-label="[[getShowHomeSubLabel_( |
| 99 prefs.homepage_is_newtabpage.value, prefs.homepage.value)]]"> | 103 prefs.browser.show_home_button.value, |
| 104 prefs.homepage_is_newtabpage.value, |
| 105 prefs.homepage.value)]]"> |
| 100 </settings-toggle-button> | 106 </settings-toggle-button> |
| 101 </div> | 107 </div> |
| 102 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> | 108 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> |
| 103 <div class="list-frame" | 109 <div class="list-frame" hidden="[[!pageVisibility.homeButton]]"> |
| 104 hidden="[[!pageVisibility.homeButton]]"> | |
| 105 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}"> | 110 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}"> |
| 106 <controlled-radio-button class="list-item" name="true" | 111 <controlled-radio-button class="list-item" name="true" |
| 107 pref="[[prefs.homepage_is_newtabpage]]" | 112 pref="[[prefs.homepage_is_newtabpage]]" |
| 108 label="$i18n{homePageNtp}" no-extension-indicator> | 113 label="$i18n{homePageNtp}" no-extension-indicator> |
| 109 </controlled-radio-button> | 114 </controlled-radio-button> |
| 110 <controlled-radio-button class="list-item" name="false" | 115 <controlled-radio-button class="list-item" name="false" |
| 111 pref="[[prefs.homepage_is_newtabpage]]" label="$i18n{other}" | 116 pref="[[prefs.homepage_is_newtabpage]]" |
| 112 no-extension-indicator> | 117 no-extension-indicator> |
| 113 <!-- TODO(dbeam): this can show double indicators when both | 118 <!-- TODO(dbeam): this can show double indicators when both |
| 114 homepage and whether to use the NTP as the homepage are | 119 homepage and whether to use the NTP as the homepage are |
| 115 managed. --> | 120 managed. --> |
| 116 <settings-input no-label-float pref="{{prefs.homepage}}" | 121 <settings-input id="customHomePage" |
| 117 label="$i18n{exampleDotCom}" | 122 no-label-float pref="{{prefs.homepage}}" |
| 123 label="$i18n{enterCustomWebAddress}" |
| 118 can-tab="[[!prefs.homepage_is_newtabpage.value]]" | 124 can-tab="[[!prefs.homepage_is_newtabpage.value]]" |
| 119 stop-keyboard-event-propagation no-extension-indicator> | 125 stop-keyboard-event-propagation no-extension-indicator> |
| 120 </settings-input> | 126 </settings-input> |
| 121 </controlled-radio-button> | 127 </controlled-radio-button> |
| 122 <template is="dom-if" if="[[prefs.homepage.extensionId]]"> | 128 <template is="dom-if" if="[[prefs.homepage.extensionId]]"> |
| 123 <extension-controlled-indicator | 129 <extension-controlled-indicator |
| 124 extension-id="[[prefs.homepage.extensionId]]" | 130 extension-id="[[prefs.homepage.extensionId]]" |
| 125 extension-can-be-disabled="[[ | 131 extension-can-be-disabled="[[ |
| 126 prefs.homepage.extensionCanBeDisabled]]" | 132 prefs.homepage.extensionCanBeDisabled]]" |
| 127 extension-name="[[prefs.homepage.controlledByName]]" | 133 extension-name="[[prefs.homepage.controlledByName]]" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" | 190 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" |
| 185 page-title="$i18n{customizeFonts}"> | 191 page-title="$i18n{customizeFonts}"> |
| 186 <settings-appearance-fonts-page prefs="{{prefs}}"> | 192 <settings-appearance-fonts-page prefs="{{prefs}}"> |
| 187 </settings-appearance-fonts-page> | 193 </settings-appearance-fonts-page> |
| 188 </settings-subpage> | 194 </settings-subpage> |
| 189 </template> | 195 </template> |
| 190 </settings-animated-pages> | 196 </settings-animated-pages> |
| 191 </template> | 197 </template> |
| 192 <script src="appearance_page.js"></script> | 198 <script src="appearance_page.js"></script> |
| 193 </dom-module> | 199 </dom-module> |
| OLD | NEW |