diff --git a/src/App.vue b/src/App.vue index 9fce8b4..bd0ff35 100644 --- a/src/App.vue +++ b/src/App.vue @@ -228,7 +228,7 @@ onMounted(async () => { z-index: 100 gap: 16px @media (min-width: 992px) - top: 142px + top: 10% right: 24px left: unset transform: unset @@ -261,9 +261,9 @@ body:hover::-webkit-scrollbar-thumb .toast-header, .toast-body font-size: 16px -.Vue-Toastification__container - &.bloodline-toast-container - &.top-right - @media (min-width: 992px) - top: 100px +// .Vue-Toastification__container +// &.bloodline-toast-container +// &.top-right +// @media (min-width: 992px) +// top: 100px diff --git a/src/assets/sass/buttons.sass b/src/assets/sass/buttons.sass index 135a0ca..a6f0b02 100644 --- a/src/assets/sass/buttons.sass +++ b/src/assets/sass/buttons.sass @@ -20,5 +20,6 @@ &[disabled], &.btn--disabled background-color: darken($purple, 10%) cursor: not-allowed + color: var(--white-dark) &:hover,&:focus,&:active background-color: darken($purple, 10%), diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index 05b0a7d..180caff 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -9,6 +9,7 @@ $tertiary-dark: darken($tertiary, 20%) $tertiary-light: lighten($tertiary, 20%) $white: #F9F9FA +$white-dark: darken($white, 20%) $black: #0F0F0F $grey: #858585 $grey-light: lighten($grey, 20%) @@ -31,7 +32,8 @@ $button-background-color: $black --tertiary: #{$tertiary} --tertiary-light: #{$tertiary-light} --tertiary-dark: #{$tertiary-dark} - --white: #{#F9F9FA} + --white: #{$white} + --white-dark: #{$white-dark} --grey: #{$grey} --grey-light: #{$grey-light} --grey2: #{$grey2} @@ -99,6 +101,14 @@ $button-background-color: $black line-height: normal // @media (min-width: 992px) // font-size: 30px +.sub-header-2 + font-family: Inter + font-style: normal + font-weight: 400 + line-height: normal + font-size: 24px + @media (min-width: 992px) + font-size: 32px // :root // --font-size-text: 16px diff --git a/src/components/ClaimComponent.vue b/src/components/ClaimComponent.vue index c8bb8d7..5c2d36a 100644 --- a/src/components/ClaimComponent.vue +++ b/src/components/ClaimComponent.vue @@ -177,7 +177,7 @@ async function claimAll() { // console.log("rewardData", rewardData); //ClaimedReward (address staker, uint256 reward) - const outputClaim = rewardData.topics[2] / 10n ** tokenStore.memeToken.decimals; + const outputClaim = BigInt(rewardData.topics[2]) / 10n ** tokenStore.memeToken.decimals; showSuccessToast( formatNumber(outputClaim), "Success!", diff --git a/src/components/RewardsWrapper.vue b/src/components/RewardsWrapper.vue index eca37de..d8e3f62 100644 --- a/src/components/RewardsWrapper.vue +++ b/src/components/RewardsWrapper.vue @@ -33,6 +33,5 @@ const props = defineProps({ padding: 0 6px 6px 6px border-bottom: 1px solid var(--grey, #858585) justify-content: space-between - height: 56px box-sizing: content-box diff --git a/src/components/SacrificeToken.vue b/src/components/SacrificeToken.vue index fbb2fd7..8e473a9 100644 --- a/src/components/SacrificeToken.vue +++ b/src/components/SacrificeToken.vue @@ -1,6 +1,6 @@