Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CPS-378: Fix Case Status labels #503

Merged
merged 2 commits into from
Apr 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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_
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not add the backstop block here as well?

9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions scss/civicrm/administer/contribute/_contribute.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
#alpha-filter {
border-bottom: 1px solid $crm-grayblue-dark;
}

.dataTable {
td {
background: $crm-white !important;
}
}
}

&#{civi-page('admin-contribute')} {
Expand All @@ -29,6 +35,12 @@
.dataTables_wrapper {
box-shadow: none;
}

.dataTable {
td {
background: $crm-white !important;
}
}
}

.crm-actions-ribbon {
Expand Down
10 changes: 7 additions & 3 deletions scss/civicrm/administer/customize-data/_customize-data.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 6 additions & 0 deletions scss/civicrm/administer/system-status/_configtask.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
background: $gray-lighter !important;
}
}

tr:not(.columnheader) {
td {
background: $crm-white !important;
}
}
}

td.tasklist a {
Expand Down
6 changes: 6 additions & 0 deletions scss/civicrm/cases/_dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@
.spacer {
height: 20px;
}

.dataTable {
td {
background: $crm-white !important;
}
}
}

div[class*='crm-case-filter-'] {
Expand Down
2 changes: 1 addition & 1 deletion scss/civicrm/common/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ table {
}

td {
background: $crm-white !important;
background: $crm-white;

&.label {
vertical-align: middle !important;
Expand Down
1 change: 1 addition & 0 deletions scss/civicrm/contact/pages/_events.scss
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@

tbody tr {
td {
background: $crm-white !important;
line-height: normal;
padding: 10px;

Expand Down
1 change: 1 addition & 0 deletions scss/civicrm/contact/pages/_reports.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down