Skip to content

Commit

Permalink
Merge branch 'hotfix/2.5.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
Lakeyzer committed Nov 16, 2022
2 parents 34d194e + 3ec3bb0 commit c039f43
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.5.3",
"version": "2.5.4",
"name": "harmless_key",
"description": "A Dungeons and Dragons Combat Tracker",
"productName": "Harmless Key",
Expand Down
13 changes: 9 additions & 4 deletions src/components/combat/Turns.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</a>
</div>
<div v-else>
Set Intitative
Set Initiative
</div>


Expand Down Expand Up @@ -334,14 +334,19 @@
}
}
@media only screen and (max-width: 576px) {
@media only screen and (max-width: 1000px) {
#turns {
.live {
.live {
display: none;
}
.info {
display: block !important;
display: block;
}
}
}
@media only screen and (max-width: 576px) {
#turns {
.edit {
color: $neutral-3;
}
Expand Down

0 comments on commit c039f43

Please sign in to comment.