From a723d2a6c0fd932615e958c8ded2fd8e24cf636c Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Mon, 17 Aug 2015 14:02:38 -0400
Subject: [PATCH] daily build
---
profiles/wcm_base/CHANGELOG.txt | 7 +
.../contrib/views_bulk_operations/LICENSE.txt | 0
.../actions/archive.action.inc | 1 +
.../actions/book.action.inc | 2 +
.../actions/delete.action.inc | 1 +
.../actions/modify.action.inc | 9 +-
.../actions/user_cancel.action.inc | 1 +
.../actions/user_roles.action.inc | 29 ++-
.../actions_permissions.info | 6 +-
.../js/views_bulk_operations.js | 32 ++--
.../plugins/operation_types/action.class.php | 2 +-
.../operation_types/rules_component.class.php | 4 +-
...lk_operations_handler_field_operations.inc | 22 +++
.../views_bulk_operations.info | 6 +-
.../views_bulk_operations.module | 97 ++++++----
...wcm_user_directory.features.field_base.inc | 15 ++
...user_directory.features.field_instance.inc | 64 ++++++-
.../wcm_user_directory.info | 4 +-
.../wcm_user_directory.views_default.inc | 100 ----------
.../wcm_user_leadership.context.inc | 46 +++++
...cm_user_leadership.features.field_base.inc | 15 ++
...ser_leadership.features.field_instance.inc | 78 +++++++-
.../wcm_user_leadership.features.inc | 3 +
.../wcm_user_leadership.info | 6 +
.../wcm_user_leadership.views_default.inc | 27 +--
.../wcm_user_profile/wcm_user_profile.ds.inc | 43 ++++-
...m_user_profile.features.field_instance.inc | 85 +++++----
.../wcm_user_profile/wcm_user_profile.info | 1 +
.../css/layouts/ocio-2/ocio-2.layout.css | 106 +++++++----
.../layouts/ocio-2/ocio-default.layout.css | 176 ++++++++++++++++++
.../ocio-2/ocio-default.layout.no-query.css | 162 ++++++++++++++++
.../ocio-default/ocio-default.layout.css | 176 ++++++++++++++++++
.../ocio-default.layout.no-query.css | 162 ++++++++++++++++
.../ocio_omega_2/css/ocio-2.no-query.css | 92 ++++++---
.../themes/ocio_omega_2/css/ocio-2.styles.css | 92 ++++++---
.../layouts/ocio-2/ocio-2-layout.tpl.php | 62 ++++++
.../layouts/ocio-2/ocio-2.layout.inc | 24 +++
.../ocio_omega_2/layouts/ocio-2/preview.png | Bin 0 -> 2900 bytes
.../ocio-default/ocio-default-layout.tpl.php | 63 +++++++
.../ocio-default/ocio-default.layout.inc | 24 +++
.../libraries/ocio-default/preview.png | Bin 0 -> 2900 bytes
.../wcm_base/themes/ocio_omega_2/ocio_2.info | 2 +-
.../sass/abstractions/_scheme-colors.scss | 9 +-
.../sass/components/_main-content.scss | 13 +-
.../sass/components/_media_magnet.scss | 38 ++++
.../ocio_omega_2/sass/components/_panes.scss | 0
.../ocio-2/ocio-2.layout.no-query.scss | 5 +
.../sass/layouts/ocio-2/ocio-2.layout.scss | 118 ++++++++++++
.../ocio_omega_2/sass/ocio-2.styles.scss | 3 +-
.../panels-pane--mm-widgets-live-pane.tpl.php | 66 +++++++
.../css/layouts/ocio-3/ocio-3.layout.css | 8 +-
.../layouts/ocio-3/ocio-3.layout.no-query.css | 8 +-
.../ocio_omega_3/css/ocio-3.no-query.css | 12 +-
.../themes/ocio_omega_3/css/ocio-3.styles.css | 12 +-
.../layouts/ocio-3/ocio-3-layout.tpl.php | 104 +++++------
.../ocio_omega_3/sass/base/_layout-base.scss | 45 +++--
.../ocio_omega_3/sass/components/_panels.scss | 6 +-
.../regions/region--main-menu.tpl.php | 39 ++++
.../layouts/ocio-4/ocio-4-layout.tpl.php | 21 +--
.../ocio_omega_4/sass/base/_buttons.scss | 14 +-
.../ocio-default/ocio-default.layout.css | 10 +
.../ocio-default.layout.no-query.css | 10 +
.../css/ocio-omega-base.no-query.css | 113 +++++++----
.../css/ocio-omega-base.styles.css | 117 ++++++++----
.../js/ocio-omega-base.behaviors.js | 7 +-
.../ocio-default/ocio-default-layout.tpl.php | 21 +--
.../ocio-omega-dps/ocio-omega-dps.tpl.php | 42 ++---
.../ocio-omega-flip-flop.tpl.php | 16 +-
.../ocio-omega-fourtiles.tpl.php | 24 +--
.../ocio-omega-tiles-equalcol.tpl.php | 18 +-
.../ocio-omega-tiles-twocol-flipped.tpl.php | 18 +-
.../ocio-omega-tiles-twocol.tpl.php | 18 +-
.../ocio_omega_base/sass/base/_buttons.scss | 6 +
.../sass/components/_search.scss | 3 +-
.../sass/components/_users.scss | 92 ++++++++-
.../sass/components/regions/_main-menu.scss | 87 ++++-----
.../sass/components/regions/_pre-footer.scss | 3 -
.../specific-pages/_leadership.scss | 37 ----
.../panels-pane--mm-widgets-live-pane.tpl.php | 1 -
profiles/wcm_base/wcm_base.make | 2 +-
80 files changed, 2312 insertions(+), 701 deletions(-)
mode change 100755 => 100644 profiles/wcm_base/modules/contrib/views_bulk_operations/LICENSE.txt
delete mode 100644 profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.views_default.inc
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.context.inc
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-default.layout.css
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-default.layout.no-query.css
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-default/ocio-default.layout.css
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-default/ocio-default.layout.no-query.css
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2-layout.tpl.php
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2.layout.inc
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/preview.png
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/libraries/ocio-default/ocio-default-layout.tpl.php
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/libraries/ocio-default/ocio-default.layout.inc
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/libraries/ocio-default/preview.png
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/sass/components/_media_magnet.scss
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/sass/components/_panes.scss
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/sass/layouts/ocio-2/ocio-2.layout.no-query.scss
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/sass/layouts/ocio-2/ocio-2.layout.scss
create mode 100644 profiles/wcm_base/themes/ocio_omega_2/templates/panels-pane--mm-widgets-live-pane.tpl.php
create mode 100644 profiles/wcm_base/themes/ocio_omega_3/templates/regions/region--main-menu.tpl.php
delete mode 100644 profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_leadership.scss
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 51000ba1..90a09163 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,10 @@
+WCM Base 7.x-1.x, 2015-08-17
+----------------------------
+- All OCIO Omega Themes: Fixed l-constrained abuses and cleaned up templates.
+- OCIO Omega Base: Removed extlink icons on links using button classes.
+- OCIO Omega Theme 2: Updated tile pane and Media Magnet widget styles.
+- Views Bulk Operations: Security release, updated to 3.3
+
WCM Base 7.x-1.x, 2015-08-12
----------------------------
- WCM Base Profile: Added Conditional Fields module.
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/LICENSE.txt b/profiles/wcm_base/modules/contrib/views_bulk_operations/LICENSE.txt
old mode 100755
new mode 100644
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/archive.action.inc b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/archive.action.inc
index 7667e493..f0055274 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/archive.action.inc
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/archive.action.inc
@@ -18,6 +18,7 @@ function views_bulk_operations_archive_action_info() {
// "Create an advanced action" dropdown on admin/config/system/actions.
'configurable' => FALSE,
'vbo_configurable' => TRUE,
+ 'behavior' => array('views_property'),
'triggers' => array('any'),
);
}
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/book.action.inc b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/book.action.inc
index add893ef..ad8fa9c4 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/book.action.inc
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/book.action.inc
@@ -13,11 +13,13 @@ function views_bulk_operations_book_action_info() {
'label' => t('Move to book'),
'configurable' => TRUE,
'behavior' => array('changes_property'),
+ 'triggers' => array('any'),
);
$actions['views_bulk_operations_remove_from_book_action'] = array(
'type' => 'node',
'label' => t('Remove from book'),
'configurable' => FALSE,
+ 'triggers' => array('any'),
);
}
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/delete.action.inc b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/delete.action.inc
index 1106ab04..52c72d2f 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/delete.action.inc
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/delete.action.inc
@@ -19,6 +19,7 @@ function views_bulk_operations_delete_action_info() {
'label' => t('Delete revision'),
'configurable' => FALSE,
'behavior' => array('deletes_property'),
+ 'triggers' => array('any'),
),
);
}
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/modify.action.inc b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/modify.action.inc
index 71b6181c..301b17b2 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/modify.action.inc
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/modify.action.inc
@@ -82,6 +82,11 @@ function views_bulk_operations_modify_action($entity, $context) {
// The wrapper will automatically modify $entity itself.
$wrapper = entity_metadata_wrapper($context['entity_type'], $entity);
foreach ($context['selected']['properties'] as $key) {
+ if (!$wrapper->$key->access('update')) {
+ // No access.
+ continue;
+ }
+
if (in_array($key, $context['append']['properties'])) {
$old_values = $wrapper->$key->value();
$wrapper->$key->set($context['properties'][$key]);
@@ -134,7 +139,7 @@ function views_bulk_operations_modify_action_form($context, &$form_state) {
if (!empty($properties)) {
$form['properties'] = array(
'#type' => 'fieldset',
- '#title' => 'Properties',
+ '#title' => t('Properties'),
);
$form['properties']['show_value'] = array(
'#suffix' => '<div class="clearfix"></div>',
@@ -298,7 +303,7 @@ function views_bulk_operations_modify_action_form($context, &$form_state) {
$token_type = str_replace('_', '-', $entity_type);
$form['tokens'] = array(
'#type' => 'fieldset',
- '#title' => 'Available tokens',
+ '#title' => t('Available tokens'),
'#collapsible' => TRUE,
'#collapsed' => TRUE,
'#weight' => 998,
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/user_cancel.action.inc b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/user_cancel.action.inc
index ea8e8ee1..147d2920 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/user_cancel.action.inc
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/user_cancel.action.inc
@@ -10,6 +10,7 @@ function views_bulk_operations_user_cancel_action_info() {
'label' => t('Cancel user account'),
'configurable' => TRUE,
'behavior' => array('deletes_property'),
+ 'triggers' => array('any'),
));
}
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/user_roles.action.inc b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/user_roles.action.inc
index 394597c3..616f13ce 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/user_roles.action.inc
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions/user_roles.action.inc
@@ -45,24 +45,19 @@ function views_bulk_operations_user_roles_action_submit($form, $form_state) {
);
}
-function views_bulk_operations_user_roles_action(&$user, $context) {
- $roles = $user->roles;
- $selected = (is_array($context['add_roles']) ? $context['add_roles'] : array()) +
- (is_array($context['remove_roles']) ? $context['remove_roles'] : array());
- $result = db_query("SELECT rid, name FROM {role} WHERE rid IN (:selected)", array(':selected' => array_keys($selected)));
- foreach ($result as $role) {
- if (isset($context['add_roles'][$role->rid])) {
- $add_roles[$role->rid] = $role->name;
- }
- if (isset($context['remove_roles'][$role->rid])) {
- $remove_roles[$role->rid] = $role->name;
- }
+function views_bulk_operations_user_roles_action($user, $context) {
+ $wrapper = entity_metadata_wrapper('user', $user);
+ if (!$wrapper->roles->access("update")) {
+ // No access.
+ return;
}
- if (!empty($add_roles)) {
- $roles += $add_roles;
+ $roles = $wrapper->roles->value();
+ if (is_array($context['add_roles'])) {
+ $roles = array_merge($roles, $context['add_roles']);
}
- if (!empty($remove_roles)) {
- $roles = array_diff($roles, $remove_roles);
+ if (is_array($context['remove_roles'])) {
+ $roles = array_diff($roles, $context['remove_roles']);
}
- user_save($user, array('roles' => $roles));
+ $wrapper->roles->set($roles);
+ $wrapper->save();
}
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions_permissions.info b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions_permissions.info
index e57077b0..658d1adc 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/actions_permissions.info
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/actions_permissions.info
@@ -3,9 +3,9 @@ description = Provides permission-based access control for actions. Used by View
package = Administration
core = 7.x
-; Information added by Drupal.org packaging script on 2013-12-23
-version = "7.x-3.2"
+; Information added by Drupal.org packaging script on 2015-07-01
+version = "7.x-3.3"
core = "7.x"
project = "views_bulk_operations"
-datestamp = "1387798183"
+datestamp = "1435764542"
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/js/views_bulk_operations.js b/profiles/wcm_base/modules/contrib/views_bulk_operations/js/views_bulk_operations.js
index aeeecc6f..ca76df86 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/js/views_bulk_operations.js
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/js/views_bulk_operations.js
@@ -46,21 +46,23 @@
});
// Set up the ability to click anywhere on the row to select it.
- $('.views-table tbody tr', form).click(function(event) {
- if (event.target.tagName.toLowerCase() != 'input' && event.target.tagName.toLowerCase() != 'a') {
- $('input[id^="edit-views-bulk-operations"]:not(:disabled)', this).each(function() {
- var checked = this.checked;
- // trigger() toggles the checkmark *after* the event is set,
- // whereas manually clicking the checkbox toggles it *beforehand*.
- // that's why we manually set the checkmark first, then trigger the
- // event (so that listeners get notified), then re-set the checkmark
- // which the trigger will have toggled. yuck!
- this.checked = !checked;
- $(this).trigger('click');
- this.checked = !checked;
- });
- }
- });
+ if (Drupal.settings.vbo.row_clickable) {
+ $('.views-table tbody tr', form).click(function(event) {
+ if (event.target.tagName.toLowerCase() != 'input' && event.target.tagName.toLowerCase() != 'a') {
+ $('input[id^="edit-views-bulk-operations"]:not(:disabled)', this).each(function() {
+ var checked = this.checked;
+ // trigger() toggles the checkmark *after* the event is set,
+ // whereas manually clicking the checkbox toggles it *beforehand*.
+ // that's why we manually set the checkmark first, then trigger the
+ // event (so that listeners get notified), then re-set the checkmark
+ // which the trigger will have toggled. yuck!
+ this.checked = !checked;
+ $(this).trigger('click');
+ this.checked = !checked;
+ });
+ }
+ });
+ }
}
Drupal.vbo.tableSelectAllPages = function(form) {
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/plugins/operation_types/action.class.php b/profiles/wcm_base/modules/contrib/views_bulk_operations/plugins/operation_types/action.class.php
index c74d90c3..f3e60a30 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/plugins/operation_types/action.class.php
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/plugins/operation_types/action.class.php
@@ -20,7 +20,7 @@ class ViewsBulkOperationsAction extends ViewsBulkOperationsBaseOperation {
*/
public function getAccessMask() {
// Assume edit by default.
- if (!isset($this->operationInfo['behavior'])) {
+ if (empty($this->operationInfo['behavior'])) {
$this->operationInfo['behavior'] = array('changes_property');
}
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/plugins/operation_types/rules_component.class.php b/profiles/wcm_base/modules/contrib/views_bulk_operations/plugins/operation_types/rules_component.class.php
index 624c850b..c40da8b2 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/plugins/operation_types/rules_component.class.php
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/plugins/operation_types/rules_component.class.php
@@ -124,6 +124,8 @@ class ViewsBulkOperationsRulesComponent extends ViewsBulkOperationsBaseOperation
else {
$element = rules_action('component_' . $this->operationInfo['parameters']['component_key']);
}
- $element->execute($data);
+ $wrapper_type = is_array($data) ? "list<{$this->entityType}>" : $this->entityType;
+ $wrapper = entity_metadata_wrapper($wrapper_type, $data);
+ $element->execute($wrapper);
}
}
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc b/profiles/wcm_base/modules/contrib/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc
index 9bb983f7..61886d48 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc
@@ -55,6 +55,7 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
'contains' => array(
'display_type' => array('default' => 0),
'enable_select_all_pages' => array('default' => TRUE),
+ 'row_clickable' => array('default' => TRUE),
'force_single' => array('default' => FALSE),
'entity_load_capacity' => array('default' => 10),
'skip_batching' => array('default' => 0),
@@ -63,11 +64,26 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
$options['vbo_operations'] = array(
'default' => array(),
'unpack_translatable' => 'unpack_operations',
+ 'export' => 'export_vbo_operations',
);
return $options;
}
+ function export_vbo_operations($indent, $prefix, $storage, $option, $definition, $parents) {
+ // Anti-recursion, since we use the parent export helper.
+ unset($definition['export']);
+
+ // Find and remove all unselected/disabled operations.
+ foreach ($storage['vbo_operations'] as $operation_id => $operation) {
+ if (empty($operation['selected'])) {
+ unset($storage['vbo_operations'][$operation_id]);
+ }
+ }
+
+ return parent::export_option($indent, $prefix, $storage, $option, $definition, $parents);
+ }
+
function unpack_operations(&$translatable, $storage, $option, $definition, $parents, $keys) {
$translatable[] = array(
'value' => t('- Choose an operation -'),
@@ -107,6 +123,12 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
'#default_value' => $this->options['vbo_settings']['enable_select_all_pages'],
'#description' => t('Check this box to enable the ability to select all items on all pages.'),
);
+ $form['vbo_settings']['row_clickable'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Make the whole row clickable'),
+ '#default_value' => $this->options['vbo_settings']['row_clickable'],
+ '#description' => t('Check this box to select an item when its row has been clicked. Requires JavaScript.'),
+ );
$form['vbo_settings']['force_single'] = array(
'#type' => 'checkbox',
'#title' => t('Force single'),
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/views_bulk_operations.info b/profiles/wcm_base/modules/contrib/views_bulk_operations/views_bulk_operations.info
index 2f03a14a..8fbdffaa 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/views_bulk_operations.info
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/views_bulk_operations.info
@@ -9,9 +9,9 @@ php = 5.2.9
files[] = plugins/operation_types/base.class.php
files[] = views/views_bulk_operations_handler_field_operations.inc
-; Information added by Drupal.org packaging script on 2013-12-23
-version = "7.x-3.2"
+; Information added by Drupal.org packaging script on 2015-07-01
+version = "7.x-3.3"
core = "7.x"
project = "views_bulk_operations"
-datestamp = "1387798183"
+datestamp = "1435764542"
diff --git a/profiles/wcm_base/modules/contrib/views_bulk_operations/views_bulk_operations.module b/profiles/wcm_base/modules/contrib/views_bulk_operations/views_bulk_operations.module
index b25b661c..e74eeb1d 100644
--- a/profiles/wcm_base/modules/contrib/views_bulk_operations/views_bulk_operations.module
+++ b/profiles/wcm_base/modules/contrib/views_bulk_operations/views_bulk_operations.module
@@ -41,21 +41,20 @@ function views_bulk_operations_load_action_includes() {
// The list of VBO actions is fairly static, so it's hardcoded for better
// performance (hitting the filesystem with file_scan_directory(), and then
// caching the result has its cost).
- $path = drupal_get_path('module', 'views_bulk_operations') . '/actions/';
$files = array(
- 'archive.action.inc',
- 'argument_selector.action.inc',
- 'book.action.inc',
- 'delete.action.inc',
- 'modify.action.inc',
- 'script.action.inc',
- 'user_roles.action.inc',
- 'user_cancel.action.inc',
+ 'archive.action',
+ 'argument_selector.action',
+ 'book.action',
+ 'delete.action',
+ 'modify.action',
+ 'script.action',
+ 'user_roles.action',
+ 'user_cancel.action',
);
if (!$loaded) {
foreach ($files as $file) {
- include_once $path . $file;
+ module_load_include('inc', 'views_bulk_operations', 'actions/' . $file);
}
$loaded = TRUE;
}
@@ -77,7 +76,7 @@ function views_bulk_operations_load_action_includes() {
function views_bulk_operations_cron() {
db_delete('queue')
->condition('name', db_like('views_bulk_operations_active_queue_'), 'LIKE')
- ->condition('created', REQUEST_TIME - 864000, '<')
+ ->condition('created', REQUEST_TIME - 86400, '<')
->execute();
}
@@ -358,7 +357,7 @@ function views_bulk_operations_form_alter(&$form, &$form_state, $form_id) {
*/
function views_bulk_operations_views_post_build(&$view) {
$vbo = _views_bulk_operations_get_field($view);
- if ($vbo && $vbo->get_selected_operations() < 1) {
+ if ($vbo && count($vbo->get_selected_operations()) < 1) {
$vbo->options['exclude'] = TRUE;
}
}
@@ -420,7 +419,7 @@ function theme_views_bulk_operations_select_all($variables) {
if ($enable_select_all_pages) {
$form['select_all']['or'] = array(
'#type' => 'markup',
- '#markup' => '<em>OR</em>',
+ '#markup' => '<em>' . t('OR') . '</em>',
);
$form['select_all']['all_pages'] = array(
'#type' => 'checkbox',
@@ -443,6 +442,13 @@ function theme_views_bulk_operations_select_all($variables) {
*/
function views_bulk_operations_form($form, &$form_state, $vbo) {
$form['#attached']['js'][] = drupal_get_path('module', 'views_bulk_operations') . '/js/views_bulk_operations.js';
+ $form['#attached']['js'][] = array(
+ 'data' => array('vbo' => array(
+ 'row_clickable' => $vbo->get_vbo_option('row_clickable'),
+ )),
+ 'type' => 'setting',
+ );
+
$form['#attached']['css'][] = drupal_get_path('module', 'views_bulk_operations') . '/css/views_bulk_operations.css';
// Wrap the form in a div with specific classes for JS targeting and theming.
$class = 'vbo-views-form';
@@ -595,14 +601,23 @@ function views_bulk_operations_confirm_form($form, &$form_state, $view, $output)
$operation = $form_state['operation'];
$rows = $form_state['selection'];
$query = drupal_get_query_parameters($_GET, array('q'));
+ $title = t('Are you sure you want to perform %operation on the selected items?', array('%operation' => $operation->label()));
$form = confirm_form($form,
- t('Are you sure you want to perform %operation on the selected items?', array('%operation' => $operation->label())),
+ $title,
array('path' => $view->get_url(), 'query' => $query),
theme('views_bulk_operations_confirmation', array('rows' => $rows, 'vbo' => $vbo, 'operation' => $operation, 'select_all_pages' => $form_state['select_all_pages']))
);
// Add VBO's submit handler to the Confirm button added by config_form().
$form['actions']['submit']['#submit'] = array('views_bulk_operations_form_submit');
+ // We can't set the View title here as $view is just a copy of the original,
+ // and our settings changes won't "stick" for the first page load of the
+ // confirmation form. We also can't just call drupal_set_title() directly
+ // because our title will be clobbered by the actual View title later. So
+ // let's tuck the title away in the form for use later.
+ // @see views_bulk_operations_preprocess_views_view()
+ $form['#vbo_confirm_form_title'] = $title;
+
return $form;
}
@@ -618,7 +633,7 @@ function theme_views_bulk_operations_confirmation($variables) {
// Load the entities from the current page, and show their titles.
$entities = _views_bulk_operations_entity_load($entity_type, array_values($rows), $vbo->revision);
foreach ($entities as $entity) {
- $items[] = check_plain(_views_bulk_operations_entity_label($entity_type, $entity));
+ $items[] = check_plain(entity_label($entity_type, $entity));
}
// All rows on all pages have been selected, so show a count of additional items.
if ($select_all_pages) {
@@ -631,6 +646,29 @@ function theme_views_bulk_operations_confirmation($variables) {
return $output;
}
+/**
+ * Implements hook_preprocess_page().
+ *
+ * Hide action links on the configure and confirm pages.
+ */
+function views_bulk_operations_preprocess_page(&$variables) {
+ if (isset($_POST['select_all'], $_POST['operation'])) {
+ $variables['action_links'] = array();
+ }
+}
+
+/**
+ * Implements hook_preprocess_views_view().
+ */
+function views_bulk_operations_preprocess_views_view($variables) {
+ // If we've stored a title for the confirmation form, retrieve it here and
+ // retitle the View.
+ // @see views_bulk_operations_confirm_form()
+ if (array_key_exists('rows', $variables) && is_array($variables['rows']) && array_key_exists('#vbo_confirm_form_title', $variables['rows'])) {
+ $variables['view']->set_title($variables['rows']['#vbo_confirm_form_title']);
+ }
+}
+
/**
* Goes through the submitted values, and returns
* an array of selected rows, in the form of
@@ -871,7 +909,7 @@ function views_bulk_operations_adjust_selection($queue_name, $operation, $option
'views_row' => array(),
'position' => array(
'current' => ++$context['sandbox']['progress'],
- 'total' => $view->total_rows,
+ 'total' => $context['sandbox']['max'],
),
);
// Some operations require full selected rows.
@@ -1042,7 +1080,7 @@ function views_bulk_operations_queue_item_process($queue_item_data, &$log = NULL
$arguments = array(
'%operation' => $operation->label(),
'@type' => $entity_type,
- '%title' => _views_bulk_operations_entity_label($entity_type, $entity),
+ '%title' => entity_label($entity_type, $entity),
);
if ($log) {
@@ -1128,7 +1166,7 @@ function views_bulk_operations_direct_process($operation, $rows, $options) {
$context['results']['log'][] = t('Skipped %operation on @type %title due to insufficient permissions.', array(
'%operation' => $operation->label(),
'@type' => $entity_type,
- '%title' => _views_bulk_operations_entity_label($entity_type, $entity),
+ '%title' => entity_label($entity_type, $entity),
));
unset($entities[$id]);
}
@@ -1236,29 +1274,6 @@ function _views_bulk_operations_entity_load($entity_type, $ids, $revision = FALS
return $entities;
}
-/**
- * Label function for entities.
- * Core entities don't declare the "label" key, so entity_label() fails,
- * and a fallback is needed. This function provides that fallback.
- */
-function _views_bulk_operations_entity_label($entity_type, $entity) {
- $label = entity_label($entity_type, $entity);
- if (!$label) {
- $entity_info = entity_get_info($entity_type);
- $id_key = $entity_info['entity keys']['id'];
- // Many entity types (e.g. "user") have a name which fits the label perfectly.
- if (isset($entity->name)) {
- $label = $entity->name;
- }
- elseif (isset($entity->{$id_key})) {
- // Fallback to the id key.
- $label = $entity->{$id_key};
- }
- }
-
- return $label;
-}
-
/**
* Helper function to report an error.
*/
diff --git a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_base.inc b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_base.inc
index bb27cdd7..5f7e08be 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_base.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_base.inc
@@ -10,6 +10,21 @@
function wcm_user_directory_field_default_field_bases() {
$field_bases = array();
+ // Exported field_base: 'field_directory_display_order'
+ $field_bases['field_directory_display_order'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_directory_display_order',
+ 'indexes' => array(),
+ 'locked' => 0,
+ 'module' => 'number',
+ 'settings' => array(),
+ 'translatable' => 0,
+ 'type' => 'number_integer',
+ );
+
// Exported field_base: 'field_display_in_directory'
$field_bases['field_display_in_directory'] = array(
'active' => 1,
diff --git a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_instance.inc b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_instance.inc
index 4d38ee9d..87421d16 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_instance.inc
@@ -10,6 +10,59 @@
function wcm_user_directory_field_default_field_instances() {
$field_instances = array();
+ // Exported field_instance: 'user-user-field_directory_display_order'
+ $field_instances['user-user-field_directory_display_order'] = array(
+ 'bundle' => 'user',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'above',
+ 'module' => 'number',
+ 'settings' => array(
+ 'decimal_separator' => '.',
+ 'prefix_suffix' => TRUE,
+ 'scale' => 0,
+ 'thousand_separator' => ' ',
+ ),
+ 'type' => 'number_integer',
+ 'weight' => 10,
+ ),
+ 'full' => array(
+ 'label' => 'above',
+ 'module' => 'number',
+ 'settings' => array(
+ 'decimal_separator' => '.',
+ 'prefix_suffix' => TRUE,
+ 'scale' => 0,
+ 'thousand_separator' => ' ',
+ ),
+ 'type' => 'number_integer',
+ 'weight' => 10,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_directory_display_order',
+ 'label' => 'Directory Display Order',
+ 'required' => 0,
+ 'settings' => array(
+ 'max' => '',
+ 'min' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'user_register_form' => 0,
+ ),
+ 'widget' => array(
+ 'active' => 0,
+ 'module' => 'number',
+ 'settings' => array(),
+ 'type' => 'number',
+ 'weight' => 9,
+ ),
+ );
+
// Exported field_instance: 'user-user-field_display_in_directory'
$field_instances['user-user-field_display_in_directory'] = array(
'bundle' => 'user',
@@ -23,9 +76,10 @@ function wcm_user_directory_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'above',
+ 'module' => 'list',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 7,
+ 'type' => 'list_default',
+ 'weight' => 9,
),
'directory' => array(
'label' => 'above',
@@ -41,9 +95,10 @@ function wcm_user_directory_field_default_field_instances() {
),
'full' => array(
'label' => 'above',
+ 'module' => 'list',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 12,
+ 'type' => 'list_default',
+ 'weight' => 9,
),
'leadership_listing' => array(
'label' => 'above',
@@ -80,6 +135,7 @@ function wcm_user_directory_field_default_field_instances() {
// Translatables
// Included for use with string extractors like potx.
t('Check this box if this person should be included in the departmental "people" directory. ');
+ t('Directory Display Order');
t('Display in Directory');
return $field_instances;
diff --git a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.info b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.info
index 97d48557..476e2e74 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.info
+++ b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.info
@@ -5,14 +5,16 @@ package = WCM Features
version = 7.x-1.0
project = wcm_user_directory
dependencies[] = features
+dependencies[] = number
dependencies[] = options
dependencies[] = views
features[ctools][] = ds:ds:1
features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
+features[field_base][] = field_directory_display_order
features[field_base][] = field_display_in_directory
+features[field_instance][] = user-user-field_directory_display_order
features[field_instance][] = user-user-field_display_in_directory
-features[views_view][] = user_directory
features_exclude[dependencies][ctools] = ctools
features_exclude[dependencies][ds] = ds
features_exclude[dependencies][list] = list
diff --git a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.views_default.inc b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.views_default.inc
deleted file mode 100644
index 88c678b7..00000000
--- a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.views_default.inc
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * @file
- * wcm_user_directory.views_default.inc
- */
-
-/**
- * Implements hook_views_default_views().
- */
-function wcm_user_directory_views_default_views() {
- $export = array();
-
- $view = new view();
- $view->name = 'user_directory';
- $view->description = '';
- $view->tag = 'OCIO User Directory';
- $view->base_table = 'users';
- $view->human_name = 'User Directory';
- $view->core = 7;
- $view->api_version = '3.0';
- $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-
- /* Display: Master */
- $handler = $view->new_display('default', 'Master', 'default');
- $handler->display->display_options['title'] = 'Directory';
- $handler->display->display_options['use_more_always'] = FALSE;
- $handler->display->display_options['access']['type'] = 'none';
- $handler->display->display_options['cache']['type'] = 'none';
- $handler->display->display_options['query']['type'] = 'views_query';
- $handler->display->display_options['exposed_form']['type'] = 'basic';
- $handler->display->display_options['pager']['type'] = 'none';
- $handler->display->display_options['style_plugin'] = 'table';
- $handler->display->display_options['style_options']['columns'] = array(
- 'name' => 'name',
- );
- $handler->display->display_options['style_options']['default'] = '-1';
- $handler->display->display_options['style_options']['info'] = array(
- 'name' => array(
- 'sortable' => 0,
- 'default_sort_order' => 'asc',
- 'align' => '',
- 'separator' => '',
- 'empty_column' => 0,
- ),
- );
- /* Field: User: Last Name */
- $handler->display->display_options['fields']['field_last_name']['id'] = 'field_last_name';
- $handler->display->display_options['fields']['field_last_name']['table'] = 'field_data_field_last_name';
- $handler->display->display_options['fields']['field_last_name']['field'] = 'field_last_name';
- /* Field: User: First Name */
- $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
- $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
- $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
- /* Field: User: Title */
- $handler->display->display_options['fields']['field_job_title']['id'] = 'field_job_title';
- $handler->display->display_options['fields']['field_job_title']['table'] = 'field_data_field_job_title';
- $handler->display->display_options['fields']['field_job_title']['field'] = 'field_job_title';
- /* Field: User: E-mail */
- $handler->display->display_options['fields']['mail']['id'] = 'mail';
- $handler->display->display_options['fields']['mail']['table'] = 'users';
- $handler->display->display_options['fields']['mail']['field'] = 'mail';
- /* Field: User: Phone */
- $handler->display->display_options['fields']['field_phone']['id'] = 'field_phone';
- $handler->display->display_options['fields']['field_phone']['table'] = 'field_data_field_phone';
- $handler->display->display_options['fields']['field_phone']['field'] = 'field_phone';
- /* Sort criterion: User: Last Name (field_last_name) */
- $handler->display->display_options['sorts']['field_last_name_value']['id'] = 'field_last_name_value';
- $handler->display->display_options['sorts']['field_last_name_value']['table'] = 'field_data_field_last_name';
- $handler->display->display_options['sorts']['field_last_name_value']['field'] = 'field_last_name_value';
- /* Sort criterion: User: First Name (field_first_name) */
- $handler->display->display_options['sorts']['field_first_name_value']['id'] = 'field_first_name_value';
- $handler->display->display_options['sorts']['field_first_name_value']['table'] = 'field_data_field_first_name';
- $handler->display->display_options['sorts']['field_first_name_value']['field'] = 'field_first_name_value';
- /* Filter criterion: User: Active */
- $handler->display->display_options['filters']['status']['id'] = 'status';
- $handler->display->display_options['filters']['status']['table'] = 'users';
- $handler->display->display_options['filters']['status']['field'] = 'status';
- $handler->display->display_options['filters']['status']['value'] = '1';
- $handler->display->display_options['filters']['status']['group'] = 1;
- $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
- /* Filter criterion: User: Display in Directory (field_display_in_directory) */
- $handler->display->display_options['filters']['field_display_in_directory_value']['id'] = 'field_display_in_directory_value';
- $handler->display->display_options['filters']['field_display_in_directory_value']['table'] = 'field_data_field_display_in_directory';
- $handler->display->display_options['filters']['field_display_in_directory_value']['field'] = 'field_display_in_directory_value';
- $handler->display->display_options['filters']['field_display_in_directory_value']['value'] = array(
- 1 => '1',
- );
-
- /* Display: Page */
- $handler = $view->new_display('page', 'Page', 'page');
- $handler->display->display_options['path'] = 'directory';
- $handler->display->display_options['menu']['title'] = 'People';
- $handler->display->display_options['menu']['weight'] = '20';
- $handler->display->display_options['menu']['name'] = 'main-menu';
- $handler->display->display_options['menu']['context'] = 0;
- $handler->display->display_options['menu']['context_only_inline'] = 0;
- $export['user_directory'] = $view;
-
- return $export;
-}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.context.inc b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.context.inc
new file mode 100644
index 00000000..b60f673e
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.context.inc
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @file
+ * wcm_user_leadership.context.inc
+ */
+
+/**
+ * Implements hook_context_default_contexts().
+ */
+function wcm_user_leadership_context_default_contexts() {
+ $export = array();
+
+ $context = new stdClass();
+ $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
+ $context->api_version = 3;
+ $context->name = 'user-leadership-page';
+ $context->description = '';
+ $context->tag = 'WCM User Leadership';
+ $context->conditions = array(
+ 'path' => array(
+ 'values' => array(
+ 'leadership' => 'leadership',
+ ),
+ ),
+ );
+ $context->reactions = array(
+ 'block' => array(
+ 'blocks' => array(
+ 'views-leadership_listing-block_1' => array(
+ 'module' => 'views',
+ 'delta' => 'leadership_listing-block_1',
+ 'region' => 'content',
+ 'weight' => '-10',
+ ),
+ ),
+ ),
+ );
+ $context->condition_mode = 0;
+
+ // Translatables
+ // Included for use with string extractors like potx.
+ t('WCM User Leadership');
+ $export['user-leadership-page'] = $context;
+
+ return $export;
+}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_base.inc b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_base.inc
index f04fcd45..879c057e 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_base.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_base.inc
@@ -35,5 +35,20 @@ function wcm_user_leadership_field_default_field_bases() {
'type' => 'list_boolean',
);
+ // Exported field_base: 'field_leadership_display_order'
+ $field_bases['field_leadership_display_order'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_leadership_display_order',
+ 'indexes' => array(),
+ 'locked' => 0,
+ 'module' => 'number',
+ 'settings' => array(),
+ 'translatable' => 0,
+ 'type' => 'number_integer',
+ );
+
return $field_bases;
}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_instance.inc b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_instance.inc
index 23706c72..5ebbf5fa 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_instance.inc
@@ -23,9 +23,10 @@ function wcm_user_leadership_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
+ 'module' => 'list',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 8,
+ 'type' => 'list_default',
+ 'weight' => 11,
),
'featured' => array(
'label' => 'above',
@@ -33,6 +34,13 @@ function wcm_user_leadership_field_default_field_instances() {
'type' => 'hidden',
'weight' => 0,
),
+ 'full' => array(
+ 'label' => 'hidden',
+ 'module' => 'list',
+ 'settings' => array(),
+ 'type' => 'list_default',
+ 'weight' => 7,
+ ),
'leadership_listing' => array(
'label' => 'hidden',
'settings' => array(),
@@ -61,7 +69,70 @@ function wcm_user_leadership_field_default_field_instances() {
'display_label' => 1,
),
'type' => 'options_onoff',
- 'weight' => 9,
+ 'weight' => 10,
+ ),
+ );
+
+ // Exported field_instance: 'user-user-field_leadership_display_order'
+ $field_instances['user-user-field_leadership_display_order'] = array(
+ 'bundle' => 'user',
+ 'default_value' => array(
+ 0 => array(
+ 'value' => 99,
+ ),
+ ),
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'above',
+ 'module' => 'number',
+ 'settings' => array(
+ 'decimal_separator' => '.',
+ 'prefix_suffix' => TRUE,
+ 'scale' => 0,
+ 'thousand_separator' => ' ',
+ ),
+ 'type' => 'number_integer',
+ 'weight' => 12,
+ ),
+ 'featured' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'full' => array(
+ 'label' => 'above',
+ 'module' => 'number',
+ 'settings' => array(
+ 'decimal_separator' => '.',
+ 'prefix_suffix' => TRUE,
+ 'scale' => 0,
+ 'thousand_separator' => ' ',
+ ),
+ 'type' => 'number_integer',
+ 'weight' => 8,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_leadership_display_order',
+ 'label' => 'Leadership Display Order',
+ 'required' => 0,
+ 'settings' => array(
+ 'max' => '',
+ 'min' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'user_register_form' => 0,
+ ),
+ 'widget' => array(
+ 'active' => 0,
+ 'module' => 'number',
+ 'settings' => array(),
+ 'type' => 'number',
+ 'weight' => 11,
),
);
@@ -69,6 +140,7 @@ function wcm_user_leadership_field_default_field_instances() {
// Included for use with string extractors like potx.
t('Check this box if this person should be included in the departmental Leadership Listing. ');
t('Display in Leadership Listing');
+ t('Leadership Display Order');
return $field_instances;
}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.inc b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.inc
index 9770d4b6..98e60a95 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.inc
@@ -8,6 +8,9 @@
* Implements hook_ctools_plugin_api().
*/
function wcm_user_leadership_ctools_plugin_api($module = NULL, $api = NULL) {
+ if ($module == "context" && $api == "context") {
+ return array("version" => "3");
+ }
if ($module == "ds" && $api == "ds") {
return array("version" => "1");
}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.info b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.info
index 0f29c417..d83dffca 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.info
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.info
@@ -4,11 +4,15 @@ core = 7.x
package = WCM Features
version = 7.x-1.0
project = wcm_user_leadership
+dependencies[] = context
dependencies[] = ds
dependencies[] = features
dependencies[] = list
+dependencies[] = number
dependencies[] = options
dependencies[] = views
+features[context][] = user-leadership-page
+features[ctools][] = context:context:3
features[ctools][] = ds:ds:1
features[ctools][] = views:views_default:3.0
features[ds_field_settings][] = user|user|leadership_listing
@@ -16,6 +20,8 @@ features[ds_layout_settings][] = user|user|leadership_listing
features[ds_view_modes][] = leadership_listing
features[features_api][] = api:2
features[field_base][] = field_display_in_leadership_list
+features[field_base][] = field_leadership_display_order
features[field_instance][] = user-user-field_display_in_leadership_list
+features[field_instance][] = user-user-field_leadership_display_order
features[views_view][] = leadership_listing
features_exclude[dependencies][ctools] = ctools
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.views_default.inc b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.views_default.inc
index d6993a23..494f5393 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.views_default.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.views_default.inc
@@ -22,17 +22,14 @@ function wcm_user_leadership_views_default_views() {
/* Display: Master */
$handler = $view->new_display('default', 'Master', 'default');
- $handler->display->display_options['title'] = 'Leadership';
$handler->display->display_options['use_more_always'] = FALSE;
- $handler->display->display_options['access']['type'] = 'perm';
- $handler->display->display_options['access']['perm'] = 'access user profiles';
+ $handler->display->display_options['access']['type'] = 'none';
$handler->display->display_options['cache']['type'] = 'none';
$handler->display->display_options['query']['type'] = 'views_query';
$handler->display->display_options['exposed_form']['type'] = 'basic';
$handler->display->display_options['pager']['type'] = 'none';
$handler->display->display_options['style_plugin'] = 'default';
- $handler->display->display_options['row_plugin'] = 'user';
- $handler->display->display_options['row_options']['view_mode'] = 'leadership_listing';
+ $handler->display->display_options['row_plugin'] = 'fields';
/* Field: User: User Photo */
$handler->display->display_options['fields']['field_user_photo']['id'] = 'field_user_photo';
$handler->display->display_options['fields']['field_user_photo']['table'] = 'field_data_field_user_photo';
@@ -42,7 +39,7 @@ function wcm_user_leadership_views_default_views() {
$handler->display->display_options['fields']['field_user_photo']['click_sort_column'] = 'fid';
$handler->display->display_options['fields']['field_user_photo']['settings'] = array(
'image_style' => 'user_picture',
- 'image_link' => '',
+ 'image_link' => 'content',
);
/* Field: Realname: Real name */
$handler->display->display_options['fields']['realname']['id'] = 'realname';
@@ -51,13 +48,11 @@ function wcm_user_leadership_views_default_views() {
$handler->display->display_options['fields']['realname']['label'] = '';
$handler->display->display_options['fields']['realname']['element_type'] = 'h2';
$handler->display->display_options['fields']['realname']['element_label_colon'] = FALSE;
- $handler->display->display_options['fields']['realname']['link_to_user'] = FALSE;
/* Field: User: Title */
$handler->display->display_options['fields']['field_job_title']['id'] = 'field_job_title';
$handler->display->display_options['fields']['field_job_title']['table'] = 'field_data_field_job_title';
$handler->display->display_options['fields']['field_job_title']['field'] = 'field_job_title';
$handler->display->display_options['fields']['field_job_title']['label'] = '';
- $handler->display->display_options['fields']['field_job_title']['element_type'] = 'h3';
$handler->display->display_options['fields']['field_job_title']['element_label_colon'] = FALSE;
/* Field: User: E-mail */
$handler->display->display_options['fields']['mail']['id'] = 'mail';
@@ -70,10 +65,17 @@ function wcm_user_leadership_views_default_views() {
$handler->display->display_options['fields']['field_bio']['table'] = 'field_data_field_bio';
$handler->display->display_options['fields']['field_bio']['field'] = 'field_bio';
$handler->display->display_options['fields']['field_bio']['label'] = '';
+ $handler->display->display_options['fields']['field_bio']['exclude'] = TRUE;
$handler->display->display_options['fields']['field_bio']['alter']['text'] = '[field_bio]';
+ $handler->display->display_options['fields']['field_bio']['alter']['max_length'] = '400';
+ $handler->display->display_options['fields']['field_bio']['alter']['more_link'] = TRUE;
+ $handler->display->display_options['fields']['field_bio']['alter']['more_link_text'] = 'Learn More';
+ $handler->display->display_options['fields']['field_bio']['alter']['trim'] = TRUE;
$handler->display->display_options['fields']['field_bio']['element_label_colon'] = FALSE;
- $handler->display->display_options['fields']['field_bio']['type'] = 'ocio_field_bases_accordion';
-
+ /* Sort criterion: User: Leadership Display Order (field_leadership_display_order) */
+ $handler->display->display_options['sorts']['field_leadership_display_order_value']['id'] = 'field_leadership_display_order_value';
+ $handler->display->display_options['sorts']['field_leadership_display_order_value']['table'] = 'field_data_field_leadership_display_order';
+ $handler->display->display_options['sorts']['field_leadership_display_order_value']['field'] = 'field_leadership_display_order_value';
/* Filter criterion: User: Active */
$handler->display->display_options['filters']['status']['id'] = 'status';
$handler->display->display_options['filters']['status']['table'] = 'users';
@@ -89,8 +91,11 @@ function wcm_user_leadership_views_default_views() {
1 => '1',
);
+ /* Display: Block */
+ $handler = $view->new_display('block', 'Block', 'block_1');
+
/* Display: Page */
- $handler = $view->new_display('page', 'Page', 'page');
+ $handler = $view->new_display('page', 'Page', 'page_1');
$handler->display->display_options['path'] = 'leadership';
$export['leadership_listing'] = $view;
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.ds.inc b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.ds.inc
index c7852dde..e0859641 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.ds.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.ds.inc
@@ -4,6 +4,35 @@
* wcm_user_profile.ds.inc
*/
+/**
+ * Implements hook_ds_field_settings_info().
+ */
+function wcm_user_profile_ds_field_settings_info() {
+ $export = array();
+
+ $ds_fieldsetting = new stdClass();
+ $ds_fieldsetting->api_version = 1;
+ $ds_fieldsetting->id = 'user|user|full';
+ $ds_fieldsetting->entity_type = 'user';
+ $ds_fieldsetting->bundle = 'user';
+ $ds_fieldsetting->view_mode = 'full';
+ $ds_fieldsetting->settings = array(
+ 'email' => array(
+ 'weight' => '3',
+ 'label' => 'hidden',
+ 'format' => 'default',
+ ),
+ 'name' => array(
+ 'weight' => '1',
+ 'label' => 'hidden',
+ 'format' => 'default',
+ ),
+ );
+ $export['user|user|full'] = $ds_fieldsetting;
+
+ return $export;
+}
+
/**
* Implements hook_ds_custom_fields_info().
*/
@@ -58,15 +87,17 @@ function wcm_user_profile_ds_layout_settings_info() {
6 => 'field_street_address',
7 => 'field_user_photo',
8 => 'field_display_in_directory',
- 9 => 'field_display_in_leadership_list',
+ 9 => 'field_directory_display_order',
+ 10 => 'field_display_in_leadership_list',
+ 11 => 'field_leadership_display_order',
),
'footer' => array(
- 10 => 'wysiwyg',
- 11 => 'timezone',
- 12 => 'field_bio',
+ 12 => 'wysiwyg',
+ 13 => 'timezone',
+ 14 => 'field_bio',
),
'hidden' => array(
- 13 => '_add_existing_field',
+ 15 => '_add_existing_field',
),
),
'fields' => array(
@@ -79,7 +110,9 @@ function wcm_user_profile_ds_layout_settings_info() {
'field_street_address' => 'right',
'field_user_photo' => 'right',
'field_display_in_directory' => 'right',
+ 'field_directory_display_order' => 'right',
'field_display_in_leadership_list' => 'right',
+ 'field_leadership_display_order' => 'right',
'wysiwyg' => 'footer',
'timezone' => 'footer',
'field_bio' => 'footer',
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_instance.inc b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_instance.inc
index c11e9bbe..e0c3c951 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_instance.inc
@@ -22,7 +22,7 @@ function wcm_user_profile_field_default_field_instances() {
'module' => 'ocio_field_bases',
'settings' => array(),
'type' => 'ocio_field_bases_accordion',
- 'weight' => 6,
+ 'weight' => 4,
),
'directory' => array(
'label' => 'above',
@@ -37,11 +37,11 @@ function wcm_user_profile_field_default_field_instances() {
'weight' => 0,
),
'full' => array(
- 'label' => 'above',
+ 'label' => 'hidden',
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
- 'weight' => 6,
+ 'weight' => 4,
),
'leadership_listing' => array(
'label' => 'hidden',
@@ -79,7 +79,7 @@ function wcm_user_profile_field_default_field_instances() {
'rows' => 5,
),
'type' => 'text_textarea',
- 'weight' => 12,
+ 'weight' => 14,
),
);
@@ -92,9 +92,10 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 9,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 13,
),
'directory' => array(
'label' => 'hidden',
@@ -112,7 +113,7 @@ function wcm_user_profile_field_default_field_instances() {
'label' => 'hidden',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 10,
+ 'weight' => 12,
),
'leadership_listing' => array(
'label' => 'hidden',
@@ -160,7 +161,7 @@ function wcm_user_profile_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
- 'weight' => 0,
+ 'weight' => 2,
),
'directory' => array(
'label' => 'hidden',
@@ -180,7 +181,7 @@ function wcm_user_profile_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
- 'weight' => 1,
+ 'weight' => 2,
),
'leadership_listing' => array(
'label' => 'hidden',
@@ -231,9 +232,10 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 10,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 14,
),
'directory' => array(
'label' => 'hidden',
@@ -251,7 +253,7 @@ function wcm_user_profile_field_default_field_instances() {
'label' => 'hidden',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 11,
+ 'weight' => 13,
),
'leadership_listing' => array(
'label' => 'hidden',
@@ -296,10 +298,10 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
- 'module' => 'text',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'text_default',
- 'weight' => 1,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 5,
),
'directory' => array(
'label' => 'hidden',
@@ -316,10 +318,10 @@ function wcm_user_profile_field_default_field_instances() {
),
'full' => array(
'label' => 'hidden',
- 'module' => 'text',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'text_default',
- 'weight' => 3,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 6,
),
'leadership_listing' => array(
'label' => 'hidden',
@@ -368,10 +370,10 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
- 'module' => 'text',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'text_default',
- 'weight' => 3,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 6,
),
'directory' => array(
'label' => 'hidden',
@@ -388,10 +390,10 @@ function wcm_user_profile_field_default_field_instances() {
),
'full' => array(
'label' => 'hidden',
- 'module' => 'text',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'text_default',
- 'weight' => 4,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 11,
),
'leadership_listing' => array(
'label' => 'hidden',
@@ -440,10 +442,10 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
- 'module' => 'text',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'text_default',
- 'weight' => 4,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 7,
),
'directory' => array(
'label' => 'hidden',
@@ -460,9 +462,9 @@ function wcm_user_profile_field_default_field_instances() {
),
'full' => array(
'label' => 'hidden',
- 'module' => 'text',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'text_default',
+ 'type' => 'ocio_field_bases_accordion',
'weight' => 5,
),
'leadership_listing' => array(
@@ -517,7 +519,7 @@ function wcm_user_profile_field_default_field_instances() {
'image_style' => 'user_picture',
),
'type' => 'image',
- 'weight' => 2,
+ 'weight' => 0,
),
'directory' => array(
'label' => 'hidden',
@@ -573,7 +575,7 @@ function wcm_user_profile_field_default_field_instances() {
'required' => 0,
'settings' => array(
'alt_field' => 0,
- 'default_image' => 0,
+ 'default_image' => 5,
'file_directory' => 'user-photos',
'file_extensions' => 'png jpg jpeg',
'max_filesize' => '500 kb',
@@ -587,18 +589,27 @@ function wcm_user_profile_field_default_field_instances() {
'module' => 'media',
'settings' => array(
'allowed_schemes' => array(
- 0 => 'public',
- 1 => 'private',
+ 'public' => 'public',
+ 'vimeo' => 0,
+ 'youtube' => 0,
),
'allowed_types' => array(
- 0 => 'image',
+ 'audio' => 0,
+ 'document' => 0,
+ 'image' => 'image',
+ 'video' => 0,
+ ),
+ 'browser_plugins' => array(
+ 'media_default--media_browser_1' => 0,
+ 'media_default--media_browser_my_files' => 0,
+ 'media_internet' => 0,
+ 'upload' => 0,
),
- 'browser_plugins' => array(),
'manualcrop_crop_info' => 1,
'manualcrop_default_crop_area' => 1,
'manualcrop_enable' => 1,
'manualcrop_inline_crop' => 0,
- 'manualcrop_instant_crop' => 0,
+ 'manualcrop_instant_crop' => FALSE,
'manualcrop_instant_preview' => 1,
'manualcrop_keyboard' => 1,
'manualcrop_maximize_default_crop_area' => 1,
@@ -608,8 +619,6 @@ function wcm_user_profile_field_default_field_instances() {
'manualcrop_styles_list' => array(),
'manualcrop_styles_mode' => 'include',
'manualcrop_thumblist' => 0,
- 'preview_image_style' => 'user_picture',
- 'progress_indicator' => 'throbber',
),
'type' => 'media_generic',
'weight' => 7,
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info
index 41b5d958..8102fc90 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info
@@ -14,6 +14,7 @@ dependencies[] = strongarm
dependencies[] = text
features[ctools][] = ds:ds:1
features[ctools][] = strongarm:strongarm:1
+features[ds_field_settings][] = user|user|full
features[ds_fields][] = email
features[ds_layout_settings][] = user|user|form
features[features_api][] = api:2
diff --git a/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-2.layout.css b/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-2.layout.css
index 862a93df..b4660466 100644
--- a/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-2.layout.css
+++ b/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-2.layout.css
@@ -1,10 +1,11 @@
/*******************************************************************************
- * ocio-x.layout.scss
+ * ocio-default.layout.scss
*
- * Styles for the OCIO 2 layout.
+ * Styles for the OCIO Default layout.
******************************************************************************/
+/*** THIS Theme uses its own grid variables ***/
.l-constrained, .l-region--highlighted, .l-region--footer {
- width: 95%;
+ padding: 0 4%;
margin: 0 auto;
*zoom: 1;
}
@@ -13,6 +14,22 @@
display: table;
clear: both;
}
+@media (min-width: 47.5em) {
+ .l-constrained, .l-region--highlighted, .l-region--footer {
+ padding: 0 10%;
+ }
+}
+
+@media (min-width: 91.25em) {
+ .max-width {
+ max-width: 72.875em;
+ margin: 0 auto;
+ padding: 0;
+ }
+}
+img, media {
+ max-width: 100%;
+}
/* Header */
.l-region--header {
@@ -37,8 +54,8 @@
}
/* Sidebars */
-.l-region--sidebar-first,
-.l-region--sidebar-second {
+.l-region--sidebar-1,
+.l-region--sidebar-2 {
padding: 20px 1.5em;
}
@@ -47,30 +64,26 @@
padding: 20px 0;
}
-@media (min-width: 44em) {
- .l-constrained, .l-region--highlighted, .l-region--footer {
- width: 90%;
- }
-
+@media (min-width: 47.5em) {
/* Header */
.l-branding {
- width: 23.40426%;
+ width: 23.72881%;
float: left;
margin-right: -100%;
- margin-left: 0%;
+ margin-left: 0;
clear: none;
}
.l-region--navigation {
- width: 48.93617%;
+ width: 49.15254%;
float: left;
margin-right: -100%;
- margin-left: 25.53191%;
+ margin-left: 25.42373%;
clear: none;
}
.l-region--header {
- width: 23.40426%;
+ width: 23.72881%;
float: right;
margin-left: 0;
margin-right: 0;
@@ -80,39 +93,56 @@
/* Sidebars */
.has-two-sidebars .l-content,
.has-one-sidebar .l-content {
- width: 65.95745%;
+ width: 66.10169%;
float: left;
margin-right: -100%;
- margin-left: 0%;
+ margin-left: 0;
clear: none;
}
- .has-two-sidebars .l-region--sidebar-first,
- .has-two-sidebars .l-region--sidebar-second,
- .has-one-sidebar .l-region--sidebar-first,
- .has-one-sidebar .l-region--sidebar-second {
- width: 31.91489%;
+ .has-two-sidebars .l-region--sidebar-1,
+ .has-two-sidebars .l-region--sidebar-2,
+ .has-one-sidebar .l-region--sidebar-1,
+ .has-one-sidebar .l-region--sidebar-2 {
+ width: 32.20339%;
float: right;
margin-left: 0;
margin-right: 0;
clear: none;
clear: right;
}
-}
-@media (min-width: 70em) {
- .l-constrained, .l-region--highlighted, .l-region--footer {
- width: 80%;
+
+ /* Footer */
+ .l-region--footer-1 {
+ width: 57.62712%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+ }
+
+ .l-region--footer-2 {
+ width: 40.67797%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
}
+ .l-region--footer-3 {
+ clear: both;
+ }
+}
+@media (min-width: 60em) {
/* Sidebars */
.has-one-sidebar .l-content {
- width: 65.95745%;
+ width: 66.10169%;
float: left;
margin-right: -100%;
- margin-left: 0%;
+ margin-left: 0;
clear: none;
}
- .has-one-sidebar .l-region--sidebar-first {
- width: 31.91489%;
+ .has-one-sidebar .l-region--sidebar-1 {
+ width: 32.20339%;
float: right;
margin-left: 0;
margin-right: 0;
@@ -121,23 +151,23 @@
}
.has-two-sidebars .l-content {
- width: 48.93617%;
+ width: 49.15254%;
float: left;
margin-right: -100%;
- margin-left: 0%;
+ margin-left: 0;
clear: none;
}
- .has-two-sidebars .l-region--sidebar-first,
- .has-two-sidebars .l-region--sidebar-second {
- width: 23.40426%;
+ .has-two-sidebars .l-region--sidebar-1,
+ .has-two-sidebars .l-region--sidebar-2 {
+ width: 23.72881%;
float: left;
margin-right: -100%;
- margin-left: 51.06383%;
+ margin-left: 50.84746%;
clear: none;
clear: none;
}
- .has-two-sidebars .l-region--sidebar-second {
- width: 23.40426%;
+ .has-two-sidebars .l-region--sidebar-2 {
+ width: 23.72881%;
float: right;
margin-left: 0;
margin-right: 0;
diff --git a/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-default.layout.css b/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-default.layout.css
new file mode 100644
index 00000000..b4660466
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-default.layout.css
@@ -0,0 +1,176 @@
+/*******************************************************************************
+ * ocio-default.layout.scss
+ *
+ * Styles for the OCIO Default layout.
+ ******************************************************************************/
+/*** THIS Theme uses its own grid variables ***/
+.l-constrained, .l-region--highlighted, .l-region--footer {
+ padding: 0 4%;
+ margin: 0 auto;
+ *zoom: 1;
+}
+.l-constrained:after, .l-region--highlighted:after, .l-region--footer:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+@media (min-width: 47.5em) {
+ .l-constrained, .l-region--highlighted, .l-region--footer {
+ padding: 0 10%;
+ }
+}
+
+@media (min-width: 91.25em) {
+ .max-width {
+ max-width: 72.875em;
+ margin: 0 auto;
+ padding: 0;
+ }
+}
+img, media {
+ max-width: 100%;
+}
+
+/* Header */
+.l-region--header {
+ padding: 20px 0;
+}
+.l-region--header .block {
+ float: right;
+}
+
+/* Content Area */
+.l-highlighted-wrapper {
+ padding: 20px 0;
+}
+
+.l-region--help {
+ margin-bottom: 20px;
+}
+
+.l-main {
+ margin-top: 40px;
+ margin-bottom: 40px;
+}
+
+/* Sidebars */
+.l-region--sidebar-1,
+.l-region--sidebar-2 {
+ padding: 20px 1.5em;
+}
+
+/* Footer */
+.l-footer-wrapper {
+ padding: 20px 0;
+}
+
+@media (min-width: 47.5em) {
+ /* Header */
+ .l-branding {
+ width: 23.72881%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+ }
+
+ .l-region--navigation {
+ width: 49.15254%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 25.42373%;
+ clear: none;
+ }
+
+ .l-region--header {
+ width: 23.72881%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ }
+
+ /* Sidebars */
+ .has-two-sidebars .l-content,
+ .has-one-sidebar .l-content {
+ width: 66.10169%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+ }
+ .has-two-sidebars .l-region--sidebar-1,
+ .has-two-sidebars .l-region--sidebar-2,
+ .has-one-sidebar .l-region--sidebar-1,
+ .has-one-sidebar .l-region--sidebar-2 {
+ width: 32.20339%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ clear: right;
+ }
+
+ /* Footer */
+ .l-region--footer-1 {
+ width: 57.62712%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+ }
+
+ .l-region--footer-2 {
+ width: 40.67797%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ }
+
+ .l-region--footer-3 {
+ clear: both;
+ }
+}
+@media (min-width: 60em) {
+ /* Sidebars */
+ .has-one-sidebar .l-content {
+ width: 66.10169%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+ }
+ .has-one-sidebar .l-region--sidebar-1 {
+ width: 32.20339%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ clear: none;
+ }
+
+ .has-two-sidebars .l-content {
+ width: 49.15254%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+ }
+ .has-two-sidebars .l-region--sidebar-1,
+ .has-two-sidebars .l-region--sidebar-2 {
+ width: 23.72881%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 50.84746%;
+ clear: none;
+ clear: none;
+ }
+ .has-two-sidebars .l-region--sidebar-2 {
+ width: 23.72881%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ }
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-default.layout.no-query.css b/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-default.layout.no-query.css
new file mode 100644
index 00000000..6d60ac25
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-2/ocio-default.layout.no-query.css
@@ -0,0 +1,162 @@
+/*******************************************************************************
+ * ocio-default.layout.scss
+ *
+ * Styles for the OCIO Default layout.
+ ******************************************************************************/
+/*** THIS Theme uses its own grid variables ***/
+.l-constrained, .l-region--highlighted, .l-region--footer {
+ padding: 0 4%;
+ margin: 0 auto;
+ *zoom: 1;
+ padding: 0 10%;
+}
+.l-constrained:after, .l-region--highlighted:after, .l-region--footer:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+
+img, media {
+ max-width: 100%;
+}
+
+/* Header */
+.l-region--header {
+ padding: 20px 0;
+}
+.l-region--header .block {
+ float: right;
+}
+
+/* Content Area */
+.l-highlighted-wrapper {
+ padding: 20px 0;
+}
+
+.l-region--help {
+ margin-bottom: 20px;
+}
+
+.l-main {
+ margin-top: 40px;
+ margin-bottom: 40px;
+}
+
+/* Sidebars */
+.l-region--sidebar-1,
+.l-region--sidebar-2 {
+ padding: 20px 1.5em;
+}
+
+/* Footer */
+.l-footer-wrapper {
+ padding: 20px 0;
+}
+
+/* Header */
+.l-branding {
+ width: 23.72881%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+}
+
+.l-region--navigation {
+ width: 49.15254%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 25.42373%;
+ clear: none;
+}
+
+.l-region--header {
+ width: 23.72881%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+}
+
+/* Sidebars */
+.has-two-sidebars .l-content,
+.has-one-sidebar .l-content {
+ width: 66.10169%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+}
+.has-two-sidebars .l-region--sidebar-1,
+.has-two-sidebars .l-region--sidebar-2,
+.has-one-sidebar .l-region--sidebar-1,
+.has-one-sidebar .l-region--sidebar-2 {
+ width: 32.20339%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ clear: right;
+}
+
+/* Footer */
+.l-region--footer-1 {
+ width: 57.62712%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+}
+
+.l-region--footer-2 {
+ width: 40.67797%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+}
+
+.l-region--footer-3 {
+ clear: both;
+}
+
+/* Sidebars */
+.has-one-sidebar .l-content {
+ width: 66.10169%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+}
+.has-one-sidebar .l-region--sidebar-1 {
+ width: 32.20339%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ clear: none;
+}
+
+.has-two-sidebars .l-content {
+ width: 49.15254%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+}
+.has-two-sidebars .l-region--sidebar-1,
+.has-two-sidebars .l-region--sidebar-2 {
+ width: 23.72881%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 50.84746%;
+ clear: none;
+ clear: none;
+}
+.has-two-sidebars .l-region--sidebar-2 {
+ width: 23.72881%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-default/ocio-default.layout.css b/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-default/ocio-default.layout.css
new file mode 100644
index 00000000..b4660466
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-default/ocio-default.layout.css
@@ -0,0 +1,176 @@
+/*******************************************************************************
+ * ocio-default.layout.scss
+ *
+ * Styles for the OCIO Default layout.
+ ******************************************************************************/
+/*** THIS Theme uses its own grid variables ***/
+.l-constrained, .l-region--highlighted, .l-region--footer {
+ padding: 0 4%;
+ margin: 0 auto;
+ *zoom: 1;
+}
+.l-constrained:after, .l-region--highlighted:after, .l-region--footer:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+@media (min-width: 47.5em) {
+ .l-constrained, .l-region--highlighted, .l-region--footer {
+ padding: 0 10%;
+ }
+}
+
+@media (min-width: 91.25em) {
+ .max-width {
+ max-width: 72.875em;
+ margin: 0 auto;
+ padding: 0;
+ }
+}
+img, media {
+ max-width: 100%;
+}
+
+/* Header */
+.l-region--header {
+ padding: 20px 0;
+}
+.l-region--header .block {
+ float: right;
+}
+
+/* Content Area */
+.l-highlighted-wrapper {
+ padding: 20px 0;
+}
+
+.l-region--help {
+ margin-bottom: 20px;
+}
+
+.l-main {
+ margin-top: 40px;
+ margin-bottom: 40px;
+}
+
+/* Sidebars */
+.l-region--sidebar-1,
+.l-region--sidebar-2 {
+ padding: 20px 1.5em;
+}
+
+/* Footer */
+.l-footer-wrapper {
+ padding: 20px 0;
+}
+
+@media (min-width: 47.5em) {
+ /* Header */
+ .l-branding {
+ width: 23.72881%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+ }
+
+ .l-region--navigation {
+ width: 49.15254%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 25.42373%;
+ clear: none;
+ }
+
+ .l-region--header {
+ width: 23.72881%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ }
+
+ /* Sidebars */
+ .has-two-sidebars .l-content,
+ .has-one-sidebar .l-content {
+ width: 66.10169%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+ }
+ .has-two-sidebars .l-region--sidebar-1,
+ .has-two-sidebars .l-region--sidebar-2,
+ .has-one-sidebar .l-region--sidebar-1,
+ .has-one-sidebar .l-region--sidebar-2 {
+ width: 32.20339%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ clear: right;
+ }
+
+ /* Footer */
+ .l-region--footer-1 {
+ width: 57.62712%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+ }
+
+ .l-region--footer-2 {
+ width: 40.67797%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ }
+
+ .l-region--footer-3 {
+ clear: both;
+ }
+}
+@media (min-width: 60em) {
+ /* Sidebars */
+ .has-one-sidebar .l-content {
+ width: 66.10169%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+ }
+ .has-one-sidebar .l-region--sidebar-1 {
+ width: 32.20339%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ clear: none;
+ }
+
+ .has-two-sidebars .l-content {
+ width: 49.15254%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+ }
+ .has-two-sidebars .l-region--sidebar-1,
+ .has-two-sidebars .l-region--sidebar-2 {
+ width: 23.72881%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 50.84746%;
+ clear: none;
+ clear: none;
+ }
+ .has-two-sidebars .l-region--sidebar-2 {
+ width: 23.72881%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ }
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-default/ocio-default.layout.no-query.css b/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-default/ocio-default.layout.no-query.css
new file mode 100644
index 00000000..6d60ac25
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/css/layouts/ocio-default/ocio-default.layout.no-query.css
@@ -0,0 +1,162 @@
+/*******************************************************************************
+ * ocio-default.layout.scss
+ *
+ * Styles for the OCIO Default layout.
+ ******************************************************************************/
+/*** THIS Theme uses its own grid variables ***/
+.l-constrained, .l-region--highlighted, .l-region--footer {
+ padding: 0 4%;
+ margin: 0 auto;
+ *zoom: 1;
+ padding: 0 10%;
+}
+.l-constrained:after, .l-region--highlighted:after, .l-region--footer:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+
+img, media {
+ max-width: 100%;
+}
+
+/* Header */
+.l-region--header {
+ padding: 20px 0;
+}
+.l-region--header .block {
+ float: right;
+}
+
+/* Content Area */
+.l-highlighted-wrapper {
+ padding: 20px 0;
+}
+
+.l-region--help {
+ margin-bottom: 20px;
+}
+
+.l-main {
+ margin-top: 40px;
+ margin-bottom: 40px;
+}
+
+/* Sidebars */
+.l-region--sidebar-1,
+.l-region--sidebar-2 {
+ padding: 20px 1.5em;
+}
+
+/* Footer */
+.l-footer-wrapper {
+ padding: 20px 0;
+}
+
+/* Header */
+.l-branding {
+ width: 23.72881%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+}
+
+.l-region--navigation {
+ width: 49.15254%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 25.42373%;
+ clear: none;
+}
+
+.l-region--header {
+ width: 23.72881%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+}
+
+/* Sidebars */
+.has-two-sidebars .l-content,
+.has-one-sidebar .l-content {
+ width: 66.10169%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+}
+.has-two-sidebars .l-region--sidebar-1,
+.has-two-sidebars .l-region--sidebar-2,
+.has-one-sidebar .l-region--sidebar-1,
+.has-one-sidebar .l-region--sidebar-2 {
+ width: 32.20339%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ clear: right;
+}
+
+/* Footer */
+.l-region--footer-1 {
+ width: 57.62712%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+}
+
+.l-region--footer-2 {
+ width: 40.67797%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+}
+
+.l-region--footer-3 {
+ clear: both;
+}
+
+/* Sidebars */
+.has-one-sidebar .l-content {
+ width: 66.10169%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+}
+.has-one-sidebar .l-region--sidebar-1 {
+ width: 32.20339%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+ clear: none;
+}
+
+.has-two-sidebars .l-content {
+ width: 49.15254%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 0;
+ clear: none;
+}
+.has-two-sidebars .l-region--sidebar-1,
+.has-two-sidebars .l-region--sidebar-2 {
+ width: 23.72881%;
+ float: left;
+ margin-right: -100%;
+ margin-left: 50.84746%;
+ clear: none;
+ clear: none;
+}
+.has-two-sidebars .l-region--sidebar-2 {
+ width: 23.72881%;
+ float: right;
+ margin-left: 0;
+ margin-right: 0;
+ clear: none;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_2/css/ocio-2.no-query.css b/profiles/wcm_base/themes/ocio_omega_2/css/ocio-2.no-query.css
index c46ef5a5..fd89e2ad 100644
--- a/profiles/wcm_base/themes/ocio_omega_2/css/ocio-2.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_2/css/ocio-2.no-query.css
@@ -51,15 +51,16 @@ body .ui-accordion .ui-accordion-content {
margin-top: 0;
}
.l-page .l-main .pane-title,
-.l-page .l-main h1.page-title {
+.l-page .l-main h1.page-title,
+.l-page .l-main h1#page-title {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 26px;
+ font-size: 2.6rem;
color: #fff;
font-weight: 600;
background-color: #b00;
@@ -68,18 +69,23 @@ body .ui-accordion .ui-accordion-content {
/* IE8 Fallback */
padding: 1.3rem 1.7rem 0.8rem;
}
+.l-page .l-main h1.page-title,
+.l-page .l-main h1#page-title {
+ font-size: 36px;
+ font-size: 3.6rem;
+}
.l-page .l-main .ocio-omega-twocol-sidebar .pane-title,
.l-page .l-main .ocio-omega-twocol-flipped-sidebar .pane-title,
.l-page .l-main .ocio-omega-equalcol-column1 .pane-title,
.l-page .l-main .ocio-omega-threecol-column1 .pane-title {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 26px;
+ font-size: 2.6rem;
color: #fff;
font-weight: 600;
background-color: #d65828;
@@ -95,15 +101,15 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .l-region--sidebar-2 h2 {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 26px;
+ font-size: 2.6rem;
color: #fff;
font-weight: 600;
- background-color: #92b0d7;
+ background-color: #028da9;
text-transform: uppercase;
padding: 13px 17px 8px;
/* IE8 Fallback */
@@ -114,12 +120,12 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .ocio-omega-equalcol-footer .pane-title {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 26px;
+ font-size: 2.6rem;
color: #fff;
font-weight: 600;
background-color: #442369;
@@ -131,12 +137,12 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .ocio-omega-threecol-column3 .pane-title {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 26px;
+ font-size: 2.6rem;
color: #fff;
font-weight: 600;
background-color: #9aa41d;
@@ -154,10 +160,11 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .search-form,
.l-page .l-main .search-results,
.l-page .l-main .search-form + h2,
-.l-page .l-main .pane-title + div {
+.l-page .l-main .pane-title + div,
+.l-page .l-main .pane-header + div {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
@@ -173,7 +180,9 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .search-form + h2 .view-content,
.l-page .l-main .search-form + h2 .views-table,
.l-page .l-main .pane-title + div .view-content,
-.l-page .l-main .pane-title + div .views-table {
+.l-page .l-main .pane-title + div .views-table,
+.l-page .l-main .pane-header + div .view-content,
+.l-page .l-main .pane-header + div .views-table {
margin: 0;
}
.l-page .l-main .view .views-row-first,
@@ -187,7 +196,9 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .search-form + h2 .views-row-first,
.l-page .l-main .search-form + h2 .views-row-first h2,
.l-page .l-main .pane-title + div .views-row-first,
-.l-page .l-main .pane-title + div .views-row-first h2 {
+.l-page .l-main .pane-title + div .views-row-first h2,
+.l-page .l-main .pane-header + div .views-row-first,
+.l-page .l-main .pane-header + div .views-row-first h2 {
margin-top: 0;
}
.l-page .l-main .view .views-row-last,
@@ -195,13 +206,50 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .search-form .views-row-last,
.l-page .l-main .search-results .views-row-last,
.l-page .l-main .search-form + h2 .views-row-last,
-.l-page .l-main .pane-title + div .views-row-last {
+.l-page .l-main .pane-title + div .views-row-last,
+.l-page .l-main .pane-header + div .views-row-last {
margin-bottom: 0;
}
.l-page .l-main .view-featured-slideshow {
padding: 0;
}
+.block--mm-widgets .item,
+.pane-mm-widgets-live-pane .item {
+ margin: 1.25em 0 0 0;
+}
+.block--mm-widgets .item:first-child,
+.pane-mm-widgets-live-pane .item:first-child {
+ margin-top: 0;
+}
+.block--mm-widgets.mm-single-channel .fa.mm-channel,
+.pane-mm-widgets-live-pane.mm-single-channel .fa.mm-channel {
+ margin-right: 0;
+ padding: 0 0 0 0.6em;
+ float: none;
+ text-align: right;
+ position: relative;
+ top: -1px;
+}
+.block--mm-widgets.mm-single-channel .fa.mm-channel.fa-facebook-page:before,
+.pane-mm-widgets-live-pane.mm-single-channel .fa.mm-channel.fa-facebook-page:before {
+ content: '\f230';
+}
+.block--mm-widgets.mm-single-channel .pane-title,
+.pane-mm-widgets-live-pane.mm-single-channel .pane-title {
+ display: table;
+ width: 100%;
+}
+.block--mm-widgets.mm-single-channel .pane-title-wrapper,
+.block--mm-widgets.mm-single-channel .fa.mm-channel,
+.pane-mm-widgets-live-pane.mm-single-channel .pane-title-wrapper,
+.pane-mm-widgets-live-pane.mm-single-channel .fa.mm-channel {
+ background-color: transparent;
+ width: auto;
+ display: table-cell;
+ vertical-align: middle;
+}
+
.image-border, .panopoly-image-featured, .panopoly-image-full, .panopoly-image-half, .panopoly-image-original, .panopoly-image-quarter, .panopoly-image-square, .panopoly-image-thumbnail {
border: 0 none;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_2/css/ocio-2.styles.css b/profiles/wcm_base/themes/ocio_omega_2/css/ocio-2.styles.css
index 197af2ce..c09b8b94 100644
--- a/profiles/wcm_base/themes/ocio_omega_2/css/ocio-2.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_2/css/ocio-2.styles.css
@@ -62,15 +62,16 @@ body .ui-accordion .ui-accordion-content {
margin-top: 0;
}
.l-page .l-main .pane-title,
-.l-page .l-main h1.page-title {
+.l-page .l-main h1.page-title,
+.l-page .l-main h1#page-title {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 26px;
+ font-size: 2.6rem;
color: #fff;
font-weight: 600;
background-color: #b00;
@@ -79,18 +80,23 @@ body .ui-accordion .ui-accordion-content {
/* IE8 Fallback */
padding: 1.3rem 1.7rem 0.8rem;
}
+.l-page .l-main h1.page-title,
+.l-page .l-main h1#page-title {
+ font-size: 36px;
+ font-size: 3.6rem;
+}
.l-page .l-main .ocio-omega-twocol-sidebar .pane-title,
.l-page .l-main .ocio-omega-twocol-flipped-sidebar .pane-title,
.l-page .l-main .ocio-omega-equalcol-column1 .pane-title,
.l-page .l-main .ocio-omega-threecol-column1 .pane-title {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 26px;
+ font-size: 2.6rem;
color: #fff;
font-weight: 600;
background-color: #d65828;
@@ -106,15 +112,15 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .l-region--sidebar-2 h2 {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 26px;
+ font-size: 2.6rem;
color: #fff;
font-weight: 600;
- background-color: #92b0d7;
+ background-color: #028da9;
text-transform: uppercase;
padding: 13px 17px 8px;
/* IE8 Fallback */
@@ -125,12 +131,12 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .ocio-omega-equalcol-footer .pane-title {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 26px;
+ font-size: 2.6rem;
color: #fff;
font-weight: 600;
background-color: #442369;
@@ -142,12 +148,12 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .ocio-omega-threecol-column3 .pane-title {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 26px;
+ font-size: 2.6rem;
color: #fff;
font-weight: 600;
background-color: #9aa41d;
@@ -165,10 +171,11 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .search-form,
.l-page .l-main .search-results,
.l-page .l-main .search-form + h2,
-.l-page .l-main .pane-title + div {
+.l-page .l-main .pane-title + div,
+.l-page .l-main .pane-header + div {
display: block;
margin: 0;
- background-color: #ececec;
+ background-color: #ededed;
padding: 17px 17px 8px;
/* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
@@ -184,7 +191,9 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .search-form + h2 .view-content,
.l-page .l-main .search-form + h2 .views-table,
.l-page .l-main .pane-title + div .view-content,
-.l-page .l-main .pane-title + div .views-table {
+.l-page .l-main .pane-title + div .views-table,
+.l-page .l-main .pane-header + div .view-content,
+.l-page .l-main .pane-header + div .views-table {
margin: 0;
}
.l-page .l-main .view .views-row-first,
@@ -198,7 +207,9 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .search-form + h2 .views-row-first,
.l-page .l-main .search-form + h2 .views-row-first h2,
.l-page .l-main .pane-title + div .views-row-first,
-.l-page .l-main .pane-title + div .views-row-first h2 {
+.l-page .l-main .pane-title + div .views-row-first h2,
+.l-page .l-main .pane-header + div .views-row-first,
+.l-page .l-main .pane-header + div .views-row-first h2 {
margin-top: 0;
}
.l-page .l-main .view .views-row-last,
@@ -206,13 +217,50 @@ body .ui-accordion .ui-accordion-content {
.l-page .l-main .search-form .views-row-last,
.l-page .l-main .search-results .views-row-last,
.l-page .l-main .search-form + h2 .views-row-last,
-.l-page .l-main .pane-title + div .views-row-last {
+.l-page .l-main .pane-title + div .views-row-last,
+.l-page .l-main .pane-header + div .views-row-last {
margin-bottom: 0;
}
.l-page .l-main .view-featured-slideshow {
padding: 0;
}
+.block--mm-widgets .item,
+.pane-mm-widgets-live-pane .item {
+ margin: 1.25em 0 0 0;
+}
+.block--mm-widgets .item:first-child,
+.pane-mm-widgets-live-pane .item:first-child {
+ margin-top: 0;
+}
+.block--mm-widgets.mm-single-channel .fa.mm-channel,
+.pane-mm-widgets-live-pane.mm-single-channel .fa.mm-channel {
+ margin-right: 0;
+ padding: 0 0 0 0.6em;
+ float: none;
+ text-align: right;
+ position: relative;
+ top: -1px;
+}
+.block--mm-widgets.mm-single-channel .fa.mm-channel.fa-facebook-page:before,
+.pane-mm-widgets-live-pane.mm-single-channel .fa.mm-channel.fa-facebook-page:before {
+ content: '\f230';
+}
+.block--mm-widgets.mm-single-channel .pane-title,
+.pane-mm-widgets-live-pane.mm-single-channel .pane-title {
+ display: table;
+ width: 100%;
+}
+.block--mm-widgets.mm-single-channel .pane-title-wrapper,
+.block--mm-widgets.mm-single-channel .fa.mm-channel,
+.pane-mm-widgets-live-pane.mm-single-channel .pane-title-wrapper,
+.pane-mm-widgets-live-pane.mm-single-channel .fa.mm-channel {
+ background-color: transparent;
+ width: auto;
+ display: table-cell;
+ vertical-align: middle;
+}
+
.image-border, .panopoly-image-featured, .panopoly-image-full, .panopoly-image-half, .panopoly-image-original, .panopoly-image-quarter, .panopoly-image-square, .panopoly-image-thumbnail {
border: 0 none;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2-layout.tpl.php b/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2-layout.tpl.php
new file mode 100644
index 00000000..d661d3ab
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2-layout.tpl.php
@@ -0,0 +1,62 @@
+<div<?php print $attributes; ?>>
+ <header class="l-header" role="banner">
+ <?php print render($page['osu_navbar']); ?>
+ <?php print render($page['masthead']); ?>
+ <?php print render($page['main_menu']); ?>
+ </header>
+
+ <div class="l-region--hero-wrapper <?php print $main_classes; ?>">
+ <?php print render($page['hero']); ?>
+ </div>
+
+ <?php if (!empty($page['highlighted'])): ?>
+ <div class="l-highlighted-wrapper">
+ <?php print render($page['highlighted']); ?>
+ </div>
+ <?php endif; ?>
+
+ <div class="l-main <?php print $main_classes; ?>">
+ <a id="main-content"></a>
+
+ <div class="l-constrained max-width">
+ <?php print $breadcrumb; ?>
+ <?php print render($tabs); ?>
+ <?php print render($page['help']); ?>
+ <?php print $messages; ?>
+ <?php print render($page['workbench']); ?>
+ </div>
+
+ <div class="l-constrained max-width">
+ <div class="l-content" role="main">
+ <?php if (!$is_front && !empty($title)): ?>
+ <?php if ($landing_page) :?>
+ <h1 class="title l-constrained max-width" id="page-title"><?php print $title; ?></h1>
+ <?php else: ?>
+ <h1 class="title" id="page-title"><?php print $title; ?></h1>
+ <?php endif; ?>
+ <?php endif; ?>
+
+ <?php if ($action_links): ?>
+ <ul class="action-links"><?php print render($action_links); ?></ul>
+ <?php endif; ?>
+
+ <?php print render($page['content']); ?>
+ <?php print $feed_icons; ?>
+ </div>
+
+ <?php print render($page['sidebar_1']); ?>
+ <?php print render($page['sidebar_2']); ?>
+ </div>
+ </div>
+ <div class="l-region--pre-footer-wrapper <?php print $main_classes; ?>">
+ <?php print render($page['pre_footer']); ?>
+ </div>
+
+ <footer class="l-footer-wrapper" role="contentinfo">
+ <div class="l-constrained max-width">
+ <?php print render($page['footer_1']); ?>
+ <?php print render($page['footer_2']); ?>
+ <?php print render($page['footer_3']); ?>
+ </div>
+ </footer>
+</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2.layout.inc b/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2.layout.inc
new file mode 100644
index 00000000..55905d99
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2.layout.inc
@@ -0,0 +1,24 @@
+name = OCIO Omega 2
+description = Default layout with two optional sidebars.
+preview = preview.png
+template = ocio-2-layout
+
+; Regions
+regions[osu_navbar] = OSU Navbar
+regions[masthead] = Masthead
+regions[main_menu] = Main Menu
+regions[hero] = Hero
+regions[workbench] = Workbench Info
+regions[content] = Content
+regions[sidebar_1] = Sidebar 1
+regions[sidebar_2] = Sidebar 2
+regions[pre_footer] = Pre-Footer
+regions[footer_1] = Footer 1
+regions[footer_2] = Footer 2
+regions[footer_3] = Footer 3
+regions[user] = User
+
+
+; Stylesheets
+stylesheets[all][] = css/layouts/ocio-2/ocio-2.layout.css
+stylesheets[all][] = css/layouts/ocio-2/ocio-2.layout.no-query.css
diff --git a/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/preview.png b/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..363f682ba910b40ad70350a5a575e512303a0754
GIT binary patch
literal 2900
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
literal 0
HcmV?d00001
diff --git a/profiles/wcm_base/themes/ocio_omega_2/libraries/ocio-default/ocio-default-layout.tpl.php b/profiles/wcm_base/themes/ocio_omega_2/libraries/ocio-default/ocio-default-layout.tpl.php
new file mode 100644
index 00000000..c912a6a8
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/libraries/ocio-default/ocio-default-layout.tpl.php
@@ -0,0 +1,63 @@
+<div<?php print $attributes; ?>>
+ <header class="l-header" role="banner">
+ <?php print render($page['osu_navbar']); ?>
+ <?php print render($page['masthead']); ?>
+ <?php print render($page['main_menu']); ?>
+ </header>
+
+ <div class="l-region--hero-wrapper <?php print $main_classes; ?>">
+ <?php print render($page['hero']); ?>
+ </div>
+
+ <?php if (!empty($page['highlighted'])): ?>
+ <div class="l-highlighted-wrapper">
+ <?php print render($page['highlighted']); ?>
+ </div>
+ <?php endif; ?>
+
+ <div class="l-main <?php print $main_classes; ?>">
+ <a id="main-content"></a>
+
+ <div class="l-constrained max-width">
+ <?php print $breadcrumb; ?>
+ <?php print render($tabs); ?>
+ <?php print render($page['help']); ?>
+ <?php print $messages; ?>
+ <?php print render($page['workbench']); ?>
+ </div>
+
+ <div class="l-constrained max-width">
+ <div class="l-content" role="main">
+ <?php if (!$is_front && !empty($title)): ?>
+ <?php if ($landing_page) :?>
+ <h1 class="title l-constrained max-width" id="page-title"><?php print $title; ?></h1>
+ <?php else: ?>
+ <h1 class="title" id="page-title"><?php print $title; ?></h1>
+ <?php endif; ?>
+ <?php endif; ?>
+
+ <?php if ($action_links): ?>
+ <ul class="action-links"><?php print render($action_links); ?></ul>
+ <?php endif; ?>
+
+ <?php print render($page['content']); ?>
+ <?php print $feed_icons; ?>
+ </div>
+
+ <?php print render($page['sidebar_1']); ?>
+ <?php print render($page['sidebar_2']); ?>
+
+ </div>
+
+ <div class="l-region--pre-footer-wrapper <?php print $main_classes; ?>">
+ <?php print render($page['pre_footer']); ?>
+ </div>
+
+ <footer class="l-footer-wrapper" role="contentinfo">
+ <div class="l-constrained max-width">
+ <?php print render($page['footer_1']); ?>
+ <?php print render($page['footer_2']); ?>
+ <?php print render($page['footer_3']); ?>
+ </div>
+ </footer>
+</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_2/libraries/ocio-default/ocio-default.layout.inc b/profiles/wcm_base/themes/ocio_omega_2/libraries/ocio-default/ocio-default.layout.inc
new file mode 100644
index 00000000..8ff75c87
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/libraries/ocio-default/ocio-default.layout.inc
@@ -0,0 +1,24 @@
+name = OCIO Default
+description = Default layout with two optional sidebars.
+preview = preview.png
+template = ocio-default-layout
+
+; Regions
+regions[osu_navbar] = OSU Navbar
+regions[masthead] = Masthead
+regions[main_menu] = Main Menu
+regions[hero] = Hero
+regions[workbench] = Workbench Info
+regions[content] = Content
+regions[sidebar_1] = Sidebar 1
+regions[sidebar_2] = Sidebar 2
+regions[pre_footer] = Pre-Footer
+regions[footer_1] = Footer 1
+regions[footer_2] = Footer 2
+regions[footer_3] = Footer 3
+regions[user] = User
+
+
+; Stylesheets
+stylesheets[all][] = css/layouts/ocio-default/ocio-default.layout.css
+stylesheets[all][] = css/layouts/ocio-default/ocio-default.layout.no-query.css
diff --git a/profiles/wcm_base/themes/ocio_omega_2/libraries/ocio-default/preview.png b/profiles/wcm_base/themes/ocio_omega_2/libraries/ocio-default/preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..363f682ba910b40ad70350a5a575e512303a0754
GIT binary patch
literal 2900
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
literal 0
HcmV?d00001
diff --git a/profiles/wcm_base/themes/ocio_omega_2/ocio_2.info b/profiles/wcm_base/themes/ocio_omega_2/ocio_2.info
index b4393d6b..6d1ea97c 100644
--- a/profiles/wcm_base/themes/ocio_omega_2/ocio_2.info
+++ b/profiles/wcm_base/themes/ocio_omega_2/ocio_2.info
@@ -55,7 +55,7 @@ settings[favicon_path] = ""
settings[favicon_upload] = ""
settings[omega_enable_warning] = 1
settings[omega_toggle_extension_layouts] = 1
-settings[omega_layout] = ocio-default
+settings[omega_layout] = ocio-2
settings[omega_toggle_extension_development] = 1
settings[omega_enable_export_reminder] = 1
settings[omega_rebuild_theme_registry] = 0
diff --git a/profiles/wcm_base/themes/ocio_omega_2/sass/abstractions/_scheme-colors.scss b/profiles/wcm_base/themes/ocio_omega_2/sass/abstractions/_scheme-colors.scss
index ac8db17a..ae0856f1 100644
--- a/profiles/wcm_base/themes/ocio_omega_2/sass/abstractions/_scheme-colors.scss
+++ b/profiles/wcm_base/themes/ocio_omega_2/sass/abstractions/_scheme-colors.scss
@@ -2,12 +2,13 @@
@mixin color-box($color: $lt-gray) {
@include content-box;
- @include font-size(3.4);
+ @include font-size(2.6);
color: $white;
font-weight: 600;
background-color: $color;
text-transform: uppercase;
- padding: 13px 17px 8px; /* IE8 Fallback */
+ padding: 13px 17px 8px;
+ /* IE8 Fallback */
padding: 1.3rem 1.7rem 0.8rem;
}
@@ -15,7 +16,7 @@
display: block;
margin: 0;
background-color: $lt-gray;
- padding: 17px 17px 8px; /* IE8 Fallback */
+ padding: 17px 17px 8px;
+ /* IE8 Fallback */
padding: 1.7rem 1.7rem 1.7rem;
}
-
diff --git a/profiles/wcm_base/themes/ocio_omega_2/sass/components/_main-content.scss b/profiles/wcm_base/themes/ocio_omega_2/sass/components/_main-content.scss
index 9ee547a5..2728fa79 100644
--- a/profiles/wcm_base/themes/ocio_omega_2/sass/components/_main-content.scss
+++ b/profiles/wcm_base/themes/ocio_omega_2/sass/components/_main-content.scss
@@ -22,10 +22,16 @@
}
.pane-title,
- h1.page-title {
+ h1.page-title,
+ h1#page-title {
@include color-box($red);
}
+ h1.page-title,
+ h1#page-title {
+ @include font-size(3.6);
+ }
+
.ocio-omega-twocol-sidebar .pane-title,
.ocio-omega-twocol-flipped-sidebar .pane-title,
.ocio-omega-equalcol-column1 .pane-title,
@@ -47,7 +53,7 @@
@include color-box($purple);
}
- .ocio-omega-threecol-column3 .pane-title {
+ .ocio-omega-threecol-column3 .pane-title {
@include color-box(darken($green, 20%));
}
@@ -61,7 +67,8 @@
.search-form,
.search-results,
.search-form + h2,
- .pane-title + div {
+ .pane-title + div,
+ .pane-header + div {
@include content-box;
.view-content,
diff --git a/profiles/wcm_base/themes/ocio_omega_2/sass/components/_media_magnet.scss b/profiles/wcm_base/themes/ocio_omega_2/sass/components/_media_magnet.scss
new file mode 100644
index 00000000..87aae601
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/sass/components/_media_magnet.scss
@@ -0,0 +1,38 @@
+.block--mm-widgets,
+.pane-mm-widgets-live-pane {
+ .item {
+ margin: 1.25em 0 0 0;
+
+ &:first-child {
+ margin-top: 0;
+ }
+ }
+
+ &.mm-single-channel {
+ .fa.mm-channel {
+ margin-right: 0;
+ padding: 0 0 0 0.6em;
+ float: none;
+ text-align: right;
+ position: relative;
+ top: -1px;
+
+ &.fa-facebook-page:before {
+ content: '\f230';
+ }
+ }
+
+ .pane-title {
+ display: table;
+ width: 100%;
+ }
+
+ .pane-title-wrapper,
+ .fa.mm-channel {
+ background-color: transparent;
+ width: auto;
+ display: table-cell;
+ vertical-align: middle;
+ }
+ }
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_2/sass/components/_panes.scss b/profiles/wcm_base/themes/ocio_omega_2/sass/components/_panes.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/profiles/wcm_base/themes/ocio_omega_2/sass/layouts/ocio-2/ocio-2.layout.no-query.scss b/profiles/wcm_base/themes/ocio_omega_2/sass/layouts/ocio-2/ocio-2.layout.no-query.scss
new file mode 100644
index 00000000..ccc66df8
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/sass/layouts/ocio-2/ocio-2.layout.no-query.scss
@@ -0,0 +1,5 @@
+$breakpoint-no-queries: true;
+$breakpoint-no-query-fallbacks: true;
+
+// Re import everything but without media queries.
+@import "ocio-default.layout";
diff --git a/profiles/wcm_base/themes/ocio_omega_2/sass/layouts/ocio-2/ocio-2.layout.scss b/profiles/wcm_base/themes/ocio_omega_2/sass/layouts/ocio-2/ocio-2.layout.scss
new file mode 100644
index 00000000..ca23c403
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/sass/layouts/ocio-2/ocio-2.layout.scss
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * ocio-default.layout.scss
+ *
+ * Styles for the OCIO Default layout.
+ ******************************************************************************/
+@import "compass";
+@import "breakpoint";
+@import "singularitygs";
+
+// Globbing from within sub-folders only works with relative paths.
+@import "../../variables/**/*";
+@import "../../base/**/*";
+
+/* Header */
+.l-region--header {
+ padding: $vert-spacing-unit 0;
+
+ .block {
+ float: right;
+ }
+}
+
+/* Content Area */
+.l-highlighted-wrapper {
+ padding: $vert-spacing-unit 0;
+}
+.l-region--highlighted {
+ @extend .l-constrained;
+}
+.l-region--help {
+ margin-bottom: $vert-spacing-unit;
+}
+.l-main {
+ margin-top: 2 * $vert-spacing-unit;
+ margin-bottom: 2 * $vert-spacing-unit;
+}
+
+/* Sidebars */
+.l-region--sidebar-1,
+.l-region--sidebar-2 {
+ padding: $vert-spacing-unit $horz-spacing-unit;
+}
+
+/* Footer */
+.l-footer-wrapper {
+ padding: $vert-spacing-unit 0;
+}
+
+.l-region--footer {
+ @extend .l-constrained;
+}
+
+@include breakpoint($tab, true) {
+
+ /* Header */
+ .l-branding {
+ @include grid-span(3, 1);
+ }
+ .l-region--navigation {
+ @include grid-span(6, 4);
+ }
+ .l-region--header {
+ @include grid-span(3, 10);
+ }
+
+ /* Sidebars */
+ .has-two-sidebars,
+ .has-one-sidebar {
+ .l-content {
+ @include grid-span(8, 1);
+ }
+ .l-region--sidebar-1,
+ .l-region--sidebar-2 {
+ @include grid-span(4, 9);
+ clear: right;
+ }
+ }
+
+ /* Footer */
+ .l-region--footer-1 {
+ @include grid-span(7, 1);
+ }
+ .l-region--footer-2 {
+ @include grid-span(5, 8);
+ }
+ .l-region--footer-3 {
+ clear: both;
+ }
+
+}
+
+
+@include breakpoint($desk, true) {
+
+ /* Sidebars */
+ .has-one-sidebar {
+ .l-content {
+ @include grid-span(8, 1);
+ }
+ .l-region--sidebar-1 {
+ @include grid-span(4, 9);
+ clear: none;
+ }
+ }
+ .has-two-sidebars {
+ .l-content {
+ @include grid-span(6, 1);
+ }
+ .l-region--sidebar-1,
+ .l-region--sidebar-2 {
+ @include grid-span(3, 7);
+ clear: none;
+ }
+ .l-region--sidebar-2 {
+ @include grid-span(3, 10);
+ }
+ }
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_2/sass/ocio-2.styles.scss b/profiles/wcm_base/themes/ocio_omega_2/sass/ocio-2.styles.scss
index 329b6ab0..525537b0 100644
--- a/profiles/wcm_base/themes/ocio_omega_2/sass/ocio-2.styles.scss
+++ b/profiles/wcm_base/themes/ocio_omega_2/sass/ocio-2.styles.scss
@@ -21,7 +21,6 @@
@import "base/**/*";
@import "components/**/*";
-.image-border, .panopoly-image-featured, .panopoly-image-full, .panopoly-image-half, .panopoly-image-original, .panopoly-image-quarter, .panopoly-image-square, .panopoly-image-thumbnail {
+.image-border, .panopoly-image-featured, .panopoly-image-full, .panopoly-image-half, .panopoly-image-original, .panopoly-image-quarter, .panopoly-image-square, .panopoly-image-thumbnail {
border: 0 none;
}
-
diff --git a/profiles/wcm_base/themes/ocio_omega_2/templates/panels-pane--mm-widgets-live-pane.tpl.php b/profiles/wcm_base/themes/ocio_omega_2/templates/panels-pane--mm-widgets-live-pane.tpl.php
new file mode 100644
index 00000000..c2000e62
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_2/templates/panels-pane--mm-widgets-live-pane.tpl.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @file panels-pane.tpl.php
+ * Main panel pane template
+ *
+ * Variables available:
+ * - $pane->type: the content type inside this pane
+ * - $pane->subtype: The subtype, if applicable. If a view it will be the
+ * view name; if a node it will be the nid, etc.
+ * - $title: The title of the content
+ * - $content: The actual content
+ * - $links: Any links associated with the content
+ * - $more: An optional 'more' link (destination only)
+ * - $admin_links: Administrative links associated with the content
+ * - $feeds: Any feed icons or associated with the content
+ * - $display: The complete panels display object containing all kinds of
+ * data including the contexts and all of the other panes being displayed.
+ */
+?>
+<?php if ($pane_prefix): ?>
+ <?php print $pane_prefix; ?>
+<?php endif; ?>
+<div class="<?php print $classes; ?>" <?php print $id; ?> <?php print $attributes; ?>>
+ <?php if ($admin_links): ?>
+ <?php print $admin_links; ?>
+ <?php endif; ?>
+
+ <?php print render($title_prefix); ?>
+ <?php if ($title): ?>
+ <<?php print $title_heading; ?><?php print $title_attributes; ?>>
+ <span class="pane-title-wrapper">
+ <?php print $title; ?>
+ </span>
+ <?php if ($channel): ?>
+ <i class="mm-channel fa fa-<?php print $channel; ?>"></i>
+ <?php endif; ?>
+ </<?php print $title_heading; ?>>
+ <?php endif; ?>
+ <?php print render($title_suffix); ?>
+
+ <?php if ($feeds): ?>
+ <div class="feed">
+ <?php print $feeds; ?>
+ </div>
+ <?php endif; ?>
+
+ <div class="pane-content">
+
+ <?php print render($content); ?>
+ </div>
+
+ <?php if ($links): ?>
+ <div class="links">
+ <?php print $links; ?>
+ </div>
+ <?php endif; ?>
+
+ <?php if ($more): ?>
+ <div class="more-link">
+ <?php print $more; ?>
+ </div>
+ <?php endif; ?>
+</div>
+<?php if ($pane_suffix): ?>
+ <?php print $pane_suffix; ?>
+<?php endif; ?>
diff --git a/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.css b/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.css
index b545285f..db58c11c 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.css
+++ b/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.css
@@ -259,7 +259,7 @@ a:visited {
color: #b00;
}
a:focus {
- color: #477abc;
+ color: #013944;
}
a:hover {
color: #666666;
@@ -322,7 +322,7 @@ h3 a:active, .gamma a:active,
h4 a:active, .delta a:active,
h5 a:active, .epsilon a:active,
h6 a:active, .zeta a:active {
- color: #477abc;
+ color: #013944;
}
.header-links:hover, h1 a:hover, .alpha a:hover,
h2 a:hover, .beta a:hover,
@@ -334,10 +334,10 @@ h6 a:hover, .zeta a:hover {
}
.reverse-links {
- color: #ececec;
+ color: #ededed;
}
.reverse-links:visited {
- color: #ececec;
+ color: #ededed;
}
.reverse-links:focus {
color: #dcaa38;
diff --git a/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.no-query.css b/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.no-query.css
index 2ae96eca..6e84cc23 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.no-query.css
@@ -243,7 +243,7 @@ a:visited {
color: #b00;
}
a:focus {
- color: #477abc;
+ color: #013944;
}
a:hover {
color: #666666;
@@ -306,7 +306,7 @@ h3 a:active, .gamma a:active,
h4 a:active, .delta a:active,
h5 a:active, .epsilon a:active,
h6 a:active, .zeta a:active {
- color: #477abc;
+ color: #013944;
}
.header-links:hover, h1 a:hover, .alpha a:hover,
h2 a:hover, .beta a:hover,
@@ -318,10 +318,10 @@ h6 a:hover, .zeta a:hover {
}
.reverse-links {
- color: #ececec;
+ color: #ededed;
}
.reverse-links:visited {
- color: #ececec;
+ color: #ededed;
}
.reverse-links:focus {
color: #dcaa38;
diff --git a/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.no-query.css b/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.no-query.css
index d6dabd83..5a6b2654 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.no-query.css
@@ -239,7 +239,7 @@ a:visited {
color: #b00;
}
a:focus {
- color: #477abc;
+ color: #013944;
}
a:hover {
color: #666666;
@@ -302,7 +302,7 @@ h3 a:active, .gamma a:active,
h4 a:active, .delta a:active,
h5 a:active, .epsilon a:active,
h6 a:active, .zeta a:active {
- color: #477abc;
+ color: #013944;
}
.header-links:hover, h1 a:hover, .alpha a:hover,
h2 a:hover, .beta a:hover,
@@ -314,10 +314,10 @@ h6 a:hover, .zeta a:hover {
}
.reverse-links {
- color: #ececec;
+ color: #ededed;
}
.reverse-links:visited {
- color: #ececec;
+ color: #ededed;
}
.reverse-links:focus {
color: #dcaa38;
@@ -360,7 +360,7 @@ h6 a:hover, .zeta a:hover {
margin-top: 1em;
}
.page-news .l-region--sidebar-2 {
- background: #ececec;
+ background: #ededed;
}
.page-news .l-region--sidebar-2 h2.block__title {
text-transform: uppercase;
@@ -407,7 +407,7 @@ fieldset.search-advanced {
}
div.workbench-info-block {
- background: #ececec;
+ background: #ededed;
padding: 1em 1.5em;
margin: 1em 0;
border: none;
diff --git a/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.styles.css b/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.styles.css
index e838ff63..34e1e7a3 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.styles.css
@@ -255,7 +255,7 @@ a:visited {
color: #b00;
}
a:focus {
- color: #477abc;
+ color: #013944;
}
a:hover {
color: #666666;
@@ -318,7 +318,7 @@ h3 a:active, .gamma a:active,
h4 a:active, .delta a:active,
h5 a:active, .epsilon a:active,
h6 a:active, .zeta a:active {
- color: #477abc;
+ color: #013944;
}
.header-links:hover, h1 a:hover, .alpha a:hover,
h2 a:hover, .beta a:hover,
@@ -330,10 +330,10 @@ h6 a:hover, .zeta a:hover {
}
.reverse-links {
- color: #ececec;
+ color: #ededed;
}
.reverse-links:visited {
- color: #ececec;
+ color: #ededed;
}
.reverse-links:focus {
color: #dcaa38;
@@ -378,7 +378,7 @@ h6 a:hover, .zeta a:hover {
}
}
.page-news .l-region--sidebar-2 {
- background: #ececec;
+ background: #ededed;
}
.page-news .l-region--sidebar-2 h2.block__title {
text-transform: uppercase;
@@ -425,7 +425,7 @@ fieldset.search-advanced {
}
div.workbench-info-block {
- background: #ececec;
+ background: #ededed;
padding: 1em 1.5em;
margin: 1em 0;
border: none;
diff --git a/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php b/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php
index cb573efb..6fb74f2f 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php
@@ -1,56 +1,54 @@
<div<?php print $attributes; ?>>
-
+
<header class="l-header" role="banner">
- <?php print render($page['osu_navbar']); ?>
- <?php print render($page['masthead']); ?>
- </header>
-
- <div class="l-constrained max-width">
- <div class="constrained-container">
-
- <?php print render($page['main_menu']); ?>
-
- <div class="l-region--hero-wrapper <?php print $main_classes; ?>">
- <?php print render($page['hero']); ?>
- </div>
-
- <?php if (!empty($page['highlighted'])): ?>
- <div class="l-highlighted-wrapper">
- <?php print render($page['highlighted']); ?>
- </div>
- <?php endif; ?>
-
- <div class="l-main <?php print $main_classes; ?>">
- <a id="main-content"></a>
- <?php print $breadcrumb; ?>
- <?php print render($tabs); ?>
- <?php print render($page['help']); ?>
- <?php print $messages; ?>
-
- <?php print render($page['workbench']); ?>
-
- <div class="l-content" role="main">
- <?php if (!$is_front && !empty($title)): ?>
- <h1 class="title" id="page-title"><?php print $title; ?></h1>
- <?php endif; ?>
-
- <?php if ($action_links): ?>
- <ul class="action-links"><?php print render($action_links); ?></ul>
- <?php endif; ?>
- <?php print render($page['content']); ?>
- <?php print $feed_icons; ?>
- </div>
-
- <?php print render($page['sidebar_1']); ?>
- <?php print render($page['sidebar_2']); ?>
- </div>
-
-
- <footer class="l-footer-wrapper" role="contentinfo">
- <?php print render($page['footer_1']); ?>
- <?php print render($page['footer_2']); ?>
- <?php print render($page['footer_3']); ?>
- </footer>
- </div>
- </div> <!--/constrained-container-->
+ <?php print render($page['osu_navbar']); ?>
+ <?php print render($page['masthead']); ?>
+ </header>
+
+ <div class="l-constrained max-width">
+ <div class="constrained-container">
+
+ <?php print render($page['main_menu']); ?>
+
+ <div class="l-region--hero-wrapper <?php print $main_classes; ?>">
+ <?php print render($page['hero']); ?>
+ </div>
+
+ <?php if (!empty($page['highlighted'])): ?>
+ <div class="l-highlighted-wrapper">
+ <?php print render($page['highlighted']); ?>
+ </div>
+ <?php endif; ?>
+
+ <div class="l-main <?php print $main_classes; ?>">
+ <a id="main-content"></a>
+ <?php print $breadcrumb; ?>
+ <?php print render($tabs); ?>
+ <?php print render($page['help']); ?>
+ <?php print $messages; ?>
+
+ <?php print render($page['workbench']); ?>
+
+ <div class="l-content" role="main">
+ <?php if (!$is_front && !empty($title)): ?>
+ <h1 class="title" id="page-title"><?php print $title; ?></h1>
+ <?php endif; ?>
+
+ <?php if ($action_links): ?>
+ <ul class="action-links"><?php print render($action_links); ?></ul>
+ <?php endif; ?>
+ <?php print render($page['content']); ?>
+ <?php print $feed_icons; ?>
+ </div>
+
+ <?php print render($page['sidebar_1']); ?>
+ <?php print render($page['sidebar_2']); ?>
+ </div>
+ </div>
+ <footer class="l-footer-wrapper" role="contentinfo">
+ <?php print render($page['footer_1']); ?>
+ <?php print render($page['footer_2']); ?>
+ <?php print render($page['footer_3']); ?>
+ </footer>
+ </div> <!--/constrained-container-->
</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_3/sass/base/_layout-base.scss b/profiles/wcm_base/themes/ocio_omega_3/sass/base/_layout-base.scss
index 8965bd1c..29c99a57 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/sass/base/_layout-base.scss
+++ b/profiles/wcm_base/themes/ocio_omega_3/sass/base/_layout-base.scss
@@ -1,31 +1,31 @@
// Setting l-constrained as percent padding
.l-constrained {
- padding:0 ;
- margin: 0 auto;
- @include pie-clearfix;
-
- @include breakpoint($tab, true) {
- padding:0 9%;
- }
+ padding: 0;
+ margin: 0 auto;
+ @include pie-clearfix;
+
+ @include breakpoint($tab, true) {
+ padding: 0 9%;
+ }
}
//add padding to navbar and masthead for mobile
@include breakpoint($small, true) {
- .l-region--osu-navbar, .l-region--masthead {
- .l-constrained {
- padding: 0 4%;
- }
- }
+ .l-region--osu-navbar, .l-region--masthead {
+ .l-constrained {
+ padding: 0 4%;
+ }
+ }
}
// setting max-width of content containers
-@include breakpoint($x-wide){
- .max-width {
- max-width: $max-width;
- margin: 0 auto;
- padding: 0;
- }
+@include breakpoint($x-wide) {
+ .max-width {
+ max-width: $max-width;
+ margin: 0 auto;
+ padding: 0;
+ }
}
@@ -39,14 +39,11 @@ body.html {
}
.constrained-container {
- background: $white;
+ background: $white;
}
-
/* setting padding for containers */
.l-main {
- padding: 2% 2%;
- @include pie-clearfix;
+ padding: 2% 2%;
+ @include pie-clearfix;
}
-
-
diff --git a/profiles/wcm_base/themes/ocio_omega_3/sass/components/_panels.scss b/profiles/wcm_base/themes/ocio_omega_3/sass/components/_panels.scss
index 9ddf35d3..510e6218 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/sass/components/_panels.scss
+++ b/profiles/wcm_base/themes/ocio_omega_3/sass/components/_panels.scss
@@ -1,6 +1,6 @@
//panels specific components
h2.pane-title {
- text-transform: uppercase;
- margin-top: 1em;
-}
\ No newline at end of file
+ text-transform: uppercase;
+ margin-top: 1em;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_3/templates/regions/region--main-menu.tpl.php b/profiles/wcm_base/themes/ocio_omega_3/templates/regions/region--main-menu.tpl.php
new file mode 100644
index 00000000..55c31ce2
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_3/templates/regions/region--main-menu.tpl.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @file
+ * Default theme implementation to display a region.
+ *
+ * Available variables:
+ * - $content: The content for this region, typically blocks.
+ * - $classes: String of classes that can be used to style contextually through
+ * CSS. It can be manipulated through the variable $classes_array from
+ * preprocess functions. The default values can be one or more of the
+ * following:
+ * - region: The current template type, i.e., "theming hook".
+ * - region-[name]: The name of the region with underscores replaced with
+ * dashes. For example, the page_top region would have a region-page-top
+ * class.
+ * - $region: The name of the region variable as defined in the theme's .info
+ * file.
+ *
+ * Helper variables:
+ * - $classes_array: Array of html class attribute values. It is flattened
+ * into a string within the variable $classes.
+ * - $is_admin: Flags true when the current user is an administrator.
+ * - $is_front: Flags true when presented in the front page.
+ * - $logged_in: Flags true when the current user is a logged-in member.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_region()
+ * @see template_process()
+ */
+?>
+<div class="l-region--main-menu-wrapper <?php print $menu_color ?>">
+ <div class="max-width">
+ <div<?php print $attributes; ?>>
+ <?php print $content; ?>
+ </div>
+ </div>
+</div>
+
diff --git a/profiles/wcm_base/themes/ocio_omega_4/layouts/ocio-4/ocio-4-layout.tpl.php b/profiles/wcm_base/themes/ocio_omega_4/layouts/ocio-4/ocio-4-layout.tpl.php
index f27659bc..c912a6a8 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/layouts/ocio-4/ocio-4-layout.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_4/layouts/ocio-4/ocio-4-layout.tpl.php
@@ -8,7 +8,7 @@
<div class="l-region--hero-wrapper <?php print $main_classes; ?>">
<?php print render($page['hero']); ?>
</div>
-
+
<?php if (!empty($page['highlighted'])): ?>
<div class="l-highlighted-wrapper">
<?php print render($page['highlighted']); ?>
@@ -17,7 +17,7 @@
<div class="l-main <?php print $main_classes; ?>">
<a id="main-content"></a>
-
+
<div class="l-constrained max-width">
<?php print $breadcrumb; ?>
<?php print render($tabs); ?>
@@ -25,13 +25,8 @@
<?php print $messages; ?>
<?php print render($page['workbench']); ?>
</div>
-
- <?php if (!$landing_page) :?>
- <div class="l-constrained max-width">
- <?php else: ?>
- <div>
- <?php endif; ?>
-
+
+ <div class="l-constrained max-width">
<div class="l-content" role="main">
<?php if (!$is_front && !empty($title)): ?>
<?php if ($landing_page) :?>
@@ -40,11 +35,11 @@
<h1 class="title" id="page-title"><?php print $title; ?></h1>
<?php endif; ?>
<?php endif; ?>
-
+
<?php if ($action_links): ?>
<ul class="action-links"><?php print render($action_links); ?></ul>
<?php endif; ?>
-
+
<?php print render($page['content']); ?>
<?php print $feed_icons; ?>
</div>
@@ -53,7 +48,7 @@
<?php print render($page['sidebar_2']); ?>
</div>
-
+
<div class="l-region--pre-footer-wrapper <?php print $main_classes; ?>">
<?php print render($page['pre_footer']); ?>
</div>
@@ -65,4 +60,4 @@
<?php print render($page['footer_3']); ?>
</div>
</footer>
-</div>
\ No newline at end of file
+</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/base/_buttons.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/base/_buttons.scss
index ca67682e..1e1eb0c3 100755
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/base/_buttons.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/base/_buttons.scss
@@ -1,11 +1,11 @@
@import "sassy-buttons";
.red-button {
- @include sassy-button;
- border-radius:0px;
- box-shadow: 0px 4px 0px 0px darken($red,8%);
- padding-bottom:0.2em;
- font-weight:normal;
+ @include sassy-button;
+ border-radius: 0px;
+ box-shadow: 0px 4px 0px 0px darken($red, 8%);
+ padding-bottom: 0.2em;
+ font-weight: normal;
}
.button,
@@ -14,5 +14,5 @@
#edit-submit--3,
#edit-preview,
.webform-submit {
- @extend .red-button;
-}
\ No newline at end of file
+ @extend .red-button;
+}
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 b8f75035..35bd5ec5 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
@@ -112,6 +112,16 @@ html body .button::-moz-focus-inner,
margin: -1px !important;
}
+input[type=button].ext .ext,
+html body .button.ext .ext,
+.form-submit.ext .ext,
+#edit-preview.ext .ext,
+.webform-submit.ext .ext {
+ background-image: none;
+ padding: 0;
+ width: 0;
+}
+
input:focus {
outline: 1px solid #999999;
}
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 1738248d..7343bc9b 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
@@ -112,6 +112,16 @@ html body .button::-moz-focus-inner,
margin: -1px !important;
}
+input[type=button].ext .ext,
+html body .button.ext .ext,
+.form-submit.ext .ext,
+#edit-preview.ext .ext,
+.webform-submit.ext .ext {
+ background-image: none;
+ padding: 0;
+ width: 0;
+}
+
input:focus {
outline: 1px solid #999999;
}
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 68b20c87..7d870b95 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
@@ -108,6 +108,16 @@ html body .button::-moz-focus-inner,
margin: -1px !important;
}
+input[type=button].ext .ext,
+html body .button.ext .ext,
+.form-submit.ext .ext,
+#edit-preview.ext .ext,
+.webform-submit.ext .ext {
+ background-image: none;
+ padding: 0;
+ width: 0;
+}
+
input:focus {
outline: 1px solid #999999;
}
@@ -1592,6 +1602,7 @@ p.search-result__snippet {
.l-region--main-menu #search-block-toggle {
cursor: pointer;
+ padding: 0.75em 0.9em;
}
.l-region--main-menu .block--search {
position: relative;
@@ -1636,7 +1647,7 @@ p.search-result__snippet {
position: absolute;
padding: 1em;
font-size: 1.2em;
- z-index: 500;
+ z-index: 501;
width: auto;
}
.l-region--main-menu #search-block-form {
@@ -1873,6 +1884,70 @@ p.search-result__snippet {
color: #b00;
}
+.views-field-field-user-photo img {
+ border: 1px solid #8c8c8c;
+}
+
+.view-id-leadership_listing {
+ padding-top: 2em;
+}
+.view-id-leadership_listing .views-row {
+ *zoom: 1;
+ margin-bottom: 3em;
+ width: 47%;
+ float: left;
+ margin-right: 6%;
+}
+.view-id-leadership_listing .views-row:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+.view-id-leadership_listing .views-row:nth-child(2n) {
+ margin-right: 0;
+}
+.view-id-leadership_listing .views-row,
+.view-id-leadership_listing .views-row:nth-child(2n) {
+ width: 31.5%;
+ margin-right: 2.75%;
+}
+.view-id-leadership_listing .views-row:nth-child(3n) {
+ margin-right: 0;
+}
+.view-id-leadership_listing .views-row,
+.view-id-leadership_listing .views-row:nth-child(2n),
+.view-id-leadership_listing .views-row:nth-child(3n) {
+ width: 23.125%;
+ margin-right: 2.5%;
+}
+.view-id-leadership_listing .views-row:nth-child(4n) {
+ margin-right: 0;
+}
+.view-id-leadership_listing .views-field-realname h2 {
+ font-size: 21px;
+ font-size: 2.1rem;
+ margin-top: 0.6em;
+ margin-bottom: 0.2em;
+}
+.view-id-leadership_listing .views-field-realname h2 a:hover {
+ color: #028da9;
+}
+.view-id-leadership_listing .views-field-field-job-title,
+.view-id-leadership_listing .views-field-mail {
+ font-size: 13px;
+ font-size: 1.3rem;
+ line-height: 150%;
+ font-weight: 400;
+}
+.view-id-leadership_listing .views-field-field-job-title a,
+.view-id-leadership_listing .views-field-mail a {
+ color: #2d2d2d;
+}
+.view-id-leadership_listing .views-field-field-job-title a:hover,
+.view-id-leadership_listing .views-field-mail a:hover {
+ color: #b00;
+}
+
.node-type-webform .webform-component-fieldset {
margin: 40px 0 20px 0;
padding: 20px 1.5em;
@@ -2577,7 +2652,7 @@ div.workbench-info-block #edit-submit {
}
.mean-container .mean-bar {
- z-index: 500;
+ z-index: 501;
}
.mean-container a.meanmenu-reveal {
@@ -2990,44 +3065,10 @@ a#skip:active:hover, a#skip:focus:hover {
background-image: url(../images/osu-navbar/dk-gray/osu_name@2x.png);
}
}
-.l-region--pre-footer-wrapper {
- margin-bottom: -0.6em;
-}
-
.front .view-featured-slideshow {
margin-bottom: 1em;
}
-.view-id-leadership_listing .views-row-1 {
- margin-top: 2.4em;
-}
-
-.view-mode-leadership_listing .field--name-field-user-photo {
- float: left;
- margin-right: 1.4em;
- margin-bottom: 0.6em;
-}
-.view-mode-leadership_listing .field--name-name {
- margin-bottom: 0.2em;
-}
-.view-mode-leadership_listing .field--name-name h2 {
- font-size: 32px;
- font-size: 3.2rem;
- padding-top: 10px;
-}
-.view-mode-leadership_listing .field--name-field-job-title {
- font-size: 22px;
- font-size: 2.2rem;
- margin-bottom: 0.3em;
-}
-.view-mode-leadership_listing .field--name-email {
- font-size: 18px;
- font-size: 1.8rem;
-}
-.view-mode-leadership_listing .field--name-field-bio {
- clear: both;
-}
-
.node--article .field--name-byline {
margin: 0.8em 0 0.6em 0;
font-weight: 600;
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 c85e2cd0..b816b382 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
@@ -108,6 +108,16 @@ html body .button::-moz-focus-inner,
margin: -1px !important;
}
+input[type=button].ext .ext,
+html body .button.ext .ext,
+.form-submit.ext .ext,
+#edit-preview.ext .ext,
+.webform-submit.ext .ext {
+ background-image: none;
+ padding: 0;
+ width: 0;
+}
+
input:focus {
outline: 1px solid #999999;
}
@@ -1605,6 +1615,7 @@ p.search-result__snippet {
.l-region--main-menu #search-block-toggle {
cursor: pointer;
+ padding: 0.75em 0.9em;
}
.l-region--main-menu .block--search {
position: relative;
@@ -1650,7 +1661,7 @@ p.search-result__snippet {
position: absolute;
padding: 1em;
font-size: 1.2em;
- z-index: 500;
+ z-index: 501;
width: auto;
}
.l-region--main-menu #search-block-form {
@@ -1888,6 +1899,74 @@ p.search-result__snippet {
color: #b00;
}
+.views-field-field-user-photo img {
+ border: 1px solid #8c8c8c;
+}
+
+.view-id-leadership_listing {
+ padding-top: 2em;
+}
+.view-id-leadership_listing .views-row {
+ *zoom: 1;
+ margin-bottom: 3em;
+ width: 47%;
+ float: left;
+ margin-right: 6%;
+}
+.view-id-leadership_listing .views-row:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+.view-id-leadership_listing .views-row:nth-child(2n) {
+ margin-right: 0;
+}
+@media (min-width: 47.5em) {
+ .view-id-leadership_listing .views-row,
+ .view-id-leadership_listing .views-row:nth-child(2n) {
+ width: 31.5%;
+ margin-right: 2.75%;
+ }
+ .view-id-leadership_listing .views-row:nth-child(3n) {
+ margin-right: 0;
+ }
+}
+@media (min-width: 75em) {
+ .view-id-leadership_listing .views-row,
+ .view-id-leadership_listing .views-row:nth-child(2n),
+ .view-id-leadership_listing .views-row:nth-child(3n) {
+ width: 23.125%;
+ margin-right: 2.5%;
+ }
+ .view-id-leadership_listing .views-row:nth-child(4n) {
+ margin-right: 0;
+ }
+}
+.view-id-leadership_listing .views-field-realname h2 {
+ font-size: 21px;
+ font-size: 2.1rem;
+ margin-top: 0.6em;
+ margin-bottom: 0.2em;
+}
+.view-id-leadership_listing .views-field-realname h2 a:hover {
+ color: #028da9;
+}
+.view-id-leadership_listing .views-field-field-job-title,
+.view-id-leadership_listing .views-field-mail {
+ font-size: 13px;
+ font-size: 1.3rem;
+ line-height: 150%;
+ font-weight: 400;
+}
+.view-id-leadership_listing .views-field-field-job-title a,
+.view-id-leadership_listing .views-field-mail a {
+ color: #2d2d2d;
+}
+.view-id-leadership_listing .views-field-field-job-title a:hover,
+.view-id-leadership_listing .views-field-mail a:hover {
+ color: #b00;
+}
+
.node-type-webform .webform-component-fieldset {
margin: 40px 0 20px 0;
padding: 20px 1.5em;
@@ -2613,7 +2692,7 @@ div.workbench-info-block #edit-submit {
}
.mean-container .mean-bar {
- z-index: 500;
+ z-index: 501;
}
.mean-container a.meanmenu-reveal {
@@ -3030,44 +3109,10 @@ a#skip:active:hover, a#skip:focus:hover {
background-image: url(../images/osu-navbar/dk-gray/osu_name@2x.png);
}
}
-.l-region--pre-footer-wrapper {
- margin-bottom: -0.6em;
-}
-
.front .view-featured-slideshow {
margin-bottom: 1em;
}
-.view-id-leadership_listing .views-row-1 {
- margin-top: 2.4em;
-}
-
-.view-mode-leadership_listing .field--name-field-user-photo {
- float: left;
- margin-right: 1.4em;
- margin-bottom: 0.6em;
-}
-.view-mode-leadership_listing .field--name-name {
- margin-bottom: 0.2em;
-}
-.view-mode-leadership_listing .field--name-name h2 {
- font-size: 32px;
- font-size: 3.2rem;
- padding-top: 10px;
-}
-.view-mode-leadership_listing .field--name-field-job-title {
- font-size: 22px;
- font-size: 2.2rem;
- margin-bottom: 0.3em;
-}
-.view-mode-leadership_listing .field--name-email {
- font-size: 18px;
- font-size: 1.8rem;
-}
-.view-mode-leadership_listing .field--name-field-bio {
- clear: both;
-}
-
.node--article .field--name-byline {
margin: 0.8em 0 0.6em 0;
font-weight: 600;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js b/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js
index 0833596c..50b5dff7 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js
+++ b/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js
@@ -50,9 +50,10 @@
}
});
- /* Match tile panes to equal height */
- $('.node-type-ocio-landing-page .row-tiles .tile-panel .fieldable-panels-pane').matchHeight();
-
+ if ($.fn.matchHeight) {
+ /* Match tile panes to equal height */
+ $('.node-type-ocio-landing-page .row-tiles .tile-panel .fieldable-panels-pane').matchHeight();
+ }
var toggleButton = $('#search-block-toggle').eq(0);
var searchBox = $('#search-block-form').eq(0);
var searchTextInput = searchBox.find('input.form-text').eq(0);
diff --git a/profiles/wcm_base/themes/ocio_omega_base/layouts/ocio-default/ocio-default-layout.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/layouts/ocio-default/ocio-default-layout.tpl.php
index 59c6dc30..c912a6a8 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/layouts/ocio-default/ocio-default-layout.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/layouts/ocio-default/ocio-default-layout.tpl.php
@@ -8,7 +8,7 @@
<div class="l-region--hero-wrapper <?php print $main_classes; ?>">
<?php print render($page['hero']); ?>
</div>
-
+
<?php if (!empty($page['highlighted'])): ?>
<div class="l-highlighted-wrapper">
<?php print render($page['highlighted']); ?>
@@ -17,7 +17,7 @@
<div class="l-main <?php print $main_classes; ?>">
<a id="main-content"></a>
-
+
<div class="l-constrained max-width">
<?php print $breadcrumb; ?>
<?php print render($tabs); ?>
@@ -25,13 +25,8 @@
<?php print $messages; ?>
<?php print render($page['workbench']); ?>
</div>
-
- <?php if (!$landing_page) :?>
- <div class="l-constrained max-width">
- <?php else: ?>
- <div>
- <?php endif; ?>
-
+
+ <div class="l-constrained max-width">
<div class="l-content" role="main">
<?php if (!$is_front && !empty($title)): ?>
<?php if ($landing_page) :?>
@@ -40,18 +35,18 @@
<h1 class="title" id="page-title"><?php print $title; ?></h1>
<?php endif; ?>
<?php endif; ?>
-
+
<?php if ($action_links): ?>
<ul class="action-links"><?php print render($action_links); ?></ul>
<?php endif; ?>
-
+
<?php print render($page['content']); ?>
<?php print $feed_icons; ?>
</div>
<?php print render($page['sidebar_1']); ?>
<?php print render($page['sidebar_2']); ?>
-
+
</div>
<div class="l-region--pre-footer-wrapper <?php print $main_classes; ?>">
@@ -65,4 +60,4 @@
<?php print render($page['footer_3']); ?>
</div>
</footer>
-</div>
\ No newline at end of file
+</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-dps/ocio-omega-dps.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-dps/ocio-omega-dps.tpl.php
index bec1f6be..662b6364 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-dps/ocio-omega-dps.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-dps/ocio-omega-dps.tpl.php
@@ -14,9 +14,9 @@
<!-- row_a -->
<div class="row-a panels-row <?php print $panels_row['row_a']; ?>">
-
+
<!-- tiles 1-4a -->
- <div class="ocio-omega-dps-container ocio-omega-dps-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-dps-container ocio-omega-dps-tile-content clearfix row-fluid">
<div class="ocio-omega-dps-tile-content-region4 ocio-omega-dps-tile1a panel-panel tile-panel clearfix span3">
<div class="ocio-omega-dps-tile-content-region4-inner ocio-omega-dps-tile1a-inner panel-panel-inner">
<?php print $content['tile1a']; ?>
@@ -38,18 +38,18 @@
</div>
</div>
</div>
-
+
<!-- band 1a -->
- <div class="ocio-omega-dps-container ocio-omega-dps-band-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-dps-container ocio-omega-dps-band-content clearfix row-fluid">
<div class="ocio-omega-dps-band-content-region ocio-omega-dps-band1a panel-panel band-panel clearfix">
<div class="ocio-omega-dps-band-inner panel-panel-inner">
<?php print $content['band1a']; ?>
</div>
</div>
</div>
-
+
<!-- tiles 5-8a -->
- <div class="ocio-omega-dps-container ocio-omega-dps-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-dps-container ocio-omega-dps-tile-content clearfix row-fluid">
<div class="ocio-omega-dps-tile-content-region4 ocio-omega-dps-tile5a panel-panel tile-panel clearfix span3">
<div class="ocio-omega-dps-tile-content-region4-inner ocio-omega-dps-tile5a-inner panel-panel-inner">
<?php print $content['tile5a']; ?>
@@ -73,35 +73,35 @@
</div>
</div><!-- /row_a -->
-
+
<!-- row_b -->
<div class="row-band panels-row <?php print $panels_row['row_b']; ?>">
-
+
<!-- band 1b -->
- <div class="ocio-omega-dps-container ocio-omega-dps-band-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-dps-container ocio-omega-dps-band-content clearfix row-fluid">
<div class="ocio-omega-dps-band-content-region ocio-omega-dps-band1b panel-panel band-panel clearfix">
<div class="ocio-omega-dps-band-inner panel-panel-inner">
<?php print $content['band1b']; ?>
</div>
</div>
</div>
-
+
</div><!-- /row_b -->
-
+
<!-- row_c -->
<div class="row-band panels-row <?php print $panels_row['row_c']; ?>">
-
+
<!-- band 1c -->
- <div class="ocio-omega-dps-container ocio-omega-dps-band-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-dps-container ocio-omega-dps-band-content clearfix row-fluid">
<div class="ocio-omega-dps-band-content-region ocio-omega-dps-band1c panel-panel band-panel clearfix">
<div class="ocio-omega-dps-band-inner panel-panel-inner">
<?php print $content['band1c']; ?>
</div>
</div>
</div>
-
+
<!-- tiles 1-3c -->
- <div class="ocio-omega-dps-container ocio-omega-dps-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-dps-container ocio-omega-dps-tile-content clearfix row-fluid">
<div class="ocio-omega-dps-tile-content-region3 ocio-omega-dps-tile1c panel-panel tile-panel clearfix span4">
<div class="ocio-omega-dps-tile-content-region3-inner ocio-omega-dps-tile1c-inner panel-panel-inner">
<?php print $content['tile1c']; ?>
@@ -118,19 +118,19 @@
</div>
</div>
</div>
-
+
</div><!-- /row_c -->
-
+
<!-- footer row -->
<div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
-
- <div class="ocio-omega-dps-container ocio-omega-dps-footer clearfix panel-panel row-fluid l-constrained max-width">
+
+ <div class="ocio-omega-dps-container ocio-omega-dps-footer clearfix panel-panel row-fluid">
<div class="ocio-omega-dps-container-inner ocio-omega-dps-footer-inner panel-panel-inner span12">
<?php print $content['footer']; ?>
</div>
</div>
-
+
</div><!-- /footer row -->
</div><!-- /.ocio-omega-dps -->
@@ -145,4 +145,4 @@
-
\ No newline at end of file
+
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-flip-flop/ocio-omega-flip-flop.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-flip-flop/ocio-omega-flip-flop.tpl.php
index b3f5e2ba..df207cc0 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-flip-flop/ocio-omega-flip-flop.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-flip-flop/ocio-omega-flip-flop.tpl.php
@@ -13,7 +13,7 @@
<div class="panel-display ocio-omega-flip-flop clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
<!-- header row -->
<div class="row-header panels-row <?php print $panels_row['header']; ?>">
- <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-header clearfix panel-panel row-fluid l-constrained max-width">
+ <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-header clearfix panel-panel row-fluid">
<div class="ocio-omega-flip-flop-container-inner ocio-omega-flip-flop-header-inner panel-panel-inner span12">
<?php print $content['header']; ?>
</div>
@@ -22,7 +22,7 @@
<!-- Row 1 -->
<div class="row-1 panels-row <?php print $panels_row['row_1']; ?>">
- <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-column-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-column-content clearfix row-fluid">
<div class="ocio-omega-flip-flop-column-content-region ocio-omega-flip-flop-column-left ocio-omega-flip-flop-column panel-panel span8">
<div class="ocio-omega-flip-flop-column-content-region-inner ocio-omega-flip-flop-column-left-inner ocio-omega-flip-flop-column-inner panel-panel-inner">
<?php print $content['row_1_col_1']; ?>
@@ -35,10 +35,10 @@
</div>
</div>
</div>
-
+
<!-- Row 2 -->
<div class="row-2 panels-row <?php print $panels_row['row_2']; ?>">
- <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-column-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-column-content clearfix row-fluid">
<div class="ocio-omega-flip-flop-column-content-region ocio-omega-flip-flop-column-left ocio-omega-flip-flop-column panel-panel span4">
<div class="ocio-omega-flip-flop-column-content-region-inner ocio-omega-flip-flop-column-left-inner ocio-omega-flip-flop-column-inner panel-panel-inner">
<?php print $content['row_2_col_1']; ?>
@@ -54,7 +54,7 @@
<!-- Row 3 -->
<div class="row-3 panels-row <?php print $panels_row['row_3']; ?>">
- <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-column-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-column-content clearfix row-fluid">
<div class="ocio-omega-flip-flop-column-content-region ocio-omega-flip-flop-column-left ocio-omega-flip-flop-column panel-panel span8">
<div class="ocio-omega-flip-flop-column-content-region-inner ocio-omega-flip-flop-column-left-inner ocio-omega-flip-flop-column-inner panel-panel-inner">
<?php print $content['row_3_col_1']; ?>
@@ -70,7 +70,7 @@
<!-- Row 4 -->
<div class="row-4 panels-row <?php print $panels_row['row_4']; ?>">
- <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-column-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-column-content clearfix row-fluid">
<div class="ocio-omega-flip-flop-column-content-region ocio-omega-flip-flop-column-left ocio-omega-flip-flop-column panel-panel span4">
<div class="ocio-omega-flip-flop-column-content-region-inner ocio-omega-flip-flop-column-left-inner ocio-omega-flip-flop-column-inner panel-panel-inner">
<?php print $content['row_4_col_1']; ?>
@@ -86,7 +86,7 @@
<!-- Row 5 -->
<div class="row-5 panels-row <?php print $panels_row['row_5']; ?>">
- <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-column-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-column-content clearfix row-fluid">
<div class="ocio-omega-flip-flop-column-content-region ocio-omega-flip-flop-column-left ocio-omega-flip-flop-column panel-panel span8">
<div class="ocio-omega-flip-flop-column-content-region-inner ocio-omega-flip-flop-column-left-inner ocio-omega-flip-flop-column-inner panel-panel-inner">
<?php print $content['row_5_col_1']; ?>
@@ -102,7 +102,7 @@
<!-- footer row -->
<div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
- <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-footer clearfix panel-panel row-fluid l-constrained max-width">
+ <div class="ocio-omega-flip-flop-container ocio-omega-flip-flop-footer clearfix panel-panel row-fluid">
<div class="ocio-omega-flip-flop-container-inner ocio-omega-flip-flop-footer-inner panel-panel-inner span12">
<?php print $content['footer']; ?>
</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-fourtiles/ocio-omega-fourtiles.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-fourtiles/ocio-omega-fourtiles.tpl.php
index e57a5b5f..e466c374 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-fourtiles/ocio-omega-fourtiles.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-fourtiles/ocio-omega-fourtiles.tpl.php
@@ -13,7 +13,7 @@
<div class="panel-display ocio-omega-fourtiles clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
<!-- header row -->
<div class="row-header panels-row <?php print $panels_row['header']; ?>">
- <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-header clearfix panel-panel row-fluid l-constrained max-width">
+ <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-header clearfix panel-panel row-fluid">
<div class="ocio-omega-fourtiles-container-inner ocio-omega-fourtiles-header-inner panel-panel-inner span12">
<?php print $content['header']; ?>
</div>
@@ -22,18 +22,18 @@
<!-- tiles row -->
<div class="row-tiles panels-row <?php print $panels_row['tiles']; ?>">
-
+
<!-- tiles header row -->
- <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-tiles-header-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-tiles-header-content clearfix row-fluid">
<div class="ocio-omega-fourtiles-tiles-header-content-region ocio-omega-fourtiles-tiles-header panel-panel tiles-header-panel clearfix">
<div class="ocio-omega-fourtiles-tiles-header-inner panel-panel-inner">
<?php print $content['tiles_header']; ?>
</div>
</div>
</div>
-
+
<!-- first row of tiles -->
- <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-tile-content clearfix row-fluid">
<div class="ocio-omega-fourtiles-tile-content-region4 ocio-omega-fourtiles-tile1 panel-panel tile-panel clearfix span3">
<div class="ocio-omega-fourtiles-tile-content-region4-inner ocio-omega-fourtiles-tile1-inner panel-panel-inner">
<?php print $content['tile1']; ?>
@@ -55,9 +55,9 @@
</div>
</div>
</div>
-
+
<!-- second row of tiles -->
- <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-tile-content clearfix row-fluid">
<div class="ocio-omega-fourtiles-tile-content-region4 ocio-omega-fourtiles-tile1 panel-panel tile-panel clearfix span3">
<div class="ocio-omega-fourtiles-tile-content-region4-inner ocio-omega-fourtiles-tile5-inner panel-panel-inner">
<?php print $content['tile5']; ?>
@@ -81,10 +81,10 @@
</div>
</div>
-
+
<!-- Row 1 -->
<div class="row-1 panels-row <?php print $panels_row['row_1']; ?>">
- <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-column-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-column-content clearfix row-fluid">
<div class="ocio-omega-fourtiles-column-content-region ocio-omega-fourtiles-column-left ocio-omega-fourtiles-column panel-panel span8">
<div class="ocio-omega-fourtiles-column-content-region-inner ocio-omega-fourtiles-column-left-inner ocio-omega-fourtiles-column-inner panel-panel-inner">
<?php print $content['row_1_col_1']; ?>
@@ -97,10 +97,10 @@
</div>
</div>
</div>
-
+
<!-- Row 2 -->
<div class="row-2 panels-row <?php print $panels_row['row_2']; ?>">
- <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-column-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-column-content clearfix row-fluid">
<div class="ocio-omega-fourtiles-column-content-region ocio-omega-fourtiles-column-left ocio-omega-fourtiles-column panel-panel span4">
<div class="ocio-omega-fourtiles-column-content-region-inner ocio-omega-fourtiles-column-left-inner ocio-omega-fourtiles-column-inner panel-panel-inner">
<?php print $content['row_2_col_1']; ?>
@@ -116,7 +116,7 @@
<!-- footer row -->
<div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
- <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-footer clearfix panel-panel row-fluid l-constrained max-width">
+ <div class="ocio-omega-fourtiles-container ocio-omega-fourtiles-footer clearfix panel-panel row-fluid">
<div class="ocio-omega-fourtiles-container-inner ocio-omega-fourtiles-footer-inner panel-panel-inner span12">
<?php print $content['footer']; ?>
</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.tpl.php
index a35887fc..fa859580 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-equalcol/ocio-omega-tiles-equalcol.tpl.php
@@ -13,7 +13,7 @@
<div class="panel-display ocio-omega-tiles-equalcol clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
<!-- header row -->
<div class="row-header panels-row <?php print $panels_row['header']; ?>">
- <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-header clearfix panel-panel row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-header clearfix panel-panel row-fluid">
<div class="ocio-omega-tiles-equalcol-container-inner ocio-omega-tiles-equalcol-header-inner panel-panel-inner span12">
<?php print $content['header']; ?>
</div>
@@ -22,18 +22,18 @@
<!-- tiles row -->
<div class="row-tiles panels-row <?php print $panels_row['tiles']; ?>">
-
+
<!-- tiles header row -->
- <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-tiles-header-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-tiles-header-content clearfix row-fluid">
<div class="ocio-omega-tiles-equalcol-tiles-header-content-region ocio-omega-tiles-equalcol-tiles-header panel-panel tiles-header-panel clearfix">
<div class="ocio-omega-tiles-equalcol-tiles-header-inner panel-panel-inner">
<?php print $content['tiles_header']; ?>
</div>
</div>
</div>
-
+
<!-- first row of tiles -->
- <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-tile-content clearfix row-fluid">
<div class="ocio-omega-tiles-equalcol-tile-content-region3 ocio-omega-tiles-equalcol-tile1 panel-panel tile-panel clearfix span4">
<div class="ocio-omega-tiles-equalcol-tile-content-region3-inner ocio-omega-tiles-equalcol-tile1-inner panel-panel-inner">
<?php print $content['tile1']; ?>
@@ -52,7 +52,7 @@
</div>
<!-- second row of tiles -->
- <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-tile-content clearfix row-fluid">
<div class="ocio-omega-tiles-equalcol-tile-content-region3 ocio-omega-tiles-equalcol-tile4 panel-panel tile-panel clearfix span4">
<div class="ocio-omega-tiles-equalcol-tile-content-region3-inner ocio-omega-tiles-equalcol-tile4-inner panel-panel-inner">
<?php print $content['tile4']; ?>
@@ -71,7 +71,7 @@
</div>
<!-- third row of tiles -->
- <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-tile-content clearfix row-fluid">
<div class="ocio-omega-tiles-equalcol-tile-content-region3 ocio-omega-tiles-equalcol-tile7 panel-panel tile-panel clearfix span4">
<div class="ocio-omega-tiles-equalcol-tile-content-region3-inner ocio-omega-tiles-equalcol-tile7-inner panel-panel-inner">
<?php print $content['tile7']; ?>
@@ -92,7 +92,7 @@
<!-- two columns row -->
<div class="row-2col panels-row <?php print $panels_row['columns']; ?>">
- <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-column-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-column-content clearfix row-fluid">
<div class="ocio-omega-tiles-equalcol-column-content-region ocio-omega-tiles-equalcol-column1 ocio-omega-tiles-equalcol-column panel-panel span6">
<div class="ocio-omega-tiles-equalcol-column-content-region-inner ocio-omega-tiles-equalcol-column1-inner ocio-omega-tiles-equalcol-column-inner panel-panel-inner">
<?php print $content['column1']; ?>
@@ -108,7 +108,7 @@
<!-- footer row -->
<div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
- <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-footer clearfix panel-panel row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-equalcol-container ocio-omega-tiles-equalcol-footer clearfix panel-panel row-fluid">
<div class="ocio-omega-tiles-equalcol-container-inner ocio-omega-tiles-equalcol-footer-inner panel-panel-inner span12">
<?php print $content['footer']; ?>
</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol-flipped/ocio-omega-tiles-twocol-flipped.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol-flipped/ocio-omega-tiles-twocol-flipped.tpl.php
index 9f634841..2583360a 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol-flipped/ocio-omega-tiles-twocol-flipped.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol-flipped/ocio-omega-tiles-twocol-flipped.tpl.php
@@ -13,7 +13,7 @@
<div class="panel-display ocio-omega-tiles-twocol-flipped clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
<!-- header row -->
<div class="row-header panels-row <?php print $panels_row['header']; ?>">
- <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-header clearfix panel-panel row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-header clearfix panel-panel row-fluid">
<div class="ocio-omega-tiles-twocol-flipped-container-inner ocio-omega-tiles-twocol-flipped-header-inner panel-panel-inner span12">
<?php print $content['header']; ?>
</div>
@@ -22,18 +22,18 @@
<!-- tiles row -->
<div class="row-tiles panels-row <?php print $panels_row['tiles']; ?>">
-
+
<!-- tiles header row -->
- <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-tiles-header-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-tiles-header-content clearfix row-fluid">
<div class="ocio-omega-tiles-twocol-flipped-tiles-header-content-region ocio-omega-tiles-twocol-flipped-tiles-header panel-panel tiles-header-panel clearfix">
<div class="ocio-omega-tiles-twocol-flipped-tiles-header-inner panel-panel-inner">
<?php print $content['tiles_header']; ?>
</div>
</div>
</div>
-
+
<!-- first row of tiles -->
- <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-tile-content clearfix row-fluid">
<div class="ocio-omega-tiles-twocol-flipped-tile-content-region3 ocio-omega-tiles-twocol-flipped-tile1 panel-panel tile-panel clearfix span4">
<div class="ocio-omega-tiles-twocol-flipped-tile-content-region3-inner ocio-omega-tiles-twocol-flipped-tile1-inner panel-panel-inner">
<?php print $content['tile1']; ?>
@@ -52,7 +52,7 @@
</div>
<!-- second row of tiles -->
- <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-tile-content clearfix row-fluid">
<div class="ocio-omega-tiles-twocol-flipped-tile-content-region3 ocio-omega-tiles-twocol-flipped-tile4 panel-panel tile-panel clearfix span4">
<div class="ocio-omega-tiles-twocol-flipped-tile-content-region3-inner ocio-omega-tiles-twocol-flipped-tile4-inner panel-panel-inner">
<?php print $content['tile4']; ?>
@@ -71,7 +71,7 @@
</div>
<!-- third row of tiles -->
- <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-tile-content clearfix row-fluid">
<div class="ocio-omega-tiles-twocol-flipped-tile-content-region3 ocio-omega-tiles-twocol-flipped-tile7 panel-panel tile-panel clearfix span4">
<div class="ocio-omega-tiles-twocol-flipped-tile-content-region3-inner ocio-omega-tiles-twocol-flipped-tile7-inner panel-panel-inner">
<?php print $content['tile7']; ?>
@@ -92,7 +92,7 @@
<!-- two columns row -->
<div class="row-2col panels-row <?php print $panels_row['columns']; ?>">
- <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-column-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-column-content clearfix row-fluid">
<div class="ocio-omega-tiles-twocol-flipped-column-content-region ocio-omega-tiles-twocol-flipped-column1 ocio-omega-tiles-twocol-flipped-column panel-panel span6">
<div class="ocio-omega-tiles-twocol-flipped-column-content-region-inner ocio-omega-tiles-twocol-flipped-column1-inner ocio-omega-tiles-twocol-flipped-column-inner panel-panel-inner">
<?php print $content['column1']; ?>
@@ -108,7 +108,7 @@
<!-- footer row -->
<div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
- <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-footer clearfix panel-panel row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-flipped-container ocio-omega-tiles-twocol-flipped-footer clearfix panel-panel row-fluid">
<div class="ocio-omega-tiles-twocol-flipped-container-inner ocio-omega-tiles-twocol-flipped-footer-inner panel-panel-inner span12">
<?php print $content['footer']; ?>
</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.tpl.php
index 89e816c1..d4083c88 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-tiles-twocol/ocio-omega-tiles-twocol.tpl.php
@@ -13,7 +13,7 @@
<div class="panel-display ocio-omega-tiles-twocol clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
<!-- header row -->
<div class="row-header panels-row <?php print $panels_row['header']; ?>">
- <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-header clearfix panel-panel row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-header clearfix panel-panel row-fluid">
<div class="ocio-omega-tiles-twocol-container-inner ocio-omega-tiles-twocol-header-inner panel-panel-inner span12">
<?php print $content['header']; ?>
</div>
@@ -22,18 +22,18 @@
<!-- tiles row -->
<div class="row-tiles panels-row <?php print $panels_row['tiles']; ?>">
-
+
<!-- tiles header row -->
- <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-tiles-header-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-tiles-header-content clearfix row-fluid">
<div class="ocio-omega-tiles-twocol-tiles-header-content-region ocio-omega-tiles-twocol-tiles-header panel-panel tiles-header-panel clearfix">
<div class="ocio-omega-tiles-twocol-tiles-header-inner panel-panel-inner">
<?php print $content['tiles_header']; ?>
</div>
</div>
</div>
-
+
<!-- first row of tiles -->
- <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-tile-content clearfix row-fluid">
<div class="ocio-omega-tiles-twocol-tile-content-region3 ocio-omega-tiles-twocol-tile1 panel-panel tile-panel clearfix span4">
<div class="ocio-omega-tiles-twocol-tile-content-region3-inner ocio-omega-tiles-twocol-tile1-inner panel-panel-inner">
<?php print $content['tile1']; ?>
@@ -52,7 +52,7 @@
</div>
<!-- second row of tiles -->
- <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-tile-content clearfix row-fluid">
<div class="ocio-omega-tiles-twocol-tile-content-region3 ocio-omega-tiles-twocol-tile4 panel-panel tile-panel clearfix span4">
<div class="ocio-omega-tiles-twocol-tile-content-region3-inner ocio-omega-tiles-twocol-tile4-inner panel-panel-inner">
<?php print $content['tile4']; ?>
@@ -71,7 +71,7 @@
</div>
<!-- third row of tiles -->
- <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-tile-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-tile-content clearfix row-fluid">
<div class="ocio-omega-tiles-twocol-tile-content-region3 ocio-omega-tiles-twocol-tile7 panel-panel tile-panel clearfix span4">
<div class="ocio-omega-tiles-twocol-tile-content-region3-inner ocio-omega-tiles-twocol-tile7-inner panel-panel-inner">
<?php print $content['tile7']; ?>
@@ -92,7 +92,7 @@
<!-- two columns row -->
<div class="row-2col panels-row <?php print $panels_row['columns']; ?>">
- <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-column-content clearfix row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-column-content clearfix row-fluid">
<div class="ocio-omega-tiles-twocol-column-content-region ocio-omega-tiles-twocol-column1 ocio-omega-tiles-twocol-column panel-panel span6">
<div class="ocio-omega-tiles-twocol-column-content-region-inner ocio-omega-tiles-twocol-column1-inner ocio-omega-tiles-twocol-column-inner panel-panel-inner">
<?php print $content['column1']; ?>
@@ -108,7 +108,7 @@
<!-- footer row -->
<div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
- <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-footer clearfix panel-panel row-fluid l-constrained max-width">
+ <div class="ocio-omega-tiles-twocol-container ocio-omega-tiles-twocol-footer clearfix panel-panel row-fluid">
<div class="ocio-omega-tiles-twocol-container-inner ocio-omega-tiles-twocol-footer-inner panel-panel-inner span12">
<?php print $content['footer']; ?>
</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_buttons.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_buttons.scss
index a9da63cc..811a018f 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_buttons.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_buttons.scss
@@ -16,4 +16,10 @@ html body .button,
#edit-preview,
.webform-submit {
@extend .red-button;
+
+ &.ext .ext {
+ background-image: none;
+ padding: 0;
+ width: 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 144fef32..da9b2f31 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
@@ -32,6 +32,7 @@ p.search-result__snippet {
.l-region--main-menu {
#search-block-toggle {
cursor: pointer;
+ padding: 0.75em 0.9em;
}
.block--search {
@@ -86,7 +87,7 @@ p.search-result__snippet {
position: absolute;
padding: 1em;
font-size: 1.2em;
- z-index: 500;
+ z-index: 501;
width: auto;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_users.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_users.scss
index 3677b1ba..6f76a6a0 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_users.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_users.scss
@@ -1,4 +1,92 @@
-.view-user-directory {
+//user profile pages
+.user-profile {
+ .group-left {
-
+ }
+}
+
+
+//photos
+
+.views-field-field-user-photo {
+ img {
+ border: 1px solid lighten($md-gray,15%);
+ }
}
+
+
+
+//leadership and directory listings
+.view-id-leadership_listing {
+ padding-top: 2em;
+
+ // 2 columns
+ .views-row {
+ @include pie-clearfix;
+ margin-bottom: 3em;
+ width: 47%;
+ float: left;
+ margin-right: 6%;
+ }
+ .views-row:nth-child(2n) {
+ margin-right: 0;
+ }
+
+ // 3 columns
+ @include breakpoint ($tab, true){
+ .views-row,
+ .views-row:nth-child(2n) {
+ width: 31.5%;
+ margin-right: 2.75%;
+ }
+
+ .views-row:nth-child(3n) {
+ margin-right: 0;
+ }
+ }
+
+ // 4 columns
+ @include breakpoint ($wide, true){
+ .views-row,
+ .views-row:nth-child(2n),
+ .views-row:nth-child(3n) {
+ width: 23.125%;
+ margin-right: 2.5%;
+ }
+
+ .views-row:nth-child(4n) {
+ margin-right: 0;
+ }
+
+ }
+
+
+
+ .views-field-realname h2 {
+ @include font-size(2.1);
+ margin-top: 0.6em;
+ margin-bottom: 0.2em;
+
+ a:hover {
+ color: $blue;
+ }
+
+ }
+
+ .views-field-field-job-title,
+ .views-field-mail {
+ @include font-size(1.3);
+ line-height: 150%;
+ font-weight: 400;
+
+ a {
+ color: $dk-gray;
+ &:hover {
+ color: $red;
+ }
+
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_main-menu.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_main-menu.scss
index 29b7f7a6..f3951c14 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_main-menu.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_main-menu.scss
@@ -91,8 +91,9 @@
& > li > a {
@include link-colors($md-gray, $dk-gray, $dk-gray, $md-gray, $red);
}
+
li .nolink {
- color: $md-gray;
+ color: $md-gray;
}
}
@@ -116,8 +117,9 @@
& > li > a {
@include link-colors($md-gray, $black, $dk-gray, $md-gray, $red);
}
+
li .nolink {
- color: $md-gray;
+ color: $md-gray;
}
}
@@ -141,8 +143,9 @@
& > li > a {
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
+
li .nolink {
- color: $white;
+ color: $white;
}
}
@@ -166,8 +169,9 @@
& > li > a {
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
+
li .nolink {
- color: $white;
+ color: $white;
}
}
@@ -191,8 +195,9 @@
& > li > a {
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
+
li .nolink {
- color: $white;
+ color: $white;
}
}
@@ -201,16 +206,16 @@
}
}
-&.red {
+ &.red {
background-color: $red;
ul.menu {
& > li > a {
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
-
+
li .nolink {
- color: $white;
+ color: $white;
}
}
@@ -232,7 +237,6 @@
}
}
-
/* styles to add triangle to top of superfish submenus */
.sf-menu ul:before {
@@ -248,14 +252,13 @@
z-index: 2;
}
-
/* styles for mobile mean menu */
.mean-container .mean-bar, .mean-container .mean-nav {
background: none;
}
.mean-container .mean-bar {
- z-index: 500;
+ z-index: 501;
}
.mean-container a.meanmenu-reveal {
@@ -266,32 +269,32 @@
text-align: center;
}
-.mean-container .mean-nav ul li a,
+.mean-container .mean-nav ul li a,
.mean-container .mean-nav ul li span.nolink {
- display:block;
- float:left;
- width:90%;
- padding:1em 5%;
- margin:0;
- text-align:left;
- color:#fff;
- border-top:1px solid #383838;
- border-top:1px solid rgba(255,255,255,.5);
- text-decoration:none;
- text-transform:uppercase;
- font-weight: 500;
+ display: block;
+ float: left;
+ width: 90%;
+ padding: 1em 5%;
+ margin: 0;
+ text-align: left;
+ color: #fff;
+ border-top: 1px solid #383838;
+ border-top: 1px solid rgba(255, 255, 255, 0.5);
+ text-decoration: none;
+ text-transform: uppercase;
+ font-weight: 500;
}
.mean-container .mean-nav ul li a.mean-expand {
- background: rgba(255,255,255,0);
- border: 0 !important;
+ background: rgba(255, 255, 255, 0);
+ border: 0 !important;
}
+
.mean-container .mean-nav ul li a.mean-expand:hover {
- background:rgba(0,0,0,0)
+ background: rgba(0, 0, 0, 0);
}
.l-region--main-menu {
-
&.white.mean-container {
background: $white;
border-bottom: 1px solid darken($lt-gray, 10%);
@@ -300,26 +303,26 @@
a.meanmenu-reveal, .mean-nav a, span.nolink {
color: $md-gray;
}
-
+
.mean-bar, .mean-nav {
background: $white;
}
- .mean-nav ul li a,
+ .mean-nav ul li a,
.mean-nav ul li span.nolink {
border-top: 1px solid darken($lt-gray, 10%) !important;
}
-
+
.mean-nav ul li a.mean-expand {
- background: rgba(255,255,255,0);
- border: 0 !important;
- }
+ background: rgba(255, 255, 255, 0);
+ border: 0 !important;
+ }
}
&.lt-gray.mean-container {
background: $lt-gray;
- a.meanmenu-reveal, .mean-nav a, span.nolink {
+ a.meanmenu-reveal, .mean-nav a, span.nolink {
color: $md-gray;
}
@@ -327,25 +330,23 @@
background: $lt-gray;
}
- .mean-nav ul li a, span.nolink {
+ .mean-nav ul li a, span.nolink {
border-top: 1px solid darken($lt-gray, 10%) !important;
}
-
+
.mean-nav ul li a.mean-expand {
- background: rgba(255,255,255,0);
- border: 0 !important;
- }
+ background: rgba(255, 255, 255, 0);
+ border: 0 !important;
+ }
}
-
+
&.md-gray.mean-container {
a.meanmenu-reveal, .mean-nav a, span.nolink {
color: $white;
}
}
-
}
-
@include breakpoint($tab, true) {
.l-region--main-menu {
& > * {
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_pre-footer.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_pre-footer.scss
index 57ea13f5..e69de29b 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_pre-footer.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_pre-footer.scss
@@ -1,3 +0,0 @@
-.l-region--pre-footer-wrapper {
- margin-bottom: -0.6em;
-}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_leadership.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_leadership.scss
deleted file mode 100644
index 91ac0813..00000000
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_leadership.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-.view-id-leadership_listing {
- .views-row-1 {
- margin-top: 2.4em;
- }
-}
-
-
-.view-mode-leadership_listing {
-
- .field--name-field-user-photo {
- float: left;
- margin-right: 1.4em;
- margin-bottom: 0.6em;
- }
-
- .field--name-name {
- h2 {
- @include font-size(3.2);
- padding-top: 10px;
- }
- margin-bottom: 0.2em;
- }
-
- .field--name-field-job-title {
- @include font-size(2.2);
- margin-bottom: 0.3em;
- }
-
- .field--name-email {
- @include font-size(1.8);
- }
-
- .field--name-field-bio {
- clear: both;
- }
-
-}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_base/templates/panes/panels-pane--mm-widgets-live-pane.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/templates/panes/panels-pane--mm-widgets-live-pane.tpl.php
index 297d17af..426dec76 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/templates/panes/panels-pane--mm-widgets-live-pane.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/templates/panes/panels-pane--mm-widgets-live-pane.tpl.php
@@ -36,7 +36,6 @@
</<?php print $title_heading; ?>>
<?php endif; ?>
<?php print render($title_suffix); ?>
-
<?php if ($feeds): ?>
<div class="feed">
<?php print $feeds; ?>
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index 122ff6e8..a1f2ff55 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -77,7 +77,7 @@ projects[token_filter][subdir] = contrib
projects[views_accordion][version] = 1.1
projects[views_accordion][subdir] = contrib
-projects[views_bulk_operations][version] = 3.2
+projects[views_bulk_operations][version] = 3.3
projects[views_bulk_operations][subdir] = contrib
projects[webform][version] = 4.8
--
GitLab