Merge pull request #829 from ita-social-projects/develop

Develop
ita-social-projects · Sep 25, 2023 · 00bca7b · 00bca7b
2 parents 987d62c + d60dadf
commit 00bca7b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/src/app/common/components/modals/Sources/SourcesModal.styles.scss b/src/app/common/components/modals/Sources/SourcesModal.styles.scss
@@ -66,8 +66,13 @@ $CancelBtn: "/src/assets/images/utils/Cancel_btn.svg";
     font-weight: 300;
     font-size: 15px;
 
-    ul, ol {
-      list-style: auto;
+    ul {
+      list-style-type: disc;
+      padding-inline-start: revert;
+    }
+
+    ol {
+      list-style-type: decimal;
       padding-inline-start: revert;
     }
 

diff --git a/src/features/AdditionalPages/NewsPage/News.styles.scss b/src/features/AdditionalPages/NewsPage/News.styles.scss
@@ -32,8 +32,13 @@
     .newsWithImageWrapper {
         overflow: auto;
 
-        ul, ol {
-            list-style: auto;
+        ul {
+            list-style-type: disc;
+            padding-inline-start: revert;
+          }
+
+          ol {
+            list-style-type: decimal;
             padding-inline-start: revert;
           }
 

diff --git a/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss b/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss
@@ -44,6 +44,7 @@
 
         @media (min-width: 768px) and (max-width: 1024px){
             top: 320px;
+            width: 96vw;
         }
 
         @media (min-width: 360px) and (max-width: 767px) {
@@ -82,15 +83,17 @@
 
     .newsContainer {
         box-sizing: border-box;
-        width: 100%;
         word-break: break-word;
         height: 193px;
+        width: f.pxToRem(840px);
+
         @include mut.flexed(column, start, space-between, nowrap);
         @include mut.rem-padded($top: 25px, $right: 30px, $bottom: 25px, $left: 30px);
 
         @media (min-width: 768px) and (max-width: 1024px){
             @include mut.rem-padded($top: 20px, $right: 40px, $bottom: 15px, $left: 20px);
             height: 141px;
+            width: 96vw;
         }
 
         @media (min-width: 360px) and (max-width: 767px) {
@@ -123,6 +126,7 @@
             font-style: bold;
             line-height: f.pxToRem(26.4px);
             -webkit-line-clamp: 1;
+            width: f.pxToRem(310px);
         }
     }
 
@@ -145,9 +149,8 @@
                 text-decoration: underline;
             }
         }
-
-        @media (min-width: 768px) and (max-width: 1024px){
-            width: 93vw;
+        @media (min-width: 768px) and (max-width: 1024px) {
+            width: 96vw;
         }
     }
     .text{
@@ -168,6 +171,7 @@
 
         @media (max-width: 767px) {
             -webkit-line-clamp: 11;
+            width: f.pxToRem(320px);
         }
     }
 }