Merge branch 'main' of https://github.com/drmaxnix/juice-script into main

2022-10-05 19:46:25 +02:00 · 2022-10-05 19:46:25 +02:00 · 14b27f6455
commit 14b27f6455
parent b767b7519e 1353887228
1 changed files with 4 additions and 0 deletions
--- a/dev/index.css
+++ b/dev/index.css
@ -62,7 +62,11 @@ div.collection div.item {

@media only screen and (max-width: 1200px) {
 	html, body {
+<<<<<<< HEAD
 		overflow-y: visible;
+=======
+		overflow-y: auto;
+>>>>>>> 13538872284d3be1ebbdc6cc70a8155d78ac3b03
 	}
 	#console {
 		overflow-y: visible;