summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--public/css/sublab-new.css25
-rw-r--r--template/pages/index/content.html2
2 files changed, 9 insertions, 18 deletions
diff --git a/public/css/sublab-new.css b/public/css/sublab-new.css
index ab464bc..e59933a 100644
--- a/public/css/sublab-new.css
+++ b/public/css/sublab-new.css
@@ -32,6 +32,7 @@ div.frame {
margin-right: auto;
min-width: 700px;
max-width: 1500px;
+ position: relative;
}
div.hiddenframe {
@@ -63,7 +64,8 @@ div.menu {
padding: 5px;
background-color: rgba(16, 16, 16, 0.5);
margin-left: 5px;
- float: left;
+ position: absolute;
+ top: 160px;
width: 100px;
min-height: 150px;
}
@@ -73,10 +75,9 @@ div.content {
border: 1px solid #444;
padding: 5px;
background-color: rgba(16, 16, 16, 0.5);
- margin: 5px;
- margin-top: 0px;
- margin-left: 125px;
- margin-right: 225px;
+ position: static;
+ margin: 0px 225px 5px 125px;
+ top: 160px;
min-height: 120px;
height: 100%;
}
@@ -89,8 +90,9 @@ div.info {
margin-right: 5px;
margin-bottom: 5px;
width: 200px;
+ position: absolute;
+ right: 0px;
min-height: 200px;
- float: right;
}
div.status {
@@ -111,23 +113,12 @@ div.footer {
#imagecontent {
clear: both;
- /* border: 1px solid #444;*/
- float: right;
- margin: 5px 10px 5px 10px;
- width: 35%;
- min-width: 150px;
- }
-
-#imagecontentnoclear {
- /* border: 1px solid #444;*/
float: right;
margin: 5px 10px 5px 10px;
width: 35%;
min-width: 150px;
}
-#
-
img {
border: 1px solid #444;
}
diff --git a/template/pages/index/content.html b/template/pages/index/content.html
index f96f0b9..71d43ad 100644
--- a/template/pages/index/content.html
+++ b/template/pages/index/content.html
@@ -1,7 +1,7 @@
<h2>
[ Das sublab - Ein Hackerspace in Leipzig ]
</h2>
-<div id="imagecontentnoclear">
+<div id="imagecontent">
<img id="contentimage" src="img/sublabview.jpg" />
<p class="subtext">
Blick in die Lounge