From dff49f3844eb179c8c0f3cfec5a553666d54eaf2 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 22 Dec 2012 00:37:11 +0000
Subject: [PATCH] Tweaks to get danimoth's theme looking as close as possible
to the original
---
i2p2www/pages/global/layout.html | 11 +++++----
i2p2www/static/styles/danimoth.css | 39 +++++++++++++++++++++---------
2 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index a1cda128a..3ae29735f 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -13,7 +13,7 @@
{%- block headextra %}{% endblock %}
</head>
<body>
-{%- if g.theme == "duck" %}
+{%- if g.theme != "danimoth" %}
<div class="hide"><a href="#content" title="Skip navigation" accesskey="2">{{ _('Skip navigation') }}</a></div>
<div id="branding">
<h1 id="logo"><a href="{{ site_url() }}"><img src="{{ url_for('static', filename='images/logo_medium.png') }}" alt="I2P" /></a></h1>
@@ -55,24 +55,25 @@
<div class="container-fluid">
<div class="sidebar">
+ {%- if not self.content() %}
<div class="alert-message block-message warning news">
<h2>{% trans %}News & Updates{% endtrans %}</h2>
{% include "blog/latest.html" %}
</div>
+ {%- endif %}
<div class="well">
{% include "global/nav.html" %}
</div>
</div>
- <div class="content well">
+ <div class="content{% if not self.content() %} well{% endif %}">
{%- if self.content() %}
{{ self.content() }}
{%- else %}
{{ self.content_outer() }}
{%- endif %}
- <footer>
- <p>{{ _("See <a href=\"licenses.html\">license") }}</a>.</p>
-
+ <footer class="row">
+ {% include "global/footer.html" %}
</footer>
</div>
</div>
diff --git a/i2p2www/static/styles/danimoth.css b/i2p2www/static/styles/danimoth.css
index 2189123b1..f881a350c 100644
--- a/i2p2www/static/styles/danimoth.css
+++ b/i2p2www/static/styles/danimoth.css
@@ -12,6 +12,21 @@ body {
font-size: 11px;
}
+.news li {
+ list-style: none;
+ margin: 0 -25px;
+}
+
+div#cssmenu > ul > li {
+ list-style: none;
+ margin: 0 -25px;
+}
+
+div#cssmenu > ul > li > a {
+ font-size: 14px;
+ line-height: 36px;
+}
+
h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td {
margin:0;
padding:0;
@@ -207,22 +222,22 @@ display:none;
display:block;
}
-.row {
+.row, .aside-wrap {
zoom:1;
margin-left:-20px;
}
-.row:before,.row:after {
+.row:before,.row:after, .aside-wrap:before, .aside-wrap:after {
display:table;
content:"";
zoom:1;
*display:inline;
}
-.row:after {
+.row:after, .aside-wrap:after {
clear:both;
}
-[class*="span"] {
+[class*="span"], .aside {
display:inline;
float:left;
margin-left:20px;
@@ -372,7 +387,7 @@ margin-left:680px;
margin-left:740px;
}
-.span-one-third {
+.span-one-third, .aside-wrap .aside {
width:300px;
}
@@ -1421,7 +1436,8 @@ float:left;
.topbar div>ul a,.nav a {
display:block;
float:none;
-padding:10px 10px 11px;
+/*padding:10px 10px 11px;*/
+padding:0 2px;
line-height:19px;
text-decoration:none;
}
@@ -1740,7 +1756,7 @@ color:#bfbfbf;
color:#404040;
}
-.hero-unit {
+.main {
background-color:#f5f5f5;
margin-bottom:30px;
padding:60px;
@@ -1748,14 +1764,14 @@ padding:60px;
-moz-border-radius:6px;
border-radius:6px;
}
-.hero-unit h1 {
+.main h1 {
margin-bottom:0;
font-size:60px;
line-height:1;
letter-spacing:-1px;
}
-.hero-unit p {
+.main p {
font-size:18px;
font-weight:200;
line-height:27px;
@@ -1871,7 +1887,7 @@ text-decoration:none;
outline:1px dotted #666;
}
-.btn.primary {
+.btn.primary, .get-i2p {
color:#ffffff;
background-color:#0064cd;
background-repeat:repeat-x;
@@ -1920,7 +1936,7 @@ opacity:0.65;
box-shadow:none;
}
-.btn.large {
+.btn.large, .get-i2p {
font-size:15px;
line-height:normal;
padding:9px 14px 9px;
@@ -2464,4 +2480,3 @@ border-color:#0069d6;
-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);
box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);
}
-
--
GitLab