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_" actionable> | 33 on-tap="openWallpaperManager_" actionable |
michaelpg
2016/07/13 00:01:35
Not relevant here, but: Are there any rows in Sett
Moe
2016/07/13 20:17:17
Good point. The only case where we're removing an
| |
34 hidden="[[!pageVisibility.appearance.setWallpaper]]"> | |
34 <iron-icon icon="settings:wallpaper"></iron-icon> | 35 <iron-icon icon="settings:wallpaper"></iron-icon> |
35 <div class="start"> | 36 <div class="start"> |
36 <div>$i18n{setWallpaper}</div> | 37 <div>$i18n{setWallpaper}</div> |
37 <div class="secondary">$i18n{openWallpaperApp}</div> | 38 <div class="secondary">$i18n{openWallpaperApp}</div> |
38 </div> | 39 </div> |
39 </div> | 40 </div> |
40 <div class="settings-box two-line"> | 41 <div class="settings-box two-line" |
42 hidden="[[!pageVisibility.appearance.setTheme]]"> | |
41 </if> | 43 </if> |
42 <if expr="not chromeos"> | 44 <if expr="not chromeos"> |
43 <div class="settings-box two-line first"> | 45 <div class="settings-box two-line first" |
46 hidden="[[!pageVisibility.appearance.setTheme]]"> | |
44 </if> | 47 </if> |
45 <div class="layout horizontal center flex" | 48 <div class="layout horizontal center flex" |
46 on-tap="openThemesGallery_" actionable> | 49 on-tap="openThemesGallery_" actionable> |
47 <iron-icon icon="settings:palette"></iron-icon> | 50 <iron-icon icon="settings:palette"></iron-icon> |
48 <div> | 51 <div> |
49 <div>$i18n{getThemes}</div> | 52 <div>$i18n{getThemes}</div> |
50 <div class="secondary">[[themeSublabel_]]</div> | 53 <div class="secondary">[[themeSublabel_]]</div> |
51 </div> | 54 </div> |
52 </div> | 55 </div> |
53 <template is="dom-if" if="[[allowResetTheme_]]"> | 56 <template is="dom-if" if="[[allowResetTheme_]]"> |
54 <div class="secondary-action"> | 57 <div class="secondary-action"> |
55 <paper-button id="resetTheme" on-tap="resetTheme_" | 58 <paper-button id="resetTheme" on-tap="resetTheme_" |
56 class="secondary-button"> | 59 class="secondary-button"> |
57 $i18n{resetToDefaultTheme} | 60 $i18n{resetToDefaultTheme} |
58 </paper-button> | 61 </paper-button> |
59 </div> | 62 </div> |
60 </template> | 63 </template> |
61 </div> | 64 </div> |
62 <div class="settings-box two-line"> | 65 <div class="settings-box two-line" |
66 hidden="[[!pageVisibility.appearance.homeButton]]"> | |
63 <settings-checkbox class="start" label="$i18n{showHomeButton}" | 67 <settings-checkbox class="start" label="$i18n{showHomeButton}" |
64 sub-label="[[getShowHomeSubLabel_(prefs.homepage_is_newtabpage.val ue, prefs.homepage.value)]]" | 68 sub-label="[[getShowHomeSubLabel_(prefs.homepage_is_newtabpage.val ue, prefs.homepage.value)]]" |
65 pref="{{prefs.browser.show_home_button}}"> | 69 pref="{{prefs.browser.show_home_button}}"> |
66 </settings-checkbox> | 70 </settings-checkbox> |
67 </div> | 71 </div> |
68 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> | 72 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> |
69 <div class="list-frame"> | 73 <div class="list-frame" |
74 hidden="[[!pageVisibility.appearance.homeButton]]"> | |
70 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}"> | 75 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}"> |
71 <paper-radio-button class="list-item" name="true"> | 76 <paper-radio-button class="list-item" name="true"> |
72 $i18n{homePageNtp} | 77 $i18n{homePageNtp} |
73 </paper-radio-button> | 78 </paper-radio-button> |
74 <paper-radio-button class="list-item" name="false"> | 79 <paper-radio-button class="list-item" name="false"> |
75 $i18n{other} | 80 $i18n{other} |
76 <settings-input no-label-float pref="{{prefs.homepage}}" | 81 <settings-input no-label-float pref="{{prefs.homepage}}" |
77 label="$i18n{exampleDotCom}"> | 82 label="$i18n{exampleDotCom}"> |
78 </settings-input> | 83 </settings-input> |
79 </paper-radio-button> | 84 </paper-radio-button> |
80 </settings-radio-group> | 85 </settings-radio-group> |
81 </div> | 86 </div> |
82 </template> | 87 </template> |
83 <div class="settings-box"> | 88 <div class="settings-box" |
89 hidden="[[!pageVisibility.appearance.bookmarksBar]]"> | |
84 <settings-checkbox class="start" label="$i18n{showBookmarksBar}" | 90 <settings-checkbox class="start" label="$i18n{showBookmarksBar}" |
85 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> | 91 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> |
86 </settings-checkbox> | 92 </settings-checkbox> |
87 </div> | 93 </div> |
94 <div class="settings-box" | |
95 first$="[[!pageVisibility.appearance.bookmarksBar]]"> | |
michaelpg
2016/07/13 00:01:35
hmm, why? the other "first" divs aren't related to
Moe
2016/07/13 20:17:17
correct, but I thought since homeButton, bookmarks
| |
88 <if expr="is_linux and not chromeos"> | 96 <if expr="is_linux and not chromeos"> |
89 <div class="settings-box"> | |
90 <settings-checkbox class="start" label="$i18n{showWindowDecorations}" | 97 <settings-checkbox class="start" label="$i18n{showWindowDecorations}" |
91 pref="{{prefs.browser.custom_chrome_frame}}"> | 98 pref="{{prefs.browser.custom_chrome_frame}}"> |
92 </settings-checkbox> | 99 </settings-checkbox> |
93 </div> | 100 </div> |
101 <div class="settings-box"> | |
94 </if> | 102 </if> |
95 <div class="settings-box"> | |
96 <div class="start">$i18n{fontSize}</div> | 103 <div class="start">$i18n{fontSize}</div> |
97 <settings-dropdown-menu id="defaultFontSize" | 104 <settings-dropdown-menu id="defaultFontSize" |
98 pref="{{prefs.webkit.webprefs.default_font_size}}" | 105 pref="{{prefs.webkit.webprefs.default_font_size}}" |
99 menu-options="[[fontSizeOptions_]]" no-label-float> | 106 menu-options="[[fontSizeOptions_]]" no-label-float> |
100 </settings-dropdown-menu> | 107 </settings-dropdown-menu> |
101 </div> | 108 </div> |
102 <div class="settings-box two-line" on-tap="onCustomizeFontsTap_" | 109 <div class="settings-box two-line" on-tap="onCustomizeFontsTap_" |
103 actionable> | 110 actionable> |
104 <div class="start"> | 111 <div class="start"> |
105 <div>$i18n{customizeFonts}</div> | 112 <div>$i18n{customizeFonts}</div> |
106 <div class="secondary">$i18n{chooseFontsAndEncoding}</div> | 113 <div class="secondary">$i18n{chooseFontsAndEncoding}</div> |
107 </div> | 114 </div> |
108 </div> | 115 </div> |
109 <div class="settings-box"> | 116 <div class="settings-box" |
117 hidden="[[!pageVisibility.appearance.pageZoom]]"> | |
110 <div class="start">$i18n{pageZoom}</div> | 118 <div class="start">$i18n{pageZoom}</div> |
111 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}" | 119 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}" |
112 menu-options="[[pageZoomOptions_]]" no-label-float> | 120 menu-options="[[pageZoomOptions_]]" no-label-float> |
113 </settings-dropdown-menu> | 121 </settings-dropdown-menu> |
114 </div> | 122 </div> |
115 </neon-animatable> | 123 </neon-animatable> |
116 <template is="dom-if" name="appearance-fonts"> | 124 <template is="dom-if" name="appearance-fonts"> |
117 <settings-subpage page-title="$i18n{customizeFonts}"> | 125 <settings-subpage page-title="$i18n{customizeFonts}"> |
118 <settings-appearance-fonts-page prefs="{{prefs}}"> | 126 <settings-appearance-fonts-page prefs="{{prefs}}"> |
119 </settings-appearance-fonts-page> | 127 </settings-appearance-fonts-page> |
120 </settings-subpage> | 128 </settings-subpage> |
121 </template> | 129 </template> |
122 </settings-animated-pages> | 130 </settings-animated-pages> |
123 </template> | 131 </template> |
124 <script src="appearance_page.js"></script> | 132 <script src="appearance_page.js"></script> |
125 </dom-module> | 133 </dom-module> |
OLD | NEW |