kytv/I2P_Website
1
0
Fork 0
forked from I2P_Developers/i2p.www
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finished merging duck's and danimoth's template layouts

Browse Source
This commit is contained in:
str4d
2012-12-23 12:21:26 +00:00
parent 84ec056c96
commit 13666290a4
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
i2p2www/pages/global/layout.html
View File

@@ -29,8 +29,7 @@
{% include "global/nav.html" %} {% include "global/nav.html" %}
</nav> </nav>
</header> </header>
<div class="container-fluid"> <div class="container-fluid{% if not self.content() %} well{% endif %}">
{%- if g.theme != "danimoth" %}
<div id="content"> <div id="content">
{% block content_outer %} {% block content_outer %}
<article class="inner"> <article class="inner">
@@ -48,18 +47,6 @@
<footer> <footer>
{% include "global/footer.html" %} {% include "global/footer.html" %}
</footer> </footer>
{%- else %}
<div class="content{% if not self.content() %} well{% endif %}">
{%- if self.content() %}
{{ self.content() }}
{%- else %}
{{ self.content_outer() }}
{%- endif %}
<footer class="row">
{% include "global/footer.html" %}
</footer>
</div>
{%- endif %}
</div> </div>
</body> </body>
</html> </html>

7
i2p2www/static/styles/danimoth.css
View File

@@ -182,10 +182,11 @@ clear:both;
.container-fluid { .container-fluid {
position:relative; position:relative;
min-width:940px; min-width:940px;
padding-left:20px; /*padding-left:20px;
padding-right:20px; padding-right:20px;
padding-top: 13px; padding-top: 13px;*/
zoom:1; zoom:1;
margin: 13px 20px 20px 260px;
} }
.container-fluid:before,.container-fluid:after { .container-fluid:before,.container-fluid:after {
display:table; display:table;
@@ -203,9 +204,11 @@ float:left;
width:220px; width:220px;
} }
/*
.container-fluid>.content { .container-fluid>.content {
margin-left:240px; margin-left:240px;
} }
*/
a { a {
color:#0069d6; color:#0069d6;