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

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

Issue 1652553002: [MD settings] adjusting heights of settings rows; removing two .css files; unifying settings layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge with master Created 4 years, 10 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
OLDNEW
1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 2 <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-icon/iron-icon.htm l"> 3 <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/neon-animation/neon-ani matable.html"> 4 <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/paper-button/paper-butt on.html"> 5 <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-radio-button/pape r-radio-button.html"> 6 <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-toggle-button/pap er-toggle-button.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
8 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml"> 8 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml">
9 <link rel="import" href="chrome://md-settings/controls/settings_input.html"> 9 <link rel="import" href="chrome://md-settings/controls/settings_input.html">
10 <link rel="import" href="chrome://md-settings/controls/settings_radio_group.html "> 10 <link rel="import" href="chrome://md-settings/controls/settings_radio_group.html ">
11 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 11 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
12 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> 12 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">
13 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 13 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
14 <link rel="import" href="appearance_fonts_page.html"> 14 <link rel="import" href="appearance_fonts_page.html">
15 15
16 <dom-module id="settings-appearance-page"> 16 <dom-module id="settings-appearance-page">
17 <link rel="import" type="css" 17 <link rel="import" type="css"
18 href="chrome://md-settings/settings_shared.css"> 18 href="chrome://md-settings/settings_shared.css">
19 <link rel="import" type="css" 19 <link rel="import" type="css"
20 href="chrome://md-settings/appearance_page/appearance_shared.css"> 20 href="chrome://md-settings/appearance_page/appearance_shared.css">
21 <link rel="import" type="css" href="chrome://resources/css/widgets.css"> 21 <link rel="import" type="css" href="chrome://resources/css/widgets.css">
22 <link rel="import" href="chrome://resources/html/action_link.html"> 22 <link rel="import" href="chrome://resources/html/action_link.html">
23 <template> 23 <template>
24 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 24 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
25 section="appearance"> 25 section="appearance">
26 <neon-animatable id="main"> 26 <neon-animatable id="main">
27 <div class="settings-box split first"> 27 <div class="settings-box first">
28 <div class="start"> 28 <div class="start">
29 <iron-icon icon="image:brightness-1"></iron-icon> 29 <iron-icon icon="image:brightness-1"></iron-icon>
30 <paper-button i18n-content="setWallpaper"></paper-button> 30 <paper-button i18n-content="setWallpaper"></paper-button>
31 </div> 31 </div>
32 <iron-icon icon="exit-to-app" disabled></iron-icon> 32 <iron-icon icon="exit-to-app" disabled></iron-icon>
33 </div> 33 </div>
34 <div class="settings-box split"> 34 <div class="settings-box">
35 <div class="start"> 35 <div class="start">
36 <iron-icon icon="image:brightness-1"></iron-icon> 36 <iron-icon icon="image:brightness-1"></iron-icon>
37 <paper-button id="get-themes" 37 <paper-button id="get-themes"
38 on-tap="openThemesGallery_" 38 on-tap="openThemesGallery_"
39 >[[i18n('getThemes')]]</paper-button> 39 >[[i18n('getThemes')]]</paper-button>
40 </div> 40 </div>
41 <template is="dom-if" if="[[!allowResetTheme_]]"> 41 <template is="dom-if" if="[[!allowResetTheme_]]">
42 <iron-icon icon="exit-to-app"></iron-icon> 42 <iron-icon icon="exit-to-app"></iron-icon>
43 </template> 43 </template>
44 <template is="dom-if" if="[[allowResetTheme_]]"> 44 <template is="dom-if" if="[[allowResetTheme_]]">
45 <paper-button on-tap="resetTheme_" 45 <paper-button on-tap="resetTheme_"
46 >[[i18n('resetToDefaultTheme')]]</paper-button> 46 >[[i18n('resetToDefaultTheme')]]</paper-button>
47 </template> 47 </template>
48 </div> 48 </div>
49 <div class="settings-box split two-line"> 49 <div class="settings-box two-line">
50 <settings-checkbox class="start" i18n-values="label:showHomeButton" 50 <settings-checkbox class="start" i18n-values="label:showHomeButton"
51 pref="{{prefs.browser.show_home_button}}"> 51 pref="{{prefs.browser.show_home_button}}">
52 </settings-checkbox> 52 </settings-checkbox>
53 </div> 53 </div>
54 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> 54 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]">
55 <div class="list-frame"> 55 <div class="list-frame">
56 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}"> 56 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}">
57 <paper-radio-button class="list-item" name="true"> 57 <paper-radio-button class="list-item" name="true">
58 [[i18n('homePageNtp')]] 58 [[i18n('homePageNtp')]]
59 </paper-radio-button> 59 </paper-radio-button>
60 <paper-radio-button class="list-item" name="false"> 60 <paper-radio-button class="list-item" name="false">
61 [[i18n('other')]] 61 [[i18n('other')]]
62 <settings-input no-label-float pref="{{prefs.homepage}}" 62 <settings-input no-label-float pref="{{prefs.homepage}}"
63 label="[[i18n('exampleDotCom')]]"> 63 label="[[i18n('exampleDotCom')]]">
64 </settings-input> 64 </settings-input>
65 </paper-radio-button> 65 </paper-radio-button>
66 </settings-radio-group> 66 </settings-radio-group>
67 </div> 67 </div>
68 </template> 68 </template>
69 <div class="settings-box split"> 69 <div class="settings-box">
70 <settings-checkbox class="start" i18n-values="label:showBookmarksBar" 70 <settings-checkbox class="start" i18n-values="label:showBookmarksBar"
71 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> 71 pref="{{prefs.bookmark_bar.show_on_all_tabs}}">
72 </settings-checkbox> 72 </settings-checkbox>
73 </div> 73 </div>
74 <div class="settings-box split"> 74 <div class="settings-box">
75 <div class="start" i18n-content="fontSize"></div> 75 <div class="start" i18n-content="fontSize"></div>
76 <settings-dropdown-menu id="defaultFontSize" 76 <settings-dropdown-menu id="defaultFontSize"
77 pref="{{prefs.webkit.webprefs.default_font_size}}" 77 pref="{{prefs.webkit.webprefs.default_font_size}}"
78 menu-options="[[fontSizeOptions_]]"> 78 menu-options="[[fontSizeOptions_]]">
79 </settings-dropdown-menu> 79 </settings-dropdown-menu>
80 </div> 80 </div>
81 <div class="settings-box split"> 81 <div class="settings-box">
82 <div class="start" i18n-content="customizeFonts"></div> 82 <div class="start" i18n-content="customizeFonts"></div>
83 <paper-button on-tap="onCustomizeFontsTap_" 83 <paper-button on-tap="onCustomizeFontsTap_"
84 i18n-content="customizeFonts"></paper-button> 84 i18n-content="customizeFonts"></paper-button>
85 </div> 85 </div>
86 <div class="settings-box split"> 86 <div class="settings-box">
87 <div class="start" i18n-content="pageZoom"></div> 87 <div class="start" i18n-content="pageZoom"></div>
88 <settings-dropdown-menu id="pageZoom" 88 <settings-dropdown-menu id="pageZoom"
89 pref="{{defaultZoomLevel_}}" 89 pref="{{defaultZoomLevel_}}"
90 menu-options="[[pageZoomOptions_]]"> 90 menu-options="[[pageZoomOptions_]]">
91 </settings-dropdown-menu> 91 </settings-dropdown-menu>
92 </div> 92 </div>
93 </neon-animatable> 93 </neon-animatable>
94 <neon-animatable id="appearance-fonts"> 94 <neon-animatable id="appearance-fonts">
95 <settings-subheader i18n-values="page-title:customizeFonts"> 95 <settings-subheader i18n-values="page-title:customizeFonts">
96 </settings-subheader> 96 </settings-subheader>
97 <template is="dom-if" if="[[showFontsPage_(currentRoute.subpage.*)]]" 97 <template is="dom-if" if="[[showFontsPage_(currentRoute.subpage.*)]]"
98 restamp> 98 restamp>
99 <settings-appearance-fonts-page prefs="{{prefs}}"> 99 <settings-appearance-fonts-page prefs="{{prefs}}">
100 </settings-appearance-fonts-page> 100 </settings-appearance-fonts-page>
101 </template> 101 </template>
102 </neon-animatable> 102 </neon-animatable>
103 </settings-animated-pages> 103 </settings-animated-pages>
104 </template> 104 </template>
105 <script src="appearance_page.js"></script> 105 <script src="appearance_page.js"></script>
106 </dom-module> 106 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698