From 41dec866225a1f21abfefb8643a381a0cf3f8aa2 Mon Sep 17 00:00:00 2001
From: Melissa Miller <miller.2676@osu.edu>
Date: Wed, 9 Dec 2015 14:27:14 -0500
Subject: [PATCH] daily build
---
profiles/wcm_base/CHANGELOG.txt | 20 ++++++++++-
.../modules/contrib/apachesolr/CHANGELOG.txt | 4 +++
.../contrib/apachesolr/apachesolr.info | 6 ++--
.../contrib/apachesolr/apachesolr.module | 5 +--
.../apachesolr_access/apachesolr_access.info | 6 ++--
.../contrib/apachesolr/apachesolr_search.info | 6 ++--
.../apachesolr_test/apachesolr_test.info | 6 ++--
.../date_popup_authored.info | 9 ++++-
.../contrib/manualcrop/manualcrop.info | 8 +++++
.../modules/contrib/workbench/workbench.info | 8 +++++
.../workbench_media/workbench_media.info | 8 +++++
.../tests/workbench_moderation_test.info | 8 +++++
.../workbench_moderation.info | 8 +++++
.../ocio_accessibility.info | 4 ++-
.../ocio_accessibility.strongarm.inc | 16 ++++++++-
.../custom/ocio_search/ocio_search.make | 2 +-
.../modules/custom/ocio_siteinfo/logo.png | Bin 5521 -> 0 bytes
.../custom/ocio_siteinfo/ocio_siteinfo.info | 2 +-
.../ocio_siteinfo/ocio_siteinfo.install | 2 ++
.../custom/ocio_siteinfo/ocio_siteinfo.module | 30 +++++++++++++++--
.../ocio_wysiwyg.features.filter.inc | 7 +++-
.../wcm_user_contact.views_default.inc | 2 ++
.../ocio_omega_4/css/ocio-4.no-query.css | 7 ++--
.../themes/ocio_omega_4/css/ocio-4.styles.css | 7 ++--
.../ocio_omega_4/sass/components/_l-main.scss | 1 -
.../ocio_omega_4/sass/variables/_shadows.scss | 4 +--
.../ocio-default/ocio-default.layout.css | 4 +++
.../ocio-default.layout.no-query.css | 4 +++
.../css/ocio-omega-base.no-query.css | 31 +++++++++++++++---
.../css/ocio-omega-base.styles.css | 31 +++++++++++++++---
.../ocio_omega_base/sass/base/_lists.scss | 6 ++++
.../sass/components/_panels.scss | 10 +++---
.../sass/components/regions/_content.scss | 7 ++++
.../sass/components/regions/_footer.scss | 12 +++++++
.../sass/components/specific-pages/_news.scss | 5 +++
.../sass/components/views/_news-views.scss | 2 +-
.../sass/variables/_colors.scss | 2 +-
.../templates/system/html.tpl.php | 2 +-
38 files changed, 248 insertions(+), 54 deletions(-)
delete mode 100644 profiles/wcm_base/modules/custom/ocio_siteinfo/logo.png
create mode 100644 profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_news.scss
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 14181dea..2334d9f8 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,21 @@
+WCM Base 7.x-1.x, 2015-12-09
+----------------------------
+- OCIO Search: Update Apachesolr to 1.8; security update.
+- OCIO Accessibility: Add pathologic settings and update Extlink settings.
+- OCIO WYSIWYG: Add <br> to available html tags.
+- OCIO Site Info: Add Google+ and Instagram social media options.
+- OCIO Omega Base:
+ - Update to latest version of FontAwesome.
+ - Fix left margin on ul within accordions.
+ - Adjust row padding on panels.
+ - Add min-height to content region.
+ - Minor spacing adjustments to news page.
+- OCIO Omega 4:
+ - Remove padding top on l-main (to fix gap above breadcrumbs on many pages).
+ - Minor adjustment to box shadows.
+- WCM User Contact: Update contact views to not link to user profile page.
+
+
WCM Base 7.x-1.x, 2015-11-24
----------------------------
- OCIO Permissions: Added edit permissions for Editors specific panel types.
@@ -17,7 +35,7 @@ WCM Base 7.x-1.x, 2015-11-10
----------------------------
- WCM Media Gallery: Created image gallery view pane with tag filtering.
- OCIO News: Add tag filtering to news panes.
-- OCIO Panels Settings: Hide redirect settings on fieldable panel panes.
+- OCIO Panels Settings: Hide redirect settings on fieldible panel panes.
- OCIO User Config: Replace username filter with real name filter on admin page.
- WCM Base:
- Disabled error display on production sites.
diff --git a/profiles/wcm_base/modules/contrib/apachesolr/CHANGELOG.txt b/profiles/wcm_base/modules/contrib/apachesolr/CHANGELOG.txt
index 29ef1baf..b9895cec 100644
--- a/profiles/wcm_base/modules/contrib/apachesolr/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/contrib/apachesolr/CHANGELOG.txt
@@ -1,6 +1,10 @@
Apache Solr integration 7.x-1.x, xxxx-xx-xx
-----------------------------
+Apache Solr integration 7.x-1.8, 2015-12-02
+-----------------------------
+SA-CONTRIB-2015-170 by Dave Reid, theapi: fix for anonymous users can delete Solr environments that are not default.
+
Apache Solr integration 7.x-1.7, 2014-08-29
-----------------------------
#2151325 by JulienD: Remove useless files[] directive from .info files.
diff --git a/profiles/wcm_base/modules/contrib/apachesolr/apachesolr.info b/profiles/wcm_base/modules/contrib/apachesolr/apachesolr.info
index c9cb58ce..45d33e0c 100644
--- a/profiles/wcm_base/modules/contrib/apachesolr/apachesolr.info
+++ b/profiles/wcm_base/modules/contrib/apachesolr/apachesolr.info
@@ -20,9 +20,9 @@ files[] = tests/solr_base_query.test
files[] = tests/solr_base_subquery.test
files[] = tests/solr_document.test
-; Information added by Drupal.org packaging script on 2014-08-29
-version = "7.x-1.7"
+; Information added by Drupal.org packaging script on 2015-12-02
+version = "7.x-1.8"
core = "7.x"
project = "apachesolr"
-datestamp = "1409317099"
+datestamp = "1449085462"
diff --git a/profiles/wcm_base/modules/contrib/apachesolr/apachesolr.module b/profiles/wcm_base/modules/contrib/apachesolr/apachesolr.module
index b7556f39..6a948cce 100644
--- a/profiles/wcm_base/modules/contrib/apachesolr/apachesolr.module
+++ b/profiles/wcm_base/modules/contrib/apachesolr/apachesolr.module
@@ -1279,10 +1279,7 @@ function apachesolr_environment_load($env_id) {
*/
function apachesolr_environment_delete_page_access($permission, $environment) {
$is_default = $environment['env_id'] == apachesolr_default_environment();
- if ($is_default && !user_access($permission)) {
- return FALSE;
- }
- return TRUE;
+ return !$is_default && user_access($permission);
}
/**
diff --git a/profiles/wcm_base/modules/contrib/apachesolr/apachesolr_access/apachesolr_access.info b/profiles/wcm_base/modules/contrib/apachesolr/apachesolr_access/apachesolr_access.info
index 3f9789fd..bb86b4b6 100644
--- a/profiles/wcm_base/modules/contrib/apachesolr/apachesolr_access/apachesolr_access.info
+++ b/profiles/wcm_base/modules/contrib/apachesolr/apachesolr_access/apachesolr_access.info
@@ -6,9 +6,9 @@ core = 7.x
files[] = tests/apachesolr_access.test
-; Information added by Drupal.org packaging script on 2014-08-29
-version = "7.x-1.7"
+; Information added by Drupal.org packaging script on 2015-12-02
+version = "7.x-1.8"
core = "7.x"
project = "apachesolr"
-datestamp = "1409317099"
+datestamp = "1449085462"
diff --git a/profiles/wcm_base/modules/contrib/apachesolr/apachesolr_search.info b/profiles/wcm_base/modules/contrib/apachesolr/apachesolr_search.info
index 52cbc50a..74d714bb 100644
--- a/profiles/wcm_base/modules/contrib/apachesolr/apachesolr_search.info
+++ b/profiles/wcm_base/modules/contrib/apachesolr/apachesolr_search.info
@@ -7,9 +7,9 @@ core = 7.x
configure = admin/config/search/apachesolr/search-pages
-; Information added by Drupal.org packaging script on 2014-08-29
-version = "7.x-1.7"
+; Information added by Drupal.org packaging script on 2015-12-02
+version = "7.x-1.8"
core = "7.x"
project = "apachesolr"
-datestamp = "1409317099"
+datestamp = "1449085462"
diff --git a/profiles/wcm_base/modules/contrib/apachesolr/tests/apachesolr_test/apachesolr_test.info b/profiles/wcm_base/modules/contrib/apachesolr/tests/apachesolr_test/apachesolr_test.info
index fd5f4670..b2022a4e 100644
--- a/profiles/wcm_base/modules/contrib/apachesolr/tests/apachesolr_test/apachesolr_test.info
+++ b/profiles/wcm_base/modules/contrib/apachesolr/tests/apachesolr_test/apachesolr_test.info
@@ -5,9 +5,9 @@ core = 7.x
hidden = TRUE
dependencies[] = apachesolr
-; Information added by Drupal.org packaging script on 2014-08-29
-version = "7.x-1.7"
+; Information added by Drupal.org packaging script on 2015-12-02
+version = "7.x-1.8"
core = "7.x"
project = "apachesolr"
-datestamp = "1409317099"
+datestamp = "1449085462"
diff --git a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
index bd506d7f..9fb31d67 100644
--- a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
+++ b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
@@ -3,4 +3,11 @@ description = "Provides a datepicker for the 'Authored on' field on node forms."
core = 7.x
files[] = date_popup_authored.test
package = Date/Time
-dependencies[] = date_popup
\ No newline at end of file
+dependencies[] = date_popup
+
+; Information added by drush on 2015-12-09
+version = "7.x-1.1+2-dev"
+core = "7.x"
+project = "date_popup_authored"
+datestamp = "1449688885"
+
diff --git a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
index f0defad2..21f35b00 100644
--- a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
+++ b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
@@ -7,3 +7,11 @@ dependencies[] = image (>=7.8)
dependencies[] = libraries (>=2.1)
files[] = includes/views/manualcrop.views.inc
+
+
+; Information added by drush on 2015-12-09
+version = "7.x-1.4+109-dev"
+core = "7.x"
+project = "manualcrop"
+datestamp = "1449688773"
+
diff --git a/profiles/wcm_base/modules/contrib/workbench/workbench.info b/profiles/wcm_base/modules/contrib/workbench/workbench.info
index d7cbf84f..4bce47ca 100644
--- a/profiles/wcm_base/modules/contrib/workbench/workbench.info
+++ b/profiles/wcm_base/modules/contrib/workbench/workbench.info
@@ -4,3 +4,11 @@ package = Workbench
core = 7.x
configure = admin/config/workbench/settings
dependencies[] = views
+
+
+; Information added by drush on 2015-12-09
+version = "7.x-1.2"
+core = "7.x"
+project = "workbench"
+datestamp = "1449688818"
+
diff --git a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
index 9eed11b0..1f4ee081 100644
--- a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
+++ b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
@@ -4,3 +4,11 @@ package = Workbench
core = 7.x
dependencies[] = workbench
dependencies[] = media
+
+
+; Information added by drush on 2015-12-09
+version = "7.x-2.1"
+core = "7.x"
+project = "workbench_media"
+datestamp = "1449688819"
+
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
index 0f9e0139..4661c68c 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
@@ -3,3 +3,11 @@ description = Test module for Workbench Moderation.
package = Workbench
core = 7.x
hidden = TRUE
+
+
+; Information added by drush on 2015-12-09
+version = "7.x-1.4+8-dev"
+core = "7.x"
+project = "workbench_moderation"
+datestamp = "1449688820"
+
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
index 3f9939f1..5845d1f2 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
@@ -16,3 +16,11 @@ files[] = workbench_moderation.migrate.inc
files[] = tests/external_node_update.test
files[] = tests/workbench_moderation.test
files[] = tests/workbench_moderation.files.test
+
+
+; Information added by drush on 2015-12-09
+version = "7.x-1.4+8-dev"
+core = "7.x"
+project = "workbench_moderation"
+datestamp = "1449688820"
+
diff --git a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.info b/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.info
index 0742c030..9f961307 100644
--- a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.info
+++ b/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.info
@@ -7,6 +7,7 @@ project = ocio_accessibility
dependencies[] = ctools
dependencies[] = extlink
dependencies[] = features
+dependencies[] = pathologic
dependencies[] = strongarm
features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2
@@ -21,4 +22,5 @@ features[variable][] = extlink_include
features[variable][] = extlink_mailto_class
features[variable][] = extlink_subdomains
features[variable][] = extlink_target
-
+features[variable][] = pathologic_local_paths
+features[variable][] = pathologic_protocol_style
diff --git a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.strongarm.inc
index 1fe31308..692781b8 100644
--- a/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.strongarm.inc
@@ -77,7 +77,7 @@ function ocio_accessibility_strongarm() {
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'extlink_subdomains';
- $strongarm->value = 0;
+ $strongarm->value = 1;
$export['extlink_subdomains'] = $strongarm;
$strongarm = new stdClass();
@@ -87,5 +87,19 @@ function ocio_accessibility_strongarm() {
$strongarm->value = '_blank';
$export['extlink_target'] = $strongarm;
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'pathologic_local_paths';
+ $strongarm->value = '';
+ $export['pathologic_local_paths'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'pathologic_protocol_style';
+ $strongarm->value = 'proto-rel';
+ $export['pathologic_protocol_style'] = $strongarm;
+
return $export;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.make b/profiles/wcm_base/modules/custom/ocio_search/ocio_search.make
index 80b069b6..6d67f789 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.make
+++ b/profiles/wcm_base/modules/custom/ocio_search/ocio_search.make
@@ -6,7 +6,7 @@ core = 7.x
;modules
-projects[apachesolr][version] = 1.7
+projects[apachesolr][version] = 1.8
projects[apachesolr][subdir] = contrib
projects[apachesolr_file][version] = 1.x-dev
diff --git a/profiles/wcm_base/modules/custom/ocio_siteinfo/logo.png b/profiles/wcm_base/modules/custom/ocio_siteinfo/logo.png
deleted file mode 100644
index 111c2a85a92b5be4816efafb81bce99db83dd48d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5521
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
I=Kb)00ciU7AOHXW
diff --git a/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.info b/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.info
index 241da422..f4066ab1 100644
--- a/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.info
+++ b/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.info
@@ -1,5 +1,5 @@
name = OCIO Site Info
-description = "Site information module for the OSU College of Engineering distribution. Provides extended site information that is used in the OSU Omega theme for social media links, site name generation and a contact information area. Adds support for several new Tokens based on additional information fields."
+description = "Site information module for the OCIO WCM distribution. Provides extended site information that is used in the OSU Omega theme for social media links, site name generation and a contact information area. Adds support for several new Tokens based on additional information fields."
core = 7.x
package = OCIO
version = 7.x-1.0
diff --git a/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.install b/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.install
index c049b3a1..6270b1dd 100644
--- a/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.install
+++ b/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.install
@@ -41,7 +41,9 @@ function ocio_siteinfo_install() {
'twitter' => 'http://twitter.com',
'youtube' => 'http://youtube.com',
'linkedin' => 'http://linkedin.com',
+ 'googleplus' => 'http://plus.google.com',
'photos' => 'http://flickr.com',
+ 'instagram' => 'http://instagram.com',
),
);
diff --git a/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.module b/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.module
index 718a1be4..560ed273 100644
--- a/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.module
+++ b/profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.module
@@ -221,6 +221,17 @@ function ocio_siteinfo_form($form, &$form_state) {
'#weight' => '-11',
'#element_validate' => array('_ocio_siteinfo_validate_url'),
);
+
+ $form['ocio_siteinfo']['social']['googleplus'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Google+'),
+ '#default_value' => $ocio_siteinfo['social']['googleplus'],
+ '#size' => '100',
+ '#maxlength' => '150',
+ '#description' => t('Enter the URL to the Google+ profile.'),
+ '#weight' => '-10',
+ '#element_validate' => array('_ocio_siteinfo_validate_url'),
+ );
$form['ocio_siteinfo']['social']['photos'] = array(
'#type' => 'textfield',
@@ -228,8 +239,19 @@ function ocio_siteinfo_form($form, &$form_state) {
'#default_value' => $ocio_siteinfo['social']['photos'],
'#size' => '100',
'#maxlength' => '150',
- '#description' => t('Enter the URL to the photo sharing account.'),
- '#weight' => '-10',
+ '#description' => t('Enter the URL to the photo sharing account (ex. Flickr, Picasa, etc...).'),
+ '#weight' => '-9',
+ '#element_validate' => array('_ocio_siteinfo_validate_url'),
+ );
+
+ $form['ocio_siteinfo']['social']['instagram'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Instagram'),
+ '#default_value' => $ocio_siteinfo['social']['instagram'],
+ '#size' => '100',
+ '#maxlength' => '150',
+ '#description' => t('Enter the URL to the Instagram profile.'),
+ '#weight' => '-8',
'#element_validate' => array('_ocio_siteinfo_validate_url'),
);
@@ -359,6 +381,10 @@ function ocio_siteinfo_social_content($location = FALSE) {
case 'linkedin':
$title_text = 'LinkedIn';
break;
+ case 'googleplus':
+ $fa_title = 'google-plus';
+ $title_text = 'Google+';
+ break;
case 'photos':
$fa_title = 'camera';
break;
diff --git a/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.features.filter.inc b/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.features.filter.inc
index b823a205..32524a41 100644
--- a/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.features.filter.inc
+++ b/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.features.filter.inc
@@ -22,7 +22,7 @@ function ocio_wysiwyg_filter_default_formats() {
'weight' => -50,
'status' => 1,
'settings' => array(
- 'allowed_html' => '<a> <em> <u> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <h2> <h3> <h4> <table> <th> <tr> <td> <hr> <img><div><p><span>',
+ 'allowed_html' => '<a> <em> <u> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <h2> <h3> <h4> <table> <th> <tr> <td> <hr> <img><div><p><span><br>',
'filter_html_help' => 1,
'filter_html_nofollow' => 0,
),
@@ -41,8 +41,13 @@ function ocio_wysiwyg_filter_default_formats() {
'weight' => 50,
'status' => 1,
'settings' => array(
+ 'settings_source' => 'global',
'local_paths' => '',
'protocol_style' => 'full',
+ 'local_settings' => array(
+ 'protocol_style' => 'full',
+ 'local_paths' => '',
+ ),
),
),
),
diff --git a/profiles/wcm_base/modules/custom/wcm_user_contact/wcm_user_contact.views_default.inc b/profiles/wcm_base/modules/custom/wcm_user_contact/wcm_user_contact.views_default.inc
index 1d6d01ca..2722cf13 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_contact/wcm_user_contact.views_default.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_contact/wcm_user_contact.views_default.inc
@@ -57,6 +57,7 @@ function wcm_user_contact_views_default_views() {
$handler->display->display_options['fields']['realname']['label'] = '';
$handler->display->display_options['fields']['realname']['element_type'] = 'h2';
$handler->display->display_options['fields']['realname']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['realname']['link_to_user'] = FALSE;
/* Field: User: Title */
$handler->display->display_options['fields']['field_job_title']['id'] = 'field_job_title';
$handler->display->display_options['fields']['field_job_title']['table'] = 'field_data_field_job_title';
@@ -272,6 +273,7 @@ function wcm_user_contact_views_default_views() {
$handler->display->display_options['fields']['realname']['label'] = '';
$handler->display->display_options['fields']['realname']['element_type'] = 'h2';
$handler->display->display_options['fields']['realname']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['realname']['link_to_user'] = FALSE;
/* Field: User: Title */
$handler->display->display_options['fields']['field_job_title']['id'] = 'field_job_title';
$handler->display->display_options['fields']['field_job_title']['table'] = 'field_data_field_job_title';
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 7ce12398..dd79f67a 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
@@ -379,7 +379,6 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.l-main {
margin-top: 0 !important;
margin-bottom: 0 !important;
- padding-top: 30px !important;
}
.l-main.lt-gray {
@@ -404,9 +403,9 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.panel-pane.pane-bundle-tile-pane,
.panel-pane.pane-bundle-tile-pane-plus-text-area {
- -moz-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
- -webkit-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
- box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
+ -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
+ -webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
+ box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane .title-box .title-text {
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 d7fcf73f..ef12d69a 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
@@ -402,7 +402,6 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.l-main {
margin-top: 0 !important;
margin-bottom: 0 !important;
- padding-top: 30px !important;
}
.l-main.lt-gray {
@@ -427,9 +426,9 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.panel-pane.pane-bundle-tile-pane,
.panel-pane.pane-bundle-tile-pane-plus-text-area {
- -moz-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
- -webkit-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
- box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
+ -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
+ -webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
+ box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane .title-box .title-text {
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/components/_l-main.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/components/_l-main.scss
index 903237a4..d9382f60 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/components/_l-main.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/components/_l-main.scss
@@ -1,7 +1,6 @@
.l-main {
margin-top: 0 !important;
margin-bottom: 0 !important;
- padding-top: 30px !important;
}
.l-main.lt-gray {
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/variables/_shadows.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/variables/_shadows.scss
index ee788ad0..edf31cd4 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/variables/_shadows.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/variables/_shadows.scss
@@ -1,5 +1,5 @@
-$default-box-shadow-color: rgba($black, 0.18);
+$default-box-shadow-color: rgba($black, 0.22);
$default-box-shadow-blur: 1px;
$default-box-shadow-h-offset: 0px;
$default-box-shadow-v-offset: 1px;
-$default-box-shadow-spread: 1px;
+$default-box-shadow-spread: 0px;
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 5a182f79..f37fa25c 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
@@ -574,6 +574,10 @@ ol ol ol {
margin-bottom: 0.6em;
}
+.ui-accordion-content ul {
+ padding-left: 0.6em;
+}
+
.media-element-container {
margin: 0 1.5em 1em 0;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
index ce650fca..cfa038c1 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
@@ -573,6 +573,10 @@ ol ol ol {
margin-bottom: 0.6em;
}
+.ui-accordion-content ul {
+ padding-left: 0.6em;
+}
+
.media-element-container {
margin: 0 1.5em 1em 0;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
index 98e2b550..6ce31251 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
@@ -569,6 +569,10 @@ ol ol ol {
margin-bottom: 0.6em;
}
+.ui-accordion-content ul {
+ padding-left: 0.6em;
+}
+
.media-element-container {
margin: 0 1.5em 1em 0;
}
@@ -1635,12 +1639,12 @@ h2.pane-title {
}
.panels-row {
- padding-top: 2em;
- padding-bottom: 2em;
+ padding-top: 1em;
+ padding-bottom: 1em;
}
.panels-row.odd, .panels-row.even {
- padding-top: 3em;
- padding-bottom: 3em;
+ padding-top: 2em;
+ padding-bottom: 2em;
}
.panels-row.first {
padding-top: 1em;
@@ -2252,6 +2256,13 @@ div.workbench-info-block #edit-submit {
bottom: 1.2em;
}
+.l-content {
+ min-height: 4em;
+}
+.l-content h1 {
+ margin-top: 1.2em;
+}
+
.l-footer-wrapper {
background: #2d2d2d;
color: #fff;
@@ -2316,9 +2327,15 @@ div.workbench-info-block #edit-submit {
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-youtube:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-youtube:focus {
background-color: #b00;
}
+.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-googleplus:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-googleplus:focus {
+ background-color: #dd4b39;
+}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-photos:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-photos:focus {
background-color: #ff0084;
}
+.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-instagram:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-instagram:focus {
+ background-color: #517fa4;
+}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-linkedin:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-linkedin:focus {
background-color: #007bb6;
}
@@ -3382,6 +3399,10 @@ a#skip:active:hover, a#skip:focus:hover {
margin-bottom: 1em;
}
+.page-news .view-id-ocio_news_archive.view-display-id-page {
+ margin-top: 2.6em;
+}
+
.node--article .field--name-byline {
margin: 0.8em 0 0.6em 0;
font-weight: 600;
@@ -3426,7 +3447,7 @@ a#skip:active:hover, a#skip:focus:hover {
.view-display-id-page .views-row,
.view-display-id-teasers_pane .views-row {
- margin-bottom: 3em;
+ margin-bottom: 3.6em;
}
.view-display-id-page .views-row h2,
.view-display-id-teasers_pane .views-row h2 {
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 78d687e1..fa083802 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
@@ -570,6 +570,10 @@ ol ol ol {
margin-bottom: 0.6em;
}
+.ui-accordion-content ul {
+ padding-left: 0.6em;
+}
+
.media-element-container {
margin: 0 1.5em 1em 0;
}
@@ -1652,12 +1656,12 @@ h2.pane-title {
}
.panels-row {
- padding-top: 2em;
- padding-bottom: 2em;
+ padding-top: 1em;
+ padding-bottom: 1em;
}
.panels-row.odd, .panels-row.even {
- padding-top: 3em;
- padding-bottom: 3em;
+ padding-top: 2em;
+ padding-bottom: 2em;
}
.panels-row.first {
padding-top: 1em;
@@ -2286,6 +2290,13 @@ div.workbench-info-block #edit-submit {
}
}
+.l-content {
+ min-height: 4em;
+}
+.l-content h1 {
+ margin-top: 1.2em;
+}
+
.l-footer-wrapper {
background: #2d2d2d;
color: #fff;
@@ -2350,9 +2361,15 @@ div.workbench-info-block #edit-submit {
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-youtube:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-youtube:focus {
background-color: #b00;
}
+.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-googleplus:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-googleplus:focus {
+ background-color: #dd4b39;
+}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-photos:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-photos:focus {
background-color: #ff0084;
}
+.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-instagram:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-instagram:focus {
+ background-color: #517fa4;
+}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-linkedin:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-linkedin:focus {
background-color: #007bb6;
}
@@ -3421,6 +3438,10 @@ a#skip:active:hover, a#skip:focus:hover {
margin-bottom: 1em;
}
+.page-news .view-id-ocio_news_archive.view-display-id-page {
+ margin-top: 2.6em;
+}
+
.node--article .field--name-byline {
margin: 0.8em 0 0.6em 0;
font-weight: 600;
@@ -3473,7 +3494,7 @@ a#skip:active:hover, a#skip:focus:hover {
.view-display-id-page .views-row,
.view-display-id-teasers_pane .views-row {
- margin-bottom: 3em;
+ margin-bottom: 3.6em;
}
.view-display-id-page .views-row h2,
.view-display-id-teasers_pane .views-row h2 {
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_lists.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_lists.scss
index 528df764..2e7c9d1c 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_lists.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_lists.scss
@@ -45,4 +45,10 @@ ol {
li {
margin-bottom: 0.6em;
}
+}
+
+.ui-accordion-content {
+ ul {
+ padding-left: 0.6em;
+ }
}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_panels.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_panels.scss
index 036e2446..1c35969f 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_panels.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_panels.scss
@@ -56,12 +56,12 @@ h2.pane-title {
// layout rows
.panels-row {
- padding-top: 2em;
- padding-bottom: 2em;
+ padding-top: 1em;
+ padding-bottom: 1em;
&.odd, &.even {
- padding-top: 3em;
- padding-bottom: 3em;
+ padding-top: 2em;
+ padding-bottom: 2em;
}
&.first {
@@ -77,7 +77,7 @@ h2.pane-title {
}
}
-//all layouts with tiles header panels
+//all layouts with tiles
.tiles-header-panel .panel-pane {
margin-top: 0;
margin-bottom: 2.5em;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_content.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_content.scss
index e69de29b..f25e16fc 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_content.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_content.scss
@@ -0,0 +1,7 @@
+.l-content {
+ min-height: 4em;
+
+ h1 {
+ margin-top: 1.2em;
+ }
+}
\ No newline at end of file
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 238dadfc..ad2b2da5 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
@@ -78,12 +78,24 @@
background-color: $youtube;
}
}
+
+ &.link-googleplus {
+ &:hover, &:focus {
+ background-color: $googleplus;
+ }
+ }
&.link-photos {
&:hover, &:focus {
background-color: $flickr;
}
}
+
+ &.link-instagram {
+ &:hover, &:focus {
+ background-color: $instagram;
+ }
+ }
&.link-linkedin {
&:hover, &:focus {
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_news.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_news.scss
new file mode 100644
index 00000000..a82d7a32
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_news.scss
@@ -0,0 +1,5 @@
+.page-news {
+ .view-id-ocio_news_archive.view-display-id-page {
+ margin-top: 2.6em;
+ }
+}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/views/_news-views.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/views/_news-views.scss
index a6cb3df7..dbb2d947 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/views/_news-views.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/views/_news-views.scss
@@ -72,7 +72,7 @@
.view-display-id-page,
.view-display-id-teasers_pane {
.views-row {
- margin-bottom: 3em;
+ margin-bottom: 3.6em;
h2 {
@include font-size(3.2);
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_colors.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_colors.scss
index da2ad0b4..fb6a34ff 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_colors.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_colors.scss
@@ -15,7 +15,7 @@ $purple: #442369;
// social media colors
$facebook: #3b5998;
$youtube: $red;
-$google-plus: #dd4b39;
+$googleplus: #dd4b39;
$twitter: #00aced;
$linkedin: #007bb6;
$flickr: #ff0084;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/templates/system/html.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/templates/system/html.tpl.php
index 7afed328..26a91acf 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/templates/system/html.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/templates/system/html.tpl.php
@@ -11,7 +11,7 @@
<?php endif; ?>
<head>
<!-- font awesome -->
- <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet">
+ <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
<!-- code font -->
<script src="//use.edgefonts.net/courier-prime.js"></script>
--
GitLab