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="/appearance_page/appearance_browser_proxy.html"> | 7 <link rel="import" href="/appearance_page/appearance_browser_proxy.html"> |
8 <link rel="import" href="/controls/controlled_radio_button.html"> | 8 <link rel="import" href="/controls/controlled_radio_button.html"> |
9 <link rel="import" href="/controls/settings_dropdown_menu.html"> | 9 <link rel="import" href="/controls/settings_dropdown_menu.html"> |
10 <link rel="import" href="/controls/settings_input.html"> | 10 <link rel="import" href="/controls/settings_input.html"> |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 </controlled-radio-button> | 88 </controlled-radio-button> |
89 </settings-radio-group> | 89 </settings-radio-group> |
90 </div> | 90 </div> |
91 </template> | 91 </template> |
92 <div class="settings-box" | 92 <div class="settings-box" |
93 hidden="[[!pageVisibility.bookmarksBar]]"> | 93 hidden="[[!pageVisibility.bookmarksBar]]"> |
94 <settings-checkbox class="start" label="$i18n{showBookmarksBar}" | 94 <settings-checkbox class="start" label="$i18n{showBookmarksBar}" |
95 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> | 95 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> |
96 </settings-checkbox> | 96 </settings-checkbox> |
97 </div> | 97 </div> |
98 <div class$="settings-box [[getFirst_( | 98 <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]"> |
99 pageVisibility.bookmarksBar)]]"> | |
100 <if expr="is_linux and not chromeos"> | 99 <if expr="is_linux and not chromeos"> |
101 <settings-checkbox class="start" label="$i18n{showWindowDecorations}" | 100 <settings-checkbox class="start" label="$i18n{showWindowDecorations}" |
102 pref="{{prefs.browser.custom_chrome_frame}}" inverted> | 101 pref="{{prefs.browser.custom_chrome_frame}}" inverted> |
103 </settings-checkbox> | 102 </settings-checkbox> |
104 </div> | 103 </div> |
105 <div class="settings-box"> | 104 <div class="settings-box"> |
106 </if> | 105 </if> |
107 <div class="start">$i18n{fontSize}</div> | 106 <div class="start">$i18n{fontSize}</div> |
108 <settings-dropdown-menu id="defaultFontSize" | 107 <settings-dropdown-menu id="defaultFontSize" |
109 pref="{{prefs.webkit.webprefs.default_font_size}}" | 108 pref="{{prefs.webkit.webprefs.default_font_size}}" |
110 menu-options="[[fontSizeOptions_]]"> | 109 menu-options="[[fontSizeOptions_]]"> |
111 </settings-dropdown-menu> | 110 </settings-dropdown-menu> |
112 </div> | 111 </div> |
113 <div id="customize-fonts-subpage-trigger" | 112 <div id="customize-fonts-subpage-trigger" class="settings-box two-line" |
114 class="settings-box two-line single-column" | |
115 on-tap="onCustomizeFontsTap_" actionable> | 113 on-tap="onCustomizeFontsTap_" actionable> |
116 <div>$i18n{customizeFonts}</div> | 114 <div class="start"> |
117 <div class="secondary">$i18n{chooseFonts}</div> | 115 <div>$i18n{customizeFonts}</div> |
| 116 <div class="secondary">$i18n{chooseFonts}</div> |
| 117 </div> |
| 118 <iron-icon icon="settings:arrow-drop-up" class="settings-arrow-right"> |
| 119 </iron-icon> |
118 </div> | 120 </div> |
119 <div class="settings-box" | 121 <div class="settings-box" |
120 hidden="[[!pageVisibility.pageZoom]]"> | 122 hidden="[[!pageVisibility.pageZoom]]"> |
121 <div class="start">$i18n{pageZoom}</div> | 123 <div class="start">$i18n{pageZoom}</div> |
122 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}" | 124 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}" |
123 menu-options="[[pageZoomOptions_]]"> | 125 menu-options="[[pageZoomOptions_]]"> |
124 </settings-dropdown-menu> | 126 </settings-dropdown-menu> |
125 </div> | 127 </div> |
126 </neon-animatable> | 128 </neon-animatable> |
127 <template is="dom-if" route-path="/fonts"> | 129 <template is="dom-if" route-path="/fonts"> |
128 <settings-subpage | 130 <settings-subpage |
129 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" | 131 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" |
130 page-title="$i18n{customizeFonts}"> | 132 page-title="$i18n{customizeFonts}"> |
131 <settings-appearance-fonts-page prefs="{{prefs}}"> | 133 <settings-appearance-fonts-page prefs="{{prefs}}"> |
132 </settings-appearance-fonts-page> | 134 </settings-appearance-fonts-page> |
133 </settings-subpage> | 135 </settings-subpage> |
134 </template> | 136 </template> |
135 </settings-animated-pages> | 137 </settings-animated-pages> |
136 </template> | 138 </template> |
137 <script src="appearance_page.js"></script> | 139 <script src="appearance_page.js"></script> |
138 </dom-module> | 140 </dom-module> |
OLD | NEW |