summaryrefslogtreecommitdiff
path: root/sublab_project
diff options
context:
space:
mode:
Diffstat (limited to 'sublab_project')
-rw-r--r--sublab_project/static/css/sublab.css27
-rw-r--r--sublab_project/templates/base.html26
2 files changed, 37 insertions, 16 deletions
diff --git a/sublab_project/static/css/sublab.css b/sublab_project/static/css/sublab.css
index 6ac4228..7e80db3 100644
--- a/sublab_project/static/css/sublab.css
+++ b/sublab_project/static/css/sublab.css
@@ -39,8 +39,12 @@ div.hiddenframe {
margin: 50px;
}
+div.header {
+ position: relative;
+ height: 150px;
+ }
+
div.logo {
- float: left;
height: 150px;
width: 110px;
margin: 5px 5px 5px 5px;
@@ -51,20 +55,29 @@ div.logo {
div.image {
margin-top: 0px;
margin: 5px;
+ margin-top: -150px;
margin-left: 125px;
border: 1px solid #444;
height: 150px;
background: #000 url(../img/topimage.jpg) no-repeat left bottom;
+ left: 125px;
+ }
+
+div.contentframe {
+ position: relative;
+ left: 0px;
+ margin: 5px;
+ border: 1px;
+
+
}
div.menu {
- clear: both;
color: #fff;
border: 1px solid #444;
padding: 5px;
background-color: rgba(16, 16, 16, 0.5);
margin-left: 5px;
- position: absolute;
top: 160px;
width: 100px;
min-height: 150px;
@@ -75,8 +88,7 @@ div.content {
border: 1px solid #444;
padding: 5px;
background-color: rgba(16, 16, 16, 0.5);
- position: static;
- margin: 0px 225px 5px 125px;
+ margin: 0px 225px 5px 225px;
top: 160px;
min-height: 120px;
height: 100%;
@@ -90,7 +102,6 @@ div.info {
margin-right: 5px;
margin-bottom: 5px;
width: 200px;
- position: absolute;
right: 0px;
min-height: 200px;
}
@@ -102,13 +113,15 @@ div.status {
}
div.footer {
- clear: both;
+ position: relative;
background-color: rgba(16, 16, 16, 0.5);
color: #fff;
border: 1px solid #444;
padding: 5px;
margin: 5px;
text-align: center;
+ position: relative;
+ top: 5px;
}
.imagecontent {
diff --git a/sublab_project/templates/base.html b/sublab_project/templates/base.html
index 9c0aa41..8914372 100644
--- a/sublab_project/templates/base.html
+++ b/sublab_project/templates/base.html
@@ -31,18 +31,23 @@
<div class="hiddenframe">
<div class="frame">
- <div class="logo">
- </div>
+ <div class="header">
- <div class="image">
- <p class="header">
- <span class="header">[ <a href="/mate/">mate</a> und technik ]</span>
- </p>
- <h1>
- Das sublab - ein Hackerspace in Leipzig
- </h1>
+ <div class="logo">
+ </div>
+
+ <div class="image">
+ <p class="header">
+ <span class="header">[ <a href="/mate/">mate</a> und technik ]</span>
+ </p>
+ <h1>
+ Das sublab - ein Hackerspace in Leipzig
+ </h1>
+ </div>
</div>
+ <div class="contentframe">
+
<div class="menu">
<ul id="menu">
{% block navigation %}
@@ -137,6 +142,9 @@
<hr>
</div>
+ la
+ </div>
+
<div class="footer">
<p>
<a href="http://wiki.vorratsdatenspeicherung.de/Ortsgruppen/Leipzig">AK Vorrat</a> |