Skip to content

Commit

Permalink
Merge pull request #40 from berkeley-cdss/styling
Browse files Browse the repository at this point in the history
Dark mode passes tests
  • Loading branch information
cycomachead authored Aug 14, 2024
2 parents d5ee61b + eb4e11e commit e80cdcb
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 14 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ description: A modern, highly customizable, responsive Jekyll template for cours
# TODO(template): this should be built from the staff list...
author: Various Bears
# You should use either light or dark as the theme.
color_scheme: light
color_scheme: dark

# TODO(setup): Set this to the semester, e.g. /sp24, (faXX / spXX / suXX / wiXX )
baseurl: '/berkeley-class-site' # the subpath of your site, which should just be the semester.
Expand Down
33 changes: 21 additions & 12 deletions _sass/color_schemes/dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ $color-scheme: dark;
$body-background-color: $grey-dk-300;
$body-heading-color: $grey-lt-000;
$body-text-color: $grey-lt-300;
$link-color: $blue-000;
// $link-color: $blue-000;
$nav-child-link-color: $grey-dk-000;
$sidebar-color: $grey-dk-300;
$base-button-color: $grey-dk-250;
$btn-primary-color: $blue-200;
// $btn-primary-color: $blue-200;
$code-background-color: #31343f; // OneDarkJekyll default for syntax-one-dark-vivid
$code-linenumber-color: #dee2f7; // OneDarkJekyll .nf for syntax-one-dark-vivid
$feedback-color: darken($sidebar-color, 3%);
Expand All @@ -25,6 +25,7 @@ $border-color: $grey-dk-200;
@import '../snytax_highliters/a11y-dark';

// Override dark-mode variables here
$berkeley-blue: #002676; // rgb(0, 38, 118);
$grey-dk-400: #0C0A0E !default;
$body-background-color: $grey-dk-400;
$sidebar-color: $grey-dk-400;
Expand All @@ -37,13 +38,21 @@ $hover-focus-link-color: darken($link-color, 10%);

// TODO(template): We need to figure out a much better solution!
// This swaps the "dk" and "lt" variants from the original JTD files.
$grey-lt-000: #959396 !default;
$grey-lt-100: #5c5962 !default;
$grey-lt-200: #44434d !default;
$grey-lt-250: #302d36 !default;
$grey-lt-300: #27262b !default;

$grey-dk-000: #f5f6fa !default;
$grey-dk-100: #eeebee !default;
$grey-dk-200: #ecebed !default;
$grey-dk-300: #e6e1e8 !default;
$grey-lt-000: #959396;
$grey-lt-100: #5c5962;
$grey-lt-200: #44434d;
$grey-lt-250: #302d36;
$grey-lt-300: #27262b;

$grey-dk-000: #f5f6fa;
$grey-dk-100: #eeebee;
$grey-dk-200: #ecebed;
$grey-dk-300: #e6e1e8;

$btn-primary-color: $berkeley-blue;
$base-button-color: $grey-dk-200;

// This is not great, but JTD forces $link-color
.btn:not(.btn-outline) {
color: $btn-primary-color !important;
}
2 changes: 1 addition & 1 deletion _sass/just-the-class/staffer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
}

.staffer-meta {
@extend .text-grey-dk-300;
color: $grey-dk-300;
}
}

0 comments on commit e80cdcb

Please sign in to comment.