Delta Between Two Patch Sets: templates/default.tmpl
Issue 29551738:
Issue 5634 - Replaced logo and refactored navbar width and colors (Closed)
Base URL: https://hg.adblockplus.org/web.adblockplus.org
Left Patch Set: Rebased
Created Oct. 10, 2017, 11:29 a.m.
Right Patch Set: Addressed comments
Created Oct. 11, 2017, 11:59 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« static/js/main.js ('k')
|
no next file »
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 1 {# | 1 {# |
| 2 # This file is part of the Adblock Plus website, | 2 # This file is part of the Adblock Plus website, |
| 3 # Copyright (C) 2006-present eyeo GmbH | 3 # Copyright (C) 2006-present eyeo GmbH |
| 4 # | 4 # |
| 5 # Adblock Plus is free software: you can redistribute it and/or modify | 5 # Adblock Plus is free software: you can redistribute it and/or modify |
| 6 # it under the terms of the GNU General Public License version 3 as | 6 # it under the terms of the GNU General Public License version 3 as |
| 7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. |
| 8 # | 8 # |
| 9 # Adblock Plus is distributed in the hope that it will be useful, | 9 # Adblock Plus is distributed in the hope that it will be useful, |
| 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 70 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/> | 70 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/> |
| 71 <![endif]--> | 71 <![endif]--> |
| 72 </head> | 72 </head> |
| 73 | 73 |
| 74 <body> | 74 <body> |
| 75 <noscript> | 75 <noscript> |
| 76 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 1000px)"/> | 76 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 1000px)"/> |
| 77 <link rel="stylesheet" href="/css/noscript-mobile.css" media="(max-width: 1000px)"/> | 77 <link rel="stylesheet" href="/css/noscript-mobile.css" media="(max-width: 1000px)"/> |
| 78 </noscript> | 78 </noscript> |
| 79 | 79 |
| 80 {% macro pageitem(pagename) %} | 80 {% macro pageitem(name) %} |
|
juliandoucette
2017/10/10 17:35:10
Removed from PatchSet (I will remove this after la
ire
2017/10/11 08:09:06
Acknowledged.
| |
| 81 <li> | 81 {% if name == page %} |
| 82 {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a> | 82 <li class="selected">{{get_string(name, "menu")}}</li> |
| 83 </li> | 83 {% else %} |
| 84 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li> | |
| 85 {% endif %} | |
| 84 {% endmacro %} | 86 {% endmacro %} |
| 85 | 87 |
| 86 <nav id="navbar"> | 88 <nav id="navbar"> |
| 87 <div class="container"> | 89 <div class="navbar-container"> |
| 88 {{ "index" | linkify(id="logo") }} | 90 {{ "index" | linkify(id="navbar-logo") }} |
|
juliandoucette
2017/10/10 17:35:11
Changed to #navbar-logo
ire
2017/10/11 08:09:04
Acknowledged.
| |
| 89 <img | 91 <img |
| 90 alt="{{ "ABP" | translate("navbar-logo-alt", "Navbar logo alt text") }}" | |
|
juliandoucette
2017/10/10 17:35:10
Removed alt, will re-add separately
ire
2017/10/11 08:09:06
Acknowledged.
| |
| 91 src="/img/navbar-logo.png" | 92 src="/img/navbar-logo.png" |
| 92 srcset="/img/navbar-logo.svg 2x"> | 93 srcset="/img/navbar-logo.svg 2x"> |
| 93 <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text ", "Navbar logo text") }}</span> | 94 <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text ", "Navbar logo text") }}</span> |
| 94 </a> | 95 </a> |
| 95 <a href="#" id="menu-toggle"> | 96 <a href="#" id="navbar-menu-toggle"> |
|
juliandoucette
2017/10/10 17:35:10
Changed to #navbar-menu-toggle
ire
2017/10/11 08:09:04
Acknowledged.
| |
| 96 <img | 97 <img |
| 97 height="25px" | |
|
juliandoucette
2017/10/10 17:35:09
Removed height set via css
ire
2017/10/11 08:09:05
Acknowledged.
| |
| 98 src="/img/menu-toggle.png" | 98 src="/img/menu-toggle.png" |
| 99 srcset="/img/menu-toggle.svg 2x" | 99 srcset="/img/menu-toggle.svg 2x"> |
| 100 alt="{{ "Menu icon" | translate("navbar-menu-logo", "Navbar menu log o alt text") }}"> | |
|
juliandoucette
2017/10/10 17:35:09
Removed alt, will re-add separately.
ire
2017/10/11 08:09:05
Acknowledged.
| |
| 101 </a> | 100 </a> |
| 102 <ul id="navbar-menu"> | 101 <ul id="navbar-menu"> |
| 103 {% for pagename in ["about", "features", "bugs", "contribute"] %} | 102 {% for pagename in ["about", "features", "bugs", "contribute"] %} |
| 104 {{ pageitem(pagename) }} | 103 <li> |
|
juliandoucette
2017/10/10 17:35:10
Replaced pageitem usage with code above.
ire
2017/10/11 08:09:06
Acknowledged.
| |
| 104 {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a> | |
| 105 </li> | |
| 105 {% endfor %} | 106 {% endfor %} |
| 106 <li id="locale-menubar"> | 107 <li id="navbar-locale-menubar"> |
| 107 <a href="#" id="locale-selected"> | 108 <a href="#" id="navbar-locale-selected"> |
| 108 {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }}) | 109 {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }}) |
|
juliandoucette
2017/10/10 17:35:09
Added "navbar-" before "locale" in these ids
ire
2017/10/11 08:09:05
Acknowledged.
| |
| 109 </a> | 110 </a> |
| 110 <ul id="locale-menu"> | 111 <ul id="navbar-locale-menu"> |
| 111 {% for available_locale in available_locales %} | 112 {% for available_locale in available_locales %} |
| 112 <li> | 113 <li> |
| 113 {{ page | linkify(available_locale) }} | 114 {{ page | linkify(available_locale) }} |
| 114 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale | to_og_locale | to_og_location }}) | 115 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale | to_og_locale | to_og_location }}) |
| 115 </a> | 116 </a> |
| 116 </li> | 117 </li> |
| 117 {% endfor %} | 118 {% endfor %} |
| 118 </ul> | 119 </ul>{# #navbar-locale-menu #} |
| 119 </li> | 120 </li> |
| 120 </ul> | 121 </ul>{# #navbar-menu #} |
| 121 </div><!-- .container --> | 122 </div>{# .container #} |
| 122 </nav> | 123 </nav>{# #navbar #} |
| 123 | 124 |
| 124 <div id="content" class="container content {{ localefile == "index" and page }}"> | 125 <div id="content" class="container content {{ localefile == "index" and page }}"> |
| 125 {% if abbnotification %} | 126 {% if abbnotification %} |
| 126 <? include abb-notification ?> | 127 <? include abb-notification ?> |
| 127 {% endif %} | 128 {% endif %} |
| 128 {% if not noheading %} | 129 {% if not noheading %} |
| 129 <h1>{{title|translate("title")}}</h1> | 130 <h1>{{title|translate("title")}}</h1> |
| 130 {% endif %} | 131 {% endif %} |
| 131 | 132 |
| 132 {% if not notoc %} | 133 {% if not notoc %} |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 200 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a> | 201 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a> |
| 201 </li> | 202 </li> |
| 202 </ul> | 203 </ul> |
| 203 </section> | 204 </section> |
| 204 </div> | 205 </div> |
| 205 </footer> | 206 </footer> |
| 206 | 207 |
| 207 <script src="/js/main.js"></script> | 208 <script src="/js/main.js"></script> |
| 208 </body> | 209 </body> |
| 209 </html> | 210 </html> |
| LEFT | RIGHT |
« static/js/main.js ('k')
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
