diff --git a/maloja/proccontrol/tasks/import_scrobbles.py b/maloja/proccontrol/tasks/import_scrobbles.py index 6d22e42..f095109 100644 --- a/maloja/proccontrol/tasks/import_scrobbles.py +++ b/maloja/proccontrol/tasks/import_scrobbles.py @@ -49,7 +49,7 @@ def import_scrobbles(inputf): typeid,typedesc = "spotify","Spotify" importfunc = parse_spotify_lite_legacy - elif re.match(r"maloja_export_?[0-9]*\.json",filename): + elif re.match(r"maloja_export[_0-9]*\.json",filename): typeid,typedesc = "maloja","Maloja" importfunc = parse_maloja diff --git a/maloja/web/static/css/startpage.css b/maloja/web/static/css/startpage.css index 345e49e..f736b42 100644 --- a/maloja/web/static/css/startpage.css +++ b/maloja/web/static/css/startpage.css @@ -10,8 +10,9 @@ div#startpage { @media (min-width: 2201px) { div#startpage { - grid-template-columns: 15vw 15vw 15vw 15vw 15vw 15vw; - grid-template-rows: 45vh 45vh; + grid-template-columns: repeat(6, 14vw); + grid-template-rows: repeat(2, 45vh); + grid-column-gap: 2vw; grid-template-areas: "charts_artists charts_artists charts_tracks charts_tracks charts_albums charts_albums"