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

Powered by Google App Engine
This is Rietveld