Side by Side Diff: templates/default.tmpl
Issue 29720642:
Noissue - Added .body-container to provide padding-top for body content and avoid navbar overlap (Closed)
Base URL: https://hg.adblockplus.org/web.adblockplus.org
Patch Set:
Created March 12, 2018, 5:02 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« static/css/main.css ('K')
|
« static/css/main.css ('k')
|
templates/minimal.tmpl » ('j')
|
templates/minimal.tmpl » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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 14 matching lines...) Expand all Loading... | |
| 25 <? include polyfills ?> | 25 <? include polyfills ?> |
| 26 | 26 |
| 27 {% block head %} | 27 {% block head %} |
| 28 {{head|safe}} | 28 {{head|safe}} |
| 29 {% endblock %} | 29 {% endblock %} |
| 30 </head> | 30 </head> |
| 31 | 31 |
| 32 <body> | 32 <body> |
| 33 <? include navbar ?> | 33 <? include navbar ?> |
| 34 | 34 |
| 35 <div id="content" class="container content {{ localefile == "index" and page }}"> | 35 <div class="body-container"> |
| 36 {% if not noheading %} | 36 <div id="content" class="container content {{ localefile == "index" and pa ge }}"> |
| 37 <h1>{{title|translate("title")}}</h1> | 37 {% if not noheading %} |
| 38 {% endif %} | 38 <h1>{{title|translate("title")}}</h1> |
| 39 {% endif %} | |
| 39 | 40 |
| 40 {% if not notoc %} | 41 {% if not notoc %} |
| 41 {% macro toc(toclist) %} | 42 {% macro toc(toclist) %} |
| 42 <ul> | 43 <ul> |
| 43 {% for item in toclist %} | 44 {% for item in toclist %} |
| 44 <li> | 45 <li> |
| 45 <a href="#{{item.anchor}}">{{item.title}}</a> | 46 <a href="#{{item.anchor}}">{{item.title}}</a> |
| 46 {% if item.subitems %}{{toc(item.subitems)}}{% endif %} | 47 {% if item.subitems %}{{toc(item.subitems)}}{% endif %} |
| 47 </li> | 48 </li> |
| 48 {% endfor %} | 49 {% endfor %} |
| 49 </ul> | 50 </ul> |
| 50 {% endmacro %} | 51 {% endmacro %} |
| 51 | 52 |
| 52 {% set toclist = body|toclist %} | 53 {% set toclist = body|toclist %} |
| 53 {% if toclist %} | 54 {% if toclist %} |
| 54 <div class="toc"> | 55 <div class="toc"> |
| 55 {{toc(toclist)}} | 56 {{toc(toclist)}} |
| 56 </div> | 57 </div> |
| 58 {% endif %} | |
| 57 {% endif %} | 59 {% endif %} |
| 58 {% endif %} | |
| 59 | 60 |
| 60 {% block body %} | 61 {% block body %} |
| 61 {{body|safe}} | 62 {{body|safe}} |
| 62 {% endblock %} | 63 {% endblock %} |
| 64 </div> | |
| 63 </div> | 65 </div> |
| 64 | 66 |
| 65 <? include footer ?> | 67 <? include footer ?> |
|
ire
2018/03/13 08:31:36
Shouldn't the body-container wrap *everything*, in
juliandoucette
2018/03/13 12:14:03
Ack.
I meant jinja block body, not html <body>.
| |
| 66 <? include scripts ?> | 68 <? include scripts ?> |
| 67 </body> | 69 </body> |
| 68 </html> | 70 </html> |
| OLD | NEW |
« static/css/main.css ('K')
|
« static/css/main.css ('k')
|
templates/minimal.tmpl » ('j')
|
templates/minimal.tmpl » ('J')
