Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

Conflicts: skolehjem/public/css/webappdark.css
2020-08-11 08:39:15 +02:00 · 2020-08-11 08:39:15 +02:00 · dd017311f7
parent d071e583f5
commit dd017311f7
1 changed files with 5 additions and 1 deletions
--- a/skolehjem/public/css/webappdark.css
+++ b/skolehjem/public/css/webappdark.css
@ -6979,7 +6979,11 @@ main {

 html,
 body {
-  background-color: rgba(0, 0, 0, 0.6);
+  background-color: #666666;
+}
+
+main {
+  background-color: #666666;
 }

 * {