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

Jump to bottom

[BSv5] Fix SCSS functions import issue, and replace darken() #1388

Merged
merged 1 commit into from
Feb 1, 2023
Merged

[BSv5] Fix SCSS functions import issue, and replace darken() #1388

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
8 changes: 4 additions & 4 deletions assets/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ $gray-800: #333 !default;
$gray-900: #222 !default;
$black: #000 !default;

$code-color: darken($secondary, 20%) !default;
$code-color: shade-color($secondary, 40%) !default;

// UI element colors

Expand All @@ -52,9 +52,9 @@ $td-sidebar-border-color: $border-color !default;
// These colors are all part of the theme palette, but the mix is fairly random to create variation. This can be overridden by the project if needed.
$td-box-colors: $dark, $primary, $secondary, $info, $gray-600, $success, $warning, $dark, $danger, $primary, $secondary, $info !default;

$link-color: darken($blue, 15%) !default;
$link-color: adjust-color($blue, $lightness: -15%) !default;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

While I followed BS's upgrade path and generally replaced darken() by shade-color(), in this case the resulting color didn't look as good, so I opted for a call to adjust-color() --matching the previous color exactly.

$link-decoration: none !default;
$link-hover-color: darken($link-color, 15%) !default;
$link-hover-color: shade-color($link-color, 30%) !default;
$link-hover-decoration: none !default;

// Fonts
Expand Down Expand Up @@ -116,7 +116,7 @@ $td-block-space-bottom-base: 4 * $spacer !default;

$pagination-color: $gray-600 !default;
$pagination-border-color: rgba($black, 0.1) !default;
$pagination-active-border-color: darken($primary, 5%) !default;
$pagination-active-border-color: adjust-color($primary, $lightness: -5%) !default;
$pagination-disabled-color: $gray-300 !default;

// Navbar
Expand Down
2 changes: 2 additions & 0 deletions assets/scss/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../vendor/bootstrap/scss/functions";
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

See the opening comment of this PR for a design rationale.


@import "support/functions";
@import "variables_project";
@import "variables";
Expand Down