| 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/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 3 <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-icon/iron-icon.htm
l"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 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="/appearance_page/appearance_browser_proxy.html"> | 8 <link rel="import" href="/appearance_page/appearance_browser_proxy.html"> |
| 8 <link rel="import" href="/controls/controlled_radio_button.html"> | 9 <link rel="import" href="/controls/controlled_radio_button.html"> |
| 9 <link rel="import" href="/controls/settings_dropdown_menu.html"> | 10 <link rel="import" href="/controls/settings_dropdown_menu.html"> |
| 10 <link rel="import" href="/controls/settings_input.html"> | 11 <link rel="import" href="/controls/settings_input.html"> |
| 11 <link rel="import" href="/controls/settings_radio_group.html"> | 12 <link rel="import" href="/controls/settings_radio_group.html"> |
| 12 <link rel="import" href="/icons.html"> | 13 <link rel="import" href="/icons.html"> |
| 13 <link rel="import" href="/route.html"> | 14 <link rel="import" href="/route.html"> |
| 14 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 15 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 15 <link rel="import" href="/settings_page/settings_subpage.html"> | 16 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 16 <link rel="import" href="/settings_shared_css.html"> | 17 <link rel="import" href="/settings_shared_css.html"> |
| 17 <link rel="import" href="appearance_fonts_page.html"> | 18 <link rel="import" href="appearance_fonts_page.html"> |
| 18 | 19 |
| 19 <dom-module id="settings-appearance-page"> | 20 <dom-module id="settings-appearance-page"> |
| 20 <link rel="import" type="css" href="chrome://resources/css/widgets.css"> | |
| 21 <template> | 21 <template> |
| 22 <style include="settings-shared"> | 22 <style include="settings-shared"></style> |
| 23 .settings-box iron-icon { | |
| 24 -webkit-margin-end: var(--iron-icon-spacing); | |
| 25 } | |
| 26 </style> | |
| 27 <settings-animated-pages id="pages" section="appearance"> | 23 <settings-animated-pages id="pages" section="appearance"> |
| 28 <neon-animatable route-path="default"> | 24 <neon-animatable route-path="default"> |
| 29 <if expr="chromeos"> | 25 <if expr="chromeos"> |
| 30 <div class="settings-box first two-line" id="wallpaperButton" | 26 <div class="settings-box first two-line" id="wallpaperButton" |
| 31 on-tap="openWallpaperManager_" actionable | 27 on-tap="openWallpaperManager_" actionable |
| 32 hidden="[[!pageVisibility.setWallpaper]]"> | 28 hidden="[[!pageVisibility.setWallpaper]]"> |
| 33 <iron-icon icon="settings:wallpaper"></iron-icon> | 29 <iron-icon icon="settings:wallpaper"></iron-icon> |
| 34 <div class="start"> | 30 <div class="middle"> |
| 35 <div>$i18n{setWallpaper}</div> | 31 <div>$i18n{setWallpaper}</div> |
| 36 <div class="secondary">$i18n{openWallpaperApp}</div> | 32 <div class="secondary">$i18n{openWallpaperApp}</div> |
| 37 </div> | 33 </div> |
| 34 <button class="icon-external" is="paper-icon-button-light"></button> |
| 38 </div> | 35 </div> |
| 39 <div class="settings-box two-line" | 36 <div class="settings-box two-line" |
| 40 hidden="[[!pageVisibility.setTheme]]"> | 37 hidden="[[!pageVisibility.setTheme]]" |
| 38 on-tap="openThemesGallery_" actionable> |
| 41 </if> | 39 </if> |
| 42 <if expr="not chromeos"> | 40 <if expr="not chromeos"> |
| 43 <div class="settings-box two-line first" | 41 <div class="settings-box two-line first" |
| 44 hidden="[[!pageVisibility.setTheme]]"> | 42 hidden="[[!pageVisibility.setTheme]]" |
| 43 on-tap="openThemesGallery_" actionable> |
| 45 </if> | 44 </if> |
| 46 <div class="layout horizontal center flex" | 45 <iron-icon icon="settings:palette"></iron-icon> |
| 47 on-tap="openThemesGallery_" actionable> | 46 <div class="middle"> |
| 48 <iron-icon icon="settings:palette"></iron-icon> | 47 <div>$i18n{theme}</div> |
| 49 <div> | 48 <div class="secondary">[[themeSublabel_]]</div> |
| 50 <div>$i18n{theme}</div> | |
| 51 <div class="secondary">[[themeSublabel_]]</div> | |
| 52 </div> | |
| 53 </div> | 49 </div> |
| 50 <button class="icon-external" is="paper-icon-button-light"></button> |
| 54 <template is="dom-if" if="[[allowResetTheme_]]"> | 51 <template is="dom-if" if="[[allowResetTheme_]]"> |
| 55 <div class="secondary-action"> | 52 <div class="secondary-action"> |
| 56 <paper-button id="resetTheme" on-tap="resetTheme_" | 53 <paper-button id="resetTheme" on-tap="resetTheme_" |
| 57 class="secondary-button"> | 54 class="secondary-button"> |
| 58 $i18n{resetToDefaultTheme} | 55 $i18n{resetToDefaultTheme} |
| 59 </paper-button> | 56 </paper-button> |
| 60 </div> | 57 </div> |
| 61 </template> | 58 </template> |
| 62 </div> | 59 </div> |
| 63 <div class="settings-box" | 60 <div class="settings-box" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 88 </controlled-radio-button> | 85 </controlled-radio-button> |
| 89 </settings-radio-group> | 86 </settings-radio-group> |
| 90 </div> | 87 </div> |
| 91 </template> | 88 </template> |
| 92 <div class="settings-box" | 89 <div class="settings-box" |
| 93 hidden="[[!pageVisibility.bookmarksBar]]"> | 90 hidden="[[!pageVisibility.bookmarksBar]]"> |
| 94 <settings-checkbox class="start" label="$i18n{showBookmarksBar}" | 91 <settings-checkbox class="start" label="$i18n{showBookmarksBar}" |
| 95 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> | 92 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> |
| 96 </settings-checkbox> | 93 </settings-checkbox> |
| 97 </div> | 94 </div> |
| 98 <div class$="settings-box [[getFirst_( | 95 <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]"> |
| 99 pageVisibility.bookmarksBar)]]"> | |
| 100 <if expr="is_linux and not chromeos"> | 96 <if expr="is_linux and not chromeos"> |
| 101 <settings-checkbox class="start" label="$i18n{showWindowDecorations}" | 97 <settings-checkbox class="start" label="$i18n{showWindowDecorations}" |
| 102 pref="{{prefs.browser.custom_chrome_frame}}" inverted> | 98 pref="{{prefs.browser.custom_chrome_frame}}" inverted> |
| 103 </settings-checkbox> | 99 </settings-checkbox> |
| 104 </div> | 100 </div> |
| 105 <div class="settings-box"> | 101 <div class="settings-box"> |
| 106 </if> | 102 </if> |
| 107 <div class="start">$i18n{fontSize}</div> | 103 <div class="start">$i18n{fontSize}</div> |
| 108 <settings-dropdown-menu id="defaultFontSize" | 104 <settings-dropdown-menu id="defaultFontSize" |
| 109 pref="{{prefs.webkit.webprefs.default_font_size}}" | 105 pref="{{prefs.webkit.webprefs.default_font_size}}" |
| 110 menu-options="[[fontSizeOptions_]]"> | 106 menu-options="[[fontSizeOptions_]]"> |
| 111 </settings-dropdown-menu> | 107 </settings-dropdown-menu> |
| 112 </div> | 108 </div> |
| 113 <div id="customize-fonts-subpage-trigger" | 109 <div id="customize-fonts-subpage-trigger" class="settings-box two-line" |
| 114 class="settings-box two-line single-column" | |
| 115 on-tap="onCustomizeFontsTap_" actionable> | 110 on-tap="onCustomizeFontsTap_" actionable> |
| 116 <div>$i18n{customizeFonts}</div> | 111 <div class="start"> |
| 117 <div class="secondary">$i18n{chooseFonts}</div> | 112 <div>$i18n{customizeFonts}</div> |
| 113 <div class="secondary">$i18n{chooseFonts}</div> |
| 114 </div> |
| 115 <button class="icon-arrow-right" is="paper-icon-button-light"> |
| 116 </button> |
| 118 </div> | 117 </div> |
| 119 <div class="settings-box" | 118 <div class="settings-box" |
| 120 hidden="[[!pageVisibility.pageZoom]]"> | 119 hidden="[[!pageVisibility.pageZoom]]"> |
| 121 <div class="start">$i18n{pageZoom}</div> | 120 <div class="start">$i18n{pageZoom}</div> |
| 122 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}" | 121 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}" |
| 123 menu-options="[[pageZoomOptions_]]"> | 122 menu-options="[[pageZoomOptions_]]"> |
| 124 </settings-dropdown-menu> | 123 </settings-dropdown-menu> |
| 125 </div> | 124 </div> |
| 126 </neon-animatable> | 125 </neon-animatable> |
| 127 <template is="dom-if" route-path="/fonts"> | 126 <template is="dom-if" route-path="/fonts"> |
| 128 <settings-subpage | 127 <settings-subpage |
| 129 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" | 128 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" |
| 130 page-title="$i18n{customizeFonts}"> | 129 page-title="$i18n{customizeFonts}"> |
| 131 <settings-appearance-fonts-page prefs="{{prefs}}"> | 130 <settings-appearance-fonts-page prefs="{{prefs}}"> |
| 132 </settings-appearance-fonts-page> | 131 </settings-appearance-fonts-page> |
| 133 </settings-subpage> | 132 </settings-subpage> |
| 134 </template> | 133 </template> |
| 135 </settings-animated-pages> | 134 </settings-animated-pages> |
| 136 </template> | 135 </template> |
| 137 <script src="appearance_page.js"></script> | 136 <script src="appearance_page.js"></script> |
| 138 </dom-module> | 137 </dom-module> |
| OLD | NEW |