🔨 Switch navbar + header to bootstrap

This commit is contained in:
SebClem 2021-01-07 22:14:11 +01:00
parent 7bcce07c59
commit ae1cc25cb0
10 changed files with 887 additions and 817 deletions

View File

@ -23,7 +23,8 @@ app.use(express.json());
app.use(express.urlencoded({ extended: false }));
app.use(cookieParser());
app.use(express.static(path.join(__dirname, "public")));
app.use('/js/',express.static(path.join(__dirname, '/node_modules/bootstrap/dist/js')))
app.use('/font/',express.static(path.join(__dirname, '/node_modules/bootstrap-icons/font')))
app.use("/", indexRouter);
app.use("/api", apiRouter);

View File

@ -356,6 +356,11 @@
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta1.tgz",
"integrity": "sha512-UrHApw/WRmT7l2rlDdn5iXr7Jps/LlMZtJlLn9G41aGDfss48hyDeYyHtX1C6NHKVcmdUarGG+ve0LZB5iHyTQ=="
},
"bootstrap-icons": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.2.2.tgz",
"integrity": "sha512-7rFICA7E/CgYLvu8zYtd2wMZYhYPQ0GtogZtQyJz/3melCGeQ76qas5wItIEwiUNmtZWg2SP2p8Ekxy3Nk7vvg=="
},
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",

View File

@ -8,6 +8,7 @@
"dependencies": {
"app-root-path": "^3.0.0",
"bootstrap": "^5.0.0-beta1",
"bootstrap-icons": "^1.2.2",
"cookie-parser": "^1.4.5",
"cron": "^1.8.2",
"debug": "~2.6.9",

View File

@ -20,13 +20,13 @@
--bs-gray: #6c757d;
--bs-gray-dark: #343a40;
--bs-primary: #0d6efd;
--bs-secondary: #6c757d;
--bs-secondary: #343a40;
--bs-success: #198754;
--bs-info: #0dcaf0;
--bs-warning: #ffc107;
--bs-danger: #dc3545;
--bs-light: #f8f9fa;
--bs-dark: #212529;
--bs-dark: #292929;
--bs-font-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
--bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
@ -51,7 +51,7 @@ body {
font-weight: 400;
line-height: 1.5;
color: #212529;
background-color: #fff;
background-color: #222222;
-webkit-text-size-adjust: 100%;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
@ -569,7 +569,7 @@ progress {
.img-thumbnail {
padding: 0.25rem;
background-color: #fff;
background-color: #222222;
border: 1px solid #dee2e6;
border-radius: 0.25rem;
max-width: 100%;
@ -1997,15 +1997,15 @@ progress {
}
.table-secondary {
--bs-table-bg: #e2e3e5;
--bs-table-striped-bg: #d7d8da;
--bs-table-bg: #d6d8d9;
--bs-table-striped-bg: #cbcdce;
--bs-table-striped-color: #000;
--bs-table-active-bg: #cbccce;
--bs-table-active-bg: #c1c2c3;
--bs-table-active-color: #000;
--bs-table-hover-bg: #d1d2d4;
--bs-table-hover-bg: #c6c8c9;
--bs-table-hover-color: #000;
color: #000;
border-color: #cbccce;
border-color: #c1c2c3;
}
.table-success {
@ -2069,15 +2069,15 @@ progress {
}
.table-dark {
--bs-table-bg: #212529;
--bs-table-striped-bg: #2c3034;
--bs-table-bg: #292929;
--bs-table-striped-bg: #343434;
--bs-table-striped-color: #fff;
--bs-table-active-bg: #373b3e;
--bs-table-active-bg: #3e3e3e;
--bs-table-active-color: #fff;
--bs-table-hover-bg: #323539;
--bs-table-hover-bg: #393939;
--bs-table-hover-color: #fff;
color: #fff;
border-color: #373b3e;
border-color: #3e3e3e;
}
.table-responsive {
@ -2377,7 +2377,7 @@ textarea.form-control-lg {
height: 1em;
margin-top: 0.25em;
vertical-align: top;
background-color: #fff;
background-color: #222222;
background-repeat: no-repeat;
background-position: center;
background-size: contain;
@ -2474,10 +2474,10 @@ textarea.form-control-lg {
outline: none;
}
.form-range:focus::-webkit-slider-thumb {
box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
box-shadow: 0 0 0 1px #222222, 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
}
.form-range:focus::-moz-range-thumb {
box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
box-shadow: 0 0 0 1px #222222, 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
}
.form-range::-moz-focus-outer {
border: 0;
@ -2893,32 +2893,32 @@ textarea.form-control-lg {
.btn-secondary {
color: #fff;
background-color: #6c757d;
border-color: #6c757d;
background-color: #343a40;
border-color: #343a40;
}
.btn-secondary:hover {
color: #fff;
background-color: #5c636a;
border-color: #565e64;
background-color: #2c3136;
border-color: #2a2e33;
}
.btn-check:focus + .btn-secondary, .btn-secondary:focus {
color: #fff;
background-color: #5c636a;
border-color: #565e64;
box-shadow: 0 0 0 0.25rem rgba(130, 138, 145, 0.5);
background-color: #2c3136;
border-color: #2a2e33;
box-shadow: 0 0 0 0.25rem rgba(82, 88, 93, 0.5);
}
.btn-check:checked + .btn-secondary, .btn-check:active + .btn-secondary, .btn-secondary:active, .btn-secondary.active, .show > .btn-secondary.dropdown-toggle {
color: #fff;
background-color: #565e64;
border-color: #51585e;
background-color: #2a2e33;
border-color: #272c30;
}
.btn-check:checked + .btn-secondary:focus, .btn-check:active + .btn-secondary:focus, .btn-secondary:active:focus, .btn-secondary.active:focus, .show > .btn-secondary.dropdown-toggle:focus {
box-shadow: 0 0 0 0.25rem rgba(130, 138, 145, 0.5);
box-shadow: 0 0 0 0.25rem rgba(82, 88, 93, 0.5);
}
.btn-secondary:disabled, .btn-secondary.disabled {
color: #fff;
background-color: #6c757d;
border-color: #6c757d;
background-color: #343a40;
border-color: #343a40;
}
.btn-success {
@ -3073,32 +3073,32 @@ textarea.form-control-lg {
.btn-dark {
color: #fff;
background-color: #212529;
border-color: #212529;
background-color: #292929;
border-color: #292929;
}
.btn-dark:hover {
color: #fff;
background-color: #1c1f23;
border-color: #1a1e21;
background-color: #232323;
border-color: #212121;
}
.btn-check:focus + .btn-dark, .btn-dark:focus {
color: #fff;
background-color: #1c1f23;
border-color: #1a1e21;
box-shadow: 0 0 0 0.25rem rgba(66, 70, 73, 0.5);
background-color: #232323;
border-color: #212121;
box-shadow: 0 0 0 0.25rem rgba(73, 73, 73, 0.5);
}
.btn-check:checked + .btn-dark, .btn-check:active + .btn-dark, .btn-dark:active, .btn-dark.active, .show > .btn-dark.dropdown-toggle {
color: #fff;
background-color: #1a1e21;
border-color: #191c1f;
background-color: #212121;
border-color: #1f1f1f;
}
.btn-check:checked + .btn-dark:focus, .btn-check:active + .btn-dark:focus, .btn-dark:active:focus, .btn-dark.active:focus, .show > .btn-dark.dropdown-toggle:focus {
box-shadow: 0 0 0 0.25rem rgba(66, 70, 73, 0.5);
box-shadow: 0 0 0 0.25rem rgba(73, 73, 73, 0.5);
}
.btn-dark:disabled, .btn-dark.disabled {
color: #fff;
background-color: #212529;
border-color: #212529;
background-color: #292929;
border-color: #292929;
}
.btn-outline-primary {
@ -3127,27 +3127,27 @@ textarea.form-control-lg {
}
.btn-outline-secondary {
color: #6c757d;
border-color: #6c757d;
color: #343a40;
border-color: #343a40;
}
.btn-outline-secondary:hover {
color: #fff;
background-color: #6c757d;
border-color: #6c757d;
background-color: #343a40;
border-color: #343a40;
}
.btn-check:focus + .btn-outline-secondary, .btn-outline-secondary:focus {
box-shadow: 0 0 0 0.25rem rgba(108, 117, 125, 0.5);
box-shadow: 0 0 0 0.25rem rgba(52, 58, 64, 0.5);
}
.btn-check:checked + .btn-outline-secondary, .btn-check:active + .btn-outline-secondary, .btn-outline-secondary:active, .btn-outline-secondary.active, .btn-outline-secondary.dropdown-toggle.show {
color: #fff;
background-color: #6c757d;
border-color: #6c757d;
background-color: #343a40;
border-color: #343a40;
}
.btn-check:checked + .btn-outline-secondary:focus, .btn-check:active + .btn-outline-secondary:focus, .btn-outline-secondary:active:focus, .btn-outline-secondary.active:focus, .btn-outline-secondary.dropdown-toggle.show:focus {
box-shadow: 0 0 0 0.25rem rgba(108, 117, 125, 0.5);
box-shadow: 0 0 0 0.25rem rgba(52, 58, 64, 0.5);
}
.btn-outline-secondary:disabled, .btn-outline-secondary.disabled {
color: #6c757d;
color: #343a40;
background-color: transparent;
}
@ -3277,27 +3277,27 @@ textarea.form-control-lg {
}
.btn-outline-dark {
color: #212529;
border-color: #212529;
color: #292929;
border-color: #292929;
}
.btn-outline-dark:hover {
color: #fff;
background-color: #212529;
border-color: #212529;
background-color: #292929;
border-color: #292929;
}
.btn-check:focus + .btn-outline-dark, .btn-outline-dark:focus {
box-shadow: 0 0 0 0.25rem rgba(33, 37, 41, 0.5);
box-shadow: 0 0 0 0.25rem rgba(41, 41, 41, 0.5);
}
.btn-check:checked + .btn-outline-dark, .btn-check:active + .btn-outline-dark, .btn-outline-dark:active, .btn-outline-dark.active, .btn-outline-dark.dropdown-toggle.show {
color: #fff;
background-color: #212529;
border-color: #212529;
background-color: #292929;
border-color: #292929;
}
.btn-check:checked + .btn-outline-dark:focus, .btn-check:active + .btn-outline-dark:focus, .btn-outline-dark:active:focus, .btn-outline-dark.active:focus, .btn-outline-dark.dropdown-toggle.show:focus {
box-shadow: 0 0 0 0.25rem rgba(33, 37, 41, 0.5);
box-shadow: 0 0 0 0.25rem rgba(41, 41, 41, 0.5);
}
.btn-outline-dark:disabled, .btn-outline-dark.disabled {
color: #212529;
color: #292929;
background-color: transparent;
}
@ -3775,8 +3775,8 @@ textarea.form-control-lg {
.nav-tabs .nav-link.active,
.nav-tabs .nav-item.show .nav-link {
color: #495057;
background-color: #fff;
border-color: #dee2e6 #dee2e6 #fff;
background-color: #222222;
border-color: #dee2e6 #dee2e6 #222222;
}
.nav-tabs .dropdown-menu {
margin-top: -1px;
@ -4185,6 +4185,10 @@ textarea.form-control-lg {
margin-left: -0.5rem;
border-bottom: 0;
}
.card-header-tabs .nav-link.active {
background-color: #fff;
border-bottom-color: #fff;
}
.card-header-pills {
margin-right: -0.5rem;
@ -4532,12 +4536,12 @@ textarea.form-control-lg {
}
.alert-secondary {
color: #41464b;
background-color: #e2e3e5;
border-color: #d3d6d8;
color: #1f2326;
background-color: #d6d8d9;
border-color: #c2c4c6;
}
.alert-secondary .alert-link {
color: #34383c;
color: #191c1e;
}
.alert-success {
@ -4586,12 +4590,12 @@ textarea.form-control-lg {
}
.alert-dark {
color: #141619;
background-color: #d3d3d4;
border-color: #bcbebf;
color: #191919;
background-color: #d4d4d4;
border-color: #bfbfbf;
}
.alert-dark .alert-link {
color: #101214;
color: #141414;
}
@keyframes progress-bar-stripes {
@ -4866,17 +4870,17 @@ textarea.form-control-lg {
}
.list-group-item-secondary {
color: #41464b;
background-color: #e2e3e5;
color: #1f2326;
background-color: #d6d8d9;
}
.list-group-item-secondary.list-group-item-action:hover, .list-group-item-secondary.list-group-item-action:focus {
color: #41464b;
background-color: #cbccce;
color: #1f2326;
background-color: #c1c2c3;
}
.list-group-item-secondary.list-group-item-action.active {
color: #fff;
background-color: #41464b;
border-color: #41464b;
background-color: #1f2326;
border-color: #1f2326;
}
.list-group-item-success {
@ -4950,17 +4954,17 @@ textarea.form-control-lg {
}
.list-group-item-dark {
color: #141619;
background-color: #d3d3d4;
color: #191919;
background-color: #d4d4d4;
}
.list-group-item-dark.list-group-item-action:hover, .list-group-item-dark.list-group-item-action:focus {
color: #141619;
background-color: #bebebf;
color: #191919;
background-color: #bfbfbf;
}
.list-group-item-dark.list-group-item-action.active {
color: #fff;
background-color: #141619;
border-color: #141619;
background-color: #191919;
border-color: #191919;
}
.btn-close {
@ -5850,10 +5854,10 @@ textarea.form-control-lg {
}
.link-secondary {
color: #6c757d;
color: #343a40;
}
.link-secondary:hover, .link-secondary:focus {
color: #565e64;
color: #2a2e33;
}
.link-success {
@ -5892,10 +5896,10 @@ textarea.form-control-lg {
}
.link-dark {
color: #212529;
color: #292929;
}
.link-dark:hover, .link-dark:focus {
color: #1a1e21;
color: #212121;
}
.ratio {
@ -6250,7 +6254,7 @@ textarea.form-control-lg {
}
.border-secondary {
border-color: #6c757d !important;
border-color: #343a40 !important;
}
.border-success {
@ -6274,7 +6278,7 @@ textarea.form-control-lg {
}
.border-dark {
border-color: #212529 !important;
border-color: #292929 !important;
}
.border-white {
@ -7036,7 +7040,7 @@ textarea.form-control-lg {
}
.text-secondary {
color: #6c757d !important;
color: #343a40 !important;
}
.text-success {
@ -7060,7 +7064,7 @@ textarea.form-control-lg {
}
.text-dark {
color: #212529 !important;
color: #292929 !important;
}
.text-white {
@ -7108,7 +7112,7 @@ textarea.form-control-lg {
}
.bg-secondary {
background-color: #6c757d !important;
background-color: #343a40 !important;
}
.bg-success {
@ -7132,11 +7136,11 @@ textarea.form-control-lg {
}
.bg-dark {
background-color: #212529 !important;
background-color: #292929 !important;
}
.bg-body {
background-color: #fff !important;
background-color: #222222 !important;
}
.bg-white {
@ -10619,8 +10623,12 @@ textarea.form-control-lg {
display: none !important;
}
}
:root {
--bs-primary: var(--primary-color, #0d6efd) !important;
.bg-accent {
background-color: #b58e51;
}
.text-accent {
color: #b58e51;
}
/*# sourceMappingURL=custom_bootstrap.css.map */

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,7 @@
.navbar{
background-color: #0091ea ;
}
#header-box{
height: 150px;
}

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,15 @@
$body-bg: #222222;
$dark: #292929;
$secondary: #343a40;
$accent: #b58e51;
@import "../node_modules/bootstrap/scss/bootstrap";
:root{
--bs-primary: var(--primary-color, #{$primary}) !important;
.bg-accent{
background-color: $accent;
}
.text-accent{
color: $accent
}

File diff suppressed because it is too large Load Diff