aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bn_django/templates/frontpage.html41
-rw-r--r--static/style/default.css48
2 files changed, 27 insertions, 62 deletions
diff --git a/bn_django/templates/frontpage.html b/bn_django/templates/frontpage.html
index f19699e..26b369d 100644
--- a/bn_django/templates/frontpage.html
+++ b/bn_django/templates/frontpage.html
@@ -35,43 +35,30 @@ Other sites: <br />
<br />
<br />
-<div class="col_right">
-<div class="col_title">Latest knowledge items</div>
-{% if newitems %}
-{% include "git_wiki/newitems_table" %}
+
+<h2 class="ruled">Photos!</h2>
+{% if latest_photos %}
+{% for photo in latest_photos %}
+<a href="{{ photo.get_absolute_url }}"><img src="{{ photo.thumburl }}"
+ alt="{{ photo.title }}" /></a>&nbsp;&nbsp;&nbsp;
+{% endfor %}
{% else %}
-None yet!
+<br/><br />None yet!
{% endif %}
-<br />
-<div class="col_title">Latest knowledge commits</div>
-{% if latest_knowledge %}
-{% include "newknowldge_table" %}
+
+<h2 class="ruled">Knowledge!</h2>
+{% if newitems %}
+{% include "git_wiki/newitems_table" %}
{% else %}
None yet!
{% endif %}
-</div>
-<div class="col_center">
-<div class="col_title">Latest comments</div>
+<h2 class="ruled">Comments!</h2>
{% if latest_comments %}
{% include "newcomments_table" %}
{% else %}
None yet!
{% endif %}
-</div>
-<div class="col_left">
-<div class="col_title">Latest photos</div>
-{% if latest_photos %}
-<div class="centerize">
-{% for photo in latest_photos %}
-<a href="{{ photo.get_absolute_url }}"><img src="{{ photo.thumburl }}"
- alt="{{ photo.title }}" /></a>
-<br />
-{% endfor %}
-</div>
-{% else %}
-<br/><br />None yet!
-{% endif %}
-</div>
{% endblock %}
+
diff --git a/static/style/default.css b/static/style/default.css
index 72ed83c..46eef85 100644
--- a/static/style/default.css
+++ b/static/style/default.css
@@ -26,6 +26,18 @@ h2.pagesubtitle {
font-style: italic;
text-align: center;
border-bottom: none; }
+h2 {
+ font-size: 140%;
+ padding-top: 8px;
+ padding-bottom: 4px;
+ padding-left: 0px;
+ padding-right: 30px; }
+h2.ruled {
+ padding-bottom: 2px;
+ margin-bottom: 4px;
+ margin-right: 10px;
+ padding-left: 8px;
+ border-bottom: 2px solid black;}
h3 {
padding-top: 8px;
padding-bottom: 4px;
@@ -96,41 +108,6 @@ pre.large {
.righty_content img {
border: 1px solid black;
width: 90%; }
-.col_title {
- width: 100%;
- margin-bottom: 7px;
- text-align: center;
- font-weight: bold;
- /* font-family: serif; */
- font-size: 120%;
-}
-.col_left {
- width: 24%;
- height: 275px;
- overflow: hidden;
- margin-top: 3px;
- margin-left: 3px;
- padding: 5px;
- /*float: right;*/
-}
-.col_center {
- width: 32%;
- height: 275px;
- overflow: hidden;
- margin-top: 3px;
- padding: 5px;
- float: right;
- border-left: 1px solid black;
- border-right: 1px solid black;
-}
-.col_right {
- width: 37%;
- height: 275px;
- overflow: hidden;
- margin-top: 3px;
- padding: 5px;
- float: right;
-}
.content_caption {
text-align: center;
font-style: italic;
@@ -201,6 +178,7 @@ pre.large {
padding: 0px;
margin: 0px;
border: none;
+ vertical-align: middle;
text-align: center; }
td.gallery_title {
vertical-align: top;