Merge current v2.11 into v3.1

This commit is contained in:
mmatur
2024-10-08 17:54:23 +02:00
16 changed files with 1483 additions and 1372 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
FROM node:20.14
FROM node:22.9-alpine3.20
# Current Active LTS release according to (https://nodejs.org/en/about/releases/)
ENV WEBUI_DIR /src/webui
ENV WEBUI_DIR=/src/webui
RUN mkdir -p $WEBUI_DIR
COPY package.json $WEBUI_DIR/
+4 -1
View File
@@ -50,8 +50,11 @@
"postcss": "^8.4.14",
"vitest": "^1.6.0"
},
"resolutions": {
"cookie": "^0.7.0"
},
"engines": {
"node": "^20 || ^18 || ^16",
"node": "^22 || ^20 || ^18 || ^16",
"npm": ">= 6.13.4",
"yarn": ">= 1.22.22"
},
@@ -64,7 +64,7 @@ export default defineComponent({
&-focus {
border: solid 2px $accent;
}
&-ex-size{
&-ex-size {
.text-h3 {
font-size: 22px;
}
+1 -1
View File
@@ -15,7 +15,7 @@
<div
v-for="(entryItems, index) in entryAll.items"
:key="index"
class="col-12 col-sm-6 col-md-2"
class="col-12 col-sm-6 col-md-3"
>
<panel-entry
:name="entryItems.name"
+1452 -1347
View File
File diff suppressed because it is too large Load Diff