From 6379c3578b47d54e6c9ca8b13d6fafc2480d47fe Mon Sep 17 00:00:00 2001
From: Marton Kiss <marton.kiss@gmail.com>
Date: Mon, 23 Jun 2014 13:44:12 +0200
Subject: [PATCH] Frontpage multe block layout

Rearrange frontpage block layout and add welcome block,
upcoming events and recent site activity into lower
regions.

Change-Id: I0ac9937e8abaceb383775881da99ee5bb458219c
---
 drupal-org.make                               |   4 +
 groups.info                                   |   1 +
 .../groups_homepage/groups_homepage.ds.inc    |  75 ++++++++++++
 .../groups_homepage.features.inc              |   3 +
 .../groups_homepage/groups_homepage.info      |   4 +
 .../groups_homepage.pages_default.inc         |  95 +++++----------
 themes/openstack/css/custom.css               | 115 +++++++++++-------
 themes/openstack/sass/custom.scss             |  33 ++++-
 8 files changed, 219 insertions(+), 111 deletions(-)
 create mode 100644 modules/groups/groups_homepage/groups_homepage.ds.inc

diff --git a/drupal-org.make b/drupal-org.make
index 0c1971c..d7c829a 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -575,6 +575,10 @@ projects[date_ical][type] = "module"
 projects[date_ical][subdir] = "contrib"
 projects[date_ical][version] = "3.2"
 
+projects[ds][type] = "module"
+projects[ds][subdir] = "contrib"
+projects[ds][version] = "2.6"
+
 ; Contributed themes.
 
 projects[zen][type] = "theme"
diff --git a/groups.info b/groups.info
index 38b05f5..4b6c4ff 100644
--- a/groups.info
+++ b/groups.info
@@ -32,6 +32,7 @@ dependencies[] = ctools
 dependencies[] = custom_search
 dependencies[] = date_ical
 dependencies[] = diff
+dependencies[] = ds
 dependencies[] = elements
 dependencies[] = email_registration
 dependencies[] = entity
diff --git a/modules/groups/groups_homepage/groups_homepage.ds.inc b/modules/groups/groups_homepage/groups_homepage.ds.inc
new file mode 100644
index 0000000..1c4c439
--- /dev/null
+++ b/modules/groups/groups_homepage/groups_homepage.ds.inc
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @file
+ * groups_homepage.ds.inc
+ */
+
+/**
+ * Implements hook_ds_field_settings_info().
+ */
+function groups_homepage_ds_field_settings_info() {
+  $export = array();
+
+  $ds_fieldsetting = new stdClass();
+  $ds_fieldsetting->api_version = 1;
+  $ds_fieldsetting->id = 'node|event|teaser';
+  $ds_fieldsetting->entity_type = 'node';
+  $ds_fieldsetting->bundle = 'event';
+  $ds_fieldsetting->view_mode = 'teaser';
+  $ds_fieldsetting->settings = array(
+    'title' => array(
+      'weight' => '0',
+      'label' => 'hidden',
+      'format' => 'default',
+      'formatter_settings' => array(
+        'link' => '1',
+        'wrapper' => 'h3',
+        'class' => '',
+      ),
+    ),
+  );
+  $export['node|event|teaser'] = $ds_fieldsetting;
+
+  return $export;
+}
+
+/**
+ * Implements hook_ds_layout_settings_info().
+ */
+function groups_homepage_ds_layout_settings_info() {
+  $export = array();
+
+  $ds_layout = new stdClass();
+  $ds_layout->api_version = 1;
+  $ds_layout->id = 'node|event|teaser';
+  $ds_layout->entity_type = 'node';
+  $ds_layout->bundle = 'event';
+  $ds_layout->view_mode = 'teaser';
+  $ds_layout->layout = 'ds_1col';
+  $ds_layout->settings = array(
+    'regions' => array(
+      'ds_content' => array(
+        0 => 'title',
+        1 => 'field_date',
+        2 => 'field_address',
+      ),
+    ),
+    'fields' => array(
+      'title' => 'ds_content',
+      'field_date' => 'ds_content',
+      'field_address' => 'ds_content',
+    ),
+    'classes' => array(),
+    'wrappers' => array(
+      'ds_content' => 'div',
+    ),
+    'layout_wrapper' => 'div',
+    'layout_attributes' => '',
+    'layout_attributes_merge' => 1,
+    'layout_link_attribute' => '',
+    'layout_link_custom' => '',
+  );
+  $export['node|event|teaser'] = $ds_layout;
+
+  return $export;
+}
diff --git a/modules/groups/groups_homepage/groups_homepage.features.inc b/modules/groups/groups_homepage/groups_homepage.features.inc
index 290a069..21dc97a 100644
--- a/modules/groups/groups_homepage/groups_homepage.features.inc
+++ b/modules/groups/groups_homepage/groups_homepage.features.inc
@@ -8,6 +8,9 @@
  * Implements hook_ctools_plugin_api().
  */
 function groups_homepage_ctools_plugin_api($module = NULL, $api = NULL) {
+  if ($module == "ds" && $api == "ds") {
+    return array("version" => "1");
+  }
   if ($module == "page_manager" && $api == "pages_default") {
     return array("version" => "1");
   }
diff --git a/modules/groups/groups_homepage/groups_homepage.info b/modules/groups/groups_homepage/groups_homepage.info
index 078243d..3be77c0 100644
--- a/modules/groups/groups_homepage/groups_homepage.info
+++ b/modules/groups/groups_homepage/groups_homepage.info
@@ -4,14 +4,18 @@ package = Groups - Landing Pages
 version = 7.x-1.0
 project = groups_homepage
 dependencies[] = ctools
+dependencies[] = ds
 dependencies[] = features
 dependencies[] = menu
 dependencies[] = page_manager
 dependencies[] = panels_mini
 dependencies[] = strongarm
+features[ctools][] = ds:ds:1
 features[ctools][] = page_manager:pages_default:1
 features[ctools][] = panels_mini:panels_default:1
 features[ctools][] = strongarm:strongarm:1
+features[ds_field_settings][] = node|event|teaser
+features[ds_layout_settings][] = node|event|teaser
 features[features_api][] = api:2
 features[menu_custom][] = main-menu
 features[page_manager_pages][] = groups_home
diff --git a/modules/groups/groups_homepage/groups_homepage.pages_default.inc b/modules/groups/groups_homepage/groups_homepage.pages_default.inc
index 85d4b4e..c446982 100644
--- a/modules/groups/groups_homepage/groups_homepage.pages_default.inc
+++ b/modules/groups/groups_homepage/groups_homepage.pages_default.inc
@@ -77,35 +77,13 @@ function groups_homepage_default_page_manager_pages() {
   $display->content = array();
   $display->panels = array();
     $pane = new stdClass();
-    $pane->pid = 'new-b2494b76-fb10-46c5-bc6a-e6fec2d3919e';
-    $pane->panel = 'os_bottom_left';
-    $pane->type = 'panels_ajax_tab_tabs';
-    $pane->subtype = 'panels_ajax_tab_tabs';
+    $pane->pid = 'new-7bf353ed-b2a0-414f-b90e-cf8c4647a2f8';
+    $pane->panel = 'os_center';
+    $pane->type = 'views_panes';
+    $pane->subtype = 'commons_events_upcoming-panel_pane_2';
     $pane->shown = TRUE;
     $pane->access = array();
-    $pane->configuration = array(
-      'mini_panels' => array(
-        'upcoming_events' => array(
-          'selected' => 1,
-          'tab_title' => '',
-          'url_id' => '',
-          'weight' => '-10',
-        ),
-        'recent_activity' => array(
-          'selected' => 1,
-          'tab_title' => '',
-          'url_id' => '',
-          'weight' => '-9',
-        ),
-      ),
-      'container_id' => 'front-events-activity-container',
-      'url_enabled' => 1,
-      'context' => array(
-        0 => 'empty',
-      ),
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
+    $pane->configuration = array();
     $pane->cache = array();
     $pane->style = array(
       'settings' => NULL,
@@ -114,40 +92,14 @@ function groups_homepage_default_page_manager_pages() {
     $pane->extras = array();
     $pane->position = 0;
     $pane->locks = array();
-    $pane->uuid = 'b2494b76-fb10-46c5-bc6a-e6fec2d3919e';
-    $display->content['new-b2494b76-fb10-46c5-bc6a-e6fec2d3919e'] = $pane;
-    $display->panels['os_bottom_left'][0] = 'new-b2494b76-fb10-46c5-bc6a-e6fec2d3919e';
+    $pane->uuid = '7bf353ed-b2a0-414f-b90e-cf8c4647a2f8';
+    $display->content['new-7bf353ed-b2a0-414f-b90e-cf8c4647a2f8'] = $pane;
+    $display->panels['os_center'][0] = 'new-7bf353ed-b2a0-414f-b90e-cf8c4647a2f8';
     $pane = new stdClass();
-    $pane->pid = 'new-f29e6e7e-d5c9-4bfd-b2b8-22769d9b8d8e';
-    $pane->panel = 'os_bottom_left';
-    $pane->type = 'panels_ajax_tab_container';
-    $pane->subtype = 'panels_ajax_tab_container';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'container_id' => 'front-events-activity-container',
-      'context' => array(
-        0 => 'empty',
-      ),
-      'override_title' => 1,
-      'override_title_text' => '<none>',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 1;
-    $pane->locks = array();
-    $pane->uuid = 'f29e6e7e-d5c9-4bfd-b2b8-22769d9b8d8e';
-    $display->content['new-f29e6e7e-d5c9-4bfd-b2b8-22769d9b8d8e'] = $pane;
-    $display->panels['os_bottom_left'][1] = 'new-f29e6e7e-d5c9-4bfd-b2b8-22769d9b8d8e';
-    $pane = new stdClass();
-    $pane->pid = 'new-7ae087d4-887e-4b54-b980-44fb87245089';
-    $pane->panel = 'os_bottom_right';
+    $pane->pid = 'new-cbab0010-59c4-4d7c-8bf9-bb00f7739528';
+    $pane->panel = 'os_left';
     $pane->type = 'block';
-    $pane->subtype = 'groups_homepage-groups_community_stats';
+    $pane->subtype = 'groups_homepage-groups_homepage_welcome';
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
@@ -162,9 +114,28 @@ function groups_homepage_default_page_manager_pages() {
     $pane->extras = array();
     $pane->position = 0;
     $pane->locks = array();
-    $pane->uuid = '7ae087d4-887e-4b54-b980-44fb87245089';
-    $display->content['new-7ae087d4-887e-4b54-b980-44fb87245089'] = $pane;
-    $display->panels['os_bottom_right'][0] = 'new-7ae087d4-887e-4b54-b980-44fb87245089';
+    $pane->uuid = 'cbab0010-59c4-4d7c-8bf9-bb00f7739528';
+    $display->content['new-cbab0010-59c4-4d7c-8bf9-bb00f7739528'] = $pane;
+    $display->panels['os_left'][0] = 'new-cbab0010-59c4-4d7c-8bf9-bb00f7739528';
+    $pane = new stdClass();
+    $pane->pid = 'new-cd740d02-05e4-4170-ac8f-a7c5d32da4aa';
+    $pane->panel = 'os_right';
+    $pane->type = 'views_panes';
+    $pane->subtype = 'commons_activity_streams_activity-panel_pane_1';
+    $pane->shown = TRUE;
+    $pane->access = array();
+    $pane->configuration = array();
+    $pane->cache = array();
+    $pane->style = array(
+      'settings' => NULL,
+    );
+    $pane->css = array();
+    $pane->extras = array();
+    $pane->position = 0;
+    $pane->locks = array();
+    $pane->uuid = 'cd740d02-05e4-4170-ac8f-a7c5d32da4aa';
+    $display->content['new-cd740d02-05e4-4170-ac8f-a7c5d32da4aa'] = $pane;
+    $display->panels['os_right'][0] = 'new-cd740d02-05e4-4170-ac8f-a7c5d32da4aa';
     $pane = new stdClass();
     $pane->pid = 'new-6b115d65-3d2e-4c7e-ad86-fd17d190afc0';
     $pane->panel = 'os_top';
diff --git a/themes/openstack/css/custom.css b/themes/openstack/css/custom.css
index 891251c..7a072da 100644
--- a/themes/openstack/css/custom.css
+++ b/themes/openstack/css/custom.css
@@ -18,19 +18,19 @@ a {
   color: #bc1518;
   text-decoration: none;
 }
-/* line 18, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.4/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */
+/* line 18, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.6/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */
 a:visited {
   color: #bc1518;
 }
-/* line 21, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.4/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */
+/* line 21, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.6/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */
 a:focus {
   color: black;
 }
-/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.4/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */
+/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.6/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */
 a:hover {
   color: black;
 }
-/* line 27, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.4/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */
+/* line 27, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.6/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */
 a:active {
   color: black;
 }
@@ -77,7 +77,7 @@ h3 {
 
 /* line 86, ../sass/custom.scss */
 .blueline {
-  background: url('../images/header-line.gif?1402581856') repeat-x scroll 0 bottom rgba(0, 0, 0, 0);
+  background: url('../images/header-line.gif?1403288496') repeat-x scroll 0 bottom rgba(0, 0, 0, 0);
 }
 
 /* line 90, ../sass/custom.scss */
@@ -313,7 +313,7 @@ h3 {
 /** Activity stream **/
 /* line 271, ../sass/custom.scss */
 .view-commons-activity-streams-activity {
-  background: #f2f6f7;
+  /*background: $blue0;*/
   padding: 10px 0px;
   margin-bottom: 20px;
   line-height: 1em;
@@ -323,31 +323,36 @@ h3 {
 .view-commons-activity-streams-activity .views-row {
   overflow: hidden;
   padding-left: 58px;
-  padding-bottom: 0.5em;
+  /*padding-bottom: 0.5em;*/
+  padding-bottom: 18px;
   min-height: 50px;
 }
-/* line 282, ../sass/custom.scss */
+/* line 283, ../sass/custom.scss */
 .view-commons-activity-streams-activity .views-row div.user-picture {
   position: absolute;
   float: left;
   margin-left: -58px;
 }
-/* line 287, ../sass/custom.scss */
+/* line 288, ../sass/custom.scss */
 .view-commons-activity-streams-activity .views-row .user-picture img {
   width: 40px;
 }
-/* line 290, ../sass/custom.scss */
+/* line 291, ../sass/custom.scss */
 .view-commons-activity-streams-activity .views-row .views-field-timestamp {
-  font-size: 0.85em;
+  font-size: 12px;
   margin-top: 0.5em;
 }
-/* line 294, ../sass/custom.scss */
+/* line 295, ../sass/custom.scss */
 .view-commons-activity-streams-activity .views-row a {
   color: #1f7a95;
 }
+/* line 299, ../sass/custom.scss */
+.view-commons-activity-streams-activity .more-link {
+  display: none;
+}
 
 /** Breadcrumb **/
-/* line 303, ../sass/custom.scss */
+/* line 307, ../sass/custom.scss */
 nav.breadcrumb {
   display: none;
 }
@@ -362,7 +367,7 @@ nav.breadcrumb {
 .two-brick.at-panel:after {
   clear: both;
 }
-/* line 314, ../sass/custom.scss */
+/* line 318, ../sass/custom.scss */
 .two-brick.at-panel .region-two-brick-left-above {
   float: left;
   width: 50%;
@@ -376,7 +381,7 @@ nav.breadcrumb {
   box-sizing: border-box;
   word-wrap: break-word;
 }
-/* line 317, ../sass/custom.scss */
+/* line 321, ../sass/custom.scss */
 .two-brick.at-panel .region-two-brick-right-above {
   float: left;
   width: 50%;
@@ -400,7 +405,7 @@ nav.breadcrumb {
 .three-50-25-25:after {
   clear: both;
 }
-/* line 326, ../sass/custom.scss */
+/* line 330, ../sass/custom.scss */
 .three-50-25-25 .region-three-50-25-25-first {
   float: left;
   width: 50%;
@@ -414,7 +419,7 @@ nav.breadcrumb {
   box-sizing: border-box;
   word-wrap: break-word;
 }
-/* line 329, ../sass/custom.scss */
+/* line 333, ../sass/custom.scss */
 .three-50-25-25 .region-three-50-25-25-second {
   float: left;
   width: 25%;
@@ -428,7 +433,7 @@ nav.breadcrumb {
   box-sizing: border-box;
   word-wrap: break-word;
 }
-/* line 332, ../sass/custom.scss */
+/* line 336, ../sass/custom.scss */
 .three-50-25-25 .region-three-50-25-25-third {
   float: left;
   width: 25%;
@@ -452,11 +457,11 @@ nav.breadcrumb {
 .openstack-front .openstack-front-container:after {
   clear: both;
 }
-/* line 343, ../sass/custom.scss */
+/* line 347, ../sass/custom.scss */
 .openstack-front .openstack-front-top {
   margin-bottom: 20px;
 }
-/* line 346, ../sass/custom.scss */
+/* line 350, ../sass/custom.scss */
 .openstack-front .region-openstack-front-first {
   float: left;
   width: 50%;
@@ -470,7 +475,7 @@ nav.breadcrumb {
   box-sizing: border-box;
   word-wrap: break-word;
 }
-/* line 349, ../sass/custom.scss */
+/* line 353, ../sass/custom.scss */
 .openstack-front .region-openstack-front-second {
   float: left;
   width: 25%;
@@ -484,7 +489,7 @@ nav.breadcrumb {
   box-sizing: border-box;
   word-wrap: break-word;
 }
-/* line 352, ../sass/custom.scss */
+/* line 356, ../sass/custom.scss */
 .openstack-front .region-openstack-front-third {
   float: left;
   width: 25%;
@@ -498,7 +503,7 @@ nav.breadcrumb {
   box-sizing: border-box;
   word-wrap: break-word;
 }
-/* line 355, ../sass/custom.scss */
+/* line 359, ../sass/custom.scss */
 .openstack-front .region-openstack-front-bottom-first {
   float: left;
   width: 66.66667%;
@@ -512,7 +517,7 @@ nav.breadcrumb {
   box-sizing: border-box;
   word-wrap: break-word;
 }
-/* line 358, ../sass/custom.scss */
+/* line 362, ../sass/custom.scss */
 .openstack-front .region-openstack-front-bottom-second {
   float: left;
   width: 33.33333%;
@@ -529,26 +534,26 @@ nav.breadcrumb {
 
 /** Landing page **/
 /* events / activity tabs */
-/* line 369, ../sass/custom.scss */
+/* line 373, ../sass/custom.scss */
 .region-openstack-front-bottom-first li a.panels-ajax-tab-tab {
   font-size: 16px;
   color: #1f7a95;
 }
-/* line 375, ../sass/custom.scss */
+/* line 379, ../sass/custom.scss */
 .region-openstack-front-bottom-first li.active a.panels-ajax-tab-tab {
   color: #bc1518;
 }
-/* line 379, ../sass/custom.scss */
+/* line 383, ../sass/custom.scss */
 .region-openstack-front-bottom-first .item-list {
   text-align: left;
 }
-/* line 382, ../sass/custom.scss */
+/* line 386, ../sass/custom.scss */
 .region-openstack-front-bottom-first .pane-title {
   display: none;
 }
 
 /* Find block */
-/* line 389, ../sass/custom.scss */
+/* line 393, ../sass/custom.scss */
 .find-user-group {
   background: #f4f3f2;
   padding: 10px 20px;
@@ -559,47 +564,69 @@ nav.breadcrumb {
   font-size: 140%;
   text-align: center;
 }
-/* line 399, ../sass/custom.scss */
+/* line 403, ../sass/custom.scss */
 .find-user-group .field-region {
   color: #cae1e9;
 }
 
+/** Welcome pane **/
+/* line 410, ../sass/custom.scss */
+.pane-groups-homepage-groups-homepage-welcome {
+  padding-right: 20px;
+}
+
 /** Landing page upcoming events **/
-/* line 406, ../sass/custom.scss */
+/* line 416, ../sass/custom.scss */
 .view-commons-events-upcoming {
-  background: #f2f6f7;
+  /*background: $blue0;*/
+  /*background: #ff0000;*/
   padding: 10px 0px;
   line-height: 1em;
 }
-/* line 411, ../sass/custom.scss */
+/* line 421, ../sass/custom.scss */
+.view-commons-events-upcoming h3 {
+  font-size: 1.2em;
+  margin: 0px;
+  margin-bottom: 5px;
+}
+/* line 425, ../sass/custom.scss */
+.view-commons-events-upcoming h3 a {
+  color: #1f7a95;
+}
+/* line 429, ../sass/custom.scss */
+.view-commons-events-upcoming .views-row {
+  padding-bottom: 18px;
+  padding-right: 20px;
+}
+/* line 434, ../sass/custom.scss */
 .view-commons-events-upcoming .attachment-before,
 .view-commons-events-upcoming .view-filters {
   display: none;
 }
-/* line 415, ../sass/custom.scss */
+/* line 438, ../sass/custom.scss */
 .view-commons-events-upcoming .field-items, .view-commons-events-upcoming .field,
 .view-commons-events-upcoming .field-item {
   display: inline;
 }
-/* line 418, ../sass/custom.scss */
+/* line 441, ../sass/custom.scss */
 .view-commons-events-upcoming article {
   padding-bottom: 1em;
 }
-/* line 421, ../sass/custom.scss */
+/* line 444, ../sass/custom.scss */
 .view-commons-events-upcoming header {
   margin-bottom: 0.5em;
 }
-/* line 424, ../sass/custom.scss */
+/* line 447, ../sass/custom.scss */
 .view-commons-events-upcoming header a {
   color: #1f7a95;
 }
-/* line 427, ../sass/custom.scss */
+/* line 450, ../sass/custom.scss */
 .view-commons-events-upcoming .field-item {
-  font-size: 0.85em;
+  font-size: 12px;
 }
 
 /** Group page **/
-/* line 439, ../sass/custom.scss */
+/* line 462, ../sass/custom.scss */
 .node-type-group .pane-commons-contributors-group-panel-pane-2,
 .node-type-group article .links,
 .node-type-group .rate-widget,
@@ -607,7 +634,7 @@ nav.breadcrumb {
 .node-type-group .field-name-field-group-location {
   display: none;
 }
-/* line 442, ../sass/custom.scss */
+/* line 465, ../sass/custom.scss */
 .node-type-group #quicktabs-commons_bw {
   background: #f2f6f7;
   padding: 10px;
@@ -616,7 +643,7 @@ nav.breadcrumb {
 }
 
 /** Community stats block **/
-/* line 452, ../sass/custom.scss */
+/* line 475, ../sass/custom.scss */
 .pane-groups-homepage-groups-community-stats {
   border-left: 3px solid #c43322;
   padding-left: 15px;
@@ -627,11 +654,11 @@ nav.breadcrumb {
   font-family: 'PT Sans',serif;
   padding: 5px;
 }
-/* line 453, ../sass/custom.scss */
+/* line 476, ../sass/custom.scss */
 .pane-groups-homepage-groups-community-stats h2 {
   display: none;
 }
-/* line 456, ../sass/custom.scss */
+/* line 479, ../sass/custom.scss */
 .pane-groups-homepage-groups-community-stats em {
   font-weight: bold;
   color: #575757;
diff --git a/themes/openstack/sass/custom.scss b/themes/openstack/sass/custom.scss
index da98fda..992c5bc 100644
--- a/themes/openstack/sass/custom.scss
+++ b/themes/openstack/sass/custom.scss
@@ -269,7 +269,7 @@ h3{
 /** Activity stream **/
 
 .view-commons-activity-streams-activity {
-  background: $blue0;
+  /*background: $blue0;*/
   padding: 10px 0px;
   margin-bottom: 20px;
   line-height: 1em;
@@ -277,7 +277,8 @@ h3{
   .views-row {
     @include clearfix();
     padding-left: 58px;
-    padding-bottom: 0.5em;
+    /*padding-bottom: 0.5em;*/
+    padding-bottom: 18px;
     min-height: 50px;
     div.user-picture {
       position: absolute;
@@ -288,13 +289,16 @@ h3{
       width: 40px;
     }
     .views-field-timestamp {
-      font-size: 0.85em;
+      font-size: 12px;
       margin-top: 0.5em;
     }
     a {
       color: $blue6;
     }
   }
+  .more-link {
+    display: none;
+  }
 
 }
 
@@ -401,12 +405,31 @@ nav.breadcrumb {
   }
 }
 
+/** Welcome pane **/
+
+.pane-groups-homepage-groups-homepage-welcome {
+  padding-right: 20px;
+}
+
 /** Landing page upcoming events **/
 
 .view-commons-events-upcoming {
-  background: $blue0;
+  /*background: $blue0;*/
+  /*background: #ff0000;*/
   padding: 10px 0px;
   line-height: 1em;
+  h3 {
+    font-size: 1.2em;
+    margin: 0px;
+    margin-bottom: 5px;
+    a {
+      color: $blue6;
+    }
+  }
+  .views-row {
+    padding-bottom: 18px;
+    padding-right: 20px;
+  }
   .attachment-before,
   .view-filters {
     display: none;
@@ -425,7 +448,7 @@ nav.breadcrumb {
     color: $blue6;
   }
   .field-item {
-    font-size: 0.85em;
+    font-size: 12px;
   }
 }