diff options
| -rw-r--r-- | sublab_project/static/css/sublab.css | 27 | ||||
| -rw-r--r-- | sublab_project/templates/base.html | 26 |
2 files changed, 16 insertions, 37 deletions
diff --git a/sublab_project/static/css/sublab.css b/sublab_project/static/css/sublab.css index 7e80db3..6ac4228 100644 --- a/sublab_project/static/css/sublab.css +++ b/sublab_project/static/css/sublab.css @@ -39,12 +39,8 @@ div.hiddenframe { margin: 50px; } -div.header { - position: relative; - height: 150px; - } - div.logo { + float: left; height: 150px; width: 110px; margin: 5px 5px 5px 5px; @@ -55,29 +51,20 @@ 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; @@ -88,7 +75,8 @@ div.content { border: 1px solid #444; padding: 5px; background-color: rgba(16, 16, 16, 0.5); - margin: 0px 225px 5px 225px; + position: static; + margin: 0px 225px 5px 125px; top: 160px; min-height: 120px; height: 100%; @@ -102,6 +90,7 @@ div.info { margin-right: 5px; margin-bottom: 5px; width: 200px; + position: absolute; right: 0px; min-height: 200px; } @@ -113,15 +102,13 @@ div.status { } div.footer { - position: relative; + clear: both; 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 8914372..9c0aa41 100644 --- a/sublab_project/templates/base.html +++ b/sublab_project/templates/base.html @@ -31,22 +31,17 @@ <div class="hiddenframe"> <div class="frame"> - <div class="header"> - - <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 class="logo"> </div> - <div class="contentframe"> + <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 class="menu"> <ul id="menu"> @@ -142,9 +137,6 @@ <hr> </div> - la - </div> - <div class="footer"> <p> <a href="http://wiki.vorratsdatenspeicherung.de/Ortsgruppen/Leipzig">AK Vorrat</a> | |