diff --git a/package-lock.json b/package-lock.json index 254ed4ab..80b29cea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3195,6 +3195,15 @@ "inherits": { "version": "2.0.3", "bundled": true, +<<<<<<< HEAD +======= + "dev": true, + "optional": true + }, + "ini": { + "version": "1.3.5", + "bundled": true, +>>>>>>> fabf2c3e (CPS-378: Fix case status labels) "dev": true, "optional": true }, diff --git a/scss/civicrm/administer/contribute/_contribute.scss b/scss/civicrm/administer/contribute/_contribute.scss index 8e9329d8..17a6cd5d 100644 --- a/scss/civicrm/administer/contribute/_contribute.scss +++ b/scss/civicrm/administer/contribute/_contribute.scss @@ -19,6 +19,12 @@ #alpha-filter { border-bottom: 1px solid $crm-grayblue-dark; } + + .dataTable { + td { + background: $crm-white !important; + } + } } &#{civi-page('admin-contribute')} { @@ -29,6 +35,12 @@ .dataTables_wrapper { box-shadow: none; } + + .dataTable { + td { + background: $crm-white !important; + } + } } .crm-actions-ribbon { diff --git a/scss/civicrm/administer/customize-data/_customize-data.scss b/scss/civicrm/administer/customize-data/_customize-data.scss index da35240c..b5bca72f 100644 --- a/scss/civicrm/administer/customize-data/_customize-data.scss +++ b/scss/civicrm/administer/customize-data/_customize-data.scss @@ -90,9 +90,13 @@ box-shadow: none !important; } - .dataTable > tbody > tr > td.crm-custom_option-links { - padding-right: 20px; - text-align: right; + .dataTable > tbody > tr > td { + background: $crm-white !important; + + .crm-custom_option-links { + padding-right: 20px; + text-align: right; + } } .ui-dialog-content #field_page { diff --git a/scss/civicrm/administer/system-status/_configtask.scss b/scss/civicrm/administer/system-status/_configtask.scss index f39f5118..bf97865c 100644 --- a/scss/civicrm/administer/system-status/_configtask.scss +++ b/scss/civicrm/administer/system-status/_configtask.scss @@ -19,6 +19,12 @@ background: $gray-lighter !important; } } + + tr:not(.columnheader) { + td { + background: $crm-white !important; + } + } } td.tasklist a { diff --git a/scss/civicrm/cases/_dashboard.scss b/scss/civicrm/cases/_dashboard.scss index 749e0a3a..8e17c29d 100644 --- a/scss/civicrm/cases/_dashboard.scss +++ b/scss/civicrm/cases/_dashboard.scss @@ -81,6 +81,12 @@ .spacer { height: 20px; } + + .dataTable { + td { + background: $crm-white !important; + } + } } div[class*='crm-case-filter-'] { diff --git a/scss/civicrm/common/_tables.scss b/scss/civicrm/common/_tables.scss index f4b1f15b..98de058b 100644 --- a/scss/civicrm/common/_tables.scss +++ b/scss/civicrm/common/_tables.scss @@ -103,7 +103,7 @@ table { } td { - background: $crm-white !important; + background: $crm-white; &.label { vertical-align: middle !important; diff --git a/scss/civicrm/contact/pages/_events.scss b/scss/civicrm/contact/pages/_events.scss index 4df975b9..fc9a0137 100644 --- a/scss/civicrm/contact/pages/_events.scss +++ b/scss/civicrm/contact/pages/_events.scss @@ -101,6 +101,7 @@ tbody tr { td { + background: $crm-white !important; line-height: normal; padding: 10px; diff --git a/scss/civicrm/contact/pages/_reports.scss b/scss/civicrm/contact/pages/_reports.scss index dba6b6d4..a2cad225 100644 --- a/scss/civicrm/contact/pages/_reports.scss +++ b/scss/civicrm/contact/pages/_reports.scss @@ -12,6 +12,7 @@ body[class*='page-civicrm-report-'] { table.report-layout { td { + background: $crm-white !important; border-bottom: 1px solid $gray-light; &.report-contents-right {