Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code
Issues
All Issues

Delta Between Two Patch Sets: desktop-options.html

Issue 29712664: Issue 6432 - Hide remove button for additional filter lists (Closed)
Left Patch Set: Addressed Jeen's suggestion in the ticket Created March 2, 2018, 4:31 p.m.
Right Patch Set: Reverted the colors back Created March 9, 2018, 11:25 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « css/desktop-options.scss ('k') | js/desktop-options.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <!-- 2 <!--
3 - This file is part of Adblock Plus <https://adblockplus.org/>, 3 - This file is part of Adblock Plus <https://adblockplus.org/>,
4 - Copyright (C) 2006-present eyeo GmbH 4 - Copyright (C) 2006-present eyeo GmbH
5 - 5 -
6 - Adblock Plus is free software: you can redistribute it and/or modify 6 - Adblock Plus is free software: you can redistribute it and/or modify
7 - it under the terms of the GNU General Public License version 3 as 7 - it under the terms of the GNU General Public License version 3 as
8 - published by the Free Software Foundation. 8 - published by the Free Software Foundation.
9 - 9 -
10 - Adblock Plus is distributed in the hope that it will be useful, 10 - Adblock Plus is distributed in the hope that it will be useful,
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 <!-- General tab content --> 79 <!-- General tab content -->
80 <div id="content-general" role="tabpanel" aria-labelledby="tab-general"> 80 <div id="content-general" role="tabpanel" aria-labelledby="tab-general">
81 <header> 81 <header>
82 <h1 class="i18n_options_tab_general"></h1> 82 <h1 class="i18n_options_tab_general"></h1>
83 <p class="i18n_options_general_description"></p> 83 <p class="i18n_options_general_description"></p>
84 </header> 84 </header>
85 <section class="cols"> 85 <section class="cols">
86 <h2 class="i18n_options_privacy_header"></h2> 86 <h2 class="i18n_options_privacy_header"></h2>
87 <ul class="list" id="recommend-protection-list-table"> 87 <ul class="list" id="recommend-protection-list-table">
88 <template> 88 <template>
89 <button data-preconfigured="hide" data-action="toggle-remove-subsc ription" role="checkbox" class="control icon"></button> 89 <button data-action="toggle-remove-subscription" data-disable="pre configured" role="checkbox" class="control icon"></button>
Thomas Greiner 2018/03/02 17:00:02 As I mentioned, let's focus on fixing this regress
saroyanm 2018/03/02 17:36:32 I'm not sure why this comment is located here. The
Thomas Greiner 2018/03/05 14:52:10 What about reversing that and instead write `data-
saroyanm 2018/03/06 15:09:52 Done.
90 <button data-preconfigured="show" role="checkbox" class="control i con" disabled></button>
Thomas Greiner 2018/03/05 14:52:10 This button is redundant because we could simply s
saroyanm 2018/03/06 15:09:52 Done.
91 <span data-display="title"></span> 90 <span data-display="title"></span>
92 <span data-tooltip="options_protection_%value%_tooltip"></span> 91 <span data-tooltip="options_protection_%value%_tooltip"></span>
93 </template> 92 </template>
94 </ul> 93 </ul>
95 </section> 94 </section>
96 <section class="cols"> 95 <section class="cols">
97 <header> 96 <header>
98 <h2 class="i18n_options_acceptableAds_header"></h2> 97 <h2 class="i18n_options_acceptableAds_header"></h2>
99 <p class="i18n_options_acceptableAds_description"></p> 98 <p class="i18n_options_acceptableAds_description"></p>
100 </header> 99 </header>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 </header> 134 </header>
136 <div id="blocking-languages"> 135 <div id="blocking-languages">
137 <ul id="blocking-languages-table" class="table list bottom-control"> 136 <ul id="blocking-languages-table" class="table list bottom-control">
138 <template> 137 <template>
139 <span> 138 <span>
140 <span data-display="title"></span> 139 <span data-display="title"></span>
141 <span class="dimmed"> 140 <span class="dimmed">
142 (<span data-display="originalTitle"></span>) 141 (<span data-display="originalTitle"></span>)
143 </span> 142 </span>
144 </span> 143 </span>
145 <button data-single="hidden" data-preconfigured="hide" data-acti on="remove-subscription" class="icon delete control" title="options_control_remo ve_title"></button> 144 <button data-single="hidden" data-hide="preconfigured" data-acti on="remove-subscription" class="icon delete control" title="options_control_remo ve_title"></button>
146 <button data-single="visible" data-preconfigured="hide" data-act ion="open-dialog" data-dialog="language-change" class="i18n_options_language_cha nge link"></button> 145 <button data-single="visible" data-hide="preconfigured" data-act ion="open-dialog" data-dialog="language-change" class="i18n_options_language_cha nge link"></button>
147 </template> 146 </template>
148 </ul> 147 </ul>
149 <button class="i18n_options_language_add list" data-action="open-dia log" data-dialog="language-add"></button> 148 <button class="i18n_options_language_add list" data-action="open-dia log" data-dialog="language-add"></button>
150 <p class="i18n_options_language_tip"></p> 149 <p class="i18n_options_language_tip"></p>
151 </div> 150 </div>
152 </section> 151 </section>
153 <section id="more-filters" class="cols"> 152 <section id="more-filters" class="cols">
154 <header> 153 <header>
155 <h2 class="i18n_options_more_filters_header"></h2> 154 <h2 class="i18n_options_more_filters_header"></h2>
156 <p class="i18n_options_more_filters_description"></p> 155 <p class="i18n_options_more_filters_description"></p>
157 </header> 156 </header>
158 <div> 157 <div>
159 <ul id="more-list-table" class="table list"> 158 <ul id="more-list-table" class="table list">
160 <template> 159 <template>
161 <span data-display="title"></span> 160 <span data-display="title"></span>
162 <button data-preconfigured="hide" data-action="remove-subscripti on" class="i18n_options_control_remove_title link control" title="options_contro l_remove_title"></button> 161 <button data-hide="preconfigured" data-action="remove-subscripti on" class="i18n_options_control_remove_title link control" title="options_contro l_remove_title"></button>
163 </template> 162 </template>
164 </ul> 163 </ul>
165 <p class="i18n_options_more_filters_note"></p> 164 <p class="i18n_options_more_filters_note"></p>
166 </div> 165 </div>
167 </section> 166 </section>
168 </div> 167 </div>
169 168
170 <!-- Whitelist tab content --> 169 <!-- Whitelist tab content -->
171 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whitelist "> 170 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whitelist ">
172 <header> 171 <header>
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 <li role="menuitem"> 262 <li role="menuitem">
264 <button class="i18n_options_filterList_updateNow icon up date-subscription" data-action="update-subscription"></button> 263 <button class="i18n_options_filterList_updateNow icon up date-subscription" data-action="update-subscription"></button>
265 </li> 264 </li>
266 <li role="menuitem"> 265 <li role="menuitem">
267 <a class="i18n_options_filterList_website icon website" target="_blank"></a> 266 <a class="i18n_options_filterList_website icon website" target="_blank"></a>
268 </li> 267 </li>
269 <li role="menuitem"> 268 <li role="menuitem">
270 <a class="i18n_options_filterList_source icon source" ta rget="_blank"></a> 269 <a class="i18n_options_filterList_source icon source" ta rget="_blank"></a>
271 </li> 270 </li>
272 <li role="menuitem"> 271 <li role="menuitem">
273 <button class="i18n_options_control_remove_title icon de lete" data-preconfigured="hide" data-action="remove-subscription"></button> 272 <button class="i18n_options_control_remove_title icon de lete" data-hide="preconfigured" data-action="remove-subscription"></button>
274 </li> 273 </li>
275 </ul> 274 </ul>
276 </div> 275 </div>
277 </div> 276 </div>
278 </div> 277 </div>
279 <div class="col5"> 278 <div class="col5">
280 <button data-preconfigured="hide" data-action="remove-subscripti on" class="control icon delete"></button> 279 <button data-hide="preconfigured" data-action="remove-subscripti on" class="control icon delete"></button>
281 </div> 280 </div>
282 </template> 281 </template>
283 </ul> 282 </ul>
284 <div class="side-controls wrap"> 283 <div class="side-controls wrap">
285 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="import"></button> 284 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="import"></button>
286 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button> 285 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button>
287 </div> 286 </div>
288 </section> 287 </section>
289 288
290 <section class="cols"> 289 <section class="cols">
291 <header> 290 <header>
292 <h2 class="i18n_options_customFilters_title"></h2> 291 <h2 class="i18n_options_customFilters_title"></h2>
293 <p class="i18n_options_customFilters_description"></p> 292 <p class="i18n_options_customFilters_description"></p>
294 </header> 293 </header>
295 <div id="custom-filters"> 294 <div id="custom-filters">
296 <h3 class="i18n_options_customFilters_widget_title"></h3> 295 <h3 class="i18n_options_customFilters_widget_title"></h3>
297 <div id="empty-custom-filters"> 296 <div id="empty-custom-filters">
298 <p class="i18n_options_customFilters_tip"></p> 297 <p class="i18n_options_customFilters_tip"></p>
299 <button class="i18n_options_customFilters_start primary" data-acti on="edit-custom-filters"> 298 <button class="i18n_options_customFilters_start primary" data-acti on="edit-custom-filters">
300 </button> 299 </button>
301 <p> 300 <p>
302 <a class="i18n_options_customFilters_learn" id="link-filters" ta rget="_blank"></a> 301 <a class="i18n_options_customFilters_learn" id="link-filters" ta rget="_blank"></a>
303 </p> 302 </p>
304 </div> 303 </div>
305 <textarea id="custom-filters-raw" rows="15"></textarea> 304 <textarea id="custom-filters-raw" rows="15" spellcheck="false" autoc omplete="off"></textarea>
306 <div class="side-controls"> 305 <div class="side-controls">
307 <button id="custom-filters-edit" class="i18n_options_customFilter_ edit secondary" data-action="edit-custom-filters"> 306 <button id="custom-filters-edit" class="i18n_options_customFilter_ edit secondary" data-action="edit-custom-filters">
308 </button> 307 </button>
309 <div class="side-controls" id="custom-filters-raw-controls"> 308 <div class="side-controls" id="custom-filters-raw-controls">
310 <button class="i18n_options_customFilter_cancel secondary" data- action="cancel-custom-filters"></button> 309 <button class="i18n_options_customFilter_cancel secondary" data- action="cancel-custom-filters"></button>
311 <button class="i18n_options_customFilter_save primary" data-acti on="save-custom-filters"></button> 310 <button class="i18n_options_customFilter_save primary" data-acti on="save-custom-filters"></button>
312 </div> 311 </div>
313 </div> 312 </div>
314 </div> 313 </div>
315 </section> 314 </section>
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 </div> 430 </div>
432 <!-- Notification --> 431 <!-- Notification -->
433 <div id="notification" aria-hidden="true" aria-live="polite"> 432 <div id="notification" aria-hidden="true" aria-live="polite">
434 <strong id="notification-text"></strong> 433 <strong id="notification-text"></strong>
435 <button class="icon close secondary" data-action="hide-notification"> 434 <button class="icon close secondary" data-action="hide-notification">
436 <span class="i18n_options_notification_hide sr-only"></span> 435 <span class="i18n_options_notification_hide sr-only"></span>
437 </button> 436 </button>
438 </div> 437 </div>
439 </body> 438 </body>
440 </html> 439 </html>
LEFTRIGHT
« css/desktop-options.scss ('k') | js/desktop-options.js » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld