Branch 'production' - 4 commits - kolab.org/www

Torsten Grote grote at kolabsys.com
Tue Aug 14 12:43:00 CEST 2012


 kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css |   50 ++++------
 1 file changed, 22 insertions(+), 28 deletions(-)

New commits:
commit 7214edfca65c101754a135fe56477636b4e06066
Merge: 159079b 541f59b
Author: Torsten Grote <grote at kolabsys.com>
Date:   Tue Aug 14 12:42:55 2012 +0200

    Merge branch 'master' into production



commit 541f59b642eaaebddfbca89f20b2d74ca301885e
Author: Torsten Grote <grote at kolabsys.com>
Date:   Tue Aug 14 12:41:10 2012 +0200

    increase bottom margin for submitted area

diff --git a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
index 8988ce2..04d023d 100644
--- a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
+++ b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
@@ -138,6 +138,7 @@ div.body-field-wrapper {
 	background-color: #F1F1F1;
 	display: inline-block;
 	padding: 3px;
+	margin-bottom: 15px;
 }
 
     /*


commit eb328b7075022908c3e7913a4b2a9a058e247fe8
Author: Torsten Grote <grote at kolabsys.com>
Date:   Tue Aug 14 12:38:50 2012 +0200

    add css for submitted area

diff --git a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
index c982cb5..8988ce2 100644
--- a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
+++ b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
@@ -110,42 +110,35 @@ div.body-field-wrapper {
 	width: 100%;
 }
 
-.content {
-        padding-bottom: 10px;
-        margin-bottom: 10px;
-        padding-top: 1em;
-        background: transparent url(../images/line.png) no-repeat bottom center;
-}
-
 #content-sidebar {
     width: 250px;
 }
 
-#content-sidebar, .content {
-/*    display: table-cell;*/
-    padding-left: 30px;
-    padding-right: 30px;
+.content h1, .content h2, .content h2 a {
+	color: #5c5c5c;
+	font-weight: normal;
+	text-shadow: 0 2px 2px #FFFFFF;
 }
 
-    .content h1, .content h2, .content h2 a {
-            color: #5c5c5c;
-            font-weight: normal;
-            text-shadow: 0 2px 2px #FFFFFF;
-        }
+.content .node {
+	margin-bottom: 15px;
+}
 
-    .content .node {
-            margin-bottom: 15px;
-        }
+.content table tbody p {
+	background: none;
+}
 
-    .content table tbody p {
-            background: none;
-        }
+.content .clear-block .submitted {
+	font-style: italic;
+	position: relative;
+	top: -1.5em;
+}
 
-    .content .clear-block .submitted {
-            font-style: italic;
-            position: relative;
-            top: -1.5em;
-        }
+.content .submitted {
+	background-color: #F1F1F1;
+	display: inline-block;
+	padding: 3px;
+}
 
     /*
      * Hide the link to the user's blog on planet.


commit 50b9d179e74f1dd8d97cb2bd235c5c1abe534f44
Author: Torsten Grote <grote at kolabsys.com>
Date:   Tue Aug 14 12:29:13 2012 +0200

    changed css id content to class

diff --git a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
index 49876ca..c982cb5 100644
--- a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
+++ b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
@@ -110,7 +110,7 @@ div.body-field-wrapper {
 	width: 100%;
 }
 
-#content {
+.content {
         padding-bottom: 10px;
         margin-bottom: 10px;
         padding-top: 1em;
@@ -121,27 +121,27 @@ div.body-field-wrapper {
     width: 250px;
 }
 
-#content-sidebar, #content {
+#content-sidebar, .content {
 /*    display: table-cell;*/
     padding-left: 30px;
     padding-right: 30px;
 }
 
-    #content h1, #content h2, #content h2 a {
+    .content h1, .content h2, .content h2 a {
             color: #5c5c5c;
             font-weight: normal;
             text-shadow: 0 2px 2px #FFFFFF;
         }
 
-    #content .node {
+    .content .node {
             margin-bottom: 15px;
         }
 
-    #content table tbody p {
+    .content table tbody p {
             background: none;
         }
 
-    #content .clear-block .submitted {
+    .content .clear-block .submitted {
             font-style: italic;
             position: relative;
             top: -1.5em;
@@ -152,7 +152,7 @@ div.body-field-wrapper {
      *
      * Accidently also removes the 'Read more...' links.. :/
      */
-/*    #content div.node.clear-block ul.links.inline {
+/*    .content div.node.clear-block ul.links.inline {
             display: none;
             visibility: hidden;
         }





More information about the commits mailing list