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 #dialog:not(.fully-rendered) { |
18 visibility: hidden; | 19 visibility: hidden; |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
78 } | 79 } |
79 | 80 |
80 .clear-browsing-data-footer a { | 81 .clear-browsing-data-footer a { |
81 text-decoration: none; | 82 text-decoration: none; |
82 } | 83 } |
83 | 84 |
84 #clearFrom { | 85 #clearFrom { |
85 -webkit-margin-start: 0.5em; | 86 -webkit-margin-start: 0.5em; |
86 } | 87 } |
87 | 88 |
89 .title { | |
90 margin: 12px 0; | |
91 } | |
92 | |
93 .title .secondary { | |
94 font-size: 80%; | |
dschuyler
2017/04/07 00:02:06
This size change is unexpected. Please help me see
dullweber
2017/04/07 09:39:21
You're right, it shouldn't be 80%.
text_defaults_
| |
95 } | |
96 | |
88 /* Cap the height on smaller screens to avoid unfavorable clipping. | 97 /* Cap the height on smaller screens to avoid unfavorable clipping. |
89 * Replace the bottom margin with padding to avoid the gap between | 98 * Replace the bottom margin with padding to avoid the gap between |
90 * the scrollbar and the bottom separator. */ | 99 * the scrollbar and the bottom separator. */ |
91 @media all and (max-height: 724px) { | 100 @media all and (max-height: 724px) { |
92 #dialog .body { | 101 #dialog .body { |
93 margin-bottom: 0; | 102 margin-bottom: 0; |
94 /* crbug.com/652027: Show four and a *half* items in the list. */ | 103 /* crbug.com/652027: Show four and a *half* items in the list. */ |
95 max-height: 280px; | 104 max-height: 280px; |
96 overflow-y: scroll; | 105 overflow-y: scroll; |
97 padding-bottom: 12px; | 106 padding-bottom: 12px; |
98 } | 107 } |
99 } | 108 } |
100 </style> | 109 </style> |
101 | 110 |
102 <dialog is="cr-dialog" id="dialog" close-text="$i18n{close}" ignore-popstate > | 111 <dialog is="cr-dialog" id="dialog" close-text="$i18n{close}" ignore-popstate > |
103 <div class="title">$i18n{clearBrowsingData}</div> | 112 <div class="title"> |
104 <div class="body"> | 113 $i18n{clearBrowsingData} |
114 <div class="secondary" | |
115 hidden$="[[!isImportantSitesDialog_(dialogState_)]]"> | |
116 $i18n{importantSitesSubtitle} | |
117 </div> | |
118 </div> | |
119 <div class="body" hidden$="[[!isClearBrowsingDataDialog_(dialogState_)]]"> | |
105 <div class="row"> | 120 <div class="row"> |
106 $i18n{clearFollowingItemsFrom} | 121 $i18n{clearFollowingItemsFrom} |
107 <settings-dropdown-menu id="clearFrom" | 122 <settings-dropdown-menu id="clearFrom" |
108 pref="{{prefs.browser.clear_data.time_period}}" | 123 pref="{{prefs.browser.clear_data.time_period}}" |
109 menu-options="[[clearFromOptions_]]"> | 124 menu-options="[[clearFromOptions_]]"> |
110 </settings-dropdown-menu> | 125 </settings-dropdown-menu> |
111 </div> | 126 </div> |
112 <settings-checkbox id="browsingCheckbox" | 127 <settings-checkbox id="browsingCheckbox" |
113 pref="{{prefs.browser.clear_data.browsing_history}}" | 128 pref="{{prefs.browser.clear_data.browsing_history}}" |
114 label="$i18n{clearBrowsingHistory}" | 129 label="$i18n{clearBrowsingHistory}" |
115 sub-label="[[counters_.browsing_history]]" | 130 sub-label="[[counters_.browsing_history]]" |
116 disabled="[[clearingInProgress_]]"> | 131 disabled="[[clearingInProgress_]]"> |
117 </settings-checkbox> | 132 </settings-checkbox> |
118 <settings-checkbox id="downloadCheckbox" | 133 <settings-checkbox id="downloadCheckbox" |
119 pref="{{prefs.browser.clear_data.download_history}}" | 134 pref="{{prefs.browser.clear_data.download_history}}" |
120 label="$i18n{clearDownloadHistory}" | 135 label="$i18n{clearDownloadHistory}" |
121 sub-label="[[counters_.download_history]]" | 136 sub-label="[[counters_.download_history]]" |
122 disabled="[[clearingInProgress_]]"> | 137 disabled="[[clearingInProgress_]]"> |
123 </settings-checkbox> | 138 </settings-checkbox> |
124 <settings-checkbox | 139 <settings-checkbox id="cacheCheckbox" |
125 pref="{{prefs.browser.clear_data.cache}}" | 140 pref="{{prefs.browser.clear_data.cache}}" |
126 label="$i18n{clearCache}" | 141 label="$i18n{clearCache}" |
127 sub-label="[[counters_.cache]]" | 142 sub-label="[[counters_.cache]]" |
128 disabled="[[clearingInProgress_]]"> | 143 disabled="[[clearingInProgress_]]"> |
129 </settings-checkbox> | 144 </settings-checkbox> |
130 <settings-checkbox | 145 <settings-checkbox id="cookiesCheckbox" |
131 pref="{{prefs.browser.clear_data.cookies}}" | 146 pref="{{prefs.browser.clear_data.cookies}}" |
132 label="$i18n{clearCookies}" | 147 label="$i18n{clearCookies}" |
133 sub-label="$i18n{clearCookiesCounter}" | 148 sub-label="$i18n{clearCookiesCounter}" |
134 disabled="[[clearingInProgress_]]"> | 149 disabled="[[clearingInProgress_]]"> |
135 </settings-checkbox> | 150 </settings-checkbox> |
136 <settings-checkbox | 151 <settings-checkbox |
137 pref="{{prefs.browser.clear_data.passwords}}" | 152 pref="{{prefs.browser.clear_data.passwords}}" |
138 label="$i18n{clearPasswords}" | 153 label="$i18n{clearPasswords}" |
139 sub-label="[[counters_.passwords]]" | 154 sub-label="[[counters_.passwords]]" |
140 disabled="[[clearingInProgress_]]"> | 155 disabled="[[clearingInProgress_]]"> |
(...skipping 10 matching lines...) Expand all Loading... | |
151 sub-label="[[counters_.hosted_apps_data]]" | 166 sub-label="[[counters_.hosted_apps_data]]" |
152 disabled="[[clearingInProgress_]]"> | 167 disabled="[[clearingInProgress_]]"> |
153 </settings-checkbox> | 168 </settings-checkbox> |
154 <settings-checkbox | 169 <settings-checkbox |
155 pref="{{prefs.browser.clear_data.media_licenses}}" | 170 pref="{{prefs.browser.clear_data.media_licenses}}" |
156 label="$i18n{clearMediaLicenses}" | 171 label="$i18n{clearMediaLicenses}" |
157 sub-label="[[counters_.media_licenses]]" | 172 sub-label="[[counters_.media_licenses]]" |
158 disabled="[[clearingInProgress_]]"> | 173 disabled="[[clearingInProgress_]]"> |
159 </settings-checkbox> | 174 </settings-checkbox> |
160 </div> | 175 </div> |
176 <template is="dom-if" if="[[isImportantSitesDialog_(dialogState_)]]"> | |
177 <div class="body"> | |
178 <template is="dom-repeat" items="[[importantSites_]]"> | |
179 <div class="row"> | |
180 <important-site-checkbox | |
181 site="[[item]]" | |
182 disabled="[[clearingInProgress_]]"> | |
183 </important-site-checkbox> | |
184 </div> | |
185 </template> | |
186 </div> | |
187 </template> | |
161 <div class="button-container"> | 188 <div class="button-container"> |
162 <paper-spinner active="[[clearingInProgress_]]"></paper-spinner> | 189 <paper-spinner active="[[clearingInProgress_]]"></paper-spinner> |
163 <paper-button class="cancel-button" disabled="[[clearingInProgress_]]" | 190 <paper-button class="cancel-button" disabled="[[clearingInProgress_]]" |
164 on-tap="onCancelTap_">$i18n{cancel}</paper-button> | 191 on-tap="onCancelTap_">$i18n{cancel}</paper-button> |
165 <paper-button class="action-button" disabled="[[clearingInProgress_]]" | 192 <paper-button class="action-button" disabled="[[clearingInProgress_]]" |
166 on-tap="onClearBrowsingDataTap_"> | 193 on-tap="onClearBrowsingDataTap_"> |
167 $i18n{clearBrowsingData} | 194 <template is="dom-if" |
195 if="[[isClearBrowsingDataDialog_(dialogState_)]]"> | |
196 $i18n{clearBrowsingData} | |
197 </template> | |
198 <template is="dom-if" if="[[isImportantSitesDialog_(dialogState_)]]"> | |
199 $i18n{importantSitesConfirm} | |
200 </template> | |
168 </paper-button> | 201 </paper-button> |
169 </div> | 202 </div> |
170 <div class="footer"> | 203 <div class="footer" |
204 hidden$="[[!isClearBrowsingDataDialog_(dialogState_)]]"> | |
171 <div id="googleFooter" class="clear-browsing-data-footer"> | 205 <div id="googleFooter" class="clear-browsing-data-footer"> |
172 <iron-icon icon="settings:googleg"></iron-icon> | 206 <iron-icon icon="settings:googleg"></iron-icon> |
173 <div class="footer-text">$i18nRaw{otherFormsOfBrowsingHistory}</div> | 207 <div class="footer-text">$i18nRaw{otherFormsOfBrowsingHistory}</div> |
174 </div> | 208 </div> |
175 <div id="generalFooter" class="clear-browsing-data-footer"> | 209 <div id="generalFooter" class="clear-browsing-data-footer"> |
176 <iron-icon icon="settings:info"></iron-icon> | 210 <iron-icon icon="settings:info"></iron-icon> |
177 <div class="footer-text"> | 211 <div class="footer-text"> |
178 <span id="syncedDataSentence">$i18n{clearsSyncedData}</span> | 212 <span id="syncedDataSentence">$i18n{clearsSyncedData}</span> |
179 <span>$i18n{warnAboutNonClearedData}</span> | 213 <span>$i18n{warnAboutNonClearedData}</span> |
180 <a id="clear-browser-data-old-learn-more-link" | 214 <a id="clear-browser-data-old-learn-more-link" |
181 href="$i18n{clearBrowsingDataLearnMoreUrl}" | 215 href="$i18n{clearBrowsingDataLearnMoreUrl}" |
182 target="_blank">$i18n{learnMore}</a> | 216 target="_blank">$i18n{learnMore}</a> |
183 </div> | 217 </div> |
184 </div> | 218 </div> |
185 </div> | 219 </div> |
186 </dialog> | 220 </dialog> |
187 | 221 |
188 <template is="dom-if" if="[[showHistoryDeletionDialog_]]" restamp> | 222 <template is="dom-if" if="[[showHistoryDeletionDialog_]]" restamp> |
189 <settings-history-deletion-dialog id="notice" | 223 <settings-history-deletion-dialog id="notice" |
190 on-close="onHistoryDeletionDialogClose_"> | 224 on-close="onHistoryDeletionDialogClose_"> |
191 </settings-history-deletion-dialog> | 225 </settings-history-deletion-dialog> |
192 </template> | 226 </template> |
193 </template> | 227 </template> |
194 <script src="clear_browsing_data_dialog.js"></script> | 228 <script src="clear_browsing_data_dialog.js"></script> |
195 </dom-module> | 229 </dom-module> |
OLD | NEW |