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

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: Created Sept. 22, 2017, 1:13 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.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« 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') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 27 matching lines...) Expand all
38 {% if alternate_locale != locale %} 38 {% if alternate_locale != locale %}
39 <meta property="og:locale:alternate" content="{{ alternate_locale | to_o g_locale }}"> 39 <meta property="og:locale:alternate" content="{{ alternate_locale | to_o g_locale }}">
40 {% endif %} 40 {% endif %}
41 {% endfor %} 41 {% endfor %}
42 <meta property="og:url" content="{{ get_canonical_url(page | ignore_browsers ) }}"> 42 <meta property="og:url" content="{{ get_canonical_url(page | ignore_browsers ) }}">
43 43
44 {# twitter https://dev.twitter.com/cards/markup #} 44 {# twitter https://dev.twitter.com/cards/markup #}
45 <meta name="twitter:site" content="@AdblockPlus" /> 45 <meta name="twitter:site" content="@AdblockPlus" />
46 <meta name="twitter:creator" content="@AdblockPlus" /> 46 <meta name="twitter:creator" content="@AdblockPlus" />
47 47
48 <link rel="stylesheet" href="/css/defaults.css" class="cssfx">
48 <link rel="stylesheet" href="/css/main.css" class="cssfx"> 49 <link rel="stylesheet" href="/css/main.css" class="cssfx">
49 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 1000p x)" class="cssfx"> 50 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 1000p x)" class="cssfx">
50 <link rel="stylesheet" href="/css/main-mobile.css" media="(max-width: 1000px )"> 51 <link rel="stylesheet" href="/css/main-mobile.css" media="(max-width: 1000px )">
51 <link rel="apple-touch-icon" href="/img/favicon-large.png" /> 52 <link rel="apple-touch-icon" href="/img/favicon-large.png" />
52 53
53 <!--[if IE 8]> 54 <!--[if IE 8]>
54 <script src="/js/vendor/ie8.js"></script> 55 <script src="/js/vendor/ie8.js"></script>
55 <![endif]--> 56 <![endif]-->
56 57
57 {% block head %} 58 {% block head %}
58 {{head|safe}} 59 {{head|safe}}
59 {% endblock %} 60 {% endblock %}
60 61
61 <!--[if lt IE 7]>
62 <script src="/js/vendor/DD_belatedPNG.js"></script>
63 <script>DD_belatedPNG.fix(".sprite");</script>
64 <![endif]-->
65 <!--[if lt IE 9]> 62 <!--[if lt IE 9]>
66 <script src="/js/vendor/html5shiv.js"></script> 63 <script src="/js/vendor/html5shiv.js"></script>
67 <script src="/js/vendor/respond.min.js"></script> 64 <script src="/js/vendor/respond.min.js"></script>
68 <![endif]--> 65 <![endif]-->
69 <!--[if lt IE 10]> 66 <!--[if lt IE 10]>
70 <script src="/js/vendor/cssfx.min.js"></script> 67 <script src="/js/vendor/cssfx.min.js"></script>
71 <![endif]--> 68 <![endif]-->
72 <!--[if IE 8]> 69 <!--[if IE 8]>
73 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/> 70 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/>
74 <![endif]--> 71 <![endif]-->
75 </head> 72 </head>
76 73
77 <body> 74 <body>
78 <noscript> 75 <noscript>
79 <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)"/>
80 <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)"/>
81 </noscript> 78 </noscript>
82 79
83 {% macro pageitem(name) %} 80 {% macro pageitem(name) %}
84 {% if name == page %} 81 {% if name == page %}
85 <li class="selected"><a>{{get_string(name, "menu")}}</a></li> 82 <li class="selected">{{get_string(name, "menu")}}</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 %} 83 {% else %}
87 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li> 84 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li>
88 {% endif %} 85 {% endif %}
89 {% endmacro %} 86 {% endmacro %}
90 87
91 <nav class="navbar accent"> 88 <nav id="navbar">
92 <div class="container"> 89 <div class="navbar-container">
93 {{ "index" | linkify(class="navbar-brand")}} 90 {{ "index" | linkify(id="navbar-logo") }}
94 <img 91 <img
95 alt="Adblock Plus" 92 src="/img/navbar-logo.png"
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" 93 srcset="/img/navbar-logo.svg 2x">
97 src="/img/header-logo.png" 94 <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text ", "Navbar logo text") }}</span>
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> 95 </a>
100 <ul class="navbar-nav"> 96 <a href="#" id="navbar-menu-toggle">
101 {% if localefile == "index" %} 97 <img
102 <li class="selected first"><a>{{get_string("installation", "menu")}} </a></li> 98 src="/img/menu-toggle.png"
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.
103 {% else %} 99 srcset="/img/menu-toggle.svg 2x">
104 <li class="install-link first">{{"index"|linkify}}{{get_string("inst allation", "menu")}} <span class="sprite install-link-icon"></span></a></li> 100 </a>
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.
105 {% endif %} 101 <ul id="navbar-menu">
106 {% for name in ["about", "features", "bugs", "contribute"] %} 102 {% for pagename in ["about", "features", "bugs", "contribute"] %}
107 {{pageitem(name)}} 103 <li>
104 {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a>
105 </li>
108 {% endfor %} 106 {% endfor %}
109 <li id="language" class="dropdown"> 107 <li id="navbar-locale-menubar">
110 <a href="#" id="current-language" class="dropdown-toggle"> 108 <a href="#" id="navbar-locale-selected">
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.
111 {{ config.get("langnames", locale) }} ({{ locale | upper }}) 109 {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }})
112 </a> 110 </a>
113 <ul id="language-selector" class="dropdown-menu secondary"> 111 <ul id="navbar-locale-menu">
114 {% for available_locale in available_locales %} 112 {% for available_locale in available_locales %}
115 <li class="language-entry"> 113 <li>
116 {{ page | linkify(available_locale) }} 114 {{ page | linkify(available_locale) }}
117 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale | upper }}) 115 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale | to_og_locale | to_og_location }})
118 </a> 116 </a>
119 </li> 117 </li>
120 {% endfor %} 118 {% endfor %}
121 </ul> 119 </ul>{# #navbar-locale-menu #}
122 </li> 120 </li>
123 </ul> 121 </ul>{# #navbar-menu #}
124 <a href="#" id="hamburger"></a> 122 </div>{# .container #}
125 </nav> 123 </nav>{# #navbar #}
126 </header> 124
127 125 <div id="content" class="container content {{ localefile == "index" and page }}">
128 <div id="content" {% if localefile == "index" %}class="{{page}}"{% endif %}>
129 {% if abbnotification %} 126 {% if abbnotification %}
130 <? include abb-notification ?> 127 <? include abb-notification ?>
131 {% endif %} 128 {% endif %}
132 {% if not noheading %} 129 {% if not noheading %}
133 <h1>{{title|translate("title")}}</h1> 130 <h1>{{title|translate("title")}}</h1>
134 {% endif %} 131 {% endif %}
135 132
136 {% if not notoc %} 133 {% if not notoc %}
137 {% macro toc(toclist) %} 134 {% macro toc(toclist) %}
138 <ul> 135 <ul>
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 <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>
205 </li> 202 </li>
206 </ul> 203 </ul>
207 </section> 204 </section>
208 </div> 205 </div>
209 </footer> 206 </footer>
210 207
211 <script src="/js/main.js"></script> 208 <script src="/js/main.js"></script>
212 </body> 209 </body>
213 </html> 210 </html>
LEFTRIGHT
« static/js/main.js ('k') | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld