Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: chrome/browser/resources/settings/appearance_page/appearance_page.html

Issue 2390553004: [MD settings] remove icons from wallpaper and themes rows; avoid opening theme page on reset (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/icons.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="/appearance_page/appearance_browser_proxy.html"> 8 <link rel="import" href="/appearance_page/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/settings_dropdown_menu.html"> 10 <link rel="import" href="/controls/settings_dropdown_menu.html">
11 <link rel="import" href="/controls/settings_input.html"> 11 <link rel="import" href="/controls/settings_input.html">
12 <link rel="import" href="/controls/settings_radio_group.html"> 12 <link rel="import" href="/controls/settings_radio_group.html">
13 <link rel="import" href="/icons.html"> 13 <link rel="import" href="/icons.html">
14 <link rel="import" href="/route.html"> 14 <link rel="import" href="/route.html">
15 <link rel="import" href="/settings_page/settings_animated_pages.html"> 15 <link rel="import" href="/settings_page/settings_animated_pages.html">
16 <link rel="import" href="/settings_page/settings_subpage.html"> 16 <link rel="import" href="/settings_page/settings_subpage.html">
17 <link rel="import" href="/settings_shared_css.html"> 17 <link rel="import" href="/settings_shared_css.html">
18 <link rel="import" href="appearance_fonts_page.html"> 18 <link rel="import" href="appearance_fonts_page.html">
19 19
20 <dom-module id="settings-appearance-page"> 20 <dom-module id="settings-appearance-page">
21 <template> 21 <template>
22 <style include="settings-shared"></style> 22 <style include="settings-shared"></style>
23 <settings-animated-pages id="pages" section="appearance"> 23 <settings-animated-pages id="pages" section="appearance">
24 <neon-animatable route-path="default"> 24 <neon-animatable route-path="default">
25 <if expr="chromeos"> 25 <if expr="chromeos">
26 <div class="settings-box first two-line" id="wallpaperButton" 26 <div class="settings-box first two-line" id="wallpaperButton"
27 on-tap="openWallpaperManager_" actionable 27 on-tap="openWallpaperManager_" actionable
28 hidden="[[!pageVisibility.setWallpaper]]"> 28 hidden="[[!pageVisibility.setWallpaper]]">
29 <iron-icon icon="settings:wallpaper"></iron-icon> 29 <div class="start">
30 <div class="middle">
31 <div>$i18n{setWallpaper}</div> 30 <div>$i18n{setWallpaper}</div>
32 <div class="secondary">$i18n{openWallpaperApp}</div> 31 <div class="secondary">$i18n{openWallpaperApp}</div>
33 </div> 32 </div>
34 <button class="icon-external" is="paper-icon-button-light"></button> 33 <button class="icon-external" is="paper-icon-button-light"></button>
35 </div> 34 </div>
36 <div class="settings-box two-line" 35 <div class="settings-box two-line"
37 hidden="[[!pageVisibility.setTheme]]" 36 hidden="[[!pageVisibility.setTheme]]" actionable>
38 on-tap="openThemesGallery_" actionable>
39 </if> 37 </if>
40 <if expr="not chromeos"> 38 <if expr="not chromeos">
41 <div class="settings-box two-line first" 39 <div class="settings-box two-line first"
42 hidden="[[!pageVisibility.setTheme]]" 40 hidden="[[!pageVisibility.setTheme]]" actionable>
43 on-tap="openThemesGallery_" actionable>
44 </if> 41 </if>
45 <iron-icon icon="settings:palette"></iron-icon> 42 <div class="start two-line" on-tap="openThemesGallery_">
46 <div class="middle"> 43 <div class="flex">
47 <div>$i18n{theme}</div> 44 <div>$i18n{theme}</div>
48 <div class="secondary">[[themeSublabel_]]</div> 45 <div class="secondary">[[themeSublabel_]]</div>
46 </div>
47 <button class="icon-external" is="paper-icon-button-light"></button>
49 </div> 48 </div>
50 <button class="icon-external" is="paper-icon-button-light"></button>
51 <template is="dom-if" if="[[allowResetTheme_]]"> 49 <template is="dom-if" if="[[allowResetTheme_]]">
52 <div class="secondary-action"> 50 <div class="secondary-action">
53 <paper-button id="resetTheme" on-tap="resetTheme_" 51 <paper-button id="resetTheme" on-tap="resetTheme_"
54 class="secondary-button"> 52 class="secondary-button">
55 $i18n{resetToDefaultTheme} 53 $i18n{resetToDefaultTheme}
56 </paper-button> 54 </paper-button>
57 </div> 55 </div>
58 </template> 56 </template>
59 </div> 57 </div>
60 <div class="settings-box" 58 <div class="settings-box"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" 126 associated-control="[[$$('#customize-fonts-subpage-trigger')]]"
129 page-title="$i18n{customizeFonts}"> 127 page-title="$i18n{customizeFonts}">
130 <settings-appearance-fonts-page prefs="{{prefs}}"> 128 <settings-appearance-fonts-page prefs="{{prefs}}">
131 </settings-appearance-fonts-page> 129 </settings-appearance-fonts-page>
132 </settings-subpage> 130 </settings-subpage>
133 </template> 131 </template>
134 </settings-animated-pages> 132 </settings-animated-pages>
135 </template> 133 </template>
136 <script src="appearance_page.js"></script> 134 <script src="appearance_page.js"></script>
137 </dom-module> 135 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/icons.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698