summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico von Geyso <Nico.Geyso@FU-Berlin.de>2012-07-10 14:15:58 +0200
committerNico von Geyso <Nico.Geyso@FU-Berlin.de>2012-07-10 14:15:58 +0200
commita3fd73090f93213960278a003865a19e86f4e75e (patch)
tree33c06e9909b1ee2dc734c19ede6e033fca34b574
parent1b93acea09679bf0fb38e872ca2b8a86fef0c76f (diff)
downloadwww-a3fd73090f93213960278a003865a19e86f4e75e.tar.gz
www-a3fd73090f93213960278a003865a19e86f4e75e.tar.bz2
www-a3fd73090f93213960278a003865a19e86f4e75e.zip
added about section
-rw-r--r--_base.html2
-rw-r--r--index.html28
-rw-r--r--static/css/main.css4
-rw-r--r--static/images/logo.pngbin0 -> 14287 bytes
4 files changed, 24 insertions, 10 deletions
diff --git a/_base.html b/_base.html
index 997a544..fb2c457 100644
--- a/_base.html
+++ b/_base.html
@@ -16,7 +16,7 @@
<div id="header" class="grid_16">
<h1 class="grid_8 alpha">
<a href="{{site.url}}">
- <img src="http://marian.spline.de/res/logo/png/spline-logo-full-white-transp.png" alt="SPLINE" />
+ <img src="{{ url_for("static/images/logo.png") }}" alt="SPLINE" />
</a>
</h1>
diff --git a/index.html b/index.html
index 3fefce3..5d263aa 100644
--- a/index.html
+++ b/index.html
@@ -4,17 +4,27 @@
{% endmeta %}
{% block content %}
-<div id="news">
- <h2>news</h2>
- {% for post in site.posts|batch(3)|first %}
- <p>
- <a href="{{ post.get_url() }}">{{ post.title }}</a>
- -
- {{ post.date.strftime('%Y, %B %d') }}
- </p>
- {% endfor %}
+<div id="content-top">
+ <div class="grid_8 alpha">
+ <h2>news</h2>
+ {% for post in site.posts|batch(3)|first %}
+ <p>
+ <a href="{{ post.get_url() }}">{{ post.title }}</a>
+ -
+ {{ post.date.strftime('%Y, %B %d') }}
+ </p>
+ {% endfor %}
+ </div>
+ <div class="grid_8 omega about">
+ <h2>about</h2>
+ <p>
+ Spline ist lorem ipsum dolor sit amet, consetetur sadipscing elitr,<br />
+ sed diam nonumy eirmod tempor invidunt ut labore et dolore magna.
+ <p>
+ </div>
</div>
+<div class="clear"></div>
<div id="services">
<h2>services</h2>
<ul class="grid_16">
diff --git a/static/css/main.css b/static/css/main.css
index 7ec54cc..0572bc5 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -20,6 +20,10 @@ body {
font-size: 120%;
}
+#content-top .about {
+ text-align: right;
+}
+
#services {
margin-top: 40px;
}
diff --git a/static/images/logo.png b/static/images/logo.png
new file mode 100644
index 0000000..3d9ec59
--- /dev/null
+++ b/static/images/logo.png
Binary files differ