From 5c0d961a012a2aa0100c7fe40dcaef434ab097d6 Mon Sep 17 00:00:00 2001 From: Claude Brisson Date: Sat, 30 Dec 2023 10:15:50 +0100 Subject: [PATCH] Fix margins and pairing page layout --- view-webapp/src/main/sass/main.scss | 2 +- view-webapp/src/main/sass/tour.scss | 10 +++++++++- view-webapp/src/main/webapp/tour-standings.inc.html | 2 -- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/view-webapp/src/main/sass/main.scss b/view-webapp/src/main/sass/main.scss index 660193e..8d97404 100644 --- a/view-webapp/src/main/sass/main.scss +++ b/view-webapp/src/main/sass/main.scss @@ -67,7 +67,7 @@ flex: 1; overflow: auto; #inner { - max-width: clamp(800px, 80vw, 100vw); + /* max-width: clamp(800px, 80vw, 100vw); */ display: flex; flex-flow: column nowrap; align-items: center; diff --git a/view-webapp/src/main/sass/tour.scss b/view-webapp/src/main/sass/tour.scss index df4c701..96479a0 100644 --- a/view-webapp/src/main/sass/tour.scss +++ b/view-webapp/src/main/sass/tour.scss @@ -167,7 +167,7 @@ min-height: 30vh; max-height: 60vh; min-width: 20vw; - max-width: 40vw; + max-width: max(30vw, 15em); border: solid 2px darkgray; border-radius: 5px; padding: 1em 0.5em; @@ -203,6 +203,7 @@ justify-content: start; align-items: stretch; gap: 1em; + max-width: max(10em, 20vw); } #unpairables { display: flex; @@ -215,6 +216,13 @@ display: inline-flex; flex-flow: row wrap; gap: 1em; + flex-shrink: 1; + max-width: max(300px, 60vw); + justify-content: center; + } + + #paired { + max-width: max(50vw, 20em); } .choose-round.button { diff --git a/view-webapp/src/main/webapp/tour-standings.inc.html b/view-webapp/src/main/webapp/tour-standings.inc.html index 46f127e..5824408 100644 --- a/view-webapp/src/main/webapp/tour-standings.inc.html +++ b/view-webapp/src/main/webapp/tour-standings.inc.html @@ -104,8 +104,6 @@ - -