From 7c8baba5d3533c57aa615a92604eba768d94f54e Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Wed, 24 Feb 2016 14:14:20 -0500
Subject: [PATCH] daily build
---
profiles/wcm_base/CHANGELOG.txt | 13 ++-
.../libraries/fitvids/jquery.fitvids.js | 13 ++-
.../modules/contrib/admin/PATCHES.txt | 2 +-
.../contrib/administerusersbyrole/PATCHES.txt | 2 +-
.../better_exposed_filters/PATCHES.txt | 2 +-
.../modules/contrib/breakpoints/PATCHES.txt | 2 +-
.../modules/contrib/chosen/PATCHES.txt | 2 +-
.../modules/contrib/ctools/PATCHES.txt | 2 +-
.../modules/contrib/defaultconfig/PATCHES.txt | 2 +-
.../contrib/defaultcontent/PATCHES.txt | 2 +-
.../modules/contrib/features/PATCHES.txt | 2 +-
.../modules/contrib/file_entity/PATCHES.txt | 2 +-
.../modules/contrib/jquery_update/PATCHES.txt | 2 +-
.../modules/contrib/manualcrop/PATCHES.txt | 2 +-
.../modules/contrib/media/PATCHES.txt | 3 +-
.../media_internet/media_internet.module | 44 +++++++++++
.../modules/contrib/media_vimeo/PATCHES.txt | 2 +-
.../modules/contrib/media_youtube/PATCHES.txt | 4 +
.../includes/MediaYouTubeStreamWrapper.inc | 7 +-
.../modules/contrib/panelizer/PATCHES.txt | 2 +-
.../modules/contrib/panels/PATCHES.txt | 2 +-
.../modules/contrib/pathauto/PATCHES.txt | 2 +-
.../modules/contrib/private/PATCHES.txt | 2 +-
.../modules/contrib/search_api_db/PATCHES.txt | 2 +-
.../contrib/simplesamlphp_auth/PATCHES.txt | 2 +-
.../modules/contrib/uuid_features/PATCHES.txt | 2 +-
.../modules/contrib/views/PATCHES.txt | 2 +-
.../views_autocomplete_filters/PATCHES.txt | 2 +-
.../contrib/workbench_moderation/PATCHES.txt | 2 +-
.../custom/ocio_media/ocio_media.module | 9 ++-
.../ocio_taxonomy.features.field_base.inc | 8 +-
.../ocio_taxonomy.features.field_instance.inc | 29 ++++---
.../custom/ocio_taxonomy/ocio_taxonomy.info | 7 +-
.../ocio-default/ocio-default.layout.css | 67 ++++++++++++++++
.../ocio-default.layout.no-query.css | 67 ++++++++++++++++
.../css/ocio-omega-base.no-query.css | 79 +++++++++++++++++++
.../css/ocio-omega-base.styles.css | 79 +++++++++++++++++++
.../sass/base/_typography.scss | 33 ++++++++
.../sass/components/_featured-slideshow.scss | 30 ++++---
profiles/wcm_base/wcm_base.make | 5 ++
40 files changed, 478 insertions(+), 65 deletions(-)
create mode 100644 profiles/wcm_base/modules/contrib/media_youtube/PATCHES.txt
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 89a2b74f..335e85c4 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,8 +1,19 @@
+WCM Base 7.x-1.x, 2016-02-24
+----------------------------
+- OCIO Media: Hide file destination field for remote files.
+- OCIO Taxonomy: Added chosen to news article tags field.
+- WCM Base: patched media contrib modules
+ - Media Internet: Allow editing remote file URLs.
+ - Media Youtube: Fix exception handling errors.
+- OCIO Omega Base:
+ - Added blockquote styles.
+ - Fixed slideshow height bug.
+
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.
+- OCIO Omega Base: Allow anchors in tile pane URLs.
WCM Base 7.x-1.x, 2016-02-11
----------------------------
diff --git a/profiles/wcm_base/libraries/fitvids/jquery.fitvids.js b/profiles/wcm_base/libraries/fitvids/jquery.fitvids.js
index 3742b4e0..bbfcdc0f 100644
--- a/profiles/wcm_base/libraries/fitvids/jquery.fitvids.js
+++ b/profiles/wcm_base/libraries/fitvids/jquery.fitvids.js
@@ -55,7 +55,7 @@
$allVideos = $allVideos.not('object object'); // SwfObj conflict patch
$allVideos = $allVideos.not(ignoreList); // Disable FitVids on this video.
- $allVideos.each(function(count){
+ $allVideos.each(function(){
var $this = $(this);
if($this.parents(ignoreList).length > 0) {
return; // Disable FitVids on this video.
@@ -69,14 +69,19 @@
var height = ( this.tagName.toLowerCase() === 'object' || ($this.attr('height') && !isNaN(parseInt($this.attr('height'), 10))) ) ? parseInt($this.attr('height'), 10) : $this.height(),
width = !isNaN(parseInt($this.attr('width'), 10)) ? parseInt($this.attr('width'), 10) : $this.width(),
aspectRatio = height / width;
- if(!$this.attr('id')){
- var videoID = 'fitvid' + count;
- $this.attr('id', videoID);
+ if(!$this.attr('name')){
+ var videoName = 'fitvid' + $.fn.fitVids._count;
+ $this.attr('name', videoName);
+ $.fn.fitVids._count++;
}
$this.wrap('<div class="fluid-width-video-wrapper"></div>').parent('.fluid-width-video-wrapper').css('padding-top', (aspectRatio * 100)+'%');
$this.removeAttr('height').removeAttr('width');
});
});
};
+
+ // Internal counter for unique video names.
+ $.fn.fitVids._count = 0;
+
// Works with either jQuery or Zepto
})( window.jQuery || window.Zepto );
diff --git a/profiles/wcm_base/modules/contrib/admin/PATCHES.txt b/profiles/wcm_base/modules/contrib/admin/PATCHES.txt
index d6a705e1..0de9d4c5 100644
--- a/profiles/wcm_base/modules/contrib/admin/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/admin/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/1334804-admin-jquery-updated-6.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/administerusersbyrole/PATCHES.txt b/profiles/wcm_base/modules/contrib/administerusersbyrole/PATCHES.txt
index a8af5d6d..85feeab4 100644
--- a/profiles/wcm_base/modules/contrib/administerusersbyrole/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/administerusersbyrole/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/administerusersbyrole-can_create_user_ajax_submit-2557473-13-D7.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/better_exposed_filters/PATCHES.txt b/profiles/wcm_base/modules/contrib/better_exposed_filters/PATCHES.txt
index 922031ec..c74d3374 100644
--- a/profiles/wcm_base/modules/contrib/better_exposed_filters/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/better_exposed_filters/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/bef-placeholder_support-2560321-2.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/breakpoints/PATCHES.txt b/profiles/wcm_base/modules/contrib/breakpoints/PATCHES.txt
index bd8feba4..92968bc1 100644
--- a/profiles/wcm_base/modules/contrib/breakpoints/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/breakpoints/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- https://www.drupal.org/files/issues/2415363-breakpoints-menu_rebuild-13.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/chosen/PATCHES.txt b/profiles/wcm_base/modules/contrib/chosen/PATCHES.txt
index 778363e1..932921d4 100644
--- a/profiles/wcm_base/modules/contrib/chosen/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/chosen/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/chosen-remove_none_option-2117827-7.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/ctools/PATCHES.txt b/profiles/wcm_base/modules/contrib/ctools/PATCHES.txt
index 6655a0ad..5a7ea810 100644
--- a/profiles/wcm_base/modules/contrib/ctools/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/ctools/PATCHES.txt
@@ -2,4 +2,4 @@ The following patches have been applied to this project:
- http://drupal.org/files/issues/ctools-readd_access_callback_params-2209775-24.patch
- http://drupal.org/files/issues/views_content-keyword-substitution-1910608-33.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/defaultconfig/PATCHES.txt b/profiles/wcm_base/modules/contrib/defaultconfig/PATCHES.txt
index db91ce58..a646afe9 100644
--- a/profiles/wcm_base/modules/contrib/defaultconfig/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/defaultconfig/PATCHES.txt
@@ -2,4 +2,4 @@ The following patches have been applied to this project:
- http://drupal.org/files/issues/defaultconfig-rebuild-2008178-14.patch
- http://drupal.org/files/issues/1900574.defaultconfig.undefinedindex_20.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/defaultcontent/PATCHES.txt b/profiles/wcm_base/modules/contrib/defaultcontent/PATCHES.txt
index 0d26fb08..120241d9 100644
--- a/profiles/wcm_base/modules/contrib/defaultcontent/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/defaultcontent/PATCHES.txt
@@ -2,4 +2,4 @@ The following patches have been applied to this project:
- http://drupal.org/files/1754428-allow-node-export-alter.patch
- http://drupal.org/files/1757782-cannot-import-menu-hierarchy-8.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/features/PATCHES.txt b/profiles/wcm_base/modules/contrib/features/PATCHES.txt
index 47fe1854..d1c847fe 100644
--- a/profiles/wcm_base/modules/contrib/features/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/features/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- https://drupal.org/files/issues/export_shorcuts_sets-986968-36.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/file_entity/PATCHES.txt b/profiles/wcm_base/modules/contrib/file_entity/PATCHES.txt
index 8c24a881..8ad5f47d 100644
--- a/profiles/wcm_base/modules/contrib/file_entity/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/file_entity/PATCHES.txt
@@ -2,4 +2,4 @@ The following patches have been applied to this project:
- http://drupal.org/files/issues/file_entity-file-size-limit-per-file-type-2530656-3.patch
- http://drupal.org/files/issues/2537982-fix-changing-file-scheme.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/jquery_update/PATCHES.txt b/profiles/wcm_base/modules/contrib/jquery_update/PATCHES.txt
index 2f41873b..f6dfcf6a 100644
--- a/profiles/wcm_base/modules/contrib/jquery_update/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/jquery_update/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/jquery_update-autoheight_fix-2241973-7.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/manualcrop/PATCHES.txt b/profiles/wcm_base/modules/contrib/manualcrop/PATCHES.txt
index 9e864c1d..6627972d 100644
--- a/profiles/wcm_base/modules/contrib/manualcrop/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/manualcrop/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/manualcrop-two-crop-tools-2237835.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/media/PATCHES.txt b/profiles/wcm_base/modules/contrib/media/PATCHES.txt
index 0148d1e3..a0156122 100644
--- a/profiles/wcm_base/modules/contrib/media/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/media/PATCHES.txt
@@ -1,6 +1,7 @@
The following patches have been applied to this project:
+- http://drupal.org/files/issues/media-edit_uri_for_remote_files-2297685-6.patch
- http://drupal.org/files/issues/media-js-dialog-issues-2093435-21.patch
- http://drupal.org/files/issues/media-alt_and_title_double-2308487-9.patch
- http://drupal.org/files/issues/media-file-name-focus-2084287-2.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.module b/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.module
index d94b4792..8b158fc8 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.module
+++ b/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.module
@@ -320,3 +320,47 @@ function media_internet_add_submit($form, &$form_state) {
$form_state['storage']['upload'] = $file->fid;
}
}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function media_internet_form_file_entity_edit_alter(&$form, &$form_state) {
+
+ $embed_code = file_create_url($form['#entity']->uri);
+
+ try {
+ $provider = get_class(media_internet_get_provider($embed_code));
+ }
+ catch (Exception $e) {
+ form_set_error('embed_code', $e->getMessage());
+ $provider = NULL;
+ }
+
+ if ($provider != 'MediaInternetFileHandler') {
+ $form['embed_code'] = array(
+ '#type' => 'textfield',
+ '#title' => t('File URL'),
+ '#description' => t('Enter the URL of this file.'),
+ '#attributes' => array('class' => array('media-add-from-url')),
+ '#maxlength' => 2083,
+ '#required' => TRUE,
+ '#default_value' => $embed_code,
+ );
+
+ $form['#validators'] = array();
+
+ array_unshift($form['actions']['submit']['#validate'], 'media_internet_add_validate');
+ array_unshift($form['actions']['submit']['#submit'], 'media_internet_edit_submit');
+ }
+}
+
+/**
+ * Submit callback that updates managed file URI.
+ */
+function media_internet_edit_submit($form, &$form_state) {
+ $embed_code = $form_state['values']['embed_code'];
+ $provider = get_class(media_internet_get_provider($embed_code));
+ $handler = new $provider($embed_code);
+
+ $form_state['values']['uri'] = $handler->parse($embed_code);
+}
diff --git a/profiles/wcm_base/modules/contrib/media_vimeo/PATCHES.txt b/profiles/wcm_base/modules/contrib/media_vimeo/PATCHES.txt
index 804e0314..2a840b03 100644
--- a/profiles/wcm_base/modules/contrib/media_vimeo/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/media_vimeo/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- https://www.drupal.org/files/issues/no_exception_handling-2446199-1.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/media_youtube/PATCHES.txt b/profiles/wcm_base/modules/contrib/media_youtube/PATCHES.txt
new file mode 100644
index 00000000..53fad5c6
--- /dev/null
+++ b/profiles/wcm_base/modules/contrib/media_youtube/PATCHES.txt
@@ -0,0 +1,4 @@
+The following patches have been applied to this project:
+- http://drupal.org/files/issues/media_youtube-remove_thumbnail_exception-2498493-23.patch
+
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/media_youtube/includes/MediaYouTubeStreamWrapper.inc b/profiles/wcm_base/modules/contrib/media_youtube/includes/MediaYouTubeStreamWrapper.inc
index 72f925f2..0e564fc5 100644
--- a/profiles/wcm_base/modules/contrib/media_youtube/includes/MediaYouTubeStreamWrapper.inc
+++ b/profiles/wcm_base/modules/contrib/media_youtube/includes/MediaYouTubeStreamWrapper.inc
@@ -28,8 +28,11 @@ class MediaYouTubeStreamWrapper extends MediaReadOnlyStreamWrapper {
return $data['thumbnail_url'];
}
else {
- throw new Exception("Error Processing Request. (Error: {$response->code}, {$response->error})");
- return;
+ $file = file_uri_to_object($this->uri);
+ $icon_dir = variable_get('media_icon_base_directory', 'public://media-icons') . '/' . variable_get('media_icon_set', 'default');
+ $local_path = file_icon_path($file, $icon_dir);
+
+ return $local_path;
}
}
diff --git a/profiles/wcm_base/modules/contrib/panelizer/PATCHES.txt b/profiles/wcm_base/modules/contrib/panelizer/PATCHES.txt
index fcd582b1..8cbf6447 100644
--- a/profiles/wcm_base/modules/contrib/panelizer/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/panelizer/PATCHES.txt
@@ -2,4 +2,4 @@ The following patches have been applied to this project:
- http://drupal.org/files/issues/array-to-object-on-update-1623536-26.patch
- http://www.drupal.org/files/issues/panelizer-search_api-2416505-3.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/panels/PATCHES.txt b/profiles/wcm_base/modules/contrib/panels/PATCHES.txt
index 4e1cdbff..a0f87b26 100644
--- a/profiles/wcm_base/modules/contrib/panels/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/panels/PATCHES.txt
@@ -3,4 +3,4 @@ The following patches have been applied to this project:
- https://www.drupal.org/files/issues/panels-focus-add-content-tab-2390803-13.patch
- https://www.drupal.org/files/issues/panels-1588212-10.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/pathauto/PATCHES.txt b/profiles/wcm_base/modules/contrib/pathauto/PATCHES.txt
index 267648ff..85b2e635 100644
--- a/profiles/wcm_base/modules/contrib/pathauto/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/pathauto/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/pathauto-persist-936222-195-pathauto-state.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/private/PATCHES.txt b/profiles/wcm_base/modules/contrib/private/PATCHES.txt
index 7d310d0f..bb0d7832 100644
--- a/profiles/wcm_base/modules/contrib/private/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/private/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/private-bypasses_content_type_edit_permissions-2660598-2.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/search_api_db/PATCHES.txt b/profiles/wcm_base/modules/contrib/search_api_db/PATCHES.txt
index 1694c453..f078ccc4 100644
--- a/profiles/wcm_base/modules/contrib/search_api_db/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/search_api_db/PATCHES.txt
@@ -3,4 +3,4 @@ The following patches have been applied to this project:
- https://www.drupal.org/files/issues/2436341-search_api_db-updb-1.patch
- https://www.drupal.org/files/issues/2343371-search_api_db-update-table-8.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/simplesamlphp_auth/PATCHES.txt b/profiles/wcm_base/modules/contrib/simplesamlphp_auth/PATCHES.txt
index 1a1f14c7..7fcd2a87 100644
--- a/profiles/wcm_base/modules/contrib/simplesamlphp_auth/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/simplesamlphp_auth/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/simplesamlphp_auth-admin-users-cannot-other-users-9291915-8.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/PATCHES.txt b/profiles/wcm_base/modules/contrib/uuid_features/PATCHES.txt
index dc5e6bbe..c4ed3d96 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/uuid_features/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/uuid_features-2220837-path-and-pathauto-for-node-3.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/views/PATCHES.txt b/profiles/wcm_base/modules/contrib/views/PATCHES.txt
index ab83ee9d..264e521e 100644
--- a/profiles/wcm_base/modules/contrib/views/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/views/PATCHES.txt
@@ -1,4 +1,4 @@
The following patches have been applied to this project:
- http://drupal.org/files/views-exposed-sorts-2037469-1.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/views_autocomplete_filters/PATCHES.txt b/profiles/wcm_base/modules/contrib/views_autocomplete_filters/PATCHES.txt
index 85fee513..b04596a6 100644
--- a/profiles/wcm_base/modules/contrib/views_autocomplete_filters/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/views_autocomplete_filters/PATCHES.txt
@@ -2,4 +2,4 @@ The following patches have been applied to this project:
- http://www.drupal.org/files/issues/views_autocomplete_filters-cache-2374709-2.patch
- http://www.drupal.org/files/issues/views_autocomplete_filters-content-pane-2317351-4.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/PATCHES.txt b/profiles/wcm_base/modules/contrib/workbench_moderation/PATCHES.txt
index 09cc1d58..b468405c 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/PATCHES.txt
@@ -2,4 +2,4 @@ The following patches have been applied to this project:
- http://drupal.org/files/playnicewithpanels-1285090-22.patch
- http://drupal.org/files/issues/view_all_unpublished-1492118-64.patch
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.module b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.module
index 22a45034..99cdd0d3 100644
--- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.module
+++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.module
@@ -40,17 +40,23 @@ function ocio_media_field_display_file_alter(&$display, $context) {
* Implements hook_form_alter().
*/
function ocio_media_form_alter(&$form, &$form_state, $form_id) {
+
if (in_array($form_id, array('file_entity_edit', 'file_entity_add_upload'))) {
$hide_fields = array(
'field_file_image_alt_text',
'field_file_image_title_text',
'field_basic_image_caption',
);
+
foreach ($hide_fields as $field) {
if (isset($form[$field])) {
$form[$field]['#access'] = FALSE;
}
}
+
+ if (!isset($form['embed_code'])) {
+ $form['destination']['#access'] = TRUE;
+ }
}
if ($form_id == 'media_wysiwyg_format_form') {
@@ -85,6 +91,3 @@ function ocio_media_file_mimetype_mapping_alter(&$mapping) {
$mapping['extensions'][$extension] = $index;
}
}
-
-
-
diff --git a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.field_base.inc b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.field_base.inc
index 13606394..b2caac8c 100644
--- a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.field_base.inc
+++ b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.field_base.inc
@@ -10,7 +10,7 @@
function ocio_taxonomy_field_default_field_bases() {
$field_bases = array();
- // Exported field_base: 'field_contact_group'
+ // Exported field_base: 'field_contact_group'.
$field_bases['field_contact_group'] = array(
'active' => 1,
'cardinality' => 1,
@@ -36,7 +36,7 @@ function ocio_taxonomy_field_default_field_bases() {
'type' => 'taxonomy_term_reference',
);
- // Exported field_base: 'field_file_tags'
+ // Exported field_base: 'field_file_tags'.
$field_bases['field_file_tags'] = array(
'active' => 1,
'cardinality' => 1,
@@ -62,7 +62,7 @@ function ocio_taxonomy_field_default_field_bases() {
'type' => 'taxonomy_term_reference',
);
- // Exported field_base: 'field_leadership_group'
+ // Exported field_base: 'field_leadership_group'.
$field_bases['field_leadership_group'] = array(
'active' => 1,
'cardinality' => 1,
@@ -88,7 +88,7 @@ function ocio_taxonomy_field_default_field_bases() {
'type' => 'taxonomy_term_reference',
);
- // Exported field_base: 'field_tags'
+ // Exported field_base: 'field_tags'.
$field_bases['field_tags'] = array(
'active' => 1,
'cardinality' => -1,
diff --git a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.field_instance.inc b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.field_instance.inc
index 6055721b..a7417a3c 100644
--- a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.field_instance.inc
@@ -10,7 +10,7 @@
function ocio_taxonomy_field_default_field_instances() {
$field_instances = array();
- // Exported field_instance: 'file-audio-field_file_tags'
+ // Exported field_instance: 'file-audio-field_file_tags'.
$field_instances['file-audio-field_file_tags'] = array(
'bundle' => 'audio',
'default_value' => NULL,
@@ -64,7 +64,7 @@ function ocio_taxonomy_field_default_field_instances() {
),
);
- // Exported field_instance: 'file-document-field_file_tags'
+ // Exported field_instance: 'file-document-field_file_tags'.
$field_instances['file-document-field_file_tags'] = array(
'bundle' => 'document',
'default_value' => NULL,
@@ -118,7 +118,7 @@ function ocio_taxonomy_field_default_field_instances() {
),
);
- // Exported field_instance: 'file-image-field_file_tags'
+ // Exported field_instance: 'file-image-field_file_tags'.
$field_instances['file-image-field_file_tags'] = array(
'bundle' => 'image',
'default_value' => NULL,
@@ -202,7 +202,7 @@ function ocio_taxonomy_field_default_field_instances() {
),
);
- // Exported field_instance: 'file-video-field_file_tags'
+ // Exported field_instance: 'file-video-field_file_tags'.
$field_instances['file-video-field_file_tags'] = array(
'bundle' => 'video',
'default_value' => NULL,
@@ -228,6 +228,12 @@ function ocio_taxonomy_field_default_field_instances() {
'type' => 'hidden',
'weight' => 0,
),
+ 'video_center' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
'video_left' => array(
'label' => 'above',
'settings' => array(),
@@ -268,7 +274,7 @@ function ocio_taxonomy_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-article-field_tags'
+ // Exported field_instance: 'node-article-field_tags'.
$field_instances['node-article-field_tags'] = array(
'bundle' => 'article',
'default_value' => NULL,
@@ -320,18 +326,17 @@ function ocio_taxonomy_field_default_field_instances() {
'user_register_form' => FALSE,
),
'widget' => array(
- 'active' => 0,
- 'module' => 'taxonomy',
+ 'active' => 1,
+ 'module' => 'options',
'settings' => array(
- 'autocomplete_path' => 'taxonomy/autocomplete',
- 'size' => 60,
+ 'apply_chosen' => 1,
),
- 'type' => 'taxonomy_autocomplete',
+ 'type' => 'options_select',
'weight' => 31,
),
);
- // Exported field_instance: 'user-user-field_contact_group'
+ // Exported field_instance: 'user-user-field_contact_group'.
$field_instances['user-user-field_contact_group'] = array(
'bundle' => 'user',
'default_value' => NULL,
@@ -378,7 +383,7 @@ function ocio_taxonomy_field_default_field_instances() {
),
);
- // Exported field_instance: 'user-user-field_leadership_group'
+ // Exported field_instance: 'user-user-field_leadership_group'.
$field_instances['user-user-field_leadership_group'] = array(
'bundle' => 'user',
'default_value' => NULL,
diff --git a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.info b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.info
index 8498a612..96ddf169 100644
--- a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.info
+++ b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.info
@@ -10,6 +10,7 @@ dependencies[] = custom_breadcrumbs_paths
dependencies[] = custom_breadcrumbs_views
dependencies[] = ds
dependencies[] = features
+dependencies[] = options
dependencies[] = strongarm
dependencies[] = taxonomy
dependencies[] = taxonomy_access_fix
@@ -39,12 +40,6 @@ features[taxonomy][] = ocio_tags
features[taxonomy][] = wcm_file_tags
features[taxonomy][] = wcm_user_contact_group
features[taxonomy][] = wcm_user_leadership_group
-features[uuid_term][] = 11c488a9-c4d6-41d2-9f5a-7e1aff2465bc
-features[uuid_term][] = 3f36288d-48cb-4a01-a725-dee41084db61
-features[uuid_term][] = 48e6d0a8-38df-445c-b739-efe08f048cb6
-features[uuid_term][] = 6cd2714c-91a5-4b78-8f36-ee2f613380fc
-features[uuid_term][] = 958c7ff0-5741-4954-aad7-c35a2c6cc0cc
-features[uuid_term][] = 9f57971f-1cbf-4b2b-a0df-262d2ea80f64
features[variable][] = custom_breadcrumbs_paths_allow_wildcards
features[variable][] = simplify_taxonomy_ocio_tags
features[variable][] = simplify_taxonomy_panopoly_categories
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
index 4ea62f8d..b82deb93 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
@@ -1,3 +1,4 @@
+@charset "UTF-8";
/*******************************************************************************
* ocio-default.layout.scss
*
@@ -817,6 +818,39 @@ tr.error {
padding: 0.3em 0.6em;
}
*/
+blockquote {
+ padding-left: 0.5em;
+ font-size: 26px;
+ font-size: 2.6rem;
+ line-height: 130%;
+ font-family: "capita", Georgia, serif;
+ font-style: italic;
+}
+blockquote::before {
+ font-size: 35px;
+ font-size: 3.5rem;
+ color: rgba(0, 0, 0, 0.6);
+ content: "\f10d";
+ font-family: FontAwesome;
+ font-style: normal;
+ margin-left: -1.5em;
+ margin-top: -0.25em;
+ float: left;
+}
+
+cite {
+ font-size: 16px;
+ font-size: 1.6rem;
+ font-family: "proximanova", Helvetica, Arial, sans-serif;
+ font-style: normal;
+ display: block;
+ padding-top: 0.6em;
+}
+cite::before {
+ content: "―";
+ margin-right: 3px;
+}
+
html, body {
font-family: "proximanova", Helvetica, Arial, sans-serif;
color: #2d2d2d;
@@ -1145,6 +1179,39 @@ table caption {
background: #c7c7c7;
}
+blockquote {
+ padding-left: 0.5em;
+ font-size: 26px;
+ font-size: 2.6rem;
+ line-height: 130%;
+ font-family: "capita", Georgia, serif;
+ font-style: italic;
+}
+blockquote::before {
+ font-size: 35px;
+ font-size: 3.5rem;
+ color: rgba(0, 0, 0, 0.6);
+ content: "\f10d";
+ font-family: FontAwesome;
+ font-style: normal;
+ margin-left: -1.5em;
+ margin-top: -0.25em;
+ float: left;
+}
+
+cite {
+ font-size: 16px;
+ font-size: 1.6rem;
+ font-family: "proximanova", Helvetica, Arial, sans-serif;
+ font-style: normal;
+ display: block;
+ padding-top: 0.6em;
+}
+cite::before {
+ content: "―";
+ margin-right: 3px;
+}
+
html, body {
font-family: "proximanova", Helvetica, Arial, sans-serif;
color: #2d2d2d;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
index 2dbb6a38..9ae6635b 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
@@ -1,3 +1,4 @@
+@charset "UTF-8";
/*******************************************************************************
* ocio-default.layout.scss
*
@@ -815,6 +816,39 @@ tr.error {
padding: 0.3em 0.6em;
}
*/
+blockquote {
+ padding-left: 0.5em;
+ font-size: 26px;
+ font-size: 2.6rem;
+ line-height: 130%;
+ font-family: "capita", Georgia, serif;
+ font-style: italic;
+}
+blockquote::before {
+ font-size: 35px;
+ font-size: 3.5rem;
+ color: rgba(0, 0, 0, 0.6);
+ content: "\f10d";
+ font-family: FontAwesome;
+ font-style: normal;
+ margin-left: -1.5em;
+ margin-top: -0.25em;
+ float: left;
+}
+
+cite {
+ font-size: 16px;
+ font-size: 1.6rem;
+ font-family: "proximanova", Helvetica, Arial, sans-serif;
+ font-style: normal;
+ display: block;
+ padding-top: 0.6em;
+}
+cite::before {
+ content: "―";
+ margin-right: 3px;
+}
+
html, body {
font-family: "proximanova", Helvetica, Arial, sans-serif;
color: #2d2d2d;
@@ -1139,6 +1173,39 @@ table caption {
background: #c7c7c7;
}
+blockquote {
+ padding-left: 0.5em;
+ font-size: 26px;
+ font-size: 2.6rem;
+ line-height: 130%;
+ font-family: "capita", Georgia, serif;
+ font-style: italic;
+}
+blockquote::before {
+ font-size: 35px;
+ font-size: 3.5rem;
+ color: rgba(0, 0, 0, 0.6);
+ content: "\f10d";
+ font-family: FontAwesome;
+ font-style: normal;
+ margin-left: -1.5em;
+ margin-top: -0.25em;
+ float: left;
+}
+
+cite {
+ font-size: 16px;
+ font-size: 1.6rem;
+ font-family: "proximanova", Helvetica, Arial, sans-serif;
+ font-style: normal;
+ display: block;
+ padding-top: 0.6em;
+}
+cite::before {
+ content: "―";
+ margin-right: 3px;
+}
+
html, body {
font-family: "proximanova", Helvetica, Arial, sans-serif;
color: #2d2d2d;
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 625084e9..d0b6f94f 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
@@ -1,3 +1,4 @@
+@charset "UTF-8";
/* No files to import found in abstractions/**\/* */
ul.breadcrumb {
padding: 0;
@@ -811,6 +812,39 @@ tr.error {
padding: 0.3em 0.6em;
}
*/
+blockquote {
+ padding-left: 0.5em;
+ font-size: 26px;
+ font-size: 2.6rem;
+ line-height: 130%;
+ font-family: "capita", Georgia, serif;
+ font-style: italic;
+}
+blockquote::before {
+ font-size: 35px;
+ font-size: 3.5rem;
+ color: rgba(0, 0, 0, 0.6);
+ content: "\f10d";
+ font-family: FontAwesome;
+ font-style: normal;
+ margin-left: -1.5em;
+ margin-top: -0.25em;
+ float: left;
+}
+
+cite {
+ font-size: 16px;
+ font-size: 1.6rem;
+ font-family: "proximanova", Helvetica, Arial, sans-serif;
+ font-style: normal;
+ display: block;
+ padding-top: 0.6em;
+}
+cite::before {
+ content: "―";
+ margin-right: 3px;
+}
+
html, body {
font-family: "proximanova", Helvetica, Arial, sans-serif;
color: #2d2d2d;
@@ -1136,6 +1170,39 @@ table caption {
background: #c7c7c7;
}
+blockquote {
+ padding-left: 0.5em;
+ font-size: 26px;
+ font-size: 2.6rem;
+ line-height: 130%;
+ font-family: "capita", Georgia, serif;
+ font-style: italic;
+}
+blockquote::before {
+ font-size: 35px;
+ font-size: 3.5rem;
+ color: rgba(0, 0, 0, 0.6);
+ content: "\f10d";
+ font-family: FontAwesome;
+ font-style: normal;
+ margin-left: -1.5em;
+ margin-top: -0.25em;
+ float: left;
+}
+
+cite {
+ font-size: 16px;
+ font-size: 1.6rem;
+ font-family: "proximanova", Helvetica, Arial, sans-serif;
+ font-style: normal;
+ display: block;
+ padding-top: 0.6em;
+}
+cite::before {
+ content: "―";
+ margin-right: 3px;
+}
+
html, body {
font-family: "proximanova", Helvetica, Arial, sans-serif;
color: #2d2d2d;
@@ -1563,6 +1630,18 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
background-color: #fff;
}
+.l-region--hero-wrapper {
+ position: relative;
+ max-height: 500px;
+}
+.l-region--hero-wrapper .views-field-field-basic-image-image {
+ position: relative;
+ top: 0;
+ z-index: 9;
+ max-height: 500px;
+ overflow: hidden;
+}
+
.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 127c1268..90b84a35 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
@@ -1,3 +1,4 @@
+@charset "UTF-8";
/* No files to import found in abstractions/**\/* */
ul.breadcrumb {
padding: 0;
@@ -813,6 +814,39 @@ tr.error {
padding: 0.3em 0.6em;
}
*/
+blockquote {
+ padding-left: 0.5em;
+ font-size: 26px;
+ font-size: 2.6rem;
+ line-height: 130%;
+ font-family: "capita", Georgia, serif;
+ font-style: italic;
+}
+blockquote::before {
+ font-size: 35px;
+ font-size: 3.5rem;
+ color: rgba(0, 0, 0, 0.6);
+ content: "\f10d";
+ font-family: FontAwesome;
+ font-style: normal;
+ margin-left: -1.5em;
+ margin-top: -0.25em;
+ float: left;
+}
+
+cite {
+ font-size: 16px;
+ font-size: 1.6rem;
+ font-family: "proximanova", Helvetica, Arial, sans-serif;
+ font-style: normal;
+ display: block;
+ padding-top: 0.6em;
+}
+cite::before {
+ content: "―";
+ margin-right: 3px;
+}
+
html, body {
font-family: "proximanova", Helvetica, Arial, sans-serif;
color: #2d2d2d;
@@ -1142,6 +1176,39 @@ table caption {
background: #c7c7c7;
}
+blockquote {
+ padding-left: 0.5em;
+ font-size: 26px;
+ font-size: 2.6rem;
+ line-height: 130%;
+ font-family: "capita", Georgia, serif;
+ font-style: italic;
+}
+blockquote::before {
+ font-size: 35px;
+ font-size: 3.5rem;
+ color: rgba(0, 0, 0, 0.6);
+ content: "\f10d";
+ font-family: FontAwesome;
+ font-style: normal;
+ margin-left: -1.5em;
+ margin-top: -0.25em;
+ float: left;
+}
+
+cite {
+ font-size: 16px;
+ font-size: 1.6rem;
+ font-family: "proximanova", Helvetica, Arial, sans-serif;
+ font-style: normal;
+ display: block;
+ padding-top: 0.6em;
+}
+cite::before {
+ content: "―";
+ margin-right: 3px;
+}
+
html, body {
font-family: "proximanova", Helvetica, Arial, sans-serif;
color: #2d2d2d;
@@ -1593,6 +1660,18 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
}
}
+.l-region--hero-wrapper {
+ position: relative;
+ max-height: 500px;
+}
+.l-region--hero-wrapper .views-field-field-basic-image-image {
+ position: relative;
+ top: 0;
+ z-index: 9;
+ max-height: 500px;
+ overflow: hidden;
+}
+
.block--mm-widgets .item,
.pane-mm-widgets-live-pane .item {
margin: 1.5em 0;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_typography.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_typography.scss
index 165b91f6..9bcc9113 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_typography.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_typography.scss
@@ -1,9 +1,42 @@
+
// font units
@mixin font-size($sizeValue: 1.6) {
font-size: $sizeValue * 10 + px;
font-size: $sizeValue + rem;
}
+blockquote {
+ padding-left: 0.5em;
+ @include font-size(2.6);
+ line-height: 130%;
+ font-family: $capita;
+ font-style: italic;
+
+ &::before {
+ @include font-size(3.5);
+ color: rgba(0, 0, 0, 0.6);
+ content: "\f10d";
+ font-family: FontAwesome;
+ font-style: normal;
+ margin-left: -1.5em;
+ margin-top: -0.25em;
+ float: left;
+ }
+}
+
+cite {
+ @include font-size(1.6);
+ font-family: $proxima;
+ font-style: normal;
+ display: block;
+ padding-top: 0.6em;
+
+ &::before {
+ content: "―";
+ margin-right: 3px;
+ }
+}
+
// base typography
html, body {
font-family: $proxima;
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 896bbece..db781e85 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
@@ -14,40 +14,40 @@
bottom: 0.6em;
padding: 0.4em 8%;
@include font-size(2.4);
-
+
.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) {
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 font-size(4.0);
}
@@ -75,7 +75,7 @@
}
}
}
-
+
.flex-direction-nav a {
color: rgba(0, 0, 0, 0.8);
text-decoration: none;
@@ -126,7 +126,7 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
&.flex-active {
background-color:$white;
}
-
+
// hide pager on small view
@include breakpoint($small, true) {
display: none;
@@ -134,3 +134,15 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
}
+.l-region--hero-wrapper {
+ position: relative;
+ max-height: 500px;
+
+ .views-field-field-basic-image-image {
+ position: relative;
+ top: 0;
+ z-index: 9;
+ max-height: 500px;
+ overflow: hidden;
+ }
+}
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index 7fb850de..8fbcebff 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -77,10 +77,15 @@ projects[mimemail][subdir] = contrib
projects[media][version] = 2.0-beta1
projects[media][subdir] = contrib
+projects[media][patch][2297685] = http://drupal.org/files/issues/media-edit_uri_for_remote_files-2297685-6.patch
projects[media][patch][2093435] = http://drupal.org/files/issues/media-js-dialog-issues-2093435-21.patch
projects[media][patch][2308487] = http://drupal.org/files/issues/media-alt_and_title_double-2308487-9.patch
projects[media][patch][2084287] = http://drupal.org/files/issues/media-file-name-focus-2084287-2.patch
+projects[media_youtube][version] = 3.0
+projects[media_youtube][subdir] = contrib
+projects[media_youtube][patch][2498493] = http://drupal.org/files/issues/media_youtube-remove_thumbnail_exception-2498493-23.patch
+
projects[navbar][version] = 1.5
projects[navbar][subdir] = contrib
--
GitLab