Merge pull request #503 from civicrm/CPS-378-case-status-labels-fix

civicrm · Apr 14, 2021 · af4508a · af4508a
2 parents 5109a76 + faae557
commit af4508a
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 4 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,21 @@
+## Overview
+_A brief description of the pull request. Try to keep it non-technical._
+
+## Before
+_The current status. Please provide screenshots or gifs ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)) where appropriate._
+
+## After
+_What has been changed. Please provide screenshots or gifs ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)) where appropriate._
+
+## Technical Details
+_If the PR introduces noteworthy technical changes, please describe them here. Provide code snippets if necessary_
+
+### Core overrides
+_If the PR overrides/patches a core file, then please explain here, for each file:_
+
+1. _Which file it is_
+2. _The reason why it was overridden/patched_
+3. _What the override/patch consists of_
+
+## Comments
+_Anything else you would like the reviewer to note_
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {