| 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"> | |
| 13 <link rel="import" href="../controls/settings_radio_group.html"> | 12 <link rel="import" href="../controls/settings_radio_group.html"> |
| 14 <link rel="import" href="../controls/settings_toggle_button.html"> | 13 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 15 <link rel="import" href="../route.html"> | 14 <link rel="import" href="../route.html"> |
| 16 <link rel="import" href="../settings_page/settings_animated_pages.html"> | 15 <link rel="import" href="../settings_page/settings_animated_pages.html"> |
| 17 <link rel="import" href="../settings_page/settings_subpage.html"> | 16 <link rel="import" href="../settings_page/settings_subpage.html"> |
| 18 <link rel="import" href="../settings_shared_css.html"> | 17 <link rel="import" href="../settings_shared_css.html"> |
| 19 <link rel="import" href="../settings_vars_css.html"> | 18 <link rel="import" href="../settings_vars_css.html"> |
| 20 <link rel="import" href="appearance_fonts_page.html"> | 19 <link rel="import" href="appearance_fonts_page.html"> |
| 20 <link rel="import" href="home_url_input.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 | 28 |
| 29 #custom-input { | 29 #custom-input { |
| 30 margin-bottom: 1rem; | 30 margin-bottom: 1rem; |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 <controlled-radio-button class="list-item" name="true" | 117 <controlled-radio-button class="list-item" name="true" |
| 118 pref="[[prefs.homepage_is_newtabpage]]" | 118 pref="[[prefs.homepage_is_newtabpage]]" |
| 119 label="$i18n{homePageNtp}" no-extension-indicator> | 119 label="$i18n{homePageNtp}" no-extension-indicator> |
| 120 </controlled-radio-button> | 120 </controlled-radio-button> |
| 121 <controlled-radio-button id="custom-input" class="list-item" | 121 <controlled-radio-button id="custom-input" class="list-item" |
| 122 name="false" pref="[[prefs.homepage_is_newtabpage]]" | 122 name="false" pref="[[prefs.homepage_is_newtabpage]]" |
| 123 no-extension-indicator> | 123 no-extension-indicator> |
| 124 <!-- TODO(dbeam): this can show double indicators when both | 124 <!-- TODO(dbeam): this can show double indicators when both |
| 125 homepage and whether to use the NTP as the homepage are | 125 homepage and whether to use the NTP as the homepage are |
| 126 managed. --> | 126 managed. --> |
| 127 <settings-input id="customHomePage" pref="{{prefs.homepage}}" | 127 <home-url-input id="customHomePage" pref="{{prefs.homepage}}" |
| 128 label="$i18n{enterCustomWebAddress}" | 128 can-tab="[[!prefs.homepage_is_newtabpage.value]]"> |
| 129 can-tab="[[!prefs.homepage_is_newtabpage.value]]" | 129 </home-url-input> |
| 130 no-extension-indicator | |
| 131 error-message="$i18n{notValidWebAddress}" | |
| 132 on-input="validate_" invalid="{{isHomeUrlInvalid_}}"> | |
| 133 </settings-input> | |
| 134 </controlled-radio-button> | 130 </controlled-radio-button> |
| 135 <template is="dom-if" if="[[prefs.homepage.extensionId]]"> | 131 <template is="dom-if" if="[[prefs.homepage.extensionId]]"> |
| 136 <extension-controlled-indicator | 132 <extension-controlled-indicator |
| 137 extension-id="[[prefs.homepage.extensionId]]" | 133 extension-id="[[prefs.homepage.extensionId]]" |
| 138 extension-can-be-disabled="[[ | 134 extension-can-be-disabled="[[ |
| 139 prefs.homepage.extensionCanBeDisabled]]" | 135 prefs.homepage.extensionCanBeDisabled]]" |
| 140 extension-name="[[prefs.homepage.controlledByName]]" | 136 extension-name="[[prefs.homepage.controlledByName]]" |
| 141 on-disable-extension="onDisableExtension_"> | 137 on-disable-extension="onDisableExtension_"> |
| 142 </extension-controlled-indicator> | 138 </extension-controlled-indicator> |
| 143 </template> | 139 </template> |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" | 193 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" |
| 198 page-title="$i18n{customizeFonts}"> | 194 page-title="$i18n{customizeFonts}"> |
| 199 <settings-appearance-fonts-page prefs="{{prefs}}"> | 195 <settings-appearance-fonts-page prefs="{{prefs}}"> |
| 200 </settings-appearance-fonts-page> | 196 </settings-appearance-fonts-page> |
| 201 </settings-subpage> | 197 </settings-subpage> |
| 202 </template> | 198 </template> |
| 203 </settings-animated-pages> | 199 </settings-animated-pages> |
| 204 </template> | 200 </template> |
| 205 <script src="appearance_page.js"></script> | 201 <script src="appearance_page.js"></script> |
| 206 </dom-module> | 202 </dom-module> |
| OLD | NEW |