Skip to content

Commit

Permalink
Thinner font + misc
Browse files Browse the repository at this point in the history
  • Loading branch information
mvaivre committed Dec 17, 2024
1 parent f72ca9f commit a97fab9
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 26 deletions.
4 changes: 2 additions & 2 deletions apps/desktop-wallet/src/components/AppHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ const AppHeaderContainer = styled.div`
align-items: center;
height: ${appHeaderHeightPx}px;
padding: 0 var(--spacing-4) 0 40px;
padding: 0 var(--spacing-2) 0 40px;
gap: var(--spacing-1);
`

Expand All @@ -173,7 +173,7 @@ const GradientBackground = styled(motion.div)`
left: 0;
right: 0;
height: 140px;
background: ${({ theme }) => `linear-gradient(to bottom, ${colord(theme.bg.background2).toHex()} 35%, transparent)`};
background: ${({ theme }) => `linear-gradient(to bottom, ${colord(theme.bg.background1).toHex()} 35%, transparent)`};
pointer-events: none;
z-index: 0;
`
Expand Down
1 change: 0 additions & 1 deletion apps/desktop-wallet/src/components/InfoBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ const TextContainer = styled.div<{ wordBreak?: boolean; ellipsis?: boolean }>`
font-weight: var(--fontWeight-medium);
word-break: ${({ wordBreak }) => (wordBreak ? 'break-all' : 'initial')};
text-align: center;
font-size: 14px;
${({ ellipsis }) =>
ellipsis
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const SideBarStyled = styled.div<{ noBorder: boolean; noExpansion: boolean }>`
align-items: center;
z-index: 1;
width: ${walletSidebarWidthPx}px;
padding: ${appHeaderHeightPx - 20}px var(--spacing-3) var(--spacing-3) var(--spacing-3);
padding: ${appHeaderHeightPx}px var(--spacing-2) var(--spacing-2) var(--spacing-2);
border-right: ${({ theme, noBorder }) => (!noBorder ? `1px solid ${theme.border.secondary}` : 'none')};
background-color: ${({ theme }) => theme.bg.background2};
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop-wallet/src/components/TabBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export const Tab = styled.div<{ isActive: boolean }>`
background-color: ${({ isActive, theme }) => (isActive ? theme.bg.accent : theme.bg.primary)};
cursor: pointer;
font-size: 15px;
font-weight: var(--fontWeight-semiBold);
font-weight: var(--fontWeight-medium);
border-radius: 100px;
padding: 0 30px;
height: calc(var(--inputHeight) - 2px);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ const LabelTime = styled.div`

const DirectionLabel = styled.span`
color: ${({ theme }) => theme.font.primary};
font-weight: var(--fontWeight-semiBold);
font-size: 14px;
`

Expand Down
4 changes: 2 additions & 2 deletions apps/desktop-wallet/src/modals/SettingsModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ const SettingsModal = memo(({ id, initialTabValue }: ModalBaseProp & SettingsMod
<TabTitleButton
key={tab.value}
role="secondary"
variant="faded"
wide
transparent={!isActive}
onClick={() => setCurrentTab(tab)}
style={{ opacity: !isActive ? 0.5 : 1 }}
wide
>
{tab.label}
</TabTitleButton>
Expand Down
12 changes: 3 additions & 9 deletions apps/desktop-wallet/src/pages/HomePage/UnlockPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import Input from '@/components/Inputs/Input'
import Select from '@/components/Inputs/Select'
import WalletPassphrase from '@/components/Inputs/WalletPassphrase'
import { FloatingPanel, Section } from '@/components/PageComponents/PageContainers'
import Paragraph from '@/components/Paragraph'
import ConnectWithLedgerButton from '@/features/ledger/ConnectWithLedgerButton'
import { useWalletConnectContext } from '@/features/walletConnect/walletConnectContext'
import { useAppSelector } from '@/hooks/redux'
Expand Down Expand Up @@ -150,11 +149,6 @@ const WalletPassphraseStyled = styled(WalletPassphrase)`
right: 20px;
`

const ParagraphStyled = styled(Paragraph)`
font-weight: var(--fontWeight-semiBold);
font-size: 16px;
`

const BrandContainer = styled.div`
display: flex;
gap: 14px;
Expand All @@ -166,9 +160,9 @@ const AlephiumLogoContainer = styled.div`
display: flex;
align-items: center;
justify-content: center;
padding: 30px;
width: 90px;
height: 90px;
padding: 34px;
width: 100px;
height: 100px;
border-radius: 100px;
background-color: ${({ theme }) => theme.bg.contrast};
`
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const AdvancedOperationsButton = () => {
const openAdvancedOperationsSideModal = () => dispatch(openModal({ name: 'AdvancedOperationsSideModal' }))

return (
<Button role="secondary" Icon={Wrench} onClick={openAdvancedOperationsSideModal}>
<Button role="secondary" Icon={Wrench} onClick={openAdvancedOperationsSideModal} short>
{t('Advanced operations')}
</Button>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const TabContent: FC<TabContentProps> = ({
/>
{HeaderMiddleComponent}
<ButtonContainer {...fadeInOut}>
<HeaderButton wide onClick={onButtonClick}>
<HeaderButton wide onClick={onButtonClick} short>
{buttonText}
</HeaderButton>
</ButtonContainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const UnlockedWalletPanel = styled.div<{
padding-right: 40px;
${({ top, doubleTop }) => css`
padding-top: ${top ? 20 : doubleTop ? 40 : 0}px;
padding-top: ${top ? 10 : doubleTop ? 20 : 0}px;
`}
${({ bottom }) =>
Expand Down Expand Up @@ -126,16 +126,22 @@ const BrandContainer = styled.div`
display: flex;
gap: 14px;
align-items: center;
margin-bottom: var(--spacing-7);
margin-bottom: var(--spacing-6);
margin-left: 8px;
@media (max-width: ${SIDEBAR_EXPAND_THRESHOLD_PX}px) {
margin-left: auto;
margin-right: auto;
}
`

const AlephiumLogoContainer = styled.div`
display: flex;
align-items: center;
justify-content: center;
padding: 12px;
width: 36px;
height: 36px;
padding: 10px;
width: 32px;
height: 32px;
border-radius: 100px;
background-color: ${({ theme }) => theme.bg.contrast};
`
Expand Down
5 changes: 3 additions & 2 deletions apps/desktop-wallet/src/style/globalStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { createGlobalStyle } from 'styled-components'

import resets from '@/style/resets'

export const appHeaderHeightPx = 72
export const appHeaderHeightPx = 50
export const walletSidebarWidthPx = 76
export const messagesLeftMarginPx = 70

Expand Down Expand Up @@ -54,7 +54,7 @@ export const GlobalStyle = createGlobalStyle`
--radius-full: 100%;
--fontWeight-normal: 400;
--fontWeight-medium: 500;
--fontWeight-medium: 550;
--fontWeight-semiBold: 600;
--fontWeight-bold: 700;
Expand All @@ -70,6 +70,7 @@ export const GlobalStyle = createGlobalStyle`
body {
color: ${({ theme }) => theme.font.primary};
background-color: ${({ theme }) => theme.bg.primary};
font-weight: var(--fontWeight-medium);
}
.skeleton-loader {
Expand Down

0 comments on commit a97fab9

Please sign in to comment.