From 980c0fd9043cb8a83c158fe4e9563412d1f80873 Mon Sep 17 00:00:00 2001
From: Melissa Miller <miller.2676@osu.edu>
Date: Mon, 11 Jan 2016 13:58:00 -0500
Subject: [PATCH] daily build
---
profiles/wcm_base/CHANGELOG.txt | 11 ++
.../better_exposed_filters.info | 6 +-
.../better_exposed_filters.theme | 10 +-
...er_exposed_filters_exposed_form_plugin.inc | 14 +-
.../bef_test_content/bef_test_content.info | 6 +-
.../tests/better_exposed_filters.test | 54 +++++++-
.../date_popup_authored.info | 9 +-
.../contrib/manualcrop/manualcrop.info | 8 ++
.../modules/contrib/workbench/workbench.info | 8 ++
.../workbench_media/workbench_media.info | 8 ++
.../tests/workbench_moderation_test.info | 8 ++
.../workbench_moderation.info | 8 ++
...ured_slideshow.features.field_instance.inc | 7 +-
.../ocio_featured_slideshow.features.inc | 2 +-
.../ocio_featured_slideshow.strongarm.inc | 3 +
.../ocio_omega_4/css/ocio-4.no-query.css | 66 ----------
.../themes/ocio_omega_4/css/ocio-4.styles.css | 78 -----------
.../sass/components/_featured-slideshow.scss | 86 -------------
.../css/ocio-omega-base.no-query.css | 95 ++++++--------
.../css/ocio-omega-base.styles.css | 121 +++++++++---------
.../panels/ocio-omega-dps/ocio-omega-dps.css | 1 +
.../sass/components/_featured-slideshow.scss | 108 ++++++++--------
22 files changed, 295 insertions(+), 422 deletions(-)
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 93dca3fb..601bde8f 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,14 @@
+WCM Base 7.x-1.x, 2016-01-11
+----------------------------
+- OCIO Omega Base:
+ - Fix mobile view for DPS Panels layout.
+ - Restyle slideshow, including better display for mobile.
+- OCIO Omega 4: Remove slideshow styles, use base theme instead.
+- OCIO Featured Slideshow:
+ - Increase image style height.
+ - Add Linkit to slideshow link field.
+
+
WCM Base 7.x-1.x, 2016-01-07
----------------------------
- OCIO UUID Settings: Disable auto-adding terms to exported vocabularies.
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 28a8e84c..bc261bc6 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-07
-version = "7.x-3.2+44-dev"
+; Information added by Drupal.org packaging script on 2016-01-09
+version = "7.x-3.2+47-dev"
core = "7.x"
project = "better_exposed_filters"
-datestamp = "1452128043"
+datestamp = "1452361746"
diff --git a/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.theme b/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.theme
index 4217ff08..98e7cd8f 100644
--- a/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.theme
+++ b/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.theme
@@ -467,13 +467,13 @@ function theme_select_as_links($vars) {
// Collect selected values so we can properly style the links later.
$selected_options = array();
- if (empty($element['#value'])) {
- if (!empty($element['#default_value'])) {
- $selected_options[] = $element['#default_value'];
- }
+ if (isset($element['#value'])) {
+ $selected_options[] = $element['#value'];
}
else {
- $selected_options[] = $element['#value'];
+ if (isset($element['#default_value'])) {
+ $selected_options[] = $element['#default_value'];
+ }
}
// Add to the selected options specified by Views whatever options are in the
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 b9435211..5d772d27 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
@@ -202,11 +202,11 @@ class better_exposed_filters_exposed_form_plugin extends views_plugin_exposed_fo
'#type' => 'textarea',
'#title' => t('Rewrite the text displayed'),
'#default_value' => $existing['sort']['advanced']['combine_rewrite'],
- '#description' => t('Use this field to rewrite the text displayed for combined sort options and sort order. Use the format of current_value|replacement_value, one replacement per line. For example: <pre>
+ '#description' => t('Use this field to rewrite the text displayed for combined sort options and sort order. Use the format of current_text|replacement_text, one replacement per line. For example: <pre>
Post date Asc|Oldest first
Post date Desc|Newest first
Title Asc|A -> Z
-Title Desc|Z -> A</pre> Leave the replacement value blank to remove an option altogether.'),
+Title Desc|Z -> A</pre> Leave the replacement text blank to remove an option altogether.'),
'#suffix' => '</div>',
'#states' => array(
'visible' => array(
@@ -730,12 +730,12 @@ Title Desc|Z -> A</pre> Leave the replacement value blank to remove an option al
'#default_value' => $existing[$label]['more_options']['rewrite']['filter_rewrite_values'],
'#description' => t('
Use this field to rewrite the filter options displayed. Use the format
- of current_value|replacement_value, one replacement per line. For
+ of current_text|replacement_text, one replacement per line. For
example: <pre>
-0|Zero
-1|One
-2|Two
-</pre> Leave the replacement value blank to remove an option altogether. If using hierarchical taxonomy filters, do not including leading hyphens in the current value.
+Current|Replacement
+On|Yes
+Off|No
+</pre> Leave the replacement text blank to remove an option altogether. If using hierarchical taxonomy filters, do not including leading hyphens in the current value.
'),
);
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 0013a564..e658455c 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-07
-version = "7.x-3.2+44-dev"
+; Information added by Drupal.org packaging script on 2016-01-09
+version = "7.x-3.2+47-dev"
core = "7.x"
project = "better_exposed_filters"
-datestamp = "1452128043"
+datestamp = "1452361746"
diff --git a/profiles/wcm_base/modules/contrib/better_exposed_filters/tests/better_exposed_filters.test b/profiles/wcm_base/modules/contrib/better_exposed_filters/tests/better_exposed_filters.test
index d2c7079a..9784b8c1 100644
--- a/profiles/wcm_base/modules/contrib/better_exposed_filters/tests/better_exposed_filters.test
+++ b/profiles/wcm_base/modules/contrib/better_exposed_filters/tests/better_exposed_filters.test
@@ -621,7 +621,7 @@ class BEF_TestLinks extends BEF_TestBase {
'path' => array('path' => 'bef_test_page'),
));
- // Verify checkbox rendering with the node type filter.
+ // Verify link rendering with the node type filter.
$this->addFilter('node.type', array(
'options[expose][multiple]' => TRUE,
));
@@ -638,10 +638,16 @@ class BEF_TestLinks extends BEF_TestBase {
$this->assertFieldByXpath('//div[@id="edit-type-wrapper"]//div[@id="edit-type-page"]/a[contains(@href, "?type[0]=page")]', NULL, 'Correct link for "page" filter');
$this->assertFieldByXpath('//div[@id="edit-type-wrapper"]//div[@id="edit-type-bef-test"]/a[contains(@href, "?type[0]=bef_test")]', NULL, 'Correct link for "bef test" filter');
+ // None of the type filter options should be marked as "active."
+ $this->assertNoFieldByXpath('//div[@id="edit-type-wrapper"]//a[contains(@class, "Active")]', NULL, 'No "type" link options are marked as "active"');
+
// Verify the status filter, which is single select.
$this->assertFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-1"]/a[contains(@href, "?status_1=1")]', NULL, 'Correct link for "status: yes" filter');
$this->assertFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-0"]/a[contains(@href, "?status_1=0")]', NULL, 'Correct link for "status: no" filter');
+ // None of the status filter options should be marked as "active."
+ $this->assertNoFieldByXpath('//div[@id="edit-status-1-wrapper"]//a[contains(@class, "Active")]', NULL, 'No "status" link options are marked as "active"');
+
// Click the published/yes link and verify the filter links update.
$this->clickLink('Yes');
@@ -650,10 +656,56 @@ class BEF_TestLinks extends BEF_TestBase {
$this->assertFieldByXpath('//div[@id="edit-type-wrapper"]//div[@id="edit-type-page"]/a[contains(@href, "?status_1=1&type[0]=page")]', NULL, 'Correct link for "page" filter');
$this->assertFieldByXpath('//div[@id="edit-type-wrapper"]//div[@id="edit-type-bef-test"]/a[contains(@href, "?status_1=1&type[0]=bef_test")]', NULL, 'Correct link for "bef test" filter');
+ // None of the type filter options should be marked as "active."
+ $this->assertNoFieldByXpath('//div[@id="edit-type-wrapper"]//a[contains(@class, "Active")]', NULL, 'No "type" link options are marked as "active"');
+
// Verify the status filter, which is single select.
$this->assertFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-1"]/a[contains(@href, "?status_1=1")]', NULL, 'Correct link for "status: yes" filter');
$this->assertFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-0"]/a[contains(@href, "?status_1=0")]', NULL, 'Correct link for "status: no" filter');
+
+ // Just the "yes" option should be marked as "active."
+ $this->assertFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-1"]/a[contains(@class, "active")]', NULL, 'Correct "active" setting for the "status: yes" filter');
+ $this->assertNoFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-0"]/a[contains(@class, "active")]', NULL, 'Correct "active" setting for the "status: no" filter');
+
+ // Verify correct links and "active" settings for non-required, boolean
+ // filters. See https://www.drupal.org/node/2631804.
+ $this->editFilter('status_1', array(
+ 'options[expose][required]' => FALSE,
+ ));
+ $this->saveView();
+ $this->drupalGet('bef_test_page');
+
+ // No default filters so nothing should be marked as active.
+ // @TODO: Views is giving us an $element['#value'] = FALSE which leads to
+ // the "No" option being marked as active. There is no reason that #value
+ // should be set, as far as I can tell. Because I'm not sure if this is a
+ // Views bug or assumption, I'm leaving this test out for now.
+ //$this->assertNoFieldByXpath('//div[@id="edit-status-1-wrapper"]//a[contains(@class, "active")]', NULL, 'Nothing marked as "active"');
+
+ // Clicking "no" should mark that option as active.
+ $this->clickLink('No');
+ $this->assertNoFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-all"]/a[contains(@class, "active")]', NULL, 'Correct "active" setting for the "status: any" filter');
+ $this->assertNoFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-1"]/a[contains(@class, "active")]', NULL, 'Correct "active" setting for the "status: yes" filter');
+ $this->assertFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-0"]/a[contains(@class, "active")]', NULL, 'Correct "active" setting for the "status: no" filter');
+
+ // Clicking "any" should mark that option as active.
+ $this->clickLink('- Any -');
+ $this->assertFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-all"]/a[contains(@class, "active")]', NULL, 'Correct "active" setting for the "status: any" filter');
+ $this->assertNoFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-1"]/a[contains(@class, "active")]', NULL, 'Correct "active" setting for the "status: yes" filter');
+ $this->assertNoFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-0"]/a[contains(@class, "active")]', NULL, 'Correct "active" setting for the "status: no" filter');
+
+ // Verify correct "active" settings for filters with default values.
+ $this->editFilter('status_1', array(
+ 'options[expose][required]' => FALSE,
+ 'options[value]' => 0,
+ ));
+ $this->saveView();
+ $this->drupalGet('bef_test_page');
+ $this->assertNoFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-all"]/a[contains(@class, "active")]', NULL, 'Correct "active" setting for the "status: any" filter');
+ $this->assertNoFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-1"]/a[contains(@class, "active")]', NULL, 'Correct "active" setting for the "status: yes" filter');
+ $this->assertFieldByXpath('//div[@id="edit-status-1-wrapper"]//div[@id="edit-status-1-0"]/a[contains(@class, "active")]', NULL, 'Correct "active" setting for the "status: no" filter');
}
+
}
class BEF_TestSecondaryFilters extends BEF_TestBase {
diff --git a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
index bd506d7f..72f7643a 100644
--- a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
+++ b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
@@ -3,4 +3,11 @@ description = "Provides a datepicker for the 'Authored on' field on node forms."
core = 7.x
files[] = date_popup_authored.test
package = Date/Time
-dependencies[] = date_popup
\ No newline at end of file
+dependencies[] = date_popup
+
+; Information added by drush on 2016-01-11
+version = "7.x-1.1+2-dev"
+core = "7.x"
+project = "date_popup_authored"
+datestamp = "1452537739"
+
diff --git a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
index f0defad2..8a82093d 100644
--- a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
+++ b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
@@ -7,3 +7,11 @@ dependencies[] = image (>=7.8)
dependencies[] = libraries (>=2.1)
files[] = includes/views/manualcrop.views.inc
+
+
+; Information added by drush on 2016-01-11
+version = "7.x-1.4+109-dev"
+core = "7.x"
+project = "manualcrop"
+datestamp = "1452537557"
+
diff --git a/profiles/wcm_base/modules/contrib/workbench/workbench.info b/profiles/wcm_base/modules/contrib/workbench/workbench.info
index d7cbf84f..2506a2f7 100644
--- a/profiles/wcm_base/modules/contrib/workbench/workbench.info
+++ b/profiles/wcm_base/modules/contrib/workbench/workbench.info
@@ -4,3 +4,11 @@ package = Workbench
core = 7.x
configure = admin/config/workbench/settings
dependencies[] = views
+
+
+; Information added by drush on 2016-01-11
+version = "7.x-1.2"
+core = "7.x"
+project = "workbench"
+datestamp = "1452537638"
+
diff --git a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
index 9eed11b0..9c10baf0 100644
--- a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
+++ b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
@@ -4,3 +4,11 @@ package = Workbench
core = 7.x
dependencies[] = workbench
dependencies[] = media
+
+
+; Information added by drush on 2016-01-11
+version = "7.x-2.1"
+core = "7.x"
+project = "workbench_media"
+datestamp = "1452537639"
+
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
index 0f9e0139..3470baf9 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
@@ -3,3 +3,11 @@ description = Test module for Workbench Moderation.
package = Workbench
core = 7.x
hidden = TRUE
+
+
+; Information added by drush on 2016-01-11
+version = "7.x-1.4+8-dev"
+core = "7.x"
+project = "workbench_moderation"
+datestamp = "1452537641"
+
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
index 3f9939f1..c86b18e3 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
@@ -16,3 +16,11 @@ files[] = workbench_moderation.migrate.inc
files[] = tests/external_node_update.test
files[] = tests/workbench_moderation.test
files[] = tests/workbench_moderation.files.test
+
+
+; Information added by drush on 2016-01-11
+version = "7.x-1.4+8-dev"
+core = "7.x"
+project = "workbench_moderation"
+datestamp = "1452537641"
+
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 54f9f0eb..40508e09 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
@@ -183,6 +183,7 @@ function ocio_featured_slideshow_field_default_field_instances() {
'absolute_url' => 1,
'attributes' => array(
'class' => '',
+ 'configurable_class' => 0,
'configurable_title' => 0,
'rel' => '',
'target' => 'user',
@@ -194,12 +195,12 @@ function ocio_featured_slideshow_field_default_field_instances() {
'enable_tokens' => 1,
'linkit' => array(
'button_text' => 'Search',
- 'enable' => 0,
- 'profile' => '',
+ 'enable' => 1,
+ 'profile' => 'ocio_field_linkit',
),
'rel_remove' => 'default',
'title' => 'none',
- 'title_label_use_field_label' => FALSE,
+ 'title_label_use_field_label' => 0,
'title_maxlength' => 128,
'title_value' => '',
'url' => 0,
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 f728b9be..8e247a04 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' => 500,
+ 'height' => 580,
),
'weight' => 1,
),
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.strongarm.inc
index 0b4eafe1..ecc4e1e8 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.strongarm.inc
@@ -56,6 +56,9 @@ function ocio_featured_slideshow_strongarm() {
'path' => array(
'weight' => '1',
),
+ 'redirect' => array(
+ 'weight' => '30',
+ ),
),
'display' => array(),
),
diff --git a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
index 99cac64c..5d9b4127 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
@@ -310,72 +310,6 @@ blockquote p {
font-family: "capita", Georgia, serif;
}
-/*
-.flexslider a .flex-title, .flexslider a .flex-summary {
- // @extend .l-constrained;
- padding: 0 2em;
-}
-*/
-.flex-title {
- padding: 0 1.1em;
-}
-
-.flex-summary {
- padding: 0 1.4em;
-}
-
-.flexslider a .flex-meta .flex-title {
- font-size: 24px;
- font-size: 2.4rem;
-}
-
-.flex-direction-nav a {
- color: #ededed;
- text-shadow: none;
- background: none;
-}
-.flex-direction-nav a:hover {
- color: #fff;
-}
-
-.flexslider:hover a {
- text-decoration: none;
-}
-
-ul.flex-direction-nav, ul.flex-direction-nav:hover {
- display: none;
-}
-
-.flexslider a .flex-meta {
- padding-left: 0px;
- padding-right: 0px;
- display: block;
- position: relative;
- background-color: #2d2d2d;
- padding-top: 1.7em;
- padding-bottom: 1.9em;
-}
-
-.flex-control-nav {
- text-align: right;
- padding-right: 1.8em;
- bottom: 120px;
- z-index: 99;
- width: 100%;
-}
-
-.flex-control-paging li a {
- background-color: #2d2d2d;
- text-align: left;
- width: 15px;
- height: 15px;
- margin-bottom: 1em;
-}
-.flex-control-paging li a.flex-active {
- background-color: #fff;
-}
-
-/* IE9 SVG, needs conditional override of 'filter' to 'none' */
.l-main {
margin-top: 0 !important;
margin-bottom: 0 !important;
diff --git a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
index e9e0eed3..b58cf5ed 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
@@ -321,84 +321,6 @@ blockquote p {
font-family: "capita", Georgia, serif;
}
-/*
-.flexslider a .flex-title, .flexslider a .flex-summary {
- // @extend .l-constrained;
- padding: 0 2em;
-}
-*/
-.flex-title {
- padding: 0 1.1em;
-}
-
-.flex-summary {
- padding: 0 1.4em;
-}
-
-.flexslider a .flex-meta .flex-title {
- font-size: 24px;
- font-size: 2.4rem;
-}
-
-.flex-direction-nav a {
- color: #ededed;
- text-shadow: none;
- background: none;
-}
-.flex-direction-nav a:hover {
- color: #fff;
-}
-
-.flexslider:hover a {
- text-decoration: none;
-}
-
-ul.flex-direction-nav, ul.flex-direction-nav:hover {
- display: none;
-}
-
-.flexslider a .flex-meta {
- padding-left: 0px;
- padding-right: 0px;
- display: block;
- position: relative;
- background-color: #2d2d2d;
- padding-top: 1.7em;
- padding-bottom: 1.9em;
-}
-
-.flex-control-nav {
- text-align: right;
- padding-right: 1.8em;
- bottom: 120px;
- z-index: 99;
- width: 100%;
-}
-
-.flex-control-paging li a {
- background-color: #2d2d2d;
- text-align: left;
- width: 15px;
- height: 15px;
- margin-bottom: 1em;
-}
-.flex-control-paging li a.flex-active {
- background-color: #fff;
-}
-@media (min-width: 47.5em) {
- .flex-control-paging li a {
- width: 17px;
- height: 17px;
- }
-}
-@media (min-width: 60em) {
- .flex-control-paging li a {
- width: 20px;
- height: 20px;
- }
-}
-
-/* IE9 SVG, needs conditional override of 'filter' to 'none' */
.l-main {
margin-top: 0 !important;
margin-bottom: 0 !important;
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/components/_featured-slideshow.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/components/_featured-slideshow.scss
index 642d9c05..e69de29b 100755
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/components/_featured-slideshow.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/components/_featured-slideshow.scss
@@ -1,86 +0,0 @@
-/*
-.flexslider a .flex-title, .flexslider a .flex-summary {
- // @extend .l-constrained;
- padding: 0 2em;
-}
-*/
-
-
-.flex-title {
- padding: 0 1.1em;
-}
-
-.flex-summary {
- padding: 0 1.4em;
-}
-
-
-.flexslider a .flex-meta .flex-title {
- @include font-size(2.4);
-}
-
-
-.flex-direction-nav a {
- color:$lt-gray;
- text-shadow:none;
- background:none;
- &:hover {
- color:$white;
- }
-}
-.flexslider:hover a {
- text-decoration:none;
-}
-ul.flex-direction-nav, ul.flex-direction-nav:hover {
- display:none;
-}
-.flexslider a .flex-meta {
- padding-left:0px;
- padding-right:0px;
- display:block;
- position:relative;
- background-color:$dk-gray;
- padding-top:1.7em;
- padding-bottom:1.9em;
-}
-
-.flex-control-nav {
- text-align:right;
- padding-right: 1.8em;
- bottom:120px;
- z-index:99;
- width:100%;
-
-}
-
-.flex-control-paging li a {
- background-color:$dk-gray;
- text-align:left;
- width:15px;
- height:15px;
- margin-bottom:1em;
- &.flex-active {
- background-color:$white;
- }
-
- @include breakpoint($tab) {
- width:17px;
- height:17px;
- }
-
- @include breakpoint($desk) {
- width:20px;
- height:20px;
- }
-
-}
-
- /* IE9 SVG, needs conditional override of 'filter' to 'none' */
-//background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjU4JSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjYiLz4KICA8L2xpbmVhckdyYWRpZW50PgogIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZC11Y2dnLWdlbmVyYXRlZCkiIC8+Cjwvc3ZnPg==);
-//background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0.6) 58%); /* FF3.6+ */
-//background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0)), color-stop(58%,rgba(0,0,0,0.6))); /* Chrome,Safari4+ */
-//background: -webkit-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.6) 58%); /* Chrome10+,Safari5.1+ */
-//background: -o-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.6) 58%); /* Opera 11.10+ */
-//background: -ms-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.6) 58%); /* IE10+ */
-//background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.6) 58%); /* W3C */
-//filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00000000', endColorstr='#99000000',GradientType=0 ); /* IE6-8 */
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 ece3d5e6..51fbe696 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
@@ -1441,39 +1441,44 @@ body .ui-accordion .ui-accordion-content {
}
.flexslider {
- background: none repeat scroll 0 0 #fff;
+ background: none repeat scroll 0 0 white;
border: 0 none;
border-radius: 0;
box-shadow: none;
margin: 0;
}
.flexslider .flex-meta {
- position: absolute;
+ display: block;
width: 100%;
- padding: 0.4em 0;
+ padding: 0.5em 1em;
text-align: center;
- z-index: 99;
- font-size: 22px;
- font-size: 2.2rem;
- line-height: 120%;
- background-color: rgba(0, 0, 0, 0.5);
- color: #fff;
+ font-size: 24px;
+ font-size: 2.4rem;
+ line-height: 110%;
+ color: #2d2d2d;
bottom: 0;
- font-size: 26px;
- font-size: 2.6rem;
+ position: absolute;
+ padding: 0.5em 0;
font-size: 30px;
font-size: 3rem;
+ background-color: rgba(0, 0, 0, 0.6);
+ color: white;
+ 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 {
- font-weight: bold;
+ font-weight: 400;
}
.flexslider .flex-meta .flex-summary {
- font-size: 0.8em;
- line-height: 1.1em;
+ font-weight: 300;
+ font-size: 0.6em;
+ line-height: 1.2em;
}
.flexslider .flex-direction-nav a {
color: rgba(0, 0, 0, 0.8);
@@ -1489,53 +1494,37 @@ body .ui-accordion .ui-accordion-content {
}
.lt-ie9 .flexslider .flex-direction-nav a {
color: #000;
- filter: alpha(opacity="50");
+ filter: alpha(opacity="60");
}
.lt-ie9 .flexslider .flex-direction-nav a:hover {
filter: alpha(opacity="80");
}
-/*
-#block-views-featured-slideshow-block {
- &,
- &.white {
- color: white;
- }
-
- &.dk-gray {
- color: $dk-gray;
- }
-
- &.black {
- color: black;
- }
-
- &.center-top .flex-meta {
- top: 1em;
- }
-
- &.center-middle .flex-meta {
- bottom: 45%;
- }
-
- & .flex-meta,
- &.center-bottom .flex-meta {
- bottom: 1.2em;
-
-
+ul.flex-direction-nav, ul.flex-direction-nav:hover {
+ display: none;
+}
- @include breakpoint($wide, true) {
- padding-left: 6em;
- padding-right: 6em;
- }
+.flex-control-nav {
+ text-align: right;
+ padding-right: 1.8em;
+ top: 20px;
+ z-index: 99;
+ width: 100%;
+ height: 30px;
+}
- @include breakpoint($x-wide, true) {
- padding-left: 10em;
- padding-right: 10em;
- }
- }
+.flex-control-paging li a {
+ background-color: #2d2d2d;
+ text-align: left;
+ width: 15px;
+ height: 15px;
+ margin-bottom: 1em;
+ display: none;
}
-*/
+.flex-control-paging li a.flex-active {
+ background-color: #fff;
+}
+
.block--mm-widgets .item,
.pane-mm-widgets-live-pane .item {
margin: 1.5em 0;
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 d29f49c0..099f2b4a 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
@@ -1450,47 +1450,56 @@ body .ui-accordion .ui-accordion-content {
}
.flexslider {
- background: none repeat scroll 0 0 #fff;
+ background: none repeat scroll 0 0 white;
border: 0 none;
border-radius: 0;
box-shadow: none;
margin: 0;
}
.flexslider .flex-meta {
- position: absolute;
+ display: block;
width: 100%;
- padding: 0.4em 0;
+ padding: 0.5em 1em;
text-align: center;
- z-index: 99;
- font-size: 22px;
- font-size: 2.2rem;
- line-height: 120%;
- background-color: rgba(0, 0, 0, 0.5);
- color: #fff;
+ font-size: 24px;
+ font-size: 2.4rem;
+ line-height: 110%;
+ color: #2d2d2d;
bottom: 0;
}
+@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;
+ }
+}
+@media (min-width: 60em) {
+ .flexslider .flex-meta {
+ font-size: 34px;
+ font-size: 3.4rem;
+ }
+}
+@media (min-width: 75em) {
+ .flexslider .flex-meta {
+ font-size: 40px;
+ font-size: 4rem;
+ }
+}
.flexslider .flex-meta .flex-title,
.flexslider .flex-meta .flex-summary {
display: block;
}
.flexslider .flex-meta .flex-title {
- font-weight: bold;
+ font-weight: 400;
}
.flexslider .flex-meta .flex-summary {
- font-size: 0.8em;
- line-height: 1.1em;
-}
-@media (min-width: 25.875em) {
- .flexslider .flex-meta {
- font-size: 26px;
- font-size: 2.6rem;
- }
-}
-@media (min-width: 47.5em) {
- .flexslider .flex-meta {
- font-size: 30px;
- font-size: 3rem;
- }
+ font-weight: 300;
+ font-size: 0.6em;
+ line-height: 1.2em;
}
.flexslider .flex-direction-nav a {
color: rgba(0, 0, 0, 0.8);
@@ -1506,53 +1515,41 @@ body .ui-accordion .ui-accordion-content {
}
.lt-ie9 .flexslider .flex-direction-nav a {
color: #000;
- filter: alpha(opacity="50");
+ filter: alpha(opacity="60");
}
.lt-ie9 .flexslider .flex-direction-nav a:hover {
filter: alpha(opacity="80");
}
-/*
-#block-views-featured-slideshow-block {
- &,
- &.white {
- color: white;
- }
-
- &.dk-gray {
- color: $dk-gray;
- }
-
- &.black {
- color: black;
- }
-
- &.center-top .flex-meta {
- top: 1em;
- }
-
- &.center-middle .flex-meta {
- bottom: 45%;
- }
-
- & .flex-meta,
- &.center-bottom .flex-meta {
- bottom: 1.2em;
-
-
+ul.flex-direction-nav, ul.flex-direction-nav:hover {
+ display: none;
+}
- @include breakpoint($wide, true) {
- padding-left: 6em;
- padding-right: 6em;
- }
+.flex-control-nav {
+ text-align: right;
+ padding-right: 1.8em;
+ top: 20px;
+ z-index: 99;
+ width: 100%;
+ height: 30px;
+}
- @include breakpoint($x-wide, true) {
- padding-left: 10em;
- padding-right: 10em;
- }
+.flex-control-paging li a {
+ background-color: #2d2d2d;
+ text-align: left;
+ width: 15px;
+ height: 15px;
+ margin-bottom: 1em;
+}
+.flex-control-paging li a.flex-active {
+ background-color: #fff;
+}
+@media (max-width: 47.5em) {
+ .flex-control-paging li a {
+ display: none;
}
}
-*/
+
.block--mm-widgets .item,
.pane-mm-widgets-live-pane .item {
margin: 1.5em 0;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-dps/ocio-omega-dps.css b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-dps/ocio-omega-dps.css
index 4cfcc318..6f41657e 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-dps/ocio-omega-dps.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-dps/ocio-omega-dps.css
@@ -82,6 +82,7 @@ bands
/* iPad or less */
@media only screen and (max-width: 760px) {
+ .ocio-omega-dps-tile-content-region5,
.ocio-omega-dps-tile-content-region4,
.ocio-omega-dps-tile-content-region3 {
width: 100%;
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 8b6aee68..69adc663 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
@@ -1,40 +1,50 @@
.flexslider {
- background: none repeat scroll 0 0 #fff;
+ background: none repeat scroll 0 0 white;
border: 0 none;
border-radius: 0;
box-shadow: none;
margin: 0;
.flex-meta {
- position: absolute;
+ display: block;
width: 100%;
- padding: 0.4em 0;
+ padding: 0.5em 1em;
text-align: center;
- z-index: 99;
- @include font-size(2.2);
- line-height: 120%;
- background-color: rgba(0, 0, 0, 0.5);
- color: #fff;
+ @include font-size(2.4);
+ line-height: 110%;
+ color: $dk-gray;
bottom: 0;
+ @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;
+ }
+
+ @include breakpoint($desk, true) {
+ @include font-size(3.4);
+ }
+
+ @include breakpoint($wide, true) {
+ @include font-size(4.0);
+ }
+
.flex-title,
.flex-summary {
display: block;
}
.flex-title {
- font-weight: bold;
+ font-weight: 400;
}
.flex-summary {
- font-size: 0.8em;
- line-height: 1.1em;
- }
- @include breakpoint($big-phone, true) {
- @include font-size(2.6);
- }
- @include breakpoint($tab, true) {
- @include font-size(3);
+ font-weight: 300;
+ font-size: 0.6em;
+ line-height: 1.2em;
}
+
}
.flex-direction-nav a {
@@ -55,51 +65,43 @@
.flex-direction-nav a {
color: $black;
- filter: alpha(opacity = "50");
+ filter: alpha(opacity = "60");
&:hover {
filter: alpha(opacity = "80");
}
}
}
-/*
-#block-views-featured-slideshow-block {
- &,
- &.white {
- color: white;
- }
-
- &.dk-gray {
- color: $dk-gray;
- }
-
- &.black {
- color: black;
- }
- &.center-top .flex-meta {
- top: 1em;
- }
- &.center-middle .flex-meta {
- bottom: 45%;
- }
-
- & .flex-meta,
- &.center-bottom .flex-meta {
- bottom: 1.2em;
+//override built in flexslider controls style
+ul.flex-direction-nav, ul.flex-direction-nav:hover {
+ display:none;
+}
+.flex-control-nav {
+ text-align:right;
+ padding-right: 1.8em;
+ top:20px;
+ z-index:99;
+ width:100%;
+ height: 30px;
+}
+.flex-control-paging li a {
+ background-color:$dk-gray;
+ text-align:left;
+ width:15px;
+ height:15px;
+ margin-bottom:1em;
+ &.flex-active {
+ background-color:$white;
+ }
+
+ // hide pager on small view
+ @include breakpoint($small, true) {
+ display: none;
+ }
+}
- @include breakpoint($wide, true) {
- padding-left: 6em;
- padding-right: 6em;
- }
- @include breakpoint($x-wide, true) {
- padding-left: 10em;
- padding-right: 10em;
- }
- }
-}
-*/
--
GitLab