From 570bb0b9fbf081306fb4b7f57d9d547893a2c98b Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Mon, 25 Apr 2016 11:37:43 -0400
Subject: [PATCH] daily build
---
.../modules/contrib/wysiwyg/tests/wysiwyg_test.info | 6 +++---
profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.admin.inc | 2 +-
profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info | 6 +++---
.../themes/ocio_omega_base/css/ocio-omega-base.no-query.css | 6 ++++--
.../themes/ocio_omega_base/css/ocio-omega-base.styles.css | 6 ++++--
.../themes/ocio_omega_base/sass/components/_tiles.scss | 2 +-
6 files changed, 16 insertions(+), 12 deletions(-)
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 9fc1cc3a..d64cf8aa 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 2016-01-25
-version = "7.x-2.2+75-dev"
+; Information added by Drupal.org packaging script on 2016-04-25
+version = "7.x-2.2+76-dev"
core = "7.x"
project = "wysiwyg"
-datestamp = "1453735332"
+datestamp = "1461587855"
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.admin.inc b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.admin.inc
index bc3e5ecf..d6618128 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.admin.inc
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.admin.inc
@@ -367,7 +367,7 @@ function wysiwyg_profile_overview($form, &$form_state) {
'#title' => t('Installation instructions'),
'#collapsible' => TRUE,
'#collapsed' => !isset($show_instructions),
- '#description' => (!$count ? t('There are no editor libraries installed currently. The following list contains a list of currently supported editors:') : ''),
+ '#description' => t('A complete list of <a href="@url">supported editor versions</a> for all Wysiwyg module versions can be found on drupal.org.', array('@url' => url('https://www.drupal.org/node/596966'))) . (!$count ? ' ' . t('There are no editor libraries installed currently. The following list contains a list of currently supported editors:') : ''),
'#weight' => 10,
);
$form['status']['report'] = array('#markup' => theme('status_report', array('requirements' => $status)));
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info
index fe87adc3..12547b1b 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 2016-01-25
-version = "7.x-2.2+75-dev"
+; Information added by Drupal.org packaging script on 2016-04-25
+version = "7.x-2.2+76-dev"
core = "7.x"
project = "wysiwyg"
-datestamp = "1453735332"
+datestamp = "1461587855"
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 b323a585..ecef3250 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
@@ -2102,8 +2102,10 @@ p.search-result__snippet {
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane.tile-pane-linked:hover {
opacity: 0.85;
}
-.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane a,
-.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane a {
+.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane > a, .panel-pane.pane-bundle-tile-pane .ui-accordion-content .fieldable-panels-pane > a, .panel-pane.pane-bundle-tile-pane .ui-tabs-content .fieldable-panels-pane > a,
+.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane > a,
+.panel-pane.pane-bundle-tile-pane-plus-text-area .ui-accordion-content .fieldable-panels-pane > a,
+.panel-pane.pane-bundle-tile-pane-plus-text-area .ui-tabs-content .fieldable-panels-pane > a {
text-decoration: none;
height: 100%;
display: block;
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 42261b90..7ec0eca8 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
@@ -2133,8 +2133,10 @@ p.search-result__snippet {
.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane.tile-pane-linked:hover {
opacity: 0.85;
}
-.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane a,
-.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane a {
+.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane > a, .panel-pane.pane-bundle-tile-pane .ui-accordion-content .fieldable-panels-pane > a, .panel-pane.pane-bundle-tile-pane .ui-tabs-content .fieldable-panels-pane > a,
+.panel-pane.pane-bundle-tile-pane-plus-text-area .fieldable-panels-pane > a,
+.panel-pane.pane-bundle-tile-pane-plus-text-area .ui-accordion-content .fieldable-panels-pane > a,
+.panel-pane.pane-bundle-tile-pane-plus-text-area .ui-tabs-content .fieldable-panels-pane > a {
text-decoration: none;
height: 100%;
display: block;
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 df34e418..b9d5c9ec 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
@@ -13,7 +13,7 @@
opacity: 0.85;
}
- a {
+ & > a {
text-decoration: none;
height: 100%;
display: block;
--
GitLab