From 1b2544cc4bedc1cc16981bb96ab1a7e1d30fb9af Mon Sep 17 00:00:00 2001 From: Elijah Steres Date: Sat, 2 Jan 2021 21:41:00 -0500 Subject: [PATCH 1/3] my life is an endless series of one-line css changes now --- static/css/game.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/static/css/game.css b/static/css/game.css index 2a3d921..d660f3c 100644 --- a/static/css/game.css +++ b/static/css/game.css @@ -61,7 +61,9 @@ display: flex; flex-direction: column; justify-content: space-around; - margin-right: 12px; + min-width: 95%; + max-width: 100%; + width: min-content; } .team { From c670c8a1a23654c4aac031ea8cfa12d89e0426fa Mon Sep 17 00:00:00 2001 From: Elijah Steres Date: Sun, 3 Jan 2021 15:09:31 -0500 Subject: [PATCH 2/3] css changes and add title field --- .DS_Store | Bin 0 -> 6148 bytes static/css/game.css | 79 +++++++++++++++----------------------- static/css/games_page.css | 16 ++++---- static/js/.DS_Store | Bin 0 -> 6148 bytes templates/base.html | 2 +- templates/game_box.html | 13 +++---- 6 files changed, 46 insertions(+), 64 deletions(-) create mode 100644 .DS_Store create mode 100644 static/js/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 div { + margin: 0.3rem 0.5rem; } .body { - margin: 10px; + margin: 0.5rem; display: grid; - grid-template-columns: 66% 33%; + grid-template-columns: repeat(3, minmax(0, 1fr)); grid-template-areas: - "teams info" - "players info" - "update update"; - grid-template-rows: 90px 85px; - grid-row-gap: 4px; - grid-column-gap: 14px; - flex: 1; + "teams teams info" "players players info" "update update update"; + grid-template-rows: 5.5rem auto auto; + grid-row-gap: 0.5rem; + grid-column-gap: 0.75rem; } .teams { @@ -70,7 +60,7 @@ display: flex; justify-content: space-between; width: 100%; - margin: 5px 0px; + margin: 0.25rem 0rem; } .team_name { @@ -86,8 +76,7 @@ align-items: center; justify-content: space-around; background: #4f545c; - padding: 25px 0px; - margin-right: 10px; + padding: 0.75rem 0rem; border-radius: 4px; } @@ -95,14 +84,14 @@ font-size: 10pt; text-align: left; height: max-content; - padding: 5px; + margin: 0.3rem 0.5rem; } .leagueoruser { font-size: 10pt; text-align: right; height: max-content; - padding: 5px; + margin: 0.3rem 0.5rem; } .footer { @@ -144,17 +133,22 @@ .players { grid-area: players; - display: flex; - flex-direction: column; - justify-content: space-around; - align-items: start; + display: grid; + grid-template-columns: auto minmax(0, 1fr); + grid-template-rows: auto auto; + grid-column-gap: 0.5rem; + margin-left: 0.3rem; } -.player { - display: flex; - align-items: end; - width: 100%; - flex-direction: column; +.players > div { + margin: 0.25rem 0rem; +} + +.player_type { + text-align: end; + font-weight: bolder; + display: inline-block; + vertical-align: middle; } .player_name { @@ -162,16 +156,13 @@ text-overflow: ellipsis; text-align: start; white-space: nowrap; - width: 95%; - margin-top: -4px; + width: 100%; } .update { grid-area: update; - margin-right: 10px; - margin-top: 5px; - min-height: 50px; - padding: 0px 10px; + min-height: 3.5rem; + padding: 0rem 0.75rem; height: 100%; background: var(--background-secondary); border-radius: 4px; @@ -180,14 +171,8 @@ justify-content: start; } -.player_type { - width: 100%; - text-align: start; - font-weight: bolder; -} - .update_emoji { - margin-right: 10px; + margin-right: 0.75rem; margin-left: 2px; } diff --git a/static/css/games_page.css b/static/css/games_page.css index d86bfdc..f95f077 100644 --- a/static/css/games_page.css +++ b/static/css/games_page.css @@ -8,7 +8,7 @@ } .container > div { - min-height: 325px; + min-height: 298px; } #filters { @@ -21,15 +21,15 @@ } #filters > * { - padding: 4px 8px; - margin: 0px 8px; + padding: 0.25rem 0.5rem; + margin: 0rem 0.5rem; font-size: 16pt; background: rgba(0,0,0,0); } #filters > .filter { - border-radius: 8px; - min-width: 100px; + border-radius: 0.5rem; + min-width: 6.25rem; text-align: center; border: none; color: white; @@ -45,14 +45,14 @@ flex-direction: column; justify-content: center; width: 100%; - height: 75px; + height: 4.5rem; } #footer > div { text-align: center; - font-size: 20px; + font-size: 16pt; position: relative; - top: 5px; + top: 0.25rem; } .emptyslot { diff --git a/static/js/.DS_Store b/static/js/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0Github
Twitter -

THE SIMMADOME

+

THE SIMMADOME

Join SIBR on to start your own games!

{% block body %}{% endblock %} diff --git a/templates/game_box.html b/templates/game_box.html index 39e18b9..c4d1d1d 100644 --- a/templates/game_box.html +++ b/templates/game_box.html @@ -6,6 +6,7 @@ src={% if state.bases[number] %}"/static/img/base_filled.png" alt="{{state.bases {%- endmacro %}
Inning: {% if state.display_top_of_inning == true %}🔼{% else %}🔽{% endif %} {{ state.display_inning }}/{{ state.max_innings }}
+
{{ state.title }}
{{ state.weather_emoji }} {{ state.weather_text }}
@@ -36,14 +37,10 @@ src={% if state.bases[number] %}"/static/img/base_filled.png" alt="{{state.bases
-
-
PITCHER
-
{{ state.pitcher }}
-
-
-
BATTER
-
{{ state.batter }}
-
+
PITCHER
+
{{ state.pitcher }}
+
BATTER
+
{{ state.batter }}
{{ state.update_emoji }}
From 1eaa1d3cd89415b224b7f34e23b0fc41b2d534a2 Mon Sep 17 00:00:00 2001 From: Elijah Steres Date: Sun, 3 Jan 2021 15:24:50 -0500 Subject: [PATCH 3/3] css fixes x_x --- static/css/common.css | 5 +++-- templates/base.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/static/css/common.css b/static/css/common.css index 6e179e5..df22339 100644 --- a/static/css/common.css +++ b/static/css/common.css @@ -28,6 +28,7 @@ h2 { .page_header { color: white; font-family: 'Goldman', cursive; + text-decoration: none; } #header { @@ -39,8 +40,8 @@ h2 { align-items: center; } -#header > .page_header { - margin: auto +#header .page_header { + margin: auto; } #link_div { diff --git a/templates/base.html b/templates/base.html index 19d0cce..da90c9e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -23,7 +23,7 @@ Github
Twitter
-

THE SIMMADOME

 +

THE SIMMADOME

Join SIBR on to start your own games!

{% block body %}{% endblock %}