kolab.org/www

[Torsten Grote]

 dev/null                                                         |binary
 kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css  |   31 +++-------
 kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/logo.png |binary
 kolab.org/www/drupal-7.15/sites/all/themes/kolab/page.tpl.php    |    5 +
 4 files changed, 15 insertions(+), 21 deletions(-)

New commits:
commit e814130ed6d2ed3bef701cd6254e74fafb142600
Author: Torsten Grote <grote at kolabsys.com>
Date:   Tue Aug 21 15:41:22 2012 +0200

    changed header implementation

diff --git a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css
index f98c1ad..e9b135a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css
+++ b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css
@@ -13,41 +13,30 @@ body.mceContentBody {
 
 /* Header Definitions */
 
-#header {
-	background: transparent url(../images/logo-small.png) no-repeat top left;
-	margin-top: 20px;
-	min-height: 140px;
-	cursor: pointer;
-
-	padding-left: 170px;
+div#header {
 	width: 70%;
 	min-width: 1000px;
+	cursor: pointer;
 }
 
-#header h1 {        
-	margin-top: 85px;
+div#header div#logo {
+	float: left;
 }
 
-#header ul li {
-	list-style-type: none;
-	list-style-image: url(../images/listitem.png);
+div#header div#site-info {
+	float: right;
+	margin-top: 20px;
+	min-height: 140px;
 }
 
-.site-name {
+div#header div#site-info .site-name {
 	border-bottom: 1px solid #dbdbdb;
     margin-bottom: 10px;
 	font-size: 40px;
 	margin-top: 85px;
 }
 
-#header .site-name {
-	border-bottom: 1px solid #dbdbdb;
-    margin-bottom: 10px;
-	font-size: 30px;
-	margin-top: 45px;
-}
-
-#header h1 a {
+div#header div#site-info .site-name a {
 	color: #514949;
 	text-decoration: none;
 }
diff --git a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/logo-small.png b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/logo-small.png
deleted file mode 100644
index 92e6508..0000000
Binary files a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/logo-small.png and /dev/null differ
diff --git a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/logo.png b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/logo.png
index d8733a3..92e6508 100644
Binary files a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/logo.png and b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/logo.png differ
diff --git a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/page.tpl.php b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/page.tpl.php
index 4ac080c..16e9b7c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/page.tpl.php
+++ b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/page.tpl.php
@@ -3,6 +3,10 @@
 ?>
 
 <div id="header" class="container" onclick="document.location='/'">
+  <div id="logo">
+    <img src="images/logo.png" border="0" alt="Kolab Logo"/>
+  </div>
+  <div id="site-info">
     <?php if($site_name): ?>
       <h1 class='site-name'>
         <a href="<?php print $front_page ?>" title="<?php print t('Home'); ?>">
@@ -15,6 +19,7 @@
         <?php print render($site_slogan); ?>
       </h3>
     <?php endif; ?>
+  </div>
 </div>
 
 <div id="root">