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.

Sign up for GitHub

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

CIWEMB-376: Update table styles #560

Merged
merged 2 commits into from
Nov 28, 2023
+49 −5
Merged

CIWEMB-376: Update table styles #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50b954e
CIWEMB-376: Update search-kit tables styles to match Shoreditch theme
ahed-compucorp Jul 26, 2023
d4fabdb
CIWEMB-376: Update default table styles
ahed-compucorp Jul 26, 2023
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
4 changes: 3 additions & 1 deletion scss/bootstrap/overrides/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ $border-radius-child: 4px !default;
//
//## Customizes the `.table` component with basic values, each used across all table variations.

$table-cell-padding: 10px 20px !default;
$table-cell-padding: 16px 10px !default;
$table-bg: $crm-white !default;
$table-border-color: $gray-light !default;

Expand Down Expand Up @@ -323,6 +323,8 @@ $pagination-active-bg: $pagination-bg !default;
$pagination-disabled-color: $gray-light !default;
$pagination-disabled-bg: $pagination-bg !default;

$pagination-a-padding: 5px 15px !default;

//== Form states and alerts
//
//## Define colors for form feedback states and, by default, alerts.
Expand Down
7 changes: 4 additions & 3 deletions scss/bootstrap/overrides/style/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* stylelint-disable selector-no-qualifying-type */

.pagination {
margin: 0;
vertical-align: top;
Expand All @@ -10,7 +12,6 @@
&.last:not(.disabled),
&.next:not(.disabled),
&.prev:not(.disabled) {

> a {
color: $gray-darker;
font-weight: bold;
Expand All @@ -19,8 +20,8 @@

> a,
> span {
border: none;
padding: 0 5px;
border: 0;
padding: $pagination-a-padding;

&:hover {
text-decoration: underline;
Expand Down
7 changes: 7 additions & 0 deletions scss/civicrm/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
$crm-standard-gap: 20px;
$crm-table-form-cell-padding: 4px;
$crm-table-cell-line-height: 18px;
$crm-table-cell-padding: 16px 10px;
$crm-table-first-cell-padding-left: 20px;

$crm-contact-info-block-min-height: 60px;
$crm-contact-info-block-padding-top: 20px;
Expand Down Expand Up @@ -48,6 +51,10 @@ $crm-section-title-spacing-y: 11px;

$crm-line-height: 135%;

$crm-search-display-pager-padding-y: 20px;
$crm-search-display-pager-padding-x: 70px;
$crm-search-display-pager-label-margin-top: 3px;

$fa-var-alert: '\f06a';
$fa-var-info-msg: '\f05a';
$fa-var-success: '\f00c';
Expand Down
1 change: 1 addition & 0 deletions scss/civicrm/common/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@import 'scrollbar';
@import 'input_file';
@import 'pager';
@import 'search-display-pager';
@import 'base';
@import 'help';
@import 'pagination';
Expand Down
23 changes: 23 additions & 0 deletions scss/civicrm/common/_search-display-pager.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
.crm-search-display {
padding-top: $crm-search-display-pager-padding-y/2;
}

.crm-search-display-pager {
background: $crm-white;
border-radius: 0;
border-top: 1px solid $table-border-color;
font-size: $font-size-base;
padding-bottom: $crm-search-display-pager-padding-y/2;
padding-left: $crm-search-display-pager-padding-x/2;
padding-right: $crm-search-display-pager-padding-x/2;
padding-top: $crm-search-display-pager-padding-y/2;

&,
a {
color: $gray-darker !important;
}

label {
margin-top: $crm-search-display-pager-label-margin-top;
}
}
12 changes: 11 additions & 1 deletion scss/civicrm/common/_tables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,17 @@ table {
tr td {
border: initial;
border-bottom: solid 1px $table-border-color;
line-height: 35px;
line-height: $crm-table-cell-line-height;
}

tr > th:first-child,
tr > td:first-child {
padding-left: $crm-table-first-cell-padding-left;
}

tr > td,
tr > th {
padding: $crm-table-cell-padding;
}

tr:last-child {
Expand Down