From dd90e7bb72c1d27b0f1578981e234e2dbb427935 Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Fri, 19 Feb 2016 16:53:49 -0500
Subject: [PATCH] daily build
---
profiles/wcm_base/CHANGELOG.txt | 8 +-
.../better_exposed_filters.info | 6 +-
...er_exposed_filters_exposed_form_plugin.inc | 1 -
.../bef_test_content/bef_test_content.info | 6 +-
.../ocio_featured_slideshow.context.inc | 4 +-
...featured_slideshow.features.field_base.inc | 2 +-
...ured_slideshow.features.field_instance.inc | 84 +++++++++++++++++-
.../ocio_featured_slideshow.features.inc | 2 +-
...ed_slideshow.flexslider_default_preset.inc | 2 -
.../ocio_featured_slideshow.info | 4 +
.../ocio_featured_slideshow.views_default.inc | 18 +++-
.../wcm_panels_settings.module | 2 +-
.../css/layouts/ocio-3/ocio-3.layout.css | 16 +++-
.../layouts/ocio-3/ocio-3.layout.no-query.css | 16 +++-
.../ocio_omega_3/css/ocio-3.no-query.css | 59 ++++++++++++-
.../themes/ocio_omega_3/css/ocio-3.styles.css | 58 ++++++++++++-
.../layouts/ocio-3/ocio-3-layout.tpl.php | 5 ++
.../wcm_base/themes/ocio_omega_3/ocio_3.info | 4 +-
.../preprocess/page.preprocess.inc | 6 +-
.../ocio_omega_3/sass/base/_layout-base.scss | 18 +++-
.../ocio_omega_3/sass/components/_l-main.scss | 26 ++++++
.../ocio_omega_3/sass/components/_panels.scss | 1 +
.../sass/components/regions/_hero.scss | 7 ++
.../sass/components/regions/_pre-footer.scss | 13 +++
.../sass/layouts/ocio-3/ocio-3.layout.scss | 3 +-
.../themes/ocio_omega_3/theme-settings.php | 14 +++
.../css/ocio-omega-base.no-query.css | 50 ++++++++---
.../css/ocio-omega-base.styles.css | 64 ++++++++++----
.../sass/components/_featured-slideshow.scss | 87 ++++++++++++-------
.../themes/ocio_omega_base/template.php | 10 ++-
30 files changed, 498 insertions(+), 98 deletions(-)
create mode 100644 profiles/wcm_base/themes/ocio_omega_3/sass/components/_l-main.scss
create mode 100644 profiles/wcm_base/themes/ocio_omega_3/sass/components/regions/_hero.scss
create mode 100644 profiles/wcm_base/themes/ocio_omega_3/sass/components/regions/_pre-footer.scss
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index d7b8952e..89a2b74f 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,6 +1,12 @@
+WCM Base 7.x-1.x, 2016-02-19
+----------------------------
+- OCIO Featured Slideshow: Add options for slideshow text color and ability
+ to make translucent background optional.
+- OCIO Omega base: Allow anchors in tile pane URLs.
+
WCM Base 7.x-1.x, 2016-02-11
----------------------------
-- WCM Base: Patched File Entity to allow switching file schemas.
+- WCM Base: Patched File Entity to allow switching file schemes.
- WCM Permissions: Allow site managers and site builders to administer files.
WCM Base 7.x-1.x, 2016-02-10
diff --git a/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.info b/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.info
index bc261bc6..92848efb 100644
--- a/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.info
+++ b/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.info
@@ -7,9 +7,9 @@ dependencies[] = views
files[] = better_exposed_filters_exposed_form_plugin.inc
files[] = tests/better_exposed_filters.test
-; Information added by Drupal.org packaging script on 2016-01-09
-version = "7.x-3.2+47-dev"
+; Information added by Drupal.org packaging script on 2016-02-17
+version = "7.x-3.2+48-dev"
core = "7.x"
project = "better_exposed_filters"
-datestamp = "1452361746"
+datestamp = "1455668046"
diff --git a/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters_exposed_form_plugin.inc b/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters_exposed_form_plugin.inc
index 5d772d27..29170d8b 100644
--- a/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters_exposed_form_plugin.inc
+++ b/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters_exposed_form_plugin.inc
@@ -1444,7 +1444,6 @@ dateFormat: "dd-mm-yy"
break;
case 'bef_links':
- $show_apply = TRUE;
$bef_add_js = TRUE;
$form[$filter_id]['#theme'] = 'select_as_links';
diff --git a/profiles/wcm_base/modules/contrib/better_exposed_filters/tests/bef_test_content/bef_test_content.info b/profiles/wcm_base/modules/contrib/better_exposed_filters/tests/bef_test_content/bef_test_content.info
index e658455c..06bca309 100644
--- a/profiles/wcm_base/modules/contrib/better_exposed_filters/tests/bef_test_content/bef_test_content.info
+++ b/profiles/wcm_base/modules/contrib/better_exposed_filters/tests/bef_test_content/bef_test_content.info
@@ -41,9 +41,9 @@ features_exclude[field][node-bef_test-field_price] = node-bef_test-field_price
features_exclude[field][node-bef_test-field_date] = node-bef_test-field_date
hidden = 1
-; Information added by Drupal.org packaging script on 2016-01-09
-version = "7.x-3.2+47-dev"
+; Information added by Drupal.org packaging script on 2016-02-17
+version = "7.x-3.2+48-dev"
core = "7.x"
project = "better_exposed_filters"
-datestamp = "1452361746"
+datestamp = "1455668046"
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.context.inc b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.context.inc
index cdfc7fd1..c1e026a5 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.context.inc
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.context.inc
@@ -29,8 +29,8 @@ function ocio_featured_slideshow_context_default_contexts() {
'views-featured_slideshow-block' => array(
'module' => 'views',
'delta' => 'featured_slideshow-block',
- 'region' => 'content',
- 'weight' => '-24',
+ 'region' => 'hero',
+ 'weight' => '-10',
),
),
),
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_base.inc b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_base.inc
index af522396..d58ce3f1 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_base.inc
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_base.inc
@@ -10,7 +10,7 @@
function ocio_featured_slideshow_field_default_field_bases() {
$field_bases = array();
- // Exported field_base: 'field_featured_summary'
+ // Exported field_base: 'field_featured_summary'.
$field_bases['field_featured_summary'] = array(
'active' => 1,
'cardinality' => 1,
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_instance.inc b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_instance.inc
index 4136f71e..5797cc0e 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_instance.inc
@@ -10,7 +10,81 @@
function ocio_featured_slideshow_field_default_field_instances() {
$field_instances = array();
- // Exported field_instance: 'node-featured_slide-field_basic_image_image'
+ // Exported field_instance:
+ // 'node-featured_slide-field_banner_image_text_bkground'.
+ $field_instances['node-featured_slide-field_banner_image_text_bkground'] = array(
+ 'bundle' => 'featured_slide',
+ 'default_value' => array(
+ 0 => array(
+ 'value' => 'translucent',
+ ),
+ ),
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'above',
+ 'module' => 'list',
+ 'settings' => array(),
+ 'type' => 'list_default',
+ 'weight' => 5,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'node',
+ 'field_name' => 'field_banner_image_text_bkground',
+ 'label' => 'Slide Text Background ',
+ 'required' => 0,
+ 'settings' => array(
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'options',
+ 'settings' => array(),
+ 'type' => 'options_select',
+ 'weight' => 36,
+ ),
+ );
+
+ // Exported field_instance:
+ // 'node-featured_slide-field_banner_image_text_color'.
+ $field_instances['node-featured_slide-field_banner_image_text_color'] = array(
+ 'bundle' => 'featured_slide',
+ 'default_value' => array(
+ 0 => array(
+ 'value' => 'white',
+ ),
+ ),
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'above',
+ 'module' => 'list',
+ 'settings' => array(),
+ 'type' => 'list_default',
+ 'weight' => 4,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'node',
+ 'field_name' => 'field_banner_image_text_color',
+ 'label' => 'Slide Text Color',
+ 'required' => 0,
+ 'settings' => array(
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'options',
+ 'settings' => array(),
+ 'type' => 'options_select',
+ 'weight' => 34,
+ ),
+ );
+
+ // Exported field_instance: 'node-featured_slide-field_basic_image_image'.
$field_instances['node-featured_slide-field_basic_image_image'] = array(
'bundle' => 'featured_slide',
'deleted' => 0,
@@ -61,7 +135,7 @@ function ocio_featured_slideshow_field_default_field_instances() {
'file_extensions' => 'png jpg jpeg',
'max_filesize' => '3mb',
'max_resolution' => '',
- 'min_resolution' => '1800x700',
+ 'min_resolution' => '1800x600',
'title_field' => 0,
'user_register_form' => FALSE,
),
@@ -105,7 +179,7 @@ function ocio_featured_slideshow_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-featured_slide-field_featured_summary'
+ // Exported field_instance: 'node-featured_slide-field_featured_summary'.
$field_instances['node-featured_slide-field_featured_summary'] = array(
'bundle' => 'featured_slide',
'default_value' => NULL,
@@ -140,7 +214,7 @@ function ocio_featured_slideshow_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-featured_slide-field_ocio_link'
+ // Exported field_instance: 'node-featured_slide-field_ocio_link'.
$field_instances['node-featured_slide-field_ocio_link'] = array(
'bundle' => 'featured_slide',
'default_value' => NULL,
@@ -220,6 +294,8 @@ function ocio_featured_slideshow_field_default_field_instances() {
// Included for use with string extractors like potx.
t('Image');
t('Link');
+ t('Slide Text Background ');
+ t('Slide Text Color');
t('Summary');
return $field_instances;
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.inc b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.inc
index 179c9a44..bbb94ca0 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.inc
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.inc
@@ -40,7 +40,7 @@ function ocio_featured_slideshow_image_default_styles() {
'name' => 'image_scale_and_crop',
'data' => array(
'width' => 1800,
- 'height' => 700,
+ 'height' => 600,
),
'weight' => 1,
),
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.flexslider_default_preset.inc b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.flexslider_default_preset.inc
index 522a81d3..62ec607c 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.flexslider_default_preset.inc
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.flexslider_default_preset.inc
@@ -16,8 +16,6 @@ function ocio_featured_slideshow_flexslider_default_presets() {
$preset->name = 'ocio_flexslider';
$preset->title = 'OCIO FlexSlider';
$preset->theme = 'classic';
- $preset->imagestyle_normal = 'flexslider_full';
- $preset->imagestyle_thumbnail = 'flexslider_thumbnail';
$preset->options = array(
'namespace' => 'flex-',
'selector' => '.slides > li',
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.info b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.info
index 10f61907..17ca4cb5 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.info
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.info
@@ -13,6 +13,7 @@ dependencies[] = image
dependencies[] = link
dependencies[] = media
dependencies[] = ocio_field_bases
+dependencies[] = ocio_landing_page
dependencies[] = override_node_options
dependencies[] = panopoly_widgets
dependencies[] = strongarm
@@ -25,6 +26,8 @@ features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
features[field_base][] = field_featured_summary
+features[field_instance][] = node-featured_slide-field_banner_image_text_bkground
+features[field_instance][] = node-featured_slide-field_banner_image_text_color
features[field_instance][] = node-featured_slide-field_basic_image_image
features[field_instance][] = node-featured_slide-field_featured_summary
features[field_instance][] = node-featured_slide-field_ocio_link
@@ -41,3 +44,4 @@ features[variable][] = node_submitted_featured_slide
features[variable][] = private_featured_slide
features[variable][] = workbench_moderation_default_state_featured_slide
features[views_view][] = featured_slideshow
+features_exclude[field_instance][node-featured_slide-field_banner_image_text_location] = node-featured_slide-field_banner_image_text_location
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.views_default.inc b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.views_default.inc
index ac598eda..0c6d9b96 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.views_default.inc
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.views_default.inc
@@ -112,6 +112,22 @@ function ocio_featured_slideshow_views_default_views() {
$handler->display->display_options['defaults']['access'] = FALSE;
$handler->display->display_options['access']['type'] = 'perm';
$handler->display->display_options['defaults']['fields'] = FALSE;
+ /* Field: Content: Banner Image Text Color */
+ $handler->display->display_options['fields']['field_banner_image_text_color']['id'] = 'field_banner_image_text_color';
+ $handler->display->display_options['fields']['field_banner_image_text_color']['table'] = 'field_data_field_banner_image_text_color';
+ $handler->display->display_options['fields']['field_banner_image_text_color']['field'] = 'field_banner_image_text_color';
+ $handler->display->display_options['fields']['field_banner_image_text_color']['label'] = '';
+ $handler->display->display_options['fields']['field_banner_image_text_color']['exclude'] = TRUE;
+ $handler->display->display_options['fields']['field_banner_image_text_color']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['field_banner_image_text_color']['type'] = 'list_key';
+ /* Field: Content: Banner Image Text Background */
+ $handler->display->display_options['fields']['field_banner_image_text_bkground']['id'] = 'field_banner_image_text_bkground';
+ $handler->display->display_options['fields']['field_banner_image_text_bkground']['table'] = 'field_data_field_banner_image_text_bkground';
+ $handler->display->display_options['fields']['field_banner_image_text_bkground']['field'] = 'field_banner_image_text_bkground';
+ $handler->display->display_options['fields']['field_banner_image_text_bkground']['label'] = '';
+ $handler->display->display_options['fields']['field_banner_image_text_bkground']['exclude'] = TRUE;
+ $handler->display->display_options['fields']['field_banner_image_text_bkground']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['field_banner_image_text_bkground']['type'] = 'list_key';
/* Field: Content: Title */
$handler->display->display_options['fields']['title']['id'] = 'title';
$handler->display->display_options['fields']['title']['table'] = 'node';
@@ -146,7 +162,7 @@ function ocio_featured_slideshow_views_default_views() {
$handler->display->display_options['fields']['field_basic_image_image']['label'] = '';
$handler->display->display_options['fields']['field_basic_image_image']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['field_basic_image_image']['alter']['text'] = '[field_basic_image_image]
-<span class="flex-meta">
+<span class="flex-meta [field_banner_image_text_color] [field_banner_image_text_bkground]">
<span class="flex-title">[title]</span>
<span class="flex-summary">[field_featured_summary]</span>
</span>
diff --git a/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.module b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.module
index 1c792dca..04a451a1 100644
--- a/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.module
+++ b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.module
@@ -52,7 +52,7 @@ function _wcm_panels_settings_region_style_settings($form) {
* Simplify form for fpp. Remove the option for title as a link.
*/
function wcm_panels_settings_form_fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form_alter(&$form, &$form_state) {
- $form['link']['#access'] = FALSE;
+ $form['widget_settings']['link']['#access'] = FALSE;
$form['redirect']['#access'] = FALSE;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.css b/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.css
index 332d7005..b3ef5043 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.css
+++ b/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.css
@@ -120,8 +120,8 @@ body.html {
/* setting padding for containers */
.l-main {
- padding: 2% 2%;
*zoom: 1;
+ padding: 0 2.5%;
}
.l-main:after {
content: "";
@@ -129,6 +129,20 @@ body.html {
clear: both;
}
+.node-type-ocio-landing-page .l-main {
+ padding: 0%;
+}
+.node-type-ocio-landing-page ul.breadcrumb {
+ padding: 0 2.5%;
+}
+.node-type-ocio-landing-page .tabs, .node-type-ocio-landing-page .messages {
+ margin: 2.5%;
+}
+
+.panels-row {
+ padding: 0 2.5%;
+}
+
img, media {
max-width: 100%;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.no-query.css b/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.no-query.css
index 10842e1a..0ab897c5 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.no-query.css
@@ -108,8 +108,8 @@ body.html {
/* setting padding for containers */
.l-main {
- padding: 2% 2%;
*zoom: 1;
+ padding: 0 2.5%;
}
.l-main:after {
content: "";
@@ -117,6 +117,20 @@ body.html {
clear: both;
}
+.node-type-ocio-landing-page .l-main {
+ padding: 0%;
+}
+.node-type-ocio-landing-page ul.breadcrumb {
+ padding: 0 2.5%;
+}
+.node-type-ocio-landing-page .tabs, .node-type-ocio-landing-page .messages {
+ margin: 2.5%;
+}
+
+.panels-row {
+ padding: 0 2.5%;
+}
+
img, media {
max-width: 100%;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.no-query.css b/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.no-query.css
index 416e3f01..90d31672 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.no-query.css
@@ -104,8 +104,8 @@ body.html {
/* setting padding for containers */
.l-main {
- padding: 2% 2%;
*zoom: 1;
+ padding: 0 2.5%;
}
.l-main:after {
content: "";
@@ -113,6 +113,20 @@ body.html {
clear: both;
}
+.node-type-ocio-landing-page .l-main {
+ padding: 0%;
+}
+.node-type-ocio-landing-page ul.breadcrumb {
+ padding: 0 2.5%;
+}
+.node-type-ocio-landing-page .tabs, .node-type-ocio-landing-page .messages {
+ margin: 2.5%;
+}
+
+.panels-row {
+ padding: 0 2.5%;
+}
+
img, media {
max-width: 100%;
}
@@ -359,6 +373,31 @@ h6 a:hover, .zeta a:hover {
display: none;
}
+.l-main {
+ margin-top: 0 !important;
+ margin-bottom: 0 !important;
+}
+
+.l-main.lt-gray {
+ background: #ededed;
+}
+.l-main.lt-gray .panels-row.even {
+ background: #ededed;
+}
+.l-main.lt-gray .panels-row.odd {
+ background: white;
+}
+
+.l-main.white {
+ background: white;
+}
+.l-main.white .panels-row.even {
+ background: white;
+}
+.l-main.white .panels-row.odd {
+ background: #ededed;
+}
+
.page-news .view-display-id-page {
padding-right: 2em;
margin-top: 1em;
@@ -430,3 +469,21 @@ div.workbench-info-block #edit-submit {
.l-footer-wrapper .l-region--footer-2 {
margin-top: 10px;
}
+
+.l-region--hero-wrapper.lt-gray {
+ background: #ededed;
+}
+
+.l-region--hero-wrapper.white {
+ background: white;
+}
+
+.l-region--pre-footer-wrapper.lt-gray {
+ background: #ededed;
+}
+.l-region--pre-footer-wrapper.white {
+ background: white;
+}
+.l-region--pre-footer-wrapper img {
+ display: block;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.styles.css b/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.styles.css
index 07c87649..4d5b63e4 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.styles.css
@@ -116,8 +116,8 @@ body.html {
/* setting padding for containers */
.l-main {
- padding: 2% 2%;
*zoom: 1;
+ padding: 0 2.5%;
}
.l-main:after {
content: "";
@@ -125,6 +125,20 @@ body.html {
clear: both;
}
+.node-type-ocio-landing-page .l-main {
+ padding: 0%;
+}
+.node-type-ocio-landing-page ul.breadcrumb {
+ padding: 0 2.5%;
+}
+.node-type-ocio-landing-page .tabs, .node-type-ocio-landing-page .messages {
+ margin: 2.5%;
+}
+
+.panels-row {
+ padding: 0 2.5%;
+}
+
img, media {
max-width: 100%;
}
@@ -375,6 +389,31 @@ h6 a:hover, .zeta a:hover {
display: none;
}
+.l-main {
+ margin-top: 0 !important;
+ margin-bottom: 0 !important;
+}
+
+.l-main.lt-gray {
+ background: #ededed;
+}
+.l-main.lt-gray .panels-row.even {
+ background: #ededed;
+}
+.l-main.lt-gray .panels-row.odd {
+ background: white;
+}
+
+.l-main.white {
+ background: white;
+}
+.l-main.white .panels-row.even {
+ background: white;
+}
+.l-main.white .panels-row.odd {
+ background: #ededed;
+}
+
@media (min-width: 47.5em) {
.page-news .view-display-id-page {
padding-right: 2em;
@@ -449,8 +488,25 @@ div.workbench-info-block #edit-submit {
margin-top: 10px;
}
+.l-region--hero-wrapper.lt-gray {
+ background: #ededed;
+}
+
+.l-region--hero-wrapper.white {
+ background: white;
+}
+
@media (min-width: 47.5em) {
.l-region--main-menu-wrapper .max-width {
padding: 0 2%;
}
}
+.l-region--pre-footer-wrapper.lt-gray {
+ background: #ededed;
+}
+.l-region--pre-footer-wrapper.white {
+ background: white;
+}
+.l-region--pre-footer-wrapper img {
+ display: block;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php b/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php
index e63d8307..be69c31a 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php
@@ -46,6 +46,11 @@
<?php print render($page['sidebar_1']); ?>
<?php print render($page['sidebar_2']); ?>
</div>
+
+ <div class="l-region--pre-footer-wrapper <?php print $main_classes; ?>">
+ <?php print render($page['pre_footer']); ?>
+ </div>
+
<footer class="l-footer-wrapper" role="contentinfo">
<?php print render($page['footer_1']); ?>
<?php print render($page['footer_2']); ?>
diff --git a/profiles/wcm_base/themes/ocio_omega_3/ocio_3.info b/profiles/wcm_base/themes/ocio_omega_3/ocio_3.info
index 700bc465..807637d9 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/ocio_3.info
+++ b/profiles/wcm_base/themes/ocio_omega_3/ocio_3.info
@@ -82,7 +82,5 @@ settings[omega_libraries][pie][status] = 1
settings[omega_libraries][html5shiv][status] = 1
settings[omega_libraries][modernizr][status] = 1
settings[ocio_omega_breadcrumb] = 1
-settings[ocio_omega_color_navbar] = lt-gray
-settings[ocio_omega_color_masthead] = dk-gray
settings[ocio_omega_color_menu] = md-gray
-settings[ocio_omega_color_accent] = none
+settings[ocio_omega_color_body] = white
diff --git a/profiles/wcm_base/themes/ocio_omega_3/preprocess/page.preprocess.inc b/profiles/wcm_base/themes/ocio_omega_3/preprocess/page.preprocess.inc
index 7537e6f9..56e77a6a 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/preprocess/page.preprocess.inc
+++ b/profiles/wcm_base/themes/ocio_omega_3/preprocess/page.preprocess.inc
@@ -3,7 +3,7 @@
/**
* Implements hook_preprocess_page().
*/
-function ocio_3_preprocess_page(&$variables) {
- // You can use preprocess hooks to modify the variables before they are passed
- // to the theme function or template file.
+function ocio_3_preprocess_page(&$vars) {
+ $classes[] = theme_get_setting('ocio_omega_color_body');
+ $vars['main_classes'] = join(' ', $classes);
}
diff --git a/profiles/wcm_base/themes/ocio_omega_3/sass/base/_layout-base.scss b/profiles/wcm_base/themes/ocio_omega_3/sass/base/_layout-base.scss
index fc623073..4e5ae79a 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/sass/base/_layout-base.scss
+++ b/profiles/wcm_base/themes/ocio_omega_3/sass/base/_layout-base.scss
@@ -49,8 +49,24 @@ body.html {
background: $white;
}
+
/* setting padding for containers */
.l-main {
- padding: 2% 2%;
@include pie-clearfix;
+ padding: 0 2.5%;
+}
+.node-type-ocio-landing-page {
+ .l-main {
+ padding: 0%;
+ }
+ ul.breadcrumb {
+ padding: 0 2.5%;
+ }
+ .tabs, .messages {
+ margin: 2.5%;
+ }
}
+
+.panels-row {
+ padding: 0 2.5%;
+}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_3/sass/components/_l-main.scss b/profiles/wcm_base/themes/ocio_omega_3/sass/components/_l-main.scss
new file mode 100644
index 00000000..d9382f60
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_3/sass/components/_l-main.scss
@@ -0,0 +1,26 @@
+.l-main {
+ margin-top: 0 !important;
+ margin-bottom: 0 !important;
+}
+
+.l-main.lt-gray {
+ background: $lt-gray;
+
+ .panels-row.even {
+ background: $lt-gray;
+ }
+ .panels-row.odd {
+ background: white;
+ }
+}
+
+.l-main.white {
+ background: white;
+
+ .panels-row.even {
+ background: white;
+ }
+ .panels-row.odd {
+ background: $lt-gray;
+ }
+}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_3/sass/components/_panels.scss b/profiles/wcm_base/themes/ocio_omega_3/sass/components/_panels.scss
index 510e6218..bf7283fa 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/sass/components/_panels.scss
+++ b/profiles/wcm_base/themes/ocio_omega_3/sass/components/_panels.scss
@@ -4,3 +4,4 @@ h2.pane-title {
text-transform: uppercase;
margin-top: 1em;
}
+
diff --git a/profiles/wcm_base/themes/ocio_omega_3/sass/components/regions/_hero.scss b/profiles/wcm_base/themes/ocio_omega_3/sass/components/regions/_hero.scss
new file mode 100644
index 00000000..d8a2fdf4
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_3/sass/components/regions/_hero.scss
@@ -0,0 +1,7 @@
+.l-region--hero-wrapper.lt-gray {
+ background: $lt-gray;
+}
+
+.l-region--hero-wrapper.white {
+ background: white;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_3/sass/components/regions/_pre-footer.scss b/profiles/wcm_base/themes/ocio_omega_3/sass/components/regions/_pre-footer.scss
new file mode 100644
index 00000000..fd57f8ff
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_3/sass/components/regions/_pre-footer.scss
@@ -0,0 +1,13 @@
+.l-region--pre-footer-wrapper {
+ &.lt-gray {
+ background: $lt-gray;
+ }
+
+ &.white {
+ background: white;
+ }
+
+ img {
+ display: block;
+ }
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_3/sass/layouts/ocio-3/ocio-3.layout.scss b/profiles/wcm_base/themes/ocio_omega_3/sass/layouts/ocio-3/ocio-3.layout.scss
index ac166177..a7c9d5db 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/sass/layouts/ocio-3/ocio-3.layout.scss
+++ b/profiles/wcm_base/themes/ocio_omega_3/sass/layouts/ocio-3/ocio-3.layout.scss
@@ -33,7 +33,8 @@
margin-bottom: $vert-spacing-unit;
}
-.l-main {}
+.l-main {
+}
/* Sidebars */
diff --git a/profiles/wcm_base/themes/ocio_omega_3/theme-settings.php b/profiles/wcm_base/themes/ocio_omega_3/theme-settings.php
index a0220f0b..05a7473b 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/theme-settings.php
+++ b/profiles/wcm_base/themes/ocio_omega_3/theme-settings.php
@@ -11,6 +11,20 @@ require_once dirname(__FILE__) . '/template.php';
* Implements hook_form_FORM_alter().
*/
function ocio_3_form_system_theme_settings_alter(&$form, $form_state) {
+
+ // Add body color option
+ $form['ocio_omega']['ocio_omega_color_body']= array(
+ '#type' => 'radios',
+ '#title' => t('Body Color'),
+ '#default_value' => theme_get_setting('ocio_omega_color_body'),
+ '#options' => ocio_omega_base_generate_color_swatches(
+ array(
+ 'white' => t('White'),
+ 'lt-gray' => t('Light Gray'),
+ )
+ ),
+ );
+
//unset options from the base theme that we don't want for this site
unset($form['ocio_omega']['ocio_omega_color_navbar']);
unset($form['ocio_omega']['ocio_omega_color_masthead']);
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
index 93f90044..625084e9 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
@@ -1466,35 +1466,57 @@ body .ui-accordion .ui-accordion-content {
.flexslider .flex-meta {
display: block;
width: 100%;
- padding: 0.5em 1em;
+ position: absolute;
+ color: white;
text-align: center;
+ bottom: 0.6em;
+ padding: 0.4em 8%;
font-size: 24px;
font-size: 2.4rem;
- line-height: 110%;
- color: white;
- bottom: 0;
- position: absolute;
- padding: 0.5em 0;
- font-size: 30px;
- font-size: 3rem;
- background-color: rgba(0, 0, 0, 0.6);
- color: white;
+ bottom: 0.3em;
+ padding: 0.5em 6%;
+ font-size: 32px;
+ font-size: 3.2rem;
font-size: 34px;
font-size: 3.4rem;
font-size: 40px;
font-size: 4rem;
}
-.flexslider .flex-meta .flex-title,
-.flexslider .flex-meta .flex-summary {
- display: block;
-}
.flexslider .flex-meta .flex-title {
+ display: block;
font-weight: 400;
+ line-height: 1.1em;
}
.flexslider .flex-meta .flex-summary {
font-weight: 300;
font-size: 0.6em;
line-height: 1.2em;
+ display: none;
+ display: block;
+}
+.flexslider .flex-meta .flex-title {
+ margin-bottom: 0.1em;
+}
+.flexslider .flex-meta.white {
+ color: white;
+}
+.flexslider .flex-meta.white.translucent {
+ bottom: 0;
+ background-color: rgba(20, 20, 20, 0.6);
+}
+.flexslider .flex-meta.dk-gray {
+ color: #2d2d2d;
+}
+.flexslider .flex-meta.dk-gray.translucent {
+ bottom: 0;
+ background-color: rgba(200, 200, 200, 0.7);
+}
+.flexslider .flex-meta.black {
+ color: black;
+}
+.flexslider .flex-meta.black.translucent {
+ bottom: 0;
+ background-color: rgba(200, 200, 200, 0.7);
}
.flexslider .flex-direction-nav a {
color: rgba(0, 0, 0, 0.8);
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
index 4a16a0d6..127c1268 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
@@ -1476,22 +1476,39 @@ body .ui-accordion .ui-accordion-content {
.flexslider .flex-meta {
display: block;
width: 100%;
- padding: 0.5em 1em;
+ position: absolute;
+ color: white;
text-align: center;
+ bottom: 0.6em;
+ padding: 0.4em 8%;
font-size: 24px;
font-size: 2.4rem;
- line-height: 110%;
- color: white;
- bottom: 0;
+}
+.flexslider .flex-meta .flex-title {
+ display: block;
+ font-weight: 400;
+ line-height: 1.1em;
+}
+.flexslider .flex-meta .flex-summary {
+ font-weight: 300;
+ font-size: 0.6em;
+ line-height: 1.2em;
+ display: none;
+}
+@media (min-width: 47.5em) {
+ .flexslider .flex-meta .flex-summary {
+ display: block;
+ }
}
@media (min-width: 47.5em) {
.flexslider .flex-meta {
- position: absolute;
- padding: 0.5em 0;
- font-size: 30px;
- font-size: 3rem;
- background-color: rgba(0, 0, 0, 0.6);
- color: white;
+ bottom: 0.3em;
+ padding: 0.5em 6%;
+ font-size: 32px;
+ font-size: 3.2rem;
+ }
+ .flexslider .flex-meta .flex-title {
+ margin-bottom: 0.1em;
}
}
@media (min-width: 60em) {
@@ -1506,17 +1523,26 @@ body .ui-accordion .ui-accordion-content {
font-size: 4rem;
}
}
-.flexslider .flex-meta .flex-title,
-.flexslider .flex-meta .flex-summary {
- display: block;
+.flexslider .flex-meta.white {
+ color: white;
}
-.flexslider .flex-meta .flex-title {
- font-weight: 400;
+.flexslider .flex-meta.white.translucent {
+ bottom: 0;
+ background-color: rgba(20, 20, 20, 0.6);
}
-.flexslider .flex-meta .flex-summary {
- font-weight: 300;
- font-size: 0.6em;
- line-height: 1.2em;
+.flexslider .flex-meta.dk-gray {
+ color: #2d2d2d;
+}
+.flexslider .flex-meta.dk-gray.translucent {
+ bottom: 0;
+ background-color: rgba(200, 200, 200, 0.7);
+}
+.flexslider .flex-meta.black {
+ color: black;
+}
+.flexslider .flex-meta.black.translucent {
+ bottom: 0;
+ background-color: rgba(200, 200, 200, 0.7);
}
.flexslider .flex-direction-nav a {
color: rgba(0, 0, 0, 0.8);
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_featured-slideshow.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_featured-slideshow.scss
index c365f974..896bbece 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_featured-slideshow.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_featured-slideshow.scss
@@ -5,49 +5,78 @@
box-shadow: none;
margin: 0;
- .flex-meta {
- display: block;
- width: 100%;
- padding: 0.5em 1em;
+ .flex-meta {
+ display: block;
+ width: 100%;
+ position: absolute;
+ color: white;
text-align: center;
+ bottom: 0.6em;
+ padding: 0.4em 8%;
@include font-size(2.4);
- line-height: 110%;
- color: white;
- bottom: 0;
-
+
+ .flex-title {
+ display: block;
+ font-weight: 400;
+ line-height: 1.1em;
+ }
+
+ .flex-summary {
+ font-weight: 300;
+ font-size: 0.6em;
+ line-height: 1.2em;
+ display: none;
+
+ //hide summary text until tab view
+ @include breakpoint($tab, true) {
+ display: block;
+ }
+ }
+
+ //adjust for various breakpoints
@include breakpoint($tab, true) {
- position: absolute;
- padding: 0.5em 0;
- @include font-size(3.0);
- background-color: rgba(0, 0, 0, 0.6);
- color: white;
+ bottom: 0.3em;
+ padding: 0.5em 6%;
+ @include font-size(3.2);
+
+ .flex-title {
+ margin-bottom: 0.1em;
+ }
}
@include breakpoint($desk, true) {
@include font-size(3.4);
}
- @include breakpoint($wide, true) {
+ @include breakpoint($wide, true) {
@include font-size(4.0);
}
- .flex-title,
- .flex-summary {
- display: block;
- }
-
- .flex-title {
- font-weight: 400;
- }
- .flex-summary {
- font-weight: 300;
- font-size: 0.6em;
- line-height: 1.2em;
+ // add text color and background per selections
+ &.white {
+ color: white;
+ &.translucent {
+ bottom: 0;
+ background-color: $dark-translucent;
+ }
+ }
+ &.dk-gray {
+ color: $dk-gray;
+ &.translucent {
+ bottom: 0;
+ background-color: darken($light-translucent, 8%);
+ }
+ }
+ &.black {
+ color: black;
+ &.translucent {
+ bottom: 0;
+ background-color: darken($light-translucent, 8%);
+ }
}
-
}
-
- .flex-direction-nav a {
+
+ .flex-direction-nav a {
color: rgba(0, 0, 0, 0.8);
text-decoration: none;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/template.php b/profiles/wcm_base/themes/ocio_omega_base/template.php
index ccb8e3a2..3d1ee9bc 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/template.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/template.php
@@ -109,8 +109,10 @@ function ocio_omega_base_preprocess_fieldable_panels_pane(&$vars) {
if (!empty($vars['content']['title'])) {
$vars['tile_title'] = $vars['content']['title']['#value'];
}
+ $vars['tile_url'] = NULL;
if (!empty($vars['content']['field_tile_link'])) {
- $vars['tile_url'] = url($vars['content']['field_tile_link']['#items'][0]['url'], array('absolute' => TRUE));
+ $link = $vars['content']['field_tile_link']['#items'][0];
+ $vars['tile_url'] = url($link['url'], array('absolute' => TRUE, 'fragment' => $link['fragment']));
}
if (!empty($vars['content']['field_background_color'])) {
$vars['classes_array'][] = $vars['content']['field_background_color']['#items'][0]['value'];
@@ -138,9 +140,9 @@ function ocio_omega_base_preprocess_fieldable_panels_pane(&$vars) {
*/
function ocio_omega_base_preprocess_field(&$vars) {
-
+
if ($vars['element']['#field_name'] == 'field_banner_image_text') {
-
+
//print classes based on selected options from field
if (isset($vars['element']['#object']->field_banner_image_text_color['und'][0]['value'])) {
$vars['classes_array'][] = $vars['element']['#object']->field_banner_image_text_color['und'][0]['value'];
@@ -151,7 +153,7 @@ function ocio_omega_base_preprocess_field(&$vars) {
if (isset($vars['element']['#object']->field_banner_image_text_bkground['und'][0]['value'])) {
$vars['classes_array'][] = $vars['element']['#object']->field_banner_image_text_bkground['und'][0]['value'];
}
-
+
}
}
--
GitLab