Merge branch 'main' into refactor-server-tidy

This commit is contained in:
Alec Armbruster 2023-06-17 12:08:37 -04:00 committed by GitHub
commit e21029602b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 1374 additions and 1413 deletions

View file

@ -1,13 +1,18 @@
@import "../../../../node_modules/bootstrap-v4/scss/functions";
@import "../../../../node_modules/bootstrap-v4/scss/variables";
// Colors // Colors
$white: #fff;
$gray-100: #f8f9fa;
$gray-200: #ebebeb; $gray-200: #ebebeb;
$gray-300: #dee2e6;
$gray-400: #ced4da;
$gray-500: #adb5bd;
$gray-600: #888; $gray-600: #888;
$gray-700: #444; $gray-700: #444;
$gray-800: #303030; $gray-800: #303030;
$gray-900: #222; $gray-900: #222;
$black: #000;
// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$grays: ( $grays: (
"gray-200": $gray-200, "gray-200": $gray-200,
"gray-600": $gray-600, "gray-600": $gray-600,
@ -16,15 +21,16 @@ $grays: (
"gray-900": $gray-900, "gray-900": $gray-900,
); );
$black: #000;
$blue: #375a7f; $blue: #375a7f;
$indigo: #6610f2;
$red: #e74c3c; $red: #e74c3c;
$yellow: #f39c12; $yellow: #f39c12;
$green: #00bc8c; $green: #00bc8c;
$cyan: #3498db; $cyan: #3498db;
// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$colors: ( $colors: (
"black": $black,
"blue": $blue, "blue": $blue,
"red": $red, "red": $red,
"yellow": $yellow, "yellow": $yellow,
@ -34,18 +40,24 @@ $colors: (
$primary: $green; $primary: $green;
$secondary: $gray-700; $secondary: $gray-700;
$success: $green;
$dark: $gray-300; $dark: $gray-300;
// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$theme-colors: ( $theme-colors: (
"primary": $primary, "primary": $primary,
"secondary": $gray-700, "secondary": $secondary,
"dark": $dark, "dark": $dark,
); );
$body-color: $gray-300; $body-color: $gray-300;
$body-bg: $gray-900; $body-bg: $gray-900;
$link-color: $success; $link-color: $success;
$mark-bg: #333;
$text-muted: $gray-600;
$yiq-contrasted-threshold: 175; $yiq-contrasted-threshold: 175;
$font-family-sans-serif: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", $font-family-sans-serif: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI",
Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji",
"Segoe UI Emoji", "Segoe UI Symbol"; "Segoe UI Emoji", "Segoe UI Symbol";
@ -53,28 +65,10 @@ $font-size-base: 0.9375rem;
$h1-font-size: 3rem; $h1-font-size: 3rem;
$h2-font-size: 2.5rem; $h2-font-size: 2.5rem;
$h3-font-size: 2rem; $h3-font-size: 2rem;
$text-muted: $gray-600;
$table-accent-bg: $gray-800; $card-cap-bg: $gray-700;
$table-border-color: $gray-700; $card-bg: $gray-800;
$input-border-color: $body-bg;
$input-group-addon-color: $gray-500;
$input-group-addon-bg: $gray-700;
$custom-file-color: $gray-500;
$custom-file-border-color: $body-bg;
$dropdown-bg: $gray-900;
$dropdown-border-color: $gray-700;
$dropdown-divider-bg: $gray-700;
$dropdown-link-color: $white;
$dropdown-link-hover-color: $white;
$dropdown-link-hover-bg: $primary;
$nav-link-padding-x: 2rem;
$nav-link-disabled-color: $gray-500;
$nav-tabs-border-color: $gray-700;
$nav-tabs-link-hover-border-color: $nav-tabs-border-color $nav-tabs-border-color
transparent;
$nav-tabs-link-active-color: $white;
$nav-tabs-link-active-border-color: $nav-tabs-border-color
$nav-tabs-border-color transparent;
$navbar-padding-y: 1rem; $navbar-padding-y: 1rem;
$navbar-dark-color: rgba($white, 0.6); $navbar-dark-color: rgba($white, 0.6);
$navbar-dark-hover-color: $white; $navbar-dark-hover-color: $white;
@ -84,6 +78,37 @@ $navbar-light-active-color: $white;
$navbar-light-toggler-border-color: rgba($gray-900, 0.1); $navbar-light-toggler-border-color: rgba($gray-900, 0.1);
$navbar-light-brand-color: $white; $navbar-light-brand-color: $white;
$navbar-light-brand-hover-color: $navbar-light-brand-color; $navbar-light-brand-hover-color: $navbar-light-brand-color;
$nav-link-padding-x: 2rem;
$nav-link-disabled-color: $gray-500;
$nav-tabs-border-color: $gray-700;
$nav-tabs-link-hover-border-color: $nav-tabs-border-color $nav-tabs-border-color
transparent;
$nav-tabs-link-active-color: $white;
$nav-tabs-link-active-border-color: $nav-tabs-border-color
$nav-tabs-border-color transparent;
$input-bg: $gray-700;
$input-color: $white;
$input-disabled-bg: darken($gray-700, 10%);
$input-border-color: $body-bg;
$input-group-addon-color: $gray-500;
$input-group-addon-bg: $gray-700;
$table-accent-bg: $gray-800;
$table-border-color: $gray-700;
$custom-file-color: $gray-500;
$custom-file-border-color: $body-bg;
$dropdown-bg: $gray-900;
$dropdown-border-color: $gray-700;
$dropdown-divider-bg: $gray-700;
$dropdown-link-color: $white;
$dropdown-link-hover-color: $white;
$dropdown-link-hover-bg: $primary;
$pagination-color: $white; $pagination-color: $white;
$pagination-bg: $success; $pagination-bg: $success;
$pagination-border-width: 0; $pagination-border-width: 0;
@ -96,9 +121,8 @@ $pagination-active-border-color: transparent;
$pagination-disabled-color: $white; $pagination-disabled-color: $white;
$pagination-disabled-bg: darken($success, 15%); $pagination-disabled-bg: darken($success, 15%);
$pagination-disabled-border-color: transparent; $pagination-disabled-border-color: transparent;
$jumbotron-bg: $gray-800; $jumbotron-bg: $gray-800;
$card-cap-bg: $gray-700;
$card-bg: $gray-800;
$popover-bg: $gray-800; $popover-bg: $gray-800;
$popover-header-bg: $gray-700; $popover-header-bg: $gray-700;
$toast-background-color: $gray-700; $toast-background-color: $gray-700;
@ -114,10 +138,6 @@ $breadcrumb-bg: $gray-700;
$close-color: $white; $close-color: $white;
$close-text-shadow: none; $close-text-shadow: none;
$pre-color: inherit; $pre-color: inherit;
$mark-bg: #333; $custom-select-bg: $gray-700;
$custom-select-bg: $secondary;
$custom-select-color: $white; $custom-select-color: $white;
$input-bg: $secondary;
$input-color: $white;
$input-disabled-bg: darken($secondary, 10%);
$light: $gray-800; $light: $gray-800;

View file

@ -1,13 +1,18 @@
@import "../../../../node_modules/bootstrap-v4/scss/functions";
@import "../../../../node_modules/bootstrap-v4/scss/variables";
// Colors // Colors
$white: #fff;
$gray-100: #f8f9fa;
$gray-200: #e9ecef; $gray-200: #e9ecef;
$gray-300: #dee2e6;
$gray-400: #ced4da;
$gray-500: #adb5bd;
$gray-600: #6c757d; $gray-600: #6c757d;
$gray-700: #495057; $gray-700: #495057;
$gray-800: #343a40; $gray-800: #343a40;
$gray-900: #212529; $gray-900: #212529;
$black: #222;
// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$grays: ( $grays: (
"gray-200": $gray-200, "gray-200": $gray-200,
"gray-600": $gray-600, "gray-600": $gray-600,
@ -16,14 +21,16 @@ $grays: (
"gray-900": $gray-900, "gray-900": $gray-900,
); );
$black: #222; $blue: #007bff;
$indigo: #6610f2;
$red: #d8486a; $red: #d8486a;
$orange: #f1641e; $orange: #f1641e;
$cyan: #02bdc2;
$green: #00c853; $green: #00c853;
$cyan: #02bdc2;
// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$colors: ( $colors: (
"black": $black,
"red": $red, "red": $red,
"orange": $orange, "orange": $orange,
"cyan": $cyan, "cyan": $cyan,
@ -36,6 +43,8 @@ $success: $indigo;
$info: $blue; $info: $blue;
$danger: darken($primary, 25%); $danger: darken($primary, 25%);
// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$theme-colors: ( $theme-colors: (
"primary": $primary, "primary": $primary,
"secondary": $secondary, "secondary": $secondary,
@ -47,24 +56,27 @@ $theme-colors: (
$body-color: $gray-700; $body-color: $gray-700;
$body-bg: #fff; $body-bg: #fff;
$link-color: $primary; $link-color: $primary;
$card-color: $gray-700;
$card-cap-color: $gray-700;
$card-bg: $gray-100;
$border-color: $gray-700; $border-color: $gray-700;
$mark-bg: rgb(255, 252, 239); $mark-bg: rgb(255, 252, 239);
$headings-color: $gray-700; $headings-color: $gray-700;
$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Droid Sans",
"Segoe UI", "Helvetica", Arial, sans-serif;
$font-weight-bold: 600;
$card-color: $gray-700;
$card-cap-color: $gray-700;
$card-bg: $gray-100;
$navbar-dark-toggler-border-color: rgba($black, 0.1);
$navbar-light-color: $gray-600; $navbar-light-color: $gray-600;
$navbar-light-hover-color: $gray-900; $navbar-light-hover-color: $gray-900;
$navbar-light-active-color: $gray-900; $navbar-light-active-color: $gray-900;
$navbar-dark-toggler-border-color: rgba($black, 0.1);
$form-feedback-valid-color: $info;
$input-btn-focus-color: rgba($primary, 0.75);
$border-radius: 0.5rem; $border-radius: 0.5rem;
$border-radius-lg: 0.5rem; $border-radius-lg: 0.5rem;
$border-radius-sm: 1rem; $border-radius-sm: 1rem;
$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Droid Sans",
"Segoe UI", "Helvetica", Arial, sans-serif;
$input-btn-focus-color: rgba($primary, 0.75);
$form-feedback-valid-color: $info;
$font-weight-bold: 600;
$rounded-pill: 0.25rem; $rounded-pill: 0.25rem;

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff