Skip to content

Commit bea3544

Browse files
committed
Fix some night mode color issues
- Fixed vite dev server not working with https enabled Plan webservers - Fixed text color of buttons with .col-theme class - Fixed hover for buttons and links with .col-theme class - Fixed checked checkbox color for checkboxes in night mode Affects issues: - Fixed #4000
1 parent 914abcc commit bea3544

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

Plan/react/dashboard/src/style/style.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,6 +1220,10 @@ div#navSrvContainer::-webkit-scrollbar-thumb {
12201220
color: var(--color-theme);
12211221
}
12221222

1223+
button.col-theme:hover, a.col-theme:hover {
1224+
color: color-mix(in srgb, var(--color-theme) 60%, black)
1225+
}
1226+
12231227
/* Minecraft color codes */
12241228
.black {
12251229
color: #000000;

Plan/react/dashboard/src/util/colors.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,13 +280,15 @@ export const createNightModeCss = () => {
280280
`.fc-today {background:var(--color-night-grey-blue) !important}` +
281281
`.fc-popover-body,.fc-popover-header{background-color: var(--color-night-dark-blue) !important;color: var(--color-night-text-dark-bg) !important;}` +
282282
`select,input,.dataTables_paginate .page-item:not(.active) a,.input-group-text,.input-group-text > * {background-color:var(--color-night-dark-blue) !important;border-color:var(--color-night-blue) !important;color: var(--color-night-text-dark-bg) !important;}` +
283+
`input.form-check-input:checked {background-color:var(--color-night-blue) !important;border-color:var(--color-night-blue) !important;color: var(--color-night-text-dark-bg) !important;}` +
283284
`.topbar-divider,.fc td,.fc tr,.fc th, .fc table, .modal-header,.modal-body,.modal-footer{border-color:var(--color-night-blue) !important;}` +
284285
`.fc a{color:var(--color-night-text-dark-bg) !important;}` +
285286
`.fc-button{ background-color: ${withReducedSaturation(colorMap.PLAN.hex)} !important;}` +
286287
`.loader{border: 4px solid var(--color-plan); background-color: var(--color-plan);}` +
287288
`.dropdown-item,.dropdown-header{color: var(--color-night-text-dark-bg) !important;}` +
288289
`.dropdown-item:hover{background-color: var(--color-night-blue) !important;}` +
289290
`.dropdown-menu{border-color:var(--color-night-blue);color: var(--color-night-blue) !important;}` +
291+
`.col-theme{--color-theme: var(--color-night-text-dark-bg)}` +
290292
`:root {--bs-heading-color:var(--color-night-text-dark-bg); --bs-card-color:var(--color-night-text-dark-bg); --bs-body-color:var(--color-night-text-dark-bg); --bs-body-bg:var(--color-night-dark-grey-blue); --bs-btn-active-border-color:var(--color-night-blue);}` +
291293
createNightModeColorCss()
292294
}

Plan/react/dashboard/vite.config.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ export default defineConfig({
2222
host: 'localhost',
2323
port: 3000,
2424
open: true,
25+
secure: false,
2526
proxy: {
26-
"/v1": {target: packageJson.proxy},
27-
"/docs/swagger.json": {target: packageJson.proxy}
27+
"/v1": {target: packageJson.proxy, secure: false},
28+
"/auth": {target: packageJson.proxy, secure: false},
29+
"/docs/swagger.json": {target: packageJson.proxy, secure: false}
2830
}
2931
}
3032
});

0 commit comments

Comments
 (0)