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

[Torsten Grote]

 dev/null                                                        |binary
 kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css |   38 +---------
 2 files changed, 5 insertions(+), 33 deletions(-)

New commits:
commit bfc05b5e03490c26701da7eab2af5086e76c1c79
Merge: afeb078 0feee51
Author: Torsten Grote <grote at kolabsys.com>
Date:   Mon Aug 20 13:58:25 2012 +0200

    Merge branch 'master' into production



commit 0feee513a99e78e438634de6ee5aab372696713e
Author: Torsten Grote <grote at kolabsys.com>
Date:   Mon Aug 20 13:53:36 2012 +0200

    clean up css for front page blocks

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 0763be9..abba25b 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
@@ -202,26 +202,18 @@ pre, code, tt {
             color: #939393;
         }
 
-#block-blog-recent,
-#block-views-tweets-block,
-#block-views-e292f6bc64606ed15c348fcee13486f4, 
-#block-views-tweets-new-view-block-1 {
+
+#block-views-planet-block,
+#block-views-tweets-block {
   width: 375px;
   display: inline;
   float: left;
   margin-top: 30px;
-}
-
-#block-views-tweets-block, 
-#block-blog-recent,
-#block-views-tweets-new-view-block-1 {
   padding-right: 20px;
 }
 
-#block-blog-recent h2,
-#block-views-tweets-block h2,
-#block-views-e292f6bc64606ed15c348fcee13486f4 h2,
-#block-views-tweets-new-view-block-1 h2 {
+#block-views-planet-block h2,
+#block-views-tweets-block h2 {
   font-size: 14px;
   font-weight: bold;
   margin: 0 0 3 0; 
@@ -233,26 +225,6 @@ pre, code, tt {
 	padding-left: 5pt;
 }
 
-#views-exposed-form-advanced-forum-active-topics-block-1 {
-  display: none;
-}
-
-#get-kolab-server, 
-#block-views-Events-block_1,
-#block-views-News-block_1 {
-  width: 46%;
-  display: inline;
-  float: left;
-  padding: 10pt 2% 0 2%;
-}
-
-#get-kolab-kontact,
-#block-views-calendar-calendar_block_1 {
-  float: right;
-  width: 46%;
-  padding: 10pt 2% 0 2%;
-}
-
 
 .span-18 {
   width: 100%;


commit c98b79a1794efa4ff3226bc6e02ae75ae729a96b
Author: Torsten Grote <grote at kolabsys.com>
Date:   Mon Aug 20 13:23:54 2012 +0200

    removed rss icon (there's one in /misc)

diff --git a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/rss_icon_small.png b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/rss_icon_small.png
deleted file mode 100644
index 1e08f67..0000000
Binary files a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/rss_icon_small.png and /dev/null differ