OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.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/html/web_ui_listener_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 4 <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-spinner/paper-spi nner.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
6 <link rel="import" href="../i18n_setup.html"> | 6 <link rel="import" href="../i18n_setup.html"> |
7 <link rel="import" href="clear_browsing_data_browser_proxy.html"> | 7 <link rel="import" href="clear_browsing_data_browser_proxy.html"> |
8 <link rel="import" href="history_deletion_dialog.html"> | 8 <link rel="import" href="history_deletion_dialog.html"> |
9 <link rel="import" href="../controls/important_site_checkbox.html"> | |
9 <link rel="import" href="../controls/settings_checkbox.html"> | 10 <link rel="import" href="../controls/settings_checkbox.html"> |
10 <link rel="import" href="../controls/settings_dropdown_menu.html"> | 11 <link rel="import" href="../controls/settings_dropdown_menu.html"> |
11 <link rel="import" href="../icons.html"> | 12 <link rel="import" href="../icons.html"> |
12 <link rel="import" href="../settings_shared_css.html"> | 13 <link rel="import" href="../settings_shared_css.html"> |
13 | 14 |
14 <dom-module id="settings-clear-browsing-data-dialog"> | 15 <dom-module id="settings-clear-browsing-data-dialog"> |
15 <template> | 16 <template> |
16 <style include="settings-shared"> | 17 <style include="settings-shared"> |
17 #dialog:not(.fully-rendered) { | 18 #clearBrowsingDataDialog:not(.fully-rendered) { |
18 visibility: hidden; | 19 visibility: hidden; |
19 } | 20 } |
20 | 21 |
21 #dialog .footer { | 22 #clearBrowsingDataDialog .footer { |
22 color: var(--paper-grey-600); | 23 color: var(--paper-grey-600); |
23 } | 24 } |
24 | 25 |
25 .row { | 26 .row { |
26 align-items: center; | 27 align-items: center; |
27 display: flex; | 28 display: flex; |
28 min-height: 40px; | 29 min-height: 40px; |
29 } | 30 } |
30 | 31 |
31 paper-spinner { | 32 paper-spinner { |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
72 } | 73 } |
73 | 74 |
74 .clear-browsing-data-footer a { | 75 .clear-browsing-data-footer a { |
75 text-decoration: none; | 76 text-decoration: none; |
76 } | 77 } |
77 | 78 |
78 #clearFrom { | 79 #clearFrom { |
79 -webkit-margin-start: 0.5em; | 80 -webkit-margin-start: 0.5em; |
80 } | 81 } |
81 | 82 |
83 .title .secondary { | |
84 font-size: 86.67%; /* (13px / 15px) * 100 */ | |
michaelpg
2017/05/03 21:48:05
nit: something like
font-size: calc(13/15 * 100%
dullweber
2017/05/04 08:31:08
thanks! I fixed it and also replaced the magic num
| |
85 padding-top: 8px; | |
86 } | |
87 | |
82 /* Cap the height on smaller screens to avoid unfavorable clipping. | 88 /* Cap the height on smaller screens to avoid unfavorable clipping. |
83 * Replace the bottom margin with padding to avoid the gap between | 89 * Replace the bottom margin with padding to avoid the gap between |
84 * the scrollbar and the bottom separator. */ | 90 * the scrollbar and the bottom separator. */ |
85 @media all and (max-height: 724px) { | 91 @media all and (max-height: 724px) { |
86 #dialog { | 92 #clearBrowsingDataDialog { |
87 /* crbug.com/652027: Show four and a *half* items in the list. */ | 93 /* crbug.com/652027: Show four and a *half* items in the list. */ |
88 --cr-dialog-body-container: { | 94 --cr-dialog-body-container: { |
89 max-height: 280px; | 95 max-height: 280px; |
90 }; | 96 }; |
91 } | 97 } |
92 } | 98 } |
93 </style> | 99 </style> |
94 | 100 |
95 <dialog is="cr-dialog" id="dialog" close-text="$i18n{close}" | 101 <dialog is="cr-dialog" id="clearBrowsingDataDialog" |
96 show-scroll-borders ignore-popstate> | 102 on-close="onClearBrowsingDataDialogClose_" |
97 <div class="title">$i18n{clearBrowsingData}</div> | 103 close-text="$i18n{close}" show-scroll-borders ignore-popstate> |
104 <div class="title"> | |
105 $i18n{clearBrowsingData} | |
106 </div> | |
98 <div class="body"> | 107 <div class="body"> |
99 <div class="row"> | 108 <div class="row"> |
100 $i18n{clearFollowingItemsFrom} | 109 $i18n{clearFollowingItemsFrom} |
101 <settings-dropdown-menu id="clearFrom" | 110 <settings-dropdown-menu id="clearFrom" |
102 label="$i18n{clearFollowingItemsFrom}" | 111 label="$i18n{clearFollowingItemsFrom}" |
103 pref="{{prefs.browser.clear_data.time_period}}" | 112 pref="{{prefs.browser.clear_data.time_period}}" |
104 menu-options="[[clearFromOptions_]]"> | 113 menu-options="[[clearFromOptions_]]"> |
105 </settings-dropdown-menu> | 114 </settings-dropdown-menu> |
106 </div> | 115 </div> |
107 <settings-checkbox id="browsingCheckbox" | 116 <settings-checkbox id="browsingCheckbox" |
108 pref="{{prefs.browser.clear_data.browsing_history}}" | 117 pref="{{prefs.browser.clear_data.browsing_history}}" |
109 label="$i18n{clearBrowsingHistory}" | 118 label="$i18n{clearBrowsingHistory}" |
110 sub-label="[[counters_.browsing_history]]" | 119 sub-label="[[counters_.browsing_history]]" |
111 disabled="[[clearingInProgress_]]"> | 120 disabled="[[clearingInProgress_]]"> |
112 </settings-checkbox> | 121 </settings-checkbox> |
113 <settings-checkbox id="downloadCheckbox" | 122 <settings-checkbox id="downloadCheckbox" |
114 pref="{{prefs.browser.clear_data.download_history}}" | 123 pref="{{prefs.browser.clear_data.download_history}}" |
115 label="$i18n{clearDownloadHistory}" | 124 label="$i18n{clearDownloadHistory}" |
116 sub-label="[[counters_.download_history]]" | 125 sub-label="[[counters_.download_history]]" |
117 disabled="[[clearingInProgress_]]"> | 126 disabled="[[clearingInProgress_]]"> |
118 </settings-checkbox> | 127 </settings-checkbox> |
119 <settings-checkbox | 128 <settings-checkbox id="cacheCheckbox" |
120 pref="{{prefs.browser.clear_data.cache}}" | 129 pref="{{prefs.browser.clear_data.cache}}" |
121 label="$i18n{clearCache}" | 130 label="$i18n{clearCache}" |
122 sub-label="[[counters_.cache]]" | 131 sub-label="[[counters_.cache]]" |
123 disabled="[[clearingInProgress_]]"> | 132 disabled="[[clearingInProgress_]]"> |
124 </settings-checkbox> | 133 </settings-checkbox> |
125 <settings-checkbox | 134 <settings-checkbox id="cookiesCheckbox" |
126 pref="{{prefs.browser.clear_data.cookies}}" | 135 pref="{{prefs.browser.clear_data.cookies}}" |
127 label="$i18n{clearCookies}" | 136 label="$i18n{clearCookies}" |
128 sub-label="$i18n{clearCookiesCounter}" | 137 sub-label="$i18n{clearCookiesCounter}" |
129 disabled="[[clearingInProgress_]]"> | 138 disabled="[[clearingInProgress_]]"> |
130 </settings-checkbox> | 139 </settings-checkbox> |
131 <settings-checkbox | 140 <settings-checkbox |
132 pref="{{prefs.browser.clear_data.passwords}}" | 141 pref="{{prefs.browser.clear_data.passwords}}" |
133 label="$i18n{clearPasswords}" | 142 label="$i18n{clearPasswords}" |
134 sub-label="[[counters_.passwords]]" | 143 sub-label="[[counters_.passwords]]" |
135 disabled="[[clearingInProgress_]]"> | 144 disabled="[[clearingInProgress_]]"> |
(...skipping 14 matching lines...) Expand all Loading... | |
150 pref="{{prefs.browser.clear_data.media_licenses}}" | 159 pref="{{prefs.browser.clear_data.media_licenses}}" |
151 label="$i18n{clearMediaLicenses}" | 160 label="$i18n{clearMediaLicenses}" |
152 sub-label="[[counters_.media_licenses]]" | 161 sub-label="[[counters_.media_licenses]]" |
153 disabled="[[clearingInProgress_]]"> | 162 disabled="[[clearingInProgress_]]"> |
154 </settings-checkbox> | 163 </settings-checkbox> |
155 </div> | 164 </div> |
156 <div class="button-container"> | 165 <div class="button-container"> |
157 <paper-spinner active="[[clearingInProgress_]]"></paper-spinner> | 166 <paper-spinner active="[[clearingInProgress_]]"></paper-spinner> |
158 <paper-button class="cancel-button" disabled="[[clearingInProgress_]]" | 167 <paper-button class="cancel-button" disabled="[[clearingInProgress_]]" |
159 on-tap="onCancelTap_">$i18n{cancel}</paper-button> | 168 on-tap="onCancelTap_">$i18n{cancel}</paper-button> |
160 <paper-button class="action-button" disabled="[[clearingInProgress_]]" | 169 <paper-button id="clearBrowsingDataConfirm" |
170 class="action-button" disabled="[[clearingInProgress_]]" | |
161 on-tap="onClearBrowsingDataTap_"> | 171 on-tap="onClearBrowsingDataTap_"> |
162 $i18n{clearBrowsingData} | 172 $i18n{clearBrowsingData} |
163 </paper-button> | 173 </paper-button> |
164 </div> | 174 </div> |
165 <div class="footer"> | 175 <div class="footer"> |
166 <div id="googleFooter" class="clear-browsing-data-footer"> | 176 <div id="googleFooter" class="clear-browsing-data-footer"> |
167 <iron-icon icon="settings:googleg"></iron-icon> | 177 <iron-icon icon="settings:googleg"></iron-icon> |
168 <div class="footer-text">$i18nRaw{otherFormsOfBrowsingHistory}</div> | 178 <div class="footer-text">$i18nRaw{otherFormsOfBrowsingHistory}</div> |
169 </div> | 179 </div> |
170 <div id="generalFooter" class="clear-browsing-data-footer"> | 180 <div id="generalFooter" class="clear-browsing-data-footer"> |
171 <iron-icon icon="settings:info"></iron-icon> | 181 <iron-icon icon="settings:info"></iron-icon> |
172 <div class="footer-text"> | 182 <div class="footer-text"> |
173 <span id="syncedDataSentence">$i18n{clearsSyncedData}</span> | 183 <span id="syncedDataSentence">$i18n{clearsSyncedData}</span> |
174 <span>$i18n{warnAboutNonClearedData}</span> | 184 <span>$i18n{warnAboutNonClearedData}</span> |
175 <a id="clear-browser-data-old-learn-more-link" | 185 <a id="clear-browser-data-old-learn-more-link" |
176 href="$i18n{clearBrowsingDataLearnMoreUrl}" | 186 href="$i18n{clearBrowsingDataLearnMoreUrl}" |
177 target="_blank">$i18n{learnMore}</a> | 187 target="_blank">$i18n{learnMore}</a> |
178 </div> | 188 </div> |
179 </div> | 189 </div> |
180 </div> | 190 </div> |
181 </dialog> | 191 </dialog> |
182 | 192 |
193 <dialog is="cr-dialog" id="importantSitesDialog" close-text="$i18n{close}" | |
194 show-scroll-borders ignore-popstate> | |
195 <div class="title"> | |
196 $i18n{clearBrowsingData} | |
197 <div class="secondary"> | |
198 $i18n{importantSitesSubtitle} | |
199 </div> | |
200 </div> | |
201 <div class="body"> | |
202 <template is="dom-repeat" items="[[importantSites_]]"> | |
203 <div class="row"> | |
204 <important-site-checkbox | |
205 site="[[item]]" | |
206 disabled="[[clearingInProgress_]]"> | |
207 </important-site-checkbox> | |
208 </div> | |
209 </template> | |
210 </div> | |
211 <div class="button-container"> | |
212 <paper-spinner active="[[clearingInProgress_]]"></paper-spinner> | |
213 <paper-button class="cancel-button" disabled="[[clearingInProgress_]]" | |
214 on-tap="onImportantSitesCancelTap_">$i18n{cancel}</paper-button> | |
215 <paper-button id="importantSitesConfirm" | |
216 class="action-button" disabled="[[clearingInProgress_]]" | |
217 on-tap="onImportantSitesConfirmTap_"> | |
218 $i18n{importantSitesConfirm} | |
219 </paper-button> | |
220 </div> | |
221 </dialog> | |
222 | |
183 <template is="dom-if" if="[[showHistoryDeletionDialog_]]" restamp> | 223 <template is="dom-if" if="[[showHistoryDeletionDialog_]]" restamp> |
184 <settings-history-deletion-dialog id="notice" | 224 <settings-history-deletion-dialog id="notice" |
185 on-close="onHistoryDeletionDialogClose_"> | 225 on-close="onHistoryDeletionDialogClose_"> |
186 </settings-history-deletion-dialog> | 226 </settings-history-deletion-dialog> |
187 </template> | 227 </template> |
188 </template> | 228 </template> |
189 <script src="clear_browsing_data_dialog.js"></script> | 229 <script src="clear_browsing_data_dialog.js"></script> |
190 </dom-module> | 230 </dom-module> |
OLD | NEW |