From cf35df7d4d90e09c65c51497acc85e0f2d6592c8 Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Tue, 8 Sep 2015 17:18:13 -0400
Subject: [PATCH] daily build
---
profiles/wcm_base/CHANGELOG.txt | 9 +-
.../custom/ocio_search/ocio_search.module | 3 +-
.../panopoly/panopoly_admin/CHANGELOG.txt | 4 +
.../panopoly_admin/panopoly_admin.info | 6 +-
.../panopoly/panopoly_core/CHANGELOG.txt | 5 +
.../panopoly_core.features.defaultconfig.inc | 7 +
.../panopoly/panopoly_core/panopoly_core.info | 8 +-
.../panopoly/panopoly_core/panopoly_core.make | 2 +-
.../panopoly_core/panopoly_core.strongarm.inc | 7 -
.../panopoly/panopoly_magic/CHANGELOG.txt | 4 +
.../panopoly_magic/panopoly_magic.info | 6 +-
.../panopoly/panopoly_pages/CHANGELOG.txt | 4 +
.../panopoly_pages/panopoly_pages.info | 6 +-
.../panopoly/panopoly_search/CHANGELOG.txt | 4 +
.../panopoly_search/panopoly_search.info | 6 +-
.../panopoly/panopoly_test/CHANGELOG.txt | 4 +
.../panopoly/panopoly_test/panopoly_test.info | 6 +-
.../panopoly/panopoly_theme/CHANGELOG.txt | 4 +
.../panopoly_theme/panopoly_theme.info | 6 +-
.../panopoly/panopoly_widgets/CHANGELOG.txt | 4 +
.../panopoly_widgets/panopoly_widgets.info | 6 +-
.../fieldable-panels-pane--tile-pane.tpl.php | 4 +-
.../css/ocio-omega-base.no-query.css | 303 ++++++++++++------
.../css/ocio-omega-base.styles.css | 303 ++++++++++++------
.../js/ocio-omega-base.behaviors.js | 2 +-
.../sass/components/_search.scss | 88 ++---
.../sass/components/_tiles.scss | 24 +-
.../sass/components/regions/_footer.scss | 1 +
.../sass/components/regions/_main-menu.scss | 253 ++++++++++-----
.../sass/components/regions/_masthead.scss | 3 +-
.../themes/ocio_omega_base/template.php | 3 +
...els-pane--tile-pane-plus-text-area.tpl.php | 4 +-
.../fieldable-panels-pane--tile-pane.tpl.php | 6 +-
profiles/wcm_base/wcm_base.make | 16 +-
34 files changed, 748 insertions(+), 373 deletions(-)
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 45b145f6..f9b5deff 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,4 +1,11 @@
-CM Base 7.x-1.x, 2015-09-02
+WCM Base 7.x-1.x, 2015-09-08
+----------------------------
+- OCIO Omega Base
+ - Mobile menu and search box style improvements.
+ - Properly render and style tile panes that are not linked.
+- Panopoly: Updated to 1.27
+
+WCM Base 7.x-1.x, 2015-09-02
----------------------------
- OCIO Omega Base: Fixed menu padding bug.
- OCIO User Config: Modified login page to allow Shibboleth or Drupal accounts.
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 f54d05ff..f306c2cf 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.module
+++ b/profiles/wcm_base/modules/custom/ocio_search/ocio_search.module
@@ -51,7 +51,8 @@ function ocio_search_solr_post_schema($posted, $env = '') {
* Implements hook_form_FORM_ID_alter().
*/
function ocio_search_form_search_block_form_alter(&$form, &$form_state) {
- $form['#prefix'] = '<i id="search-block-toggle" class="fa fa-search" title="Toggle Search" tabindex="0"></i>';
+ $form['#prefix'] = '<div id="ocio-search"><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');
+ $form['#suffix'] = '</div>';
}
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
index b577d9fd..f72e2765 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Admin 7.x-1.27, 2015-09-02
+----------------------------
+- No changes since last release.
+
Panopoly Admin 7.x-1.26, 2015-08-19
----------------------------
- Multilingual options for menu does not work.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
index 3256a6fd..1907ce9d 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
@@ -38,9 +38,9 @@ features[page_manager_pages][] = panopoly_admin_page_library
features[page_manager_pages][] = panopoly_admin_pane_library
features[variable][] = user_admin_role
-; Information added by Drupal.org packaging script on 2015-08-20
-version = "7.x-1.26"
+; Information added by Drupal.org packaging script on 2015-09-02
+version = "7.x-1.27"
core = "7.x"
project = "panopoly_admin"
-datestamp = "1440033846"
+datestamp = "1441223655"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
index 5612491e..1c1ae2cb 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
@@ -1,3 +1,8 @@
+Panopoly Core 7.x-1.27, 2015-09-02
+---------------------------
+- Update to fieldable_panels_panes version 1.7 for SA-CONTRIB-2015-145.
+- Move jQuery version from strongarm to defaultconfig so it can be overridden.
+
Panopoly Core 7.x-1.26, 2015-08-19
---------------------------
- Revert "Issue #2474563 by mglaman: Need ctools patch for calling node_view
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.features.defaultconfig.inc b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.features.defaultconfig.inc
index b1a6ff59..b622af9d 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.features.defaultconfig.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.features.defaultconfig.inc
@@ -109,6 +109,13 @@ function panopoly_core_defaultconfig_strongarm() {
);
$export['field_bundle_settings_taxonomy_term__panopoly_categories'] = $strongarm;
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'jquery_update_jquery_version';
+ $strongarm->value = '1.7';
+ $export['jquery_update_jquery_version'] = $strongarm;
+
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
index 2541906d..0c3658d6 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
@@ -46,6 +46,7 @@ features[defaultconfig][] = strongarm:date_format_panopoly_day
features[defaultconfig][] = strongarm:date_format_panopoly_time
features[defaultconfig][] = strongarm:date_format_short
features[defaultconfig][] = strongarm:field_bundle_settings_taxonomy_term__panopoly_categories
+features[defaultconfig][] = strongarm:jquery_update_jquery_version
features[defaultconfig][] = strongarm:panelizer_defaults_taxonomy_term_panopoly_categories
features[defaultconfig][] = strongarm:panels_page_allowed_layouts
features[defaultconfig][] = strongarm:panels_page_allowed_types
@@ -66,7 +67,6 @@ features[panelizer_defaults][] = taxonomy_term:panopoly_categories:default:defau
features[panelizer_defaults][] = taxonomy_term:panopoly_categories:default:featured
features[taxonomy][] = panopoly_categories
features[variable][] = ctools_content_all_views
-features[variable][] = jquery_update_jquery_version
features[variable][] = page_manager_node_edit_disabled
features[variable][] = page_manager_node_view_disabled
features[variable][] = page_manager_term_view_disabled
@@ -74,9 +74,9 @@ features[variable][] = panelizer_taxonomy_term:panopoly_categories_allowed_layou
features[variable][] = panelizer_taxonomy_term:panopoly_categories_allowed_types_default
features[views_view][] = panopoly_taxonomy
-; Information added by Drupal.org packaging script on 2015-08-20
-version = "7.x-1.26"
+; Information added by Drupal.org packaging script on 2015-09-02
+version = "7.x-1.27"
core = "7.x"
project = "panopoly_core"
-datestamp = "1440033854"
+datestamp = "1441223664"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make
index 0d5fa689..56bb3597 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make
@@ -21,7 +21,7 @@ projects[panelizer][subdir] = contrib
projects[panelizer][patch][1623536] = http://drupal.org/files/issues/array-to-object-on-update-1623536-26.patch
projects[panelizer][patch][2416505] = http://www.drupal.org/files/issues/panelizer-search_api-2416505-3.patch
-projects[fieldable_panels_panes][version] = 1.6
+projects[fieldable_panels_panes][version] = 1.7
projects[fieldable_panels_panes][subdir] = contrib
projects[pm_existing_pages][version] = 1.4
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.strongarm.inc b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.strongarm.inc
index 14afdf78..6847371a 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.strongarm.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.strongarm.inc
@@ -17,13 +17,6 @@ function panopoly_core_strongarm() {
$strongarm->value = 0;
$export['ctools_content_all_views'] = $strongarm;
- $strongarm = new stdClass();
- $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
- $strongarm->api_version = 1;
- $strongarm->name = 'jquery_update_jquery_version';
- $strongarm->value = '1.7';
- $export['jquery_update_jquery_version'] = $strongarm;
-
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
index bcd1000f..dd98668b 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Magic 7.x-1.27, 2015-09-02
+----------------------------
+- No changes since last release.
+
Panopoly Magic 7.x-1.26, 2015-08-19
----------------------------
- Live preview after image upload breaks Spotlight (regression).
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
index 4474e064..abf20fa1 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
@@ -15,9 +15,9 @@ stylesheets[all][] = css/panopoly-modal.css
features[features_api][] = api:2
files[] = plugins/views/panopoly_magic_plugin_display_panel_pane.inc
-; Information added by Drupal.org packaging script on 2015-08-20
-version = "7.x-1.26"
+; Information added by Drupal.org packaging script on 2015-09-02
+version = "7.x-1.27"
core = "7.x"
project = "panopoly_magic"
-datestamp = "1440033874"
+datestamp = "1441223978"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
index 62cc8c23..70366708 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Pages 7.x-1.27, 2015-09-02
+----------------------------
+- No changes since last release.
+
Panopoly Pages 7.x-1.26, 2015-08-19
----------------------------
- Errors on non-interactive install with drush site-install.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
index 96d08b15..f29dd6ea 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
@@ -67,9 +67,9 @@ features[variable][] = panelizer_node:panopoly_page_allowed_layouts_default
features[variable][] = panelizer_node:panopoly_page_allowed_types_default
features[variable][] = save_continue_panopoly_page
-; Information added by Drupal.org packaging script on 2015-08-20
-version = "7.x-1.26"
+; Information added by Drupal.org packaging script on 2015-09-02
+version = "7.x-1.27"
core = "7.x"
project = "panopoly_pages"
-datestamp = "1440034757"
+datestamp = "1441223984"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
index e1b1744a..0956ecfe 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Search 7.x-1.27, 2015-09-02
+-----------------------------
+- No changes since last release.
+
Panopoly Search 7.x-1.26, 2015-08-19
-----------------------------
- Have panopoly_search SOLR intergration configured for node access by default.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
index 24f35735..09b83ba8 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
@@ -53,9 +53,9 @@ features[variable][] = search_api_facets_search_ids
features[views_view][] = panopoly_database_search
features[views_view][] = panopoly_search
-; Information added by Drupal.org packaging script on 2015-08-20
-version = "7.x-1.26"
+; Information added by Drupal.org packaging script on 2015-09-02
+version = "7.x-1.27"
core = "7.x"
project = "panopoly_search"
-datestamp = "1440034766"
+datestamp = "1441223990"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
index bd126e68..d643641c 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Test 7.x-1.27, 2015-09-02
+---------------------------
+- No changes since last release.
+
Panopoly Test 7.x-1.26, 2015-08-19
---------------------------
- Errors on non-interactive install with drush site-install.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
index e83b2d6c..a729565c 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
@@ -99,9 +99,9 @@ features_exclude[dependencies][panopoly_pages] = panopoly_pages
features_exclude[dependencies][panelizer] = panelizer
hidden = 1
-; Information added by Drupal.org packaging script on 2015-08-20
-version = "7.x-1.26"
+; Information added by Drupal.org packaging script on 2015-09-02
+version = "7.x-1.27"
core = "7.x"
project = "panopoly_test"
-datestamp = "1440034776"
+datestamp = "1441224278"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
index 06551921..b4e9052b 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Theme 7.x-1.27, 2015-09-02
+----------------------------
+- No changes since last release.
+
Panopoly Theme 7.x-1.26, 2015-08-19
----------------------------
- Accordion style setting "-1" on active doesn't work with jquery ui => 1.9.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
index ea40f4ef..26c5cc94 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
@@ -11,9 +11,9 @@ stylesheets[all][] = css/panopoly-accordian.css
stylesheets[all][] = css/panopoly-layouts.css
features[features_api][] = api:2
-; Information added by Drupal.org packaging script on 2015-08-20
-version = "7.x-1.26"
+; Information added by Drupal.org packaging script on 2015-09-02
+version = "7.x-1.27"
core = "7.x"
project = "panopoly_theme"
-datestamp = "1440034783"
+datestamp = "1441224284"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
index ec4e1e48..45403d7e 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Widgets 7.x-1.27, 2015-09-02
+------------------------------
+- No changes since last release.
+
Panopoly Widgets 7.x-1.26, 2015-08-19
------------------------------
- Panopoly Widgets - support the Title module.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
index de596836..c7b292d0 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
@@ -118,9 +118,9 @@ features[file_display][] = video__teaser__media_youtube_image
features[file_display][] = video__teaser__media_youtube_video
features[views_view][] = panopoly_widgets_general_content
-; Information added by Drupal.org packaging script on 2015-08-20
-version = "7.x-1.26"
+; Information added by Drupal.org packaging script on 2015-09-02
+version = "7.x-1.27"
core = "7.x"
project = "panopoly_widgets"
-datestamp = "1440034797"
+datestamp = "1441224547"
diff --git a/profiles/wcm_base/themes/ocio_omega_4/templates/panes/fieldable-panels-pane--tile-pane.tpl.php b/profiles/wcm_base/themes/ocio_omega_4/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
index 0d3db8c6..9c021795 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_4/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
@@ -1,8 +1,8 @@
<div<?php print $attributes; ?>>
- <a href="<?php print $tile_url; ?>">
+ <?php if ($tile_url): ?><a href="<?php print $tile_url; ?>"><?php endif; ?>
<?php print render($content['field_tile_background_img']); ?>
<div class="title-box">
<div class="title-text"><h2><?php print $tile_title; ?></h2></div>
</div>
- </a>
+ <?php if ($tile_url): ?></a><?php endif; ?>
</div>
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 f818ff34..8a45504f 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
@@ -1607,68 +1607,73 @@ p.search-result__snippet {
margin-bottom: 0.4em;
}
+.l-page .l-region--main-menu:hover #search-block-toggle {
+ outline: 0 none !important;
+}
.l-page .l-region--main-menu #search-block-toggle {
cursor: pointer;
- padding: 0.75em 0.9em;
}
-.l-page .l-region--main-menu .block--search {
- position: relative;
- z-index: 500;
+.l-page .l-region--main-menu #search-block-toggle:focus {
+ outline: 1px dotted red;
}
-.l-page .l-region--main-menu .block--search * {
- height: 100%;
-}
-.l-page .l-region--main-menu .block--search .search-block-form {
+.l-page .l-region--main-menu #block-search-form {
+ z-index: 498;
position: absolute;
right: 0;
top: 100%;
- background-color: rgba(0, 0, 0, 0.7);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#444444,endColorstr=#444444);
+ background-color: rgba(0, 0, 0, 0.8);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#333333,endColorstr=#333333);
height: 4em;
display: none;
}
-.l-page .l-region--main-menu .block--search .search-block-form .container-inline {
+.l-page .l-region--main-menu #block-search-form * {
+ height: 100%;
+}
+.l-page .l-region--main-menu #block-search-form .container-inline {
display: table;
padding: 1em;
}
-.l-page .l-region--main-menu .block--search .search-block-form .container-inline .form-item {
+.l-page .l-region--main-menu #block-search-form .container-inline .form-item {
display: table-cell;
+ vertical-align: middle;
}
-.l-page .l-region--main-menu .block--search .search-block-form .container-inline .form-item .form-text {
+.l-page .l-region--main-menu #block-search-form .container-inline .form-item .form-text {
border: 0 none;
padding: 0 6px;
font-size: 1em;
}
-.l-page .l-region--main-menu .block--search .search-block-form .container-inline .form-actions {
+.l-page .l-region--main-menu #block-search-form .container-inline .form-actions {
display: table-cell;
text-align: center;
width: 1.9em;
}
-.l-page .l-region--main-menu .block--search .search-block-form .container-inline .form-actions .form-submit {
+.l-page .l-region--main-menu #block-search-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 {
+.l-page .l-region--main-menu #search-block-toggle {
position: absolute;
+ right: 0;
padding: 1em;
font-size: 1.2em;
- z-index: 501;
+ z-index: 500;
width: auto;
+ margin-top: 0.25em;
}
-.l-region--main-menu #search-block-form {
+.l-page .l-region--main-menu #block-search-form {
display: none;
- position: relative;
- background-color: transparent;
height: auto;
+ width: 100%;
}
-.l-region--main-menu #search-block-form .container-inline {
+.l-page .l-region--main-menu #block-search-form .container-inline {
width: 100%;
clear: both;
+ padding: 4%;
}
-.l-region--main-menu #search-block-form .container-inline .form-text {
+.l-page .l-region--main-menu #block-search-form .container-inline .form-text {
width: 100%;
}
@@ -1676,16 +1681,18 @@ p.search-result__snippet {
padding: 0;
z-index: 9;
}
-.panel-pane.pane-bundle-tile-pane:hover {
- opacity: 0.9;
-}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane {
background: #fff;
width: 100%;
z-index: 99;
}
+.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.tile-pane-linked:hover {
+ opacity: 0.9;
+}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane a {
text-decoration: none;
+ height: 100%;
+ display: block;
color: #b00;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane a:visited {
@@ -1720,6 +1727,7 @@ p.search-result__snippet {
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.md-gray {
background: #666666;
+ color: #fff;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.md-gray a {
color: #fff;
@@ -1738,6 +1746,7 @@ p.search-result__snippet {
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.dk-gray {
background: #2d2d2d;
+ color: #fff;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.dk-gray a {
color: #fff;
@@ -1755,7 +1764,8 @@ p.search-result__snippet {
color: #028da9;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.black {
- background: black;
+ background: #000;
+ color: #fff;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.black a {
color: #fff;
@@ -1774,6 +1784,7 @@ p.search-result__snippet {
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.red {
background: #b00;
+ color: #fff;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.red a {
color: #fff;
@@ -1833,9 +1844,6 @@ p.search-result__snippet {
padding: 0;
text-align: center;
}
-.panel-pane.pane-bundle-tile-pane-plus-text-area:hover {
- opacity: 0.9;
-}
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane {
background: #fff;
width: 100%;
@@ -1844,7 +1852,7 @@ p.search-result__snippet {
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane.lt-gray {
background: #ededed;
}
-.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane:hover {
+.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane.tile-pane-linked:hover {
opacity: 0.9;
}
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane .text-areas {
@@ -1852,6 +1860,8 @@ p.search-result__snippet {
}
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane a {
text-decoration: none;
+ height: 100%;
+ display: block;
}
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane a h2 {
font-size: 22px;
@@ -2126,6 +2136,7 @@ div.workbench-info-block #edit-submit {
.l-footer-wrapper .osu-siteinfo-social {
margin-top: 0;
text-align: right;
+ padding-left: 0;
}
.l-footer-wrapper .osu-siteinfo-social li {
display: inline-block;
@@ -2211,7 +2222,7 @@ div.workbench-info-block #edit-submit {
text-transform: uppercase;
}
.l-region--main-menu ul.sf-main-menu li a,
-.l-region--main-menu ul.sf-main-menu li .nolink {
+.l-region--main-menu ul.sf-main-menu li span {
font-weight: 500;
text-decoration: none;
}
@@ -2287,11 +2298,11 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.white ul.menu ul > li > a:active {
color: #2d2d2d;
}
-.l-region--main-menu ul.menu li .nolink, .l-region--main-menu ul.menu ul li .nolink, .l-region--main-menu.white ul.menu li .nolink, .l-region--main-menu.white ul.menu ul li .nolink,
-.l-region--main-menu-wrapper ul.menu li .nolink,
-.l-region--main-menu-wrapper ul.menu ul li .nolink,
-.l-region--main-menu-wrapper.white ul.menu li .nolink,
-.l-region--main-menu-wrapper.white ul.menu ul li .nolink {
+.l-region--main-menu ul.menu li span, .l-region--main-menu ul.menu ul li span, .l-region--main-menu.white ul.menu li span, .l-region--main-menu.white ul.menu ul li span,
+.l-region--main-menu-wrapper ul.menu li span,
+.l-region--main-menu-wrapper ul.menu ul li span,
+.l-region--main-menu-wrapper.white ul.menu li span,
+.l-region--main-menu-wrapper.white ul.menu ul li span {
color: #666666;
}
.l-region--main-menu #search-block-toggle, .l-region--main-menu.white #search-block-toggle,
@@ -2356,9 +2367,9 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.lt-gray ul.menu ul > li > a:active {
color: #2d2d2d;
}
-.l-region--main-menu.lt-gray ul.menu li .nolink, .l-region--main-menu.lt-gray ul.menu ul li .nolink,
-.l-region--main-menu-wrapper.lt-gray ul.menu li .nolink,
-.l-region--main-menu-wrapper.lt-gray ul.menu ul li .nolink {
+.l-region--main-menu.lt-gray ul.menu li span, .l-region--main-menu.lt-gray ul.menu ul li span,
+.l-region--main-menu-wrapper.lt-gray ul.menu li span,
+.l-region--main-menu-wrapper.lt-gray ul.menu ul li span {
color: #666666;
}
.l-region--main-menu.lt-gray #search-block-toggle,
@@ -2418,9 +2429,9 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.md-gray ul.menu ul > li > a:active {
color: #b00;
}
-.l-region--main-menu.md-gray ul.menu li .nolink, .l-region--main-menu.md-gray ul.menu ul li .nolink,
-.l-region--main-menu-wrapper.md-gray ul.menu li .nolink,
-.l-region--main-menu-wrapper.md-gray ul.menu ul li .nolink {
+.l-region--main-menu.md-gray ul.menu li span, .l-region--main-menu.md-gray ul.menu ul li span,
+.l-region--main-menu-wrapper.md-gray ul.menu li span,
+.l-region--main-menu-wrapper.md-gray ul.menu ul li span {
color: #fff;
}
.l-region--main-menu.md-gray #search-block-toggle,
@@ -2480,9 +2491,9 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.dk-gray ul.menu ul > li > a:active {
color: #b00;
}
-.l-region--main-menu.dk-gray ul.menu li .nolink, .l-region--main-menu.dk-gray ul.menu ul li .nolink,
-.l-region--main-menu-wrapper.dk-gray ul.menu li .nolink,
-.l-region--main-menu-wrapper.dk-gray ul.menu ul li .nolink {
+.l-region--main-menu.dk-gray ul.menu li span, .l-region--main-menu.dk-gray ul.menu ul li span,
+.l-region--main-menu-wrapper.dk-gray ul.menu li span,
+.l-region--main-menu-wrapper.dk-gray ul.menu ul li span {
color: #fff;
}
.l-region--main-menu.dk-gray #search-block-toggle,
@@ -2542,9 +2553,9 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.black ul.menu ul > li > a:active {
color: #b00;
}
-.l-region--main-menu.black ul.menu li .nolink, .l-region--main-menu.black ul.menu ul li .nolink,
-.l-region--main-menu-wrapper.black ul.menu li .nolink,
-.l-region--main-menu-wrapper.black ul.menu ul li .nolink {
+.l-region--main-menu.black ul.menu li span, .l-region--main-menu.black ul.menu ul li span,
+.l-region--main-menu-wrapper.black ul.menu li span,
+.l-region--main-menu-wrapper.black ul.menu ul li span {
color: #fff;
}
.l-region--main-menu.black #search-block-toggle,
@@ -2591,8 +2602,8 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.red ul.menu > li > a:active {
color: #b00;
}
-.l-region--main-menu.red ul.menu li .nolink,
-.l-region--main-menu-wrapper.red ul.menu li .nolink {
+.l-region--main-menu.red ul.menu li span,
+.l-region--main-menu-wrapper.red ul.menu li span {
color: #fff;
}
.l-region--main-menu.red ul.menu ul,
@@ -2658,96 +2669,193 @@ div.workbench-info-block #edit-submit {
z-index: 2;
}
-/* styles for mobile mean menu */
-.mean-container .mean-bar, .mean-container .mean-nav {
+.l-region--main-menu {
+ /* styles for mobile mean menu */
+}
+.l-region--main-menu.mean-container .mean-bar, .l-region--main-menu.mean-container .mean-nav {
background: none;
}
-
-.mean-container .mean-bar {
- z-index: 501;
+.l-region--main-menu.mean-container .mean-bar {
+ z-index: 499;
+ padding: 0;
}
-
-.mean-container a.meanmenu-reveal {
+.l-region--main-menu.mean-container a.meanmenu-reveal {
color: #fff;
font-size: 1.5em;
- padding: 0.75em;
+ padding: 0.9em 1em;
text-indent: 0em;
text-align: center;
+ left: 0 !important;
+ right: auto !important;
}
-
-.mean-container .mean-nav ul li a,
-.mean-container .mean-nav ul li span.nolink {
+.l-region--main-menu.mean-container .mean-nav {
+ margin-top: 4em;
+}
+.l-region--main-menu.mean-container .mean-nav ul li li {
display: block;
float: left;
- width: 90%;
- padding: 1em 5%;
+ width: 100%;
margin: 0;
text-align: left;
- color: #fff;
- border-top: 1px solid #383838;
- border-top: 1px solid rgba(255, 255, 255, 0.5);
- text-decoration: none;
text-transform: uppercase;
font-weight: 500;
+ box-sizing: border-box;
+ background: rgba(0, 0, 0, 0.1);
+ color: rgba(0, 0, 0, 0.9);
}
-
-.mean-container .mean-nav ul li a.mean-expand {
- background: rgba(255, 255, 255, 0);
+.l-region--main-menu.mean-container .mean-nav ul li a,
+.l-region--main-menu.mean-container .mean-nav ul li span {
+ color: #fff;
+ text-decoration: none;
+ border: 0;
+ padding: 1em 1em 0.9em 1.2em;
+ border: 0 none;
+ box-sizing: border-box;
+ width: 100%;
+}
+.l-region--main-menu.mean-container .mean-nav ul li li a {
+ padding-left: 3em;
+ box-sizing: border-box;
+ width: 100%;
+ color: #222;
+ opacity: 1;
+}
+.l-region--main-menu.mean-container .mean-nav ul li a.mean-expand {
border: 0 !important;
+ padding: 0.7em 0.9em 1.55em 0.8em !important;
+ width: auto;
+ margin: 0;
+ background-color: transparent;
}
-
-.mean-container .mean-nav ul li a.mean-expand:hover {
+.l-region--main-menu.mean-container .mean-nav ul li a.mean-expand:hover {
background: transparent;
}
-
-.l-region--main-menu.white.mean-container {
+.l-region--main-menu.mean-container.white {
background: #fff;
- border-bottom: 1px solid lightgray;
- border-top: 1px solid lightgray;
+ border-bottom: 1px solid #e6e6e6;
}
-.l-region--main-menu.white.mean-container a.meanmenu-reveal, .l-region--main-menu.white.mean-container .mean-nav a, .l-region--main-menu.white.mean-container span.nolink {
+.l-region--main-menu.mean-container.white a.meanmenu-reveal, .l-region--main-menu.mean-container.white .mean-nav a, .l-region--main-menu.mean-container.white .mean-nav span {
color: #666666;
}
-.l-region--main-menu.white.mean-container .mean-bar, .l-region--main-menu.white.mean-container .mean-nav {
+.l-region--main-menu.mean-container.white .mean-bar, .l-region--main-menu.mean-container.white .mean-nav {
background: #fff;
}
-.l-region--main-menu.white.mean-container .mean-nav ul li a,
-.l-region--main-menu.white.mean-container .mean-nav ul li span.nolink {
- border-top: 1px solid lightgray !important;
+.l-region--main-menu.mean-container.white .mean-nav ul li li {
+ background: #e6e6e6;
}
-.l-region--main-menu.white.mean-container .mean-nav ul li a.mean-expand {
- background: rgba(255, 255, 255, 0);
- border: 0 !important;
+.l-region--main-menu.mean-container.white .mean-nav ul li li a, .l-region--main-menu.mean-container.white .mean-nav ul li li span {
+ color: #1a1a1a;
}
-.l-region--main-menu.lt-gray.mean-container {
+.l-region--main-menu.mean-container.lt-gray {
background: #ededed;
+ border-bottom: 1px solid lightgray;
}
-.l-region--main-menu.lt-gray.mean-container a.meanmenu-reveal, .l-region--main-menu.lt-gray.mean-container .mean-nav a, .l-region--main-menu.lt-gray.mean-container span.nolink {
+.l-region--main-menu.mean-container.lt-gray a.meanmenu-reveal, .l-region--main-menu.mean-container.lt-gray .mean-nav a, .l-region--main-menu.mean-container.lt-gray .mean-nav span {
color: #666666;
}
-.l-region--main-menu.lt-gray.mean-container .mean-bar, .l-region--main-menu.lt-gray.mean-container .mean-nav {
+.l-region--main-menu.mean-container.lt-gray .mean-bar, .l-region--main-menu.mean-container.lt-gray .mean-nav {
background: #ededed;
}
-.l-region--main-menu.lt-gray.mean-container .mean-nav ul li a, .l-region--main-menu.lt-gray.mean-container span.nolink {
- border-top: 1px solid lightgray !important;
+.l-region--main-menu.mean-container.lt-gray .mean-nav ul li li {
+ background: lightgray;
}
-.l-region--main-menu.lt-gray.mean-container .mean-nav ul li a.mean-expand {
- background: rgba(255, 255, 255, 0);
- border: 0 !important;
+.l-region--main-menu.mean-container.lt-gray .mean-nav ul li li a, .l-region--main-menu.mean-container.lt-gray .mean-nav ul li li span {
+ color: #1a1a1a;
+}
+.l-region--main-menu.mean-container.md-gray {
+ background: #666666;
+ border-bottom: 1px solid #4d4d4d;
+}
+.l-region--main-menu.mean-container.md-gray a.meanmenu-reveal, .l-region--main-menu.mean-container.md-gray .mean-nav a, .l-region--main-menu.mean-container.md-gray .mean-nav span {
+ color: #fff;
+}
+.l-region--main-menu.mean-container.md-gray .mean-bar, .l-region--main-menu.mean-container.md-gray .mean-nav {
+ background: #666666;
+}
+.l-region--main-menu.mean-container.md-gray .mean-nav ul li li {
+ background: #4d4d4d;
+}
+.l-region--main-menu.mean-container.md-gray .mean-nav ul li li a, .l-region--main-menu.mean-container.md-gray .mean-nav ul li li span {
+ color: white;
+}
+.l-region--main-menu.mean-container.dk-gray {
+ background: #2d2d2d;
+ border-bottom: 1px solid #141414;
+}
+.l-region--main-menu.mean-container.dk-gray a.meanmenu-reveal, .l-region--main-menu.mean-container.dk-gray .mean-nav a, .l-region--main-menu.mean-container.dk-gray .mean-nav span {
+ color: #fff;
+}
+.l-region--main-menu.mean-container.dk-gray .mean-bar, .l-region--main-menu.mean-container.dk-gray .mean-nav {
+ background: #2d2d2d;
+}
+.l-region--main-menu.mean-container.dk-gray .mean-nav ul li li {
+ background: #535353;
+}
+.l-region--main-menu.mean-container.dk-gray .mean-nav ul li li a, .l-region--main-menu.mean-container.dk-gray .mean-nav ul li li span {
+ color: white;
}
-.l-region--main-menu.md-gray.mean-container a.meanmenu-reveal, .l-region--main-menu.md-gray.mean-container .mean-nav a, .l-region--main-menu.md-gray.mean-container span.nolink {
+.l-region--main-menu.mean-container.black {
+ background: #000;
+ border-bottom: 1px solid black;
+}
+.l-region--main-menu.mean-container.black a.meanmenu-reveal, .l-region--main-menu.mean-container.black .mean-nav a, .l-region--main-menu.mean-container.black .mean-nav span {
color: #fff;
}
+.l-region--main-menu.mean-container.black .mean-bar, .l-region--main-menu.mean-container.black .mean-nav {
+ background: #000;
+}
+.l-region--main-menu.mean-container.black .mean-nav ul li li {
+ background: #262626;
+}
+.l-region--main-menu.mean-container.black .mean-nav ul li li a, .l-region--main-menu.mean-container.black .mean-nav ul li li span {
+ color: white;
+}
+.l-region--main-menu.mean-container.red {
+ background: #b00;
+ border-bottom: 1px solid #880000;
+}
+.l-region--main-menu.mean-container.red a.meanmenu-reveal, .l-region--main-menu.mean-container.red .mean-nav a, .l-region--main-menu.mean-container.red .mean-nav span {
+ color: #fff;
+}
+.l-region--main-menu.mean-container.red .mean-bar, .l-region--main-menu.mean-container.red .mean-nav {
+ background: #b00;
+}
+.l-region--main-menu.mean-container.red .mean-nav ul li li {
+ background: #880000;
+}
+.l-region--main-menu.mean-container.red .mean-nav ul li li a, .l-region--main-menu.mean-container.red .mean-nav ul li li span {
+ color: white;
+}
+
+.l-page .l-constrained .mean-container a.meanmenu-reveal,
+.l-page .l-constrained .mean-container .mean-nav ul li a,
+.l-page .l-constrained .mean-container .mean-nav ul li span,
+.l-page .l-constrained .mean-container #search-block-toggle {
+ padding-left: 4%;
+ padding-right: 4%;
+}
+.l-page .l-constrained .mean-container .mean-nav a.mean-expand {
+ padding-left: 4% !important;
+ padding-right: 4% !important;
+ margin-right: 2px;
+}
+.l-page .l-constrained .mean-container .mean-nav ul li li a {
+ padding-left: 8%;
+ padding-right: 8%;
+}
.l-region--main-menu > * {
display: table-cell !important;
}
-.l-region--main-menu > * {
+.l-region--main-menu-wrapper .l-region--main-menu {
+ padding: 0;
+}
+.l-region--main-menu-wrapper .l-region--main-menu > * {
display: block;
}
-.l-region--main-menu #search-block-toggle {
- margin-top: 0.25em;
+.l-region--main-menu-wrapper .l-constrained {
+ padding: 0;
}
#superfish-1-toggle span {
@@ -2830,9 +2938,10 @@ body #site-logo {
body #site-logo img {
height: 140px;
width: auto;
+ margin-right: -0.5em;
}
-#site-logo {
+body #site-logo {
display: none;
}
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 752bb84a..0e985505 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
@@ -1620,44 +1620,47 @@ p.search-result__snippet {
margin-bottom: 0.4em;
}
+.l-page .l-region--main-menu:hover #search-block-toggle {
+ outline: 0 none !important;
+}
.l-page .l-region--main-menu #search-block-toggle {
cursor: pointer;
- padding: 0.75em 0.9em;
-}
-.l-page .l-region--main-menu .block--search {
- position: relative;
- z-index: 500;
}
-.l-page .l-region--main-menu .block--search * {
- height: 100%;
+.l-page .l-region--main-menu #search-block-toggle:focus {
+ outline: 1px dotted red;
}
-.l-page .l-region--main-menu .block--search .search-block-form {
+.l-page .l-region--main-menu #block-search-form {
+ z-index: 498;
position: absolute;
right: 0;
top: 100%;
- background-color: rgba(0, 0, 0, 0.7);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#444444,endColorstr=#444444);
+ background-color: rgba(0, 0, 0, 0.8);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#333333,endColorstr=#333333);
height: 4em;
display: none;
}
-.l-page .l-region--main-menu .block--search .search-block-form .container-inline {
+.l-page .l-region--main-menu #block-search-form * {
+ height: 100%;
+}
+.l-page .l-region--main-menu #block-search-form .container-inline {
display: table;
padding: 1em;
}
-.l-page .l-region--main-menu .block--search .search-block-form .container-inline .form-item {
+.l-page .l-region--main-menu #block-search-form .container-inline .form-item {
display: table-cell;
+ vertical-align: middle;
}
-.l-page .l-region--main-menu .block--search .search-block-form .container-inline .form-item .form-text {
+.l-page .l-region--main-menu #block-search-form .container-inline .form-item .form-text {
border: 0 none;
padding: 0 6px;
font-size: 1em;
}
-.l-page .l-region--main-menu .block--search .search-block-form .container-inline .form-actions {
+.l-page .l-region--main-menu #block-search-form .container-inline .form-actions {
display: table-cell;
text-align: center;
width: 1.9em;
}
-.l-page .l-region--main-menu .block--search .search-block-form .container-inline .form-actions .form-submit {
+.l-page .l-region--main-menu #block-search-form .container-inline .form-actions .form-submit {
border-radius: 0;
-webkit-box-sizing: content-box;
padding-right: 1em;
@@ -1665,24 +1668,26 @@ p.search-result__snippet {
}
@media (max-width: 47.5em) {
- .l-region--main-menu #search-block-toggle {
+ .l-page .l-region--main-menu #search-block-toggle {
position: absolute;
+ right: 0;
padding: 1em;
font-size: 1.2em;
- z-index: 501;
+ z-index: 500;
width: auto;
+ margin-top: 0.25em;
}
- .l-region--main-menu #search-block-form {
+ .l-page .l-region--main-menu #block-search-form {
display: none;
- position: relative;
- background-color: transparent;
height: auto;
+ width: 100%;
}
- .l-region--main-menu #search-block-form .container-inline {
+ .l-page .l-region--main-menu #block-search-form .container-inline {
width: 100%;
clear: both;
+ padding: 4%;
}
- .l-region--main-menu #search-block-form .container-inline .form-text {
+ .l-page .l-region--main-menu #block-search-form .container-inline .form-text {
width: 100%;
}
}
@@ -1690,16 +1695,18 @@ p.search-result__snippet {
padding: 0;
z-index: 9;
}
-.panel-pane.pane-bundle-tile-pane:hover {
- opacity: 0.9;
-}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane {
background: #fff;
width: 100%;
z-index: 99;
}
+.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.tile-pane-linked:hover {
+ opacity: 0.9;
+}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane a {
text-decoration: none;
+ height: 100%;
+ display: block;
color: #b00;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane a:visited {
@@ -1734,6 +1741,7 @@ p.search-result__snippet {
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.md-gray {
background: #666666;
+ color: #fff;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.md-gray a {
color: #fff;
@@ -1752,6 +1760,7 @@ p.search-result__snippet {
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.dk-gray {
background: #2d2d2d;
+ color: #fff;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.dk-gray a {
color: #fff;
@@ -1769,7 +1778,8 @@ p.search-result__snippet {
color: #028da9;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.black {
- background: black;
+ background: #000;
+ color: #fff;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.black a {
color: #fff;
@@ -1788,6 +1798,7 @@ p.search-result__snippet {
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.red {
background: #b00;
+ color: #fff;
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane.red a {
color: #fff;
@@ -1848,9 +1859,6 @@ p.search-result__snippet {
padding: 0;
text-align: center;
}
-.panel-pane.pane-bundle-tile-pane-plus-text-area:hover {
- opacity: 0.9;
-}
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane {
background: #fff;
width: 100%;
@@ -1859,7 +1867,7 @@ p.search-result__snippet {
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane.lt-gray {
background: #ededed;
}
-.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane:hover {
+.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane.tile-pane-linked:hover {
opacity: 0.9;
}
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane .text-areas {
@@ -1867,6 +1875,8 @@ p.search-result__snippet {
}
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane a {
text-decoration: none;
+ height: 100%;
+ display: block;
}
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane a h2 {
font-size: 22px;
@@ -2165,6 +2175,7 @@ div.workbench-info-block #edit-submit {
.l-footer-wrapper .osu-siteinfo-social {
margin-top: 0;
text-align: right;
+ padding-left: 0;
}
.l-footer-wrapper .osu-siteinfo-social li {
display: inline-block;
@@ -2251,7 +2262,7 @@ div.workbench-info-block #edit-submit {
text-transform: uppercase;
}
.l-region--main-menu ul.sf-main-menu li a,
-.l-region--main-menu ul.sf-main-menu li .nolink {
+.l-region--main-menu ul.sf-main-menu li span {
font-weight: 500;
text-decoration: none;
}
@@ -2327,11 +2338,11 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.white ul.menu ul > li > a:active {
color: #2d2d2d;
}
-.l-region--main-menu ul.menu li .nolink, .l-region--main-menu ul.menu ul li .nolink, .l-region--main-menu.white ul.menu li .nolink, .l-region--main-menu.white ul.menu ul li .nolink,
-.l-region--main-menu-wrapper ul.menu li .nolink,
-.l-region--main-menu-wrapper ul.menu ul li .nolink,
-.l-region--main-menu-wrapper.white ul.menu li .nolink,
-.l-region--main-menu-wrapper.white ul.menu ul li .nolink {
+.l-region--main-menu ul.menu li span, .l-region--main-menu ul.menu ul li span, .l-region--main-menu.white ul.menu li span, .l-region--main-menu.white ul.menu ul li span,
+.l-region--main-menu-wrapper ul.menu li span,
+.l-region--main-menu-wrapper ul.menu ul li span,
+.l-region--main-menu-wrapper.white ul.menu li span,
+.l-region--main-menu-wrapper.white ul.menu ul li span {
color: #666666;
}
.l-region--main-menu #search-block-toggle, .l-region--main-menu.white #search-block-toggle,
@@ -2396,9 +2407,9 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.lt-gray ul.menu ul > li > a:active {
color: #2d2d2d;
}
-.l-region--main-menu.lt-gray ul.menu li .nolink, .l-region--main-menu.lt-gray ul.menu ul li .nolink,
-.l-region--main-menu-wrapper.lt-gray ul.menu li .nolink,
-.l-region--main-menu-wrapper.lt-gray ul.menu ul li .nolink {
+.l-region--main-menu.lt-gray ul.menu li span, .l-region--main-menu.lt-gray ul.menu ul li span,
+.l-region--main-menu-wrapper.lt-gray ul.menu li span,
+.l-region--main-menu-wrapper.lt-gray ul.menu ul li span {
color: #666666;
}
.l-region--main-menu.lt-gray #search-block-toggle,
@@ -2458,9 +2469,9 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.md-gray ul.menu ul > li > a:active {
color: #b00;
}
-.l-region--main-menu.md-gray ul.menu li .nolink, .l-region--main-menu.md-gray ul.menu ul li .nolink,
-.l-region--main-menu-wrapper.md-gray ul.menu li .nolink,
-.l-region--main-menu-wrapper.md-gray ul.menu ul li .nolink {
+.l-region--main-menu.md-gray ul.menu li span, .l-region--main-menu.md-gray ul.menu ul li span,
+.l-region--main-menu-wrapper.md-gray ul.menu li span,
+.l-region--main-menu-wrapper.md-gray ul.menu ul li span {
color: #fff;
}
.l-region--main-menu.md-gray #search-block-toggle,
@@ -2520,9 +2531,9 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.dk-gray ul.menu ul > li > a:active {
color: #b00;
}
-.l-region--main-menu.dk-gray ul.menu li .nolink, .l-region--main-menu.dk-gray ul.menu ul li .nolink,
-.l-region--main-menu-wrapper.dk-gray ul.menu li .nolink,
-.l-region--main-menu-wrapper.dk-gray ul.menu ul li .nolink {
+.l-region--main-menu.dk-gray ul.menu li span, .l-region--main-menu.dk-gray ul.menu ul li span,
+.l-region--main-menu-wrapper.dk-gray ul.menu li span,
+.l-region--main-menu-wrapper.dk-gray ul.menu ul li span {
color: #fff;
}
.l-region--main-menu.dk-gray #search-block-toggle,
@@ -2582,9 +2593,9 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.black ul.menu ul > li > a:active {
color: #b00;
}
-.l-region--main-menu.black ul.menu li .nolink, .l-region--main-menu.black ul.menu ul li .nolink,
-.l-region--main-menu-wrapper.black ul.menu li .nolink,
-.l-region--main-menu-wrapper.black ul.menu ul li .nolink {
+.l-region--main-menu.black ul.menu li span, .l-region--main-menu.black ul.menu ul li span,
+.l-region--main-menu-wrapper.black ul.menu li span,
+.l-region--main-menu-wrapper.black ul.menu ul li span {
color: #fff;
}
.l-region--main-menu.black #search-block-toggle,
@@ -2631,8 +2642,8 @@ div.workbench-info-block #edit-submit {
.l-region--main-menu-wrapper.red ul.menu > li > a:active {
color: #b00;
}
-.l-region--main-menu.red ul.menu li .nolink,
-.l-region--main-menu-wrapper.red ul.menu li .nolink {
+.l-region--main-menu.red ul.menu li span,
+.l-region--main-menu-wrapper.red ul.menu li span {
color: #fff;
}
.l-region--main-menu.red ul.menu ul,
@@ -2698,86 +2709,180 @@ div.workbench-info-block #edit-submit {
z-index: 2;
}
-/* styles for mobile mean menu */
-.mean-container .mean-bar, .mean-container .mean-nav {
+.l-region--main-menu {
+ /* styles for mobile mean menu */
+}
+.l-region--main-menu.mean-container .mean-bar, .l-region--main-menu.mean-container .mean-nav {
background: none;
}
-
-.mean-container .mean-bar {
- z-index: 501;
+.l-region--main-menu.mean-container .mean-bar {
+ z-index: 499;
+ padding: 0;
}
-
-.mean-container a.meanmenu-reveal {
+.l-region--main-menu.mean-container a.meanmenu-reveal {
color: #fff;
font-size: 1.5em;
- padding: 0.75em;
+ padding: 0.9em 1em;
text-indent: 0em;
text-align: center;
+ left: 0 !important;
+ right: auto !important;
}
-
-.mean-container .mean-nav ul li a,
-.mean-container .mean-nav ul li span.nolink {
+.l-region--main-menu.mean-container .mean-nav {
+ margin-top: 4em;
+}
+.l-region--main-menu.mean-container .mean-nav ul li li {
display: block;
float: left;
- width: 90%;
- padding: 1em 5%;
+ width: 100%;
margin: 0;
text-align: left;
- color: #fff;
- border-top: 1px solid #383838;
- border-top: 1px solid rgba(255, 255, 255, 0.5);
- text-decoration: none;
text-transform: uppercase;
font-weight: 500;
+ box-sizing: border-box;
+ background: rgba(0, 0, 0, 0.1);
+ color: rgba(0, 0, 0, 0.9);
}
-
-.mean-container .mean-nav ul li a.mean-expand {
- background: rgba(255, 255, 255, 0);
+.l-region--main-menu.mean-container .mean-nav ul li a,
+.l-region--main-menu.mean-container .mean-nav ul li span {
+ color: #fff;
+ text-decoration: none;
+ border: 0;
+ padding: 1em 1em 0.9em 1.2em;
+ border: 0 none;
+ box-sizing: border-box;
+ width: 100%;
+}
+.l-region--main-menu.mean-container .mean-nav ul li li a {
+ padding-left: 3em;
+ box-sizing: border-box;
+ width: 100%;
+ color: #222;
+ opacity: 1;
+}
+.l-region--main-menu.mean-container .mean-nav ul li a.mean-expand {
border: 0 !important;
+ padding: 0.7em 0.9em 1.55em 0.8em !important;
+ width: auto;
+ margin: 0;
+ background-color: transparent;
}
-
-.mean-container .mean-nav ul li a.mean-expand:hover {
+.l-region--main-menu.mean-container .mean-nav ul li a.mean-expand:hover {
background: transparent;
}
-
-.l-region--main-menu.white.mean-container {
+.l-region--main-menu.mean-container.white {
background: #fff;
- border-bottom: 1px solid lightgray;
- border-top: 1px solid lightgray;
+ border-bottom: 1px solid #e6e6e6;
}
-.l-region--main-menu.white.mean-container a.meanmenu-reveal, .l-region--main-menu.white.mean-container .mean-nav a, .l-region--main-menu.white.mean-container span.nolink {
+.l-region--main-menu.mean-container.white a.meanmenu-reveal, .l-region--main-menu.mean-container.white .mean-nav a, .l-region--main-menu.mean-container.white .mean-nav span {
color: #666666;
}
-.l-region--main-menu.white.mean-container .mean-bar, .l-region--main-menu.white.mean-container .mean-nav {
+.l-region--main-menu.mean-container.white .mean-bar, .l-region--main-menu.mean-container.white .mean-nav {
background: #fff;
}
-.l-region--main-menu.white.mean-container .mean-nav ul li a,
-.l-region--main-menu.white.mean-container .mean-nav ul li span.nolink {
- border-top: 1px solid lightgray !important;
+.l-region--main-menu.mean-container.white .mean-nav ul li li {
+ background: #e6e6e6;
}
-.l-region--main-menu.white.mean-container .mean-nav ul li a.mean-expand {
- background: rgba(255, 255, 255, 0);
- border: 0 !important;
+.l-region--main-menu.mean-container.white .mean-nav ul li li a, .l-region--main-menu.mean-container.white .mean-nav ul li li span {
+ color: #1a1a1a;
}
-.l-region--main-menu.lt-gray.mean-container {
+.l-region--main-menu.mean-container.lt-gray {
background: #ededed;
+ border-bottom: 1px solid lightgray;
}
-.l-region--main-menu.lt-gray.mean-container a.meanmenu-reveal, .l-region--main-menu.lt-gray.mean-container .mean-nav a, .l-region--main-menu.lt-gray.mean-container span.nolink {
+.l-region--main-menu.mean-container.lt-gray a.meanmenu-reveal, .l-region--main-menu.mean-container.lt-gray .mean-nav a, .l-region--main-menu.mean-container.lt-gray .mean-nav span {
color: #666666;
}
-.l-region--main-menu.lt-gray.mean-container .mean-bar, .l-region--main-menu.lt-gray.mean-container .mean-nav {
+.l-region--main-menu.mean-container.lt-gray .mean-bar, .l-region--main-menu.mean-container.lt-gray .mean-nav {
background: #ededed;
}
-.l-region--main-menu.lt-gray.mean-container .mean-nav ul li a, .l-region--main-menu.lt-gray.mean-container span.nolink {
- border-top: 1px solid lightgray !important;
+.l-region--main-menu.mean-container.lt-gray .mean-nav ul li li {
+ background: lightgray;
+}
+.l-region--main-menu.mean-container.lt-gray .mean-nav ul li li a, .l-region--main-menu.mean-container.lt-gray .mean-nav ul li li span {
+ color: #1a1a1a;
}
-.l-region--main-menu.lt-gray.mean-container .mean-nav ul li a.mean-expand {
- background: rgba(255, 255, 255, 0);
- border: 0 !important;
+.l-region--main-menu.mean-container.md-gray {
+ background: #666666;
+ border-bottom: 1px solid #4d4d4d;
+}
+.l-region--main-menu.mean-container.md-gray a.meanmenu-reveal, .l-region--main-menu.mean-container.md-gray .mean-nav a, .l-region--main-menu.mean-container.md-gray .mean-nav span {
+ color: #fff;
+}
+.l-region--main-menu.mean-container.md-gray .mean-bar, .l-region--main-menu.mean-container.md-gray .mean-nav {
+ background: #666666;
+}
+.l-region--main-menu.mean-container.md-gray .mean-nav ul li li {
+ background: #4d4d4d;
+}
+.l-region--main-menu.mean-container.md-gray .mean-nav ul li li a, .l-region--main-menu.mean-container.md-gray .mean-nav ul li li span {
+ color: white;
+}
+.l-region--main-menu.mean-container.dk-gray {
+ background: #2d2d2d;
+ border-bottom: 1px solid #141414;
+}
+.l-region--main-menu.mean-container.dk-gray a.meanmenu-reveal, .l-region--main-menu.mean-container.dk-gray .mean-nav a, .l-region--main-menu.mean-container.dk-gray .mean-nav span {
+ color: #fff;
+}
+.l-region--main-menu.mean-container.dk-gray .mean-bar, .l-region--main-menu.mean-container.dk-gray .mean-nav {
+ background: #2d2d2d;
+}
+.l-region--main-menu.mean-container.dk-gray .mean-nav ul li li {
+ background: #535353;
+}
+.l-region--main-menu.mean-container.dk-gray .mean-nav ul li li a, .l-region--main-menu.mean-container.dk-gray .mean-nav ul li li span {
+ color: white;
+}
+.l-region--main-menu.mean-container.black {
+ background: #000;
+ border-bottom: 1px solid black;
+}
+.l-region--main-menu.mean-container.black a.meanmenu-reveal, .l-region--main-menu.mean-container.black .mean-nav a, .l-region--main-menu.mean-container.black .mean-nav span {
+ color: #fff;
+}
+.l-region--main-menu.mean-container.black .mean-bar, .l-region--main-menu.mean-container.black .mean-nav {
+ background: #000;
+}
+.l-region--main-menu.mean-container.black .mean-nav ul li li {
+ background: #262626;
}
-.l-region--main-menu.md-gray.mean-container a.meanmenu-reveal, .l-region--main-menu.md-gray.mean-container .mean-nav a, .l-region--main-menu.md-gray.mean-container span.nolink {
+.l-region--main-menu.mean-container.black .mean-nav ul li li a, .l-region--main-menu.mean-container.black .mean-nav ul li li span {
+ color: white;
+}
+.l-region--main-menu.mean-container.red {
+ background: #b00;
+ border-bottom: 1px solid #880000;
+}
+.l-region--main-menu.mean-container.red a.meanmenu-reveal, .l-region--main-menu.mean-container.red .mean-nav a, .l-region--main-menu.mean-container.red .mean-nav span {
color: #fff;
}
+.l-region--main-menu.mean-container.red .mean-bar, .l-region--main-menu.mean-container.red .mean-nav {
+ background: #b00;
+}
+.l-region--main-menu.mean-container.red .mean-nav ul li li {
+ background: #880000;
+}
+.l-region--main-menu.mean-container.red .mean-nav ul li li a, .l-region--main-menu.mean-container.red .mean-nav ul li li span {
+ color: white;
+}
+
+.l-page .l-constrained .mean-container a.meanmenu-reveal,
+.l-page .l-constrained .mean-container .mean-nav ul li a,
+.l-page .l-constrained .mean-container .mean-nav ul li span,
+.l-page .l-constrained .mean-container #search-block-toggle {
+ padding-left: 4%;
+ padding-right: 4%;
+}
+.l-page .l-constrained .mean-container .mean-nav a.mean-expand {
+ padding-left: 4% !important;
+ padding-right: 4% !important;
+ margin-right: 2px;
+}
+.l-page .l-constrained .mean-container .mean-nav ul li li a {
+ padding-left: 8%;
+ padding-right: 8%;
+}
@media (min-width: 47.5em) {
.l-region--main-menu > * {
@@ -2785,11 +2890,14 @@ div.workbench-info-block #edit-submit {
}
}
@media (max-width: 47.5em) {
- .l-region--main-menu > * {
+ .l-region--main-menu-wrapper .l-region--main-menu {
+ padding: 0;
+ }
+ .l-region--main-menu-wrapper .l-region--main-menu > * {
display: block;
}
- .l-region--main-menu #search-block-toggle {
- margin-top: 0.25em;
+ .l-region--main-menu-wrapper .l-constrained {
+ padding: 0;
}
}
#superfish-1-toggle span {
@@ -2872,10 +2980,11 @@ body #site-logo {
body #site-logo img {
height: 140px;
width: auto;
+ margin-right: -0.5em;
}
@media (max-width: 47.5em) {
- #site-logo {
+ body #site-logo {
display: none;
}
}
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 9a38af14..77dd6794 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
@@ -57,7 +57,7 @@
}
var toggleButton = $('#search-block-toggle').eq(0);
- var searchBox = $('#search-block-form').eq(0);
+ var searchBox = $('#block-search-form').eq(0);
var searchTextInput = searchBox.find('input.form-text').eq(0);
/**
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_search.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_search.scss
index 9b110b30..c7bb965a 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,52 +30,58 @@ p.search-result__snippet {
}
.l-page .l-region--main-menu {
+ &:hover {
+ #search-block-toggle {
+ outline: 0 none !important;
+ }
+ }
+
#search-block-toggle {
cursor: pointer;
- padding: 0.75em 0.9em;
+
+ &:focus {
+ outline: 1px dotted red;
+ }
}
- .block--search {
+ #block-search-form {
* {
height: 100%;
}
- position: relative;
- z-index: 500;
-
- .search-block-form {
- position: absolute;
- right: 0;
- top: 100%;
- background-color: rgba(0, 0, 0, 0.7);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#444444,endColorstr=#444444);
- height: 4em;
- display: none;
-
- .container-inline {
- display: table;
- padding: 1em;
+ z-index: 498;
+ position: absolute;
+ right: 0;
+ top: 100%;
+ background-color: rgba(0, 0, 0, 0.8);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#333333,endColorstr=#333333);
+ height: 4em;
+ display: none;
+
+ .container-inline {
+ display: table;
+ padding: 1em;
- .form-item {
- display: table-cell;
+ .form-item {
+ display: table-cell;
+ vertical-align: middle;
- .form-text {
- border: 0 none;
- padding: 0 6px;
- font-size: 1em;
- }
+ .form-text {
+ border: 0 none;
+ padding: 0 6px;
+ font-size: 1em;
}
+ }
- .form-actions {
- display: table-cell;
- text-align: center;
- width: 1.9em;
-
- .form-submit {
- border-radius: 0;
- -webkit-box-sizing: content-box;
- padding-right: 1em;
- padding-left: 1em;
- }
+ .form-actions {
+ display: table-cell;
+ text-align: center;
+ width: 1.9em;
+
+ .form-submit {
+ border-radius: 0;
+ -webkit-box-sizing: content-box;
+ padding-right: 1em;
+ padding-left: 1em;
}
}
}
@@ -83,24 +89,26 @@ p.search-result__snippet {
}
@include breakpoint($small, true) {
- .l-region--main-menu {
+ .l-page .l-region--main-menu {
#search-block-toggle {
position: absolute;
+ right: 0;
padding: 1em;
font-size: 1.2em;
- z-index: 501;
+ z-index: 500;
width: auto;
+ margin-top: 0.25em;
}
- #search-block-form {
+ #block-search-form {
display: none;
- position: relative;
- background-color: transparent;
height: auto;
+ width: 100%;
.container-inline {
width: 100%;
clear: both;
+ padding: 4%;
.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 5b99c92b..d3d7e8ee 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
@@ -4,17 +4,19 @@
padding: 0;
z-index: 9;
- &:hover {
- opacity: 0.9;
- }
-
.fieldable-panels-pane {
background: $white;
width: 100%;
z-index: 99;
+ &.tile-pane-linked:hover {
+ opacity: 0.9;
+ }
+
a {
text-decoration: none;
+ height: 100%;
+ display: block;
@include link-colors($red, $md-gray, $blue, $red, $blue);
}
@@ -28,6 +30,7 @@
&.md-gray {
background: $md-gray;
+ color: $white;
a {
@include link-colors($white, $lt-gray, $blue, $white, $blue);
@@ -36,6 +39,7 @@
&.dk-gray {
background: $dk-gray;
+ color: $white;
a {
@include link-colors($white, $lt-gray, $blue, $white, $blue);
@@ -43,7 +47,8 @@
}
&.black {
- background: black;
+ background: $black;
+ color: $white;
a {
@include link-colors($white, $lt-gray, $blue, $white, $blue);
@@ -52,6 +57,7 @@
&.red {
background: $red;
+ color: $white;
a {
@include link-colors($white, $lt-gray, $blue, $white, $blue);
@@ -110,10 +116,6 @@
padding: 0;
text-align: center;
- &:hover {
- opacity: 0.9;
- }
-
.fieldable-panels-pane {
background: $white;
width: 100%;
@@ -123,7 +125,7 @@
background: $lt-gray;
}
- &:hover {
+ &.tile-pane-linked:hover {
opacity: 0.9;
}
@@ -133,6 +135,8 @@
a {
text-decoration: none;
+ height: 100%;
+ display: block;
h2 {
@include font-size(2.2);
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 fdbf1e0d..f45af952 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
@@ -42,6 +42,7 @@
.osu-siteinfo-social {
margin-top: 0;
text-align: right;
+ padding-left: 0;
li {
display: inline-block;
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 d7aec57b..40c14f42 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
@@ -33,7 +33,7 @@
text-transform: uppercase;
a,
- .nolink {
+ span {
font-weight: 500;
text-decoration: none;
}
@@ -87,7 +87,7 @@
@include link-colors($md-gray, $dk-gray, $dk-gray, $md-gray, $red);
}
- li .nolink {
+ li span {
color: $md-gray;
}
}
@@ -113,7 +113,7 @@
@include link-colors($md-gray, $black, $dk-gray, $md-gray, $red);
}
- li .nolink {
+ li span {
color: $md-gray;
}
}
@@ -139,7 +139,7 @@
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
- li .nolink {
+ li span {
color: $white;
}
}
@@ -165,7 +165,7 @@
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
- li .nolink {
+ li span {
color: $white;
}
}
@@ -191,7 +191,7 @@
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
- li .nolink {
+ li span {
color: $white;
}
}
@@ -209,7 +209,7 @@
@include link-colors($white, darken($lt-gray, 10%), $red, $white, $yellow);
}
- li .nolink {
+ li span {
color: $white;
}
}
@@ -247,101 +247,196 @@
z-index: 2;
}
-/* styles for mobile mean menu */
-.mean-container .mean-bar, .mean-container .mean-nav {
- background: none;
-}
+@mixin menu-colors($bgcolor: "lt-gray", $fgcolor: "md-gray") {
+ background-color: $white;
-.mean-container .mean-bar {
- z-index: 501;
-}
+ ul.menu ul {
+ background-color: $lt-gray;
+ }
-.mean-container a.meanmenu-reveal {
- color: $white;
- font-size: 1.5em;
- padding: 0.75em;
- text-indent: 0em;
- text-align: center;
-}
+ .sf-menu ul:before {
+ border-bottom-color: $lt-gray;
+ }
-.mean-container .mean-nav ul li a,
-.mean-container .mean-nav ul li span.nolink {
- display: block;
- float: left;
- width: 90%;
- padding: 1em 5%;
- margin: 0;
- text-align: left;
- color: #fff;
- border-top: 1px solid #383838;
- border-top: 1px solid rgba(255, 255, 255, 0.5);
- text-decoration: none;
- text-transform: uppercase;
- font-weight: 500;
-}
+ ul.menu, ul.menu ul {
+ & > li > a {
+ @include link-colors($md-gray, $dk-gray, $dk-gray, $md-gray, $red);
+ }
-.mean-container .mean-nav ul li a.mean-expand {
- background: rgba(255, 255, 255, 0);
- border: 0 !important;
-}
+ li span {
+ color: $md-gray;
+ }
+ }
-.mean-container .mean-nav ul li a.mean-expand:hover {
- background: rgba(0, 0, 0, 0);
+ #search-block-toggle {
+ @include link-colors($md-gray, $dk-gray, $dk-gray, $md-gray, $red);
+ }
}
-.l-region--main-menu {
- &.white.mean-container {
- background: $white;
- border-bottom: 1px solid darken($lt-gray, 10%);
- border-top: 1px solid darken($lt-gray, 10%);
+@mixin menu-colors-mobile($bgcolor: "lt-gray", $fgcolor: "md-gray") {
+ background: $bgcolor;
+ border-bottom: 1px solid darken($bgcolor, 10%);
- a.meanmenu-reveal, .mean-nav a, span.nolink {
- color: $md-gray;
+ a.meanmenu-reveal, .mean-nav a, .mean-nav span {
+ color: $fgcolor;
+ }
+
+ .mean-bar, .mean-nav {
+ background: $bgcolor;
+ }
+
+ .mean-nav ul li {
+ @if lightness($bgcolor) > 66 {
+ li {
+ background: darken($bgcolor, 10%);
+
+ a, span {
+ color: darken($fgcolor, 30%);
+ }
+ }
+ }
+
+ @else if lightness($bgcolor) > 33 {
+ li {
+ background: darken($bgcolor, 10%);
+
+ a, span {
+ color: lighten($fgcolor, 30%);
+ }
+ }
}
+ @else {
+ li {
+ background: lighten($bgcolor, 15%);
+
+ a, span {
+ color: lighten($fgcolor, 30%);
+ }
+ }
+ }
+ }
+}
+
+.l-region--main-menu {
+ /* styles for mobile mean menu */
+ &.mean-container {
.mean-bar, .mean-nav {
- background: $white;
+ background: none;
}
- .mean-nav ul li a,
- .mean-nav ul li span.nolink {
- border-top: 1px solid darken($lt-gray, 10%) !important;
+ .mean-bar {
+ z-index: 499;
+ padding: 0;
}
- .mean-nav ul li a.mean-expand {
- background: rgba(255, 255, 255, 0);
- border: 0 !important;
+ a.meanmenu-reveal {
+ color: $white;
+ font-size: 1.5em;
+ padding: 0.9em 1em;
+ text-indent: 0em;
+ text-align: center;
+ left: 0 !important;
+ right: auto !important;
+ }
+
+ .mean-nav {
+ margin-top: 4em;
+
+ ul li {
+ li {
+ display: block;
+ float: left;
+ width: 100%;
+ margin: 0;
+ text-align: left;
+ text-transform: uppercase;
+ font-weight: 500;
+ box-sizing: border-box;
+ background: rgba(0, 0, 0, 0.1);
+ color: rgba(0, 0, 0, 0.9);
+ }
+
+ a,
+ span {
+ color: #fff;
+ text-decoration: none;
+ border: 0;
+ padding: 1em 1em 0.9em 1.2em;
+ border: 0 none;
+ box-sizing: border-box;
+ width: 100%;
+ }
+
+ li a {
+ padding-left: 3em;
+ box-sizing: border-box;
+ width: 100%;
+ color: #222;
+ opacity: 1;
+ }
+
+ a.mean-expand {
+ border: 0 !important;
+ padding: 0.7em 0.9em 1.55em 0.8em !important;
+ width: auto;
+ margin: 0;
+ background-color: transparent;
+ }
+
+ a.mean-expand:hover {
+ background: rgba(0, 0, 0, 0);
+ }
+ }
}
- }
- &.lt-gray.mean-container {
- background: $lt-gray;
+ &.white {
+ @include menu-colors-mobile($white, $md-gray);
+ }
- a.meanmenu-reveal, .mean-nav a, span.nolink {
- color: $md-gray;
+ &.lt-gray {
+ @include menu-colors-mobile($lt-gray, $md-gray);
}
- .mean-bar, .mean-nav {
- background: $lt-gray;
+ &.md-gray {
+ @include menu-colors-mobile($md-gray, $white);
}
- .mean-nav ul li a, span.nolink {
- border-top: 1px solid darken($lt-gray, 10%) !important;
+ &.dk-gray {
+ @include menu-colors-mobile($dk-gray, $white);
}
- .mean-nav ul li a.mean-expand {
- background: rgba(255, 255, 255, 0);
- border: 0 !important;
+ &.black {
+ @include menu-colors-mobile($black, $white);
}
- }
- &.md-gray.mean-container {
- a.meanmenu-reveal, .mean-nav a, span.nolink {
- color: $white;
+ &.red {
+ @include menu-colors-mobile($red, $white);
}
}
}
+.l-page .l-constrained .mean-container {
+ a.meanmenu-reveal,
+ .mean-nav ul li a,
+ .mean-nav ul li span,
+ #search-block-toggle {
+ padding-left: 4%;
+ padding-right: 4%;
+ }
+
+ .mean-nav a.mean-expand {
+ padding-left: 4% !important;
+ padding-right: 4% !important;
+ margin-right: 2px;
+ }
+
+ .mean-nav ul li li a {
+ padding-left: 8%;
+ padding-right: 8%;
+ }
+}
+
@include breakpoint($tab, true) {
.l-region--main-menu {
& > * {
@@ -352,13 +447,17 @@
@include breakpoint($small, true) {
- .l-region--main-menu {
- & > * {
- display: block;
+ .l-region--main-menu-wrapper {
+ .l-region--main-menu {
+ padding: 0;
+
+ & > * {
+ display: block;
+ }
}
- #search-block-toggle {
- margin-top: 0.25em;
+ .l-constrained {
+ padding: 0;
}
}
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_masthead.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_masthead.scss
index 42e5e631..61672147 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_masthead.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_masthead.scss
@@ -81,11 +81,12 @@ body #site-logo {
img {
height: 140px;
width: auto;
+ margin-right: -0.5em;
}
}
@include breakpoint($small, true) {
- #site-logo {
+ body #site-logo {
display: none;
}
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/template.php b/profiles/wcm_base/themes/ocio_omega_base/template.php
index bfe4e4cc..8bd350fc 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/template.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/template.php
@@ -110,6 +110,9 @@ function ocio_omega_base_preprocess_fieldable_panels_pane(&$vars) {
$vars['tile_url'] = $vars['content']['field_tile_link']['#items'][0]['url'];
$vars['classes_array'][] = $vars['content']['field_background_color']['#items'][0]['value'];
$vars['classes_array'][] = $vars['content']['field_background_color_2']['#items'][0]['value'];
+ if (!empty($vars['tile_url'])) {
+ $vars['classes_array'][] = 'tile-pane-linked';
+ }
}
function ocio_omega_base_panel_rows($row_assignment, $vars) {
diff --git a/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane-plus-text-area.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane-plus-text-area.tpl.php
index 9e77459d..8e9428ae 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane-plus-text-area.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane-plus-text-area.tpl.php
@@ -1,9 +1,9 @@
<div<?php print $attributes; ?>>
- <a href="<?php print $tile_url; ?>">
+ <?php if ($tile_url): ?><a href="<?php print $tile_url; ?>"><?php endif; ?>
<?php print render($content['field_tile_background_img']); ?>
<div class="text-areas">
<h2><?php print $tile_title; ?></h2>
<?php print render($content['field_tile_text_area']); ?>
</div>
- </a>
+ <?php if ($tile_url): ?></a><?php endif; ?>
</div>
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 1e331863..ecfbd244 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,9 +1,9 @@
<div<?php print $attributes; ?>>
- <a href="<?php print $tile_url; ?>">
+ <?php if ($tile_url): ?><a href="<?php print $tile_url; ?>"><?php endif; ?>
<?php print render($content['field_tile_background_img']); ?>
<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>
+ <?php if ($tile_url): ?><div class="title-icon"><i class="fa fa-angle-right"></i></div><?php endif; ?>
</div>
- </a>
+ <?php if ($tile_url): ?></a><?php endif; ?>
</div>
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index b6f66588..50cd2b95 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -359,33 +359,33 @@ libraries[ocio_modernizr][download][branch] = 7.x-1.x
; The Panopoly Foundation
-projects[panopoly_core][version] = 1.26
+projects[panopoly_core][version] = 1.27
projects[panopoly_core][subdir] = panopoly
-projects[panopoly_theme][version] = 1.26
+projects[panopoly_theme][version] = 1.27
projects[panopoly_theme][subdir] = panopoly
-projects[panopoly_magic][version] = 1.26
+projects[panopoly_magic][version] = 1.27
projects[panopoly_magic][subdir] = panopoly
-projects[panopoly_widgets][version] = 1.26
+projects[panopoly_widgets][version] = 1.27
projects[panopoly_widgets][subdir] = panopoly
projects[panopoly_widgets][patch][2528248] = http://drupal.org/files/issues/panopoly_widgets-media-browser-tabs-2528248-1.patch
-projects[panopoly_admin][version] = 1.26
+projects[panopoly_admin][version] = 1.27
projects[panopoly_admin][subdir] = panopoly
; The Panopoly Toolset
-projects[panopoly_pages][version] = 1.26
+projects[panopoly_pages][version] = 1.27
projects[panopoly_pages][subdir] = panopoly
-projects[panopoly_search][version] = 1.26
+projects[panopoly_search][version] = 1.27
projects[panopoly_search][subdir] = panopoly
; For running the automated tests.
-projects[panopoly_test][version] = 1.26
+projects[panopoly_test][version] = 1.27
projects[panopoly_test][subdir] = panopoly
--
GitLab