aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@manus.(none)>2007-03-06 21:58:01 -0800
committerbnewbold <bnewbold@manus.(none)>2007-03-06 21:58:01 -0800
commit569bc574bd24518eefe572e088a128dc76fca4c2 (patch)
tree37df35b441050b5ae65ed3680f6eda21ddeb3c70
parentcf804de463c83bfe11aba3576be2ccdd34443fd1 (diff)
parentfc3a4435e1e819f873970e3724d6fb3f69a6ea6a (diff)
downloadbnewnet-569bc574bd24518eefe572e088a128dc76fca4c2.tar.gz
bnewnet-569bc574bd24518eefe572e088a128dc76fca4c2.zip
Merge branch 'production' of animus:/srv/git/bn-project into comments
-rw-r--r--bn_django/templates/frontpage.html10
-rw-r--r--static/style/default.css17
2 files changed, 11 insertions, 16 deletions
diff --git a/bn_django/templates/frontpage.html b/bn_django/templates/frontpage.html
index d3eed9d..1a7acc2 100644
--- a/bn_django/templates/frontpage.html
+++ b/bn_django/templates/frontpage.html
@@ -28,21 +28,18 @@ For 2007 i'm taking a year break from <a href="http://web.mit.edu">MIT</a>...
as of February i'm living in Seattle working at <a href="http://azalea.com/AboutUs">Azalea Software</a> doing tech work. Starting in mid-May i'll be working at the Moss Landing Marine Labs in California, followed in October by field work in Antartica. I will be back at MIT for the spring 2008 semester.
<br />
-<br />
-
<div class="right_stuff">
For more recent content see the <a href="/timeline/">timeline</a>
</div>
-
+<br />
<div class="col_right">
<div class="col_title">Latest knowledge</div>
{% if latest_knowledge %}
{% include "newknowldge_table" %}
{% else %}
None yet!
-<br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br />
{% endif %}
</div>
@@ -51,8 +48,6 @@ None yet!
{% if latest_comments %}
{% else %}
None yet!
-<br /><br /> <br /> <br />
-<br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br />
{% endif %}
</div>
@@ -68,9 +63,6 @@ None yet!
</div>
{% else %}
<br/><br />None yet!
-<br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br />
{% endif %}
</div>
-<br /> <br /> <br /> <br />
-<br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br /> <br />
{% endblock %}
diff --git a/static/style/default.css b/static/style/default.css
index d6f93e4..1a3a938 100644
--- a/static/style/default.css
+++ b/static/style/default.css
@@ -101,12 +101,17 @@ pre.large {
}
.col_left {
width: 24%;
+ height: 275px;
+ overflow: hidden;
margin-top: 3px;
+ margin-left: 3px;
padding: 5px;
- float: right;
+ /*float: right;*/
}
.col_center {
- width: 38%;
+ width: 32%;
+ height: 275px;
+ overflow: hidden;
margin-top: 3px;
padding: 5px;
float: right;
@@ -114,14 +119,12 @@ pre.large {
border-right: 1px solid black;
}
.col_right {
- width: 31%;
- left: 67%;
+ width: 37%;
+ height: 275px;
+ overflow: hidden;
margin-top: 3px;
- margin-right: 1%;
padding: 5px;
float: right;
- left: 0px;
- top: 0px;
}
.content_caption {
text-align: center;