From e0f6381ee634a68e84f03646d3ee0c51b79e50e2 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Wed, 28 Mar 2012 21:03:29 +0200 Subject: Revert "minor changes in sublab.css and base.html" This commit is not ready yet This reverts commit a25d8d1762dbafd32130c00f5d83cc6bef40118d. --- sublab_project/static/css/sublab.css | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'sublab_project/static') 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 { -- cgit v1.2.1 From 85942b5e9c05d2b5de9039a605414bec5abf0460 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Wed, 28 Mar 2012 21:20:42 +0200 Subject: git.sublab.org logo --- sublab_project/static/img/gitsublaborg.png | Bin 2286 -> 3278 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'sublab_project/static') diff --git a/sublab_project/static/img/gitsublaborg.png b/sublab_project/static/img/gitsublaborg.png index e6979eb..c449f48 100644 Binary files a/sublab_project/static/img/gitsublaborg.png and b/sublab_project/static/img/gitsublaborg.png differ -- cgit v1.2.1