port to bootstrap, lots of changes...

1 files changed, 25 insertions, 24 deletions

diff --git a/index.html b/index.html
index 9f331d8..d7a286d 100644
--- a/index.html
+++ b/index.html
@@ -1,11 +1,11 @@
 {% meta %}
   title: Home
-  top_link: 3
+  top_link: 1
 {% endmeta %}
 
 {% block content %}
-<div id="content-top">
-  <div class="grid_7 alpha">
+<div class="row-fluid overview">
+  <div class="span4">
     <h2>news</h2>
     {% for post in site.posts|batch(3)|first %}
     <p>
@@ -15,43 +15,44 @@
     </p>
     {% endfor %}
   </div>
-  <div class="grid_9 omega about">
+
+  <div class="span8 about">
     <h2>about</h2>
     <p>
       Wir sind Menschen die Spaß am <i>Hacken</i> von <b>freier Software</b> haben.<br />
       Zu finden sind wir im <b>Raum K40</b> des 
       <a href="http://inf.fu-berlin.de">Instituts für Informatik</a> der
-      <a href="http://www.fu-berlin.de">FU Berlin</a>.
+      <a href="http://www.fu-berlin.de">FU Berlin</a>.<br />
       Desweiteren auch virtuell im IRC auf Freenode im Channel <b>#spline</b>.
     <p>
   </div>
 </div>
 
-<div class="clear"></div>
 <div id="services">
   <h2>services</h2>
-  <ul class="grid_16">
-  {% for page in site.pages|sort(attribute='title') %}
-    {% if page.path.startswith('services/') %}
-      <li class="grid_8 {{ loop.cycle('omega', 'alpha') }}">
-        <div class="link">
-          <div class="grid_2 alpha">
-            <img src="{{page.logo_url}}" alt="{{page.title}}" />
-          </div>
+  {% for row in site.pages|filter_by_path('services/')|sort(attribute='title')|batch(2) %}
+    <div class="row-fluid service-row">
+      {% for page in row %}
+        <div class="span6">
+          <div class="row-fluid">
+            <div class="img span">
+              <img src="{{page.logo_url}}" alt="{{page.title}}" />
+            </div>
 
-          <div class="gird_6 omega">
-            <a href="{{page.get_url()}}">
-              <span class="link"></span>
-              {{page.title}}
-            </a>
+            <div class="desc link-hover span8">
+              <a href="{% if page.link %}{{page.link}}{% else %}{{page.get_url()}}{% endif %}">
+                <span class="link"></span>
+                {{page.title}}
+              </a>
 
-            <p>
-              {{page.description}}
-            </p>
+              <p>
+                {{page.description}}
+              </p>
+            </div>
           </div>
         </div>
-      </li>
-    {% endif %}
+      {% endfor %}
+    </div>
   {% endfor %}
   </ul>
 </div>