From 13666290a48e56c606665ba90fc4318533d6c053 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 23 Dec 2012 12:21:26 +0000
Subject: [PATCH] Finished merging duck's and danimoth's template layouts
---
i2p2www/pages/global/layout.html | 15 +--------------
i2p2www/static/styles/danimoth.css | 7 +++++--
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index d6f6dd306..808b1ede7 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -29,8 +29,7 @@
{% include "global/nav.html" %}
</nav>
</header>
- <div class="container-fluid">
-{%- if g.theme != "danimoth" %}
+ <div class="container-fluid{% if not self.content() %} well{% endif %}">
<div id="content">
{% block content_outer %}
<article class="inner">
@@ -48,18 +47,6 @@
<footer>
{% include "global/footer.html" %}
</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>
</body>
</html>
diff --git a/i2p2www/static/styles/danimoth.css b/i2p2www/static/styles/danimoth.css
index 464a2650e..7ab9a8e6e 100644
--- a/i2p2www/static/styles/danimoth.css
+++ b/i2p2www/static/styles/danimoth.css
@@ -182,10 +182,11 @@ clear:both;
.container-fluid {
position:relative;
min-width:940px;
-padding-left:20px;
+/*padding-left:20px;
padding-right:20px;
-padding-top: 13px;
+padding-top: 13px;*/
zoom:1;
+margin: 13px 20px 20px 260px;
}
.container-fluid:before,.container-fluid:after {
display:table;
@@ -203,9 +204,11 @@ float:left;
width:220px;
}
+/*
.container-fluid>.content {
margin-left:240px;
}
+*/
a {
color:#0069d6;
--
GitLab