diff --git a/app/src/ui/button/Button.module.scss b/app/src/ui/button/Button.module.scss index 7346561d..ed0dd6f5 100644 --- a/app/src/ui/button/Button.module.scss +++ b/app/src/ui/button/Button.module.scss @@ -23,6 +23,10 @@ $HALF_LOADER_SIZE: 15px; text-align: center; cursor: pointer; + &__respect-case { + text-transform: none; + } + p, span { font-size: inherit; @@ -306,6 +310,10 @@ $HALF_LOADER_SIZE: 15px; padding: 0; transition: opacity $duration-medium; + &.button--large { + font-size: $font-size-text-lead; + } + &.button--primary, &.button--secondary, &.button--success, @@ -338,29 +346,41 @@ $HALF_LOADER_SIZE: 15px; } } + &.button--primary { + color: var(--color-button-outlined-primary-text); + + &:active, + &:hover, + &:focus { + border-color: var(--color-button-outlined-primary-border-hover); + color: var(--color-button-outlined-primary-hover-text); + background: var(--color-button-outlined-primary-hover); + } + } + &.button--secondary { - border-color: var(--color-button-secondary); - color: var(--color-button-secondary-text); + border-color: var(--color-button-outlined-secondary-border); + color: var(--color-button-outlined-secondary-text); &:active, &:hover, &:focus { - border-color: var(--color-button-secondary-hover); - color: var(--color-button-secondary-hover-text); - background: var(--color-button-secondary-hover); + border-color: var(--color-button-outlined-secondary-border-hover); + color: var(--color-button-outlined-secondary-hover-text); + background: var(--color-button-outlined-secondary-hover); } &[disabled] { border-color: var(--color-dark-1); color: var(--color-dark-1); - background-color: var(--color-white); + background-color: transparent; &:active, &:hover, &:focus { - border-color: var(--color-button-secondary-hover); - color: var(--color-button-secondary-text); - background: var(--color-button-secondary-hover); + border-color: var(--color-button-outlined-secondary-hover); + color: var(--color-button-outlined-secondary-text); + background: var(--color-button-outlined-secondary-hover); } } } @@ -441,28 +461,6 @@ $HALF_LOADER_SIZE: 15px; color: var(--color-white); } } - - &.button--primary { - background-color: transparent; - - .button__icon--right { - svg { - fill: var(--color-button-primary); - } - } - - &:active, - &:hover, - &:focus { - border-color: var(--color-button-outlined-primary-hover-text); - - .button__icon--right { - svg { - fill: var(--color-button-primary-text); - } - } - } - } } &--gradient { diff --git a/app/src/ui/button/Button.module.scss.d.ts b/app/src/ui/button/Button.module.scss.d.ts index 8d6e362c..1c921912 100644 --- a/app/src/ui/button/Button.module.scss.d.ts +++ b/app/src/ui/button/Button.module.scss.d.ts @@ -10,6 +10,7 @@ export type Styles = { "button__icon--right": string; button__loader: string; "button__loading-floating-border": string; + "button__respect-case": string; "button--auto-size": string; "button--danger": string; "button--dark": string; diff --git a/app/src/ui/button/Button.tsx b/app/src/ui/button/Button.tsx index 8e21fe6b..af786ce2 100644 --- a/app/src/ui/button/Button.tsx +++ b/app/src/ui/button/Button.tsx @@ -2,8 +2,10 @@ import clsx from "clsx"; import React, { ForwardedRef, forwardRef } from "react"; +import { Typography } from "ui/typography/Typography"; + import styles from "./Button.module.scss"; -import { ButtonProps, DefaultButtonProps, LinkButtonProps } from "./Button.types"; +import { ButtonProps, DefaultButtonProps, AnchorButtonProps, LinkButtonProps } from "./Button.types"; export const Button = forwardRef( ( @@ -22,6 +24,7 @@ export const Button = forwardRef} aria-label={isLoading && !ariaLabel ? "loading" : ariaLabel} - {...(restProps as LinkButtonProps)} + {...(restProps as AnchorButtonProps)} > {content} ); } + if (TagName === "link") { + return ( + )} + > + {content} + + ); + } + return (