diff --git a/dockerfile b/dockerfile index 074a281..19a450c 100644 --- a/dockerfile +++ b/dockerfile @@ -1,7 +1,7 @@ -ARG GLPI_VERSION=10.0.12 +ARG GLPI_VERSION=10.0.14 ARG VERSION_PHP=8.2 -FROM debian:bullseye-slim as prepare +FROM debian:bookworm-slim as prepare ARG GLPI_VERSION ARG VERSION_PHP @@ -33,7 +33,7 @@ RUN export GLPI_URL=$(curl -s https://api.github.com/repos/glpi-project/glpi/rel tar -xzf /tmp/${TAR_FILENAME} -C /tmp; -FROM debian:bullseye-slim +FROM debian:bookworm-slim ARG GLPI_VERSION diff --git a/gitlab-ci b/gitlab-ci index bd22ff5..a24f352 160000 --- a/gitlab-ci +++ b/gitlab-ci @@ -1 +1 @@ -Subproject commit bd22ff566c20e4b80b210d4598978fcd11920cfa +Subproject commit a24f352ca3d82b8d0f02f5db20173fe2c3f71a4a diff --git a/includes/var/www/html/css/palettes/nfc.scss b/includes/var/www/html/css/palettes/nfc.scss new file mode 100644 index 0000000..5a080f4 --- /dev/null +++ b/includes/var/www/html/css/palettes/nfc.scss @@ -0,0 +1,102 @@ + +$primary: #73bcf7; +$primary-fg: #f0f0f0; + +$secondary: #7e7e7e; +$secondary-fg: #73ff00; + +$dark: #212427; +$light: #f0f0f0; + +$link-color: #0066cc; +$mainmenu_bg: #212427; +$mainmenu_fg: #f0f0f0; +$accent-color: #73bcf7; +$text-muted: #666666; + + +@import "../includes/palette_light"; + + +/* +* --------------------------------------------------------------------- +* CSS +* --------------------------------------------------------------------- +*/ +.navbar-vertical.navbar-expand-lg { + width: 275px +} + +.navbar-expand-lg.navbar-vertical ~ .navbar, .navbar-expand-lg.navbar-vertical ~ .page-wrapper { + margin-left: 275px; +} + +.navbar-light { + //box-shadow: inset 0 -1px 0 0 rgba(98, 105, 118, 0.16); + background-color: #151515; +} + + +.navbar { + min-height: 76px; +} + + +span.input-group-text { + visibility: hidden; + border-radius: 4px; +} + + + +// Header Entity button +.navbar .text-muted { + color: $accent-color !important; + opacity: 70%; + } + + +body { + --tblr-body-bg: #f0f0f0; +} + +@include media-breakpoint-up(lg) { + body.navbar-collapsed { + .sidebar { + #navbar-menu { + .nav-item { + .nav-link { + & + .dropdown-menu { + + color: $accent-color; + border: 1px solid $accent-color; + + .dropdown-item { + &.hover { + border-left-color: $accent-color; + } + + &.active { + background-color: lighten($mainmenu-bg, 40%); + border-left-color: $accent-color; + } + } + } + } + + } + } + } + } +} + +.dashboard { + + .card { + box-shadow: none !important; + + margin: 0 !important; + border-radius: 5px !important; + } + +} diff --git a/includes/var/www/html/css/palettes/previews/nfc.png b/includes/var/www/html/css/palettes/previews/nfc.png new file mode 100644 index 0000000..c79b71b Binary files /dev/null and b/includes/var/www/html/css/palettes/previews/nfc.png differ diff --git a/website-template b/website-template index 992b548..f5a82d3 160000 --- a/website-template +++ b/website-template @@ -1 +1 @@ -Subproject commit 992b54805b8b6c78a3d2a5ea7de71c7be2b070c8 +Subproject commit f5a82d3604faca56756eec91acee28ff89defd1d