summaryrefslogtreecommitdiff
path: root/sublab_project/static
diff options
context:
space:
mode:
authorFlorian <florianraemisch@web.de>2012-02-11 22:43:16 +0100
committerFlorian <florianraemisch@web.de>2012-02-11 22:44:25 +0100
commita25d8d1762dbafd32130c00f5d83cc6bef40118d (patch)
treeb3a8980b454dc598e8eeac39fbc975a26aee9953 /sublab_project/static
parent787220e317ad7b6778c0cc233629f2497b8a27d3 (diff)
minor changes in sublab.css and base.html
Diffstat (limited to 'sublab_project/static')
-rw-r--r--sublab_project/static/css/sublab.css27
1 files changed, 20 insertions, 7 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 {