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

Side by Side 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.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« static/css/main.css ('K') | « static/img/header-logo-2x.png ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 </head> 75 </head>
76 76
77 <body> 77 <body>
78 <noscript> 78 <noscript>
79 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 1000px)"/> 79 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 1000px)"/>
80 <link rel="stylesheet" href="/css/noscript-mobile.css" media="(max-width: 1000px)"/> 80 <link rel="stylesheet" href="/css/noscript-mobile.css" media="(max-width: 1000px)"/>
81 </noscript> 81 </noscript>
82 82
83 {% macro pageitem(name) %} 83 {% macro pageitem(name) %}
84 {% if name == page %} 84 {% if name == page %}
85 <li class="selected">{{get_string(name, "menu")}}</li> 85 <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.
86 {% else %} 86 {% else %}
87 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li> 87 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li>
88 {% endif %} 88 {% endif %}
89 {% endmacro %} 89 {% endmacro %}
90 90
91 <header> 91 <nav class="navbar accent">
ire 2017/09/22 09:29:59 This opening <header> element is missing
92 {{"index"|linkify(id="logo", class="sprite", itemprop="image")}}</a> 92 <div class="container">
93 <nav> 93 {{ "index" | linkify(class="navbar-brand")}}
94 <ul> 94 <img
95 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.
96 title="Adblock Plus"
97 src="/img/header-logo.png"
98 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.
99 </a>
100 <ul class="navbar-nav">
95 {% if localefile == "index" %} 101 {% if localefile == "index" %}
96 <li class="selected first">{{get_string("installation", "menu")}}</l i> 102 <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.
97 {% else %} 103 {% else %}
98 <li class="install-link first">{{"index"|linkify}}{{get_string("inst allation", "menu")}} <span class="sprite install-link-icon"></span></a></li> 104 <li class="install-link first">{{"index"|linkify}}{{get_string("inst allation", "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.
99 {% endif %} 105 {% endif %}
100 {% for name in ["about", "features", "bugs", "contribute"] %} 106 {% for name in ["about", "features", "bugs", "contribute"] %}
101 {{pageitem(name)}} 107 {{pageitem(name)}}
102 {% endfor %} 108 {% endfor %}
103 <li id="language"> 109 <li id="language" class="dropdown">
104 <div id="current-language"> 110 <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.
105 {{ config.get("langnames", locale) }} <span class="locale-code">({ { locale }})</span> 111 {{ config.get("langnames", locale) }} ({{ locale | upper }})
106 <span id="language-arrow" class="sprite"></span> 112 </a>
107 </div> 113 <ul id="language-selector" class="dropdown-menu secondary">
108 <ul id="language-selector">
109 {% for available_locale in available_locales %} 114 {% for available_locale in available_locales %}
110 <li class="language-entry"> 115 <li class="language-entry">
111 {{ page | linkify(available_locale) }} 116 {{ page | linkify(available_locale) }}
112 {{ config.get("langnames", available_locale) }} <span class= "locale-code">({{ available_locale }})</span> 117 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale | upper }})
113 </a> 118 </a>
114 </li> 119 </li>
115 {% endfor %} 120 {% endfor %}
116 </ul> 121 </ul>
117 </li> 122 </li>
118 </ul> 123 </ul>
119 <a href="#" id="hamburger"></a> 124 <a href="#" id="hamburger"></a>
120 </nav> 125 </nav>
121 </header> 126 </header>
122 127
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a> 204 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a>
200 </li> 205 </li>
201 </ul> 206 </ul>
202 </section> 207 </section>
203 </div> 208 </div>
204 </footer> 209 </footer>
205 210
206 <script src="/js/main.js"></script> 211 <script src="/js/main.js"></script>
207 </body> 212 </body>
208 </html> 213 </html>
OLDNEW
« static/css/main.css ('K') | « static/img/header-logo-2x.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld