techwire/bang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into main

Browse Source
This commit is contained in:
Giulio 2020-11-28 21:33:20 +01:00
commit 400631a5a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/App.vue
View File

@ -16,7 +16,7 @@
<div v-else> <div v-else>
<div v-if="!isInLobby" > <div v-if="!isInLobby" >
<p>{{$t("online_players")}}{{onlinePlayers}}</p> <p>{{$t("online_players")}}{{onlinePlayers}}</p>
<Card :card="getSelfCard" style="position:absolute; bottom:10pt; left: 10pt;"/> <Card :card="getSelfCard" style="position:absolute; top:10pt; left: 10pt;"/>
<h2>{{$t("available_lobbies")}}</h2> <h2>{{$t("available_lobbies")}}</h2>
<div style="display: flex"> <div style="display: flex">
<Card v-for="lobby in openLobbies" v-bind:key="lobby.name" :card="getLobbyCard(lobby)" @click.native="joinLobby(lobby)"/> <Card v-for="lobby in openLobbies" v-bind:key="lobby.name" :card="getLobbyCard(lobby)" @click.native="joinLobby(lobby)"/>
@ -36,7 +36,7 @@
<h2>{{$t("warning")}}</h2> <h2>{{$t("warning")}}</h2>
<p>{{$t("connection_error")}}</p> <p>{{$t("connection_error")}}</p>
</div> </div>
<select style="position:absolute;bottom:4pt;right:4pt;" v-model="$i18n.locale"> <select style="position:fixed;bottom:4pt;right:4pt;" v-model="$i18n.locale">
<option <option
v-for="(lang, i) in ['it.🇮🇹.Italiano', 'en.🇬🇧.English']" v-for="(lang, i) in ['it.🇮🇹.Italiano', 'en.🇬🇧.English']"
:key="`lang-${i}`" :key="`lang-${i}`"

4
frontend/src/components/Card.vue
View File

@ -70,7 +70,7 @@ export default {
} }
.card.usable-next-turn { .card.usable-next-turn {
box-shadow: box-shadow:
0 0 0 3pt rgb(192,192,117), 0 0 0 6pt white, 0 0 5pt 6pt #aaa 0 0 0 3pt #6aa16e, 0 0 0 6pt white, 0 0 5pt 6pt #aaa
} }
.card h4 { .card h4 {
position: absolute; position: absolute;
@ -133,7 +133,7 @@ export default {
} }
.card.usable-next-turn { .card.usable-next-turn {
box-shadow: box-shadow:
0 0 0 3pt rgb(192,192,117), 0 0 0 6pt #181a1b, 0 0 5pt 6pt #aaa 0 0 0 3pt #6aa16e, 0 0 0 6pt #181a1b, 0 0 5pt 6pt #aaa
} }
} }
</style> </style>