Compare commits
68 Commits
0.2.0
...
developmen
Author | SHA1 | Date | |
---|---|---|---|
36b27754eb | |||
68f26a45bb | |||
2659c5f306 | |||
b487e2bfa1 | |||
0813f5be06 | |||
01d78e0bfb | |||
549c91f3fb | |||
9f2403aa2f | |||
81b879bc8f | |||
127dd11c59 | |||
1b7996759e | |||
39a4ed07d4 | |||
905ee44907 | |||
ced75b5b38 | |||
7e6528f669 | |||
ec51bf8328 | |||
55461f2d30 | |||
a0dd1a1bbd | |||
0ccc5eec3d | |||
7c6cc8f973 | |||
816c630760 | |||
47ea4db8b3 | |||
6fb6229338 | |||
05b941fd4b | |||
3c0363aa0f | |||
c28ce42377 | |||
949e0ae50f | |||
ab853aff3f | |||
6d874d2171 | |||
9535154fcd | |||
189ad5b229 | |||
a5098f14e0 | |||
f23b548bd1 | |||
d503dd1500 | |||
7faec55dc6 | |||
dd686bbb56 | |||
448797096b | |||
52d517e174 | |||
e131a9c615 | |||
303872a25f | |||
30c5a8d2ea | |||
00b140b936 | |||
2ddd0ffe9e | |||
a0667c86d4 | |||
beaba45b3a | |||
a42fababc5 | |||
2f7b47a24e | |||
d324da1b1a | |||
09db65d7f4 | |||
0dbb81ca84 | |||
adcbacf824 | |||
4050dc567b | |||
3d93fca3dc | |||
dae4a337f9 | |||
89fa6cf4b5 | |||
0f9b203815 | |||
043d3e83de | |||
0b746d7ee8 | |||
dffc70141f | |||
4820e30d55 | |||
f424c3f806 | |||
646a605bc4 | |||
4f9e2e75df | |||
8b39ca13f6 | |||
153141874f | |||
098f43b611 | |||
33561c8665 | |||
9e605a0bbc |
2
.cz.yaml
2
.cz.yaml
@ -4,4 +4,4 @@ commitizen:
|
||||
name: cz_conventional_commits
|
||||
tag_format: $major.$minor.$patch$prerelease
|
||||
update_changelog_on_bump: true
|
||||
version: 0.2.0
|
||||
version: 0.7.0
|
||||
|
33
CHANGELOG.md
33
CHANGELOG.md
@ -1,3 +1,36 @@
|
||||
## 0.7.0 (2024-08-01)
|
||||
|
||||
### Features
|
||||
|
||||
- [01d78e0b](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/01d78e0bfb32aee9701379f1cb96f971100d1946) - Bump GLPI version 10.0.15 -> 10.0.16 [ [!34](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/34) ]
|
||||
|
||||
## 0.6.0 (2024-05-31)
|
||||
|
||||
### Features
|
||||
|
||||
- [ec51bf83](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/ec51bf8328a5be9f589b314a2c38b9c213127dcb) - Bump GLPI version 10.0.14 -> 10.0.15 [ [!34](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/34) ]
|
||||
|
||||
## 0.5.0 (2024-03-27)
|
||||
|
||||
### Features
|
||||
|
||||
- [0ccc5eec](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/0ccc5eec3de8773fde1c9cbf0b85ecb3ce66d1c8) - Bump base image debian-bullseye -> debian-bookworm [ [!32](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/32) ]
|
||||
- [7c6cc8f9](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/7c6cc8f9736246f62ad7c677a1361a96a4520c0f) - Bump GLPI version 10.0.12 -> 10.0.14 [ [!32](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/32) ]
|
||||
- [816c6307](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/816c6307605be92c396f1c3eaabedd414fe56c83) - add custom theme 'nfc' [ [!32](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/32) ]
|
||||
|
||||
## 0.4.0 (2024-02-01)
|
||||
|
||||
### Features
|
||||
|
||||
- [0f9b2038](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/0f9b203815e69156fbbd538edf19cf7f22654e4d) - Bump GLPI version to 10.0.12 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
|
||||
|
||||
## 0.3.0 (2024-01-09)
|
||||
|
||||
### Features
|
||||
|
||||
- **php**: [dffc7014](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/dffc70141f46cf7f719aa928bd76aa4e55b67a0d) - Bumped to version 8.2 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
|
||||
- **glpi**: [4820e30d](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/4820e30d551d904d4781e503ca2c8adb7a336fbd) - Bumped to version 10.0.11 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
|
||||
|
||||
## 0.2.0 (2023-10-28)
|
||||
|
||||
### Features
|
||||
|
@ -8,6 +8,8 @@
|
||||
|
||||

|
||||
|
||||
[](https://hub.docker.com/r/nofusscomputing/docker-glpi) [](https://artifacthub.io/packages/search?repo=nfc-docker-glpi)
|
||||
|
||||
<br>
|
||||
|
||||
  [](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues)
|
||||
|
15
dockerfile
15
dockerfile
@ -1,7 +1,7 @@
|
||||
ARG GLPI_VERSION=10.0.10
|
||||
ARG VERSION_PHP=8.1
|
||||
ARG GLPI_VERSION=10.0.16
|
||||
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,14 @@ 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
|
||||
|
||||
LABEL \
|
||||
org.opencontainers.image.vendor="No Fuss Computing" \
|
||||
org.opencontainers.image.title="GLPI" \
|
||||
org.opencontainers.image.description="GLPI Within a docker container" \
|
||||
org.opencontainers.image.vendor="No Fuss Computing" \
|
||||
io.artifacthub.package.license="MIT"
|
||||
|
||||
|
||||
ARG GLPI_VERSION
|
||||
|
Submodule gitlab-ci updated: 52f4ebda54...224ef83157
102
includes/var/www/html/css/palettes/nfc.scss
Normal file
102
includes/var/www/html/css/palettes/nfc.scss
Normal file
@ -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;
|
||||
}
|
||||
|
||||
}
|
BIN
includes/var/www/html/css/palettes/previews/nfc.png
Normal file
BIN
includes/var/www/html/css/palettes/previews/nfc.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.2 KiB |
Submodule website-template updated: 992b54805b...8735f623dc
Reference in New Issue
Block a user