From f068554a1245b49b0f7ed91247f15ec36592d17e Mon Sep 17 00:00:00 2001
From: Melissa Miller <miller.2676@osu.edu>
Date: Mon, 11 Jan 2016 14:44:51 -0500
Subject: [PATCH] daily build 2
---
profiles/wcm_base/CHANGELOG.txt | 5 +++++
.../contrib/date_popup_authored/date_popup_authored.info | 2 +-
profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info | 2 +-
profiles/wcm_base/modules/contrib/workbench/workbench.info | 2 +-
.../modules/contrib/workbench_media/workbench_media.info | 2 +-
.../tests/workbench_moderation_test.info | 2 +-
.../contrib/workbench_moderation/workbench_moderation.info | 2 +-
.../ocio_featured_slideshow.features.field_instance.inc | 4 ++--
.../ocio_featured_slideshow.features.inc | 2 +-
.../themes/ocio_omega_base/css/ocio-omega-base.no-query.css | 4 ++--
.../themes/ocio_omega_base/css/ocio-omega-base.styles.css | 4 ++--
.../ocio_omega_base/sass/components/_featured-slideshow.scss | 4 ++--
12 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 601bde8f..942fb29b 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,8 @@
+WCM Base 7.x-1.x, 2016-01-11 (2)
+--------------------------------
+- OCIO Omega Base: Change slideshow text and background for small breakpoint.
+- OCIO Featured Slideshow: Adjust image style and minimum image size.
+
WCM Base 7.x-1.x, 2016-01-11
----------------------------
- OCIO Omega Base:
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 72f7643a..f5141f5b 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
@@ -9,5 +9,5 @@ dependencies[] = date_popup
version = "7.x-1.1+2-dev"
core = "7.x"
project = "date_popup_authored"
-datestamp = "1452537739"
+datestamp = "1452541129"
diff --git a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
index 8a82093d..af9ef501 100644
--- a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
+++ b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
@@ -13,5 +13,5 @@ files[] = includes/views/manualcrop.views.inc
version = "7.x-1.4+109-dev"
core = "7.x"
project = "manualcrop"
-datestamp = "1452537557"
+datestamp = "1452541011"
diff --git a/profiles/wcm_base/modules/contrib/workbench/workbench.info b/profiles/wcm_base/modules/contrib/workbench/workbench.info
index 2506a2f7..2560f809 100644
--- a/profiles/wcm_base/modules/contrib/workbench/workbench.info
+++ b/profiles/wcm_base/modules/contrib/workbench/workbench.info
@@ -10,5 +10,5 @@ dependencies[] = views
version = "7.x-1.2"
core = "7.x"
project = "workbench"
-datestamp = "1452537638"
+datestamp = "1452541065"
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 9c10baf0..89a76c6f 100644
--- a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
+++ b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
@@ -10,5 +10,5 @@ dependencies[] = media
version = "7.x-2.1"
core = "7.x"
project = "workbench_media"
-datestamp = "1452537639"
+datestamp = "1452541066"
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 3470baf9..35ca8ec6 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
@@ -9,5 +9,5 @@ hidden = TRUE
version = "7.x-1.4+8-dev"
core = "7.x"
project = "workbench_moderation"
-datestamp = "1452537641"
+datestamp = "1452541066"
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 c86b18e3..072054b8 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
@@ -22,5 +22,5 @@ files[] = tests/workbench_moderation.files.test
version = "7.x-1.4+8-dev"
core = "7.x"
project = "workbench_moderation"
-datestamp = "1452537641"
+datestamp = "1452541066"
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 40508e09..4136f71e 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
@@ -61,7 +61,7 @@ function ocio_featured_slideshow_field_default_field_instances() {
'file_extensions' => 'png jpg jpeg',
'max_filesize' => '3mb',
'max_resolution' => '',
- 'min_resolution' => '2000x320',
+ 'min_resolution' => '1800x700',
'title_field' => 0,
'user_register_form' => FALSE,
),
@@ -70,7 +70,6 @@ function ocio_featured_slideshow_field_default_field_instances() {
'module' => 'media',
'settings' => array(
'allowed_schemes' => array(
- 'private' => 'private',
'public' => 'public',
'vimeo' => 0,
'youtube' => 0,
@@ -78,6 +77,7 @@ function ocio_featured_slideshow_field_default_field_instances() {
'allowed_types' => array(
'audio' => 0,
'document' => 0,
+ 'flash' => 0,
'image' => 'image',
'video' => 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 8e247a04..179c9a44 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' => 580,
+ 'height' => 700,
),
'weight' => 1,
),
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 51fbe696..58cc7e99 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,7 +1441,7 @@ body .ui-accordion .ui-accordion-content {
}
.flexslider {
- background: none repeat scroll 0 0 white;
+ background: none repeat scroll 0 0 #2d2d2d;
border: 0 none;
border-radius: 0;
box-shadow: none;
@@ -1455,7 +1455,7 @@ body .ui-accordion .ui-accordion-content {
font-size: 24px;
font-size: 2.4rem;
line-height: 110%;
- color: #2d2d2d;
+ color: white;
bottom: 0;
position: absolute;
padding: 0.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 099f2b4a..93baa904 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,7 +1450,7 @@ body .ui-accordion .ui-accordion-content {
}
.flexslider {
- background: none repeat scroll 0 0 white;
+ background: none repeat scroll 0 0 #2d2d2d;
border: 0 none;
border-radius: 0;
box-shadow: none;
@@ -1464,7 +1464,7 @@ body .ui-accordion .ui-accordion-content {
font-size: 24px;
font-size: 2.4rem;
line-height: 110%;
- color: #2d2d2d;
+ color: white;
bottom: 0;
}
@media (min-width: 47.5em) {
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 69adc663..c365f974 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,5 +1,5 @@
.flexslider {
- background: none repeat scroll 0 0 white;
+ background: none repeat scroll 0 0 $dk-gray;
border: 0 none;
border-radius: 0;
box-shadow: none;
@@ -12,7 +12,7 @@
text-align: center;
@include font-size(2.4);
line-height: 110%;
- color: $dk-gray;
+ color: white;
bottom: 0;
@include breakpoint($tab, true) {
--
GitLab