Merge branch 'almarklein:main' into bulkedit

almarklein · Jul 12, 2024 · 152e261 · 152e261
2 parents 85a1992 + f7baccd
commit 152e261
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/tests/test_server_assetserver.py b/tests/test_server_assetserver.py
@@ -69,7 +69,8 @@ def test_assets():
         ):
             r = p.get(page)
             assert r.status == 404
-            assert "404" in r.body.decode() and "not found" in r.body.decode()
+            assert "not found" in r.body.decode()
+            # assert "404" in r.body.decode()
 
 
 hash_checker_code = """

diff --git a/timetagger/app/front.py b/timetagger/app/front.py
@@ -1973,7 +1973,7 @@ def _draw_record_area(self, ctx, x1, x2, x3, y1, y2):
         # Draw "now" - also if drawing stats
         t = self._canvas.now()
         y = y1 + (t - t1) * pps
-        ctx.strokeStyle = COLORS.prim1_clr
+        ctx.strokeStyle = COLORS.record_text
         ctx.lineWidth = 3  # Pretty thick so it sticks over other edges like week bounds
         ctx.setLineDash([4, 4])
         ctx.lineDashOffset = t % 8

diff --git a/timetagger/app/timetagger_manifest.json b/timetagger/app/timetagger_manifest.json
@@ -6,7 +6,7 @@
     "lang": "en-US",
     "start_url": "./",
     "scope": "./",
-    "display": "fullscreen",
+    "display": "standalone",
     "theme_color": "#F4F4F4",
     "background_color": "#E6E7E5",
     "icons": [