Merge branch 'indev' of https://github.com/Sakimori/matteo-the-prestige into indev

2021-01-05 15:31:57 -05:00 · 2021-01-05 15:31:57 -05:00 · 0a1ce24853
commit 0a1ce24853
parent 84cb16ab5d 5eee2f4d0e
2 changed files with 1 additions and 4 deletions
--- a/static/css/game.css
+++ b/static/css/game.css
@ -19,13 +19,9 @@
    border-right: none;
    border-bottom: none;
    height: min-content;
-<<<<<<< HEAD
    width: 100%;
    min-width: 32rem;
    max-width: 44rem;
-=======
-    min-width: 500px;
->>>>>>> upstream/indev
 }

 .header {
--- a/static/css/games_page.css
+++ b/static/css/games_page.css
@ -8,6 +8,7 @@
 .emptyslot, .game {
    min-height: 18.75rem;
    justify-self: center;
+    max-width: 44rem;
 }

 #filters {