Skip to content

Commit 31f3a85

Browse files
committed
Merge branch 'hotfix/2.40.2' into main
2 parents 3a4e9bf + a01bbe8 commit 31f3a85

11 files changed

Lines changed: 53 additions & 47 deletions

File tree

package-lock.json

Lines changed: 11 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.40.1",
2+
"version": "2.40.2",
33
"name": "shieldmaiden",
44
"description": "A Dungeons and Dragons Combat Tracker",
55
"productName": "Shieldmaiden",

src/components/Footer.vue

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
<div class="top">
44
<div class="content">
55
<div class="logo-container">
6-
<img class="logo" src="../assets/_img/logo/logo-cyan.svg" alt="Shieldmaiden logo" />
6+
<img
7+
class="logo"
8+
src="../assets/_img/logo/logo-cyan.svg"
9+
alt="Shieldmaiden logo"
10+
loading="lazy"
11+
/>
712
</div>
813

914
<div class="links">
@@ -147,6 +152,7 @@ export default {
147152
.logo {
148153
margin-top: -40px;
149154
width: 250px;
155+
aspect-ratio: 25 / 24;
150156
}
151157
}
152158
}
@@ -167,6 +173,9 @@ export default {
167173
ul {
168174
padding: 0;
169175
list-style: none;
176+
display: flex;
177+
flex-direction: column;
178+
gap: 3px;
170179
171180
a {
172181
font-size: 12px;

src/components/header/UserMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</div>
8282
</q-popup-proxy>
8383
</div>
84-
<button v-else class="btn btn-clear btn-sm bg-neutral-6 user-btn">
84+
<button v-else class="btn btn-clear btn-sm bg-neutral-6 user-btn" aria-label="User menu">
8585
<i class="fas fa-user-circle" />
8686
<q-popup-proxy
8787
:dark="$store.getters.theme === 'dark'"

src/components/home/Builder.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,21 @@
99
<p class="text">
1010
Our encounter builder is easy to use and lets you use your own custom monsters. We
1111
instantly calculate the difficulty for you.<br />
12-
<router-link to="/tools/encounter-builder" class="learn-more">Learn more</router-link>
12+
<router-link to="/tools/encounter-builder" class="learn-more"
13+
>More on the Encounter Builder</router-link
14+
>
1315
</p>
1416
<router-link to="/encounter-builder" class="btn btn-lg bg-accent">
1517
Try Encounter Builder
1618
</router-link>
1719
</div>
1820
</div>
1921
<div class="col-12 col-md-7">
20-
<img src="~assets/_img/encounter-builder-shieldmaiden.webp" alt="Encounter Builder" />
22+
<img
23+
src="~assets/_img/encounter-builder-shieldmaiden.webp"
24+
alt="Encounter Builder"
25+
loading="lazy"
26+
/>
2127
</div>
2228
</div>
2329
</div>

src/components/home/General.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<img
77
src="~assets/_img/combat-tracker-shieldmaiden.webp"
88
alt="Combat Tracker Shieldmaiden"
9+
loading="lazy"
910
/>
1011
</div>
1112
<div class="col-12 col-md-5">
@@ -15,7 +16,9 @@
1516
<p class="text">
1617
We focus on keeping the game on the table by managing everything you need to keep
1718
track of during encounters. On top of that we enhance the player experience.<br />
18-
<router-link to="/tools/combat-tracker" class="learn-more">Learn more</router-link>
19+
<router-link to="/tools/combat-tracker" class="learn-more"
20+
>More about the Combat Tracker</router-link
21+
>
1922
</p>
2023
<router-link to="/demo/run-encounter" class="btn btn-lg bg-accent"
2124
>Try Demo Encounter</router-link

src/components/home/Header.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
href="https://discord.gg/dU59jgvcuq"
1515
target="_blank"
1616
rel="noopener"
17+
aria-label="Join our Discord"
1718
>
1819
<i class="fab fa-discord" aria-hidden="true" />
1920
<q-tooltip anchor="bottom middle" self="top middle" :offset="[0, 10]">
@@ -75,6 +76,7 @@ header {
7576
7677
.logo {
7778
height: 36px;
79+
aspect-ratio: 156 / 36;
7880
}
7981
.dot-app {
8082
margin-left: 3px;

src/components/home/Pricing.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<p>
1818
Your support helps us keep the app afloat and spend more time improving it. Thank
1919
you!<br />
20-
<router-link to="/pricing" class="learn-more">Learn more</router-link>
20+
<router-link to="/pricing" class="learn-more">Checkout pricing</router-link>
2121
</p>
2222
</div>
2323
<router-link to="/sign-up" class="btn btn-lg bg-accent">

0 commit comments

Comments
 (0)