diff --git a/src/assets/fonts/DIN Pro/DINPro-Light.otf b/src/assets/fonts/DIN Pro/DINPro-Light.otf new file mode 100644 index 0000000..8a7f085 Binary files /dev/null and b/src/assets/fonts/DIN Pro/DINPro-Light.otf differ diff --git a/src/assets/fonts/DIN Pro/DINPro-Light.ttf b/src/assets/fonts/DIN Pro/DINPro-Light.ttf deleted file mode 100644 index 508e4e7..0000000 Binary files a/src/assets/fonts/DIN Pro/DINPro-Light.ttf and /dev/null differ diff --git a/src/components/address/index.scss b/src/components/address/index.scss index c2b6ab5..9b443ed 100644 --- a/src/components/address/index.scss +++ b/src/components/address/index.scss @@ -10,7 +10,7 @@ width: 16px; height: 16px; border-radius: 10px; - margin-right: 10px; + margin-right: 15px; align-self: center; } @@ -24,7 +24,7 @@ &--clickable { &:hover { - color: #5d5d5d; + color: #bfbfbf; cursor: pointer; } } diff --git a/src/components/button/index.scss b/src/components/button/index.scss index 24d7ad2..b1b5815 100644 --- a/src/components/button/index.scss +++ b/src/components/button/index.scss @@ -37,12 +37,12 @@ } &--cancel { - color: #bfbfbf; + color: #838383; background: none; padding: 0; &:hover { - color: #838383; + color: #4a4a4a; background: none; } } @@ -60,6 +60,7 @@ &--red { background: $color-red; border: 1px solid $color-red; + padding: 8px 20px; &:hover { background-color: #ff5757; diff --git a/src/components/emptyState/index.jsx b/src/components/emptyState/index.jsx index 4e87af9..0788f6a 100644 --- a/src/components/emptyState/index.jsx +++ b/src/components/emptyState/index.jsx @@ -23,7 +23,7 @@ EmptyState.propTypes = { EmptyState.defaultProps = { small: false, - text: 'Nothing to show...', + text: 'Nothing to display.', }; export default EmptyState; diff --git a/src/components/emptyState/index.scss b/src/components/emptyState/index.scss index df97171..6565cc4 100644 --- a/src/components/emptyState/index.scss +++ b/src/components/emptyState/index.scss @@ -3,7 +3,7 @@ @import 'style/variables.scss'; .empty-state { - font-family: 'Gilroy-Medium', sans-serif; + font-family: 'DINPro-regular', sans-serif; font-size: 18px; color: #4A4A4A; text-align: left; diff --git a/src/components/header/components/index.scss b/src/components/header/components/index.scss index e1b6401..6dede7c 100644 --- a/src/components/header/components/index.scss +++ b/src/components/header/components/index.scss @@ -31,7 +31,7 @@ &__balance { display: flex; - padding: 0rem 1rem; + padding-left: .9rem; align-content: baseline; } @@ -42,9 +42,10 @@ opacity: 0.75; letter-spacing: 0; line-height: 0.5; + padding-bottom: 8px; &--grey { - opacity: 0.25; + opacity: 0.1; } } @@ -91,6 +92,7 @@ font-stretch: normal; line-height: 1.2; z-index: 1; + margin-top: 2px; } &__dropdown-caret { diff --git a/src/components/simpleCard/components/simpleCardFooter/index.scss b/src/components/simpleCard/components/simpleCardFooter/index.scss index 87aa9de..1f88498 100644 --- a/src/components/simpleCard/components/simpleCardFooter/index.scss +++ b/src/components/simpleCard/components/simpleCardFooter/index.scss @@ -8,3 +8,7 @@ border: none; color: #4a4a4a; } + +.kosu { + margin-top: -20px; +} diff --git a/src/components/simpleCard/index.scss b/src/components/simpleCard/index.scss index 1fb7f33..e8b5621 100644 --- a/src/components/simpleCard/index.scss +++ b/src/components/simpleCard/index.scss @@ -12,6 +12,6 @@ border-radius: 2px; &--min-height { - min-height: 145px; + min-height: 135px; } } diff --git a/src/components/symbols/acceptedSymbol/index.scss b/src/components/symbols/acceptedSymbol/index.scss index 37dfd5e..bd5c6d3 100644 --- a/src/components/symbols/acceptedSymbol/index.scss +++ b/src/components/symbols/acceptedSymbol/index.scss @@ -11,7 +11,7 @@ color: $color-white; letter-spacing: 0.89px; text-align: center; - padding: 2px; + padding: 4px; display: inline-block; width: 92px; border-radius: 2px; diff --git a/src/components/symbols/proposalSymbol/index.scss b/src/components/symbols/proposalSymbol/index.scss index 8dc1f58..bec7d0a 100644 --- a/src/components/symbols/proposalSymbol/index.scss +++ b/src/components/symbols/proposalSymbol/index.scss @@ -11,7 +11,7 @@ color: $color-white; letter-spacing: 0.89px; text-align: center; - padding: 2px; + padding: 4px; display: inline-block; width: 92px; border-radius: 2px; diff --git a/src/components/symbols/rejectedSymbol/index.scss b/src/components/symbols/rejectedSymbol/index.scss index d3f61f7..c91ccf6 100644 --- a/src/components/symbols/rejectedSymbol/index.scss +++ b/src/components/symbols/rejectedSymbol/index.scss @@ -11,7 +11,7 @@ color: $color-white; letter-spacing: 0.89px; text-align: center; - padding: 2px; + padding: 4px; display: inline-block; width: 92px; border-radius: 2px; diff --git a/src/components/symbols/validatorSymbol/index.scss b/src/components/symbols/validatorSymbol/index.scss index 5ff560f..c7a022d 100644 --- a/src/components/symbols/validatorSymbol/index.scss +++ b/src/components/symbols/validatorSymbol/index.scss @@ -11,7 +11,7 @@ color: $color-white; letter-spacing: 0.89px; text-align: center; - padding: 2px; + padding: 4px; display: inline-block; width: 92px; border-radius: 2px; diff --git a/src/components/table/index.jsx b/src/components/table/index.jsx index fef6e31..e91c381 100644 --- a/src/components/table/index.jsx +++ b/src/components/table/index.jsx @@ -45,9 +45,9 @@ const StyledTable = styled.table` } & th { - padding: 17px 10px 17px 18px; + padding: 14px 10px 14px 18px; font-family: 'Gilroy-Medium', sans-serif; - font-size: 20px; + font-size: 18px; color: #4a4a4a; text-align: left; font-weight: normal; diff --git a/src/routes/account/components/governanceActivityView/index.jsx b/src/routes/account/components/governanceActivityView/index.jsx index 88c98cd..6267748 100644 --- a/src/routes/account/components/governanceActivityView/index.jsx +++ b/src/routes/account/components/governanceActivityView/index.jsx @@ -119,7 +119,7 @@ function GovernanceActivityView(props) { diff --git a/src/routes/account/components/ordersView/index.jsx b/src/routes/account/components/ordersView/index.jsx index 757ad57..c5800b7 100644 --- a/src/routes/account/components/ordersView/index.jsx +++ b/src/routes/account/components/ordersView/index.jsx @@ -32,7 +32,7 @@ function OrdersView(props) { diff --git a/src/routes/challenge/components/challengeView/index.scss b/src/routes/challenge/components/challengeView/index.scss index 314eefb..24e9392 100644 --- a/src/routes/challenge/components/challengeView/index.scss +++ b/src/routes/challenge/components/challengeView/index.scss @@ -11,34 +11,34 @@ &__title { font-family: 'DINPro-Medium', sans-serif; font-size: 39px; - color: #838383; + color: #4a4a4a; text-align: left; } &__public-key-label { font-family: 'DINPro-Medium', sans-serif; - font-size: 12px; + font-size: 13px; color: #BFBFBF; text-align: left; } &__public-key { font-family: 'DINPro-Medium', sans-serif; - font-size: 16px; + font-size: 14px; color: #BFBFBF; text-align: left; } &__content { font-family: 'Gilroy-Medium', sans-serif; - font-size: 25px; + font-size: 20px; color: #838383; text-align: left; } &__address { font-family: 'DINPro-Medium', sans-serif; - font-size: 25px; + font-size: 20px; color: #4a4a4a; text-align: left; } @@ -62,7 +62,7 @@ border: 1px solid #ededed; box-shadow: 3px 9px 15px 0 rgba(0, 0, 0, 0.07); padding: 12px 15px; - min-height: 145px; + min-height: 138px; } &__card-title { diff --git a/src/routes/home/components/pastChallengesView/index.jsx b/src/routes/home/components/pastChallengesView/index.jsx index abc53ea..87cb7f7 100644 --- a/src/routes/home/components/pastChallengesView/index.jsx +++ b/src/routes/home/components/pastChallengesView/index.jsx @@ -53,7 +53,7 @@ function PastChallengesView(props) {
window.open(`https://etherscan.io/address/${pastChallenge.challenger}`)} + onClick={() => window.open(`https://ropsten.etherscan.io/address/${pastChallenge.challenger}`)} short clickable /> diff --git a/src/routes/past/components/pastChallengeView/index.jsx b/src/routes/past/components/pastChallengeView/index.jsx index f62e4f9..a2815e8 100644 --- a/src/routes/past/components/pastChallengeView/index.jsx +++ b/src/routes/past/components/pastChallengeView/index.jsx @@ -41,15 +41,15 @@ function PastChallengeView(props) { } = props; return ( -
+
{`Challenge #${challengeId}`}
- {passed ? : } - {' '} {status === 1 ? : } + {' '} + {passed ? : } diff --git a/src/routes/past/components/pastChallengeView/index.scss b/src/routes/past/components/pastChallengeView/index.scss index eceb9e0..632c4e8 100644 --- a/src/routes/past/components/pastChallengeView/index.scss +++ b/src/routes/past/components/pastChallengeView/index.scss @@ -11,20 +11,21 @@ &__title { font-family: 'DINPro-Medium', sans-serif; font-size: 39px; - color: #838383; + color: #4a4a4a; text-align: left; + margin-bottom: 10px; } &__content-address { font-family: 'DINPro-Medium', sans-serif; - font-size: 25px; + font-size: 20px; color: #4a4a4a; text-align: left; } &__content { font-family: 'Gilroy-Medium', sans-serif; - font-size: 25px; + font-size: 20px; color: #838383; text-align: left; } diff --git a/src/routes/validator/components/validatorView/index.jsx b/src/routes/validator/components/validatorView/index.jsx index e883d0a..ac9ca05 100644 --- a/src/routes/validator/components/validatorView/index.jsx +++ b/src/routes/validator/components/validatorView/index.jsx @@ -41,7 +41,7 @@ function ValidatorView(props) { challengeListing, } = props; - const monthlyReward = parseFloat(dailyReward) * 30; + const monthlyReward = parseFloat(dailyReward); const [isValidatorChallengeModalOpen, toggleValidatorChallengeModal] = useState(false); const formattedAge = timestampToCountdown(confirmationUnix, true, true); @@ -120,7 +120,7 @@ function ValidatorView(props) { View on {' '} - Monthly reward + Daily reward {numeral(monthlyReward).format('0,0.[00]')} diff --git a/src/routes/validator/components/validatorView/index.scss b/src/routes/validator/components/validatorView/index.scss index 1753624..9ab5c7c 100644 --- a/src/routes/validator/components/validatorView/index.scss +++ b/src/routes/validator/components/validatorView/index.scss @@ -5,13 +5,13 @@ .validator-view { padding-right: 125px; padding-left: 125px; - padding-top: 50px; + padding-top: 30px; padding-bottom: 50px; &__header { font-family: 'DINPro-Medium', sans-serif; font-size: 39px; - color: #838383; + color: #4a4a4a; text-align: left; } @@ -24,21 +24,21 @@ &__address { font-family: 'DINPro-Medium', sans-serif; - font-size: 25px; - color: #4A4A4A; + font-size: 20px; + color: #838383; text-align: left; } &__validator-label { font-family: 'DINPro-Medium', sans-serif; - font-size: 12px; + font-size: 13px; color: #BFBFBF; text-align: left; } &__validator-public-key { font-family: 'DINPro-Medium', sans-serif; - font-size: 16px; + font-size: 14px; color: #BFBFBF; text-align: left; padding-bottom: 10px; @@ -47,8 +47,9 @@ &__link-label { font-family: 'Gilroy-Medium', sans-serif; font-size: 14px; - color: #BFBFBF; + color: #838383; text-align: left; + margin-top: 9px; } &__link { @@ -69,7 +70,7 @@ &__age-block-label { opacity: 0.5; - font-family: 'Gilroy-Regular', sans-serif; + font-family: 'DINPro-Medium', sans-serif; font-size: 16px; color: #4A4A4A; text-align: left; diff --git a/src/style/fonts.scss b/src/style/fonts.scss index e4d1d43..12a8f5c 100644 --- a/src/style/fonts.scss +++ b/src/style/fonts.scss @@ -1,6 +1,6 @@ @font-face { font-family: 'DINPro-light'; - src: url('../assets/fonts/DIN Pro/DINPro-Light.ttf'); + src: url('../assets/fonts/DIN Pro/DINPro-Light.otf'); } @font-face {