Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 4d88df1c381c4136cfe4780b6b5464d9c984bb31
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Wed Oct 30 14:24:53 2024 -0400

    fixing active/focus states

commit 630f74db6365625af210de81d577d43945f62df4
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Wed Oct 23 13:25:14 2024 -0400

    sign-up/login/debug menu updates

commit f85ef1c58e367219923c46aeebe77d1aa846b6f3
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Tue Oct 15 13:56:36 2024 -0400

    more color standardization

commit cd2ee3350fc51016cc75fb799debeefa0b1d9b64
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Tue Oct 15 13:39:02 2024 -0400

    updates per comments

commit e91371522bb9a6dae5c6d02eb6f16f0b632f7a24
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Fri Oct 4 14:25:45 2024 -0400

    class selection active state

commit 4fcdca1eb07eb67aacd84feb1c9357d52fd6f23f
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Thu Oct 3 14:31:00 2024 -0400

    fixing a few more buttons

commit 475e21aae7733cfa072f828c559cc0930f0ad878
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Wed Oct 2 15:57:25 2024 -0400

    line-heights converted to unitless multipliers

commit c5dca257274a60b02e1f12e3c6daf103cec53096
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Fri Sep 27 13:48:20 2024 -0400

    second pass

commit 685f4d4d64b8b234afbb702d1b8a52d4670d3825
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Thu Sep 26 16:58:59 2024 -0400

    first pass
This commit is contained in:
Kalista Payne
2024-11-21 12:37:02 -06:00
parent 529f856ab9
commit a36114e904
16 changed files with 234 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/src/components/shops/buyModal.vue
+12 -7
View File
@@ -378,7 +378,7 @@
height: 40px;
border-radius: 2px;
background-color: $white;
box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
box-shadow: 0 2px 2px 0 rgba($black, 0.16), 0 1px 4px 0 rgba($black, 0.12);
margin-right: 24px;
input {
@@ -462,17 +462,17 @@
&.gems {
color: $green-10;
background-color: rgba(36, 204, 143, 0.15);
background-color: rgba($green-100, 0.15);
}
&.gold {
color: $yellow-5;
background-color: rgba(255, 190, 93, 0.15);
background-color: rgba($yellow-100, 0.15);
}
&.hourglasses {
color: $hourglass-color;
background-color: rgba(41, 149, 205, 0.15);
background-color: rgba($blue-10, 0.15);
}
}
@@ -516,11 +516,16 @@
button.btn.btn-primary {
margin-top: 16px;
padding: 4px 16px;
height: 32px;
padding: 2px 12px;
line-height: 1.714;
&:focus {
border: 2px solid black;
border: 2px solid $purple-400;
}
&:active {
border: 2px solid $purple-400 !important;
box-shadow:none;
}
}
website/client/src/components/shops/market/sellModal.vue
+8 -3
View File
@@ -297,11 +297,16 @@
button.btn.btn-primary {
margin-top: 16px;
padding: 4px 16px;
height: 32px;
padding: 2px 12px;
line-height: 1.714;
&:focus {
border: 2px solid black;
border: 2px solid $purple-400;
}
&:active {
border: 2px solid $purple-400;
box-shadow: none;
}
.balance {
website/client/src/components/shops/quests/buyQuestModal.vue
+13 -8
View File
@@ -198,7 +198,7 @@
top: 25px;
border-radius: 8px;
background-color: $gray-600;
box-shadow: 0 2px 16px 0 rgba(26, 24, 29, 0.32);
box-shadow: 0 2px 16px 0 rgba($black, 0.32);
display: flex;
align-items: center;
flex-direction: column;
@@ -208,12 +208,17 @@
}
button.btn.btn-primary {
margin-top: 14px;
padding: 4px 16px;
height: 32px;
margin-top: 16px;
padding: 2px 12px;
line-height: 1.714;
&:focus {
border: 2px solid black;
border: 2px solid $purple-400;
}
&:active {
border: 2px solid $purple-400;
box-shadow: none;
}
}
@@ -249,7 +254,7 @@
&.gems {
color: $green-10;
background-color: rgba(36, 204, 143, 0.15);
background-color: rgba($green-100, 0.15);
line-height: 1.4;
margin: 0 0 0 -4px;
border-radius: 20px;
@@ -257,7 +262,7 @@
&.gold {
color: $yellow-5;
background-color: rgba(255, 190, 93, 0.15);
background-color: rgba($yellow-100, 0.15);
line-height: 1.4;
margin: 0 0 0 -4px;
border-radius: 20px;
@@ -265,7 +270,7 @@
&.hourglasses {
color: $hourglass-color;
background-color: rgba(41, 149, 205, 0.15);
background-color: rgba($blue-10, 0.15);
line-height: 1.4;
margin: 0 0 0 -4px;
border-radius: 20px;