fix: отступы в карточках и SText (#25)

habralab · Oct 9, 2023 · 9333117 · 9333117
1 parent bf27d77
commit 9333117
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/src/entities/profile/AboutMe/AboutMe.tsx b/src/entities/profile/AboutMe/AboutMe.tsx
@@ -12,8 +12,8 @@ export function AboutMe() {
       right="0"
       bg="white"
       borderRadius="2xl"
-      p={4}
-      gap={4}
+      p={5}
+      gap={6}
     >
       <Flex direction="column" gap={2}>
         <SText variant="h2">Обо мне</SText>

diff --git a/src/entities/profile/Reviews/Reviews.tsx b/src/entities/profile/Reviews/Reviews.tsx
@@ -11,7 +11,7 @@ export function Reviews(props: ReviewType) {
   const { rating } = props;
 
   return (
-    <VStack align="stretch" spacing={0} p={4} mb={4} borderRadius="2xl" bg="white">
+    <VStack align="stretch" spacing={0} p={5} mb={4} borderRadius="2xl" bg="white">
       <Flex align="center" justifyContent="space-between">
         <SText variant="caption">3 сентября 2022</SText>
         {rating}

diff --git a/src/shared/config/theme/theme.ts b/src/shared/config/theme/theme.ts
@@ -6,12 +6,12 @@ import {
   createMultiStyleConfigHelpers,
 } from '@chakra-ui/react';
 
-import '@fontsource/raleway/600.css';
-import '@fontsource/raleway/700.css';
-import '@fontsource/inter/400.css';
-import '@fontsource/inter/500.css';
-import '@fontsource/inter/600.css';
-import '@fontsource/inter/700.css';
+import '@fontsource/raleway/cyrillic-600.css';
+import '@fontsource/raleway/cyrillic-700.css';
+import '@fontsource/inter/cyrillic-400.css';
+import '@fontsource/inter/cyrillic-500.css';
+import '@fontsource/inter/cyrillic-600.css';
+import '@fontsource/inter/cyrillic-700.css';
 
 /**
  * Можно посмотреть исходники и понять, что можно переопределить

diff --git a/src/shared/ui/SText/SText.tsx b/src/shared/ui/SText/SText.tsx
@@ -1,7 +1,7 @@
 import { Heading, Text, TextProps } from '@chakra-ui/react';
 
 type Heading = 'h1' | 'h2' | 'h3';
-type Variants = 'h1' | 'h2' | 'h3' | 'h4' | 'caption';
+type Variants = 'h1' | 'h2' | 'h3' | 'caption';
 
 type STextProps = {
   children: string;
@@ -26,13 +26,9 @@ function getStyles(variant?: Variants) {
       styles.fontSize = 'sm';
       styles.fontWeight = 'medium';
       break;
-    case 'h4':
-      styles.fontSize = 'xs';
-      styles.fontWeight = 'medium';
-      break;
     case 'caption':
       styles.fontSize = 'xs';
-      styles.color = 'gray.600';
+      styles.color = 'gray.700';
       break;
   }
   return styles;