Skip to content
Snippets Groups Projects
Commit f068554a authored by Melissa Miller's avatar Melissa Miller
Browse files

daily build 2

parent 980c0fd9
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 15 deletions
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 WCM Base 7.x-1.x, 2016-01-11
---------------------------- ----------------------------
- OCIO Omega Base: - OCIO Omega Base:
......
...@@ -9,5 +9,5 @@ dependencies[] = date_popup ...@@ -9,5 +9,5 @@ dependencies[] = date_popup
version = "7.x-1.1+2-dev" version = "7.x-1.1+2-dev"
core = "7.x" core = "7.x"
project = "date_popup_authored" project = "date_popup_authored"
datestamp = "1452537739" datestamp = "1452541129"
...@@ -13,5 +13,5 @@ files[] = includes/views/manualcrop.views.inc ...@@ -13,5 +13,5 @@ files[] = includes/views/manualcrop.views.inc
version = "7.x-1.4+109-dev" version = "7.x-1.4+109-dev"
core = "7.x" core = "7.x"
project = "manualcrop" project = "manualcrop"
datestamp = "1452537557" datestamp = "1452541011"
...@@ -10,5 +10,5 @@ dependencies[] = views ...@@ -10,5 +10,5 @@ dependencies[] = views
version = "7.x-1.2" version = "7.x-1.2"
core = "7.x" core = "7.x"
project = "workbench" project = "workbench"
datestamp = "1452537638" datestamp = "1452541065"
...@@ -10,5 +10,5 @@ dependencies[] = media ...@@ -10,5 +10,5 @@ dependencies[] = media
version = "7.x-2.1" version = "7.x-2.1"
core = "7.x" core = "7.x"
project = "workbench_media" project = "workbench_media"
datestamp = "1452537639" datestamp = "1452541066"
...@@ -9,5 +9,5 @@ hidden = TRUE ...@@ -9,5 +9,5 @@ hidden = TRUE
version = "7.x-1.4+8-dev" version = "7.x-1.4+8-dev"
core = "7.x" core = "7.x"
project = "workbench_moderation" project = "workbench_moderation"
datestamp = "1452537641" datestamp = "1452541066"
...@@ -22,5 +22,5 @@ files[] = tests/workbench_moderation.files.test ...@@ -22,5 +22,5 @@ files[] = tests/workbench_moderation.files.test
version = "7.x-1.4+8-dev" version = "7.x-1.4+8-dev"
core = "7.x" core = "7.x"
project = "workbench_moderation" project = "workbench_moderation"
datestamp = "1452537641" datestamp = "1452541066"
...@@ -61,7 +61,7 @@ function ocio_featured_slideshow_field_default_field_instances() { ...@@ -61,7 +61,7 @@ function ocio_featured_slideshow_field_default_field_instances() {
'file_extensions' => 'png jpg jpeg', 'file_extensions' => 'png jpg jpeg',
'max_filesize' => '3mb', 'max_filesize' => '3mb',
'max_resolution' => '', 'max_resolution' => '',
'min_resolution' => '2000x320', 'min_resolution' => '1800x700',
'title_field' => 0, 'title_field' => 0,
'user_register_form' => FALSE, 'user_register_form' => FALSE,
), ),
...@@ -70,7 +70,6 @@ function ocio_featured_slideshow_field_default_field_instances() { ...@@ -70,7 +70,6 @@ function ocio_featured_slideshow_field_default_field_instances() {
'module' => 'media', 'module' => 'media',
'settings' => array( 'settings' => array(
'allowed_schemes' => array( 'allowed_schemes' => array(
'private' => 'private',
'public' => 'public', 'public' => 'public',
'vimeo' => 0, 'vimeo' => 0,
'youtube' => 0, 'youtube' => 0,
...@@ -78,6 +77,7 @@ function ocio_featured_slideshow_field_default_field_instances() { ...@@ -78,6 +77,7 @@ function ocio_featured_slideshow_field_default_field_instances() {
'allowed_types' => array( 'allowed_types' => array(
'audio' => 0, 'audio' => 0,
'document' => 0, 'document' => 0,
'flash' => 0,
'image' => 'image', 'image' => 'image',
'video' => 0, 'video' => 0,
), ),
......
...@@ -40,7 +40,7 @@ function ocio_featured_slideshow_image_default_styles() { ...@@ -40,7 +40,7 @@ function ocio_featured_slideshow_image_default_styles() {
'name' => 'image_scale_and_crop', 'name' => 'image_scale_and_crop',
'data' => array( 'data' => array(
'width' => 1800, 'width' => 1800,
'height' => 580, 'height' => 700,
), ),
'weight' => 1, 'weight' => 1,
), ),
......
...@@ -1441,7 +1441,7 @@ body .ui-accordion .ui-accordion-content { ...@@ -1441,7 +1441,7 @@ body .ui-accordion .ui-accordion-content {
} }
.flexslider { .flexslider {
background: none repeat scroll 0 0 white; background: none repeat scroll 0 0 #2d2d2d;
border: 0 none; border: 0 none;
border-radius: 0; border-radius: 0;
box-shadow: none; box-shadow: none;
...@@ -1455,7 +1455,7 @@ body .ui-accordion .ui-accordion-content { ...@@ -1455,7 +1455,7 @@ body .ui-accordion .ui-accordion-content {
font-size: 24px; font-size: 24px;
font-size: 2.4rem; font-size: 2.4rem;
line-height: 110%; line-height: 110%;
color: #2d2d2d; color: white;
bottom: 0; bottom: 0;
position: absolute; position: absolute;
padding: 0.5em 0; padding: 0.5em 0;
......
...@@ -1450,7 +1450,7 @@ body .ui-accordion .ui-accordion-content { ...@@ -1450,7 +1450,7 @@ body .ui-accordion .ui-accordion-content {
} }
.flexslider { .flexslider {
background: none repeat scroll 0 0 white; background: none repeat scroll 0 0 #2d2d2d;
border: 0 none; border: 0 none;
border-radius: 0; border-radius: 0;
box-shadow: none; box-shadow: none;
...@@ -1464,7 +1464,7 @@ body .ui-accordion .ui-accordion-content { ...@@ -1464,7 +1464,7 @@ body .ui-accordion .ui-accordion-content {
font-size: 24px; font-size: 24px;
font-size: 2.4rem; font-size: 2.4rem;
line-height: 110%; line-height: 110%;
color: #2d2d2d; color: white;
bottom: 0; bottom: 0;
} }
@media (min-width: 47.5em) { @media (min-width: 47.5em) {
......
.flexslider { .flexslider {
background: none repeat scroll 0 0 white; background: none repeat scroll 0 0 $dk-gray;
border: 0 none; border: 0 none;
border-radius: 0; border-radius: 0;
box-shadow: none; box-shadow: none;
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
text-align: center; text-align: center;
@include font-size(2.4); @include font-size(2.4);
line-height: 110%; line-height: 110%;
color: $dk-gray; color: white;
bottom: 0; bottom: 0;
@include breakpoint($tab, true) { @include breakpoint($tab, true) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment