Unified Diff: new-options.html
Issue 29502647:
Issue 5482 - Sidebar and about ABP dialog (Closed)
Patch Set: Rebased
Created Aug. 23, 2017, 1:29 p.m.
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')
|
new-options.js » ('j')
|
skin/new-options.css » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: new-options.html |
| =================================================================== |
| --- a/new-options.html |
| +++ b/new-options.html |
| @@ -30,59 +30,49 @@ |
| </head> |
| <body data-tab="general"> |
| <!-- Navigation sidebar --> |
| - <div id="nav-sidebar"> |
| - <div id="fixed-sidebar" class="fixed"> |
| - <header id="page-title"> |
| - <p class="i18n_options_page_header_1"></p> |
| - <h1 class="i18n_options_page_header_2"></h1> |
| + <div id="sidebar"> |
| + <div class="fixed"> |
| + <header> |
| + <img id="sidebar-logo" src="skin/abp-logo.svg"> |
| + <h1> |
| + Adblock <strong>Plus</strong> |
| + </h1> |
| + <p class="i18n_options_page_title"></p> |
| </header> |
| <nav> |
| - <ul id="nav-tablist" class="tabs vertical" |
| + <ul class="tabs" |
| role="tablist" data-action="switch-tab" |
| data-keys="ArrowLeft ArrowUp ArrowRight ArrowDown"> |
| - <li id="tab-general" role="tab" data-tab="general" |
| - aria-selected="true" aria-controls="content-general" |
| - tabindex="0"> |
| - <span class="i18n_options_tab_general"></span> |
| + <li> |
| + <a href="#general" class="i18n_options_tab_general" role="tab" aria-selected="true" aria-controls="content-general"></a> |
| </li> |
| - <li id="tab-whitelist" role="tab" data-tab="whitelist" |
| - aria-controls="content-whitelist" |
| - tabindex="-1"> |
| - <span class="i18n_options_tab_whitelist"></span> |
| + <li> |
| + <a href="#whitelist" class="i18n_options_tab_whitelist" role="tab" aria-controls="content-whitelist"></a> |
| </li> |
| - <li id="tab-advanced" role="tab" data-tab="advanced" |
| - aria-controls="content-advanced" tabindex="-1"> |
| - <span class="i18n_options_tab_advanced"></span> |
| + <li> |
| + <a href="#advanced" class="i18n_options_tab_advanced" role="tab" aria-controls="content-advanced"></a> |
| </li> |
| - <li id="tab-help" role="tab" data-tab="help" |
| - aria-controls="content-help" tabindex="-1"> |
| - <span class="i18n_options_tab_help"></span> |
| + <li> |
| + <a href="#help" class="i18n_options_tab_help" role="tab" aria-controls="content-help"></a> |
| </li> |
| </ul> |
| </nav> |
| - |
| - <a id="link-version"> |
| - <span class="i18n_options_version"></span> |
| - <span id="abp-version"></span> |
| - </a> |
| - |
| <footer> |
| - <ul class="tabs vertical bottom" data-action="open-doclink" |
| - data-keys="Enter"> |
| - <li id="tab-share" data-doclink="share-general" tabindex="0"> |
| - <span class="i18n_options_tab_share"></span> |
| - </li> |
| - <li id="tab-contribute" data-doclink="contribute" tabindex="0"> |
| - <span class="i18n_options_tab_contribute"></span> |
| - </li> |
| - </ul> |
| - </footer> |
| + <p> |
| + <a id="contribute" |
| + class="i18n_options_footer_contribute button secondary" |
| + target="_blank"></a> |
| + </p> |
| + <p> |
| + <button class="i18n_options_footer_about link" |
| + data-action="open-dialog" data-dialog="about"></button> |
| + </p> |
| + </footer> |
| </div> |
| </div> |
| - <div id="content"> |
| - <div id="content-wrapper"> |
| - <div id="dialog-background"></div> |
| + <main> |
| + <div id="dialog-background"></div> |
| <!-- General tab content --> |
| <div id="content-general" role="tabpanel" aria-labelledby="tab-general"> |
| @@ -319,14 +309,14 @@ |
| <a id="link-weibo" target="_blank">weibo</a> |
| </span> |
| </p> |
| - </div> |
| </div> |
| - </div> |
| + </main> |
| <!-- Dialog --> |
| <div id="dialog" role="dialog" aria-hidden="true"> |
| <header> |
| <span id="dialog-title"> |
| + <span id="dialog-title-about" class="i18n_options_dialog_about_title"></span> |
| <span id="dialog-title-custom" class="i18n_options_dialog_custom_title"></span> |
| <span id="dialog-title-language-add" class="i18n_options_dialog_language_title"></span> |
| <span id="dialog-title-language-change" class="i18n_options_dialog_language_title"></span> |
| @@ -335,6 +325,14 @@ |
| <button id="dialog-close" class="i18n_options_close focus-first" data-action="close-dialog"></button> |
| </header> |
| <div id="dialog-body" class="content"> |
| + <!-- About Adblock Plus --> |
| + <div id="dialog-content-about" class="dialog-content"> |
| + <p id="abp-version"></p> |
| + <p class="i18n_options_dialog_about_copyright"></p> |
| + <p> |
| + <button class="i18n_options_close primary" data-action="close-dialog"></button> |
| + </p> |
| + </div> |
| <!-- Add language subscription --> |
| <div id="dialog-content-language-add" class="dialog-content"> |
| <ul id="all-lang-table-add" class="table list"> |
« no previous file with comments
|
« locale/en-US/new-options.json ('k')
|
new-options.js » ('j')
|
skin/new-options.css » ('J')
