Merge pull request #10 from ViktorSvertoka/Dima-DiaryPage1

Fix(Fonts) Error correction
ViktorSvertoka · Sep 15, 2023 · c7aa17d · c7aa17d
2 parents ff53651 + 1358809
commit c7aa17d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/src/components/DashboardItem/DashboardItem.styled.jsx b/src/components/DashboardItem/DashboardItem.styled.jsx
@@ -25,18 +25,15 @@ const Title = styled.h3`
   font-feature-settings:
     'clig' off,
     'liga' off;
-  font-family: Roboto;
+  font-family: 'RobotoBold', sans-serif;
   font-size: 12px;
-  font-style: normal;
-  font-weight: 400;
   line-height: 18px;
 `;
 
 const Value = styled.p`
   color: #efede8;
-  font-family: Roboto;
+  font-family: 'RobotoBold';
   font-size: 24px;
-  font-weight: 700;
   line-height: 32px;
   margin-top: auto;
 `;

diff --git a/src/components/Diary/DayProducts/DayProducts.styled.jsx b/src/components/Diary/DayProducts/DayProducts.styled.jsx
@@ -22,10 +22,8 @@ const WrapperTitleBtn = styled.div`
 
 const Title = styled.h3`
   color: rgba(239, 237, 232, 0.5);
-  font-family: Roboto;
+  font-family: 'RobotoMedium';
   font-size: 14px;
-  font-style: normal;
-  font-weight: 400;
   line-height: 18px;
 `;
 
@@ -37,10 +35,8 @@ const AddBtn = styled.button`
   padding: 0;
   background-color: transparent;
   color: #e6533c;
-  font-family: Roboto;
+  font-family: 'RobotoMedium';
   font-size: 16px;
-  font-style: normal;
-  font-weight: 500;
   line-height: 24px;
 `;
 
@@ -51,10 +47,8 @@ const DefaultText = styled.p`
   transform: translate(-50%, -50%);
 
   color: rgba(239, 237, 232, 0.3);
-  font-family: Roboto;
+  font-family: 'RobotoRegular';
   font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
   line-height: 24px;
 `;
 

diff --git a/src/components/Diary/DaySwitch/DaySwitch.styled.jsx b/src/components/Diary/DaySwitch/DaySwitch.styled.jsx
@@ -12,10 +12,8 @@ const DateLabel = styled.p`
   align-items: center;
   justify-content: center;
   color: #efede8;
-  font-family: Roboto;
+  font-family: 'RobotoBold';
   font-size: 24px;
-  font-style: normal;
-  font-weight: 700;
   line-height: 32px;
 `;
 

diff --git a/src/styles/globalStyles.jsx b/src/styles/globalStyles.jsx
@@ -73,7 +73,7 @@ h6 {
 }
 
 h2{
-    font-family: 'RobotoBold', sans-serif;
+        font-family: 'RobotoBold';
     color: #EFEDE8;
 
 }