Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix default font size #962

Merged
merged 7 commits into from
Mar 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pages/maintenance.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ const MaintenanceImage = styled.div<{ backgroundImage: string }>`
const Title = styled.h1`
color: ${({ theme: { card } }) => card.titleColor};
font-family: ${({ theme }) => theme.fonts.fontFamilyTitle};
font-size: 3.5rem;
font-size: 1.5rem;
font-weight: 800;
line-height: 1.2;
`
const SubTitle = styled.h3`
font-size: 2rem;
font-size: 1rem;
font-weight: 400;
line-height: 1.2;
`
Expand Down
4 changes: 2 additions & 2 deletions src/components/aelin/GasSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const Wrapper = styled.div`

const Text = styled.span`
color: ${({ theme }) => theme.colors.textColorLight};
font-size: 1.4rem;
font-size: 0.9rem;
font-weight: 400;
line-height: 1.2;
`
Expand Down Expand Up @@ -80,7 +80,7 @@ const ButtonDropdown = styled.button`
`

const EditButton = styled(ButtonPrimaryLight)`
font-size: 1rem;
font-size: 0.8rem;
font-weight: 400;
height: 24px;
margin-left: 10px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/ActionTabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const Tab = styled.h3<{ isActive?: boolean }>`
cursor: pointer;
display: flex;
flex-grow: 1;
font-size: 1.2rem;
font-size: 0.8rem;
font-weight: 600;
justify-content: center;
line-height: 1.4;
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/CardWithTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const CardTitle = styled.h2<{ isActive?: boolean }>`
cursor: pointer;
display: flex;
flex-grow: 1;
font-size: 1.2rem;
font-size: 0.9rem;
font-weight: 400;
justify-content: center;
line-height: 1.4;
Expand All @@ -45,7 +45,7 @@ export const CardTitle = styled.h2<{ isActive?: boolean }>`
transition: opacity 0.15s linear;

@media (min-width: ${({ theme }) => theme.themeBreakPoints.tabletPortraitStart}) {
font-size: 1.6rem;
font-size: 1rem;
min-height: 50px;
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/common/ChangeWalletMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const Row = styled.div`
align-items: center;
display: flex;
flex-shrink: 0;
font-size: 1.4rem;
font-size: 0.9rem;
gap: 8px;
justify-content: center;
margin-bottom: 10px;
Expand Down Expand Up @@ -49,7 +49,7 @@ const ExternalLink = styled.a`

const Button = styled(ButtonPrimaryLight)`
border-width: 0.5px;
font-size: 1rem;
font-size: 0.65rem;
font-weight: 500;
height: 24px;
line-height: 1.2;
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/CollapsibleBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ const Header = styled.div`
const Title = styled.h3`
color: ${({ theme: { card } }) => card.titleColor};
font-family: ${({ theme }) => theme.fonts.fontFamilyTitle};
font-size: 1.4rem;
font-size: 1rem;
font-weight: 700;
line-height: 1.2;
margin: 0;
padding: 0;

@media (min-width: ${({ theme }) => theme.themeBreakPoints.tabletPortraitStart}) {
font-size: 1.8rem;
font-size: 1.2rem;
}
`

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export const DropdownItemCSS = css<DropdownItemProps>`
color: ${({ theme }) => theme.dropdown.item.color};
cursor: pointer;
display: flex;
font-size: 1.4rem;
font-size: 0.9rem;
font-weight: 400;
gap: 10px;
justify-content: ${({ justifyContent }) => justifyContent};
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Loading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const Wrapper = styled.div`

const Text = styled.p`
color: ${({ theme }) => theme.colors.textColorLighter};
font-size: 1.5rem;
font-size: 1rem;
font-weight: 500;
line-height: 1.2;
margin: 15px auto 0;
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const Card = styled(BaseCard)<{ size?: modalSize }>`
export const Title = styled.h1`
color: ${({ theme }) => theme.colors.textColor};
font-family: ${({ theme }) => theme.fonts.fontFamilyTitle};
font-size: 1.8rem;
font-size: 1rem;
font-weight: 700;
line-height: 1.2;
margin: 0 0 20px;
Expand Down Expand Up @@ -66,7 +66,7 @@ export const ModalButtonCSS = css`

export const ModalTextCSS = css`
color: ${({ theme }) => theme.colors.textColorLight};
font-size: 1.4rem;
font-size: 0.9rem;
font-weight: 400;
line-height: 1.2;
margin: 0 auto 20px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/NetworkPlaceholder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Wrapper.defaultProps = {

const Name = styled.div`
color: ${({ theme: { networkPlaceholder } }) => networkPlaceholder.color};
font-size: 1.3rem;
font-size: 0.8rem;
font-weight: 700;
height: 11px;
line-height: 1;
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Notifications.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Badge = styled.span`
border-radius: 50%;
color: #fff;
display: flex;
font-size: 0.8rem;
font-size: 0.6rem;
font-weight: 600;
height: 14px;
justify-content: center;
Expand Down
2 changes: 1 addition & 1 deletion src/components/form/LabeledCheckbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Wrapper = styled.div`
const Label = styled.span<{ checked?: boolean }>`
color: ${({ checked, theme: { colors } }) =>
checked ? colors.textColor : colors.textColorLight};
font-size: 1.4rem;
font-size: 0.9rem;
font-weight: 400;
line-height: 1.2;
margin-top: 1px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/form/LabeledRadioButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Wrapper = styled.div`
const Label = styled.span<{ checked?: boolean }>`
color: ${({ checked, theme: { colors } }) =>
checked ? colors.textColor : colors.textColorLight};
font-size: 1.4rem;
font-size: 0.9rem;
font-weight: 400;
line-height: 1.2;
margin-top: 1px;
Expand Down
4 changes: 2 additions & 2 deletions src/components/form/TokenInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const MaxButton = styled.button`
border: none;
color: ${({ theme }) => theme.colors.textColor};
cursor: pointer;
font-size: 1rem;
font-size: 0.7rem;
font-weight: 400;
padding: 0;
position: absolute;
Expand All @@ -49,7 +49,7 @@ const MaxButton = styled.button`

const Balance = styled.div`
color: ${({ theme }) => theme.colors.textColor};
font-size: 1.2rem;
font-size: 0.8rem;
font-weight: 400;
line-height: 1.2;
margin: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/components/helpers/GeneralError.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const Title = styled.h1`

const Text = styled.p`
color: ${({ theme }) => theme.colors.error};
font-size: 1.4rem;
font-size: 0.9rem;
font-weight: 400;
line-height: 1.2;
margin: 0 auto 40px;
Expand Down
4 changes: 2 additions & 2 deletions src/components/history/DealsAccepted.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react'

import { DealAccepted_OrderBy, OrderDirection } from '@/graphql-schema'
import { genericSuspense } from '@/src/components/helpers/SafeSuspense'
import { TableCard, TableWrapper } from '@/src/components/history/common/TableWrapper'
import { TableCard, TableWrapper, Text } from '@/src/components/history/common/TableWrapper'
import {
ButtonPrimaryLight,
ButtonPrimaryLightSm,
Expand Down Expand Up @@ -108,7 +108,7 @@ export const DealsAccepted: React.FC = () => {
tableHeaderCells={tableHeaderCells}
>
<TableCard>
<p>There’s no deal accepted yet</p>
<Text>There’s no deal accepted yet</Text>
<ButtonPrimaryLight
onClick={() => {
router.push('/')
Expand Down
4 changes: 2 additions & 2 deletions src/components/history/DealsFunded.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react'

import { DealFunded_OrderBy, OrderDirection } from '@/graphql-schema'
import { genericSuspense } from '@/src/components/helpers/SafeSuspense'
import { TableCard, TableWrapper } from '@/src/components/history/common/TableWrapper'
import { TableCard, TableWrapper, Text } from '@/src/components/history/common/TableWrapper'
import {
ButtonPrimaryLight,
ButtonPrimaryLightSm,
Expand Down Expand Up @@ -108,7 +108,7 @@ export const DealsFunded: React.FC = () => {
tableHeaderCells={tableHeaderCells}
>
<TableCard>
<p>There’s no deal funded history yet</p>
<Text>There’s no deal funded history yet</Text>
<ButtonPrimaryLight
onClick={() => {
router.push('/')
Expand Down
4 changes: 2 additions & 2 deletions src/components/history/DealsSponsored.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react'

import { DealSponsored_OrderBy, OrderDirection } from '@/graphql-schema'
import { genericSuspense } from '@/src/components/helpers/SafeSuspense'
import { TableCard, TableWrapper } from '@/src/components/history/common/TableWrapper'
import { TableCard, TableWrapper, Text } from '@/src/components/history/common/TableWrapper'
import {
ButtonPrimaryLight,
ButtonPrimaryLightSm,
Expand Down Expand Up @@ -112,7 +112,7 @@ export const DealsSponsored: React.FC = () => {
tableHeaderCells={tableHeaderCells}
>
<TableCard>
<p>There’s no deal sponsored history yet</p>
<Text>There’s no deal sponsored history yet</Text>
<ButtonPrimaryLight
onClick={() => {
router.push('/pool/create')
Expand Down
4 changes: 2 additions & 2 deletions src/components/history/Deposits.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react'

import { Deposit_OrderBy, OrderDirection } from '@/graphql-schema'
import { genericSuspense } from '@/src/components/helpers/SafeSuspense'
import { TableCard, TableWrapper } from '@/src/components/history/common/TableWrapper'
import { TableCard, TableWrapper, Text } from '@/src/components/history/common/TableWrapper'
import {
ButtonPrimaryLight,
ButtonPrimaryLightSm,
Expand Down Expand Up @@ -109,7 +109,7 @@ export const Deposits: React.FC = () => {
tableHeaderCells={tableHeaderCells}
>
<TableCard>
<p>There’s no deposit history yet</p>
<Text>There’s no deposit history yet</Text>
<ButtonPrimaryLight
onClick={() => {
router.push('/')
Expand Down
4 changes: 2 additions & 2 deletions src/components/history/Vests.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react'

import { OrderDirection, Vest_OrderBy } from '@/graphql-schema'
import { genericSuspense } from '@/src/components/helpers/SafeSuspense'
import { TableCard, TableWrapper } from '@/src/components/history/common/TableWrapper'
import { TableCard, TableWrapper, Text } from '@/src/components/history/common/TableWrapper'
import {
ButtonPrimaryLight,
ButtonPrimaryLightSm,
Expand Down Expand Up @@ -104,7 +104,7 @@ export const Vests: React.FC = () => {
tableHeaderCells={tableHeaderCells}
>
<TableCard>
<p>There’s no vest history yet</p>
<Text>There’s no vest history yet</Text>
<ButtonPrimaryLight
onClick={() => {
router.push('/')
Expand Down
4 changes: 2 additions & 2 deletions src/components/history/Withdraws.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react'

import { OrderDirection, Withdraw_OrderBy } from '@/graphql-schema'
import { genericSuspense } from '@/src/components/helpers/SafeSuspense'
import { TableCard, TableWrapper } from '@/src/components/history/common/TableWrapper'
import { TableCard, TableWrapper, Text } from '@/src/components/history/common/TableWrapper'
import {
ButtonPrimaryLight,
ButtonPrimaryLightSm,
Expand Down Expand Up @@ -104,7 +104,7 @@ export const Withdraws: React.FC = () => {
tableHeaderCells={tableHeaderCells}
>
<TableCard>
<p>There’s no withdraw history yet</p>
<Text>There’s no withdraw history yet</Text>
<ButtonPrimaryLight
onClick={() => {
router.push('/')
Expand Down
6 changes: 6 additions & 0 deletions src/components/history/common/TableWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ export const TableCard = styled.div`
align-items: center;
`

export const Text = styled.h3`
font-size: 1rem;
font-weight: 400;
line-height: 1.2;
`

export const TableWrapper: React.FC<TableWrapper> = ({
children,
columns,
Expand Down
2 changes: 1 addition & 1 deletion src/components/layout/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ const DropdownButton = styled.button`

const NetworkError = styled.p`
color: ${({ theme }) => theme.colors.error};
font-size: 1.6rem;
font-size: 1rem;
line-height: 1.4;
margin: 0 auto 30px;
`
Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/MobileMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const Icon = styled.span`

const Text = styled.span`
color: ${({ theme }) => theme.mobileMenu.itemColor};
font-size: 1rem;
font-size: 0.75rem;
font-weight: 500;
line-height: 1.2;
padding: 0 12px;
Expand Down
4 changes: 0 additions & 4 deletions src/components/notifications/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ const Row = styled(BaseRow)`
width: 100%;
}

.cellText {
width: calc(100% - 120px);
}

.cellLink {
margin-left: auto;
width: fit-content;
Expand Down
14 changes: 6 additions & 8 deletions src/components/pools/actions/Deposit/Deposit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const StyledTokenInput = styled(TokenInput)<{ isPrivate?: boolean }>`

export const Contents = styled.p`
color: ${({ theme }) => theme.colors.textColorLight};
font-size: 1.4rem;
font-size: 0.9rem;
font-weight: 400;
line-height: 1.5;
margin: 15px 0 30px 0;
Expand All @@ -47,10 +47,6 @@ const ButtonsWrapper = styled.div`
gap: 5px;
`

const Button = styled(ButtonGradient)`
width: 110px;
`

const MinimumInvestment = styled.span`
width: 100%;
font-weight: 400;
Expand Down Expand Up @@ -219,7 +215,7 @@ function Deposit({ pool, poolHelpers }: Props) {
/>
)}
<ButtonsWrapper>
<Button
<ButtonGradient
disabled={
!address ||
!isAppConnected ||
Expand All @@ -233,8 +229,10 @@ function Deposit({ pool, poolHelpers }: Props) {
onClick={depositTokens}
>
Deposit
</Button>
{pool.hasNftList && <Button onClick={handleOpenNftSelectionModal}>Select NFT</Button>}
</ButtonGradient>
{pool.hasNftList && (
<ButtonGradient onClick={handleOpenNftSelectionModal}>Select NFT</ButtonGradient>
)}
</ButtonsWrapper>
</>
)
Expand Down
Loading