diff --git a/modules/groups/groups_ambassador_pages/groups_ambassador_pages.pages_default.inc b/modules/groups/groups_ambassador_pages/groups_ambassador_pages.pages_default.inc index 8419e5e..96a12ba 100644 --- a/modules/groups/groups_ambassador_pages/groups_ambassador_pages.pages_default.inc +++ b/modules/groups/groups_ambassador_pages/groups_ambassador_pages.pages_default.inc @@ -75,6 +75,29 @@ function groups_ambassador_pages_default_page_manager_pages() { $display->uuid = '6ddb52e2-863d-4d7f-a7b5-5976ca341ccd'; $display->content = array(); $display->panels = array(); + $pane = new stdClass(); + $pane->pid = 'new-773e55a9-0642-480c-8f46-cad7edc9e6c7'; + $pane->panel = 'os_bottom'; + $pane->type = 'block'; + $pane->subtype = 'groups_ambassador-groups_ambassador_ask'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'override_title' => 1, + 'override_title_text' => '', + 'override_title_heading' => 'h2', + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 0; + $pane->locks = array(); + $pane->uuid = '773e55a9-0642-480c-8f46-cad7edc9e6c7'; + $display->content['new-773e55a9-0642-480c-8f46-cad7edc9e6c7'] = $pane; + $display->panels['os_bottom'][0] = 'new-773e55a9-0642-480c-8f46-cad7edc9e6c7'; $pane = new stdClass(); $pane->pid = 'new-43902f5c-ea84-413e-9c25-8e025ad673f0'; $pane->panel = 'os_bottom'; @@ -93,14 +116,37 @@ function groups_ambassador_pages_default_page_manager_pages() { ); $pane->css = array(); $pane->extras = array(); - $pane->position = 0; + $pane->position = 1; $pane->locks = array(); $pane->uuid = '43902f5c-ea84-413e-9c25-8e025ad673f0'; $display->content['new-43902f5c-ea84-413e-9c25-8e025ad673f0'] = $pane; - $display->panels['os_bottom'][0] = 'new-43902f5c-ea84-413e-9c25-8e025ad673f0'; + $display->panels['os_bottom'][1] = 'new-43902f5c-ea84-413e-9c25-8e025ad673f0'; + $pane = new stdClass(); + $pane->pid = 'new-b014ccc9-fa9c-488b-9a83-6238f145fc53'; + $pane->panel = 'os_top'; + $pane->type = 'block'; + $pane->subtype = 'groups_ambassador-groups_ambassador_page_banner'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'override_title' => 1, + 'override_title_text' => '', + 'override_title_heading' => 'h2', + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 0; + $pane->locks = array(); + $pane->uuid = 'b014ccc9-fa9c-488b-9a83-6238f145fc53'; + $display->content['new-b014ccc9-fa9c-488b-9a83-6238f145fc53'] = $pane; + $display->panels['os_top'][0] = 'new-b014ccc9-fa9c-488b-9a83-6238f145fc53'; $pane = new stdClass(); $pane->pid = 'new-4c8a52b1-d3ec-45ee-8950-efd18888858f'; - $pane->panel = 'os_middle'; + $pane->panel = 'os_top'; $pane->type = 'views'; $pane->subtype = 'groups_ambassador_list'; $pane->shown = TRUE; @@ -128,57 +174,11 @@ function groups_ambassador_pages_default_page_manager_pages() { ); $pane->css = array(); $pane->extras = array(); - $pane->position = 0; + $pane->position = 1; $pane->locks = array(); $pane->uuid = '4c8a52b1-d3ec-45ee-8950-efd18888858f'; $display->content['new-4c8a52b1-d3ec-45ee-8950-efd18888858f'] = $pane; - $display->panels['os_middle'][0] = 'new-4c8a52b1-d3ec-45ee-8950-efd18888858f'; - $pane = new stdClass(); - $pane->pid = 'new-773e55a9-0642-480c-8f46-cad7edc9e6c7'; - $pane->panel = 'os_middle'; - $pane->type = 'block'; - $pane->subtype = 'groups_ambassador-groups_ambassador_ask'; - $pane->shown = TRUE; - $pane->access = array(); - $pane->configuration = array( - 'override_title' => 1, - 'override_title_text' => '', - 'override_title_heading' => 'h2', - ); - $pane->cache = array(); - $pane->style = array( - 'settings' => NULL, - ); - $pane->css = array(); - $pane->extras = array(); - $pane->position = 1; - $pane->locks = array(); - $pane->uuid = '773e55a9-0642-480c-8f46-cad7edc9e6c7'; - $display->content['new-773e55a9-0642-480c-8f46-cad7edc9e6c7'] = $pane; - $display->panels['os_middle'][1] = 'new-773e55a9-0642-480c-8f46-cad7edc9e6c7'; - $pane = new stdClass(); - $pane->pid = 'new-b014ccc9-fa9c-488b-9a83-6238f145fc53'; - $pane->panel = 'os_top'; - $pane->type = 'block'; - $pane->subtype = 'groups_ambassador-groups_ambassador_page_banner'; - $pane->shown = TRUE; - $pane->access = array(); - $pane->configuration = array( - 'override_title' => 1, - 'override_title_text' => '', - 'override_title_heading' => 'h2', - ); - $pane->cache = array(); - $pane->style = array( - 'settings' => NULL, - ); - $pane->css = array(); - $pane->extras = array(); - $pane->position = 0; - $pane->locks = array(); - $pane->uuid = 'b014ccc9-fa9c-488b-9a83-6238f145fc53'; - $display->content['new-b014ccc9-fa9c-488b-9a83-6238f145fc53'] = $pane; - $display->panels['os_top'][0] = 'new-b014ccc9-fa9c-488b-9a83-6238f145fc53'; + $display->panels['os_top'][1] = 'new-4c8a52b1-d3ec-45ee-8950-efd18888858f'; $pane = new stdClass(); $pane->pid = 'new-16f9cb5c-04fe-4619-a853-8edaa6a3af42'; $pane->panel = 'os_top_left'; diff --git a/themes/openstack/layouts/panels/openstack_front/openstack-front.tpl.php b/themes/openstack/layouts/panels/openstack_front/openstack-front.tpl.php index b370370..7d21532 100644 --- a/themes/openstack/layouts/panels/openstack_front/openstack-front.tpl.php +++ b/themes/openstack/layouts/panels/openstack_front/openstack-front.tpl.php @@ -15,7 +15,7 @@ $panel_suffix = isset($panel_suffix) ? $panel_suffix : ''; -
+
@@ -28,6 +28,7 @@ $panel_suffix = isset($panel_suffix) ? $panel_suffix : '';
+
@@ -45,6 +46,7 @@ $panel_suffix = isset($panel_suffix) ? $panel_suffix : '';
+
@@ -54,6 +56,7 @@ $panel_suffix = isset($panel_suffix) ? $panel_suffix : '';
+
@@ -66,6 +69,7 @@ $panel_suffix = isset($panel_suffix) ? $panel_suffix : '';
+
diff --git a/themes/openstack_bootstrap/custom-sass/partials/_ambassadors.scss b/themes/openstack_bootstrap/custom-sass/partials/_ambassadors.scss index 6c49744..1ec182b 100644 --- a/themes/openstack_bootstrap/custom-sass/partials/_ambassadors.scss +++ b/themes/openstack_bootstrap/custom-sass/partials/_ambassadors.scss @@ -98,12 +98,6 @@ .region-openstack-front-top-second { background: inherit; } - - // container / row / columns for faq region - .openstack-front-bottom { - @extend .container; - margin-bottom: 70px; - } // remove original page header h1.page-header { display: none; @@ -138,6 +132,7 @@ color: #FFFFFF; padding-top: 60px; padding-bottom: 40px; + margin-bottom: 70px; h3 { margin: 0px; text-align: right; @@ -155,6 +150,7 @@ } .pane-groups-ambassador-groups-ambassador-faq { + @extend .container; h3 { color: #2A4E68; font-family: "Open Sans",Helvetica,Arial,sans-serif; diff --git a/themes/openstack_bootstrap/custom-sass/style.scss b/themes/openstack_bootstrap/custom-sass/style.scss index 2aa29a3..ba898b5 100644 --- a/themes/openstack_bootstrap/custom-sass/style.scss +++ b/themes/openstack_bootstrap/custom-sass/style.scss @@ -93,6 +93,10 @@ margin-top: 80px; } +.openstack-front-two-column { + margin-bottom: 70px; +} + /* === Hidden elements === */ .pane-groups-homepage-groups-find-nearby {