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: Moved irrelivant IE CSS from main.css to main-desktop.css where it was originally Created Oct. 10, 2017, 5:37 p.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/js/main.js ('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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 </noscript> 78 </noscript>
79 79
80 {% macro pageitem(name) %} 80 {% macro pageitem(name) %}
81 {% if name == page %} 81 {% if name == page %}
82 <li class="selected">{{get_string(name, "menu")}}</li> 82 <li class="selected">{{get_string(name, "menu")}}</li>
83 {% else %} 83 {% else %}
84 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li> 84 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li>
85 {% endif %} 85 {% endif %}
86 {% endmacro %} 86 {% endmacro %}
87 87
88 <header> 88 <nav id="navbar">
89 {{"index"|linkify(id="logo", class="sprite", itemprop="image")}}</a> 89 <div class="container">
90 <nav> 90 {{ "index" | linkify(id="navbar-logo") }}
91 <ul> 91 <img
92 {% if localefile == "index" %} 92 src="/img/navbar-logo.png"
93 <li class="selected first">{{get_string("installation", "menu")}}</l i> 93 srcset="/img/navbar-logo.svg 2x">
94 {% else %} 94 <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text ", "Navbar logo text") }}</span>
95 <li class="install-link first">{{"index"|linkify}}{{get_string("inst allation", "menu")}} <span class="sprite install-link-icon"></span></a></li> 95 </a>
96 {% endif %} 96 <a href="#" id="navbar-menu-toggle">
97 {% for name in ["about", "features", "bugs", "contribute"] %} 97 <img
98 {{pageitem(name)}} 98 src="/img/menu-toggle.png"
99 srcset="/img/menu-toggle.svg 2x">
100 </a>
101 <ul id="navbar-menu">
102 {% for pagename in ["about", "features", "bugs", "contribute"] %}
103 <li>
104 {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a>
105 </li>
99 {% endfor %} 106 {% endfor %}
100 <li id="language"> 107 <li id="navbar-locale-menubar">
101 <div id="current-language"> 108 <a href="#" id="navbar-locale-selected">
102 {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }}) 109 {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }})
103 <span id="language-arrow" class="sprite"></span> 110 </a>
104 </div> 111 <ul id="navbar-locale-menu">
105 <ul id="language-selector">
106 {% for available_locale in available_locales %} 112 {% for available_locale in available_locales %}
107 <li class="language-entry"> 113 <li>
108 {{ page | linkify(available_locale) }} 114 {{ page | linkify(available_locale) }}
109 {{ 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 }})
110 </a> 116 </a>
111 </li> 117 </li>
112 {% endfor %} 118 {% endfor %}
113 </ul> 119 </ul>{# #navbar-locale-menu #}
114 </li> 120 </li>
115 </ul> 121 </ul>{# #navbar-menu #}
116 <a href="#" id="hamburger"></a> 122 </div>{# .container #}
117 </nav> 123 </nav>{# #navbar #}
118 </header>
119 124
120 <div id="content" class="container content {{ localefile == "index" and page }}"> 125 <div id="content" class="container content {{ localefile == "index" and page }}">
121 {% if abbnotification %} 126 {% if abbnotification %}
122 <? include abb-notification ?> 127 <? include abb-notification ?>
123 {% endif %} 128 {% endif %}
124 {% if not noheading %} 129 {% if not noheading %}
125 <h1>{{title|translate("title")}}</h1> 130 <h1>{{title|translate("title")}}</h1>
126 {% endif %} 131 {% endif %}
127 132
128 {% if not notoc %} 133 {% if not notoc %}
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 <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>
197 </li> 202 </li>
198 </ul> 203 </ul>
199 </section> 204 </section>
200 </div> 205 </div>
201 </footer> 206 </footer>
202 207
203 <script src="/js/main.js"></script> 208 <script src="/js/main.js"></script>
204 </body> 209 </body>
205 </html> 210 </html>
OLDNEW
« static/css/main.css ('K') | « static/js/main.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld