Side by Side Diff: new-options.html
Issue 29536681:
Issue 5628 - Implement main styles (Closed)
Patch Set:
Created Sept. 6, 2017, 6:26 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« locale/en-US/new-options.json ('k')
|
skin/icons/arrow.svg » ('j')
|
skin/new-options.css » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 69 data-action="open-dialog" data-dialog="about"></button> | 69 data-action="open-dialog" data-dialog="about"></button> |
| 70 </p> | 70 </p> |
| 71 </footer> | 71 </footer> |
| 72 </div> | 72 </div> |
| 73 </div> | 73 </div> |
| 74 <main> | 74 <main> |
| 75 <div id="dialog-background"></div> | 75 <div id="dialog-background"></div> |
| 76 | 76 |
| 77 <!-- General tab content --> | 77 <!-- General tab content --> |
| 78 <div id="content-general" role="tabpanel" aria-labelledby="tab-general"> | 78 <div id="content-general" role="tabpanel" aria-labelledby="tab-general"> |
| 79 <h1 class="i18n_options_tab_general"></h1> | 79 <h1 class="i18n_options_tab_general"></h1> |
|
juliandoucette
2017/09/12 22:45:36
NIT/Suggest: Wrap <h1> and <p> inside a <header>
saroyanm
2017/09/13 15:26:35
Agree.
saroyanm
2017/09/13 16:47:58
Done.
| |
| 80 <p class="i18n_options_general_description"></p> | 80 <p class="i18n_options_general_description"></p> |
| 81 <section> | 81 <section class="cols"> |
| 82 <h2 class="i18n_options_privacy_header"></h2> | 82 <h2 class="i18n_options_privacy_header"></h2> |
| 83 <ul id="recommend-protection-list-table" class="table list"> | 83 <ul class="list" id="recommend-protection-list-table"> |
| 84 <template> | 84 <template> |
| 85 <button data-action="toggle-remove-subscription" role="checkbox" c lass="control"></button> | 85 <button data-action="toggle-remove-subscription" role="checkbox" c lass="control"></button> |
|
juliandoucette
2017/09/12 22:45:35
NIT/Suggest: Implement a custom checkbox like this
saroyanm
2017/09/13 15:26:34
We will file another issue to address separately.
| |
| 86 <label class="display"></label> | 86 <label class="display"></label> |
| 87 <span class="i18n_options_readMore" data-tooltip="options_protecti on_%value%_tooltip"></span> | 87 <span data-tooltip="options_protection_%value%_tooltip"></span> |
| 88 </template> | 88 </template> |
| 89 </ul> | 89 </ul> |
| 90 </section> | 90 </section> |
| 91 <section> | 91 <section class="cols"> |
| 92 <h2 class="i18n_options_acceptableAds_header"></h2> | 92 <header> |
| 93 <p class="i18n_options_acceptableAds_description"></p> | 93 <h2 class="i18n_options_acceptableAds_header"></h2> |
| 94 <p class="i18n_options_acceptableAds_description"></p> | |
| 95 </header> | |
| 94 <form id="acceptable-ads"> | 96 <form id="acceptable-ads"> |
| 95 <div> | 97 <div> |
| 96 <input data-action="switch-acceptable-ads" type="radio" name="acce ptable-ads" value="ads"> | 98 <input data-action="switch-acceptable-ads" type="radio" name="acce ptable-ads" value="ads"> |
| 97 <label class="i18n_options_acceptableAds_ads_label"></label> | 99 <label class="i18n_options_acceptableAds_ads_label"></label> |
| 98 <p id="enable-aa-description" class="i18n_options_acceptableAds_ad s_description_1"></p> | 100 <p id="enable-aa-description" class="i18n_options_acceptableAds_ad s_description_1"></p> |
| 99 <p class="i18n_options_acceptableAds_ads_description_2"></p> | 101 <p class="i18n_options_acceptableAds_ads_description_2"></p> |
| 100 </div> | 102 </div> |
| 101 <div> | 103 <div> |
| 102 <input data-action="switch-acceptable-ads" type="radio" name="acce ptable-ads" value="privacy"> | 104 <input data-action="switch-acceptable-ads" type="radio" name="acce ptable-ads" value="privacy"> |
| 103 <label class="i18n_options_acceptableAds_privacy_label"></label> | 105 <label class="i18n_options_acceptableAds_privacy_label"></label> |
| 104 <p class="i18n_options_acceptableAds_privacy_description"></p> | 106 <p class="i18n_options_acceptableAds_privacy_description"></p> |
| 105 <p id="dnt" class="i18n_options_acceptableAds_dnt_notification"></ p> | 107 <p id="dnt" class="i18n_options_acceptableAds_dnt_notification"></ p> |
| 106 </div> | 108 </div> |
| 107 <div> | 109 <div> |
| 108 <input data-action="switch-acceptable-ads" type="radio" name="acce ptable-ads" value="none"> | 110 <input data-action="switch-acceptable-ads" type="radio" name="acce ptable-ads" value="none"> |
| 109 <label class="i18n_options_acceptableAds_none_label"></label> | 111 <label class="i18n_options_acceptableAds_none_label"></label> |
| 110 </div> | 112 </div> |
| 111 </form> | 113 </form> |
| 112 </section> | 114 </section> |
| 113 <section> | 115 <section class="cols"> |
| 114 <h2 class="i18n_options_language_header"></h2> | 116 <header> |
| 115 <p class="i18n_options_language_description"></p> | 117 <h2 class="i18n_options_language_header"></h2> |
| 118 <p class="i18n_options_language_description"></p> | |
| 119 </header> | |
| 116 <div id="blocking-languages"> | 120 <div id="blocking-languages"> |
|
saroyanm
2017/09/06 19:02:56
Note: There is a ticket for improving semantics us
juliandoucette
2017/09/12 22:45:35
Acknowledged.
| |
| 117 <ul id="blocking-languages-table" class="table list"> | 121 <ul id="blocking-languages-table" class="table list"> |
| 118 <template> | 122 <template> |
| 119 <label class="display"></label> | 123 <label class="display"></label> |
| 120 <button data-single="hidden" data-action="remove-subscription" c lass="delete control" title="options_control_remove_title"></button> | 124 <button data-single="hidden" data-action="remove-subscription" c lass="delete control" title="options_control_remove_title"></button> |
| 121 <button data-single="visible" data-action="open-dialog" data-dia log="language-change" class="i18n_options_language_change"></button> | 125 <button data-single="visible" data-action="open-dialog" data-dia log="language-change" class="i18n_options_language_change link"></button> |
| 122 </template> | 126 </template> |
| 123 </ul> | 127 </ul> |
| 124 <div class="controls"> | 128 <button class="i18n_options_language_add list" data-action="open-dia log" data-dialog="language-add"></button> |
| 125 <button data-action="open-dialog" data-dialog="language-add"> | 129 <p class="i18n_options_language_tip"></p> |
| 126 <span class="i18n_options_language_add"></span> | |
| 127 </button> | |
| 128 </div> | |
| 129 </div> | 130 </div> |
| 130 <p class="i18n_options_language_tip"></p> | |
| 131 </section> | 131 </section> |
| 132 <section> | 132 <section class="cols"> |
| 133 <h2 class="i18n_options_more_filters_header"></h2> | 133 <header> |
| 134 <p class="i18n_options_more_filters_description"></p> | 134 <h2 class="i18n_options_more_filters_header"></h2> |
| 135 <ul id="custom-list-table" class="table list"> | 135 <p class="i18n_options_more_filters_description"></p> |
| 136 <template> | 136 </header> |
| 137 <label class="display"></label> | 137 <div> |
| 138 <button data-action="remove-subscription" class="delete control" t itle="options_control_remove_title"></button> | 138 <ul id="custom-list-table" class="table list"> |
|
juliandoucette
2017/09/12 22:45:35
NIT: I think "table" and "list" is redundant here.
saroyanm
2017/09/13 15:26:34
I'm using .table for the "list items" that has bor
| |
| 139 </template> | 139 <template> |
| 140 </ul> | 140 <label class="display"></label> |
| 141 <p class="i18n_options_more_filters_note"></p> | 141 <button data-action="remove-subscription" class="i18n_options_co ntrol_remove_title link control" title="options_control_remove_title"></button> |
| 142 </template> | |
| 143 </ul> | |
| 144 <p class="i18n_options_more_filters_note"></p> | |
| 145 </div> | |
| 142 </section> | 146 </section> |
| 143 </div> | 147 </div> |
| 144 | 148 |
| 145 <!-- Whitelist tab content --> | 149 <!-- Whitelist tab content --> |
| 146 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whitelist "> | 150 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whitelist "> |
| 147 <h1 class="i18n_options_tab_whitelist"></h1> | 151 <h1 class="i18n_options_tab_whitelist"></h1> |
| 148 <p class="i18n_options_whitelist_description"></p> | 152 <p class="i18n_options_whitelist_description"></p> |
| 149 <form> | 153 <form class="section"> |
| 150 <input id="whitelisting-textbox" type="text"> | 154 <input id="whitelisting-textbox" type="text"> |
| 151 <button id="whitelisting-add-button" | 155 <button id="whitelisting-add-button" |
| 152 type="submit" | 156 type="submit" |
| 153 data-action="add-domain-exception" | 157 data-action="add-domain-exception" |
| 154 class="i18n_options_whitelist_add" disabled> | 158 class="i18n_options_whitelist_add primary" disabled> |
| 155 </button> | 159 </button> |
| 156 <div id="whitelisting-validation"></div> | |
| 157 </form> | 160 </form> |
| 158 <ul id="whitelisting-table" class="table list"> | 161 <ul id="whitelisting-table" class="table list"> |
| 159 <template> | 162 <template> |
| 160 <label class="display"></label> | 163 <label class="display"></label> |
| 161 <button data-action="remove-filter" class="delete control" | 164 <button data-action="remove-filter" class="delete control" |
| 162 title="options_control_remove_title"> | 165 title="options_control_remove_title"> |
| 163 </button> | 166 </button> |
| 164 </template> | 167 </template> |
| 165 </ul> | 168 </ul> |
| 166 </div> | 169 </div> |
| 167 | 170 |
| 168 <!-- Advanced tab content --> | 171 <!-- Advanced tab content --> |
| 169 <div id="content-advanced" role="tabpanel" | 172 <div id="content-advanced" role="tabpanel" |
| 170 aria-labelledby="tab-advanced"> | 173 aria-labelledby="tab-advanced"> |
| 171 <div> | 174 <h1 class="i18n_options_tab_advanced"></h1> |
|
juliandoucette
2017/09/12 22:45:35
NIT/Suggest: Wrap this <h1> and <p> in a <header>
saroyanm
2017/09/13 15:26:35
Acknowledged.
| |
| 172 <h1 class="i18n_options_tab_advanced"></h1> | 175 <p class="i18n_options_advanced_description"></p> |
| 173 <p class="i18n_options_advanced_description"></p> | 176 <section class="cols"> |
| 174 <section> | 177 <h2 class="i18n_options_customize_header"></h2> |
| 175 <h2 class="i18n_options_customize_header"></h2> | 178 <ul id="customize" class="list"> |
| 176 <ul id="customize" class="table"> | 179 <li data-pref="shouldShowBlockElementMenu"> |
| 177 <li data-pref="shouldShowBlockElementMenu"> | 180 <button role="checkbox" data-action="toggle-pref"></button> |
| 178 <label> | 181 <span class="i18n_options_customize_blockElement display"></span> |
| 179 <button role="checkbox" data-action="toggle-pref"></button> | 182 <span data-tooltip="options_customize_blockElement_tooltip"></span > |
| 180 <span class="i18n_options_customize_blockElement"></span> | 183 </li> |
| 181 <span class="i18n_options_readMore" | 184 <li data-pref="show_devtools_panel"> |
| 182 data-tooltip="options_customize_blockElement_tooltip"></span > | 185 <button role="checkbox" data-action="toggle-pref"></button> |
| 183 </label> | 186 <span class="i18n_options_customize_showDevToolsPanel display"></s pan> |
| 184 </li> | 187 <span data-tooltip="options_customize_showDevToolsPanel_tooltip">< /span> |
| 185 <li data-pref="show_devtools_panel"> | 188 </li> |
| 186 <label> | 189 <li data-pref="notifications_ignoredcategories"> |
| 187 <button role="checkbox" data-action="toggle-pref"></button> | 190 <button role="checkbox" data-action="toggle-pref"></button> |
| 188 <span class="i18n_options_customize_showDevToolsPanel"></span> | 191 <span class="i18n_options_customize_showNotifications display"></s pan> |
| 189 <span class="i18n_options_readMore" | 192 <span data-tooltip="options_customize_showNotifications_tooltip">< /span> |
| 190 data-tooltip="options_customize_showDevToolsPanel_tooltip">< /span> | 193 </li> |
| 191 </label> | 194 </ul> |
| 192 </li> | 195 </section> |
| 193 <li data-pref="notifications_ignoredcategories"> | |
| 194 <label> | |
| 195 <button role="checkbox" data-action="toggle-pref"></button> | |
| 196 <span class="i18n_options_customize_showNotifications"></span> | |
| 197 <span class="i18n_options_readMore" | |
| 198 data-tooltip="options_customize_showNotifications_tooltip">< /span> | |
| 199 </label> | |
| 200 </li> | |
| 201 </ul> | |
| 202 </section> | |
| 203 </div> | |
| 204 | 196 |
| 205 <section> | 197 <section> |
| 206 <h1 class="i18n_options_filterList_title"></h1> | 198 <header> |
| 207 <p id="filter-lists-description" class="i18n_options_filterList_descri ption"></p> | 199 <h2 class="i18n_options_filterList_title"></h2> |
| 200 <p id="filter-lists-description" class="i18n_options_filterList_desc ription"></p> | |
| 201 </header> | |
| 208 | 202 |
| 209 <div id="all-filter-lists-table-header"> | 203 <div id="all-filter-lists-table-header" class="th"> |
|
juliandoucette
2017/09/12 22:45:35
Note: It's not clear why you didn't use a real tab
saroyanm
2017/09/13 15:26:35
We have issue to address that -> https://issues.ad
| |
| 210 <h2 class="i18n_options_filterList_column_status"></h2> | 204 <h3 class="i18n_options_filterList_column_status col4"></h3> |
| 211 <h2 class="i18n_options_filterList_column_name"></h2> | 205 <h3 class="i18n_options_filterList_column_name col4"></h3> |
| 212 <h2 class="i18n_options_filterList_column_update"></h2> | 206 <h3 class="i18n_options_filterList_column_update col4"></h3> |
| 207 <h3 class="col4"></h3> | |
| 213 </div> | 208 </div> |
| 214 <ul class="table cols" id="all-filter-lists-table"> | 209 <ul class="table cols" id="all-filter-lists-table"> |
|
juliandoucette
2017/09/12 22:45:34
Note:
I was able to:
- Make this list unrespons
saroyanm
2017/09/13 15:26:35
Most of them are caused by adding empty filter lis
| |
| 215 <template> | 210 <template> |
| 216 <button data-action="remove-subscription" class="control delete">< /button> | 211 <div class="col4"> |
| 217 <button data-action="toggle-disable-subscription" role="checkbox" class="control"> | 212 <button data-action="toggle-disable-subscription" role="checkbox " class="control toggle"> |
|
juliandoucette
2017/09/12 22:45:35
NIT/Suggest: A checkbox is a more appropriate inpu
juliandoucette
2017/09/12 22:45:35
NIT: This switch shows 1px from the left on the ri
saroyanm
2017/09/13 15:26:35
Same as mentioned above.
saroyanm
2017/09/13 15:26:35
I'll update width of icon to -> 2.25rem
saroyanm
2017/09/13 16:47:57
Done.
| |
| 218 </button> | 213 </button> |
| 219 <div class="state"> | 214 <div class="state"> |
| 220 <span class="i18n_options_filterList_state_active" id="state-act ive"></span> | 215 <span class="i18n_options_filterList_state_active" id="state-a ctive"></span> |
| 221 <span class="i18n_options_filterList_state_disabled" id="state-d isabled"></span> | 216 <span class="i18n_options_filterList_state_disabled" id="state -disabled"></span> |
| 217 </div> | |
| 222 </div> | 218 </div> |
| 223 <div> | 219 <div class="col4"> |
| 224 <label class="display"></label> | 220 <label class="display"></label> |
| 225 </div> | 221 </div> |
| 226 <span class="last-update"></span> | 222 <div class="col4"> |
| 227 <span class="message"></span> | 223 <span class="last-update"></span> |
| 228 <a data-action="open-context-menu" class="arrow"></a> | 224 <span class="message"></span> |
| 229 <div role="menubar" class="context-menu-wrapper"> | 225 </div> |
| 230 <div class="context-menu"> | 226 <div class="col4"> |
| 231 <ul class="content" role="menu"> | 227 <button data-action="open-context-menu" class="gear"></button> |
| 232 <li role="menuitem"> | 228 <div role="menubar" class="context-menu-wrapper"> |
| 233 <a class="i18n_options_filterList_updateNow update-subscri ption" data-action="update-subscription"></a> | 229 <div class="context-menu"> |
| 234 </li> | 230 <ul class="content" role="menu"> |
| 235 <li role="menuitem"> | 231 <li role="menuitem"> |
| 236 <a class="i18n_options_filterList_website website" target= "_blank"></a> | 232 <button class="i18n_options_filterList_updateNow update- subscription" data-action="update-subscription"></button> |
| 237 </li> | 233 </li> |
| 238 <li role="menuitem"> | 234 <li role="menuitem"> |
| 239 <a class="i18n_options_filterList_source source" target="_ blank"></a> | 235 <a class="i18n_options_filterList_website website" targe t="_blank"></a> |
| 240 </li> | 236 </li> |
| 241 <li role="menuitem"> | 237 <li role="menuitem"> |
| 242 <a class="i18n_options_filterList_delete delete" data-acti on="remove-subscription"></a> | 238 <a class="i18n_options_filterList_source source" target= "_blank"></a> |
| 243 </li> | 239 </li> |
| 244 </ul> | 240 <li role="menuitem"> |
| 241 <button class="i18n_options_filterList_delete delete" da ta-action="remove-subscription"></button> | |
| 242 </li> | |
| 243 </ul> | |
| 244 </div> | |
| 245 </div> | 245 </div> |
| 246 <button data-action="remove-subscription" class="control delete" ></button> | |
| 246 </div> | 247 </div> |
| 247 </template> | 248 </template> |
| 248 </ul> | 249 </ul> |
| 249 <div class="controls"> | 250 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="custom"></button> |
| 250 <button data-action="open-dialog" data-dialog="custom"> | 251 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button> |
| 251 <span class="icon icon-add"></span> | |
| 252 <span class="i18n_options_filterList_add"></span> | |
| 253 </button> | |
| 254 <button data-action="update-all-subscriptions"> | |
| 255 <span class="icon icon-update"></span> | |
| 256 <span class="i18n_options_filterList_update"></span> | |
| 257 </button> | |
| 258 </div> | |
| 259 </section> | 252 </section> |
| 260 | 253 |
| 261 <section> | 254 <section class="cols"> |
| 262 <h1 class="i18n_options_customFilters_title"></h1> | 255 <header> |
| 263 <p class="i18n_options_customFilters_description"></p> | 256 <h2 class="i18n_options_customFilters_title"></h2> |
| 264 <h2 class="i18n_options_customFilters_widget_title"></h2> | 257 <p class="i18n_options_customFilters_description"></p> |
| 258 </header> | |
| 265 <div id="custom-filters"> | 259 <div id="custom-filters"> |
| 260 <h3 class="i18n_options_customFilters_widget_title"></h3> | |
| 266 <div id="empty-custom-filters"> | 261 <div id="empty-custom-filters"> |
| 267 <p class="i18n_options_customFilters_tip"></p> | 262 <p class="i18n_options_customFilters_tip"></p> |
|
juliandoucette
2017/09/12 22:45:35
NIT: You're missing an icon here.
saroyanm
2017/09/13 15:26:36
Yes, we are waiting for the assets
| |
| 268 <button class="i18n_options_customFilters_start" data-action="edit -custom-filters"> | 263 <button class="i18n_options_customFilters_start secondary" data-ac tion="edit-custom-filters"> |
|
juliandoucette
2017/09/12 22:45:35
NIT: This is supposed to be a primary button.
saroyanm
2017/09/13 15:26:36
Acknowledged.
saroyanm
2017/09/13 16:47:57
Done.
| |
| 269 </button> | 264 </button> |
| 270 <p> | 265 <p> |
| 271 <a class="i18n_options_customFilters_learn" id="link-filters" ta rget="_blank"></a> | 266 <a class="i18n_options_customFilters_learn" id="link-filters" ta rget="_blank"></a> |
|
juliandoucette
2017/09/12 22:45:34
NIT: This string is missing a period.
saroyanm
2017/09/13 15:26:35
In specs documentation we are not using period.
| |
| 272 </p> | 267 </p> |
| 273 </div> | 268 </div> |
| 274 <textarea id="custom-filters-raw" rows="15"></textarea> | 269 <textarea id="custom-filters-raw" rows="15"></textarea> |
| 275 <button id="custom-filters-edit" class="i18n_options_customFilter_ed it" data-action="edit-custom-filters"> | 270 <button id="custom-filters-edit" class="i18n_options_customFilter_ed it secondary" data-action="edit-custom-filters"> |
| 276 </button> | 271 </button> |
| 277 <div id="custom-filters-raw-controls"> | 272 <div id="custom-filters-raw-controls"> |
| 278 <button class="i18n_options_customFilter_save" data-action="save-c ustom-filters"> | 273 <button class="i18n_options_customFilter_cancel secondary" data-ac tion="cancel-custom-filters"></button> |
| 279 </button> | 274 <button class="i18n_options_customFilter_save primary" data-action ="save-custom-filters"></button> |
| 280 <button class="i18n_options_customFilter_cancel" data-action="canc el-custom-filters"> | |
| 281 </button> | |
| 282 </div> | 275 </div> |
| 283 </div> | 276 </div> |
| 284 </section> | 277 </section> |
| 285 </div> | 278 </div> |
| 286 | 279 |
| 287 <!-- Help tab content --> | 280 <!-- Help tab content --> |
| 288 <div id="content-help" role="tabpanel" aria-labelledby="tab-help"> | 281 <div id="content-help" role="tabpanel" aria-labelledby="tab-help"> |
| 289 <h1 class="i18n_options_tab_help"></h1> | 282 <h1 class="i18n_options_tab_help"></h1> |
| 290 <p class="i18n_options_help_description"></p> | 283 <p class="i18n_options_help_description"></p> |
| 291 <section> | 284 <section class="cols"> |
| 292 <h2 class="i18n_options_support_title"></h2> | 285 <h2 class="i18n_options_support_title"></h2> |
| 293 <ul> | 286 <ul> |
| 294 <li id="report-issue" class="i18n_options_report_issue"></li> | 287 <li id="report-issue" class="i18n_options_report_issue"></li> |
| 295 <li id="report-ad" class="i18n_options_report_ad"></li> | 288 <li id="report-ad" class="i18n_options_report_ad"></li> |
| 296 <li id="report-bug" class="i18n_options_report_bug"></li> | 289 <li id="report-bug" class="i18n_options_report_bug"></li> |
| 297 <li id="report-forum" class="i18n_options_report_forum"></li> | 290 <li id="report-forum" class="i18n_options_report_forum"></li> |
| 298 </ul> | 291 </ul> |
| 299 </section> | 292 </section> |
| 300 <section> | 293 <section class="cols"> |
| 301 <h2 class="i18n_options_social_title"></h2> | 294 <header> |
| 302 <p class="i18n_options_social_description"></p> | 295 <h2 class="i18n_options_social_title"></h2> |
| 296 <p class="i18n_options_social_description"></p> | |
| 297 </header> | |
| 303 <div id="social"> | 298 <div id="social"> |
| 304 <ul id="social-general"> | 299 <ul id="social-general"> |
| 305 <li><a id="twitter">Twitter</a></li> | 300 <li><a id="twitter">Twitter</a></li> |
| 306 <li><a id="facebook">Facebook</a></li> | 301 <li><a id="facebook">Facebook</a></li> |
| 307 <li><a id="google-plus">Google Plus</a></li> | 302 <li><a id="google-plus">Google Plus</a></li> |
| 308 </ul> | 303 </ul> |
| 309 <ul id="social-chinese"> | 304 <ul id="social-chinese"> |
| 310 <li><a id="weibo">Weibo</a></li> | 305 <li><a id="weibo">Weibo</a></li> |
| 311 </ul> | 306 </ul> |
| 312 <p> | 307 <p> |
| 313 <strong> | 308 <strong> |
| 314 <span class="i18n_options_email"></span> | 309 <span class="i18n_options_email"></span> |
| 315 <a href="mailto:support@adblockplus.org">support@adblockplus.org </a> | 310 <a href="mailto:support@adblockplus.org">support@adblockplus.org </a> |
| 316 </strong> | 311 </strong> |
| 317 </p> | 312 </p> |
| 318 </div> | 313 </div> |
| 319 </section> | 314 </section> |
| 320 </div> | 315 </div> |
| 321 </main> | 316 </main> |
| 322 | 317 |
| 323 <!-- Dialog --> | 318 <!-- Dialog --> |
| 324 <div id="dialog" role="dialog" aria-hidden="true"> | 319 <div id="dialog" role="dialog" aria-hidden="true"> |
| 325 <header> | 320 <header> |
| 326 <span id="dialog-title"> | 321 <span id="dialog-title"> |
| 327 <span id="dialog-title-about" class="i18n_options_dialog_about_title"> </span> | 322 <h3 id="dialog-title-about" class="i18n_options_dialog_about_title"></ h3> |
| 328 <span id="dialog-title-custom" class="i18n_options_dialog_custom_title "></span> | 323 <h3 id="dialog-title-custom" class="i18n_options_dialog_custom_title"> </h3> |
| 329 <span id="dialog-title-language-add" class="i18n_options_dialog_langua ge_title"></span> | 324 <h3 id="dialog-title-language-add" class="i18n_options_dialog_language _title"></h3> |
| 330 <span id="dialog-title-language-change" class="i18n_options_dialog_lan guage_title"></span> | 325 <h3 id="dialog-title-language-change" class="i18n_options_dialog_langu age_title"></h3> |
| 331 <span id="dialog-title-predefined" class="i18n_options_dialog_predefin ed_title"></span> | 326 <h3 id="dialog-title-predefined" class="i18n_options_dialog_predefined _title"></h3> |
| 332 </span> | 327 </span> |
| 333 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button> | 328 <button id="dialog-close" data-action="close-dialog"></button> |
| 334 </header> | 329 </header> |
| 335 <div id="dialog-body" class="content"> | 330 <div id="dialog-body" class="content"> |
| 336 <!-- About Adblock Plus --> | 331 <!-- About Adblock Plus --> |
| 337 <div id="dialog-content-about" class="dialog-content"> | 332 <div id="dialog-content-about" class="dialog-content"> |
| 338 <p id="abp-version"></p> | 333 <p id="abp-version"></p> |
| 339 <p class="i18n_options_dialog_about_copyright"></p> | 334 <p class="i18n_options_dialog_about_copyright"></p> |
|
juliandoucette
2017/09/12 22:45:35
NIT: This should probably be two paragraphs (based
saroyanm
2017/09/13 15:26:35
Acknowledged.
saroyanm
2017/09/13 16:47:58
Done.
| |
| 340 <p> | 335 <p> |
| 341 <button class="i18n_options_close primary" data-action="close-dialog "></button> | 336 <button class="i18n_options_close primary" data-action="close-dialog "></button> |
| 342 </p> | 337 </p> |
| 343 </div> | 338 </div> |
| 344 <!-- Add language subscription --> | 339 <!-- Add language subscription --> |
| 345 <div id="dialog-content-language-add" class="dialog-content"> | 340 <div id="dialog-content-language-add" class="dialog-content"> |
| 346 <ul id="all-lang-table-add" class="table list"> | 341 <ul id="all-lang-table-add" class="table list"> |
| 347 <template> | 342 <template> |
| 348 <button data-action="add-language-subscription,close-dialog" class ="control add" role="checkbox"> | 343 <button data-action="add-language-subscription,close-dialog" class ="control add" role="checkbox"> |
| 349 <label class="display"></label> | 344 <label class="display"></label> |
| 350 </button> | 345 </button> |
| 351 <button data-action="change-language-subscription,close-dialog" cl ass="control change" role="checkbox"> | 346 <button data-action="change-language-subscription,close-dialog" cl ass="control change" role="checkbox"> |
| 352 <label class="display"></label> | 347 <label class="display"></label> |
| 353 </button> | 348 </button> |
| 354 </template> | 349 </template> |
| 355 </ul> | 350 </ul> |
| 356 </div> | 351 </div> |
| 357 <!-- Add custom subscription --> | 352 <!-- Add custom subscription --> |
| 358 <div id="dialog-content-custom" class="dialog-content"> | 353 <div id="dialog-content-custom" class="dialog-content"> |
| 359 <div class="dialog-content-block"> | 354 <div> |
| 360 <div> | 355 <label for="blockingList-textbox" class="i18n_options_dialog_custom_ subscription_title"></label> |
| 361 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> | 356 <input id="blockingList-textbox" type="text" class="default-focus" p laceholder="https://website.com/filterlist.txt" /> |
| 362 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" /> | |
| 363 </div> | |
| 364 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button> | |
| 365 </div> | 357 </div> |
| 366 <div class="dialog-content-block"> | 358 <p> |
| 367 <h3 class="i18n_options_dialog_edit_own_list"></h3> | 359 <button class="i18n_options_dialog_custom_import primary" data-actio n="import-subscription"></button> |
| 368 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced"></button> | 360 </p> |
| 369 </div> | |
| 370 </div> | 361 </div> |
| 371 <!-- Add predefined subscription --> | 362 <!-- Add predefined subscription --> |
| 372 <div id="dialog-content-predefined" class="dialog-content"> | 363 <div id="dialog-content-predefined" class="dialog-content"> |
| 373 <div class="dialog-content-block"> | 364 <div class="dialog-content-block"> |
| 374 <h3></h3> | 365 <h3></h3> |
| 375 <div class="url"></div> | 366 <div class="url"></div> |
| 376 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 367 <button class="i18n_options_dialog_predefined_confirm default-focus primary" data-action="add-predefined-subscription"></button> |
| 377 </div> | 368 </div> |
| 378 </div> | 369 </div> |
| 379 </div> | 370 </div> |
| 380 <!-- Placeholder element to determine when to wrap focus around --> | 371 <!-- Placeholder element to determine when to wrap focus around --> |
| 381 <span class="focus-last" tabindex="0"></span> | 372 <span class="focus-last" tabindex="0"></span> |
| 382 </div> | 373 </div> |
| 383 <!-- Notification --> | 374 <!-- Notification --> |
| 384 <div id="notification" aria-hidden="true" aria-live="polite"> | 375 <div id="notification" aria-hidden="true" aria-live="polite"> |
| 385 <strong id="notification-text"></strong> | 376 <strong id="notification-text"></strong> |
| 386 <button id="hide-notification" data-action="hide-notification"> | 377 <button id="hide-notification" data-action="hide-notification"> |
| 387 <span class="i18n_options_notification_hide sr-only"></span> | 378 <span class="i18n_options_notification_hide sr-only"></span> |
| 388 </button> | 379 </button> |
| 389 </div> | 380 </div> |
| 390 </body> | 381 </body> |
| 391 </html> | 382 </html> |
| OLD | NEW |
« no previous file with comments
|
« locale/en-US/new-options.json ('k')
|
skin/icons/arrow.svg » ('j')
|
skin/new-options.css » ('J')
