From ad5f81d84ab310225b7671a7b8b2b7103cba4879 Mon Sep 17 00:00:00 2001 From: "Christopher C. Wells" Date: Sun, 9 Jul 2023 09:26:13 -0700 Subject: [PATCH] Adopt new Bootstrap 5 dark mode support --- babybuddy/static_src/scss/_variables.scss | 82 ------------ babybuddy/templates/babybuddy/base.html | 2 +- babybuddy/templates/babybuddy/filter.html | 2 +- .../templates/babybuddy/nav-dropdown.html | 6 +- babybuddy/templates/babybuddy/welcome.html | 2 +- .../templates/error/403_csrf_bad_origin.html | 2 +- babybuddy/templates/registration/login.html | 4 +- .../registration/password_reset_confirm.html | 4 +- .../registration/password_reset_form.html | 2 +- core/templates/core/timer_detail.html | 6 +- core/templates/core/widget_tag_editor.html | 2 +- core/templates/timeline/_timeline.html | 2 +- .../templates/cards/diaperchange_types.html | 5 +- dashboard/templates/cards/feeding_day.html | 2 +- .../templates/cards/feeding_last_method.html | 2 +- dashboard/templates/cards/sleep_recent.html | 2 +- dashboard/templates/cards/timer_list.html | 2 +- dashboard/templates/cards/tummytime_day.html | 2 +- .../dashboard/child_button_group.html | 2 +- reports/templates/reports/report_base.html | 2 +- ....d4851339e6b5.css => app.17f998aecee3.css} | 118 +++++++++--------- static/babybuddy/css/app.17f998aecee3.css.gz | Bin 0 -> 35236 bytes static/babybuddy/css/app.css | 118 +++++++++--------- static/babybuddy/css/app.css.gz | Bin 35235 -> 35181 bytes static/babybuddy/css/app.d4851339e6b5.css.gz | Bin 35288 -> 0 bytes static/staticfiles.json | 2 +- 26 files changed, 144 insertions(+), 229 deletions(-) rename static/babybuddy/css/{app.d4851339e6b5.css => app.17f998aecee3.css} (98%) create mode 100644 static/babybuddy/css/app.17f998aecee3.css.gz delete mode 100644 static/babybuddy/css/app.d4851339e6b5.css.gz diff --git a/babybuddy/static_src/scss/_variables.scss b/babybuddy/static_src/scss/_variables.scss index 7e0309ec..c5e61fd0 100644 --- a/babybuddy/static_src/scss/_variables.scss +++ b/babybuddy/static_src/scss/_variables.scss @@ -28,14 +28,7 @@ $light: $gray-100; $dark: $gray-800; -// Body -// Settings for the `` element. - -$body-bg: $gray-900; -$body-color: $gray-400; - // Links -// Style anchor elements. $link-color: $info; $link-decoration: none; @@ -43,94 +36,19 @@ $link-hover-color: color.adjust($link-color, $lightness: -15%); // Components -// Define common padding and border radius sizes and more. $border-color: $gray-200; $component-active-color: $gray-400; $component-active-bg: $primary; -// Fonts -// Font, line-height, and color for body text, headings, and more. - -$text-muted: $gray-600 !default; -$blockquote-small-color: $gray-600 !default; -$hr-border-color: rgba($black, .1) !default; -$mark-bg: #fcf8e3 !default; - - -// Forms - -$input-bg: $white; -$input-disabled-bg: $gray-600; -$input-color: $black; -$input-border-color: rgba($gray-600, .15); -$input-group-addon-bg: $gray-500; - - // Tables $table-cell-padding-y: 0.75rem; $table-cell-padding-x: 0.75rem; $table-striped-bg: $dark; -// Dropdowns -// Dropdown menu container and contents. - -$dropdown-bg: $gray-700; -$dropdown-divider-bg: $gray-800; -$dropdown-link-color: $body-color; -$dropdown-link-hover-color: color.adjust($body-color, $lightness: -5%); -$dropdown-link-hover-bg: $primary; -$dropdown-link-active-color: $component-active-color; -$dropdown-link-active-bg: $component-active-bg; -$dropdown-header-color: color.adjust($body-color, $lightness: -25%); - - -// Pagination - -$pagination-color: $link-color; -$pagination-bg: $dark; -$pagination-border-color: color.adjust($dark, $lightness: 5%); - -$pagination-hover-color: $link-hover-color; -$pagination-hover-bg: $gray-900; -$pagination-hover-border-color: $gray-800; - -$pagination-active-color: $body-color; -$pagination-active-bg: $primary; -$pagination-active-border-color: $primary; - -$pagination-disabled-color: $gray-600; -$pagination-disabled-bg: $pagination-bg; -$pagination-disabled-border-color: $pagination-border-color; - - -// Cards - -$card-bg: $dark; -$card-cap-bg: rgba($light, .05); - - -// Progress bars - -$progress-bg: $gray-600; - - -// List group - -$list-group-bg: $dark; -$list-group-hover-bg: color.adjust($list-group-bg, $lightness: -5%); -$list-group-active-color: $component-active-color !default; -$list-group-active-bg: $component-active-bg !default; -$list-group-active-border-color: $list-group-active-bg !default; -$list-group-action-color: $gray-400; -$list-group-action-hover-color: $list-group-action-color; - - // Breadcrumbs -$breadcrumb-active-color: $gray-600; -$breadcrumb-bg: none; $breadcrumb-padding-y: 0.75rem; $breadcrumb-padding-x: 1rem; diff --git a/babybuddy/templates/babybuddy/base.html b/babybuddy/templates/babybuddy/base.html index adf9a6b4..2d921009 100644 --- a/babybuddy/templates/babybuddy/base.html +++ b/babybuddy/templates/babybuddy/base.html @@ -4,7 +4,7 @@ {% get_current_timezone as TIMEZONE %} - + {% block title %}{% endblock %} | Baby Buddy diff --git a/babybuddy/templates/babybuddy/filter.html b/babybuddy/templates/babybuddy/filter.html index cc7f362b..1b22ec0f 100644 --- a/babybuddy/templates/babybuddy/filter.html +++ b/babybuddy/templates/babybuddy/filter.html @@ -23,7 +23,7 @@

- +