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

Rename for consistency $table-sm-cell-padding, $table-bg-accent, $table-bg-hover, $table-bg-active, $table-inverse-bg-accent, $table-inverse-bg-hover to $table-cell-padding-sm, $table-accent-bg, $table-hover-bg, $table-active-bg, $table-inverse-accent-bg, $table-inverse-hover-bg, respectively (#22414) #22806

Merged
merged 1 commit into from
Jun 13, 2017
Merged

Rename for consistency $table-sm-cell-padding, $table-bg-accent, $table-bg-hover, $table-bg-active, $table-inverse-bg-accent, $table-inverse-bg-hover to $table-cell-padding-sm, $table-accent-bg, $table-hover-bg, $table-active-bg, $table-inverse-accent-bg, $table-inverse-hover-bg, respectively (#22414) #22806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions scss/_tables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
.table-sm {
th,
td {
padding: $table-sm-cell-padding;
padding: $table-cell-padding-sm;
}
}

Expand Down Expand Up @@ -69,7 +69,7 @@

.table-striped {
tbody tr:nth-of-type(odd) {
background-color: $table-bg-accent;
background-color: $table-accent-bg;
}
}

Expand All @@ -81,7 +81,7 @@
.table-hover {
tbody tr {
@include hover {
background-color: $table-bg-hover;
background-color: $table-hover-bg;
}
}
}
Expand All @@ -93,7 +93,7 @@
// inheritance to nested tables.

// Generate the contextual variants
@include table-row-variant(active, $table-bg-active);
@include table-row-variant(active, $table-active-bg);
@include table-row-variant(success, $state-success-bg);
@include table-row-variant(info, $state-info-bg);
@include table-row-variant(warning, $state-warning-bg);
Expand Down Expand Up @@ -134,14 +134,14 @@

&.table-striped {
tbody tr:nth-of-type(odd) {
background-color: $table-inverse-bg-accent;
background-color: $table-inverse-accent-bg;
}
}

&.table-hover {
tbody tr {
@include hover {
background-color: $table-inverse-bg-hover;
background-color: $table-inverse-hover-bg;
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,12 @@ $list-inline-padding: 5px !default;
// Customizes the `.table` component with basic values, each used across all table variations.

$table-cell-padding: .75rem !default;
$table-sm-cell-padding: .3rem !default;
$table-cell-padding-sm: .3rem !default;

$table-bg: transparent !default;
$table-bg-accent: rgba($black,.05) !default;
$table-bg-hover: rgba($black,.075) !default;
$table-bg-active: $table-bg-hover !default;
$table-accent-bg: rgba($black,.05) !default;
$table-hover-bg: rgba($black,.075) !default;
$table-active-bg: $table-hover-bg !default;

$table-border-width: $border-width !default;
$table-border-color: $gray-lighter !default;
Expand All @@ -327,8 +327,8 @@ $table-head-bg: $gray-lighter !default;
$table-head-color: $gray !default;

$table-inverse-bg: $gray-dark !default;
$table-inverse-bg-accent: rgba($white, .05) !default;
$table-inverse-bg-hover: rgba($white, .075) !default;
$table-inverse-accent-bg: rgba($white, .05) !default;
$table-inverse-hover-bg: rgba($white, .075) !default;
$table-inverse-border-color: lighten($gray-dark, 7.5%) !default;
$table-inverse-color: $body-bg !default;

Expand Down