Merge pull request #64 from tonkeeper/feature/pro-dashboard

fix: desktop modal border radius
tonkeeper · Apr 1, 2024 · 0a8bfd1 · 0a8bfd1
2 parents 340aaeb + 51b63d2
commit 0a8bfd1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/packages/uikit/src/components/Notification.tsx b/packages/uikit/src/components/Notification.tsx
@@ -178,8 +178,10 @@ const Content = styled.div<{ standalone: boolean }>`
     ${p =>
         p.theme.displayType === 'full-width' &&
         css`
-            border-bottom-right-radius: ${p.theme.cornerMedium};
-            border-bottom-left-radius: ${p.theme.cornerMedium};
+            border-top-right-radius: ${props => props.theme.cornerSmall};
+            border-top-left-radius: ${props => props.theme.cornerSmall};
+            border-bottom-right-radius: ${p.theme.cornerSmall};
+            border-bottom-left-radius: ${p.theme.cornerSmall};
             max-height: calc(100% - 32px);
             overflow: auto;
             padding-top: 0;

diff --git a/packages/uikit/src/desktop-pages/purchases/DesktopPurchases.tsx b/packages/uikit/src/desktop-pages/purchases/DesktopPurchases.tsx
@@ -89,7 +89,7 @@ export const DesktopPurchases = () => {
     return (
         <DesktopViewPageLayout ref={scrollRef}>
             <DesktopViewHeader borderBottom={!closeTop}>
-                {t('page_header_purchases')}
+                <Label2>{t('page_header_purchases')}</Label2>
             </DesktopViewHeader>
             <NFTPageBody>{nfts && <NftsListStyled nfts={nfts} />}</NFTPageBody>
         </DesktopViewPageLayout>

diff --git a/packages/uikit/src/desktop-pages/settings/DesktopWalletSettingsPage.tsx b/packages/uikit/src/desktop-pages/settings/DesktopWalletSettingsPage.tsx
@@ -55,7 +55,9 @@ export const DesktopWalletSettingsPage = () => {
 
     return (
         <DesktopViewPageLayout>
-            <DesktopViewHeader borderBottom>{t('settings_title')}</DesktopViewHeader>
+            <DesktopViewHeader borderBottom>
+                <Label2>{t('settings_title')}</Label2>
+            </DesktopViewHeader>
             <SettingsListBlock>
                 <SettingsListItem onClick={onRenameOpen}>
                     <WalletEmoji containerSize="16px" emojiSize="16px" emoji={wallet.emoji} />

diff --git a/packages/uikit/src/styles/proTheme.ts b/packages/uikit/src/styles/proTheme.ts
@@ -12,9 +12,9 @@ export const proTheme: DefaultTheme = {
     backgroundContent: '#17171A',
     backgroundContentTint: '#222224',
     backgroundContentAttention: '#2F2F33',
-    backgroundOverlayStrong: 'rgb(15 15 15 / 72%)',
-    backgroundOverlayLight: 'rgb(15 15 15 / 48%)',
-    backgroundOverlayExtraLight: 'rgb(15 15 15 / 24%)',
+    backgroundOverlayStrong: 'rgba(20, 20, 20, 0.72)',
+    backgroundOverlayLight: 'rgba(20, 20, 20, 0.48)',
+    backgroundOverlayExtraLight: 'rgba(20, 20, 20, 0.24)',
     backgroundHighlighted: 'rgb(255 255 255 / 4%)',
 
     iconPrimary: '#EBEBEB',