nikola/pairgoth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master' into pairing_theo

Browse Source
This commit is contained in:
Theo Barollet
2023-12-31 13:50:19 +01:00
parent 6ec0b52bb8 18edd16d6c
commit 279c7a8f9e
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
view-webapp/src/main/sass/main.scss
View File

@@ -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;

10
view-webapp/src/main/sass/tour.scss
View File

@@ -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 {

2
view-webapp/src/main/webapp/tour-standings.inc.html
View File

@@ -104,8 +104,6 @@
<button class="ui gray floating cancel button">Cancel</button>
<button class="ui blue floating button">EGF</button>
<button class="ui blue floating button">FFG</button>
<button class="ui blue floating button">PDF</button>
<button class="ui blue floating button">HTML</button>
</div>
</div>
</div>