From e566422c5df9ac82d7d511d73d51ca5f6931f8a4 Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Wed, 13 Apr 2016 15:12:44 -0400
Subject: [PATCH] daily build
---
profiles/wcm_base/CHANGELOG.txt | 6 +
.../contrib/features/features.admin.inc | 20 ++--
.../contrib/features/features.drush.inc | 4 +-
.../modules/contrib/features/features.info | 10 +-
.../modules/contrib/features/features.module | 7 +-
.../tests/features_test/features_test.info | 6 +-
.../plugins/accordion/editor-accordion.css | 12 +-
.../ocio_wysiwyg/plugins/tabs/editor-tabs.css | 12 +-
.../ocio-default/ocio-default.layout.css | 84 ++++++++------
.../ocio-default.layout.no-query.css | 84 ++++++++------
.../css/ocio-omega-base.no-query.css | 84 ++++++++------
.../css/ocio-omega-base.styles.css | 84 ++++++++------
.../sass/base/_accordions.scss | 13 ++-
.../ocio_omega_base/sass/base/_tables.scss | 108 +++++++++++-------
profiles/wcm_base/wcm_base.make | 2 +-
15 files changed, 336 insertions(+), 200 deletions(-)
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index f0dc7eab..ca6b6395 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,9 @@
+WCM Base 7.x-1.x, 2016-04-13
+----------------------------
+- WCM Base: Updated Features module to 2.9 (security release).
+- OCIO Omega Base: Improved accordion and table styles.
+- OCIO WYSIWYG: Fix accordion and tab group indicators.
+
WCM Base 7.x-1.x, 2016-04-12
----------------------------
- WCM Base:
diff --git a/profiles/wcm_base/modules/contrib/features/features.admin.inc b/profiles/wcm_base/modules/contrib/features/features.admin.inc
index e22bee93..46752c89 100644
--- a/profiles/wcm_base/modules/contrib/features/features.admin.inc
+++ b/profiles/wcm_base/modules/contrib/features/features.admin.inc
@@ -88,6 +88,12 @@ function features_settings_form($form, $form_state) {
'#default_value' => variable_get('features_rebuild_on_flush', TRUE),
'#description' => t('If you have a large site with many features, you may experience lag on full cache clear. If disabled, features will rebuild only when viewing the features list or saving the modules list.'),
);
+ $form['general']['features_rebuild_modules_page'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Rebuild features on accessing modules list page'),
+ '#default_value' => variable_get('features_rebuild_modules_page', FALSE),
+ '#description' => t('If you have a large site with many features, you may experience lag on accessing the modules administration page. If disabled, features will not rebuild when viewing the modules list.'),
+ );
return system_settings_form($form);
}
@@ -1328,7 +1334,7 @@ function features_form_submit(&$form, &$form_state) {
// page callback rather than as part of the submit handler as some modules
// have includes/other directives of importance in hooks that have already
// been called in this page load.
- $form_state['redirect'] = 'admin/structure/features/cleanup/clear';
+ $form_state['redirect'] = array('admin/structure/features/cleanup', array('query' => array('token' => drupal_get_token())));
$features = $form['#features'];
if (!empty($features)) {
@@ -1352,21 +1358,19 @@ function features_form_rebuild() {
}
/**
- * Form for clearing cache after enabling a feature.
+ * Callback for clearing cache after enabling a feature.
*/
-function features_cleanup_form($form, $form_state, $cache_clear = FALSE) {
- // Clear caches if we're getting a post-submit redirect that requests it.
- if ($cache_clear) {
+function features_cleanup() {
+ if (!empty($_GET['token']) && drupal_valid_token($_GET['token'])) {
drupal_flush_all_caches();
-
// The following functions need to be run because drupal_flush_all_caches()
// runs rebuilds in the wrong order. The node type cache is rebuilt *after*
// the menu is rebuilt, meaning that the menu tree is stale in certain
// circumstances after drupal_flush_all_caches(). We rebuild again.
menu_rebuild();
- }
-
drupal_goto('admin/structure/features');
+ }
+ return MENU_NOT_FOUND;
}
/**
diff --git a/profiles/wcm_base/modules/contrib/features/features.drush.inc b/profiles/wcm_base/modules/contrib/features/features.drush.inc
index 90a01d1d..e3ae80c6 100644
--- a/profiles/wcm_base/modules/contrib/features/features.drush.inc
+++ b/profiles/wcm_base/modules/contrib/features/features.drush.inc
@@ -812,7 +812,7 @@ function drush_features_revert() {
}
}
else {
- drush_features_list();
+ drush_print_table(drush_features_list());
return;
}
}
@@ -866,7 +866,7 @@ function drush_features_revert_all() {
*/
function drush_features_diff() {
if (!$args = func_get_args()) {
- drush_features_list();
+ drush_print_table(drush_features_list());
return;
}
$module = $args[0];
diff --git a/profiles/wcm_base/modules/contrib/features/features.info b/profiles/wcm_base/modules/contrib/features/features.info
index 789fdfc8..4c0d8c73 100644
--- a/profiles/wcm_base/modules/contrib/features/features.info
+++ b/profiles/wcm_base/modules/contrib/features/features.info
@@ -3,12 +3,16 @@ description = "Provides feature management for Drupal."
core = 7.x
package = "Features"
files[] = tests/features.test
+test_dependencies[] = image
+test_dependencies[] = strongarm
+test_dependencies[] = taxonomy
+test_dependencies[] = views
configure = admin/structure/features/settings
-; Information added by Drupal.org packaging script on 2016-03-23
-version = "7.x-2.8"
+; Information added by Drupal.org packaging script on 2016-04-13
+version = "7.x-2.9"
core = "7.x"
project = "features"
-datestamp = "1458744548"
+datestamp = "1460560763"
diff --git a/profiles/wcm_base/modules/contrib/features/features.module b/profiles/wcm_base/modules/contrib/features/features.module
index 280a7098..123e94f0 100644
--- a/profiles/wcm_base/modules/contrib/features/features.module
+++ b/profiles/wcm_base/modules/contrib/features/features.module
@@ -84,8 +84,7 @@ function features_menu() {
$items['admin/structure/features/cleanup'] = array(
'title' => 'Cleanup',
'description' => 'Clear cache after enabling/disabling a feature.',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('features_cleanup_form', 4),
+ 'page callback' => 'features_cleanup',
'type' => MENU_CALLBACK,
'file' => 'features.admin.inc',
'weight' => 1,
@@ -921,7 +920,9 @@ function features_access_override_actions($feature) {
* Implements hook_form_alter() for system_modules form().
*/
function features_form_system_modules_alter(&$form) {
- features_rebuild();
+ if (variable_get('features_rebuild_modules_page', FALSE)) {
+ features_rebuild();
+ }
}
/**
diff --git a/profiles/wcm_base/modules/contrib/features/tests/features_test/features_test.info b/profiles/wcm_base/modules/contrib/features/tests/features_test/features_test.info
index 9d9eaa84..7a2b94ba 100644
--- a/profiles/wcm_base/modules/contrib/features/tests/features_test/features_test.info
+++ b/profiles/wcm_base/modules/contrib/features/tests/features_test/features_test.info
@@ -21,9 +21,9 @@ features[user_permission][] = create features_test content
features[views_view][] = features_test
hidden = 1
-; Information added by Drupal.org packaging script on 2016-03-23
-version = "7.x-2.8"
+; Information added by Drupal.org packaging script on 2016-04-13
+version = "7.x-2.9"
core = "7.x"
project = "features"
-datestamp = "1458744548"
+datestamp = "1460560763"
diff --git a/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/accordion/editor-accordion.css b/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/accordion/editor-accordion.css
index bb55875b..7c779422 100644
--- a/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/accordion/editor-accordion.css
+++ b/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/accordion/editor-accordion.css
@@ -6,7 +6,7 @@
.cke_widget_wrapper .ui-accordion .ui-accordion-header {
background-image: url("icon-accordion.png");
background-repeat: no-repeat;
- background-position: right 0.9em center;
+ background-position: right 0.85em center;
padding-right: 4em;
background-color: #e0e0e0;
}
@@ -43,11 +43,11 @@
.cke_widget_accordion + .cke_widget_accordion:before {
background-color: #e0e0e0;
content: "";
- float: right;
- height: 1.5em;
- width: 1.5em;
- margin-right: 0.6em;
- margin-top: -0.6em;
+ height: 1em;
+ position: absolute;
+ right: 0.9em;
text-align: center;
+ top: -0.5em;
transform: rotate(45deg);
+ width: 1em;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/tabs/editor-tabs.css b/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/tabs/editor-tabs.css
index f2c77797..b4601751 100644
--- a/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/tabs/editor-tabs.css
+++ b/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/tabs/editor-tabs.css
@@ -6,7 +6,7 @@
.cke_widget_wrapper .ui-tabs .ui-tabs-nav {
background-image: url("icon-tabs.png");
background-repeat: no-repeat;
- background-position: right 0.9em center;
+ background-position: right 0.85em center;
padding-right: 4em;
background-color: #e0e0e0;
}
@@ -43,12 +43,12 @@
.cke_widget_tabs + .cke_widget_tabs:before {
background-color: #e0e0e0;
content: "";
- float: right;
- height: 1.5em;
- width: 1.5em;
- margin-right: 0.6em;
- margin-top: -0.6em;
+ height: 1em;
+ position: absolute;
+ right: 0.9em;
text-align: center;
+ top: -0.5em;
transform: rotate(45deg);
+ width: 1em;
}
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 0528c739..a59207f4 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
@@ -10,6 +10,13 @@
overflow: auto;
}
+body .panels-row.odd .ui-accordion .ui-accordion-header {
+ background: lightgray;
+}
+body .panels-row.odd .ui-accordion .ui-accordion-content {
+ border-color: lightgray;
+}
+
ul.breadcrumb {
padding: 0;
padding-top: 1.4em;
@@ -1055,19 +1062,19 @@ h6 a:hover, .zeta a:hover {
text-decoration: none;
}
-.reverse-links, th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+.reverse-links, table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
color: #ededed;
}
-.reverse-links:visited, th a:visited {
+.reverse-links:visited, table th a:visited {
color: #ededed;
}
-.reverse-links:focus, th a:focus {
+.reverse-links:focus, table th a:focus {
color: #d65828;
}
-.reverse-links:hover, th a:hover {
+.reverse-links:hover, table th a:hover {
color: #fff;
}
-.reverse-links:active, th a:active {
+.reverse-links:active, table th a:active {
color: #b00;
}
@@ -1153,58 +1160,71 @@ blockquote.pull-quote cite::before {
}
table {
+ width: 100%;
margin-bottom: 20px;
font-size: 14px;
font-size: 1.4rem;
line-height: 140%;
+ /* Table captions */
}
-
-th {
+table th {
background: #353535;
color: #fff;
- font-weight: 300;
+ font-weight: 600;
}
-th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
text-decoration: none;
}
-
-table {
- border: 1px solid #666666;
-}
-
-thead, th {
- border: 1px solid #666666;
+table, table thead {
+ border: 1px solid #353535;
}
-
-tr, td {
+table tbody {
border: 1px solid lightgray;
}
-
-tr.odd {
+table tbody tr {
+ border-bottom: 1px solid lightgray;
+}
+table tbody tr.odd, table tbody tr:nth-child(odd) {
+ background: #fff;
+}
+table tbody tr.even, table tbody tr:nth-child(even) {
background: #ededed;
}
-
-tr.even {
+table thead + tbody tr.odd, table thead + tbody tr:nth-child(odd) {
+ background: #ededed;
+}
+table thead + tbody tr.even, table thead + tbody tr:nth-child(even) {
background: #fff;
}
-
-td, th {
+table td, table th {
padding: 0.5em 0.8em;
+ border: 0 none;
}
-
-/* Table captions */
table caption {
color: #666666;
text-align: left;
margin-bottom: 5px;
}
+.panels-row.odd table tbody tr.odd, .panels-row.odd table tbody tr:nth-child(odd) {
+ background: #fff;
+}
+.panels-row.odd table tbody tr.even, .panels-row.odd table tbody tr:nth-child(even) {
+ background: #f2f2f2;
+}
+.panels-row.odd table thead + tbody tr.odd, .panels-row.odd table thead + tbody tr:nth-child(odd) {
+ background: #f2f2f2;
+}
+.panels-row.odd table thead + tbody tr.even, .panels-row.odd table thead + tbody tr:nth-child(even) {
+ background: #fff;
+}
+
.ui-accordion-content table td {
border: 1px solid #ededed;
}
/***************************
-*** special instance tables
+*** special instance tables
***************************/
/* tables added with the table pane type */
.pane-bundle-table table {
@@ -1458,19 +1478,19 @@ h6 a:hover, .zeta a:hover {
text-decoration: none;
}
-.reverse-links, th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+.reverse-links, table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
color: #ededed;
}
-.reverse-links:visited, th a:visited {
+.reverse-links:visited, table th a:visited {
color: #ededed;
}
-.reverse-links:focus, th a:focus {
+.reverse-links:focus, table th a:focus {
color: #d65828;
}
-.reverse-links:hover, th a:hover {
+.reverse-links:hover, table th a:hover {
color: #fff;
}
-.reverse-links:active, th a:active {
+.reverse-links:active, table th a:active {
color: #b00;
}
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 e12bfcd5..2e4c5bb9 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
@@ -10,6 +10,13 @@
overflow: auto;
}
+body .panels-row.odd .ui-accordion .ui-accordion-header {
+ background: lightgray;
+}
+body .panels-row.odd .ui-accordion .ui-accordion-content {
+ border-color: lightgray;
+}
+
ul.breadcrumb {
padding: 0;
padding-top: 1.4em;
@@ -1049,19 +1056,19 @@ h6 a:hover, .zeta a:hover {
text-decoration: none;
}
-.reverse-links, th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+.reverse-links, table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
color: #ededed;
}
-.reverse-links:visited, th a:visited {
+.reverse-links:visited, table th a:visited {
color: #ededed;
}
-.reverse-links:focus, th a:focus {
+.reverse-links:focus, table th a:focus {
color: #d65828;
}
-.reverse-links:hover, th a:hover {
+.reverse-links:hover, table th a:hover {
color: #fff;
}
-.reverse-links:active, th a:active {
+.reverse-links:active, table th a:active {
color: #b00;
}
@@ -1147,58 +1154,71 @@ blockquote.pull-quote cite::before {
}
table {
+ width: 100%;
margin-bottom: 20px;
font-size: 14px;
font-size: 1.4rem;
line-height: 140%;
+ /* Table captions */
}
-
-th {
+table th {
background: #353535;
color: #fff;
- font-weight: 300;
+ font-weight: 600;
}
-th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
text-decoration: none;
}
-
-table {
- border: 1px solid #666666;
-}
-
-thead, th {
- border: 1px solid #666666;
+table, table thead {
+ border: 1px solid #353535;
}
-
-tr, td {
+table tbody {
border: 1px solid lightgray;
}
-
-tr.odd {
+table tbody tr {
+ border-bottom: 1px solid lightgray;
+}
+table tbody tr.odd, table tbody tr:nth-child(odd) {
+ background: #fff;
+}
+table tbody tr.even, table tbody tr:nth-child(even) {
background: #ededed;
}
-
-tr.even {
+table thead + tbody tr.odd, table thead + tbody tr:nth-child(odd) {
+ background: #ededed;
+}
+table thead + tbody tr.even, table thead + tbody tr:nth-child(even) {
background: #fff;
}
-
-td, th {
+table td, table th {
padding: 0.5em 0.8em;
+ border: 0 none;
}
-
-/* Table captions */
table caption {
color: #666666;
text-align: left;
margin-bottom: 5px;
}
+.panels-row.odd table tbody tr.odd, .panels-row.odd table tbody tr:nth-child(odd) {
+ background: #fff;
+}
+.panels-row.odd table tbody tr.even, .panels-row.odd table tbody tr:nth-child(even) {
+ background: #f2f2f2;
+}
+.panels-row.odd table thead + tbody tr.odd, .panels-row.odd table thead + tbody tr:nth-child(odd) {
+ background: #f2f2f2;
+}
+.panels-row.odd table thead + tbody tr.even, .panels-row.odd table thead + tbody tr:nth-child(even) {
+ background: #fff;
+}
+
.ui-accordion-content table td {
border: 1px solid #ededed;
}
/***************************
-*** special instance tables
+*** special instance tables
***************************/
/* tables added with the table pane type */
.pane-bundle-table table {
@@ -1448,19 +1468,19 @@ h6 a:hover, .zeta a:hover {
text-decoration: none;
}
-.reverse-links, th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+.reverse-links, table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
color: #ededed;
}
-.reverse-links:visited, th a:visited {
+.reverse-links:visited, table th a:visited {
color: #ededed;
}
-.reverse-links:focus, th a:focus {
+.reverse-links:focus, table th a:focus {
color: #d65828;
}
-.reverse-links:hover, th a:hover {
+.reverse-links:hover, table th a:hover {
color: #fff;
}
-.reverse-links:active, th a:active {
+.reverse-links:active, table th a:active {
color: #b00;
}
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 00111c56..538991d3 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
@@ -6,6 +6,13 @@
overflow: auto;
}
+body .panels-row.odd .ui-accordion .ui-accordion-header {
+ background: lightgray;
+}
+body .panels-row.odd .ui-accordion .ui-accordion-content {
+ border-color: lightgray;
+}
+
ul.breadcrumb {
padding: 0;
padding-top: 1.4em;
@@ -1045,19 +1052,19 @@ h6 a:hover, .zeta a:hover, .view-faq.view-faq.view-display-id-page div.view-disp
text-decoration: none;
}
-.reverse-links, th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+.reverse-links, table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
color: #ededed;
}
-.reverse-links:visited, th a:visited {
+.reverse-links:visited, table th a:visited {
color: #ededed;
}
-.reverse-links:focus, th a:focus {
+.reverse-links:focus, table th a:focus {
color: #d65828;
}
-.reverse-links:hover, th a:hover {
+.reverse-links:hover, table th a:hover {
color: #fff;
}
-.reverse-links:active, th a:active {
+.reverse-links:active, table th a:active {
color: #b00;
}
@@ -1144,58 +1151,71 @@ blockquote.pull-quote cite::before {
}
table {
+ width: 100%;
margin-bottom: 20px;
font-size: 14px;
font-size: 1.4rem;
line-height: 140%;
+ /* Table captions */
}
-
-th {
+table th {
background: #353535;
color: #fff;
- font-weight: 300;
+ font-weight: 600;
}
-th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
text-decoration: none;
}
-
-table {
- border: 1px solid #666666;
-}
-
-thead, th {
- border: 1px solid #666666;
+table, table thead {
+ border: 1px solid #353535;
}
-
-tr, td {
+table tbody {
border: 1px solid lightgray;
}
-
-tr.odd {
+table tbody tr {
+ border-bottom: 1px solid lightgray;
+}
+table tbody tr.odd, table tbody tr:nth-child(odd) {
+ background: #fff;
+}
+table tbody tr.even, table tbody tr:nth-child(even) {
background: #ededed;
}
-
-tr.even {
+table thead + tbody tr.odd, table thead + tbody tr:nth-child(odd) {
+ background: #ededed;
+}
+table thead + tbody tr.even, table thead + tbody tr:nth-child(even) {
background: #fff;
}
-
-td, th {
+table td, table th {
padding: 0.5em 0.8em;
+ border: 0 none;
}
-
-/* Table captions */
table caption {
color: #666666;
text-align: left;
margin-bottom: 5px;
}
+.panels-row.odd table tbody tr.odd, .panels-row.odd table tbody tr:nth-child(odd) {
+ background: #fff;
+}
+.panels-row.odd table tbody tr.even, .panels-row.odd table tbody tr:nth-child(even) {
+ background: #f2f2f2;
+}
+.panels-row.odd table thead + tbody tr.odd, .panels-row.odd table thead + tbody tr:nth-child(odd) {
+ background: #f2f2f2;
+}
+.panels-row.odd table thead + tbody tr.even, .panels-row.odd table thead + tbody tr:nth-child(even) {
+ background: #fff;
+}
+
.ui-accordion-content table td {
border: 1px solid #ededed;
}
/***************************
-*** special instance tables
+*** special instance tables
***************************/
/* tables added with the table pane type */
.pane-bundle-table table {
@@ -1445,19 +1465,19 @@ h6 a:hover, .zeta a:hover, .view-faq.view-faq.view-display-id-page div.view-disp
text-decoration: none;
}
-.reverse-links, th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+.reverse-links, table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
color: #ededed;
}
-.reverse-links:visited, th a:visited {
+.reverse-links:visited, table th a:visited {
color: #ededed;
}
-.reverse-links:focus, th a:focus {
+.reverse-links:focus, table th a:focus {
color: #d65828;
}
-.reverse-links:hover, th a:hover {
+.reverse-links:hover, table th a:hover {
color: #fff;
}
-.reverse-links:active, th a:active {
+.reverse-links:active, table th a:active {
color: #b00;
}
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 71fc12f6..8821fd7f 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
@@ -6,6 +6,13 @@
overflow: auto;
}
+body .panels-row.odd .ui-accordion .ui-accordion-header {
+ background: lightgray;
+}
+body .panels-row.odd .ui-accordion .ui-accordion-content {
+ border-color: lightgray;
+}
+
ul.breadcrumb {
padding: 0;
padding-top: 1.4em;
@@ -1051,19 +1058,19 @@ h6 a:hover, .zeta a:hover, .view-faq.view-faq.view-display-id-page div.view-disp
text-decoration: none;
}
-.reverse-links, th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+.reverse-links, table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
color: #ededed;
}
-.reverse-links:visited, th a:visited {
+.reverse-links:visited, table th a:visited {
color: #ededed;
}
-.reverse-links:focus, th a:focus {
+.reverse-links:focus, table th a:focus {
color: #d65828;
}
-.reverse-links:hover, th a:hover {
+.reverse-links:hover, table th a:hover {
color: #fff;
}
-.reverse-links:active, th a:active {
+.reverse-links:active, table th a:active {
color: #b00;
}
@@ -1150,58 +1157,71 @@ blockquote.pull-quote cite::before {
}
table {
+ width: 100%;
margin-bottom: 20px;
font-size: 14px;
font-size: 1.4rem;
line-height: 140%;
+ /* Table captions */
}
-
-th {
+table th {
background: #353535;
color: #fff;
- font-weight: 300;
+ font-weight: 600;
}
-th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
text-decoration: none;
}
-
-table {
- border: 1px solid #666666;
-}
-
-thead, th {
- border: 1px solid #666666;
+table, table thead {
+ border: 1px solid #353535;
}
-
-tr, td {
+table tbody {
border: 1px solid lightgray;
}
-
-tr.odd {
+table tbody tr {
+ border-bottom: 1px solid lightgray;
+}
+table tbody tr.odd, table tbody tr:nth-child(odd) {
+ background: #fff;
+}
+table tbody tr.even, table tbody tr:nth-child(even) {
background: #ededed;
}
-
-tr.even {
+table thead + tbody tr.odd, table thead + tbody tr:nth-child(odd) {
+ background: #ededed;
+}
+table thead + tbody tr.even, table thead + tbody tr:nth-child(even) {
background: #fff;
}
-
-td, th {
+table td, table th {
padding: 0.5em 0.8em;
+ border: 0 none;
}
-
-/* Table captions */
table caption {
color: #666666;
text-align: left;
margin-bottom: 5px;
}
+.panels-row.odd table tbody tr.odd, .panels-row.odd table tbody tr:nth-child(odd) {
+ background: #fff;
+}
+.panels-row.odd table tbody tr.even, .panels-row.odd table tbody tr:nth-child(even) {
+ background: #f2f2f2;
+}
+.panels-row.odd table thead + tbody tr.odd, .panels-row.odd table thead + tbody tr:nth-child(odd) {
+ background: #f2f2f2;
+}
+.panels-row.odd table thead + tbody tr.even, .panels-row.odd table thead + tbody tr:nth-child(even) {
+ background: #fff;
+}
+
.ui-accordion-content table td {
border: 1px solid #ededed;
}
/***************************
-*** special instance tables
+*** special instance tables
***************************/
/* tables added with the table pane type */
.pane-bundle-table table {
@@ -1455,19 +1475,19 @@ h6 a:hover, .zeta a:hover, .view-faq.view-faq.view-display-id-page div.view-disp
text-decoration: none;
}
-.reverse-links, th a, th .ui-accordion-content a, .ui-accordion-content th a, th .ui-tabs-content a, .ui-tabs-content th a {
+.reverse-links, table th a, table th .ui-accordion-content a, .ui-accordion-content table th a, table th .ui-tabs-content a, .ui-tabs-content table th a {
color: #ededed;
}
-.reverse-links:visited, th a:visited {
+.reverse-links:visited, table th a:visited {
color: #ededed;
}
-.reverse-links:focus, th a:focus {
+.reverse-links:focus, table th a:focus {
color: #d65828;
}
-.reverse-links:hover, th a:hover {
+.reverse-links:hover, table th a:hover {
color: #fff;
}
-.reverse-links:active, th a:active {
+.reverse-links:active, table th a:active {
color: #b00;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_accordions.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_accordions.scss
index 49cffda0..05f3a0e4 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_accordions.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_accordions.scss
@@ -8,4 +8,15 @@
a {
@extend a;
}
-}
\ No newline at end of file
+}
+
+body .panels-row.odd .ui-accordion {
+ .ui-accordion-header {
+ background: darken($lt-gray, 10%);
+ }
+
+ .ui-accordion-content {
+ border-color: darken($lt-gray, 10%);
+ }
+}
+
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_tables.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_tables.scss
index 2cc371fe..ad92bec2 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_tables.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_tables.scss
@@ -1,68 +1,98 @@
@import "typography.scss";
table {
- margin-bottom:$vert-spacing-unit;
+ width: 100%;
+ margin-bottom: $vert-spacing-unit;
@include font-size(1.4);
line-height: 140%;
-}
-th {
- background: lighten($dk-gray,3%);
- color: $white;
- font-weight: 300;
- a {
- @extend .reverse-links;
- text-decoration: none;
- }
-}
+ th {
+ background: lighten($dk-gray,3%);
+ color: $white;
+ font-weight: 600;
-table {
- border: 1px solid $md-gray;
-}
+ a {
+ @extend .reverse-links;
+ text-decoration: none;
+ }
+ }
-thead, th {
- border: 1px solid $md-gray;
-}
+ &, thead {
+ border: 1px solid lighten($dk-gray, 3%);
+ }
-tr, td {
- border: 1px solid darken($lt-gray, 10%);
-}
+ tbody {
+ border: 1px solid darken($lt-gray, 10%);
-tr.odd {
- background: $lt-gray;
-}
+ tr {
+ border-bottom: 1px solid darken($lt-gray, 10%);
-tr.even {
- background: $white;
-}
+ &.odd, &:nth-child(odd) {
+ background: $white;
+ }
+ &.even, &:nth-child(even) {
+ background: $lt-gray;
+ }
+ }
+ }
-td, th {
- padding: 0.5em 0.8em;
-}
+ thead + tbody tr {
+ &.odd, &:nth-child(odd) {
+ background: $lt-gray;
+ }
+ &.even, &:nth-child(even) {
+ background: $white;
+ }
+ }
-/* Table captions */
-table caption {
- color:$md-gray;
- text-align:left;
- @extend .fine-print;
- margin-bottom: $vert-spacing-unit/4;
+ td, th {
+ padding: 0.5em 0.8em;
+ border: 0 none;
+ }
+
+ /* Table captions */
+ caption {
+ color:$md-gray;
+ text-align:left;
+ @extend .fine-print;
+ margin-bottom: $vert-spacing-unit/4;
+ }
}
+.panels-row.odd table {
+ tbody tr {
+ &.odd, &:nth-child(odd) {
+ background: $white;
+ }
+ &.even, &:nth-child(even) {
+ background: lighten($lt-gray, 2%);
+ }
+ }
-//adding borders to tables within accordions
+ thead + tbody tr {
+ &.odd, &:nth-child(odd) {
+ background: lighten($lt-gray, 2%);
+ }
+ &.even, &:nth-child(even) {
+ background: $white;
+ }
+ }
+}
+
+//adding borders to tables within accordions
.ui-accordion-content {
table td {
- border:1px solid $lt-gray;
+ border: 1px solid $lt-gray;
}
}
/***************************
-*** special instance tables
+*** special instance tables
***************************/
/* tables added with the table pane type */
.pane-bundle-table table {
width: 100%;
-}
\ No newline at end of file
+}
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index 595c555e..ebee2168 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -39,7 +39,7 @@ projects[draggableviews][subdir] = contrib
projects[ds][version] = 2.13
projects[ds][subdir] = contrib
-projects[features][version] = 2.8
+projects[features][version] = 2.9
projects[features][subdir] = contrib
projects[features][patch][986968] = https://drupal.org/files/issues/export_shorcuts_sets-986968-36.patch
--
GitLab