diff --git a/HMCL/src/main/resources/assets/css/brightness-dark.css b/HMCL/src/main/resources/assets/css/brightness-dark.css index 5d869db728..44b940ba0e 100644 --- a/HMCL/src/main/resources/assets/css/brightness-dark.css +++ b/HMCL/src/main/resources/assets/css/brightness-dark.css @@ -7,14 +7,17 @@ } .log-window { + -fixed-log-background: #282828; -fixed-log-toggle-selected: #DEE2E6; -fixed-log-toggle-unselected: #6C757D; - -fixed-log-text-fill: #FFFFFF; - -fixed-log-trace: #495057; - -fixed-log-debug: #343A40; - -fixed-log-info: #212529; - -fixed-log-warn: #331904; - -fixed-log-error: #58151C; - -fixed-log-fatal: #842029; - -fixed-log-selected: #6C757D; + -fixed-log-text-fill: #e3e3e3; + -fixed-log-trace-background: #495057; + -fixed-log-debug-background: #343A40; + -fixed-log-info-background: #212529; + -fixed-log-warn-background: #413c26; + -fixed-log-warn-text-fill: #fdf3aa; + -fixed-log-error-background: #4e3534; + -fixed-log-error-text-fill: #f9dedc; + -fixed-log-fatal-background: #842029; + -fixed-log-selected: #3e3e3e; } diff --git a/HMCL/src/main/resources/assets/css/brightness-light.css b/HMCL/src/main/resources/assets/css/brightness-light.css index 6235056083..3490b67eee 100644 --- a/HMCL/src/main/resources/assets/css/brightness-light.css +++ b/HMCL/src/main/resources/assets/css/brightness-light.css @@ -7,14 +7,17 @@ } .log-window { + -fixed-log-background: #ffffff; -fixed-log-toggle-selected: #000000; -fixed-log-toggle-unselected: #6C757D; - -fixed-log-text-fill: #000000; - -fixed-log-trace: #EEE9E0; - -fixed-log-debug: #EEE9E0; - -fixed-log-info: #FFFFFF; - -fixed-log-warn: #FFEECC; - -fixed-log-error: #FFCCBB; - -fixed-log-fatal: #F7A699; - -fixed-log-selected: #C4C4C4; + -fixed-log-text-fill: #1f1f1f; + -fixed-log-trace-background: #EEE9E0; + -fixed-log-debug-background: #EEE9E0; + -fixed-log-info-background: #FFFFFF; + -fixed-log-warn-background: #fef6d5; + -fixed-log-warn-text-fill: #3e2f00; + -fixed-log-error-background: #fcebeb; + -fixed-log-error-text-fill: #410e0b; + -fixed-log-fatal-background: #F7A699; + -fixed-log-selected: #f2f2f2; } diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index af297ddd52..f40487f571 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -1382,27 +1382,27 @@ } .log-toggle.fatal { - -fx-background-color: -fixed-log-fatal; + -fx-background-color: -fixed-log-fatal-background; } .log-toggle.error { - -fx-background-color: -fixed-log-error; + -fx-background-color: -fixed-log-error-background; } .log-toggle.warn { - -fx-background-color: -fixed-log-warn; + -fx-background-color: -fixed-log-warn-background; } .log-toggle.info { - -fx-background-color: -fixed-log-info; + -fx-background-color: -fixed-log-info-background; } .log-toggle.debug { - -fx-background-color: -fixed-log-debug; + -fx-background-color: -fixed-log-debug-background; } .log-toggle.trace { - -fx-background-color: -fixed-log-trace; + -fx-background-color: -fixed-log-trace-background; } .log-window-list-cell:selected { @@ -1410,7 +1410,7 @@ } .log-window { - -fx-background-color: -monet-surface-container; + -fx-background-color: -fixed-log-background; } .log-window .scroll-bar .thumb { @@ -1433,36 +1433,36 @@ .log-window-list-cell:fatal { -fx-text-fill: -fixed-log-text-fill; - -fx-background-color: -fixed-log-fatal; + -fx-background-color: -fixed-log-fatal-background; } .log-window-list-cell:error { - -fx-text-fill: -fixed-log-text-fill; - -fx-background-color: -fixed-log-error; + -fx-text-fill: -fixed-log-error-text-fill; + -fx-background-color: -fixed-log-error-background; } .log-window-list-cell:warn { - -fx-text-fill: -fixed-log-text-fill; - -fx-background-color: -fixed-log-warn; + -fx-text-fill: -fixed-log-warn-text-fill; + -fx-background-color: -fixed-log-warn-background; } .log-window-list-cell:info { -fx-text-fill: -fixed-log-text-fill; - -fx-background-color: -fixed-log-info; + -fx-background-color: -fixed-log-info-background; } .log-window-list-cell { - -fx-background-color: -fixed-log-info; + -fx-background-color: -fixed-log-info-background; } .log-window-list-cell:debug { -fx-text-fill: -fixed-log-text-fill; - -fx-background-color: -fixed-log-debug; + -fx-background-color: -fixed-log-debug-background; } .log-window-list-cell:trace { -fx-text-fill: -fixed-log-text-fill; - -fx-background-color: -fixed-log-trace; + -fx-background-color: -fixed-log-trace-background; } .log-window-list-cell:selected {