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/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"> |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 67 <div class="secondary" id="themesSecondary"> | 67 <div class="secondary" id="themesSecondary"> |
| 68 [[themeSublabel_]] | 68 [[themeSublabel_]] |
| 69 </div> | 69 </div> |
| 70 </div> | 70 </div> |
| 71 <button class="icon-external" is="paper-icon-button-light" | 71 <button class="icon-external" is="paper-icon-button-light" |
| 72 aria-label="$i18n{themes}" | 72 aria-label="$i18n{themes}" |
| 73 aria-describedby="themesSecondary"></button> | 73 aria-describedby="themesSecondary"></button> |
| 74 </div> | 74 </div> |
| 75 <if expr="not is_linux or chromeos"> | 75 <if expr="not is_linux or chromeos"> |
| 76 <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> | 76 <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> |
| 77 <div class="secondary-action"> | 77 <div class="separator"></div> |
| 78 <paper-button id="useDefault" on-tap="onUseDefaultTap_" | 78 <paper-button id="useDefault" on-tap="onUseDefaultTap_" |
| 79 class="secondary-button"> | 79 class="secondary-button"> |
| 80 $i18n{resetToDefaultTheme} | 80 $i18n{resetToDefaultTheme} |
| 81 </paper-button> | 81 </paper-button> |
| 82 </div> | |
| 83 </template> | 82 </template> |
| 84 </if> | 83 </if> |
| 85 <if expr="is_linux and not chromeos"> | 84 <if expr="is_linux and not chromeos"> |
| 86 <div class="secondary-action" hidden="[[!showThemesSecondary_( | 85 <div class="layout horizontal center" hidden="[[!showThemesSecondary_( |
| 87 prefs.extensions.theme.id.value, useSystemTheme_)]]"> | 86 prefs.extensions.theme.id.value, useSystemTheme_)]]" |
| 87 id="themesSecondarActions"> | |
|
Dan Beam
2017/05/01 15:32:31
secondary
dschuyler
2017/05/01 19:26:11
Done.
| |
| 88 <div class="separator"></div> | |
| 88 <template is="dom-if" if="[[showUseClassic_( | 89 <template is="dom-if" if="[[showUseClassic_( |
| 89 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> | 90 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> |
| 90 <paper-button id="useDefault" on-tap="onUseDefaultTap_" | 91 <paper-button id="useDefault" on-tap="onUseDefaultTap_" |
| 91 class="secondary-button"> | 92 class="secondary-button"> |
| 92 $i18n{useClassicTheme} | 93 $i18n{useClassicTheme} |
| 93 </paper-button> | 94 </paper-button> |
| 94 </template> | 95 </template> |
| 95 <template is="dom-if" if="[[showUseSystem_( | 96 <template is="dom-if" if="[[showUseSystem_( |
| 96 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> | 97 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> |
| 97 <paper-button id="useSystem" on-tap="onUseSystemTap_" | 98 <paper-button id="useSystem" on-tap="onUseSystemTap_" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 194 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" | 195 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" |
| 195 page-title="$i18n{customizeFonts}"> | 196 page-title="$i18n{customizeFonts}"> |
| 196 <settings-appearance-fonts-page prefs="{{prefs}}"> | 197 <settings-appearance-fonts-page prefs="{{prefs}}"> |
| 197 </settings-appearance-fonts-page> | 198 </settings-appearance-fonts-page> |
| 198 </settings-subpage> | 199 </settings-subpage> |
| 199 </template> | 200 </template> |
| 200 </settings-animated-pages> | 201 </settings-animated-pages> |
| 201 </template> | 202 </template> |
| 202 <script src="appearance_page.js"></script> | 203 <script src="appearance_page.js"></script> |
| 203 </dom-module> | 204 </dom-module> |
| OLD | NEW |