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

[Torsten Grote]

 kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css            |    7 +++++++
 kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/rss_icon_small.png |binary
 2 files changed, 7 insertions(+)

New commits:
commit afeb078fe35b72eaa32ed7bfd603948c9e48bcac
Merge: e7d0853 585e297
Author: Torsten Grote <grote at kolabsys.com>
Date:   Mon Aug 20 11:57:18 2012 +0200

    Merge branch 'master' into production



commit 585e29796a514db9b60be1adfe5a07e36a8e03ca
Author: Torsten Grote <grote at kolabsys.com>
Date:   Mon Aug 20 11:56:58 2012 +0200

    add rss icon to theme

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
new file mode 100644
index 0000000..1e08f67
Binary files /dev/null and b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/images/rss_icon_small.png differ


commit 3d1152bc54b3e5adf59bb9ae9c359ae9c5d213bb
Author: Torsten Grote <grote at kolabsys.com>
Date:   Mon Aug 20 11:52:05 2012 +0200

    rss icon positioning for news

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 d55c663..0763be9 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
@@ -451,3 +451,10 @@ img.alignleft {
 	font-size: 12pt;
 	padding: 4pt;
 }
+
+/* positioning for rss icon */
+div.news div.view-header {
+	float: right;
+	margin-top: -37pt;
+	margin-right: 10pt;
+}