kass/matteo-the-prestige
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #130 from esSteres/indev

Browse Source 
missed a merge conflict riv
This commit is contained in:
Sakimori 2021-01-05 15:28:51 -05:00 committed by GitHub
commit 5eee2f4d0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/css/game.css
View File

@ -19,13 +19,9 @@
border-right: none; border-right: none;
border-bottom: none; border-bottom: none;
height: min-content; height: min-content;
<<<<<<< HEAD
width: 100%; width: 100%;
min-width: 32rem; min-width: 32rem;
max-width: 44rem; max-width: 44rem;
=======
min-width: 500px;
>>>>>>> upstream/indev
} }
.header { .header {

1
static/css/games_page.css
View File

@ -8,6 +8,7 @@
.emptyslot, .game { .emptyslot, .game {
min-height: 18.75rem; min-height: 18.75rem;
justify-self: center; justify-self: center;
max-width: 44rem;
} }
#filters { #filters {