templates/default.tmpl - Issue 29551738: Issue 5634 - Replaced logo and refactored navbar width and colors

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: Refactored implementation Created Oct. 6, 2017, 4:12 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

OLD	NEW
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 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/>	69 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/>

70 <![endif]-->	70 <![endif]-->

71 </head>	71 </head>

72	72

73 <body>	73 <body>

74 <noscript>	74 <noscript>

75 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 1000px)"/>	75 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 1000px)"/>

76 <link rel="stylesheet" href="/css/noscript-mobile.css" media="(max-width: 1000px)"/>	76 <link rel="stylesheet" href="/css/noscript-mobile.css" media="(max-width: 1000px)"/>

77 </noscript>	77 </noscript>

78	78

79 {% macro pageitem(name) %}	79 {% macro pageitem(pagename) %}
	juliandoucette 2017/10/06 16:28:56 I'll get rid of this entirely after the new footer I'll get rid of this entirely after the new footer lands.
80 {% if name == page %}	80 <li>

81 <li class="selected">{{get_string(name, "menu")}}</li>	81 {{ pagename \| linkify }}{{ get_string(pagename, "menu") }}</a>

82 {% else %}	82 </li>

83 <li>{{name\|linkify}}{{get_string(name, "menu")}}</a></li>

84 {% endif %}

85 {% endmacro %}	83 {% endmacro %}

86	84

87 <header>	85 <nav id="navbar">
	juliandoucette 2017/10/06 16:28:57 There is an inconsistency between this and my foot There is an inconsistency between this and my footer implementation. "navbar" vs "site-navbar". I chose just "navbar" because "site" just adds specificity which is redundant in an ID (which should only be used once). This is not a strong opinion. I kinda like site-* out of habit (I picked this up from WordPress theming). ire 2017/10/11 08:08:58 I personally prefer the site- prefix because it te Show quoted text On 2017/10/06 16:28:57, juliandoucette wrote: > There is an inconsistency between this and my footer implementation. "navbar" vs > "site-navbar". I chose just "navbar" because "site" just adds specificity > which is redundant in an ID (which should only be used once). This is not a > strong opinion. I kinda like site-* out of habit (I picked this up from > WordPress theming). I personally prefer the site- prefix because it tells me this is a global site-wide component, regardless of it only being used once. Since we plan on adding using a .navbar class, I think it would be clearer if this name was changed to something else. But you don't have to do this now (or at all).
88 {{"index"\|linkify(id="logo", class="sprite", itemprop="image")}}</a>	86 <div class="container">

89 <nav>	87 {{ "index" \| linkify(id="logo") }}

90 <ul>	88 <img

91 {% if localefile == "index" %}	89 alt="{{ "ABP" \| translate("navbar-logo-alt", "Navbar logo alt text") }}"

92 <li class="selected first">{{get_string("installation", "menu")}}</l i>	90 src="/img/navbar-logo.png"

93 {% else %}	91 srcset="/img/navbar-logo.svg 2x">

94 <li class="install-link first">{{"index"\|linkify}}{{get_string("inst allation", "menu")}} <span class="sprite install-link-icon"></span></a></li>	92 <span>{{ "Adblock <strong>Plus</strong>" \| translate("navbar-logo-text ", "Navbar logo text") }}</span>

95 {% endif %}	93 </a>

96 {% for name in ["about", "features", "bugs", "contribute"] %}	94 <a href="#" id="menu-toggle">

97 {{pageitem(name)}}	95 <img

	96 height="25px"

	97 src="/img/menu-toggle.png"
	juliandoucette 2017/10/06 16:28:57 I'll address file names and folders separately. I I'll address file names and folders separately. I chose these to be ~consistent. ire 2017/10/11 08:08:58 Acknowledged. Show quoted text On 2017/10/06 16:28:57, juliandoucette wrote: > I'll address file names and folders separately. I chose these to be ~consistent. Acknowledged.
	98 srcset="/img/menu-toggle.svg 2x"

	99 alt="{{ "Menu icon" \| translate("navbar-menu-logo", "Navbar menu log o alt text") }}">

	100 </a>

	101 <ul id="navbar-menu">

	102 {% for pagename in ["about", "features", "bugs", "contribute"] %}

	103 {{ pageitem(pagename) }}

98 {% endfor %}	104 {% endfor %}

99 <li id="language">	105 <li id="locale-menubar">

100 <div id="current-language">	106 <a href="#" id="locale-selected">

101 {{ config.get("langnames", locale) }} ({{ locale \| to_og_locale \| to_og_location }})	107 {{ config.get("langnames", locale) }} ({{ locale \| to_og_locale \| to_og_location }})

102 <span id="language-arrow" class="sprite"></span>	108 </a>

103 </div>	109 <ul id="locale-menu">

104 <ul id="language-selector">

105 {% for available_locale in available_locales %}	110 {% for available_locale in available_locales %}

106 <li class="language-entry">	111 <li>

107 {{ page \| linkify(available_locale) }}	112 {{ page \| linkify(available_locale) }}

108 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale \| to_og_locale \| to_og_location }})	113 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale \| to_og_locale \| to_og_location }})

109 </a>	114 </a>

110 </li>	115 </li>

111 {% endfor %}	116 {% endfor %}

112 </ul>	117 </ul>

113 </li>	118 </li>

114 </ul>	119 </ul>

115 <a href="#" id="hamburger"></a>	120 </div><!-- .container -->

116 </nav>	121 </nav>

117 </header>

118	122

119 <div id="content" class="container {{ localefile == "index" and page }}">	123 <div id="content" class="container {{ localefile == "index" and page }}">

120 {% if abbnotification %}	124 {% if abbnotification %}

121 <? include abb-notification ?>	125 <? include abb-notification ?>

122 {% endif %}	126 {% endif %}

123 {% if not noheading %}	127 {% if not noheading %}

124 <h1>{{title\|translate("title")}}</h1>	128 <h1>{{title\|translate("title")}}</h1>

125 {% endif %}	129 {% endif %}

126	130

127 {% if not notoc %}	131 {% if not notoc %}

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
195 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a>	199 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a>

196 </li>	200 </li>

197 </ul>	201 </ul>

198 </section>	202 </section>

199 </div>	203 </div>

200 </footer>	204 </footer>

201	205

202 <script src="/js/main.js"></script>	206 <script src="/js/main.js"></script>

203 </body>	207 </body>

204 </html>	208 </html>

OLD	NEW

« static/css/main-desktop.css ('K') | « static/js/main.js ('k') | no next file » | no next file with comments »