diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 14181dea44c4a5d101f94ce5b2cd3b07935295db..2334d9f868e01fb6d7938b493ca7746da361f3ee 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 29ef1bafbcc6cb2304e00ab8e57c1fd485ae9e2f..b9895cecc31f1ec1d74b0956da5d085f3b33d034 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 c9cb58ce94ab5afb95d169c4e531bb605475c454..45d33e0c513499b7798bb47f4b01508e3621b1a9 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 b7556f39d81efd80da3bbdd018fd25bb22e63f99..6a948cceecaf8ae0b49504ae6d24bd7925524963 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 3f9789fddc5efebb48c4682a0829f438b77a97f9..bb86b4b6dbf33ba4516b64080bb9e7d423abb7e1 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 52cbc50aa32ab1e9feeb182650fcc3238e2c977e..74d714bb8aad70b46628d2f4f8ca50e3f82b5be3 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 fd5f4670ea5e59c96466579b2710f6ac65a86fff..b2022a4e1a56125f36cce90111db833e1ba87aa3 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 bd506d7fd3b823ef3007eadd2dfee8b48dcc6fd5..9fb31d67393e3800b414e010f73f80965c06b7f6 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 f0defad2c46c26897cbd8859c768016a84fb8416..21f35b00d200c931f7984aafcf2193fe6cd5f747 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 d7cbf84f6369778823ff812cc8a73b4f01b89ced..4bce47caacbeb7f43969ebe6b129b5193029b4ba 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 9eed11b0890ef272579ddb4f41cb6ca4aaae667e..1f4ee081fe0d7e737a82a9221eed3b0b7d1b23ff 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 0f9e0139939f90f05138f37fdc695d018263dee7..4661c68c065e4b543202120cf39dadc1eabb4382 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 3f9939f1b620392b86995547bbcbb4b94258075d..5845d1f29f8b771140a77b6f23a864494f873418 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 0742c030626418faa73edd873ed7c01847e438a4..9f9613075a30249d92e5a82213914a6a15a5acfa 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 1fe313085906c22f2c262f46e9cfd561cfa2dbf8..692781b8ca06205d0e9adabe5cff07a936017108 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 80b069b6c194a367bd3dca9f2f6a7a5f6acb5d78..6d67f7897df4924333a1457cf81b12a971c7831d 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
Binary files a/profiles/wcm_base/modules/custom/ocio_siteinfo/logo.png and /dev/null differ
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 241da422fe3ddc9268ce0891d424188f65d31165..f4066ab1c6dac17821b3eba8280e3e30167f2a2b 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 c049b3a135ca1d78caf368e7d2e70874f3f1b608..6270b1ddc48ae70ceaa2eacd66068df9d52cdf69 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 718a1be4a8a6d1f947a01d4e95daabc9d7acc9f4..560ed2738a08c60789802075cdea9339fe6329bb 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 b823a20520cda6a84cf5926424074e81d0a09802..32524a4125651428d97c5870fe46d35f6887ca28 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 1d6d01ca8b05ce76914a4c559fcbd8cd04d74a9c..2722cf1364eebae59c30378d600ee185e6ac81f9 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 7ce12398a2fef1cc72863c6e9ab8d354eab989cc..dd79f67a1e67ecf47888c8971a82c70715f1cd99 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 d7fcf73fa671b9e08d12d7bdde6ec4bfccbcae2f..ef12d69a30b3b832a3cdb171e438de4e4610865b 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 903237a45f1416a3ac77241775371d7a7d74582f..d9382f60c153c8f1a5ac886d34f1ebcfdaae0f17 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 ee788ad04626addd01e45a3afc23f80af09b5d1e..edf31cd469323dea5008c711418725ff0816be28 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 5a182f79270e134b01c6e1dbd94f7c2a048c5385..f37fa25c3708aaa5f96bb845ec3b1361c0958387 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 ce650fca4be2ff32cdf1f2dbb02e914c714aed6c..cfa038c187a42ef7bcddb262ef2c8b878d2807ad 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 98e2b550ec3067e55d33518886eb3e7c2092c4a8..6ce31251d6874093813356133fcfd2951107708f 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 78d687e1274f693ead280e89fde42d6541e2f8b5..fa083802c53244269152c030f1c7bb7377430dc7 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 528df764b516e8567047e1a0c9ed0edbb72b6867..2e7c9d1ca50f5d44bf2b5bc880cefcdd320e7ff5 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 036e2446807ce03507f87248a1870e4b08fec0d6..1c35969f7ebcef9568c41d8193048f80f14e8f33 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f25e16fc5d0bb44f42c0346b45fe038abde63578 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 238dadfca63462e65c3ec6c6ec4535079dcfac47..ad2b2da5c60b3bd9b1bd8bbb4e309ca6b544a634 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 0000000000000000000000000000000000000000..a82d7a32ffb2c812b1236583305cdda0b6843c0c
--- /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 a6cb3df73bdbc7caea12bbac5796812386a421e9..dbb2d947edd437c5170849cfa90261090b70e00d 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 da2ad0b4b18337fb325613a8c7ef95c127cbdd11..fb6a34ffbbea1b44c6c56d045d7a5d9fbcf93093 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 7afed328278ca4cfed8f88463bf5c0fdb96979ee..26a91acf769bcacfc945d00163388b5c7334be50 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>