From 50b237fddfbc390e0d66aaf19a66813af24f151f Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Thu, 2 Jun 2016 15:48:48 -0400
Subject: [PATCH] daily build

---
 profiles/wcm_base/CHANGELOG.txt               |  6 ++
 .../better_exposed_filters.api.php            | 15 ++++
 .../better_exposed_filters.info               |  6 +-
 ...er_exposed_filters_exposed_form_plugin.inc |  3 +
 .../bef_test_content/bef_test_content.info    |  6 +-
 .../private_files_download_permission.info    |  6 +-
 .../private_files_download_permission.module  | 18 ++---
 .../ocio_simplesamlphp_auth.module            | 32 +++++++-
 ...m_permissions.features.user_permission.inc | 11 +++
 .../wcm_permissions/wcm_permissions.info      |  2 +
 .../ocio-default/ocio-default.layout.css      | 13 +++-
 .../ocio-default.layout.no-query.css          | 13 +++-
 .../css/ocio-omega-base.no-query.css          | 31 ++++++--
 .../css/ocio-omega-base.styles.css            | 31 ++++++--
 .../ocio_omega_base/sass/base/_media.scss     | 16 +++-
 .../sass/base/_typography.scss                |  1 +
 .../sass/components/_search.scss              | 77 ++++++++++---------
 17 files changed, 207 insertions(+), 80 deletions(-)

diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index e70caaa1..fccaf551 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,9 @@
+WCM Base 7.x-1.x, 2016-06-02
+----------------------------
+- OCIO SimpleSAMLphp Auth, WCM Permissions: Added permission to allow
+  changing a user's authentication type.
+- OCIO Omega Base: Style fixes for search box, blockquote and mobile videos.
+
 WCM Base 7.x-1.x, 2016-05-24
 ----------------------------
 - WCM Base: Added patch to Link module to allow tel: links.
diff --git a/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.api.php b/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.api.php
index c7296d71..91485192 100644
--- a/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.api.php
+++ b/profiles/wcm_base/modules/contrib/better_exposed_filters/better_exposed_filters.api.php
@@ -18,3 +18,18 @@ function hook_better_exposed_filters_settings_alter(&$settings, $context) {
   $settings['field_price_value']['slider_options']['bef_slider_min'] = 500;
   $settings['field_price_value']['slider_options']['bef_slider_max'] = 5000;
 }
+
+
+/**
+ * Modify the array of BEF display options for an exposed filter.
+ *
+ * @param array $display_options
+ *   The set of display options available to this filter.
+ * @param object $filter
+ *   The exposed filter.
+ */
+function hook_better_exposed_filters_display_options_alter(&$display_options, $filter) {
+  if ($filter instanceof CustomViewsFilterFoo) {
+    $display_options['bef_links'] = t('Links');
+  }
+}
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 65175dc3..c1bf2707 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-05-17
-version = "7.x-3.2+50-dev"
+; Information added by Drupal.org packaging script on 2016-05-31
+version = "7.x-3.2+51-dev"
 core = "7.x"
 project = "better_exposed_filters"
-datestamp = "1463464432"
+datestamp = "1464715144"
 
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 29170d8b..c5e7afa5 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
@@ -460,6 +460,9 @@ Title Desc|Z -> A</pre> Leave the replacement text blank to remove an option alt
         $display_options['bef_hidden'] = t('Hidden');
       }
 
+      // Alter the list of available display options for this filter.
+      drupal_alter('better_exposed_filters_display_options', $display_options, $filter);
+
       $filter_key = $filter->options['is_grouped'] ? 'group_info' : 'expose';
       $identifier = '"' . $filter->options[$filter_key]['identifier'] . '"';
       if (!empty($filter->options[$filter_key]['label'])) {
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 cff6dc73..eaf0f85b 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-05-17
-version = "7.x-3.2+50-dev"
+; Information added by Drupal.org packaging script on 2016-05-31
+version = "7.x-3.2+51-dev"
 core = "7.x"
 project = "better_exposed_filters"
-datestamp = "1463464432"
+datestamp = "1464715144"
 
diff --git a/profiles/wcm_base/modules/contrib/private_files_download_permission/private_files_download_permission.info b/profiles/wcm_base/modules/contrib/private_files_download_permission/private_files_download_permission.info
index 466b49ea..a8b09c8c 100644
--- a/profiles/wcm_base/modules/contrib/private_files_download_permission/private_files_download_permission.info
+++ b/profiles/wcm_base/modules/contrib/private_files_download_permission/private_files_download_permission.info
@@ -4,9 +4,9 @@ core = 7.x
 package = Access control
 configure = admin/config/media/private-files-download-permission
 
-; Information added by Drupal.org packaging script on 2015-11-02
-version = "7.x-2.3+8-dev"
+; Information added by Drupal.org packaging script on 2016-05-31
+version = "7.x-2.3+11-dev"
 core = "7.x"
 project = "private_files_download_permission"
-datestamp = "1446474242"
+datestamp = "1464698049"
 
diff --git a/profiles/wcm_base/modules/contrib/private_files_download_permission/private_files_download_permission.module b/profiles/wcm_base/modules/contrib/private_files_download_permission/private_files_download_permission.module
index 0fed3e3b..b6598219 100644
--- a/profiles/wcm_base/modules/contrib/private_files_download_permission/private_files_download_permission.module
+++ b/profiles/wcm_base/modules/contrib/private_files_download_permission/private_files_download_permission.module
@@ -175,11 +175,11 @@ function private_files_download_permission_list_directories() {
     // Prepare the 'Enabled users' cell.
     if (variable_get('private_files_download_permission_by_user_checks')) {
       $enabled_users = array_intersect_key($users, $directory->uid);
-      sort($enabled_users);
+      natcasesort($enabled_users);
     }
     // Prepare the 'Enabled roles' cell.
     $enabled_roles = array_intersect_key($roles, $directory->rid);
-    sort($enabled_roles);
+    natcasesort($enabled_roles);
     // Fill table row.
     $rows[] = array(
       $directory->path,
@@ -274,7 +274,7 @@ function private_files_download_permission_get_directory_form($form, &$form_stat
   // Prepare user checkboxes.
   if (variable_get('private_files_download_permission_by_user_checks')) {
     $users = array_flip(private_files_download_permission_get_users());
-    ksort($users);
+    ksort($users, SORT_NATURAL | SORT_FLAG_CASE);
     $users = array_flip($users);
     foreach ($users as $uid => $user) {
       $form['users']['user_' . $uid] = array(
@@ -293,7 +293,7 @@ function private_files_download_permission_get_directory_form($form, &$form_stat
   );
   // Prepare role checkboxes.
   $roles = array_flip(user_roles());
-  ksort($roles);
+  ksort($roles, SORT_NATURAL | SORT_FLAG_CASE);
   $roles = array_flip($roles);
   foreach ($roles as $rid => $role) {
     $form['roles']['role_' . $rid] = array(
@@ -413,7 +413,7 @@ function private_files_download_permission_get_directory_form_submit($form, &$fo
   }
   catch (Exception $e) {
     $transaction->rollback();
-    drupal_set_message(t('An error occurred while saving directory to the control list. Please check the log for details.'), 'error');
+    drupal_set_message(t('An error occurred while saving directory to the control list. Possible duplication? Please check the log for details.'), 'error');
   }
   // Purge directory list from cache.
   drupal_static_reset('private_files_download_permission_get_directory_list');
@@ -579,16 +579,12 @@ function private_files_download_permission_file_download($uri) {
       // Evaluate user and role permissions and optionally allow access to $uri.
       if (variable_get('private_files_download_permission_by_user_checks')) {
         if (in_array($user->uid, array_keys($best_matching_directory->uid))) {
-          $files = file_load_multiple(array(), array('uri' => $uri));
-          $file = reset($files);
-          return file_transfer($uri, file_get_content_headers($file));
+          return array('Content-Type' => file_get_mimetype($uri));
         }
       }
       foreach ($user->roles as $rid => $role) {
         if (in_array($rid, array_keys($best_matching_directory->rid))) {
-          $files = file_load_multiple(array(), array('uri' => $uri));
-          $file = reset($files);
-          return file_transfer($uri, file_get_content_headers($file));
+          return array('Content-Type' => file_get_mimetype($uri));
         }
       }
     }
diff --git a/profiles/wcm_base/modules/custom/ocio_simplesamlphp_auth/ocio_simplesamlphp_auth.module b/profiles/wcm_base/modules/custom/ocio_simplesamlphp_auth/ocio_simplesamlphp_auth.module
index dd1603f2..62db5f40 100644
--- a/profiles/wcm_base/modules/custom/ocio_simplesamlphp_auth/ocio_simplesamlphp_auth.module
+++ b/profiles/wcm_base/modules/custom/ocio_simplesamlphp_auth/ocio_simplesamlphp_auth.module
@@ -6,6 +6,17 @@
 
 include_once 'ocio_simplesamlphp_auth.features.inc';
 
+/**
+ * Implements hook_permission().
+ */
+function ocio_simplesamlphp_auth_permission() {
+  return array(
+    'change user authentication type' => array(
+      'title' => t('Change user authentication type'),
+    ),
+  );
+}
+
 /**
  * Implements hook_entity_info
  */
@@ -269,7 +280,7 @@ function ocio_simplesamlphp_auth_form_user_profile_form_alter(&$form, &$form_sta
   }
 
   // add authentication method option to profile form
-  if (user_access('administer simpleSAMLphp authentication')) {
+  if (user_access('administer simpleSAMLphp authentication') || user_access('change user authentication type')) {
     $authOptions = array('drupal' => t('Drupal'), 'simplesamlphp' => 'SimpleSAML');
     $form['account']['authenticationType']= array(
       '#type' => 'radios',
@@ -461,6 +472,8 @@ function ocio_simplesamlphp_auth_cron() {
   $filesToRefresh = explode(',', variable_get('ocio_simplesamlphp_auth_metadata_files', 'shib13-idp-remote.php,saml20-idp-remote.php'));
   // init request options array
   $request_options = array();
+  // init refresh flag as false
+  $doRefresh = false;
   // loop files to refresh
   foreach ($filesToRefresh as $fileName) {
     $refreshFile = $filePath . trim($fileName);
@@ -479,13 +492,16 @@ function ocio_simplesamlphp_auth_cron() {
           }
         }
         // metadata exists but is expired; refresh
-        _ocio_simplesamlphp_auth_refresh_metadata($request_options);
+        $doRefresh = true;
       }
     } else {
       // metadata doesn't exist; create it
-      _ocio_simplesamlphp_auth_refresh_metadata($request_options);
+      $doRefresh = true;
     }
   }
+  if ($doRefresh) {
+    _ocio_simplesamlphp_auth_refresh_metadata($request_options);
+  }
 }
 
 
@@ -618,7 +634,15 @@ function _ocio_simplesamlphp_auth_refresh_metadata($httpOptions = array()){
     'absolute' => TRUE,
     'https' => TRUE,
   );
-  drupal_http_request(url($cron_path, $urlOptions), $httpOptions);
+  $urlString = url($cron_path, $urlOptions);
+  // use curl to hit refresh URL
+  $ch = curl_init();
+  curl_setopt($ch, CURLOPT_URL, $urlString);
+  curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+  $output = curl_exec($ch);
+  curl_close($ch);
+  // log
+  watchdog('ocio_simplesamlphp_auth', 'SimpleSAMLphp metadata refresh called via curl: ' . $urlString);
 }
 
 /**
diff --git a/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.features.user_permission.inc b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.features.user_permission.inc
index afc32d05..515a5858 100644
--- a/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.features.user_permission.inc
+++ b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.features.user_permission.inc
@@ -1077,6 +1077,17 @@ function wcm_permissions_user_default_permissions() {
     'module' => 'panels',
   );
 
+  // Exported permission: 'change user authentication type'.
+  $permissions['change user authentication type'] = array(
+    'name' => 'change user authentication type',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'site builder' => 'site builder',
+      'site manager' => 'site manager',
+    ),
+    'module' => 'ocio_simplesamlphp_auth',
+  );
+
   // Exported permission: 'clear cache'.
   $permissions['clear cache'] = array(
     'name' => 'clear cache',
diff --git a/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.info b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.info
index 5c7007b1..b471de17 100644
--- a/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.info
+++ b/profiles/wcm_base/modules/custom/wcm_permissions/wcm_permissions.info
@@ -46,6 +46,7 @@ dependencies[] = ocio_field_bases
 dependencies[] = ocio_landing_page
 dependencies[] = ocio_main_menu
 dependencies[] = ocio_omega_settings
+dependencies[] = ocio_simplesamlphp_auth
 dependencies[] = ocio_siteinfo
 dependencies[] = override_node_options
 dependencies[] = page_manager
@@ -191,6 +192,7 @@ features[user_permission][] = bypass private files download permission
 features[user_permission][] = bypass private files download permission for temporary files
 features[user_permission][] = bypass workbench moderation
 features[user_permission][] = change layouts in place editing
+features[user_permission][] = change user authentication type
 features[user_permission][] = clear cache
 features[user_permission][] = clone node
 features[user_permission][] = clone own nodes
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 e02a3503..51c958fe 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
@@ -868,8 +868,17 @@ img, media {
 }
 
 @media (max-width: 47.5em) {
-  .media-element.file-video-center {
+  .field .media-element.media-youtube-video,
+  .field .media-element.media-vimeo-video {
     width: 100%;
+    margin: 0;
+    float: none;
+    display: block;
+  }
+  .field img.media-element {
+    margin: 0 auto;
+    float: none;
+    display: block;
   }
 }
 .media.media-element-container.media-image_right {
@@ -1250,6 +1259,7 @@ blockquote {
   background: #f5f5f5 none repeat scroll 0 0;
   border-left: 4px solid #ddd;
   padding: 1.9em 2em;
+  overflow: hidden;
 }
 blockquote p, blockquote li, blockquote ul, blockquote ol {
   margin: 0.4em 0 0 0;
@@ -1666,6 +1676,7 @@ blockquote {
   background: #f5f5f5 none repeat scroll 0 0;
   border-left: 4px solid #ddd;
   padding: 1.9em 2em;
+  overflow: hidden;
 }
 blockquote p, blockquote li, blockquote ul, blockquote ol {
   margin: 0.4em 0 0 0;
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 8333a8ea..568ccda0 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
@@ -866,8 +866,17 @@ img, media {
   bottom: -3px;
 }
 
-.media-element.file-video-center {
+.field .media-element.media-youtube-video,
+.field .media-element.media-vimeo-video {
   width: 100%;
+  margin: 0;
+  float: none;
+  display: block;
+}
+.field img.media-element {
+  margin: 0 auto;
+  float: none;
+  display: block;
 }
 
 .media.media-element-container.media-image_right {
@@ -1244,6 +1253,7 @@ blockquote {
   background: #f5f5f5 none repeat scroll 0 0;
   border-left: 4px solid #ddd;
   padding: 1.9em 2em;
+  overflow: hidden;
 }
 blockquote p, blockquote li, blockquote ul, blockquote ol {
   margin: 0.4em 0 0 0;
@@ -1656,6 +1666,7 @@ blockquote {
   background: #f5f5f5 none repeat scroll 0 0;
   border-left: 4px solid #ddd;
   padding: 1.9em 2em;
+  overflow: hidden;
 }
 blockquote p, blockquote li, blockquote ul, blockquote ol {
   margin: 0.4em 0 0 0;
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 abaa91fc..fa2536db 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
@@ -862,8 +862,17 @@ img, media {
   bottom: -3px;
 }
 
-.media-element.file-video-center {
+.field .media-element.media-youtube-video,
+.field .media-element.media-vimeo-video {
   width: 100%;
+  margin: 0;
+  float: none;
+  display: block;
+}
+.field img.media-element {
+  margin: 0 auto;
+  float: none;
+  display: block;
 }
 
 .media.media-element-container.media-image_right {
@@ -1241,6 +1250,7 @@ blockquote {
   background: #f5f5f5 none repeat scroll 0 0;
   border-left: 4px solid #ddd;
   padding: 1.9em 2em;
+  overflow: hidden;
 }
 blockquote p, blockquote li, blockquote ul, blockquote ol {
   margin: 0.4em 0 0 0;
@@ -1654,6 +1664,7 @@ blockquote {
   background: #f5f5f5 none repeat scroll 0 0;
   border-left: 4px solid #ddd;
   padding: 1.9em 2em;
+  overflow: hidden;
 }
 blockquote p, blockquote li, blockquote ul, blockquote ol {
   margin: 0.4em 0 0 0;
@@ -2081,7 +2092,10 @@ p.search-result__snippet {
 .l-page .l-region--main-menu #search-block-toggle:focus {
   outline: 1px dotted red;
 }
-.l-page .l-region--main-menu #block-search-form {
+.l-page .l-region--main-menu #wcm-search {
+  position: relative;
+}
+.l-page .l-region--main-menu #wcm-search #block-search-form {
   z-index: 498;
   position: absolute;
   right: 0;
@@ -2091,34 +2105,35 @@ p.search-result__snippet {
   height: 4em;
   display: none;
 }
-.l-page .l-region--main-menu #block-search-form * {
+.l-page .l-region--main-menu #wcm-search #block-search-form * {
   height: 100%;
 }
-.l-page .l-region--main-menu #block-search-form .container-inline {
+.l-page .l-region--main-menu #wcm-search #block-search-form .container-inline {
   display: table;
   padding: 1em;
 }
-.l-page .l-region--main-menu #block-search-form .container-inline .form-item {
+.l-page .l-region--main-menu #wcm-search #block-search-form .container-inline .form-item {
   display: table-cell;
   vertical-align: middle;
 }
-.l-page .l-region--main-menu #block-search-form .container-inline .form-item .form-text {
+.l-page .l-region--main-menu #wcm-search #block-search-form .container-inline .form-item .form-text {
   border: 0 none;
   padding: 0 6px;
   font-size: 1em;
 }
-.l-page .l-region--main-menu #block-search-form .container-inline .form-actions {
+.l-page .l-region--main-menu #wcm-search #block-search-form .container-inline .form-actions {
   display: table-cell;
   text-align: center;
   width: 1.9em;
 }
-.l-page .l-region--main-menu #block-search-form .container-inline .form-actions .form-submit {
+.l-page .l-region--main-menu #wcm-search #block-search-form .container-inline .form-actions .form-submit {
   border-radius: 0;
   -webkit-box-sizing: content-box;
   padding-right: 1em;
   padding-left: 1em;
   box-shadow: none;
   padding: 0.6em 1.3em 0.4em;
+  margin: 0;
 }
 
 .l-page .l-region--main-menu #search-block-toggle {
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 c0e843e1..2676e08c 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
@@ -864,8 +864,17 @@ img, media {
 }
 
 @media (max-width: 47.5em) {
-  .media-element.file-video-center {
+  .field .media-element.media-youtube-video,
+  .field .media-element.media-vimeo-video {
     width: 100%;
+    margin: 0;
+    float: none;
+    display: block;
+  }
+  .field img.media-element {
+    margin: 0 auto;
+    float: none;
+    display: block;
   }
 }
 .media.media-element-container.media-image_right {
@@ -1247,6 +1256,7 @@ blockquote {
   background: #f5f5f5 none repeat scroll 0 0;
   border-left: 4px solid #ddd;
   padding: 1.9em 2em;
+  overflow: hidden;
 }
 blockquote p, blockquote li, blockquote ul, blockquote ol {
   margin: 0.4em 0 0 0;
@@ -1664,6 +1674,7 @@ blockquote {
   background: #f5f5f5 none repeat scroll 0 0;
   border-left: 4px solid #ddd;
   padding: 1.9em 2em;
+  overflow: hidden;
 }
 blockquote p, blockquote li, blockquote ul, blockquote ol {
   margin: 0.4em 0 0 0;
@@ -2111,7 +2122,10 @@ p.search-result__snippet {
 .l-page .l-region--main-menu #search-block-toggle:focus {
   outline: 1px dotted red;
 }
-.l-page .l-region--main-menu #block-search-form {
+.l-page .l-region--main-menu #wcm-search {
+  position: relative;
+}
+.l-page .l-region--main-menu #wcm-search #block-search-form {
   z-index: 498;
   position: absolute;
   right: 0;
@@ -2121,34 +2135,35 @@ p.search-result__snippet {
   height: 4em;
   display: none;
 }
-.l-page .l-region--main-menu #block-search-form * {
+.l-page .l-region--main-menu #wcm-search #block-search-form * {
   height: 100%;
 }
-.l-page .l-region--main-menu #block-search-form .container-inline {
+.l-page .l-region--main-menu #wcm-search #block-search-form .container-inline {
   display: table;
   padding: 1em;
 }
-.l-page .l-region--main-menu #block-search-form .container-inline .form-item {
+.l-page .l-region--main-menu #wcm-search #block-search-form .container-inline .form-item {
   display: table-cell;
   vertical-align: middle;
 }
-.l-page .l-region--main-menu #block-search-form .container-inline .form-item .form-text {
+.l-page .l-region--main-menu #wcm-search #block-search-form .container-inline .form-item .form-text {
   border: 0 none;
   padding: 0 6px;
   font-size: 1em;
 }
-.l-page .l-region--main-menu #block-search-form .container-inline .form-actions {
+.l-page .l-region--main-menu #wcm-search #block-search-form .container-inline .form-actions {
   display: table-cell;
   text-align: center;
   width: 1.9em;
 }
-.l-page .l-region--main-menu #block-search-form .container-inline .form-actions .form-submit {
+.l-page .l-region--main-menu #wcm-search #block-search-form .container-inline .form-actions .form-submit {
   border-radius: 0;
   -webkit-box-sizing: content-box;
   padding-right: 1em;
   padding-left: 1em;
   box-shadow: none;
   padding: 0.6em 1.3em 0.4em;
+  margin: 0;
 }
 
 @media (max-width: 47.5em) {
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_media.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_media.scss
index 72291e3d..1429b022 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_media.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_media.scss
@@ -136,8 +136,20 @@ img, media {
 }
 
 @include breakpoint($small, true) {
-  .media-element.file-video-center {
-    width: 100%;
+  .field {
+    .media-element.media-youtube-video,
+    .media-element.media-vimeo-video  {
+      width: 100%;
+      margin: 0;
+      float: none;
+      display: block;
+    }
+
+    img.media-element {
+      margin: 0 auto;
+      float: none;
+      display: block;
+    }
   }
 }
 
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 f0c89a8b..486b7bbe 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
@@ -190,6 +190,7 @@ blockquote {
   background: #f5f5f5 none repeat scroll 0 0;
   border-left: 4px solid #ddd;
   padding: 1.9em 2em;
+  overflow: hidden;
 
   p, li, ul, ol {
     margin: 0.4em 0 0 0;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_search.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_search.scss
index 10f8221d..5310fd68 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_search.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_search.scss
@@ -44,46 +44,51 @@ p.search-result__snippet {
     }
   }
 
-  #block-search-form {
-    * {
-      height: 100%;
-    }
-    z-index: 498;
-    position: absolute;
-    right: 0;
-    top: 100%;
-    background-color: rgba(0, 0, 0, 0.8);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#333333,endColorstr=#333333);
-    height: 4em;
-    display: none;
-
-    .container-inline {
-      display: table;
-      padding: 1em;
+  #wcm-search {
+    position: relative;
 
-      .form-item {
-        display: table-cell;
-        vertical-align: middle;
+    #block-search-form {
+      * {
+        height: 100%;
+      }
+      z-index: 498;
+      position: absolute;
+      right: 0;
+      top: 100%;
+      background-color: rgba(0, 0, 0, 0.8);
+      filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#333333,endColorstr=#333333);
+      height: 4em;
+      display: none;
 
-        .form-text {
-          border: 0 none;
-          padding: 0 6px;
-          font-size: 1em;
+      .container-inline {
+        display: table;
+        padding: 1em;
+
+        .form-item {
+          display: table-cell;
+          vertical-align: middle;
+
+          .form-text {
+            border: 0 none;
+            padding: 0 6px;
+            font-size: 1em;
+          }
         }
-      }
 
-      .form-actions {
-        display: table-cell;
-        text-align: center;
-        width: 1.9em;
-
-        .form-submit {
-          border-radius: 0;
-          -webkit-box-sizing: content-box;
-          padding-right: 1em;
-          padding-left: 1em;
-          box-shadow: none;
-          padding: 0.6em 1.3em 0.4em;
+        .form-actions {
+          display: table-cell;
+          text-align: center;
+          width: 1.9em;
+
+          .form-submit {
+            border-radius: 0;
+            -webkit-box-sizing: content-box;
+            padding-right: 1em;
+            padding-left: 1em;
+            box-shadow: none;
+            padding: 0.6em 1.3em 0.4em;
+            margin: 0;
+          }
         }
       }
     }
-- 
GitLab