Branch 'production' - 6 commits - kolab.org/www
Torsten Grote
grote at kolabsys.com
Wed Jun 20 10:22:38 CEST 2012
kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css | 31 +++++++---
1 file changed, 22 insertions(+), 9 deletions(-)
New commits:
commit a76b1b4225d631346220e3893cdbc981adac2891
Merge: c55c1cb 998f44f
Author: Torsten Grote <grote at kolabsys.com>
Date: Wed Jun 20 10:22:31 2012 +0200
Merge branch 'master' into production
commit 998f44f6f37a79fdb93b017a2471e6a5890e3622
Author: Torsten Grote <grote at kolabsys.com>
Date: Wed Jun 20 10:04:49 2012 +0200
fixed css of matrixes
diff --git a/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css b/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
index bcf93fb..01f76e7 100644
--- a/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
+++ b/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
@@ -277,9 +277,10 @@ ul.help-matrix {
ul.help-matrix > li
{
- float: left;
margin: 10px 10px;
width: 46%;
+ display: inline-block;
+ vertical-align: top;
}
ul.help-matrix > li p
@@ -295,9 +296,10 @@ ul.community-matrix {
ul.community-matrix > li
{
- float: left;
margin: 10px 10px;
width: 46%;
+ display: inline-block;
+ vertical-align: top;
}
ul.community-matrix > li p
commit 7c0470fac30a0d596da084a57311221f1d16c60f
Author: Torsten Grote <grote at kolabsys.com>
Date: Tue Jun 19 17:32:45 2012 +0200
more css adjustments
diff --git a/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css b/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
index e9f14bc..bcf93fb 100644
--- a/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
+++ b/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
@@ -96,7 +96,8 @@ div.body-field-wrapper {
text-decoration: none;
text-align: center;
display: block;
- font-size: 130%;
+ font-size: 120%;
+ font-weight: bold;
}
#navlist li a.active, #navlist li.active-trail {
@@ -277,8 +278,7 @@ ul.help-matrix {
ul.help-matrix > li
{
float: left;
- height: 10em;
- margin: 0px 10px;
+ margin: 10px 10px;
width: 46%;
}
@@ -296,8 +296,7 @@ ul.community-matrix {
ul.community-matrix > li
{
float: left;
- height: 15em;
- margin: 0px 10px;
+ margin: 10px 10px;
width: 46%;
}
@@ -317,12 +316,12 @@ ul#subnavlist
#subnavlist li
{
- background-color: rgba(240, 240, 240, 0.2);
display: inline;
list-style-type: none;
padding: 10px;
text-align: center;
- font-size: 130%;
+ font-size: 120%;
+ font-weight: bold;
}
#getkolab {
commit 06b3db61f28a5ee7e3ace822fd5fae68f9fa653b
Author: Torsten Grote <grote at kolabsys.com>
Date: Tue Jun 19 16:24:57 2012 +0200
highlight subnav links better
diff --git a/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css b/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
index 0d55fac..e9f14bc 100644
--- a/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
+++ b/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
@@ -96,10 +96,11 @@ div.body-field-wrapper {
text-decoration: none;
text-align: center;
display: block;
+ font-size: 130%;
}
#navlist li a.active, #navlist li.active-trail {
- background: transparent url(../images/menu.jpg) no-repeat top left;
+ background: transparent url(../images/menu.jpg) no-repeat bottom left;
}
#main {
@@ -309,17 +310,19 @@ ul.community-matrix > li p
ul#subnavlist
{
background: transparent url("/sites/all/themes/kolab/images/line.png") no-repeat scroll center bottom;
- padding-bottom: 15px;
- padding-top: 15px;
+ padding-bottom: 10px;
+ padding-top: 10px;
text-align: center;
}
#subnavlist li
{
+ background-color: rgba(240, 240, 240, 0.2);
display: inline;
list-style-type: none;
- padding: 2em;
+ padding: 10px;
text-align: center;
+ font-size: 130%;
}
#getkolab {
commit 4563d5624a8f7be8acc6d8dabe5bc7892c581d3f
Author: Torsten Grote <grote at kolabsys.com>
Date: Tue Jun 19 15:38:32 2012 +0200
more css improvements
diff --git a/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css b/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
index 4cb06c1..0d55fac 100644
--- a/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
+++ b/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
@@ -308,19 +308,18 @@ ul.community-matrix > li p
ul#subnavlist
{
- background: transparent url("/sites/all/themes/kolab/images/line.png") no-repeat scroll center bottom;
+ background: transparent url("/sites/all/themes/kolab/images/line.png") no-repeat scroll center bottom;
+ padding-bottom: 15px;
+ padding-top: 15px;
+ text-align: center;
}
#subnavlist li
{
display: inline;
list-style-type: none;
- padding-right: 5em;
-}
-
-#subnavlist a
-{
- text-align: center;
+ padding: 2em;
+ text-align: center;
}
#getkolab {
commit 46930ae0c06c7a4487b24b651caf474294a6b320
Author: Torsten Grote <grote at kolabsys.com>
Date: Tue Jun 19 15:25:21 2012 +0200
trying some css improvements
diff --git a/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css b/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
index 33d15f5..4cb06c1 100644
--- a/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
+++ b/kolab.org/www/drupal-6.26/sites/all/themes/kolab/css/custom.css
@@ -209,7 +209,7 @@ pre, code, tt {
#block-views-tweets-block,
#block-views-e292f6bc64606ed15c348fcee13486f4,
#block-views-tweets_new_view-block_1 {
- width: 250px;
+ width: 375px;
display: inline;
float: left;
margin-top: 30px;
@@ -306,6 +306,11 @@ ul.community-matrix > li p
margin-bottom: 0.5em;
}
+ul#subnavlist
+{
+ background: transparent url("/sites/all/themes/kolab/images/line.png") no-repeat scroll center bottom;
+}
+
#subnavlist li
{
display: inline;
@@ -313,6 +318,11 @@ ul.community-matrix > li p
padding-right: 5em;
}
+#subnavlist a
+{
+ text-align: center;
+}
+
#getkolab {
background-color: #EAF5FF;
border: 2px solid #ccc;
More information about the commits
mailing list