templates/default.tmpl - Issue 29337807: Issue 3097 - Refactored subscriptions list table on adblockplus.org/en/subscriptions

Delta Between Two Patch Sets: templates/default.tmpl

Issue 29337807: Issue 3097 - Refactored subscriptions list table on adblockplus.org/en/subscriptions (Closed)

Left Patch Set: Refactored markup & styles, added rtl styles, and fixed typo. Created July 19, 2016, 10:26 p.m.

Right Patch Set: Removed extra whitespace Created July 29, 2016, 10:52 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

LEFT	RIGHT
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-2016 Eyeo GmbH	3 # Copyright (C) 2006-2016 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 125 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
136 {{toc(toclist)}}	136 {{toc(toclist)}}

137 </div>	137 </div>

138 {% endif %}	138 {% endif %}

139 {% endif %}	139 {% endif %}

140	140

141 {% block body %}	141 {% block body %}

142 {{body\|safe}}	142 {{body\|safe}}

143 {% endblock %}	143 {% endblock %}

144 </div>	144 </div>

145	145

146 <footer class="footer-main">	146 <footer id="footer-main">
Thomas Greiner 2016/07/27 09:42:10 Detail: What about using an ID instead? Because it Detail: What about using an ID instead? Because it doesn't look like we'll have other elements like this one on the page. juliandoucette 2016/07/27 12:11:01 I did that habitually based on csslint rules http: Show quoted text On 2016/07/27 09:42:10, Thomas Greiner wrote: > Detail: What about using an ID instead? Because it doesn't look like we'll have > other elements like this one on the page. I did that habitually based on csslint rules http://stackoverflow.com/questions/8084555/why-selecting-by-id-is-not-recomme... I should probably use an ID to be more consistent with the way the rest of our CSS is written. Thomas Greiner 2016/07/27 13:25:49 It's a discussion that we probably need to have in Show quoted text On 2016/07/27 12:11:01, juliandoucette wrote: > On 2016/07/27 09:42:10, Thomas Greiner wrote: > > Detail: What about using an ID instead? Because it doesn't look like we'll > have > > other elements like this one on the page. > > I did that habitually based on csslint rules > http://stackoverflow.com/questions/8084555/why-selecting-by-id-is-not-recomme... > > I should probably use an ID to be more consistent with the way the rest of our > CSS is written. It's a discussion that we probably need to have in #4155. But yeah, until then best to keep things consistent. juliandoucette 2016/07/28 21:34:01 Done. Show quoted text On 2016/07/27 13:25:49, Thomas Greiner wrote: > On 2016/07/27 12:11:01, juliandoucette wrote: > > On 2016/07/27 09:42:10, Thomas Greiner wrote: > > > Detail: What about using an ID instead? Because it doesn't look like we'll > > have > > > other elements like this one on the page. > > > > I did that habitually based on csslint rules > > > http://stackoverflow.com/questions/8084555/why-selecting-by-id-is-not-recomme... > > > > I should probably use an ID to be more consistent with the way the rest of our > > CSS is written. > > It's a discussion that we probably need to have in #4155. But yeah, until then > best to keep things consistent. Done.
147 <div id="footer-content">	147 <div id="footer-content">

148 <nav>	148 <nav>

149 <section class="first">	149 <section class="first">

150 <h1>{{get_string("resources", "menu")}}</h1>	150 <h1>{{get_string("resources", "menu")}}</h1>

151 <ul>	151 <ul>

152 {% for name in ["acceptable-ads", "documentation", "deployments", "privacy", "impressum"] %}	152 {% for name in ["acceptable-ads", "documentation", "deployments", "privacy", "impressum"] %}

153 {{pageitem(name)}}	153 {{pageitem(name)}}

154 {% endfor %}	154 {% endfor %}

155 </ul>	155 </ul>

156 </section>	156 </section>

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

189 </li>	189 </li>

190 </ul>	190 </ul>

191 </section>	191 </section>

192 </div>	192 </div>

193 </footer>	193 </footer>

194	194

195 <script src="/js/main.js"></script>	195 <script src="/js/main.js"></script>

196 </body>	196 </body>

197 </html>	197 </html>

LEFT	RIGHT