From c272ddd5f01506de56429d7794dd73fd6b74fed8 Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Wed, 24 Jun 2015 08:46:32 -0400
Subject: [PATCH] daily build
---
profiles/wcm_base/build-wcm_base-dev.make | 3 +-
.../wysiwyg/editors/js/ckeditor-3.0.js | 3 +
.../contrib/wysiwyg/tests/wysiwyg_test.info | 6 +-
.../modules/contrib/wysiwyg/wysiwyg.api.js | 22 +
.../modules/contrib/wysiwyg/wysiwyg.info | 6 +-
.../modules/contrib/wysiwyg/wysiwyg.init.js | 2 +-
.../modules/contrib/wysiwyg/wysiwyg.install | 25 +-
.../modules/contrib/wysiwyg/wysiwyg.js | 27 +
.../ocio_field_bases.features.field_base.inc | 173 ------
.../ocio_field_bases/ocio_field_bases.info | 10 +-
.../ocio_main_menu.strongarm.inc | 2 +-
.../custom/ocio_search/ocio_search.module | 5 +-
.../ocio_wysiwyg.features.wysiwyg.inc | 6 +-
...wcm_tile_panes.features.field_instance.inc | 1 -
.../wcm_tile_panes.features.inc | 8 +-
..._tile_panes.fieldable_panels_pane_type.inc | 12 +-
.../custom/wcm_tile_panes/wcm_tile_panes.info | 10 +-
.../custom/wcm_user_directory/README.md | 0
...wcm_user_directory.features.field_base.inc | 39 ++
...user_directory.features.field_instance.inc | 74 +++
.../wcm_user_directory.features.inc | 21 +
.../wcm_user_directory.info | 18 +
.../wcm_user_directory.module | 7 +
.../wcm_user_directory.views_default.inc | 78 +++
.../modules/custom/wcm_user_profile/README.md | 0
.../wcm_user_profile/wcm_user_profile.ds.inc | 76 +++
.../wcm_user_profile.features.field_base.inc | 181 ++++++
...m_user_profile.features.field_instance.inc | 514 ++++++++++++++++++
.../wcm_user_profile.features.inc | 60 ++
.../wcm_user_profile/wcm_user_profile.info | 35 ++
.../wcm_user_profile/wcm_user_profile.module | 7 +
.../css/layouts/ocio-3/ocio-3.layout.css | 28 +-
.../layouts/ocio-3/ocio-3.layout.no-query.css | 28 +-
.../ocio_omega_3/css/ocio-3.no-query.css | 28 +-
.../themes/ocio_omega_3/css/ocio-3.styles.css | 28 +-
.../ocio_omega_3/sass/base/_buttons.scss | 18 +-
.../ocio_omega_4/css/ocio-4.no-query.css | 65 ++-
.../themes/ocio_omega_4/css/ocio-4.styles.css | 69 ++-
.../ocio_omega_4/sass/base/_accordions.scss | 18 +
.../themes/ocio_omega_4/sass/base/_body.scss | 3 -
.../sass/components/regions/_main-menu.scss | 40 ++
.../ocio-default/ocio-default.layout.css | 44 +-
.../ocio-default.layout.no-query.css | 32 +-
.../css/ocio-omega-base.no-query.css | 287 ++++++----
.../css/ocio-omega-base.styles.css | 396 ++++++++++----
.../js/ocio-omega-base.behaviors.js | 109 +++-
.../panels/ocio-omega-threecol.css | 4 +-
.../preprocess/page.preprocess.inc | 4 +
.../ocio_omega_base/sass/base/_buttons.scss | 18 +-
.../sass/base/_layout-base.scss | 2 +-
.../ocio_omega_base/sass/base/_messages.scss | 2 +-
.../sass/components/_accordions.scss | 12 +-
.../sass/components/_featured-slideshow.scss | 7 +
.../sass/components/_search.scss | 126 ++---
.../sass/components/_tiles.scss | 105 +++-
.../sass/components/_workbench.scss | 2 +-
.../sass/components/regions/_footer.scss | 1 +
.../sass/components/regions/_main-menu.scss | 106 +++-
.../ocio_omega_base/sass/variables/_grid.scss | 14 +-
.../fieldable-panels-pane--tile-pane.tpl.php | 5 +-
.../themes/ocio_omega_base/theme-settings.php | 2 +
profiles/wcm_base/wcm_base.info | 4 +-
profiles/wcm_base/wcm_base.make | 18 +-
63 files changed, 2348 insertions(+), 708 deletions(-)
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_directory/README.md
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_base.inc
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_instance.inc
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.inc
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.info
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.module
create 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_profile/README.md
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.ds.inc
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_base.inc
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_instance.inc
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info
create mode 100644 profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.module
create mode 100644 profiles/wcm_base/themes/ocio_omega_4/sass/base/_accordions.scss
create mode 100644 profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_main-menu.scss
diff --git a/profiles/wcm_base/build-wcm_base-dev.make b/profiles/wcm_base/build-wcm_base-dev.make
index e0beec31..1bd2b717 100644
--- a/profiles/wcm_base/build-wcm_base-dev.make
+++ b/profiles/wcm_base/build-wcm_base-dev.make
@@ -36,11 +36,12 @@ projects[ocio_taxonomy][options][working-copy] = TRUE
projects[ocio_twitter][options][working-copy] = TRUE
projects[ocio_url_aliases][options][working-copy] = TRUE
projects[ocio_user_config][options][working-copy] = TRUE
-projects[ocio_user_directory][options][working-copy] = TRUE
projects[ocio_uuid_settings][options][working-copy] = TRUE
projects[ocio_workbench][options][working-copy] = TRUE
projects[ocio_wysiwyg][options][working-copy] = TRUE
projects[wcm_tile_panes][options][working-copy] = TRUE
+projects[wcm_user_directory][options][working-copy] = TRUE
+projects[wcm_user_profile][options][working-copy] = TRUE
;themes
projects[ocio_omega_base][options][working-copy] = TRUE
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/ckeditor-3.0.js b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/ckeditor-3.0.js
index 164b2bf4..36e0d8cc 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/ckeditor-3.0.js
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/ckeditor-3.0.js
@@ -2,6 +2,9 @@
CKEDITOR.disableAutoInline = true;
+// Exclude every id starting with 'cke_' in ajax_html_ids during AJAX requests.
+Drupal.wysiwyg.excludeIdSelectors.wysiwyg_ckeditor = ['[id^="cke_"]'];
+
Drupal.wysiwyg.editor.init.ckeditor = function(settings) {
// Plugins must only be loaded once. Only the settings from the first format
// will be used but they're identical anyway.
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info b/profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info
index c9e293c1..cd0d336e 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info
@@ -6,9 +6,9 @@ hidden = TRUE
dependencies[] = wysiwyg
files[] = wysiwyg_test.module
-; Information added by Drupal.org packaging script on 2015-06-04
-version = "7.x-2.2+58-dev"
+; Information added by Drupal.org packaging script on 2015-06-20
+version = "7.x-2.2+60-dev"
core = "7.x"
project = "wysiwyg"
-datestamp = "1433409487"
+datestamp = "1434841086"
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.api.js b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.api.js
index 0318b0b4..e9fc345a 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.api.js
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.api.js
@@ -95,3 +95,25 @@ Drupal.wysiwyg.plugins.awesome = {
return '<img src="' + settings.path + '/images/spacer.gif" alt="<--break->" title="<--break-->" class="wysiwyg-break drupal-content" />';
}
};
+
+/**
+ * Because some editors add a lot of new elements with the id attribute set,
+ * Wysiwyg provides a way to exclude such ids from the ajax_html_ids[] parameter
+ * sent in AJAX requests. Serverside POST limits such as PHP's max_input_vars
+ * could otherwise cause the request to be rejected.
+ *
+ * The filter gathers a list of jQuery selectors from a global list in
+ * Drupal.wysiwyg.excludeIdSelectors, joins them with a comma separator and
+ * wraps them in "[id]:not[...]", which is then run on the document the same way
+ * Drupal core gathers the ids on every AJAX request.
+ *
+ * To add to the filter, set a unique key to Drupal.wysiwyg.excludeIdSelectors
+ * and set its value to an Array holding one or more selector strings which
+ * would match the element(s) to exclude.
+ *
+ * Beware not to match elements which are not removed before the actual request
+ * is performed, or Drupal may accidentally reuse the same id for new elements.
+ *
+ * Below is a sample from ckeditor.inc matching every id starting with 'cke_'.
+ */
+Drupal.wysiwyg.excludeIdSelectors.wysiwyg_ckeditor = ['[id^="cke_"]'];
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info
index 79727889..2bb0827b 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info
@@ -9,9 +9,9 @@ configure = admin/config/content/wysiwyg
files[] = wysiwyg.module
files[] = tests/wysiwyg.test
-; Information added by Drupal.org packaging script on 2015-06-04
-version = "7.x-2.2+58-dev"
+; Information added by Drupal.org packaging script on 2015-06-20
+version = "7.x-2.2+60-dev"
core = "7.x"
project = "wysiwyg"
-datestamp = "1433409487"
+datestamp = "1434841086"
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.init.js b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.init.js
index 6ccdb314..92bb23ce 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.init.js
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.init.js
@@ -1,5 +1,5 @@
-Drupal.wysiwyg = Drupal.wysiwyg || { 'instances': {} };
+Drupal.wysiwyg = Drupal.wysiwyg || { 'instances': {}, 'excludeIdSelectors': {} };
Drupal.wysiwyg.editor = Drupal.wysiwyg.editor || { 'init': {}, 'attach': {}, 'detach': {}, 'instance': {} };
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.install b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.install
index b8480b15..61ec9753 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.install
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.install
@@ -55,7 +55,7 @@ function wysiwyg_schema() {
'description' => 'The {filter_format}.format of the text format.',
'type' => 'varchar',
'length' => 255,
- 'not null' => FALSE,
+ 'not null' => TRUE,
),
'status' => array(
'description' => 'Boolean indicating whether the format is enabled by default.',
@@ -66,9 +66,9 @@ function wysiwyg_schema() {
'size' => 'tiny',
),
),
+ 'primary key' => array('uid', 'format'),
'indexes' => array(
'uid' => array('uid'),
- 'format' => array('format'),
),
'foreign keys' => array(
'uid' => array(
@@ -352,3 +352,24 @@ function wysiwyg_update_7202() {
}
}
}
+
+/**
+ * Add primary index to {wysiwyg_user}.
+ */
+function wysiwyg_update_7203() {
+ db_drop_index('wysiwyg_user', 'uid');
+ db_drop_index('wysiwyg_user', 'format');
+ db_change_field('wysiwyg_user', 'format', 'format',
+ array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ ),
+ array(
+ 'primary key' => array('uid', 'format'),
+ 'indexes' => array(
+ 'uid' => array('uid'),
+ ),
+ )
+ );
+}
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.js b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.js
index ba1fb291..7a89c9f8 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.js
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.js
@@ -608,6 +608,33 @@ function callbackWrapper(name, context) {
}
}
+var oldBeforeSerialize = (Drupal.ajax ? Drupal.ajax.prototype.beforeSerialize : false);
+if (oldBeforeSerialize) {
+ /**
+ * Filter the ajax_html_ids list sent in AJAX requests.
+ *
+ * This overrides part of the form serializer to not include ids we know will
+ * not collide because editors are removed before those ids are reused.
+ *
+ * This avoids hitting like max_input_vars, which defaults to 1000,
+ * even with just a few active editor instances.
+ */
+ Drupal.ajax.prototype.beforeSerialize = function (element, options) {
+ var ret = oldBeforeSerialize.call(this, element, options);
+ var excludeSelectors = [];
+ $.each(Drupal.wysiwyg.excludeIdSelectors, function () {
+ if ($.isArray(this)) {
+ excludeSelectors = excludeSelectors.concat(this);
+ }
+ });
+ options.data['ajax_html_ids[]'] = [];
+ $('[id]:not(' + excludeSelectors.join(',') + ')').each(function () {
+ options.data['ajax_html_ids[]'].push(this.id);
+ });
+ return ret;
+ }
+}
+
/**
* Allow certain editor libraries to initialize before the DOM is loaded.
*/
diff --git a/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.features.field_base.inc b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.features.field_base.inc
index 382a3511..483b0f66 100644
--- a/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.features.field_base.inc
+++ b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.features.field_base.inc
@@ -58,31 +58,6 @@ function ocio_field_bases_field_default_field_bases() {
'type' => 'datetime',
);
- // Exported field_base: 'field_display_in_directory'
- $field_bases['field_display_in_directory'] = array(
- 'active' => 1,
- 'cardinality' => 1,
- 'deleted' => 0,
- 'entity_types' => array(),
- 'field_name' => 'field_display_in_directory',
- 'indexes' => array(
- 'value' => array(
- 0 => 'value',
- ),
- ),
- 'locked' => 0,
- 'module' => 'list',
- 'settings' => array(
- 'allowed_values' => array(
- 0 => 'no',
- 1 => 'yes',
- ),
- 'allowed_values_function' => '',
- ),
- 'translatable' => 0,
- 'type' => 'list_boolean',
- );
-
// Exported field_base: 'field_file_description'
$field_bases['field_file_description'] = array(
'active' => 1,
@@ -144,69 +119,6 @@ function ocio_field_bases_field_default_field_bases() {
'type' => 'text',
);
- // Exported field_base: 'field_first_name'
- $field_bases['field_first_name'] = array(
- 'active' => 1,
- 'cardinality' => 1,
- 'deleted' => 0,
- 'entity_types' => array(),
- 'field_name' => 'field_first_name',
- 'indexes' => array(
- 'format' => array(
- 0 => 'format',
- ),
- ),
- 'locked' => 0,
- 'module' => 'text',
- 'settings' => array(
- 'max_length' => 50,
- ),
- 'translatable' => 0,
- 'type' => 'text',
- );
-
- // Exported field_base: 'field_job_title'
- $field_bases['field_job_title'] = array(
- 'active' => 1,
- 'cardinality' => 1,
- 'deleted' => 0,
- 'entity_types' => array(),
- 'field_name' => 'field_job_title',
- 'indexes' => array(
- 'format' => array(
- 0 => 'format',
- ),
- ),
- 'locked' => 0,
- 'module' => 'text',
- 'settings' => array(
- 'max_length' => 255,
- ),
- 'translatable' => 0,
- 'type' => 'text',
- );
-
- // Exported field_base: 'field_last_name'
- $field_bases['field_last_name'] = array(
- 'active' => 1,
- 'cardinality' => 1,
- 'deleted' => 0,
- 'entity_types' => array(),
- 'field_name' => 'field_last_name',
- 'indexes' => array(
- 'format' => array(
- 0 => 'format',
- ),
- ),
- 'locked' => 0,
- 'module' => 'text',
- 'settings' => array(
- 'max_length' => 50,
- ),
- 'translatable' => 0,
- 'type' => 'text',
- );
-
// Exported field_base: 'field_ocio_body'
$field_bases['field_ocio_body'] = array(
'active' => 1,
@@ -255,90 +167,5 @@ function ocio_field_bases_field_default_field_bases() {
'type' => 'link_field',
);
- // Exported field_base: 'field_phone'
- $field_bases['field_phone'] = array(
- 'active' => 1,
- 'cardinality' => 1,
- 'deleted' => 0,
- 'entity_types' => array(),
- 'field_name' => 'field_phone',
- 'indexes' => array(
- 'format' => array(
- 0 => 'format',
- ),
- ),
- 'locked' => 0,
- 'module' => 'text',
- 'settings' => array(
- 'max_length' => 20,
- ),
- 'translatable' => 0,
- 'type' => 'text',
- );
-
- // Exported field_base: 'field_room_and_building'
- $field_bases['field_room_and_building'] = array(
- 'active' => 1,
- 'cardinality' => 1,
- 'deleted' => 0,
- 'entity_types' => array(),
- 'field_name' => 'field_room_and_building',
- 'indexes' => array(
- 'format' => array(
- 0 => 'format',
- ),
- ),
- 'locked' => 0,
- 'module' => 'text',
- 'settings' => array(
- 'max_length' => 255,
- ),
- 'translatable' => 0,
- 'type' => 'text',
- );
-
- // Exported field_base: 'field_street_address'
- $field_bases['field_street_address'] = array(
- 'active' => 1,
- 'cardinality' => 1,
- 'deleted' => 0,
- 'entity_types' => array(),
- 'field_name' => 'field_street_address',
- 'indexes' => array(
- 'format' => array(
- 0 => 'format',
- ),
- ),
- 'locked' => 0,
- 'module' => 'text',
- 'settings' => array(
- 'max_length' => 255,
- ),
- 'translatable' => 0,
- 'type' => 'text',
- );
-
- // Exported field_base: 'field_user_photo'
- $field_bases['field_user_photo'] = array(
- 'active' => 1,
- 'cardinality' => 1,
- 'deleted' => 0,
- 'entity_types' => array(),
- 'field_name' => 'field_user_photo',
- 'indexes' => array(
- 'fid' => array(
- 0 => 'fid',
- ),
- ),
- 'locked' => 0,
- 'module' => 'image',
- 'settings' => array(
- 'default_image' => 6,
- 'uri_scheme' => 'public',
- ),
- 'translatable' => 0,
- 'type' => 'image',
- );
-
return $field_bases;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.info b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.info
index 16c8c047..ece7bb85 100644
--- a/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.info
+++ b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.info
@@ -1,5 +1,5 @@
name = OCIO Field Bases
-description = Feature for all field bases. Field instances will be stored with each content type.
+description = Field bases for all content types. Field instances will be stored with each content type. User field bases are not included.
core = 7.x
package = OCIO Features
version = 7.x-1.0
@@ -16,18 +16,10 @@ features[ctools][] = linkit:linkit_profiles:1
features[features_api][] = api:2
features[field_base][] = field_answer
features[field_base][] = field_date
-features[field_base][] = field_display_in_directory
features[field_base][] = field_file_description
features[field_base][] = field_file_image_alt_text
features[field_base][] = field_file_image_title_text
-features[field_base][] = field_first_name
-features[field_base][] = field_job_title
-features[field_base][] = field_last_name
features[field_base][] = field_ocio_body
features[field_base][] = field_ocio_link
-features[field_base][] = field_phone
-features[field_base][] = field_room_and_building
-features[field_base][] = field_street_address
-features[field_base][] = field_user_photo
features[linkit_profiles][] = ocio_field_linkit
features_exclude[taxonomy][ocio_tags] = ocio_tags
diff --git a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.strongarm.inc
index a8da5d65..58ec8797 100644
--- a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.strongarm.inc
@@ -233,7 +233,7 @@ function ocio_main_menu_strongarm() {
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'responsive_menus_mean_menu_media_size';
- $strongarm->value = '700';
+ $strongarm->value = '760';
$export['responsive_menus_mean_menu_media_size'] = $strongarm;
$strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.module b/profiles/wcm_base/modules/custom/ocio_search/ocio_search.module
index 56f9df96..7184788c 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.module
+++ b/profiles/wcm_base/modules/custom/ocio_search/ocio_search.module
@@ -36,6 +36,7 @@ function ocio_search_solr_post_schema() {
* Implements hook_form_FORM_ID_alter().
*/
function ocio_search_form_search_block_form_alter(&$form, &$form_state) {
- $form['actions']['submit']['#prefix'] = '<button class="search-button" tabindex="-1"><i class="fa fa-search"></i>';
- $form['actions']['submit']['#suffix'] = '</button>';
+ $form['#prefix'] = '<i id="search-block-toggle" class="fa fa-search" title="Toggle Search" tabindex="0"></i>';
+ $form['search_block_form']['#attributes']['placeholder'] = t('Search');
+ $form['actions']['submit']['#value'] = t('Go');
}
diff --git a/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.features.wysiwyg.inc b/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.features.wysiwyg.inc
index 6e94c231..d173f996 100644
--- a/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.features.wysiwyg.inc
+++ b/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.features.wysiwyg.inc
@@ -62,9 +62,9 @@ function ocio_wysiwyg_wysiwyg_default_profiles() {
'acf_allowed_content' => '',
'css_setting' => 'none',
'css_path' => '',
- 'stylesSet' => 'Image Left=span.img-left
-Image Right=span.img-right
-',
+ 'stylesSet' => 'Image Left=span.img-left
+Image Right=span.img-right
+Button=a.button',
'block_formats' => 'p,h2,h3,h4',
'advanced__active_tab' => 'edit-basic',
'forcePasteAsPlainText' => 0,
diff --git a/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.field_instance.inc b/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.field_instance.inc
index 4ebf4ac0..362dac9c 100644
--- a/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.field_instance.inc
@@ -140,7 +140,6 @@ function wcm_tile_panes_field_default_field_instances() {
),
);
-
// Exported field_instance: 'fieldable_panels_pane-tile_pane_plus_text_area-field_tile_background_img'
$field_instances['fieldable_panels_pane-tile_pane_plus_text_area-field_tile_background_img'] = array(
'bundle' => 'tile_pane_plus_text_area',
diff --git a/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.inc b/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.inc
index 0dd940c1..fc08621b 100644
--- a/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.inc
@@ -29,8 +29,8 @@ function wcm_tile_panes_image_default_styles() {
1 => array(
'name' => 'image_scale_and_crop',
'data' => array(
- 'width' => 600,
- 'height' => 520,
+ 'width' => 800,
+ 'height' => 700,
),
'weight' => 1,
),
@@ -44,8 +44,8 @@ function wcm_tile_panes_image_default_styles() {
2 => array(
'name' => 'image_scale_and_crop',
'data' => array(
- 'width' => 600,
- 'height' => 400,
+ 'width' => 800,
+ 'height' => 640,
),
'weight' => 1,
),
diff --git a/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.fieldable_panels_pane_type.inc b/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.fieldable_panels_pane_type.inc
index 4a0737b3..44aef8cf 100644
--- a/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.fieldable_panels_pane_type.inc
+++ b/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.fieldable_panels_pane_type.inc
@@ -13,18 +13,18 @@ function wcm_tile_panes_default_fieldable_panels_pane_type() {
$fieldable_panels_pane_type = new stdClass();
$fieldable_panels_pane_type->disabled = FALSE; /* Edit this to true to make a default fieldable_panels_pane_type disabled initially */
$fieldable_panels_pane_type->api_version = 1;
- $fieldable_panels_pane_type->name = 'tile_pane_plus_text_area';
- $fieldable_panels_pane_type->title = 'Tile Pane Plus Text Area';
+ $fieldable_panels_pane_type->name = 'tile_pane';
+ $fieldable_panels_pane_type->title = 'Tile Pane';
$fieldable_panels_pane_type->description = '';
- $export['tile_pane_plus_text_area'] = $fieldable_panels_pane_type;
+ $export['tile_pane'] = $fieldable_panels_pane_type;
$fieldable_panels_pane_type = new stdClass();
$fieldable_panels_pane_type->disabled = FALSE; /* Edit this to true to make a default fieldable_panels_pane_type disabled initially */
$fieldable_panels_pane_type->api_version = 1;
- $fieldable_panels_pane_type->name = 'tile_pane';
- $fieldable_panels_pane_type->title = 'Tile Pane';
+ $fieldable_panels_pane_type->name = 'tile_pane_plus_text_area';
+ $fieldable_panels_pane_type->title = 'Tile Pane Plus Text Area';
$fieldable_panels_pane_type->description = '';
- $export['tile_pane'] = $fieldable_panels_pane_type;
+ $export['tile_pane_plus_text_area'] = $fieldable_panels_pane_type;
return $export;
}
diff --git a/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.info b/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.info
index 32af6aab..41e03c6a 100644
--- a/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.info
+++ b/profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.info
@@ -1,7 +1,7 @@
name = WCM Tile Panes
description = Contains two types of tile panes to be used via panels on WCM sites.
core = 7.x
-package = OCIO Features
+package = WCM Features
version = 7.x-1.0
project = wcm_tile_panes
dependencies[] = ctools
@@ -17,15 +17,15 @@ features[features_api][] = api:2
features[field_base][] = field_tile_background_img
features[field_base][] = field_tile_link
features[field_base][] = field_tile_text_area
+features[field_instance][] = fieldable_panels_pane-tile_pane-field_tile_background_img
+features[field_instance][] = fieldable_panels_pane-tile_pane-field_tile_link
features[field_instance][] = fieldable_panels_pane-tile_pane_plus_text_area-field_tile_background_img
features[field_instance][] = fieldable_panels_pane-tile_pane_plus_text_area-field_tile_link
features[field_instance][] = fieldable_panels_pane-tile_pane_plus_text_area-field_tile_text_area
-features[field_instance][] = fieldable_panels_pane-tile_pane-field_tile_background_img
-features[field_instance][] = fieldable_panels_pane-tile_pane-field_tile_link
-features[fieldable_panels_pane_type][] = tile_pane_plus_text_area
features[fieldable_panels_pane_type][] = tile_pane
+features[fieldable_panels_pane_type][] = tile_pane_plus_text_area
features[image][] = tile_pane
features[image][] = tile_pane_plus
-features[variable][] = field_bundle_settings_fieldable_panels_pane__tile_pane_plus_text_area
features[variable][] = field_bundle_settings_fieldable_panels_pane__tile_pane
+features[variable][] = field_bundle_settings_fieldable_panels_pane__tile_pane_plus_text_area
features_exclude[dependencies][media] = media
diff --git a/profiles/wcm_base/modules/custom/wcm_user_directory/README.md b/profiles/wcm_base/modules/custom/wcm_user_directory/README.md
new file mode 100644
index 00000000..e69de29b
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
new file mode 100644
index 00000000..bb27cdd7
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_base.inc
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @file
+ * wcm_user_directory.features.field_base.inc
+ */
+
+/**
+ * Implements hook_field_default_field_bases().
+ */
+function wcm_user_directory_field_default_field_bases() {
+ $field_bases = array();
+
+ // Exported field_base: 'field_display_in_directory'
+ $field_bases['field_display_in_directory'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_display_in_directory',
+ 'indexes' => array(
+ 'value' => array(
+ 0 => 'value',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'list',
+ 'settings' => array(
+ 'allowed_values' => array(
+ 0 => 'no',
+ 1 => 'yes',
+ ),
+ 'allowed_values_function' => '',
+ ),
+ 'translatable' => 0,
+ 'type' => 'list_boolean',
+ );
+
+ return $field_bases;
+}
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
new file mode 100644
index 00000000..d316ced0
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_instance.inc
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @file
+ * wcm_user_directory.features.field_instance.inc
+ */
+
+/**
+ * Implements hook_field_default_field_instances().
+ */
+function wcm_user_directory_field_default_field_instances() {
+ $field_instances = array();
+
+ // Exported field_instance: 'user-user-field_display_in_directory'
+ $field_instances['user-user-field_display_in_directory'] = array(
+ 'bundle' => 'user',
+ 'default_value' => array(
+ 0 => array(
+ 'value' => 0,
+ ),
+ ),
+ 'deleted' => 0,
+ 'description' => 'Check this box if this person should be included in the departmental "people" directory. ',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 7,
+ ),
+ 'directory' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 10,
+ ),
+ 'featured' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'full' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 12,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_display_in_directory',
+ 'label' => 'Display in Directory',
+ 'required' => 0,
+ 'settings' => array(
+ 'user_register_form' => 1,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'options',
+ 'settings' => array(
+ 'display_label' => 1,
+ ),
+ 'type' => 'options_onoff',
+ 'weight' => 8,
+ ),
+ );
+
+ // 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('Display in Directory');
+
+ return $field_instances;
+}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.inc b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.inc
new file mode 100644
index 00000000..6a52415c
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.inc
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @file
+ * wcm_user_directory.features.inc
+ */
+
+/**
+ * Implements hook_ctools_plugin_api().
+ */
+function wcm_user_directory_ctools_plugin_api($module = NULL, $api = NULL) {
+ if ($module == "ds" && $api == "ds") {
+ return array("version" => "1");
+ }
+}
+
+/**
+ * Implements hook_views_api().
+ */
+function wcm_user_directory_views_api($module = NULL, $api = NULL) {
+ return array("api" => "3.0");
+}
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
new file mode 100644
index 00000000..97d48557
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.info
@@ -0,0 +1,18 @@
+name = WCM User Directory
+description = Directory view and settings for a departmental directory on WCM sites.
+core = 7.x
+package = WCM Features
+version = 7.x-1.0
+project = wcm_user_directory
+dependencies[] = features
+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_display_in_directory
+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.module b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.module
new file mode 100644
index 00000000..0639d6d6
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.module
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @file
+ * Code for the WCM User Directory feature.
+ */
+
+include_once 'wcm_user_directory.features.inc';
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
new file mode 100644
index 00000000..44c1d07f
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.views_default.inc
@@ -0,0 +1,78 @@
+<?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['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: Name */
+ $handler->display->display_options['fields']['name']['id'] = 'name';
+ $handler->display->display_options['fields']['name']['table'] = 'users';
+ $handler->display->display_options['fields']['name']['field'] = 'name';
+ $handler->display->display_options['fields']['name']['label'] = '';
+ $handler->display->display_options['fields']['name']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['name']['alter']['ellipsis'] = FALSE;
+ /* 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'] = 'people';
+ $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_profile/README.md b/profiles/wcm_base/modules/custom/wcm_user_profile/README.md
new file mode 100644
index 00000000..e69de29b
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
new file mode 100644
index 00000000..ab46a5ed
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.ds.inc
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @file
+ * wcm_user_profile.ds.inc
+ */
+
+/**
+ * Implements hook_ds_layout_settings_info().
+ */
+function wcm_user_profile_ds_layout_settings_info() {
+ $export = array();
+
+ $ds_layout = new stdClass();
+ $ds_layout->api_version = 1;
+ $ds_layout->id = 'user|user|form';
+ $ds_layout->entity_type = 'user';
+ $ds_layout->bundle = 'user';
+ $ds_layout->view_mode = 'form';
+ $ds_layout->layout = 'ds_2col_stacked';
+ $ds_layout->settings = array(
+ 'regions' => array(
+ 'left' => array(
+ 0 => 'account',
+ ),
+ 'right' => array(
+ 1 => 'field_first_name',
+ 2 => 'field_last_name',
+ 3 => 'field_job_title',
+ 4 => 'field_phone',
+ 5 => 'field_room_and_building',
+ 6 => 'field_street_address',
+ 7 => 'field_user_photo',
+ 8 => 'field_display_in_directory',
+ ),
+ 'footer' => array(
+ 9 => 'field_bio',
+ 10 => 'wysiwyg',
+ 11 => 'timezone',
+ ),
+ 'hidden' => array(
+ 12 => '_add_existing_field',
+ ),
+ ),
+ 'fields' => array(
+ 'account' => 'left',
+ 'field_first_name' => 'right',
+ 'field_last_name' => 'right',
+ 'field_job_title' => 'right',
+ 'field_phone' => 'right',
+ 'field_room_and_building' => 'right',
+ 'field_street_address' => 'right',
+ 'field_user_photo' => 'right',
+ 'field_display_in_directory' => 'right',
+ 'field_bio' => 'footer',
+ 'wysiwyg' => 'footer',
+ 'timezone' => 'footer',
+ '_add_existing_field' => 'hidden',
+ ),
+ 'classes' => array(),
+ 'wrappers' => array(
+ 'header' => 'div',
+ 'left' => 'div',
+ 'right' => 'div',
+ 'footer' => 'div',
+ 'ds_hidden' => 'div',
+ ),
+ 'layout_wrapper' => 'div',
+ 'layout_attributes' => '',
+ 'layout_attributes_merge' => 1,
+ 'layout_link_attribute' => '',
+ 'layout_link_custom' => '',
+ );
+ $export['user|user|form'] = $ds_layout;
+
+ return $export;
+}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_base.inc b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_base.inc
new file mode 100644
index 00000000..32ff7004
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_base.inc
@@ -0,0 +1,181 @@
+<?php
+/**
+ * @file
+ * wcm_user_profile.features.field_base.inc
+ */
+
+/**
+ * Implements hook_field_default_field_bases().
+ */
+function wcm_user_profile_field_default_field_bases() {
+ $field_bases = array();
+
+ // Exported field_base: 'field_bio'
+ $field_bases['field_bio'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_bio',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(),
+ 'translatable' => 0,
+ 'type' => 'text_long',
+ );
+
+ // Exported field_base: 'field_first_name'
+ $field_bases['field_first_name'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_first_name',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(
+ 'max_length' => 50,
+ ),
+ 'translatable' => 0,
+ 'type' => 'text',
+ );
+
+ // Exported field_base: 'field_job_title'
+ $field_bases['field_job_title'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_job_title',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(
+ 'max_length' => 255,
+ ),
+ 'translatable' => 0,
+ 'type' => 'text',
+ );
+
+ // Exported field_base: 'field_last_name'
+ $field_bases['field_last_name'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_last_name',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(
+ 'max_length' => 50,
+ ),
+ 'translatable' => 0,
+ 'type' => 'text',
+ );
+
+ // Exported field_base: 'field_phone'
+ $field_bases['field_phone'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_phone',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(
+ 'max_length' => 20,
+ ),
+ 'translatable' => 0,
+ 'type' => 'text',
+ );
+
+ // Exported field_base: 'field_room_and_building'
+ $field_bases['field_room_and_building'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_room_and_building',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(
+ 'max_length' => 255,
+ ),
+ 'translatable' => 0,
+ 'type' => 'text',
+ );
+
+ // Exported field_base: 'field_street_address'
+ $field_bases['field_street_address'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_street_address',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(
+ 'max_length' => 255,
+ ),
+ 'translatable' => 0,
+ 'type' => 'text',
+ );
+
+ // Exported field_base: 'field_user_photo'
+ $field_bases['field_user_photo'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_user_photo',
+ 'indexes' => array(
+ 'fid' => array(
+ 0 => 'fid',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'image',
+ 'settings' => array(
+ 'default_image' => 0,
+ 'uri_scheme' => 'public',
+ ),
+ 'translatable' => 0,
+ 'type' => 'image',
+ );
+
+ return $field_bases;
+}
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
new file mode 100644
index 00000000..a91c6cd7
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_instance.inc
@@ -0,0 +1,514 @@
+<?php
+/**
+ * @file
+ * wcm_user_profile.features.field_instance.inc
+ */
+
+/**
+ * Implements hook_field_default_field_instances().
+ */
+function wcm_user_profile_field_default_field_instances() {
+ $field_instances = array();
+
+ // Exported field_instance: 'user-user-field_bio'
+ $field_instances['user-user-field_bio'] = array(
+ 'bundle' => 'user',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 6,
+ ),
+ 'directory' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'featured' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'full' => array(
+ 'label' => 'above',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 6,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_bio',
+ 'label' => 'Bio',
+ 'required' => 0,
+ 'settings' => array(
+ 'linkit' => array(
+ 'button_text' => 'Search',
+ 'enable' => 0,
+ 'profile' => '',
+ ),
+ 'text_processing' => 1,
+ 'user_register_form' => 1,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'rows' => 5,
+ ),
+ 'type' => 'text_textarea',
+ 'weight' => 9,
+ ),
+ );
+
+ // Exported field_instance: 'user-user-field_first_name'
+ $field_instances['user-user-field_first_name'] = array(
+ 'bundle' => 'user',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 9,
+ ),
+ 'directory' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 8,
+ ),
+ 'featured' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'full' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 10,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_first_name',
+ 'label' => 'First Name',
+ 'required' => 1,
+ 'settings' => array(
+ 'text_processing' => 0,
+ 'user_register_form' => 1,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'size' => 50,
+ ),
+ 'type' => 'text_textfield',
+ 'weight' => 1,
+ ),
+ );
+
+ // Exported field_instance: 'user-user-field_job_title'
+ $field_instances['user-user-field_job_title'] = array(
+ 'bundle' => 'user',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 0,
+ ),
+ 'directory' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 2,
+ ),
+ 'featured' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'full' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 1,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_job_title',
+ 'label' => 'Title',
+ 'required' => 0,
+ 'settings' => array(
+ 'linkit' => array(
+ 'button_text' => 'Search',
+ 'enable' => 0,
+ 'profile' => '',
+ ),
+ 'text_processing' => 0,
+ 'user_register_form' => 1,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'size' => 60,
+ ),
+ 'type' => 'text_textfield',
+ 'weight' => 3,
+ ),
+ );
+
+ // Exported field_instance: 'user-user-field_last_name'
+ $field_instances['user-user-field_last_name'] = array(
+ 'bundle' => 'user',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 10,
+ ),
+ 'directory' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 9,
+ ),
+ 'featured' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'full' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 11,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_last_name',
+ 'label' => 'Last Name',
+ 'required' => 1,
+ 'settings' => array(
+ 'text_processing' => 0,
+ 'user_register_form' => 1,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'size' => 50,
+ ),
+ 'type' => 'text_textfield',
+ 'weight' => 2,
+ ),
+ );
+
+ // Exported field_instance: 'user-user-field_phone'
+ $field_instances['user-user-field_phone'] = array(
+ 'bundle' => 'user',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => 'Use the following format: 614-292-0000',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 1,
+ ),
+ 'directory' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 3,
+ ),
+ 'featured' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'full' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 3,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_phone',
+ 'label' => 'Phone',
+ 'required' => 0,
+ 'settings' => array(
+ 'linkit' => array(
+ 'button_text' => 'Search',
+ 'enable' => 0,
+ 'profile' => '',
+ ),
+ 'text_processing' => 0,
+ 'user_register_form' => 1,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'size' => 20,
+ ),
+ 'type' => 'text_textfield',
+ 'weight' => 4,
+ ),
+ );
+
+ // Exported field_instance: 'user-user-field_room_and_building'
+ $field_instances['user-user-field_room_and_building'] = array(
+ 'bundle' => 'user',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 3,
+ ),
+ 'directory' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_plain',
+ 'weight' => 4,
+ ),
+ 'featured' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'full' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 4,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_room_and_building',
+ 'label' => 'Room and Building',
+ 'required' => 0,
+ 'settings' => array(
+ 'linkit' => array(
+ 'button_text' => 'Search',
+ 'enable' => 0,
+ 'profile' => '',
+ ),
+ 'text_processing' => 0,
+ 'user_register_form' => 1,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'size' => 60,
+ ),
+ 'type' => 'text_textfield',
+ 'weight' => 5,
+ ),
+ );
+
+ // Exported field_instance: 'user-user-field_street_address'
+ $field_instances['user-user-field_street_address'] = array(
+ 'bundle' => 'user',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 4,
+ ),
+ 'directory' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_plain',
+ 'weight' => 5,
+ ),
+ 'featured' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'full' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 5,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_street_address',
+ 'label' => 'Street Address',
+ 'required' => 0,
+ 'settings' => array(
+ 'linkit' => array(
+ 'button_text' => 'Search',
+ 'enable' => 0,
+ 'profile' => '',
+ ),
+ 'text_processing' => 0,
+ 'user_register_form' => 1,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'size' => 60,
+ ),
+ 'type' => 'text_textfield',
+ 'weight' => 6,
+ ),
+ );
+
+ // Exported field_instance: 'user-user-field_user_photo'
+ $field_instances['user-user-field_user_photo'] = array(
+ 'bundle' => 'user',
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'image',
+ 'settings' => array(
+ 'image_link' => '',
+ 'image_style' => 'user_picture',
+ ),
+ 'type' => 'image',
+ 'weight' => 2,
+ ),
+ 'directory' => array(
+ 'label' => 'hidden',
+ 'module' => 'image',
+ 'settings' => array(
+ 'image_link' => '',
+ 'image_style' => 'user_picture_thumbnail',
+ ),
+ 'type' => 'image',
+ 'weight' => 0,
+ ),
+ 'featured' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'full' => array(
+ 'label' => 'hidden',
+ 'module' => 'image',
+ 'settings' => array(
+ 'image_link' => '',
+ 'image_style' => 'user_picture',
+ ),
+ 'type' => 'image',
+ 'weight' => 0,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_user_photo',
+ 'label' => 'User Photo',
+ 'required' => 0,
+ 'settings' => array(
+ 'alt_field' => 0,
+ 'default_image' => 0,
+ 'file_directory' => 'user-photos',
+ 'file_extensions' => 'png jpg jpeg',
+ 'max_filesize' => '500 kb',
+ 'max_resolution' => '600x600',
+ 'min_resolution' => '200x286',
+ 'title_field' => 0,
+ 'user_register_form' => 1,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'image',
+ 'settings' => array(
+ 'manualcrop_crop_info' => 1,
+ 'manualcrop_default_crop_area' => 1,
+ 'manualcrop_enable' => 1,
+ 'manualcrop_inline_crop' => 0,
+ 'manualcrop_instant_crop' => 0,
+ 'manualcrop_instant_preview' => 1,
+ 'manualcrop_keyboard' => 1,
+ 'manualcrop_maximize_default_crop_area' => 1,
+ 'manualcrop_require_cropping' => array(
+ 'user_picture' => 'user_picture',
+ ),
+ 'manualcrop_styles_list' => array(),
+ 'manualcrop_styles_mode' => 'include',
+ 'manualcrop_thumblist' => 0,
+ 'preview_image_style' => 'user_picture',
+ 'progress_indicator' => 'throbber',
+ ),
+ 'type' => 'image_image',
+ 'weight' => 7,
+ ),
+ );
+
+ // Translatables
+ // Included for use with string extractors like potx.
+ t('Bio');
+ t('First Name');
+ t('Last Name');
+ t('Phone');
+ t('Room and Building');
+ t('Street Address');
+ t('Title');
+ t('Use the following format: 614-292-0000');
+ t('User Photo');
+
+ return $field_instances;
+}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc
new file mode 100644
index 00000000..36778696
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @file
+ * wcm_user_profile.features.inc
+ */
+
+/**
+ * Implements hook_ctools_plugin_api().
+ */
+function wcm_user_profile_ctools_plugin_api($module = NULL, $api = NULL) {
+ if ($module == "ds" && $api == "ds") {
+ return array("version" => "1");
+ }
+ if ($module == "strongarm" && $api == "strongarm") {
+ return array("version" => "1");
+ }
+}
+
+/**
+ * Implements hook_image_default_styles().
+ */
+function wcm_user_profile_image_default_styles() {
+ $styles = array();
+
+ // Exported image style: user_picture.
+ $styles['user_picture'] = array(
+ 'label' => 'User Picture',
+ 'effects' => array(
+ 4 => array(
+ 'name' => 'manualcrop_crop_and_scale',
+ 'data' => array(
+ 'width' => 200,
+ 'height' => 286,
+ 'upscale' => 0,
+ 'respectminimum' => 1,
+ 'onlyscaleifcrop' => 0,
+ 'style_name' => 'user_picture',
+ ),
+ 'weight' => 1,
+ ),
+ ),
+ );
+
+ // Exported image style: user_picture_thumbnail.
+ $styles['user_picture_thumbnail'] = array(
+ 'label' => 'User Picture Thumbnail',
+ 'effects' => array(
+ 3 => array(
+ 'name' => 'image_scale_and_crop',
+ 'data' => array(
+ 'width' => 120,
+ 'height' => 172,
+ ),
+ 'weight' => 2,
+ ),
+ ),
+ );
+
+ return $styles;
+}
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
new file mode 100644
index 00000000..3bc20d4e
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info
@@ -0,0 +1,35 @@
+name = WCM User Profile
+description = User profile fields and settings for all WCM sites.
+core = 7.x
+package = WCM Features
+version = 7.x-1.0
+project = wcm_user_profile
+dependencies[] = ctools
+dependencies[] = ds
+dependencies[] = features
+dependencies[] = image
+dependencies[] = ocio_field_bases
+dependencies[] = strongarm
+dependencies[] = text
+features[ctools][] = ds:ds:1
+features[ctools][] = strongarm:strongarm:1
+features[ds_layout_settings][] = user|user|form
+features[features_api][] = api:2
+features[field_base][] = field_bio
+features[field_base][] = field_first_name
+features[field_base][] = field_job_title
+features[field_base][] = field_last_name
+features[field_base][] = field_phone
+features[field_base][] = field_room_and_building
+features[field_base][] = field_street_address
+features[field_base][] = field_user_photo
+features[field_instance][] = user-user-field_bio
+features[field_instance][] = user-user-field_first_name
+features[field_instance][] = user-user-field_job_title
+features[field_instance][] = user-user-field_last_name
+features[field_instance][] = user-user-field_phone
+features[field_instance][] = user-user-field_room_and_building
+features[field_instance][] = user-user-field_street_address
+features[field_instance][] = user-user-field_user_photo
+features[image][] = user_picture
+features[image][] = user_picture_thumbnail
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.module b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.module
new file mode 100644
index 00000000..66388483
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.module
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @file
+ * Code for the WCM User Profile feature.
+ */
+
+include_once 'wcm_user_profile.features.inc';
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 72d01719..cce8e916 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
@@ -5,9 +5,7 @@
******************************************************************************/
.red-button, input[type=button],
.button,
-#edit-submit,
-#edit-submit--2,
-#edit-submit--3,
+.form-submit,
#edit-preview,
.webform-submit {
font-size: 14px;
@@ -29,42 +27,32 @@
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover {
text-decoration: none;
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover {
background-color: #a20000;
}
.red-button:active, input[type=button]:active,
.button:active,
-#edit-submit:active,
-#edit-submit--2:active,
-#edit-submit--3:active,
+.form-submit:active,
#edit-preview:active,
.webform-submit:active {
background-color: #920000;
}
.red-button.disabled, input.disabled[type=button],
.disabled.button,
-.disabled#edit-submit,
-.disabled#edit-submit--2,
-.disabled#edit-submit--3,
+.disabled.form-submit,
.disabled#edit-preview,
.disabled.webform-submit, .red-button[disabled], input[disabled][type=button],
[disabled].button,
-[disabled]#edit-submit,
-[disabled]#edit-submit--2,
-[disabled]#edit-submit--3,
+[disabled].form-submit,
[disabled]#edit-preview,
[disabled].webform-submit {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
@@ -77,9 +65,7 @@
}
.red-button::-moz-focus-inner, input[type=button]::-moz-focus-inner,
.button::-moz-focus-inner,
-#edit-submit::-moz-focus-inner,
-#edit-submit--2::-moz-focus-inner,
-#edit-submit--3::-moz-focus-inner,
+.form-submit::-moz-focus-inner,
#edit-preview::-moz-focus-inner,
.webform-submit::-moz-focus-inner {
padding: 0 !important;
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 b368ab13..98cb0dd4 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
@@ -5,9 +5,7 @@
******************************************************************************/
.red-button, input[type=button],
.button,
-#edit-submit,
-#edit-submit--2,
-#edit-submit--3,
+.form-submit,
#edit-preview,
.webform-submit {
font-size: 14px;
@@ -29,42 +27,32 @@
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover {
text-decoration: none;
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover {
background-color: #a20000;
}
.red-button:active, input[type=button]:active,
.button:active,
-#edit-submit:active,
-#edit-submit--2:active,
-#edit-submit--3:active,
+.form-submit:active,
#edit-preview:active,
.webform-submit:active {
background-color: #920000;
}
.red-button.disabled, input.disabled[type=button],
.disabled.button,
-.disabled#edit-submit,
-.disabled#edit-submit--2,
-.disabled#edit-submit--3,
+.disabled.form-submit,
.disabled#edit-preview,
.disabled.webform-submit, .red-button[disabled], input[disabled][type=button],
[disabled].button,
-[disabled]#edit-submit,
-[disabled]#edit-submit--2,
-[disabled]#edit-submit--3,
+[disabled].form-submit,
[disabled]#edit-preview,
[disabled].webform-submit {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
@@ -77,9 +65,7 @@
}
.red-button::-moz-focus-inner, input[type=button]::-moz-focus-inner,
.button::-moz-focus-inner,
-#edit-submit::-moz-focus-inner,
-#edit-submit--2::-moz-focus-inner,
-#edit-submit--3::-moz-focus-inner,
+.form-submit::-moz-focus-inner,
#edit-preview::-moz-focus-inner,
.webform-submit::-moz-focus-inner {
padding: 0 !important;
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 194f3b12..8fec18b6 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
@@ -1,9 +1,7 @@
/* No files to import found in abstractions/**\/* */
.red-button, input[type=button],
.button,
-#edit-submit,
-#edit-submit--2,
-#edit-submit--3,
+.form-submit,
#edit-preview,
.webform-submit, .node-type-webform #edit-submitted-file-upload-button {
font-size: 14px;
@@ -25,42 +23,32 @@
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover, .node-type-webform #edit-submitted-file-upload-button:hover {
text-decoration: none;
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover, .node-type-webform #edit-submitted-file-upload-button:hover {
background-color: #a20000;
}
.red-button:active, input[type=button]:active,
.button:active,
-#edit-submit:active,
-#edit-submit--2:active,
-#edit-submit--3:active,
+.form-submit:active,
#edit-preview:active,
.webform-submit:active, .node-type-webform #edit-submitted-file-upload-button:active {
background-color: #920000;
}
.red-button.disabled, input.disabled[type=button],
.disabled.button,
-.disabled#edit-submit,
-.disabled#edit-submit--2,
-.disabled#edit-submit--3,
+.disabled.form-submit,
.disabled#edit-preview,
.disabled.webform-submit, .node-type-webform .disabled#edit-submitted-file-upload-button, .red-button[disabled], input[disabled][type=button],
[disabled].button,
-[disabled]#edit-submit,
-[disabled]#edit-submit--2,
-[disabled]#edit-submit--3,
+[disabled].form-submit,
[disabled]#edit-preview,
[disabled].webform-submit, .node-type-webform [disabled]#edit-submitted-file-upload-button {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
@@ -73,9 +61,7 @@
}
.red-button::-moz-focus-inner, input[type=button]::-moz-focus-inner,
.button::-moz-focus-inner,
-#edit-submit::-moz-focus-inner,
-#edit-submit--2::-moz-focus-inner,
-#edit-submit--3::-moz-focus-inner,
+.form-submit::-moz-focus-inner,
#edit-preview::-moz-focus-inner,
.webform-submit::-moz-focus-inner, .node-type-webform #edit-submitted-file-upload-button::-moz-focus-inner {
padding: 0 !important;
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 73c8826b..9bdbb790 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
@@ -1,9 +1,7 @@
/* No files to import found in abstractions/**\/* */
.red-button, input[type=button],
.button,
-#edit-submit,
-#edit-submit--2,
-#edit-submit--3,
+.form-submit,
#edit-preview,
.webform-submit, .node-type-webform #edit-submitted-file-upload-button {
font-size: 14px;
@@ -25,42 +23,32 @@
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover, .node-type-webform #edit-submitted-file-upload-button:hover {
text-decoration: none;
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover, .node-type-webform #edit-submitted-file-upload-button:hover {
background-color: #a20000;
}
.red-button:active, input[type=button]:active,
.button:active,
-#edit-submit:active,
-#edit-submit--2:active,
-#edit-submit--3:active,
+.form-submit:active,
#edit-preview:active,
.webform-submit:active, .node-type-webform #edit-submitted-file-upload-button:active {
background-color: #920000;
}
.red-button.disabled, input.disabled[type=button],
.disabled.button,
-.disabled#edit-submit,
-.disabled#edit-submit--2,
-.disabled#edit-submit--3,
+.disabled.form-submit,
.disabled#edit-preview,
.disabled.webform-submit, .node-type-webform .disabled#edit-submitted-file-upload-button, .red-button[disabled], input[disabled][type=button],
[disabled].button,
-[disabled]#edit-submit,
-[disabled]#edit-submit--2,
-[disabled]#edit-submit--3,
+[disabled].form-submit,
[disabled]#edit-preview,
[disabled].webform-submit, .node-type-webform [disabled]#edit-submitted-file-upload-button {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
@@ -73,9 +61,7 @@
}
.red-button::-moz-focus-inner, input[type=button]::-moz-focus-inner,
.button::-moz-focus-inner,
-#edit-submit::-moz-focus-inner,
-#edit-submit--2::-moz-focus-inner,
-#edit-submit--3::-moz-focus-inner,
+.form-submit::-moz-focus-inner,
#edit-preview::-moz-focus-inner,
.webform-submit::-moz-focus-inner, .node-type-webform #edit-submitted-file-upload-button::-moz-focus-inner {
padding: 0 !important;
diff --git a/profiles/wcm_base/themes/ocio_omega_3/sass/base/_buttons.scss b/profiles/wcm_base/themes/ocio_omega_3/sass/base/_buttons.scss
index 6a80a259..7bb13f82 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/sass/base/_buttons.scss
+++ b/profiles/wcm_base/themes/ocio_omega_3/sass/base/_buttons.scss
@@ -3,21 +3,17 @@
@import "sassy-buttons";
.red-button {
- @include sassy-button;
- text-transform: uppercase;
- font-family: $proxima;
- letter-spacing: 0.05em;
- font-weight: 400;
+ @include sassy-button;
+ text-transform: uppercase;
+ font-family: $proxima;
+ letter-spacing: 0.05em;
+ font-weight: 400;
}
input[type=button],
.button,
-#edit-submit,
-#edit-submit--2,
-#edit-submit--3,
+.form-submit,
#edit-preview,
.webform-submit {
- @extend .red-button;
+ @extend .red-button;
}
-
-
diff --git a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
index 62d04bd2..730465b6 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
@@ -1,6 +1,13 @@
/* No files to import found in abstractions/**\/* */
-.html {
- background: #ececec;
+.l-main.lt-gray .ui-accordion-header, .l-main.lt-gray .ui-accordion-header.ui-state-active, .l-main.lt-gray .ui-accordion-header.ui-state-default, .l-main.lt-gray .ui-accordion-header.ui-state-hover {
+ border: 0;
+ background-color: #cdcdcd;
+}
+.l-main.lt-gray .ui-accordion-content {
+ box-sizing: content-box;
+ background-color: #fff;
+ padding: 1.2em 1.9em 0.5em 1.9em;
+ border: 0px;
}
.red-button, .button,
@@ -375,3 +382,57 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.l-content {
padding: 0;
}
+
+.l-region--main-menu, .l-region--main-menu.white {
+ background-color: #fff;
+}
+.l-region--main-menu ul.menu ul, .l-region--main-menu.white ul.menu ul {
+ background-color: #cdcdcd;
+}
+.l-region--main-menu .sf-menu ul:before, .l-region--main-menu.white .sf-menu ul:before {
+ border-bottom-color: #cdcdcd;
+}
+.l-region--main-menu ul.menu > li > a, .l-region--main-menu ul.menu ul > li > a, .l-region--main-menu.white ul.menu > li > a, .l-region--main-menu.white ul.menu ul > li > a {
+ color: #666666;
+}
+.l-region--main-menu ul.menu > li > a:visited, .l-region--main-menu ul.menu ul > li > a:visited, .l-region--main-menu.white ul.menu > li > a:visited, .l-region--main-menu.white ul.menu ul > li > a:visited {
+ color: #666666;
+}
+.l-region--main-menu ul.menu > li > a:focus, .l-region--main-menu ul.menu ul > li > a:focus, .l-region--main-menu.white ul.menu > li > a:focus, .l-region--main-menu.white ul.menu ul > li > a:focus {
+ color: #b00;
+}
+.l-region--main-menu ul.menu > li > a:hover, .l-region--main-menu ul.menu ul > li > a:hover, .l-region--main-menu.white ul.menu > li > a:hover, .l-region--main-menu.white ul.menu ul > li > a:hover {
+ color: #2d2d2d;
+}
+.l-region--main-menu ul.menu > li > a:active, .l-region--main-menu ul.menu ul > li > a:active, .l-region--main-menu.white ul.menu > li > a:active, .l-region--main-menu.white ul.menu ul > li > a:active {
+ color: #2d2d2d;
+}
+.l-region--main-menu #search-block-toggle, .l-region--main-menu.white #search-block-toggle {
+ color: #666666;
+}
+.l-region--main-menu #search-block-toggle:visited, .l-region--main-menu.white #search-block-toggle:visited {
+ color: #666666;
+}
+.l-region--main-menu #search-block-toggle:focus, .l-region--main-menu.white #search-block-toggle:focus {
+ color: #b00;
+}
+.l-region--main-menu #search-block-toggle:hover, .l-region--main-menu.white #search-block-toggle:hover {
+ color: #2d2d2d;
+}
+.l-region--main-menu #search-block-toggle:active, .l-region--main-menu.white #search-block-toggle:active {
+ color: #2d2d2d;
+}
+
+/* styles to add triangle to top of superfish submenus */
+.sf-menu ul:before {
+ content: ' ';
+ height: 0;
+ position: absolute;
+ width: 0;
+ border: 10px solid transparent;
+ /* arrow size */
+ border-bottom-color: #cdcdcd;
+ top: -19px;
+ left: 10px;
+ z-index: 2;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
index 1010e357..383a8b94 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
@@ -1,6 +1,13 @@
/* No files to import found in abstractions/**\/* */
-.html {
- background: #ececec;
+.l-main.lt-gray .ui-accordion-header, .l-main.lt-gray .ui-accordion-header.ui-state-active, .l-main.lt-gray .ui-accordion-header.ui-state-default, .l-main.lt-gray .ui-accordion-header.ui-state-hover {
+ border: 0;
+ background-color: #cdcdcd;
+}
+.l-main.lt-gray .ui-accordion-content {
+ box-sizing: content-box;
+ background-color: #fff;
+ padding: 1.2em 1.9em 0.5em 1.9em;
+ border: 0px;
}
.red-button, .button,
@@ -89,7 +96,7 @@
display: table;
clear: both;
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
.l-constrained {
padding: 0 7%;
}
@@ -359,7 +366,7 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.flex-control-paging li a.flex-active {
background-color: #fff;
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
.flex-control-paging li a {
width: 17px;
height: 17px;
@@ -391,3 +398,57 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.l-content {
padding: 0;
}
+
+.l-region--main-menu, .l-region--main-menu.white {
+ background-color: #fff;
+}
+.l-region--main-menu ul.menu ul, .l-region--main-menu.white ul.menu ul {
+ background-color: #cdcdcd;
+}
+.l-region--main-menu .sf-menu ul:before, .l-region--main-menu.white .sf-menu ul:before {
+ border-bottom-color: #cdcdcd;
+}
+.l-region--main-menu ul.menu > li > a, .l-region--main-menu ul.menu ul > li > a, .l-region--main-menu.white ul.menu > li > a, .l-region--main-menu.white ul.menu ul > li > a {
+ color: #666666;
+}
+.l-region--main-menu ul.menu > li > a:visited, .l-region--main-menu ul.menu ul > li > a:visited, .l-region--main-menu.white ul.menu > li > a:visited, .l-region--main-menu.white ul.menu ul > li > a:visited {
+ color: #666666;
+}
+.l-region--main-menu ul.menu > li > a:focus, .l-region--main-menu ul.menu ul > li > a:focus, .l-region--main-menu.white ul.menu > li > a:focus, .l-region--main-menu.white ul.menu ul > li > a:focus {
+ color: #b00;
+}
+.l-region--main-menu ul.menu > li > a:hover, .l-region--main-menu ul.menu ul > li > a:hover, .l-region--main-menu.white ul.menu > li > a:hover, .l-region--main-menu.white ul.menu ul > li > a:hover {
+ color: #2d2d2d;
+}
+.l-region--main-menu ul.menu > li > a:active, .l-region--main-menu ul.menu ul > li > a:active, .l-region--main-menu.white ul.menu > li > a:active, .l-region--main-menu.white ul.menu ul > li > a:active {
+ color: #2d2d2d;
+}
+.l-region--main-menu #search-block-toggle, .l-region--main-menu.white #search-block-toggle {
+ color: #666666;
+}
+.l-region--main-menu #search-block-toggle:visited, .l-region--main-menu.white #search-block-toggle:visited {
+ color: #666666;
+}
+.l-region--main-menu #search-block-toggle:focus, .l-region--main-menu.white #search-block-toggle:focus {
+ color: #b00;
+}
+.l-region--main-menu #search-block-toggle:hover, .l-region--main-menu.white #search-block-toggle:hover {
+ color: #2d2d2d;
+}
+.l-region--main-menu #search-block-toggle:active, .l-region--main-menu.white #search-block-toggle:active {
+ color: #2d2d2d;
+}
+
+/* styles to add triangle to top of superfish submenus */
+.sf-menu ul:before {
+ content: ' ';
+ height: 0;
+ position: absolute;
+ width: 0;
+ border: 10px solid transparent;
+ /* arrow size */
+ border-bottom-color: #cdcdcd;
+ top: -19px;
+ left: 10px;
+ z-index: 2;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/base/_accordions.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/base/_accordions.scss
new file mode 100644
index 00000000..df541d22
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/base/_accordions.scss
@@ -0,0 +1,18 @@
+//accordions if lt-gray backgraound
+.l-main.lt-gray {
+
+ .ui-accordion-header {
+
+ &, &.ui-state-active, &.ui-state-default, &.ui-state-hover {
+ border: 0;
+ background-color: darken($lt-gray, 12%);
+ }
+ }
+
+ .ui-accordion-content {
+ box-sizing: content-box;
+ background-color: $white;
+ padding: 1.2em 1.9em 0.5em 1.9em;
+ border: 0px;
+ }
+}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/base/_body.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/base/_body.scss
index bb017204..e69de29b 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/base/_body.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/base/_body.scss
@@ -1,3 +0,0 @@
-.html {
- background: $lt-gray;
-}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_main-menu.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_main-menu.scss
new file mode 100644
index 00000000..fa69ffe1
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_main-menu.scss
@@ -0,0 +1,40 @@
+.l-region--main-menu {
+
+ &, &.white {
+ background-color: $white;
+
+ ul.menu ul {
+ background-color: darken($lt-gray, 12%);
+ }
+
+ .sf-menu ul:before {
+ border-bottom-color: darken($lt-gray, 12%);
+ }
+
+ ul.menu, ul.menu ul {
+ & > li > a {
+ @include link-colors($md-gray, $dk-gray, $dk-gray, $md-gray, $red);
+ }
+ }
+
+ #search-block-toggle {
+ @include link-colors($md-gray, $dk-gray, $dk-gray, $md-gray, $red);
+ }
+ }
+
+}
+
+/* styles to add triangle to top of superfish submenus */
+
+.sf-menu ul:before {
+ content: ' ';
+ height: 0;
+ position: absolute;
+ width: 0;
+ border: 10px solid transparent;
+ /* arrow size */
+ border-bottom-color: darken($lt-gray, 12%);
+ top: -19px;
+ left: 10px;
+ z-index: 2;
+}
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 6f945e61..972fa22e 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
@@ -41,9 +41,7 @@ ul.breadcrumb li:last-child:after {
.red-button, input[type=button],
.button,
-#edit-submit,
-#edit-submit--2,
-#edit-submit--3,
+.form-submit,
#edit-preview,
.webform-submit {
font-size: 14px;
@@ -65,42 +63,32 @@ ul.breadcrumb li:last-child:after {
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover {
text-decoration: none;
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover {
background-color: #a20000;
}
.red-button:active, input[type=button]:active,
.button:active,
-#edit-submit:active,
-#edit-submit--2:active,
-#edit-submit--3:active,
+.form-submit:active,
#edit-preview:active,
.webform-submit:active {
background-color: #920000;
}
.red-button.disabled, input.disabled[type=button],
.disabled.button,
-.disabled#edit-submit,
-.disabled#edit-submit--2,
-.disabled#edit-submit--3,
+.disabled.form-submit,
.disabled#edit-preview,
.disabled.webform-submit, .red-button[disabled], input[disabled][type=button],
[disabled].button,
-[disabled]#edit-submit,
-[disabled]#edit-submit--2,
-[disabled]#edit-submit--3,
+[disabled].form-submit,
[disabled]#edit-preview,
[disabled].webform-submit {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
@@ -113,9 +101,7 @@ ul.breadcrumb li:last-child:after {
}
.red-button::-moz-focus-inner, input[type=button]::-moz-focus-inner,
.button::-moz-focus-inner,
-#edit-submit::-moz-focus-inner,
-#edit-submit--2::-moz-focus-inner,
-#edit-submit--3::-moz-focus-inner,
+.form-submit::-moz-focus-inner,
#edit-preview::-moz-focus-inner,
.webform-submit::-moz-focus-inner {
padding: 0 !important;
@@ -541,14 +527,14 @@ input:focus {
display: table;
clear: both;
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
.l-constrained, .l-region--main-menu, .l-region--highlighted, .l-region--footer {
padding: 0 5%;
}
}
@media (min-width: 68em) {
.l-constrained, .l-region--main-menu, .l-region--highlighted, .l-region--footer {
- padding: 0 10%;
+ padding: 0 6%;
}
}
@@ -610,7 +596,7 @@ img, media {
padding: 1.2em 1.6em;
background-image: none;
border: 0;
- background-color: #ececec;
+ background-color: #dadada;
}
.messages ul {
margin: 0 0 0 1em;
@@ -831,7 +817,7 @@ h2.block__title {
margin-top: 0;
}
-@media (max-width: 43em) {
+@media (max-width: 47.5em) {
html {
font-size: 50%;
}
@@ -843,7 +829,7 @@ h2.block__title {
line-height: 150%;
}
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
html {
font-size: 57%;
}
@@ -1138,7 +1124,7 @@ h2.block__title {
margin-top: 0;
}
-@media (max-width: 43em) {
+@media (max-width: 47.5em) {
html {
font-size: 50%;
}
@@ -1150,7 +1136,7 @@ h2.block__title {
line-height: 150%;
}
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
html {
font-size: 57%;
}
@@ -1338,7 +1324,7 @@ h6 a:hover, .zeta a:hover {
padding: 20px 0;
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
/* Header */
.l-branding {
width: 23.72881%;
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 655e3d7e..c9a5d073 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
@@ -41,9 +41,7 @@ ul.breadcrumb li:last-child:after {
.red-button, input[type=button],
.button,
-#edit-submit,
-#edit-submit--2,
-#edit-submit--3,
+.form-submit,
#edit-preview,
.webform-submit {
font-size: 14px;
@@ -65,42 +63,32 @@ ul.breadcrumb li:last-child:after {
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover {
text-decoration: none;
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover {
background-color: #a20000;
}
.red-button:active, input[type=button]:active,
.button:active,
-#edit-submit:active,
-#edit-submit--2:active,
-#edit-submit--3:active,
+.form-submit:active,
#edit-preview:active,
.webform-submit:active {
background-color: #920000;
}
.red-button.disabled, input.disabled[type=button],
.disabled.button,
-.disabled#edit-submit,
-.disabled#edit-submit--2,
-.disabled#edit-submit--3,
+.disabled.form-submit,
.disabled#edit-preview,
.disabled.webform-submit, .red-button[disabled], input[disabled][type=button],
[disabled].button,
-[disabled]#edit-submit,
-[disabled]#edit-submit--2,
-[disabled]#edit-submit--3,
+[disabled].form-submit,
[disabled]#edit-preview,
[disabled].webform-submit {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
@@ -113,9 +101,7 @@ ul.breadcrumb li:last-child:after {
}
.red-button::-moz-focus-inner, input[type=button]::-moz-focus-inner,
.button::-moz-focus-inner,
-#edit-submit::-moz-focus-inner,
-#edit-submit--2::-moz-focus-inner,
-#edit-submit--3::-moz-focus-inner,
+.form-submit::-moz-focus-inner,
#edit-preview::-moz-focus-inner,
.webform-submit::-moz-focus-inner {
padding: 0 !important;
@@ -536,7 +522,7 @@ input:focus {
margin: 0 auto;
*zoom: 1;
padding: 0 5%;
- padding: 0 10%;
+ padding: 0 6%;
}
.l-constrained:after, .l-region--main-menu:after, .l-region--highlighted:after, .l-region--footer:after {
content: "";
@@ -602,7 +588,7 @@ img, media {
padding: 1.2em 1.6em;
background-image: none;
border: 0;
- background-color: #ececec;
+ background-color: #dadada;
}
.messages ul {
margin: 0 0 0 1em;
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 46c0a0f1..81bda460 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
@@ -37,9 +37,7 @@ ul.breadcrumb li:last-child:after {
.red-button, input[type=button],
.button,
-#edit-submit,
-#edit-submit--2,
-#edit-submit--3,
+.form-submit,
#edit-preview,
.webform-submit, .node-type-webform #edit-submitted-file-upload-button {
font-size: 14px;
@@ -61,42 +59,32 @@ ul.breadcrumb li:last-child:after {
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover, .node-type-webform #edit-submitted-file-upload-button:hover {
text-decoration: none;
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover, .node-type-webform #edit-submitted-file-upload-button:hover {
background-color: #a20000;
}
.red-button:active, input[type=button]:active,
.button:active,
-#edit-submit:active,
-#edit-submit--2:active,
-#edit-submit--3:active,
+.form-submit:active,
#edit-preview:active,
.webform-submit:active, .node-type-webform #edit-submitted-file-upload-button:active {
background-color: #920000;
}
.red-button.disabled, input.disabled[type=button],
.disabled.button,
-.disabled#edit-submit,
-.disabled#edit-submit--2,
-.disabled#edit-submit--3,
+.disabled.form-submit,
.disabled#edit-preview,
.disabled.webform-submit, .node-type-webform .disabled#edit-submitted-file-upload-button, .red-button[disabled], input[disabled][type=button],
[disabled].button,
-[disabled]#edit-submit,
-[disabled]#edit-submit--2,
-[disabled]#edit-submit--3,
+[disabled].form-submit,
[disabled]#edit-preview,
[disabled].webform-submit, .node-type-webform [disabled]#edit-submitted-file-upload-button {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
@@ -109,9 +97,7 @@ ul.breadcrumb li:last-child:after {
}
.red-button::-moz-focus-inner, input[type=button]::-moz-focus-inner,
.button::-moz-focus-inner,
-#edit-submit::-moz-focus-inner,
-#edit-submit--2::-moz-focus-inner,
-#edit-submit--3::-moz-focus-inner,
+.form-submit::-moz-focus-inner,
#edit-preview::-moz-focus-inner,
.webform-submit::-moz-focus-inner, .node-type-webform #edit-submitted-file-upload-button::-moz-focus-inner {
padding: 0 !important;
@@ -532,7 +518,7 @@ input:focus {
margin: 0 auto;
*zoom: 1;
padding: 0 5%;
- padding: 0 10%;
+ padding: 0 6%;
}
.l-constrained:after, .l-region--main-menu:after {
content: "";
@@ -598,7 +584,7 @@ img, media {
padding: 1.2em 1.6em;
background-image: none;
border: 0;
- background-color: #ececec;
+ background-color: #dadada;
}
.messages ul {
margin: 0 0 0 1em;
@@ -1301,31 +1287,25 @@ body .ui-accordion .ui-accordion-header {
}
body .ui-accordion .ui-accordion-header p {
margin: 0;
+ color: #2d2d2d;
}
body .ui-accordion .ui-accordion-header, body .ui-accordion .ui-accordion-header.ui-state-active, body .ui-accordion .ui-accordion-header.ui-state-default, body .ui-accordion .ui-accordion-header.ui-state-hover {
border: 0;
- background-color: #999999;
+ background-color: #dfdfdf;
background-image: none;
}
body .ui-accordion .ui-accordion-header, body .ui-accordion .ui-accordion-header a, body .ui-accordion .ui-accordion-header.ui-state-active, body .ui-accordion .ui-accordion-header.ui-state-active a, body .ui-accordion .ui-accordion-header.ui-state-default, body .ui-accordion .ui-accordion-header.ui-state-default a, body .ui-accordion .ui-accordion-header.ui-state-hover, body .ui-accordion .ui-accordion-header.ui-state-hover a {
- color: #fff;
- font-weight: bold;
+ color: #2d2d2d;
+ font-weight: 400;
}
body .ui-accordion .ui-accordion-header a, body .ui-accordion .ui-accordion-header.ui-state-active a, body .ui-accordion .ui-accordion-header.ui-state-default a, body .ui-accordion .ui-accordion-header.ui-state-hover a {
padding: 0;
}
body .ui-accordion .ui-accordion-content {
box-sizing: content-box;
- background-color: #ececec;
- padding: 0.5em 1.9em;
-}
-
-.view .date-nav-wrapper ul.pager {
- list-style: none;
-}
-.view .date-nav-wrapper ul.pager .date-prev a,
-.view .date-nav-wrapper ul.pager .date-next a {
- padding: 1em;
+ background-color: #fff;
+ padding: 1.2em 1.9em 0.5em 1.9em;
+ border: 1px solid #dfdfdf;
}
/* Clean this up sometime soon :) */
@@ -1556,81 +1536,71 @@ p.search-result__snippet {
margin-bottom: 0.4em;
}
+.l-region--main-menu #search-block-toggle {
+ cursor: pointer;
+}
.l-region--main-menu .block--search {
- float: right;
- height: 2.5em;
- margin-right: -2%;
+ position: relative;
}
.l-region--main-menu .block--search * {
height: 100%;
}
-.l-region--main-menu .block--search .container-inline {
+.l-region--main-menu .block--search .search-block-form {
+ position: absolute;
+ right: 0;
+ top: 100%;
+ background-color: rgba(0, 0, 0, 0.7);
+ height: 4em;
+ display: none;
+}
+.l-region--main-menu .block--search .search-block-form .container-inline {
display: table;
- padding: 0.3em 0em;
+ padding: 1em;
}
-.l-region--main-menu .block--search .container-inline .form-item {
+.l-region--main-menu .block--search .search-block-form .container-inline .form-item {
display: table-cell;
- background-color: transparent;
}
-.l-region--main-menu .block--search .container-inline .form-item .form-text {
- background-color: transparent;
- text-transform: uppercase;
+.l-region--main-menu .block--search .search-block-form .container-inline .form-item .form-text {
border: 0 none;
- color: #fff;
- font-weight: 400;
padding: 0 6px;
- cursor: pointer;
font-size: 1em;
- resize: horizontal;
- text-align: right;
-}
-.l-region--main-menu .block--search .container-inline .form-item .form-text:focus {
- background-color: #fff;
- text-indent: 0;
- color: #000;
- cursor: text;
- text-transform: none;
- text-align: left;
-}
-.l-region--main-menu .block--search .container-inline .form-item .form-text:focus:hover {
- color: #000;
}
-.l-region--main-menu .block--search .container-inline .form-item .form-text.text-entered {
- text-transform: none;
- font-weight: 600;
-}
-.l-region--main-menu .block--search .container-inline .form-item .form-text:hover {
- color: lightgray;
-}
-.l-region--main-menu .block--search .container-inline .form-actions {
+.l-region--main-menu .block--search .search-block-form .container-inline .form-actions {
display: table-cell;
- background-color: transparent;
text-align: center;
width: 1.9em;
}
-.l-region--main-menu .block--search .container-inline .form-actions button {
- background-color: transparent;
- border: 0 none;
- color: #fff;
- padding-top: 2px;
- cursor: pointer;
+.l-region--main-menu .block--search .search-block-form .container-inline .form-actions .form-submit {
+ border-radius: 0;
+ -webkit-box-sizing: content-box;
+ padding-right: 1em;
+ padding-left: 1em;
+}
+
+.l-region--main-menu #search-block-toggle {
+ position: absolute;
+ padding: 1em;
+ font-size: 1.2em;
+ z-index: 1000;
+ width: auto;
+}
+.l-region--main-menu #search-block-form {
+ display: none;
position: relative;
+ background-color: transparent;
+ height: auto;
}
-.l-region--main-menu .block--search .container-inline .form-actions button:hover, .l-region--main-menu .block--search .container-inline .form-actions button:focus {
- color: #ececec;
+.l-region--main-menu #search-block-form .container-inline {
+ width: 100%;
+ clear: both;
}
-.l-region--main-menu .block--search .container-inline .form-actions button .form-submit {
- background-color: transparent !important;
- text-indent: -999em;
- position: absolute;
- right: 0;
- width: 1.9em;
- padding: 0 !important;
+.l-region--main-menu #search-block-form .container-inline .form-text {
+ width: 100%;
}
.panel-pane.pane-bundle-tile-pane {
- background: #666666;
padding: 0;
+ margin-bottom: 20px;
}
.panel-pane.pane-bundle-tile-pane:hover {
opacity: 0.9;
@@ -1649,14 +1619,36 @@ p.search-result__snippet {
color: #ececec;
}
.panel-pane.pane-bundle-tile-pane a:active {
- color: #666666;
+ color: #ececec;
+}
+.panel-pane.pane-bundle-tile-pane .title-box {
+ background: #666666;
+ *zoom: 1;
+ min-height: 60px;
+ padding: 18px 20px 18px 20px;
+ margin-top: -8px;
+}
+.panel-pane.pane-bundle-tile-pane .title-box:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+.panel-pane.pane-bundle-tile-pane .title-box .title-text {
+ width: 85%;
+ float: left;
}
-.panel-pane.pane-bundle-tile-pane h2 {
+.panel-pane.pane-bundle-tile-pane .title-box .title-text h2 {
font-size: 24px;
- font-size: 2.4rem;
+ line-height: 120%;
font-weight: 400;
- padding: 0.5em 0.8em 0.7em 0.8em;
margin-top: 0;
+ margin-bottom: 0;
+ padding-top: 2px;
+}
+.panel-pane.pane-bundle-tile-pane .title-box .title-icon {
+ float: right;
+ font-size: 32px;
+ padding: 7px 0;
}
.panel-pane.pane-bundle-tile-pane-plus-text-area {
@@ -1782,7 +1774,7 @@ p.search-result__snippet {
}
div.workbench-info-block {
- background: #ececec;
+ background-color: #dadada;
padding: 1em 1.5em;
margin: 1em 0;
border: none;
@@ -1803,6 +1795,7 @@ div.workbench-info-block #edit-submit {
}
.l-footer-wrapper .l-region {
margin-bottom: 20px;
+ text-align: left;
}
.l-footer-wrapper #osu-wordmark {
margin-bottom: 20px;
@@ -1882,6 +1875,14 @@ div.workbench-info-block #edit-submit {
margin-left: 0;
}
+.l-region--main-menu {
+ position: relative;
+}
+.l-region--main-menu > * {
+ display: table-cell;
+ vertical-align: middle;
+ width: 100%;
+}
.l-region--main-menu ul.menu {
margin: 0;
}
@@ -1912,6 +1913,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu ul.menu > li > a:active, .l-region--main-menu ul.menu ul > li > a:active, .l-region--main-menu.white ul.menu > li > a:active, .l-region--main-menu.white ul.menu ul > li > a:active {
color: #2d2d2d;
}
+.l-region--main-menu #search-block-toggle, .l-region--main-menu.white #search-block-toggle {
+ color: #666666;
+}
+.l-region--main-menu #search-block-toggle:visited, .l-region--main-menu.white #search-block-toggle:visited {
+ color: #666666;
+}
+.l-region--main-menu #search-block-toggle:focus, .l-region--main-menu.white #search-block-toggle:focus {
+ color: #b00;
+}
+.l-region--main-menu #search-block-toggle:hover, .l-region--main-menu.white #search-block-toggle:hover {
+ color: #2d2d2d;
+}
+.l-region--main-menu #search-block-toggle:active, .l-region--main-menu.white #search-block-toggle:active {
+ color: #2d2d2d;
+}
.l-region--main-menu.lt-gray {
background-color: #ececec;
}
@@ -1936,6 +1952,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu.lt-gray ul.menu > li > a:active, .l-region--main-menu.lt-gray ul.menu ul > li > a:active {
color: #2d2d2d;
}
+.l-region--main-menu.lt-gray #search-block-toggle {
+ color: #2d2d2d;
+}
+.l-region--main-menu.lt-gray #search-block-toggle:visited {
+ color: #666666;
+}
+.l-region--main-menu.lt-gray #search-block-toggle:focus {
+ color: #b00;
+}
+.l-region--main-menu.lt-gray #search-block-toggle:hover {
+ color: #000;
+}
+.l-region--main-menu.lt-gray #search-block-toggle:active {
+ color: #2d2d2d;
+}
.l-region--main-menu.md-gray {
background-color: #666666;
}
@@ -1960,6 +1991,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu.md-gray ul.menu > li > a:active, .l-region--main-menu.md-gray ul.menu ul > li > a:active {
color: #b00;
}
+.l-region--main-menu.md-gray #search-block-toggle {
+ color: #fff;
+}
+.l-region--main-menu.md-gray #search-block-toggle:visited {
+ color: #fff;
+}
+.l-region--main-menu.md-gray #search-block-toggle:focus {
+ color: #dcaa38;
+}
+.l-region--main-menu.md-gray #search-block-toggle:hover {
+ color: lightgray;
+}
+.l-region--main-menu.md-gray #search-block-toggle:active {
+ color: #b00;
+}
.l-region--main-menu.dk-gray {
background-color: #2d2d2d;
}
@@ -1984,6 +2030,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu.dk-gray ul.menu > li > a:active, .l-region--main-menu.dk-gray ul.menu ul > li > a:active {
color: #b00;
}
+.l-region--main-menu.dk-gray #search-block-toggle {
+ color: #fff;
+}
+.l-region--main-menu.dk-gray #search-block-toggle:visited {
+ color: #fff;
+}
+.l-region--main-menu.dk-gray #search-block-toggle:focus {
+ color: #dcaa38;
+}
+.l-region--main-menu.dk-gray #search-block-toggle:hover {
+ color: lightgray;
+}
+.l-region--main-menu.dk-gray #search-block-toggle:active {
+ color: #b00;
+}
.l-region--main-menu.black {
background-color: #000;
}
@@ -2008,6 +2069,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu.black ul.menu > li > a:active, .l-region--main-menu.black ul.menu ul > li > a:active {
color: #b00;
}
+.l-region--main-menu.black #search-block-toggle {
+ color: #fff;
+}
+.l-region--main-menu.black #search-block-toggle:visited {
+ color: #fff;
+}
+.l-region--main-menu.black #search-block-toggle:focus {
+ color: #dcaa38;
+}
+.l-region--main-menu.black #search-block-toggle:hover {
+ color: lightgray;
+}
+.l-region--main-menu.black #search-block-toggle:active {
+ color: #b00;
+}
.l-region--main-menu.red {
background-color: #b00;
}
@@ -2044,6 +2120,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu.red ul.menu ul li a:active {
color: #2d2d2d;
}
+.l-region--main-menu.red #search-block-toggle {
+ color: #666666;
+}
+.l-region--main-menu.red #search-block-toggle:visited {
+ color: #666666;
+}
+.l-region--main-menu.red #search-block-toggle:focus {
+ color: #2d2d2d;
+}
+.l-region--main-menu.red #search-block-toggle:hover {
+ color: #2d2d2d;
+}
+.l-region--main-menu.red #search-block-toggle:active {
+ color: #2d2d2d;
+}
.l-region--main-menu.red .sf-menu ul:before {
border-bottom-color: lightgray;
}
@@ -2095,6 +2186,18 @@ div.workbench-info-block #edit-submit {
border-top: 1px solid lightgray !important;
}
+.l-region--main-menu > * {
+ display: table-cell !important;
+}
+
+.l-region--main-menu > * {
+ display: block;
+}
+
+#superfish-1-toggle span {
+ display: none;
+}
+
.l-region--masthead,
.l-region--masthead.white {
background-color: #fff;
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 0d31d8fa..6bf2d04f 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
@@ -37,9 +37,7 @@ ul.breadcrumb li:last-child:after {
.red-button, input[type=button],
.button,
-#edit-submit,
-#edit-submit--2,
-#edit-submit--3,
+.form-submit,
#edit-preview,
.webform-submit, .node-type-webform #edit-submitted-file-upload-button {
font-size: 14px;
@@ -61,42 +59,32 @@ ul.breadcrumb li:last-child:after {
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover, .node-type-webform #edit-submitted-file-upload-button:hover {
text-decoration: none;
}
.red-button:hover, input[type=button]:hover,
.button:hover,
-#edit-submit:hover,
-#edit-submit--2:hover,
-#edit-submit--3:hover,
+.form-submit:hover,
#edit-preview:hover,
.webform-submit:hover, .node-type-webform #edit-submitted-file-upload-button:hover {
background-color: #a20000;
}
.red-button:active, input[type=button]:active,
.button:active,
-#edit-submit:active,
-#edit-submit--2:active,
-#edit-submit--3:active,
+.form-submit:active,
#edit-preview:active,
.webform-submit:active, .node-type-webform #edit-submitted-file-upload-button:active {
background-color: #920000;
}
.red-button.disabled, input.disabled[type=button],
.disabled.button,
-.disabled#edit-submit,
-.disabled#edit-submit--2,
-.disabled#edit-submit--3,
+.disabled.form-submit,
.disabled#edit-preview,
.disabled.webform-submit, .node-type-webform .disabled#edit-submitted-file-upload-button, .red-button[disabled], input[disabled][type=button],
[disabled].button,
-[disabled]#edit-submit,
-[disabled]#edit-submit--2,
-[disabled]#edit-submit--3,
+[disabled].form-submit,
[disabled]#edit-preview,
[disabled].webform-submit, .node-type-webform [disabled]#edit-submitted-file-upload-button {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
@@ -109,9 +97,7 @@ ul.breadcrumb li:last-child:after {
}
.red-button::-moz-focus-inner, input[type=button]::-moz-focus-inner,
.button::-moz-focus-inner,
-#edit-submit::-moz-focus-inner,
-#edit-submit--2::-moz-focus-inner,
-#edit-submit--3::-moz-focus-inner,
+.form-submit::-moz-focus-inner,
#edit-preview::-moz-focus-inner,
.webform-submit::-moz-focus-inner, .node-type-webform #edit-submitted-file-upload-button::-moz-focus-inner {
padding: 0 !important;
@@ -537,14 +523,14 @@ input:focus {
display: table;
clear: both;
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
.l-constrained, .l-region--main-menu {
padding: 0 5%;
}
}
@media (min-width: 68em) {
.l-constrained, .l-region--main-menu {
- padding: 0 10%;
+ padding: 0 6%;
}
}
@@ -606,7 +592,7 @@ img, media {
padding: 1.2em 1.6em;
background-image: none;
border: 0;
- background-color: #ececec;
+ background-color: #dadada;
}
.messages ul {
margin: 0 0 0 1em;
@@ -827,7 +813,7 @@ h2.block__title {
margin-top: 0;
}
-@media (max-width: 43em) {
+@media (max-width: 47.5em) {
html {
font-size: 50%;
}
@@ -839,7 +825,7 @@ h2.block__title {
line-height: 150%;
}
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
html {
font-size: 57%;
}
@@ -1135,7 +1121,7 @@ h2.block__title {
margin-top: 0;
}
-@media (max-width: 43em) {
+@media (max-width: 47.5em) {
html {
font-size: 50%;
}
@@ -1147,7 +1133,7 @@ h2.block__title {
line-height: 150%;
}
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
html {
font-size: 57%;
}
@@ -1317,31 +1303,25 @@ body .ui-accordion .ui-accordion-header {
}
body .ui-accordion .ui-accordion-header p {
margin: 0;
+ color: #2d2d2d;
}
body .ui-accordion .ui-accordion-header, body .ui-accordion .ui-accordion-header.ui-state-active, body .ui-accordion .ui-accordion-header.ui-state-default, body .ui-accordion .ui-accordion-header.ui-state-hover {
border: 0;
- background-color: #999999;
+ background-color: #dfdfdf;
background-image: none;
}
body .ui-accordion .ui-accordion-header, body .ui-accordion .ui-accordion-header a, body .ui-accordion .ui-accordion-header.ui-state-active, body .ui-accordion .ui-accordion-header.ui-state-active a, body .ui-accordion .ui-accordion-header.ui-state-default, body .ui-accordion .ui-accordion-header.ui-state-default a, body .ui-accordion .ui-accordion-header.ui-state-hover, body .ui-accordion .ui-accordion-header.ui-state-hover a {
- color: #fff;
- font-weight: bold;
+ color: #2d2d2d;
+ font-weight: 400;
}
body .ui-accordion .ui-accordion-header a, body .ui-accordion .ui-accordion-header.ui-state-active a, body .ui-accordion .ui-accordion-header.ui-state-default a, body .ui-accordion .ui-accordion-header.ui-state-hover a {
padding: 0;
}
body .ui-accordion .ui-accordion-content {
box-sizing: content-box;
- background-color: #ececec;
- padding: 0.5em 1.9em;
-}
-
-.view .date-nav-wrapper ul.pager {
- list-style: none;
-}
-.view .date-nav-wrapper ul.pager .date-prev a,
-.view .date-nav-wrapper ul.pager .date-next a {
- padding: 1em;
+ background-color: #fff;
+ padding: 1.2em 1.9em 0.5em 1.9em;
+ border: 1px solid #dfdfdf;
}
/* Clean this up sometime soon :) */
@@ -1378,6 +1358,11 @@ body .ui-accordion .ui-accordion-content {
margin-bottom: 3em;
}
+@media (max-width: 47.5em) {
+ .flexslider {
+ display: none;
+ }
+}
.flexslider {
background: none repeat scroll 0 0 #fff;
border: 0 none;
@@ -1454,7 +1439,7 @@ body .ui-accordion .ui-accordion-content {
.node--article.view-mode-full .field--name-field-featured-image {
margin: 1em 0 1em 0;
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
.node--article.view-mode-full .field--name-field-featured-image {
float: right;
margin: 1em 0 1em 1em;
@@ -1471,7 +1456,7 @@ body .ui-accordion .ui-accordion-content {
.node--article--teaser .field--name-field-featured-image {
display: none;
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
.node--article--teaser .field--name-field-featured-image {
display: block;
float: right;
@@ -1580,81 +1565,72 @@ p.search-result__snippet {
margin-bottom: 0.4em;
}
+.l-region--main-menu #search-block-toggle {
+ cursor: pointer;
+}
.l-region--main-menu .block--search {
- float: right;
- height: 2.5em;
- margin-right: -2%;
+ position: relative;
}
.l-region--main-menu .block--search * {
height: 100%;
}
-.l-region--main-menu .block--search .container-inline {
+.l-region--main-menu .block--search .search-block-form {
+ position: absolute;
+ right: 0;
+ top: 100%;
+ background-color: rgba(0, 0, 0, 0.7);
+ height: 4em;
+ display: none;
+}
+.l-region--main-menu .block--search .search-block-form .container-inline {
display: table;
- padding: 0.3em 0em;
+ padding: 1em;
}
-.l-region--main-menu .block--search .container-inline .form-item {
+.l-region--main-menu .block--search .search-block-form .container-inline .form-item {
display: table-cell;
- background-color: transparent;
}
-.l-region--main-menu .block--search .container-inline .form-item .form-text {
- background-color: transparent;
- text-transform: uppercase;
+.l-region--main-menu .block--search .search-block-form .container-inline .form-item .form-text {
border: 0 none;
- color: #fff;
- font-weight: 400;
padding: 0 6px;
- cursor: pointer;
font-size: 1em;
- resize: horizontal;
- text-align: right;
-}
-.l-region--main-menu .block--search .container-inline .form-item .form-text:focus {
- background-color: #fff;
- text-indent: 0;
- color: #000;
- cursor: text;
- text-transform: none;
- text-align: left;
}
-.l-region--main-menu .block--search .container-inline .form-item .form-text:focus:hover {
- color: #000;
-}
-.l-region--main-menu .block--search .container-inline .form-item .form-text.text-entered {
- text-transform: none;
- font-weight: 600;
-}
-.l-region--main-menu .block--search .container-inline .form-item .form-text:hover {
- color: lightgray;
-}
-.l-region--main-menu .block--search .container-inline .form-actions {
+.l-region--main-menu .block--search .search-block-form .container-inline .form-actions {
display: table-cell;
- background-color: transparent;
text-align: center;
width: 1.9em;
}
-.l-region--main-menu .block--search .container-inline .form-actions button {
- background-color: transparent;
- border: 0 none;
- color: #fff;
- padding-top: 2px;
- cursor: pointer;
- position: relative;
-}
-.l-region--main-menu .block--search .container-inline .form-actions button:hover, .l-region--main-menu .block--search .container-inline .form-actions button:focus {
- color: #ececec;
-}
-.l-region--main-menu .block--search .container-inline .form-actions button .form-submit {
- background-color: transparent !important;
- text-indent: -999em;
- position: absolute;
- right: 0;
- width: 1.9em;
- padding: 0 !important;
+.l-region--main-menu .block--search .search-block-form .container-inline .form-actions .form-submit {
+ border-radius: 0;
+ -webkit-box-sizing: content-box;
+ padding-right: 1em;
+ padding-left: 1em;
}
+@media (max-width: 47.5em) {
+ .l-region--main-menu #search-block-toggle {
+ position: absolute;
+ padding: 1em;
+ font-size: 1.2em;
+ z-index: 1000;
+ width: auto;
+ }
+ .l-region--main-menu #search-block-form {
+ display: none;
+ position: relative;
+ background-color: transparent;
+ height: auto;
+ }
+ .l-region--main-menu #search-block-form .container-inline {
+ width: 100%;
+ clear: both;
+ }
+ .l-region--main-menu #search-block-form .container-inline .form-text {
+ width: 100%;
+ }
+}
.panel-pane.pane-bundle-tile-pane {
- background: #666666;
padding: 0;
+ margin-bottom: 20px;
}
.panel-pane.pane-bundle-tile-pane:hover {
opacity: 0.9;
@@ -1673,14 +1649,109 @@ p.search-result__snippet {
color: #ececec;
}
.panel-pane.pane-bundle-tile-pane a:active {
- color: #666666;
+ color: #ececec;
+}
+.panel-pane.pane-bundle-tile-pane .title-box {
+ background: #666666;
+ *zoom: 1;
+ min-height: 60px;
+ padding: 18px 20px 18px 20px;
+ margin-top: -8px;
}
-.panel-pane.pane-bundle-tile-pane h2 {
+.panel-pane.pane-bundle-tile-pane .title-box:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+@media (min-width: 47.5em) {
+ .panel-pane.pane-bundle-tile-pane .title-box {
+ height: 80px;
+ }
+}
+@media (min-width: 68em) {
+ .panel-pane.pane-bundle-tile-pane .title-box {
+ height: 90px;
+ }
+}
+@media (min-width: 78em) {
+ .panel-pane.pane-bundle-tile-pane .title-box {
+ height: 94px;
+ }
+}
+@media (min-width: 88em) {
+ .panel-pane.pane-bundle-tile-pane .title-box {
+ height: 96px;
+ }
+}
+.panel-pane.pane-bundle-tile-pane .title-box .title-text {
+ width: 85%;
+ float: left;
+}
+@media (min-width: 78em) {
+ .panel-pane.pane-bundle-tile-pane .title-box .title-text {
+ width: 75%;
+ }
+}
+@media (min-width: 100em) {
+ .panel-pane.pane-bundle-tile-pane .title-box .title-text {
+ width: 65%;
+ }
+}
+.panel-pane.pane-bundle-tile-pane .title-box .title-text h2 {
font-size: 24px;
- font-size: 2.4rem;
+ line-height: 120%;
font-weight: 400;
- padding: 0.5em 0.8em 0.7em 0.8em;
margin-top: 0;
+ margin-bottom: 0;
+ padding-top: 2px;
+}
+@media (max-width: 47.5em) {
+ .panel-pane.pane-bundle-tile-pane .title-box .title-text h2 {
+ padding-top: 8px;
+ }
+}
+@media (min-width: 47.5em) {
+ .panel-pane.pane-bundle-tile-pane .title-box .title-text h2 {
+ font-size: 18px;
+ }
+}
+@media (min-width: 68em) {
+ .panel-pane.pane-bundle-tile-pane .title-box .title-text h2 {
+ font-size: 21px;
+ }
+}
+@media (min-width: 78em) {
+ .panel-pane.pane-bundle-tile-pane .title-box .title-text h2 {
+ font-size: 23px;
+ }
+}
+@media (min-width: 88em) {
+ .panel-pane.pane-bundle-tile-pane .title-box .title-text h2 {
+ font-size: 24px;
+ }
+}
+.panel-pane.pane-bundle-tile-pane .title-box .title-icon {
+ float: right;
+ font-size: 32px;
+ padding: 7px 0;
+}
+@media (min-width: 68em) {
+ .panel-pane.pane-bundle-tile-pane .title-box .title-icon {
+ font-size: 34px;
+ padding: 9px 0;
+ }
+}
+@media (min-width: 78em) {
+ .panel-pane.pane-bundle-tile-pane .title-box .title-icon {
+ font-size: 35px;
+ padding: 10px 0;
+ }
+}
+@media (min-width: 88em) {
+ .panel-pane.pane-bundle-tile-pane .title-box .title-icon {
+ font-size: 36px;
+ padding: 12px 0;
+ }
}
.panel-pane.pane-bundle-tile-pane-plus-text-area {
@@ -1747,7 +1818,7 @@ p.search-result__snippet {
margin-left: -10px;
margin-right: 10px;
}
-@media (min-width: 46em) {
+@media (min-width: 47.5em) {
.view-user-directory #isotope-container {
margin-right: -10px;
}
@@ -1818,7 +1889,7 @@ p.search-result__snippet {
}
div.workbench-info-block {
- background: #ececec;
+ background-color: #dadada;
padding: 1em 1.5em;
margin: 1em 0;
border: none;
@@ -1839,6 +1910,7 @@ div.workbench-info-block #edit-submit {
}
.l-footer-wrapper .l-region {
margin-bottom: 20px;
+ text-align: left;
}
.l-footer-wrapper #osu-wordmark {
margin-bottom: 20px;
@@ -1904,7 +1976,7 @@ div.workbench-info-block #edit-submit {
font-size: 1.3rem;
}
-@media (max-width: 43em) {
+@media (max-width: 47.5em) {
.l-page .l-footer-wrapper .l-region {
text-align: center;
}
@@ -1919,6 +1991,14 @@ div.workbench-info-block #edit-submit {
margin-left: 0;
}
}
+.l-region--main-menu {
+ position: relative;
+}
+.l-region--main-menu > * {
+ display: table-cell;
+ vertical-align: middle;
+ width: 100%;
+}
.l-region--main-menu ul.menu {
margin: 0;
}
@@ -1949,6 +2029,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu ul.menu > li > a:active, .l-region--main-menu ul.menu ul > li > a:active, .l-region--main-menu.white ul.menu > li > a:active, .l-region--main-menu.white ul.menu ul > li > a:active {
color: #2d2d2d;
}
+.l-region--main-menu #search-block-toggle, .l-region--main-menu.white #search-block-toggle {
+ color: #666666;
+}
+.l-region--main-menu #search-block-toggle:visited, .l-region--main-menu.white #search-block-toggle:visited {
+ color: #666666;
+}
+.l-region--main-menu #search-block-toggle:focus, .l-region--main-menu.white #search-block-toggle:focus {
+ color: #b00;
+}
+.l-region--main-menu #search-block-toggle:hover, .l-region--main-menu.white #search-block-toggle:hover {
+ color: #2d2d2d;
+}
+.l-region--main-menu #search-block-toggle:active, .l-region--main-menu.white #search-block-toggle:active {
+ color: #2d2d2d;
+}
.l-region--main-menu.lt-gray {
background-color: #ececec;
}
@@ -1973,6 +2068,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu.lt-gray ul.menu > li > a:active, .l-region--main-menu.lt-gray ul.menu ul > li > a:active {
color: #2d2d2d;
}
+.l-region--main-menu.lt-gray #search-block-toggle {
+ color: #2d2d2d;
+}
+.l-region--main-menu.lt-gray #search-block-toggle:visited {
+ color: #666666;
+}
+.l-region--main-menu.lt-gray #search-block-toggle:focus {
+ color: #b00;
+}
+.l-region--main-menu.lt-gray #search-block-toggle:hover {
+ color: #000;
+}
+.l-region--main-menu.lt-gray #search-block-toggle:active {
+ color: #2d2d2d;
+}
.l-region--main-menu.md-gray {
background-color: #666666;
}
@@ -1997,6 +2107,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu.md-gray ul.menu > li > a:active, .l-region--main-menu.md-gray ul.menu ul > li > a:active {
color: #b00;
}
+.l-region--main-menu.md-gray #search-block-toggle {
+ color: #fff;
+}
+.l-region--main-menu.md-gray #search-block-toggle:visited {
+ color: #fff;
+}
+.l-region--main-menu.md-gray #search-block-toggle:focus {
+ color: #dcaa38;
+}
+.l-region--main-menu.md-gray #search-block-toggle:hover {
+ color: lightgray;
+}
+.l-region--main-menu.md-gray #search-block-toggle:active {
+ color: #b00;
+}
.l-region--main-menu.dk-gray {
background-color: #2d2d2d;
}
@@ -2021,6 +2146,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu.dk-gray ul.menu > li > a:active, .l-region--main-menu.dk-gray ul.menu ul > li > a:active {
color: #b00;
}
+.l-region--main-menu.dk-gray #search-block-toggle {
+ color: #fff;
+}
+.l-region--main-menu.dk-gray #search-block-toggle:visited {
+ color: #fff;
+}
+.l-region--main-menu.dk-gray #search-block-toggle:focus {
+ color: #dcaa38;
+}
+.l-region--main-menu.dk-gray #search-block-toggle:hover {
+ color: lightgray;
+}
+.l-region--main-menu.dk-gray #search-block-toggle:active {
+ color: #b00;
+}
.l-region--main-menu.black {
background-color: #000;
}
@@ -2045,6 +2185,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu.black ul.menu > li > a:active, .l-region--main-menu.black ul.menu ul > li > a:active {
color: #b00;
}
+.l-region--main-menu.black #search-block-toggle {
+ color: #fff;
+}
+.l-region--main-menu.black #search-block-toggle:visited {
+ color: #fff;
+}
+.l-region--main-menu.black #search-block-toggle:focus {
+ color: #dcaa38;
+}
+.l-region--main-menu.black #search-block-toggle:hover {
+ color: lightgray;
+}
+.l-region--main-menu.black #search-block-toggle:active {
+ color: #b00;
+}
.l-region--main-menu.red {
background-color: #b00;
}
@@ -2081,6 +2236,21 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu.red ul.menu ul li a:active {
color: #2d2d2d;
}
+.l-region--main-menu.red #search-block-toggle {
+ color: #666666;
+}
+.l-region--main-menu.red #search-block-toggle:visited {
+ color: #666666;
+}
+.l-region--main-menu.red #search-block-toggle:focus {
+ color: #2d2d2d;
+}
+.l-region--main-menu.red #search-block-toggle:hover {
+ color: #2d2d2d;
+}
+.l-region--main-menu.red #search-block-toggle:active {
+ color: #2d2d2d;
+}
.l-region--main-menu.red .sf-menu ul:before {
border-bottom-color: lightgray;
}
@@ -2132,6 +2302,20 @@ div.workbench-info-block #edit-submit {
border-top: 1px solid lightgray !important;
}
+@media (min-width: 47.5em) {
+ .l-region--main-menu > * {
+ display: table-cell !important;
+ }
+}
+@media (max-width: 47.5em) {
+ .l-region--main-menu > * {
+ display: block;
+ }
+}
+#superfish-1-toggle span {
+ display: none;
+}
+
.l-region--masthead,
.l-region--masthead.white {
background-color: #fff;
@@ -2210,7 +2394,7 @@ div.workbench-info-block #edit-submit {
width: auto;
}
-@media (max-width: 43em) {
+@media (max-width: 47.5em) {
#site-logo {
display: none;
}
@@ -2339,7 +2523,7 @@ a#skip:active:hover, a#skip:focus:hover {
/* Mixin sets nav bar icons based on light/dark setting and pixel ratio.*/
/* Replace text links with icons when space runs out at 720px*/
-@media (max-width: 43em) {
+@media (max-width: 47.5em) {
#osu_navbar div.links ul {
margin-top: -2px;
}
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 c52a5f4d..6aa87d1a 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,25 +50,108 @@
}
});
- var textfield = '#block-search-form .form-text';
- $(textfield).val('Search');
+ var toggleButton = $('#search-block-toggle').eq(0);
+ var searchBox = $('#search-block-form').eq(0);
+ var searchTextInput = searchBox.find('input.form-text').eq(0);
- $(textfield).focus(function(){
- if (this.value == 'Search') {
- this.value = '';
+ /**
+ * The following reacts to clicks anywhere. If the click is within the
+ * search box, the search box will stay visible. If the click is outside the
+ * search box, the search box will be dismissed.
+ */
+ $(document).click(function(event) {
+ toggleSearchBox(event);
+ });
+
+ toggleButton.keypress(function(event){
+ if (event.which === 13) {
+ toggleSearchBox(event);
+ }
+ });
+
+ function toggleSearchBox(event) {
+ var clickTarget = $(event.target).eq(0);
+ if (clickTarget.attr('id') == toggleButton.attr('id')) {
+ // Clicked the toggle button.
+ if (searchBox.is(':visible') ){
+ // Turn sticky visibility on.
+ hideHoverSearchBox();
+ }
+ else {
+ showHoverSearchBox();
+ }
+ }
+ else if (clickedSearchBox(event)) {
+ return;
+ }
+ else if (searchBox.is(':visible')) {
+ // This only matters if the search box is currently visible.
+ hideHoverSearchBox(true);
+ }
+ }
+
+ /*
+ * Determines if the target clicked was inside the search box.
+ */
+ function clickedSearchBox(event) {
+ var clickTarget = $(event.target).eq(0);
+ var inSearchBox = false;
+ // Check if the search box itself was clicked.
+ if (searchBox.get(0) == clickTarget.get(0)) {
+ // Search box was clicked.
+ inSearchBox = true;
}
else {
- $(this).removeClass('text-entered');
+ /*
+ * Compare the click target against all the elements in the search box
+ * to determine if the clicked element is part of it.
+ */
+ var elements = searchBox.find('*');
+ elements.each(function(index) {
+ if (elements.eq(index).get(0) == clickTarget.get(0)) {
+ // Search box element was clicked.
+ inSearchBox = true;
+ return;
+ }
+ });
}
- });
- $(textfield).blur(function(){
- if (this.value == '') {
- this.value = 'Search';
+ return inSearchBox;
+ }
+
+ /*
+ * Displays the hover search box.
+ */
+ function showHoverSearchBox() {
+ searchBox.stop(true, true).clearQueue().fadeIn('fast');
+ }
+
+ /*
+ * Hides the hover search box when applicable.
+ *
+ * @param force
+ * If set to TRUE, forces the search box to be hidden and disables
+ * the sticky visibility parameter.
+ */
+ function hideHoverSearchBox(force) {
+
+ if (force != undefined) {
+ if (force === true) {
+ // Hide the box and turn sticky visibility off.
+ hideHoverSearchBox_do();
+ return;
+ }
}
- else{
- $(this).addClass('text-entered');
+
+ if (!searchBox.is(':focus')) {
+ hideHoverSearchBox_do();
}
- });
+ }
+
+ function hideHoverSearchBox_do() {
+ // Handles the actual hiding, without any logical operations.
+ searchBox.stop(true, true).fadeOut('fast')
+ }
+
}
};
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.css b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.css
index e3c18601..aa61c829 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.css
@@ -25,8 +25,8 @@
margin-right: 0;
}
-/* iPhone [portrait + landscape] and some wider phones too */
-@media only screen and (max-width: 600px) {
+/* iPad or less */
+@media only screen and (max-width: 760px) {
.ocio-omega-threecol-column-content-region,
.ocio-omega-threecol-column3 {
width: 100%;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc b/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc
index 747ee432..ec40b8a3 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc
+++ b/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc
@@ -6,6 +6,10 @@
function ocio_omega_base_preprocess_page(&$vars) {
// You can use preprocess hooks to modify the variables before they are passed
// to the theme function or template file.
+ /*
$classes[] = 'accent-' . theme_get_setting('ocio_omega_color_accent');
+ */
+ $classes = array();
$vars['main_classes'] = join(' ', $classes);
+
}
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 6a80a259..7bb13f82 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
@@ -3,21 +3,17 @@
@import "sassy-buttons";
.red-button {
- @include sassy-button;
- text-transform: uppercase;
- font-family: $proxima;
- letter-spacing: 0.05em;
- font-weight: 400;
+ @include sassy-button;
+ text-transform: uppercase;
+ font-family: $proxima;
+ letter-spacing: 0.05em;
+ font-weight: 400;
}
input[type=button],
.button,
-#edit-submit,
-#edit-submit--2,
-#edit-submit--3,
+.form-submit,
#edit-preview,
.webform-submit {
- @extend .red-button;
+ @extend .red-button;
}
-
-
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_layout-base.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_layout-base.scss
index c03df2c8..1d6adf23 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_layout-base.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_layout-base.scss
@@ -7,7 +7,7 @@
padding:0 5%;
}
@include breakpoint($desk, true) {
- padding:0 10%;
+ padding:0 6%;
}
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_messages.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_messages.scss
index 8bd049e9..b56a5530 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_messages.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_messages.scss
@@ -9,7 +9,7 @@
padding: 1.2em 1.6em;
background-image: none;
border: 0;
- background-color: $lt-gray;
+ background-color: darken($lt-gray, 7%);
ul {
margin: 0 0 0 1em;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_accordions.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_accordions.scss
index 66d237d7..502ab53f 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_accordions.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_accordions.scss
@@ -14,16 +14,17 @@ body {
p {
margin: 0;
+ color: $dk-gray;
}
&, &.ui-state-active, &.ui-state-default, &.ui-state-hover {
border: 0;
- background-color: lighten($md-gray, 20%);
+ background-color: darken($lt-gray, 5%);
background-image: none;
&, a {
- color: $white;
- font-weight: bold;
+ color: $dk-gray;
+ font-weight: 400;
}
a {
@@ -34,8 +35,9 @@ body {
.ui-accordion-content {
box-sizing: content-box;
- background-color: $lt-gray;
- padding: 0.5em 1.9em;
+ background-color: $white;
+ padding: 1.2em 1.9em 0.5em 1.9em;
+ border: 1px solid darken($lt-gray, 5%);
}
}
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_featured-slideshow.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_featured-slideshow.scss
index 55419f32..0e4bd4f3 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_featured-slideshow.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_featured-slideshow.scss
@@ -1,3 +1,10 @@
+@include breakpoint($small){
+ .flexslider {
+ display:none;
+ }
+}
+
+
.flexslider {
background: none repeat scroll 0 0 #fff;
border: 0 none;
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 0a5b4512..4766df2d 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
@@ -30,85 +30,77 @@ p.search-result__snippet {
}
.l-region--main-menu {
- .block--search {
- float: right;
- height: 2.5em;
- margin-right: -2%;
+ #search-block-toggle {
+ cursor: pointer;
+ }
+ .block--search {
* {
height: 100%;
}
-
- .container-inline {
- display: table;
- padding: 0.3em 0em;
-
- .form-item {
- display: table-cell;
- background-color: transparent;
-
- .form-text {
- background-color: transparent;
- text-transform: uppercase;
- border: 0 none;
- color: #fff;
- font-weight: 400;
- padding: 0 6px;
- cursor: pointer;
- font-size: 1em;
- resize: horizontal;
- text-align: right;
-
- &:focus {
- background-color: #fff;
- text-indent: 0;
- color: #000;
- cursor: text;
- text-transform: none;
- text-align: left;
-
- &:hover {
- color: #000;
- }
+ position: relative;
+
+ .search-block-form {
+ position: absolute;
+ right: 0;
+ top: 100%;
+ background-color: rgba(0, 0, 0, 0.7);
+ height: 4em;
+ display: none;
+
+ .container-inline {
+ display: table;
+ padding: 1em;
+
+ .form-item {
+ display: table-cell;
+
+ .form-text {
+ border: 0 none;
+ padding: 0 6px;
+ font-size: 1em;
}
+ }
- &.text-entered {
- text-transform: none;
- font-weight: 600;
- }
+ .form-actions {
+ display: table-cell;
+ text-align: center;
+ width: 1.9em;
- &:hover {
- color: lightgray;
+ .form-submit {
+ border-radius: 0;
+ -webkit-box-sizing: content-box;
+ padding-right: 1em;
+ padding-left: 1em;
}
}
}
+ }
+ }
+}
- .form-actions {
- display: table-cell;
- background-color: transparent;
- text-align: center;
- width: 1.9em;
-
- button {
- background-color: transparent;
- border: 0 none;
- color: #fff;
- padding-top: 2px;
- cursor: pointer;
- position: relative;
-
- &:hover, &:focus {
- color: $lt-gray;
- }
+@include breakpoint($small, true) {
+ .l-region--main-menu {
+ #search-block-toggle {
+ position: absolute;
+ padding: 1em;
+ font-size: 1.2em;
+ z-index: 1000;
+ width: auto;
+ }
- .form-submit {
- background-color: transparent !important;
- text-indent: -999em;
- position: absolute;
- right: 0;
- width: 1.9em;
- padding: 0 !important;
- }
+ #search-block-form {
+ display: none;
+ position: relative;
+ background-color: transparent;
+ height: auto;
+
+ .container-inline {
+ width: 100%;
+ clear: both;
+
+ .form-text {
+ width: 100%;
}
}
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
index 2611ae21..8b26b19b 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
@@ -1,8 +1,8 @@
//custom tile panes
.panel-pane.pane-bundle-tile-pane {
- background: $md-gray;
padding: 0;
+ margin-bottom: 20px;
&:hover {
opacity: 0.9;
@@ -10,17 +10,106 @@
a {
text-decoration: none;
- @include link-colors($white, $lt-gray, $md-gray, $white, $blue);
+ @include link-colors($white, $lt-gray, $lt-gray, $white, $blue);
}
- h2 {
- @include font-size(2.4);
- font-weight: 400;
- padding: 0.5em 0.8em 0.7em 0.8em;
- margin-top: 0;
- }
+ .title-box {
+ background: $md-gray;
+ @include pie-clearfix;
+ min-height: 60px;
+ padding: 18px 20px 18px 20px;
+ margin-top: -8px;
+
+ @include breakpoint($tab){
+ height: 80px;
+ }
+
+ @include breakpoint($desk){
+ height: 90px;
+ }
+
+ @include breakpoint($desk-wide){
+ height: 94px;
+ }
+
+ @include breakpoint($wide){
+ height: 96px;
+ }
+
+ .title-text {
+ width: 85%;
+ float: left;
+
+ @include breakpoint($desk-wide){
+ width: 75%;
+ }
+
+ @include breakpoint($x-wide){
+ width: 65%;
+ }
+
+ h2 {
+ font-size: 24px;
+ line-height: 120%;
+ font-weight: 400;
+ margin-top: 0;
+ margin-bottom: 0;
+ padding-top: 2px;
+
+ @include breakpoint($small){
+ padding-top: 8px;
+ }
+
+ @include breakpoint($tab){
+ font-size: 18px;
+ }
+
+ @include breakpoint($desk){
+ font-size: 21px;
+ }
+
+ @include breakpoint($desk-wide){
+ font-size: 23px;
+ }
+
+ @include breakpoint($wide){
+ font-size: 24px;
+ }
+
+ }
+ }
+
+ .title-icon {
+ float: right;
+ font-size: 32px;
+ padding: 7px 0;
+
+ @include breakpoint($desk){
+ font-size: 34px;
+ padding: 9px 0;
+ }
+
+ @include breakpoint($desk-wide){
+ font-size: 35px;
+ padding: 10px 0;
+ }
+
+ @include breakpoint($wide){
+ font-size: 36px;
+ padding: 12px 0;
+ }
+
+
+ }
+
+ }
+
}
+
+
+
+
.panel-pane.pane-bundle-tile-pane-plus-text-area {
background: $lt-gray;
padding: 0;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_workbench.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_workbench.scss
index 4315ee15..c7f0b2bd 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_workbench.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_workbench.scss
@@ -1,6 +1,6 @@
//from workbench_moderation.css
div.workbench-info-block {
- background: $lt-gray;
+ background-color: darken($lt-gray, 7%);
padding: 1em 1.5em;
margin: 1em 0;
border: none;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_footer.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_footer.scss
index 4cb009a2..02ae2868 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_footer.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_footer.scss
@@ -4,6 +4,7 @@
.l-region {
margin-bottom: $vert-spacing-unit;
+ text-align: left;
}
#osu-wordmark {
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 9e51fc1d..8a520653 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
@@ -1,4 +1,12 @@
.l-region--main-menu {
+ position: relative;
+
+ & > * {
+ display: table-cell;
+ vertical-align: middle;
+ width: 100%;
+ }
+
ul.menu {
margin: 0;
@@ -9,106 +17,150 @@
&, &.white {
background-color: $white;
+
ul.menu ul {
background-color: $lt-gray;
}
+
.sf-menu ul:before {
border-bottom-color: $lt-gray;
}
+
ul.menu, ul.menu ul {
& > li > a {
@include link-colors($md-gray, $dk-gray, $dk-gray, $md-gray, $red);
}
}
+
+ #search-block-toggle {
+ @include link-colors($md-gray, $dk-gray, $dk-gray, $md-gray, $red);
+ }
}
&.lt-gray {
background-color: $lt-gray;
+
ul.menu ul {
background-color: darken($lt-gray, 10%);
}
+
.sf-menu ul:before {
border-bottom-color: darken($lt-gray, 10%);
}
+
ul.menu, ul.menu ul {
& > li > a {
@include link-colors($dk-gray, $black, $dk-gray, $md-gray, $red);
}
}
+
+ #search-block-toggle {
+ @include link-colors($dk-gray, $black, $dk-gray, $md-gray, $red);
+ }
}
&.md-gray {
background-color: $md-gray;
+
ul.menu ul {
background-color: darken($md-gray, 10%);
}
+
.sf-menu ul:before {
border-bottom-color: darken($md-gray, 10%);
}
+
ul.menu, ul.menu ul {
& > li > a {
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
}
+
+ #search-block-toggle {
+ @include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
+ }
}
&.dk-gray {
background-color: $dk-gray;
+
ul.menu ul {
background-color: $md-gray;
}
+
.sf-menu ul:before {
border-bottom-color: $md-gray;
}
+
ul.menu, ul.menu ul {
& > li > a {
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
}
+
+ #search-block-toggle {
+ @include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
+ }
}
&.black {
background-color: $black;
+
ul.menu ul {
background-color: $dk-gray;
}
+
.sf-menu ul:before {
border-bottom-color: $dk-gray;
}
+
ul.menu, ul.menu ul {
& > li > a {
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
}
+
+ #search-block-toggle {
+ @include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
+ }
}
&.red {
background-color: $red;
+
ul.menu {
& > li > a {
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
}
+
ul.menu ul {
background-color: darken($lt-gray, 10%);
+
li a {
@include link-colors($md-gray, $dk-gray, $dk-gray, $md-gray, $dk-gray);
}
}
+
+ #search-block-toggle {
+ @include link-colors($md-gray, $dk-gray, $dk-gray, $md-gray, $dk-gray);
+ }
+
.sf-menu ul:before {
border-bottom-color: darken($lt-gray, 10%);
}
}
}
-
/* styles to add triangle to top of superfish submenus */
+
.sf-menu ul:before {
content: ' ';
height: 0;
position: absolute;
width: 0;
- border: 10px solid transparent; /* arrow size */
+ border: 10px solid transparent;
+ /* arrow size */
border-bottom-color: darken($lt-gray, 10%);
top: -19px;
left: 10px;
@@ -117,39 +169,63 @@
/* styles for mobile mean menu */
.mean-container .mean-bar, .mean-container .mean-nav {
- background:none;
+ background: none;
}
.mean-container .mean-bar {
- z-index:999;
+ z-index: 999;
}
.mean-container a.meanmenu-reveal {
- color:$white;
- font-size:25px;
- text-indent:0em;
+ color: $white;
+ font-size: 25px;
+ text-indent: 0em;
}
.l-region--main-menu {
&.md-gray.mean-container {
- a.meanmenu-reveal, .mean-nav a {
+ a.meanmenu-reveal, .mean-nav a {
color: $white;
}
}
+
&.lt-gray.mean-container {
- background:lighten($lt-gray, 5%);
- border-bottom:1px solid darken($lt-gray,10%);
- border-top:1px solid darken($lt-gray,10%);
- a.meanmenu-reveal, .mean-nav a {
- color:$md-gray;
+ background: lighten($lt-gray, 5%);
+ border-bottom: 1px solid darken($lt-gray, 10%);
+ border-top: 1px solid darken($lt-gray, 10%);
+
+ a.meanmenu-reveal, .mean-nav a {
+ color: $md-gray;
}
+
.mean-bar, .mean-nav {
- background:lighten($lt-gray, 5%);
+ background: lighten($lt-gray, 5%);
}
+
.mean-nav ul li a {
- border-top:1px solid darken($lt-gray,10%) !important;
+ border-top: 1px solid darken($lt-gray, 10%) !important;
+ }
+ }
+}
+
+@include breakpoint($tab, true) {
+ .l-region--main-menu {
+ & > * {
+ display: table-cell !important;
}
}
}
+@include breakpoint($small, true) {
+ .l-region--main-menu {
+ & > * {
+ display: block;
+ }
+ }
+}
+
+//hide main menu span text that shows up when between breakpoints
+#superfish-1-toggle span {
+ display: none;
+}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_grid.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_grid.scss
index b6370278..408f2722 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_grid.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_grid.scss
@@ -2,13 +2,13 @@
$vert-spacing-unit: 20px;
$horz-spacing-unit: 1.5em;
-$small: max-width 43em;
-$tab: 46em;
-$tab-desk: 56em;
-$desk: 68em;
-$desk-wide: 78em;
-$wide: 88em;
-$x-wide: 100em;
+$small: max-width 47.5em; // 760px
+$tab: 47.5em; //760px
+$tab-desk: 56em; //896px
+$desk: 68em; //1088px
+$desk-wide: 78em; //1248px
+$wide: 88em; //1408px
+$x-wide: 100em; //1600px
$grids: 4;
$grids: add-grid(12 at $tab);
diff --git a/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
index 9e66220c..3c17e02f 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
@@ -1,4 +1,7 @@
<a href="<?php print $tile_url; ?>">
<?php print render($content['field_tile_background_img']); ?>
- <h2><?php print $tile_title; ?></h2>
+ <div class="title-box">
+ <div class="title-text"><h2><?php print $tile_title; ?></h2></div>
+ <div class="title-icon"><i class="fa fa-angle-right"></i></div>
+ </div>
</a>
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_base/theme-settings.php b/profiles/wcm_base/themes/ocio_omega_base/theme-settings.php
index 35ab2947..7e509e74 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/theme-settings.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/theme-settings.php
@@ -61,6 +61,7 @@ function ocio_omega_base_form_system_theme_settings_alter(&$form, $form_state) {
)
)
),
+ /*
'ocio_omega_color_accent' => array(
'#type' => 'radios',
'#title' => t('Accent Color'),
@@ -76,6 +77,7 @@ function ocio_omega_base_form_system_theme_settings_alter(&$form, $form_state) {
),
'#description' => "Choose which accent color you'd like to use.",
)
+ */
);
$form['#attached']['css'][] = drupal_get_path('theme', 'ocio_omega_base') . '/css/ocio-omega-base.settings.css';
diff --git a/profiles/wcm_base/wcm_base.info b/profiles/wcm_base/wcm_base.info
index bf72fcc4..e83eb4e7 100644
--- a/profiles/wcm_base/wcm_base.info
+++ b/profiles/wcm_base/wcm_base.info
@@ -108,8 +108,10 @@ dependencies[] = ocio_taxonomy
dependencies[] = ocio_twitter
dependencies[] = ocio_url_aliases
dependencies[] = ocio_user_config
-dependencies[] = ocio_user_directory
dependencies[] = ocio_uuid_settings
dependencies[] = ocio_workbench
dependencies[] = ocio_wysiwyg
dependencies[] = wcm_tile_panes
+dependencies[] = wcm_user_directory
+dependencies[] = wcm_user_profile
+
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index f5371d55..59949c00 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -255,12 +255,6 @@ projects[ocio_user_config][download][type] = "git"
projects[ocio_user_config][download][url] = git@code.osu.edu:ocio_odee_web/ocio_user_config.git
projects[ocio_user_config][download][branch] = 7.x-1.x
-projects[ocio_user_directory][type] = module
-projects[ocio_user_directory][subdir] = custom
-projects[ocio_user_directory][download][type] = "git"
-projects[ocio_user_directory][download][url] = git@code.osu.edu:ocio_odee_web/ocio_user_directory.git
-projects[ocio_user_directory][download][branch] = 7.x-1.x
-
projects[ocio_uuid_settings][type] = module
projects[ocio_uuid_settings][subdir] = custom
projects[ocio_uuid_settings][download][type] = "git"
@@ -285,7 +279,17 @@ projects[wcm_tile_panes][download][type] = "git"
projects[wcm_tile_panes][download][url] = git@code.osu.edu:ocio_odee_web/wcm_tile_panes.git
projects[wcm_tile_panes][download][branch] = 7.x-1.x
-
+projects[wcm_user_directory][type] = module
+projects[wcm_user_directory][subdir] = custom
+projects[wcm_user_directory][download][type] = "git"
+projects[wcm_user_directory][download][url] = git@code.osu.edu:ocio_odee_web/wcm_user_directory.git
+projects[wcm_user_directory][download][branch] = 7.x-1.x
+
+projects[wcm_user_profile][type] = module
+projects[wcm_user_profile][subdir] = custom
+projects[wcm_user_profile][download][type] = "git"
+projects[wcm_user_profile][download][url] = git@code.osu.edu:ocio_odee_web/wcm_user_profile.git
+projects[wcm_user_profile][download][branch] = 7.x-1.x
;themes
--
GitLab