Chromium Code Reviews| 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-radio-button/pape r-radio-button.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> |
| 9 <link rel="import" href="/appearance_page/appearance_browser_proxy.html"> | 9 <link rel="import" href="/appearance_page/appearance_browser_proxy.html"> |
| 10 <link rel="import" href="/controls/settings_dropdown_menu.html"> | 10 <link rel="import" href="/controls/settings_dropdown_menu.html"> |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 <style include="settings-shared"> | 23 <style include="settings-shared"> |
| 24 .settings-box iron-icon { | 24 .settings-box iron-icon { |
| 25 -webkit-margin-end: var(--iron-icon-spacing); | 25 -webkit-margin-end: var(--iron-icon-spacing); |
| 26 } | 26 } |
| 27 </style> | 27 </style> |
| 28 <settings-animated-pages id="pages" current-route="{{currentRoute}}" | 28 <settings-animated-pages id="pages" current-route="{{currentRoute}}" |
| 29 section="appearance"> | 29 section="appearance"> |
| 30 <neon-animatable id="main"> | 30 <neon-animatable id="main"> |
| 31 <if expr="chromeos"> | 31 <if expr="chromeos"> |
| 32 <div class="settings-box first two-line" id="wallpaperButton" | 32 <div class="settings-box first two-line" id="wallpaperButton" |
| 33 on-tap="openWallpaperManager_"> | 33 on-tap="openWallpaperManager_" actionable> |
| 34 <iron-icon icon="settings:wallpaper"></iron-icon> | 34 <iron-icon icon="settings:wallpaper"></iron-icon> |
| 35 <div class="start"> | 35 <div class="start"> |
| 36 <div>$i18n{setWallpaper}</div> | 36 <div>$i18n{setWallpaper}</div> |
| 37 <div class="secondary">$i18n{openWallpaperApp}</div> | 37 <div class="secondary">$i18n{openWallpaperApp}</div> |
| 38 </div> | 38 </div> |
| 39 </div> | 39 </div> |
| 40 <div class="settings-box two-line"> | 40 <div class="settings-box two-line"> |
| 41 </if> | 41 </if> |
| 42 <if expr="not chromeos"> | 42 <if expr="not chromeos"> |
| 43 <div class="settings-box two-line first"> | 43 <div class="settings-box two-line first"> |
| 44 </if> | 44 </if> |
| 45 <div class="layout horizontal center flex" | 45 <div class="layout horizontal center flex" |
| 46 on-tap="openThemesGallery_"> | 46 on-tap="openThemesGallery_" actionable> |
| 47 <iron-icon icon="settings:palette"></iron-icon> | 47 <iron-icon icon="settings:palette"></iron-icon> |
| 48 <div> | 48 <div> |
| 49 <div>$i18n{getThemes}</div> | 49 <div>$i18n{getThemes}</div> |
| 50 <div class="secondary">[[themeSublabel_]]</div> | 50 <div class="secondary">[[themeSublabel_]]</div> |
| 51 </div> | 51 </div> |
| 52 </div> | 52 </div> |
| 53 <template is="dom-if" if="[[allowResetTheme_]]"> | 53 <template is="dom-if" if="[[allowResetTheme_]]"> |
| 54 <div class="secondary-action"> | 54 <div class="secondary-action"> |
| 55 <paper-button id="resetTheme" on-tap="resetTheme_" | 55 <paper-button id="resetTheme" on-tap="resetTheme_" actionable |
|
dpapad
2016/06/23 20:51:45
Given that paper-buttons are by default having the
Dan Beam
2016/06/23 21:28:03
no, this is wrong. Reverted.
| |
| 56 class="secondary-button"> | 56 class="secondary-button"> |
| 57 $i18n{resetToDefaultTheme} | 57 $i18n{resetToDefaultTheme} |
| 58 </paper-button> | 58 </paper-button> |
| 59 </div> | 59 </div> |
| 60 </template> | 60 </template> |
| 61 </div> | 61 </div> |
| 62 <div class="settings-box two-line"> | 62 <div class="settings-box two-line"> |
| 63 <settings-checkbox class="start" label="$i18n{showHomeButton}" | 63 <settings-checkbox class="start" label="$i18n{showHomeButton}" |
| 64 sub-label="[[getShowHomeSubLabel_(prefs.homepage_is_newtabpage.val ue, prefs.homepage.value)]]" | 64 sub-label="[[getShowHomeSubLabel_(prefs.homepage_is_newtabpage.val ue, prefs.homepage.value)]]" |
| 65 pref="{{prefs.browser.show_home_button}}"> | 65 pref="{{prefs.browser.show_home_button}}"> |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 85 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> | 85 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> |
| 86 </settings-checkbox> | 86 </settings-checkbox> |
| 87 </div> | 87 </div> |
| 88 <div class="settings-box"> | 88 <div class="settings-box"> |
| 89 <div class="start">$i18n{fontSize}</div> | 89 <div class="start">$i18n{fontSize}</div> |
| 90 <settings-dropdown-menu id="defaultFontSize" | 90 <settings-dropdown-menu id="defaultFontSize" |
| 91 pref="{{prefs.webkit.webprefs.default_font_size}}" | 91 pref="{{prefs.webkit.webprefs.default_font_size}}" |
| 92 menu-options="[[fontSizeOptions_]]" no-label-float> | 92 menu-options="[[fontSizeOptions_]]" no-label-float> |
| 93 </settings-dropdown-menu> | 93 </settings-dropdown-menu> |
| 94 </div> | 94 </div> |
| 95 <div class="settings-box two-line" on-tap="onCustomizeFontsTap_"> | 95 <div class="settings-box two-line" on-tap="onCustomizeFontsTap_" |
| 96 actionable> | |
| 96 <div class="start"> | 97 <div class="start"> |
| 97 <div>$i18n{customizeFonts}</div> | 98 <div>$i18n{customizeFonts}</div> |
| 98 <div class="secondary">$i18n{chooseFontsAndEncoding}</div> | 99 <div class="secondary">$i18n{chooseFontsAndEncoding}</div> |
| 99 </div> | 100 </div> |
| 100 </div> | 101 </div> |
| 101 <div class="settings-box"> | 102 <div class="settings-box"> |
| 102 <div class="start">$i18n{pageZoom}</div> | 103 <div class="start">$i18n{pageZoom}</div> |
| 103 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}" | 104 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}" |
| 104 menu-options="[[pageZoomOptions_]]" no-label-float> | 105 menu-options="[[pageZoomOptions_]]" no-label-float> |
| 105 </settings-dropdown-menu> | 106 </settings-dropdown-menu> |
| 106 </div> | 107 </div> |
| 107 </neon-animatable> | 108 </neon-animatable> |
| 108 <template is="dom-if" name="appearance-fonts"> | 109 <template is="dom-if" name="appearance-fonts"> |
| 109 <settings-subpage page-title="$i18n{customizeFonts}"> | 110 <settings-subpage page-title="$i18n{customizeFonts}"> |
| 110 <settings-appearance-fonts-page prefs="{{prefs}}"> | 111 <settings-appearance-fonts-page prefs="{{prefs}}"> |
| 111 </settings-appearance-fonts-page> | 112 </settings-appearance-fonts-page> |
| 112 </settings-subpage> | 113 </settings-subpage> |
| 113 </template> | 114 </template> |
| 114 </settings-animated-pages> | 115 </settings-animated-pages> |
| 115 </template> | 116 </template> |
| 116 <script src="appearance_page.js"></script> | 117 <script src="appearance_page.js"></script> |
| 117 </dom-module> | 118 </dom-module> |
| OLD | NEW |