Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

css

  • Loading branch information...
commit 6f9380b40b10bf044ad25eacde70893f14656088 1 parent 6bb9b2a
Bernhard Vallant authored
1  src/hup/settings.py
@@ -123,6 +123,7 @@
123 123
     'django.contrib.messages',
124 124
     'django.contrib.staticfiles',
125 125
     'django.contrib.comments',
  126
+    'django.contrib.webdesign',
126 127
     'django.contrib.flatpages',
127 128
     # Uncomment the next line to enable the admin:
128 129
     'django.contrib.admin',
38  src/hup/static/css/hupcss.css
@@ -75,45 +75,37 @@ header {
75 75
    margin-top:10px;
76 76
    padding-top:10px;
77 77
    background-color : #D4D8D6;
78  
-   
79  
-   
80  
-   
81 78
 }
82 79
 
83  
-header h1{
  80
+.logo {
  81
+    float: left;
  82
+    padding: 0;
  83
+}
84 84
 
85  
-     color:  white;
  85
+.logo img {
  86
+    display: inline-block;
  87
+    border: 0;
  88
+}
  89
+
  90
+header h1{
  91
+    color:  white;
86 92
     text-align: right;
87 93
     font-weight: bold;
88 94
     font-size:30px;
89  
-   padding-right:10px;
90  
-   
  95
+    padding-right:10px;
91 96
 }
92 97
 
93 98
 
94 99
 
95  
-
96  
-
97  
-
98 100
 #content {
99  
-
100  
-      
101 101
     background-color : #D4D8D6;
102 102
     font-size:12px;
103  
-    height:400px;
104  
-    margin-top:10px;
105  
-    overflow: auto;
106  
-    padding-top:10px;
107  
-    padding-left:40px; 
108  
-   
109  
-  
110  
-
111  
-} 
112  
-
  103
+    margin:10px 0;
  104
+    padding: 20px;
  105
+}
113 106
 
114 107
 
115 108
 #content h1,h2 {
116  
-  
117 109
     color:#CC9900;
118 110
     font-weight:bold;
119 111
 }
17  src/hup/templates/base.html
... ...
@@ -1,18 +1,14 @@
1 1
 {% extends "html.html" %}
2  
-
  2
+{% load webdesign %}
3 3
 {% block body %}
4 4
 <div class="container">
5 5
     {% block header %}
6  
-    <header class="span-24 last"> 
7  
-            
8  
-
  6
+    <header class="span-24 last">
9 7
           <h1> Housing for the Urban Poor  </h1>
10 8
 
11 9
 
12  
-            <a  href="http://www.habitat-unit.de/" target="_blank"><img class="left" src="{{ STATIC_URL }}img/habitat_unit.png" alt="Habitat Unit Logo"  /></a>
13  
-
14  
-        <a href="http://www.tu-berlin.de" target="_blank"> <img  src="{{ STATIC_URL }}img/tuberlin.png" alt="TU Berlin Logo"/></a>
15  
-          
  10
+            <a class="logo" href="http://www.habitat-unit.de/" target="_blank"><img src="{{ STATIC_URL }}img/habitat_unit.png" alt="Habitat Unit Logo"  /></a>
  11
+        <a class="logo" href="http://www.tu-berlin.de" target="_blank"><img  src="{{ STATIC_URL }}img/tuberlin.png" alt="TU Berlin Logo"/></a>
16 12
     </header>
17 13
     {% endblock %}
18 14
     {% block middle %}
@@ -36,10 +32,7 @@
36 32
    
37 33
 
38 34
     <section id="content" class="span-19 last" >
39  
-    <p>
40  
-  
41  
-        {% block content %}  {% endblock %}
42  
-      
  35
+        {% block content %}{% endblock %}
43 36
     </section>
44 37
 
45 38
     {% endblock %}

0 notes on commit 6f9380b

Please sign in to comment.
Something went wrong with that request. Please try again.