Merge branch 'main' into refactor-server-tidy

This commit is contained in:
SleeplessOne1917 2023-06-17 15:06:09 +00:00 committed by GitHub
commit b52b18939c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 2034 additions and 2060 deletions

View file

@ -1,108 +1,13 @@
$white: #fff; @import "variables.darkly";
$gray-100: #f8f9fa;
$gray-200: #ebebeb;
$gray-300: #dee2e6;
$gray-400: #ced4da;
$gray-500: #adb5bd;
$gray-600: #888;
$gray-700: #444;
$gray-800: #303030;
$gray-900: #222;
$black: #000;
$blue: #375a7f;
$indigo: #6610f2;
$purple: #6f42c1;
$pink: #e83e8c;
$red: #e74c3c;
$orange: #fd7e14;
$yellow: #f39c12;
$green: #00bc8c;
$teal: #20c997;
$cyan: #3498db;
$primary: $blue; $primary: $blue;
$secondary: #444; $secondary: #444;
$success: $green;
$info: $cyan;
$warning: $yellow;
$danger: $red;
$light: $gray-800; $light: $gray-800;
$dark: $gray-300;
$yiq-contrasted-threshold: 175; $theme-colors: (
$body-bg: $gray-900; "primary": $primary,
$body-color: $gray-300; "secondary": $secondary,
"light": $light,
);
$link-color: $red; $link-color: $red;
$font-family-sans-serif: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI",
Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji",
"Segoe UI Emoji", "Segoe UI Symbol";
$font-size-base: 0.9375rem;
$h1-font-size: 3rem;
$h2-font-size: 2.5rem;
$h3-font-size: 2rem;
$text-muted: $gray-600;
$table-accent-bg: $gray-800;
$table-border-color: $gray-700;
$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-dark-color: rgba($white, 0.6);
$navbar-dark-hover-color: $white;
$navbar-light-color: rgba($white, 0.6);
$navbar-light-hover-color: $white;
$navbar-light-active-color: $white;
$navbar-light-toggler-border-color: rgba($gray-900, 0.1);
$pagination-color: $white;
$pagination-bg: $success;
$pagination-border-width: 0;
$pagination-border-color: transparent;
$pagination-hover-color: $white;
$pagination-hover-bg: lighten($success, 10%);
$pagination-hover-border-color: transparent;
$pagination-active-bg: $pagination-hover-bg;
$pagination-active-border-color: transparent;
$pagination-disabled-color: $white;
$pagination-disabled-bg: darken($success, 15%);
$pagination-disabled-border-color: transparent;
$jumbotron-bg: $gray-800;
$card-cap-bg: $gray-700;
$card-bg: $gray-800;
$popover-bg: $gray-800;
$popover-header-bg: $gray-700;
$toast-background-color: $gray-700;
$toast-header-background-color: $gray-800;
$modal-content-bg: $gray-800;
$modal-content-border-color: $gray-700;
$modal-header-border-color: $gray-700;
$progress-bg: $gray-700;
$list-group-bg: $gray-800;
$list-group-border-color: $gray-700;
$list-group-hover-bg: $gray-700;
$breadcrumb-bg: $gray-700;
$close-color: $white;
$close-text-shadow: none;
$pre-color: inherit;
$mark-bg: #333;
$custom-select-bg: $secondary;
$custom-select-color: $white;
$input-bg: $secondary;
$input-color: $white;
$input-disabled-bg: darken($secondary, 10%);
$light: $gray-800;
$navbar-light-brand-color: $white;
$navbar-light-brand-hover-color: $navbar-light-brand-color;

View file

@ -1,35 +1,51 @@
$white: #fff; @import "../../../../node_modules/bootstrap-v4/scss/functions";
$gray-100: #f8f9fa; @import "../../../../node_modules/bootstrap-v4/scss/variables";
// Colors
$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;
$grays: (
"gray-200": $gray-200,
"gray-600": $gray-600,
"gray-700": $gray-700,
"gray-800": $gray-800,
"gray-900": $gray-900,
);
$black: #000; $black: #000;
$blue: #375a7f; $blue: #375a7f;
$indigo: #6610f2;
$purple: #6f42c1;
$pink: #e83e8c;
$red: #e74c3c; $red: #e74c3c;
$orange: #fd7e14;
$yellow: #f39c12; $yellow: #f39c12;
$green: #00bc8c; $green: #00bc8c;
$teal: #20c997;
$cyan: #3498db; $cyan: #3498db;
$primary: $blue;
$colors: (
"black": $black,
"blue": $blue,
"red": $red,
"yellow": $yellow,
"green": $green,
"cyan": $cyan,
);
$primary: $green;
$secondary: $gray-700; $secondary: $gray-700;
$success: $green;
$info: $cyan;
$warning: $yellow;
$danger: $red;
$dark: $gray-300; $dark: $gray-300;
$yiq-contrasted-threshold: 175;
$body-bg: $gray-900; $theme-colors: (
"primary": $primary,
"secondary": $gray-700,
"dark": $dark,
);
$body-color: $gray-300; $body-color: $gray-300;
$body-bg: $gray-900;
$link-color: $success; $link-color: $success;
$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";
@ -66,6 +82,8 @@ $navbar-light-color: rgba($white, 0.6);
$navbar-light-hover-color: $white; $navbar-light-hover-color: $white;
$navbar-light-active-color: $white; $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-hover-color: $navbar-light-brand-color;
$pagination-color: $white; $pagination-color: $white;
$pagination-bg: $success; $pagination-bg: $success;
$pagination-border-width: 0; $pagination-border-width: 0;
@ -103,5 +121,3 @@ $input-bg: $secondary;
$input-color: $white; $input-color: $white;
$input-disabled-bg: darken($secondary, 10%); $input-disabled-bg: darken($secondary, 10%);
$light: $gray-800; $light: $gray-800;
$navbar-light-brand-color: $white;
$navbar-light-brand-hover-color: $navbar-light-brand-color;

View file

@ -1,47 +1,9 @@
$white: #fff; @import "variables.darkly";
$gray-100: #f8f9fa;
$gray-200: #e9ecef;
$gray-300: #dee2e6;
$gray-400: #ced4da;
$gray-500: #adb5bd;
$gray-600: #6c757d;
$gray-700: #495057;
$gray-800: #343a40;
$gray-900: #212529;
$black: #000;
$blue: #007bff;
$indigo: #6610f2;
$white: #ffffff;
$orange: #f1641e;
$cyan: #02bdc2;
$green: #00c853;
$primary: #f1641e;
$secondary: #c80000; $secondary: #c80000;
$info: $blue;
$body-color: $gray-700;
$link-color: $primary;
$red: #d8486a;
$border-radius: 0.5rem;
$border-radius-lg: 0.5rem;
$border-radius-sm: 1rem;
$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Droid Sans",
"Segoe UI", "Helvetica", Arial, sans-serif;
$headings-color: $gray-700;
$input-btn-focus-color: rgba($primary, 0.75);
$form-feedback-valid-color: $info;
$navbar-light-color: $gray-600;
$black: #222222;
$navbar-dark-toggler-border-color: rgba($black, 0.1);
$navbar-light-active-color: $gray-900;
$card-color: $gray-700;
$card-cap-color: $gray-700;
$info: $blue;
$body-bg: #fff;
$success: $indigo;
$danger: darken($primary, 24%); $danger: darken($primary, 24%);
$navbar-light-hover-color: $gray-900;
$card-bg: $gray-100; $theme-colors: (
$border-color: $gray-700; "secondary": $secondary,
$mark-bg: rgb(255, 252, 239); "danger": $danger,
$font-weight-bold: 600; );
$rounded-pill: 0.25rem;

View file

@ -1,47 +1,70 @@
$white: #fff; @import "../../../../node_modules/bootstrap-v4/scss/functions";
$gray-100: #f8f9fa; @import "../../../../node_modules/bootstrap-v4/scss/variables";
// Colors
$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: #000;
$blue: #007bff; $grays: (
$indigo: #6610f2; "gray-200": $gray-200,
$white: #ffffff; "gray-600": $gray-600,
"gray-700": $gray-700,
"gray-800": $gray-800,
"gray-900": $gray-900,
);
$black: #222;
$red: #d8486a;
$orange: #f1641e; $orange: #f1641e;
$cyan: #02bdc2; $cyan: #02bdc2;
$green: #00c853; $green: #00c853;
$colors: (
"black": $black,
"red": $red,
"orange": $orange,
"cyan": $cyan,
"green": $green,
);
$primary: $orange; $primary: $orange;
$secondary: $green; $secondary: $green;
$info: $cyan; $success: $indigo;
$info: $blue;
$danger: darken($primary, 25%);
$theme-colors: (
"primary": $primary,
"secondary": $secondary,
"success": $success,
"info": $info,
"danger": $danger,
);
$body-color: $gray-700; $body-color: $gray-700;
$body-bg: #fff;
$link-color: $primary; $link-color: $primary;
$red: #d8486a; $card-color: $gray-700;
$card-cap-color: $gray-700;
$card-bg: $gray-100;
$border-color: $gray-700;
$mark-bg: rgb(255, 252, 239);
$headings-color: $gray-700;
$navbar-light-color: $gray-600;
$navbar-light-hover-color: $gray-900;
$navbar-light-active-color: $gray-900;
$navbar-dark-toggler-border-color: rgba($black, 0.1);
$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", $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Droid Sans",
"Segoe UI", "Helvetica", Arial, sans-serif; "Segoe UI", "Helvetica", Arial, sans-serif;
$headings-color: $gray-700;
$input-btn-focus-color: rgba($primary, 0.75); $input-btn-focus-color: rgba($primary, 0.75);
$form-feedback-valid-color: $info; $form-feedback-valid-color: $info;
$navbar-light-color: $gray-600;
$black: #222222;
$navbar-dark-toggler-border-color: rgba($black, 0.1);
$navbar-light-active-color: $gray-900;
$card-color: $gray-700;
$card-cap-color: $gray-700;
$info: $blue;
$body-bg: #fff;
$success: $indigo;
$danger: darken($primary, 25%);
$navbar-light-hover-color: $gray-900;
$card-bg: $gray-100;
$border-color: $gray-700;
$mark-bg: rgb(255, 252, 239);
$font-weight-bold: 600; $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