Skip to content

Commit

Permalink
Merge branch 'hotfix/2.31.2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Lakeyzer committed Oct 28, 2024
2 parents 5a01421 + baedd46 commit 2475a06
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 18 deletions.
4 changes: 2 additions & 2 deletions 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.31.1",
"version": "2.31.2",
"name": "shieldmaiden",
"description": "A Dungeons and Dragons Combat Tracker",
"productName": "Shieldmaiden",
Expand Down
19 changes: 4 additions & 15 deletions src/css/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ html body {
font-size: $font-size;
font-family: "Open Sans", sans-serif;
position: relative;
// background-image: url("../assets/_img/styles/paper-bg.png");

button {
all: unset;
box-sizing: border-box;
}

*:focus-visible {
Expand Down Expand Up @@ -1483,11 +1483,9 @@ html body {
padding: 0.375rem 0.75rem;
font-size: 1rem;
line-height: 1.5;
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out;

i {
// font-weight: normal;
}
transition:
color 0.15s ease-in-out,
background-color 0.15s ease-in-out;

&:focus-visible {
outline: $outline;
Expand Down Expand Up @@ -1685,8 +1683,6 @@ html body {
margin-bottom: 20px;
border-radius: $border-radius;
overflow: auto;
// box-shadow: 0 3px 7px 0 rgba(0, 0, 0, 0.125), 0 6px 2px 0 rgba(0, 0, 0, 0.1);
// border: solid 1px $neutral-5;

&::-webkit-scrollbar {
display: none !important;
Expand Down Expand Up @@ -2757,13 +2753,6 @@ html body {
min-width: 35px;
}
}
a.q-item {
// color: $neutral-2 !important;

&:hover {
// color: $blue !important;
}
}
}

table {
Expand Down

0 comments on commit 2475a06

Please sign in to comment.