summaryrefslogtreecommitdiff
path: root/sublab_project/static/css
diff options
context:
space:
mode:
authorMarkus Zapke-Grùˆndemann <markus@keimlink.de>2012-03-28 21:40:46 +0200
committerMarkus Zapke-Grùˆndemann <markus@keimlink.de>2012-03-28 21:40:46 +0200
commita13419db5b5afbde82017a23ecbf27857dd148dd (patch)
tree734d4f6fdf9bd61e4defd3397771f82dffc24854 /sublab_project/static/css
parenteafda4ef5a9469c15d769763498163499ddb5871 (diff)
parent85942b5e9c05d2b5de9039a605414bec5abf0460 (diff)
Merge branch 'master' of sublab.org:subweb
Diffstat (limited to 'sublab_project/static/css')
-rw-r--r--sublab_project/static/css/sublab.css27
1 files changed, 7 insertions, 20 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 {