From d97e3ba1c15e287c06c7d8c486e7930379a82991 Mon Sep 17 00:00:00 2001 From: Marton Kiss Date: Tue, 17 Jun 2014 13:06:35 +0200 Subject: [PATCH] Refactor front page layout Introduce a new layout to front page, include a map, group finder, and tabbed upcoming events / recent activity. Change-Id: I1a865e29e3a1174a2f0ca1636f01ee3a2d0df0a0 --- drupal-org.make | 9 + events.json | 6 +- groups.info | 1 + .../groups_homepage.features.inc | 3 + .../groups_homepage/groups_homepage.info | 9 +- .../groups_homepage.pages_default.inc | 157 ++++++----- .../groups_homepage.panels_default.inc | 110 ++++++++ .../templates/groups_find_nearby.tpl.php | 13 +- themes/openstack/css/custom.css | 266 ++++++++++++------ themes/openstack/sass/custom.scss | 111 +++++++- themes/openstack/templates/page.tpl.php | 54 ++-- 11 files changed, 537 insertions(+), 202 deletions(-) create mode 100644 modules/groups/groups_homepage/groups_homepage.panels_default.inc diff --git a/drupal-org.make b/drupal-org.make index 1228d44..9de0c5b 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -560,6 +560,15 @@ projects[feeds_fetcher_directory][version] = "2.0-beta5" ; https://drupal.org/node/2023775 projects[feeds_fetcher_directory][patch][] = "https://drupal.org/files/feeds_fetcher_directory-config-form-validate-errors.patch" +projects[jquery_update][type] = "module" +projects[jquery_update][subdir] = "contrib" +projects[jquery_update][version] = "2.4" + +projects[panels_ajax_tab][type] = "module" +projects[panels_ajax_tab][subdir] = "contrib" +projects[panels_ajax_tab][version] = "1.0-alpha+9-dev" + + ; Contributed themes. projects[zen][type] = "theme" diff --git a/events.json b/events.json index e95d9a6..0550b4a 100644 --- a/events.json +++ b/events.json @@ -2,13 +2,13 @@ "events": [ { "title": "Gartner Data Center Conference", - "date_from": "2014-01-09 09:00:00", - "date_to": "2014-01-12 18:00:00", + "date_from": "2014-11-09 09:00:00", + "date_to": "2014-11-12 18:00:00", "location": "US/Las Vegas, NV" }, { "title": "OpenStack in action 4", - "date_from": "2014-01-05 09:00:00", + "date_from": "2014-11-05 09:00:00", "location": "FR/Paris" } ] diff --git a/groups.info b/groups.info index 08f56e8..07a6243 100644 --- a/groups.info +++ b/groups.info @@ -41,6 +41,7 @@ dependencies[] = features dependencies[] = file_entity dependencies[] = flag dependencies[] = http_client +dependencies[] = jquery_update dependencies[] = libraries dependencies[] = media dependencies[] = media_internet diff --git a/modules/groups/groups_homepage/groups_homepage.features.inc b/modules/groups/groups_homepage/groups_homepage.features.inc index 5c88e61..290a069 100644 --- a/modules/groups/groups_homepage/groups_homepage.features.inc +++ b/modules/groups/groups_homepage/groups_homepage.features.inc @@ -11,6 +11,9 @@ function groups_homepage_ctools_plugin_api($module = NULL, $api = NULL) { if ($module == "page_manager" && $api == "pages_default") { return array("version" => "1"); } + if ($module == "panels_mini" && $api == "panels_default") { + return array("version" => "1"); + } if ($module == "strongarm" && $api == "strongarm") { return array("version" => "1"); } diff --git a/modules/groups/groups_homepage/groups_homepage.info b/modules/groups/groups_homepage/groups_homepage.info index 0aee3c5..d46cdd9 100644 --- a/modules/groups/groups_homepage/groups_homepage.info +++ b/modules/groups/groups_homepage/groups_homepage.info @@ -7,11 +7,14 @@ dependencies[] = ctools dependencies[] = features dependencies[] = menu dependencies[] = page_manager +dependencies[] = panels_mini dependencies[] = strongarm features[ctools][] = page_manager:pages_default:1 +features[ctools][] = panels_mini:panels_default:1 +features[ctools][] = strongarm:strongarm:1 features[features_api][] = api:2 features[menu_custom][] = main-menu -features[menu_links][] = main-menu:home features[page_manager_pages][] = groups_home -features[ctools][] = strongarm:strongarm:1 -features[variable][] = site_frontpage \ No newline at end of file +features[panels_mini][] = recent_activity +features[panels_mini][] = upcoming_events +features[variable][] = site_frontpage diff --git a/modules/groups/groups_homepage/groups_homepage.pages_default.inc b/modules/groups/groups_homepage/groups_homepage.pages_default.inc index fa96470..85d4b4e 100644 --- a/modules/groups/groups_homepage/groups_homepage.pages_default.inc +++ b/modules/groups/groups_homepage/groups_homepage.pages_default.inc @@ -65,6 +65,10 @@ function groups_homepage_default_page_manager_pages() { 'os_bottom_left' => NULL, 'os_bottom_right' => NULL, 'os_bottom' => NULL, + 'two_66_33_top' => NULL, + 'two_66_33_first' => NULL, + 'two_66_33_second' => NULL, + 'two_66_33_bottom' => NULL, ), ); $display->cache = array(); @@ -73,13 +77,32 @@ function groups_homepage_default_page_manager_pages() { $display->content = array(); $display->panels = array(); $pane = new stdClass(); - $pane->pid = 'new-4149ec78-f9ea-2084-5961-19adcd9726c5'; + $pane->pid = 'new-b2494b76-fb10-46c5-bc6a-e6fec2d3919e'; $pane->panel = 'os_bottom_left'; - $pane->type = 'block'; - $pane->subtype = 'groups_homepage-groups_community_map'; + $pane->type = 'panels_ajax_tab_tabs'; + $pane->subtype = 'panels_ajax_tab_tabs'; $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' => '', ); @@ -91,19 +114,23 @@ function groups_homepage_default_page_manager_pages() { $pane->extras = array(); $pane->position = 0; $pane->locks = array(); - $pane->uuid = '4149ec78-f9ea-2084-5961-19adcd9726c5'; - $display->content['new-4149ec78-f9ea-2084-5961-19adcd9726c5'] = $pane; - $display->panels['os_bottom_left'][0] = 'new-4149ec78-f9ea-2084-5961-19adcd9726c5'; + $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 = new stdClass(); - $pane->pid = 'new-c2b9e460-b848-d8f4-8153-cf0687afd8ea'; - $pane->panel = 'os_bottom_right'; - $pane->type = 'block'; - $pane->subtype = 'groups_homepage-groups_find_nearby'; + $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( - 'override_title' => 0, - 'override_title_text' => '', + 'container_id' => 'front-events-activity-container', + 'context' => array( + 0 => 'empty', + ), + 'override_title' => 1, + 'override_title_text' => '', ); $pane->cache = array(); $pane->style = array( @@ -111,55 +138,14 @@ function groups_homepage_default_page_manager_pages() { ); $pane->css = array(); $pane->extras = array(); - $pane->position = 0; + $pane->position = 1; $pane->locks = array(); - $pane->uuid = 'c2b9e460-b848-d8f4-8153-cf0687afd8ea'; - $display->content['new-c2b9e460-b848-d8f4-8153-cf0687afd8ea'] = $pane; - $display->panels['os_bottom_right'][0] = 'new-c2b9e460-b848-d8f4-8153-cf0687afd8ea'; - $pane = new stdClass(); - $pane->pid = 'new-1a23fada-1c8b-2cf4-2978-e8aa64e28877'; - $pane->panel = 'os_center'; - $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 = '1a23fada-1c8b-2cf4-2978-e8aa64e28877'; - $display->content['new-1a23fada-1c8b-2cf4-2978-e8aa64e28877'] = $pane; - $display->panels['os_center'][0] = 'new-1a23fada-1c8b-2cf4-2978-e8aa64e28877'; - $pane = new stdClass(); - $pane->pid = 'new-dd6ca3f4-3444-af04-f1e2-47c9f488ed53'; - $pane->panel = 'os_left'; - $pane->type = 'block'; - $pane->subtype = 'groups_homepage-groups_homepage_welcome'; - $pane->shown = TRUE; - $pane->access = array(); - $pane->configuration = array( - 'override_title' => 0, - 'override_title_text' => '', - ); - $pane->cache = array(); - $pane->style = array( - 'settings' => NULL, - ); - $pane->css = array(); - $pane->extras = array(); - $pane->position = 0; - $pane->locks = array(); - $pane->uuid = 'dd6ca3f4-3444-af04-f1e2-47c9f488ed53'; - $display->content['new-dd6ca3f4-3444-af04-f1e2-47c9f488ed53'] = $pane; - $display->panels['os_left'][0] = 'new-dd6ca3f4-3444-af04-f1e2-47c9f488ed53'; + $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_middle'; + $pane->panel = 'os_bottom_right'; $pane->type = 'block'; $pane->subtype = 'groups_homepage-groups_community_stats'; $pane->shown = TRUE; @@ -178,15 +164,30 @@ function groups_homepage_default_page_manager_pages() { $pane->locks = array(); $pane->uuid = '7ae087d4-887e-4b54-b980-44fb87245089'; $display->content['new-7ae087d4-887e-4b54-b980-44fb87245089'] = $pane; - $display->panels['os_middle'][0] = 'new-7ae087d4-887e-4b54-b980-44fb87245089'; + $display->panels['os_bottom_right'][0] = 'new-7ae087d4-887e-4b54-b980-44fb87245089'; $pane = new stdClass(); - $pane->pid = 'new-4f60b089-fac8-aa14-d1f8-d5674b0d51bc'; - $pane->panel = 'os_right'; - $pane->type = 'views_panes'; - $pane->subtype = 'commons_events_upcoming-panel_pane_2'; + $pane->pid = 'new-6b115d65-3d2e-4c7e-ad86-fd17d190afc0'; + $pane->panel = 'os_top'; + $pane->type = 'views'; + $pane->subtype = 'groups_map'; $pane->shown = TRUE; $pane->access = array(); - $pane->configuration = array(); + $pane->configuration = array( + 'override_pager_settings' => 0, + 'use_pager' => 0, + 'nodes_per_page' => '0', + 'pager_id' => '0', + 'offset' => '0', + 'more_link' => 0, + 'feed_icons' => 0, + 'panel_args' => 0, + 'link_to_view' => 0, + 'args' => '', + 'url' => '', + 'display' => 'default', + 'override_title' => 0, + 'override_title_text' => '', + ); $pane->cache = array(); $pane->style = array( 'settings' => NULL, @@ -195,9 +196,31 @@ function groups_homepage_default_page_manager_pages() { $pane->extras = array(); $pane->position = 0; $pane->locks = array(); - $pane->uuid = '4f60b089-fac8-aa14-d1f8-d5674b0d51bc'; - $display->content['new-4f60b089-fac8-aa14-d1f8-d5674b0d51bc'] = $pane; - $display->panels['os_right'][0] = 'new-4f60b089-fac8-aa14-d1f8-d5674b0d51bc'; + $pane->uuid = '6b115d65-3d2e-4c7e-ad86-fd17d190afc0'; + $display->content['new-6b115d65-3d2e-4c7e-ad86-fd17d190afc0'] = $pane; + $display->panels['os_top'][0] = 'new-6b115d65-3d2e-4c7e-ad86-fd17d190afc0'; + $pane = new stdClass(); + $pane->pid = 'new-c2b9e460-b848-d8f4-8153-cf0687afd8ea'; + $pane->panel = 'os_top'; + $pane->type = 'block'; + $pane->subtype = 'groups_homepage-groups_find_nearby'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'override_title' => 1, + 'override_title_text' => '', + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 1; + $pane->locks = array(); + $pane->uuid = 'c2b9e460-b848-d8f4-8153-cf0687afd8ea'; + $display->content['new-c2b9e460-b848-d8f4-8153-cf0687afd8ea'] = $pane; + $display->panels['os_top'][1] = 'new-c2b9e460-b848-d8f4-8153-cf0687afd8ea'; $display->hide_title = PANELS_TITLE_NONE; $display->title_pane = '0'; $handler->conf['display'] = $display; diff --git a/modules/groups/groups_homepage/groups_homepage.panels_default.inc b/modules/groups/groups_homepage/groups_homepage.panels_default.inc new file mode 100644 index 0000000..e9a2093 --- /dev/null +++ b/modules/groups/groups_homepage/groups_homepage.panels_default.inc @@ -0,0 +1,110 @@ +disabled = FALSE; /* Edit this to true to make a default mini disabled initially */ + $mini->api_version = 1; + $mini->name = 'recent_activity'; + $mini->category = ''; + $mini->admin_title = 'Recent Activity'; + $mini->admin_description = ''; + $mini->requiredcontexts = array(); + $mini->contexts = array(); + $mini->relationships = array(); + $display = new panels_display(); + $display->layout = 'one'; + $display->layout_settings = array(); + $display->panel_settings = array( + 'style_settings' => array( + 'default' => NULL, + 'one_main' => NULL, + ), + ); + $display->cache = array(); + $display->title = ''; + $display->uuid = '1ca209d6-0a3a-4748-9d50-f09e299aae60'; + $display->content = array(); + $display->panels = array(); + $pane = new stdClass(); + $pane->pid = 'new-2855799f-fc72-4981-8402-591d13dcd415'; + $pane->panel = 'one_main'; + $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 = '2855799f-fc72-4981-8402-591d13dcd415'; + $display->content['new-2855799f-fc72-4981-8402-591d13dcd415'] = $pane; + $display->panels['one_main'][0] = 'new-2855799f-fc72-4981-8402-591d13dcd415'; + $display->hide_title = PANELS_TITLE_NONE; + $display->title_pane = '0'; + $mini->display = $display; + $export['recent_activity'] = $mini; + + $mini = new stdClass(); + $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */ + $mini->api_version = 1; + $mini->name = 'upcoming_events'; + $mini->category = ''; + $mini->admin_title = 'Upcoming Events'; + $mini->admin_description = ''; + $mini->requiredcontexts = array(); + $mini->contexts = array(); + $mini->relationships = array(); + $display = new panels_display(); + $display->layout = 'one'; + $display->layout_settings = array(); + $display->panel_settings = array( + 'style_settings' => array( + 'default' => NULL, + 'one_main' => NULL, + ), + ); + $display->cache = array(); + $display->title = ''; + $display->uuid = '291fa2bf-424b-4abd-8408-49fa1805ed44'; + $display->content = array(); + $display->panels = array(); + $pane = new stdClass(); + $pane->pid = 'new-b6c08a22-2d0b-4ac5-9e7c-ffe6398d0c1e'; + $pane->panel = 'one_main'; + $pane->type = 'views_panes'; + $pane->subtype = 'commons_events_upcoming-panel_pane_2'; + $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 = 'b6c08a22-2d0b-4ac5-9e7c-ffe6398d0c1e'; + $display->content['new-b6c08a22-2d0b-4ac5-9e7c-ffe6398d0c1e'] = $pane; + $display->panels['one_main'][0] = 'new-b6c08a22-2d0b-4ac5-9e7c-ffe6398d0c1e'; + $display->hide_title = PANELS_TITLE_FIXED; + $display->title_pane = 'new-b6c08a22-2d0b-4ac5-9e7c-ffe6398d0c1e'; + $mini->display = $display; + $export['upcoming_events'] = $mini; + + return $export; +} diff --git a/modules/groups/groups_homepage/templates/groups_find_nearby.tpl.php b/modules/groups/groups_homepage/templates/groups_find_nearby.tpl.php index c6d221f..65d07dd 100644 --- a/modules/groups/groups_homepage/templates/groups_find_nearby.tpl.php +++ b/modules/groups/groups_homepage/templates/groups_find_nearby.tpl.php @@ -3,17 +3,8 @@ * Template of front page groups finder block. */ ?> -
+
-

- Find the nearest usergroup in your region and meet with other stackers! -

- - + Find groups near
-

Not found?

-

- Establish a new Openstack User Group in your city. Read our organizer tips About bootstrapping a local group and join to our fast growing vibrant community! -

- Register new user group
\ No newline at end of file diff --git a/themes/openstack/css/custom.css b/themes/openstack/css/custom.css index 9c099b3..891251c 100644 --- a/themes/openstack/css/custom.css +++ b/themes/openstack/css/custom.css @@ -5,7 +5,7 @@ */ /** COLORS **/ /** BASIC STLYES **/ -/* line 37, ../sass/custom.scss */ +/* line 49, ../sass/custom.scss */ body { font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; font-size: 13px; @@ -13,7 +13,7 @@ body { font-weight: normal; } -/* line 42, ../sass/custom.scss */ +/* line 54, ../sass/custom.scss */ a { color: #bc1518; text-decoration: none; @@ -34,82 +34,142 @@ a:hover { a:active { color: black; } -/* line 45, ../sass/custom.scss */ +/* line 57, ../sass/custom.scss */ a:hover { text-decoration: underline; } -/* line 50, ../sass/custom.scss */ +/* line 62, ../sass/custom.scss */ +a, a:active, a:focus { + outline: none; +} + +/* line 66, ../sass/custom.scss */ p { margin: 0 0 1.5em; } -/* line 54, ../sass/custom.scss */ +/* line 70, ../sass/custom.scss */ h1 { font-size: 24px; color: #264d69; font-weight: normal; } -/* line 58, ../sass/custom.scss */ +/* line 74, ../sass/custom.scss */ h2 { font-size: 18px; color: #264d69; font-weight: normal; } -/* line 62, ../sass/custom.scss */ +/* line 78, ../sass/custom.scss */ h3 { font-size: 16px; color: #bc1518; font-weight: normal; } -/* line 66, ../sass/custom.scss */ +/* line 82, ../sass/custom.scss */ .block { margin: 0px; } -/* line 70, ../sass/custom.scss */ +/* line 86, ../sass/custom.scss */ .blueline { - background: url('../images/header-line.gif?1398243000') repeat-x scroll 0 bottom rgba(0, 0, 0, 0); + background: url('../images/header-line.gif?1402581856') repeat-x scroll 0 bottom rgba(0, 0, 0, 0); } -/* line 74, ../sass/custom.scss */ +/* line 90, ../sass/custom.scss */ #logo { line-height: 24px; - verical-align: baseline; + vertical-align: baseline; } -/* line 77, ../sass/custom.scss */ +/* line 93, ../sass/custom.scss */ #logo img { padding-top: 8px; } +/** BRANDING LAYOUT **/ +/* reset */ +/* line 103, ../sass/custom.scss */ +#branding a#logo { + margin: 0; + padding: 0; + border: 0; +} +/* line 106, ../sass/custom.scss */ +#branding div#navigation { + margin: 0; + padding: 0; + border: 0; + width: auto; +} + +/* line 46, ../sass-extensions/zen-grids/stylesheets/zen/_grids.scss */ +#branding #branding-container:before, #branding #branding-container:after { + content: ""; + display: table; +} +/* line 50, ../sass-extensions/zen-grids/stylesheets/zen/_grids.scss */ +#branding #branding-container:after { + clear: both; +} +/* line 118, ../sass/custom.scss */ +#branding a#logo { + float: left; + width: 16.66667%; + margin-left: 0%; + margin-right: -16.66667%; + padding-left: 5px; + padding-right: 5px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + word-wrap: break-word; + min-width: 196px; +} +/* line 122, ../sass/custom.scss */ +#branding div#navigation { + float: left; + width: 83.33333%; + margin-left: 16.66667%; + margin-right: -100%; + padding-left: 5px; + padding-right: 5px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + word-wrap: break-word; +} + /** PRIMARY MENU **/ -/* line 84, ../sass/custom.scss */ +/* line 130, ../sass/custom.scss */ #navigation { height: auto; line-height: 24px; } -/* line 87, ../sass/custom.scss */ +/* line 133, ../sass/custom.scss */ #navigation * { padding: 0; margin: 0; } -/* line 91, ../sass/custom.scss */ +/* line 137, ../sass/custom.scss */ #navigation nav { margin-left: 30px; } -/* line 94, ../sass/custom.scss */ +/* line 140, ../sass/custom.scss */ #navigation .links li { padding: 0; } -/* line 97, ../sass/custom.scss */ +/* line 143, ../sass/custom.scss */ #navigation li { vertical-align: baseline; margin-right: 20px; } -/* line 100, ../sass/custom.scss */ +/* line 146, ../sass/custom.scss */ #navigation li a { display: block; color: #353535; @@ -117,24 +177,24 @@ h3 { font-size: 14px; text-decoration: none; } -/* line 109, ../sass/custom.scss */ +/* line 155, ../sass/custom.scss */ #navigation li.active a { border-bottom: 3px solid #CF2F19; color: #CF2F19; } /** UTILITY LINKS **/ -/* line 118, ../sass/custom.scss */ +/* line 164, ../sass/custom.scss */ .block-commons-utility-links { text-align: right; } -/* line 120, ../sass/custom.scss */ +/* line 166, ../sass/custom.scss */ .block-commons-utility-links ul { padding: 0; margin: 0; display: inline-block; } -/* line 124, ../sass/custom.scss */ +/* line 170, ../sass/custom.scss */ .block-commons-utility-links ul li { margin: 0; padding: 0; @@ -142,33 +202,33 @@ h3 { display: inline-block; padding-left: 0.5em; } -/* line 130, ../sass/custom.scss */ +/* line 176, ../sass/custom.scss */ .block-commons-utility-links ul li a { color: #1F7A95; } /** BLOCK SEARCH FORM **/ -/* line 139, ../sass/custom.scss */ +/* line 185, ../sass/custom.scss */ #header #block-search-form { float: right; } -/* line 141, ../sass/custom.scss */ +/* line 187, ../sass/custom.scss */ #header #block-search-form .form-item { margin: 0px; margin-top: 0.5em; } -/* line 145, ../sass/custom.scss */ +/* line 191, ../sass/custom.scss */ #header #block-search-form .form-type-textfield { border: 1px solid #c5e2ea; display: inline-block; } -/* line 148, ../sass/custom.scss */ +/* line 194, ../sass/custom.scss */ #header #block-search-form .form-type-textfield input { border: none; outline: none; font-size: 16px; } -/* line 154, ../sass/custom.scss */ +/* line 200, ../sass/custom.scss */ #header #block-search-form .form-submit { background: #CF2F19; color: #ffffff; @@ -177,7 +237,7 @@ h3 { } /** FOOTER **/ -/* line 165, ../sass/custom.scss */ +/* line 211, ../sass/custom.scss */ #footer hr { height: 1px; background: none repeat scroll 0 0 #DDDDDD; @@ -189,44 +249,44 @@ h3 { margin: 0 0 1.45em; width: 100%; } -/* line 176, ../sass/custom.scss */ +/* line 222, ../sass/custom.scss */ #footer .span-8, #footer .span-4 { float: left; margin-right: 10px; } -/* line 179, ../sass/custom.scss */ +/* line 225, ../sass/custom.scss */ #footer .span-8 h3, #footer .span-4 h3 { margin-bottom: 10px; } -/* line 182, ../sass/custom.scss */ +/* line 228, ../sass/custom.scss */ #footer .span-8 ul, #footer .span-4 ul { margin-top: 10px; list-style: none; padding: 0px; } -/* line 186, ../sass/custom.scss */ +/* line 232, ../sass/custom.scss */ #footer .span-8 ul li, #footer .span-4 ul li { line-height: 18px; } -/* line 188, ../sass/custom.scss */ +/* line 234, ../sass/custom.scss */ #footer .span-8 ul li a, #footer .span-8 ul li a.hover, #footer .span-4 ul li a, #footer .span-4 ul li a.hover { color: #000000; } -/* line 194, ../sass/custom.scss */ +/* line 240, ../sass/custom.scss */ #footer .span-8 { width: 310px; } -/* line 197, ../sass/custom.scss */ +/* line 243, ../sass/custom.scss */ #footer .span-4 { width: 150px; } -/* line 200, ../sass/custom.scss */ +/* line 246, ../sass/custom.scss */ #footer .span-4.last { margin-right: 0px; } /** Groups Page **/ -/* line 207, ../sass/custom.scss */ +/* line 253, ../sass/custom.scss */ .view-groups-groups-directory { margin-top: 1em; margin-bottom: 2em; @@ -236,58 +296,58 @@ h3 { -o-column-count: 6; column-count: 6; } -/* line 211, ../sass/custom.scss */ +/* line 257, ../sass/custom.scss */ .view-groups-groups-directory h3 { margin-top: 0px; margin-bottom: 0.5em; } -/* line 215, ../sass/custom.scss */ +/* line 261, ../sass/custom.scss */ .view-groups-groups-directory .views-row-last { padding-bottom: 1em; } -/* line 218, ../sass/custom.scss */ +/* line 264, ../sass/custom.scss */ .view-groups-groups-directory a { color: #1F7A95; } /** Activity stream **/ -/* line 225, ../sass/custom.scss */ +/* line 271, ../sass/custom.scss */ .view-commons-activity-streams-activity { background: #f2f6f7; - padding: 10px; + padding: 10px 0px; margin-bottom: 20px; line-height: 1em; /* activity stream row */ } -/* line 231, ../sass/custom.scss */ +/* line 277, ../sass/custom.scss */ .view-commons-activity-streams-activity .views-row { overflow: hidden; padding-left: 58px; padding-bottom: 0.5em; min-height: 50px; } -/* line 236, ../sass/custom.scss */ +/* line 282, ../sass/custom.scss */ .view-commons-activity-streams-activity .views-row div.user-picture { position: absolute; float: left; margin-left: -58px; } -/* line 241, ../sass/custom.scss */ +/* line 287, ../sass/custom.scss */ .view-commons-activity-streams-activity .views-row .user-picture img { width: 40px; } -/* line 244, ../sass/custom.scss */ +/* line 290, ../sass/custom.scss */ .view-commons-activity-streams-activity .views-row .views-field-timestamp { font-size: 0.85em; margin-top: 0.5em; } -/* line 248, ../sass/custom.scss */ +/* line 294, ../sass/custom.scss */ .view-commons-activity-streams-activity .views-row a { color: #1f7a95; } /** Breadcrumb **/ -/* line 257, ../sass/custom.scss */ +/* line 303, ../sass/custom.scss */ nav.breadcrumb { display: none; } @@ -302,7 +362,7 @@ nav.breadcrumb { .two-brick.at-panel:after { clear: both; } -/* line 268, ../sass/custom.scss */ +/* line 314, ../sass/custom.scss */ .two-brick.at-panel .region-two-brick-left-above { float: left; width: 50%; @@ -316,7 +376,7 @@ nav.breadcrumb { box-sizing: border-box; word-wrap: break-word; } -/* line 271, ../sass/custom.scss */ +/* line 317, ../sass/custom.scss */ .two-brick.at-panel .region-two-brick-right-above { float: left; width: 50%; @@ -340,7 +400,7 @@ nav.breadcrumb { .three-50-25-25:after { clear: both; } -/* line 280, ../sass/custom.scss */ +/* line 326, ../sass/custom.scss */ .three-50-25-25 .region-three-50-25-25-first { float: left; width: 50%; @@ -354,7 +414,7 @@ nav.breadcrumb { box-sizing: border-box; word-wrap: break-word; } -/* line 283, ../sass/custom.scss */ +/* line 329, ../sass/custom.scss */ .three-50-25-25 .region-three-50-25-25-second { float: left; width: 25%; @@ -368,7 +428,7 @@ nav.breadcrumb { box-sizing: border-box; word-wrap: break-word; } -/* line 286, ../sass/custom.scss */ +/* line 332, ../sass/custom.scss */ .three-50-25-25 .region-three-50-25-25-third { float: left; width: 25%; @@ -392,7 +452,11 @@ nav.breadcrumb { .openstack-front .openstack-front-container:after { clear: both; } -/* line 297, ../sass/custom.scss */ +/* line 343, ../sass/custom.scss */ +.openstack-front .openstack-front-top { + margin-bottom: 20px; +} +/* line 346, ../sass/custom.scss */ .openstack-front .region-openstack-front-first { float: left; width: 50%; @@ -406,7 +470,7 @@ nav.breadcrumb { box-sizing: border-box; word-wrap: break-word; } -/* line 300, ../sass/custom.scss */ +/* line 349, ../sass/custom.scss */ .openstack-front .region-openstack-front-second { float: left; width: 25%; @@ -420,7 +484,7 @@ nav.breadcrumb { box-sizing: border-box; word-wrap: break-word; } -/* line 303, ../sass/custom.scss */ +/* line 352, ../sass/custom.scss */ .openstack-front .region-openstack-front-third { float: left; width: 25%; @@ -434,12 +498,12 @@ nav.breadcrumb { box-sizing: border-box; word-wrap: break-word; } -/* line 306, ../sass/custom.scss */ +/* line 355, ../sass/custom.scss */ .openstack-front .region-openstack-front-bottom-first { float: left; - width: 50%; + width: 66.66667%; margin-left: 0%; - margin-right: -50%; + margin-right: -66.66667%; padding-left: 5px; padding-right: 5px; -moz-box-sizing: border-box; @@ -448,11 +512,11 @@ nav.breadcrumb { box-sizing: border-box; word-wrap: break-word; } -/* line 309, ../sass/custom.scss */ +/* line 358, ../sass/custom.scss */ .openstack-front .region-openstack-front-bottom-second { float: left; - width: 50%; - margin-left: 50%; + width: 33.33333%; + margin-left: 66.66667%; margin-right: -100%; padding-left: 5px; padding-right: 5px; @@ -463,42 +527,79 @@ nav.breadcrumb { word-wrap: break-word; } +/** Landing page **/ +/* events / activity tabs */ +/* line 369, ../sass/custom.scss */ +.region-openstack-front-bottom-first li a.panels-ajax-tab-tab { + font-size: 16px; + color: #1f7a95; +} +/* line 375, ../sass/custom.scss */ +.region-openstack-front-bottom-first li.active a.panels-ajax-tab-tab { + color: #bc1518; +} +/* line 379, ../sass/custom.scss */ +.region-openstack-front-bottom-first .item-list { + text-align: left; +} +/* line 382, ../sass/custom.scss */ +.region-openstack-front-bottom-first .pane-title { + display: none; +} + +/* Find block */ +/* line 389, ../sass/custom.scss */ +.find-user-group { + background: #f4f3f2; + padding: 10px 20px; + border-top: 1px solid #c6c6c6; + color: #1d6a95; + margin-top: 10px; + margin-bottom: 10px; + font-size: 140%; + text-align: center; +} +/* line 399, ../sass/custom.scss */ +.find-user-group .field-region { + color: #cae1e9; +} + /** Landing page upcoming events **/ -/* line 316, ../sass/custom.scss */ +/* line 406, ../sass/custom.scss */ .view-commons-events-upcoming { background: #f2f6f7; - padding: 10px; + padding: 10px 0px; line-height: 1em; } -/* line 321, ../sass/custom.scss */ +/* line 411, ../sass/custom.scss */ .view-commons-events-upcoming .attachment-before, .view-commons-events-upcoming .view-filters { display: none; } -/* line 325, ../sass/custom.scss */ +/* line 415, ../sass/custom.scss */ .view-commons-events-upcoming .field-items, .view-commons-events-upcoming .field, .view-commons-events-upcoming .field-item { display: inline; } -/* line 328, ../sass/custom.scss */ +/* line 418, ../sass/custom.scss */ .view-commons-events-upcoming article { padding-bottom: 1em; } -/* line 331, ../sass/custom.scss */ +/* line 421, ../sass/custom.scss */ .view-commons-events-upcoming header { margin-bottom: 0.5em; } -/* line 334, ../sass/custom.scss */ +/* line 424, ../sass/custom.scss */ .view-commons-events-upcoming header a { color: #1f7a95; } -/* line 337, ../sass/custom.scss */ +/* line 427, ../sass/custom.scss */ .view-commons-events-upcoming .field-item { font-size: 0.85em; } /** Group page **/ -/* line 349, ../sass/custom.scss */ +/* line 439, ../sass/custom.scss */ .node-type-group .pane-commons-contributors-group-panel-pane-2, .node-type-group article .links, .node-type-group .rate-widget, @@ -506,7 +607,7 @@ nav.breadcrumb { .node-type-group .field-name-field-group-location { display: none; } -/* line 352, ../sass/custom.scss */ +/* line 442, ../sass/custom.scss */ .node-type-group #quicktabs-commons_bw { background: #f2f6f7; padding: 10px; @@ -515,22 +616,23 @@ nav.breadcrumb { } /** Community stats block **/ -/* line 362, ../sass/custom.scss */ +/* line 452, ../sass/custom.scss */ .pane-groups-homepage-groups-community-stats { + border-left: 3px solid #c43322; + padding-left: 15px; + letter-spacing: -0.076em; font-size: 130%; - text-align: center; - color: #7F7F7F; - /*border: 3px solid #D5D5D5;*/ - border-bottom: 2px solid #D5D5D5; - border-top: 2px solid #D5D5D5; + text-align: left; + color: gray; font-family: 'PT Sans',serif; padding: 5px; } -/* line 363, ../sass/custom.scss */ +/* line 453, ../sass/custom.scss */ .pane-groups-homepage-groups-community-stats h2 { display: none; } -/* line 366, ../sass/custom.scss */ +/* line 456, ../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 c64aaec..da98fda 100644 --- a/themes/openstack/sass/custom.scss +++ b/themes/openstack/sass/custom.scss @@ -6,6 +6,7 @@ @import "compass/css3"; @import "compass/layout.scss"; +@import "compass/reset/utilities"; @import "compass/typography"; @import "compass/utilities"; @import "init"; @@ -22,10 +23,21 @@ $blue4: #264D69; $blue5: #1D395E; $blue6: #1F7A95; +$blue7: #C1E4EE; +$blue8: #7ED5EE; +$blue9: #1D6A95; + $red: #BC1518; +$red1: #C43322; $green: #D5EFD4; +$grey0: #CAE1E9; +$grey1: #F4F3F2; +$grey2: #C6C6C6; +$grey3: #808080; +$grey4: #575757; + @mixin font($size, $color, $weight){ font-size: $size; color: $color; @@ -47,6 +59,10 @@ a{ } } +a, a:active, a:focus { + outline: none; +} + p{ margin: 0 0 1.5em; } @@ -73,12 +89,42 @@ h3{ #logo { line-height: 24px; - verical-align: baseline; + vertical-align: baseline; img { padding-top: 8px; } } +/** BRANDING LAYOUT **/ + +/* reset */ + +#branding { + a#logo { + @include reset-box-model; + } + div#navigation { + @include reset-box-model; + width: auto; + } +} + +#branding { + $zen-column-count: 12; + $zen-gutter-width: 10px; + #branding-container { + @include zen-grid-container; + } + a#logo { + @include zen-grid-item(2, 1); + min-width: 196px; + } + div#navigation { + @include zen-grid-item(10, 3); + } +} + + /** PRIMARY MENU **/ #navigation { @@ -224,7 +270,7 @@ h3{ .view-commons-activity-streams-activity { background: $blue0; - padding: 10px; + padding: 10px 0px; margin-bottom: 20px; line-height: 1em; /* activity stream row */ @@ -294,6 +340,9 @@ nav.breadcrumb { .openstack-front-container { @include zen-grid-container; } + .openstack-front-top { + margin-bottom: 20px; + } .region-openstack-front-first { @include zen-grid-item(6, 1); } @@ -304,10 +353,51 @@ nav.breadcrumb { @include zen-grid-item(3, 10); } .region-openstack-front-bottom-first { - @include zen-grid-item(6, 1); + @include zen-grid-item(8, 1); } .region-openstack-front-bottom-second { - @include zen-grid-item(6, 7); + @include zen-grid-item(4, 9); + } +} + +/** Landing page **/ + +/* events / activity tabs */ + +.region-openstack-front-bottom-first { + li { + a.panels-ajax-tab-tab { + font-size: 16px; + color: $blue6; + } + } + li.active { + a.panels-ajax-tab-tab { + color: $red; + } + } + .item-list { + text-align: left; + } + .pane-title { + display: none; + } +} + +/* Find block */ + +.find-user-group { + background: $grey1; + padding: 10px 20px; + border-top: 1px solid $grey2; + color: $blue9; + margin-top: 10px; + margin-bottom: 10px; + font-size: 140%; + text-align: center; + + .field-region { + color: $grey0; } } @@ -315,7 +405,7 @@ nav.breadcrumb { .view-commons-events-upcoming { background: $blue0; - padding: 10px; + padding: 10px 0px; line-height: 1em; .attachment-before, .view-filters { @@ -365,13 +455,14 @@ nav.breadcrumb { } em { font-weight: bold; + color: $grey4; } + border-left: 3px solid $red1; + padding-left: 15px; + letter-spacing: -0.076em; font-size: 130%; - text-align: center; - color: #7F7F7F; - /*border: 3px solid #D5D5D5;*/ - border-bottom: 2px solid #D5D5D5; - border-top: 2px solid #D5D5D5; + text-align: left; + color: $grey3; font-family: 'PT Sans',serif; padding: 5px; } \ No newline at end of file diff --git a/themes/openstack/templates/page.tpl.php b/themes/openstack/templates/page.tpl.php index a725fca..93cc6d8 100644 --- a/themes/openstack/templates/page.tpl.php +++ b/themes/openstack/templates/page.tpl.php @@ -15,34 +15,36 @@
- - - - -