Unified Diff: 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
Patch Set:
Created Sept. 22, 2017, 1:13 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« static/css/main.css ('K')
|
« static/img/header-logo-2x.png ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: templates/default.tmpl |
| =================================================================== |
| --- a/templates/default.tmpl |
| +++ b/templates/default.tmpl |
| @@ -77,44 +77,49 @@ |
| <body> |
| <noscript> |
| <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 1000px)"/> |
| <link rel="stylesheet" href="/css/noscript-mobile.css" media="(max-width: 1000px)"/> |
| </noscript> |
| {% macro pageitem(name) %} |
| {% if name == page %} |
| - <li class="selected">{{get_string(name, "menu")}}</li> |
| + <li class="selected"><a>{{get_string(name, "menu")}}</a></li> |
|
ire
2017/09/22 09:30:00
Why doesn't this have an href attribute?
juliandoucette
2017/09/22 11:50:41
No good reason. I just did the minimum I needed to
juliandoucette
2017/09/25 15:49:08
Done.
|
| {% else %} |
| <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li> |
| {% endif %} |
| {% endmacro %} |
| - <header> |
|
ire
2017/09/22 09:29:59
This opening <header> element is missing
|
| - {{"index"|linkify(id="logo", class="sprite", itemprop="image")}}</a> |
| - <nav> |
| - <ul> |
| + <nav class="navbar accent"> |
| + <div class="container"> |
| + {{ "index" | linkify(class="navbar-brand")}} |
| + <img |
| + alt="Adblock Plus" |
|
ire
2017/09/22 09:29:59
Missing translation (also for title)
juliandoucette
2017/09/22 11:50:42
We don't translate our brand name. I should probab
juliandoucette
2017/09/25 15:49:08
Done.
|
| + title="Adblock Plus" |
| + src="/img/header-logo.png" |
| + srcset="/img/header-logo-2x.png"> |
|
ire
2017/09/22 09:29:58
Missing 2x
juliandoucette
2017/09/22 11:50:42
Acknowledged.
juliandoucette
2017/09/25 15:49:08
Done.
|
| + </a> |
| + <ul class="navbar-nav"> |
| {% if localefile == "index" %} |
| - <li class="selected first">{{get_string("installation", "menu")}}</li> |
| + <li class="selected first"><a>{{get_string("installation", "menu")}}</a></li> |
|
ire
2017/09/22 09:30:00
Why doesn't this have an href attribute?
juliandoucette
2017/09/22 11:50:41
Same as above.
juliandoucette
2017/09/25 15:49:08
Done.
|
| {% else %} |
| <li class="install-link first">{{"index"|linkify}}{{get_string("installation", "menu")}} <span class="sprite install-link-icon"></span></a></li> |
|
ire
2017/09/22 09:29:59
The install link comes last in the design
ire
2017/09/22 09:29:59
Why doesn't it have a black background-color like
juliandoucette
2017/09/22 11:50:41
Same as above.
juliandoucette
2017/09/22 11:50:41
This change is design only; not content.
juliandoucette
2017/09/25 15:49:08
Done.
|
| {% endif %} |
| {% for name in ["about", "features", "bugs", "contribute"] %} |
| {{pageitem(name)}} |
| {% endfor %} |
| - <li id="language"> |
| - <div id="current-language"> |
| - {{ config.get("langnames", locale) }} <span class="locale-code">({{ locale }})</span> |
| - <span id="language-arrow" class="sprite"></span> |
| - </div> |
| - <ul id="language-selector"> |
| + <li id="language" class="dropdown"> |
| + <a href="#" id="current-language" class="dropdown-toggle"> |
|
ire
2017/09/22 09:29:59
Shouldn't this be a button?
juliandoucette
2017/09/22 11:50:42
Yes. But I'll refactor this in https://issues.adbl
ire
2017/09/28 08:38:41
Acknowledged.
|
| + {{ config.get("langnames", locale) }} ({{ locale | upper }}) |
| + </a> |
| + <ul id="language-selector" class="dropdown-menu secondary"> |
| {% for available_locale in available_locales %} |
| <li class="language-entry"> |
| {{ page | linkify(available_locale) }} |
| - {{ config.get("langnames", available_locale) }} <span class="locale-code">({{ available_locale }})</span> |
| + {{ config.get("langnames", available_locale) }} ({{ available_locale | upper }}) |
| </a> |
| </li> |
| {% endfor %} |
| </ul> |
| </li> |
| </ul> |
| <a href="#" id="hamburger"></a> |
| </nav> |
« static/css/main.css ('K')
|
« static/img/header-logo-2x.png ('k')
|
no next file »
|
no next file with comments »
