From 3c10ec1a9935948894d5c6516bce8502d4fadede Mon Sep 17 00:00:00 2001 From: stitch1 Date: Wed, 11 Dec 2024 19:42:25 +0100 Subject: [PATCH 1/2] clean up unused build options to remove confusion --- .env.production | 2 -- .env.staging | 2 -- Dockerfile | 2 +- Makefile | 16 ++++------------ 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 .env.production delete mode 100644 .env.staging diff --git a/.env.production b/.env.production deleted file mode 100644 index 7d5d8b2..0000000 --- a/.env.production +++ /dev/null @@ -1,2 +0,0 @@ -VITE_NODE_ENV=production -VITE_VUE_APP_DJANGO_PATH=https://dashboard.internet.nl diff --git a/.env.staging b/.env.staging deleted file mode 100644 index f2a7279..0000000 --- a/.env.staging +++ /dev/null @@ -1,2 +0,0 @@ -VITE_NODE_ENV=production -VITE_VUE_APP_DJANGO_PATH=https://acc.dashboard.internet.nl \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 4a625a3..c08c106 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ADD package-lock.json package-lock.json RUN make setup ADD . /src/ -RUN make build-gui-deploy +RUN make build # Copy all compiled content into simple http server container FROM nginx diff --git a/Makefile b/Makefile index e2e6ef6..b31e851 100644 --- a/Makefile +++ b/Makefile @@ -21,20 +21,12 @@ vue-cli: | $(vue-cli) run: vue-cli npm run dev -# run-csp: vue-cli -# npm run serve -- --mode production - -build-gui-staging: vue-cli - npm run build -- --mode staging - -build-gui-production: vue-cli - npm run build -- --mode production - -build-gui-deploy: vue-cli +# This option takes the env.deploy file and applies it during build. +build: vue-cli npm run build -- --mode deploy -build: vue-cli - npm run build +build-local: vue-cli + npm run build -- --mode development pull_image: # optimize build by caching previously build image From 08b034432dfe99966029cba7d0e5ec999b03a047 Mon Sep 17 00:00:00 2001 From: stitch1 Date: Wed, 11 Dec 2024 20:03:54 +0100 Subject: [PATCH 2/2] fix tooltips in report --- src/components/reports/ReportTableVirtualList.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/reports/ReportTableVirtualList.vue b/src/components/reports/ReportTableVirtualList.vue index e8fcba1..6c097b5 100644 --- a/src/components/reports/ReportTableVirtualList.vue +++ b/src/components/reports/ReportTableVirtualList.vue @@ -157,7 +157,8 @@ div.rotate > span { #report-template .testresultcell span { - display: none; /* This is a fix for popups that inject a span after every usage! */ + float: left; /* This is a fix for popups that inject a span after every usage! */ + width: 0px; } /* first-of-type: This is a fix for popups that inject a span after every usage! */ @@ -170,7 +171,7 @@ div.rotate > span { */ width: 32px; /* Needs to be 32 px for comparison to be visible.*/ height: 20px; - display: block; + display: inline-block; color: transparent; /** While hidden, can a screen reader still find it? */