added sidebar and simplified header css

2 files changed, 34 insertions, 37 deletions

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 1ef9d80..7f51131 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
@@ -11,58 +11,47 @@ body.mceContentBody {
 	background: none repeat scroll 0 0 #FFFFFF;
 }
 
+/* Header Definitions */
+
 #header-region {
-        clear: right;
-        float: right;
-    }
+	clear: right;
+	float: right;
+}
 
 #header {
-        background: transparent url(../images/logo.png) no-repeat top left;
-        margin-top: 20px;
-        min-height: 225px;
-    }
-
-#header-normal {
 	background: transparent url(../images/logo-small.png) no-repeat top left;
 	margin-top: 20px;
 	min-height: 140px;
 	cursor: pointer;
-}
 
-    #header .span-24 {
-        padding-left: 264px;
-	width: 586px;
-    }
-
-     #header-normal .span-24 {
-	 padding-left: 170px;
-	 width: 680px;
-     }
+	padding-left: 170px;
+	width: 1000px;
+}
 
-     #header h1 {        
-         margin-top: 85px;
-    }
+#header h1 {        
+	margin-top: 85px;
+}
 
-    #header ul li, #header-normal ul li {
-            list-style-type: none;
-            list-style-image: url(../images/listitem.png);
-        }
+#header ul li {
+	list-style-type: none;
+	list-style-image: url(../images/listitem.png);
+}
 
 .site-name {
 	border-bottom: 1px solid #dbdbdb;
-        margin-bottom: 10px;
+    margin-bottom: 10px;
 	font-size: 40px;
 	margin-top: 85px;
 }
 
-#header-normal .site-name {
+#header .site-name {
 	border-bottom: 1px solid #dbdbdb;
-        margin-bottom: 10px;
+    margin-bottom: 10px;
 	font-size: 30px;
 	margin-top: 45px;
 }
 
-#header h1 a, #header-normal h1 a {
+#header h1 a {
 	color: #514949;
 	text-decoration: none;
 }
@@ -110,10 +99,22 @@ div.body-field-wrapper {
 	background: transparent url(../images/menu.jpg) no-repeat bottom left;
 }
 
-#right-sidebar {
-    width: 250px;
+/* Sidebar */
+
+div#right-sidebar {
+	background-color: #F0F0F0;
+	border: 2px solid #000000;
+	border-radius: 10px;
+	float: right;
+	margin-left: 5pt;
+	width: 250px;
 }
 
+div.region-right-sidebar {
+	padding-left: 5pt;
+}
+
+
 .content h1, .content h2, .content h2 a {
 	color: #5c5c5c;
 	font-weight: normal;
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 a0bb36a..4ac080c 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
@@ -2,8 +2,7 @@
   if(drupal_is_front_page()): $title = ""; endif;
 ?>
 
-<div id="header-normal" class="container" onclick="document.location='/'">
-  <div class="span-24">
+<div id="header" class="container" onclick="document.location='/'">
     <?php if($site_name): ?>
       <h1 class='site-name'>
         <a href="<?php print $front_page ?>" title="<?php print t('Home'); ?>">
@@ -16,12 +15,10 @@
         <?php print render($site_slogan); ?>
       </h3>
     <?php endif; ?>
-  </div>
 </div>
 
 <div id="root">
   <div class="container">
-    <div class="span-24">
       <?php print theme('links__system_main_menu', array(
         'links' => $main_menu,
         'attributes' => array(
@@ -61,6 +58,5 @@
       <div id="footer">
         <?php print render($page['footer']); ?>
       </div>
-    </div>
   </div>
 </div>