From febeddcf297763967eda43b5510b41d04aff4c5a Mon Sep 17 00:00:00 2001 From: KateYatsiuk Date: Fri, 22 Sep 2023 16:03:58 +0300 Subject: [PATCH 1/4] Fixed ol ul --- .../components/modals/Sources/SourcesModal.styles.scss | 9 +++++++-- src/features/AdditionalPages/NewsPage/News.styles.scss | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/app/common/components/modals/Sources/SourcesModal.styles.scss b/src/app/common/components/modals/Sources/SourcesModal.styles.scss index f5baaa21b..c4788befb 100644 --- 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 index 1933a30e7..f0ed37817 100644 --- 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; } From dd2d1da5eae2e5ad82ebc714db31000149ad9969 Mon Sep 17 00:00:00 2001 From: KateYatsiuk Date: Mon, 25 Sep 2023 13:40:27 +0300 Subject: [PATCH 2/4] Styles fix --- .../NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss b/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss index 17a897204..d736f78f4 100644 --- a/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss +++ b/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss @@ -82,9 +82,10 @@ .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); @@ -123,6 +124,7 @@ font-style: bold; line-height: f.pxToRem(26.4px); -webkit-line-clamp: 1; + width: f.pxToRem(310px); } } @@ -168,6 +170,7 @@ @media (max-width: 767px) { -webkit-line-clamp: 11; + width: f.pxToRem(320px); } } } From 66a3c7e7c8872ad361242613e5ba289d6323a9cc Mon Sep 17 00:00:00 2001 From: Vitalii <98163405+MementoMorj@users.noreply.github.com> Date: Tue, 26 Sep 2023 02:16:12 +0300 Subject: [PATCH 3/4] fix-for-tablet --- .../NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss b/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss index d736f78f4..4f8d1a0f1 100644 --- 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) { @@ -92,6 +93,7 @@ @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) { @@ -147,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{ @@ -165,7 +166,7 @@ line-height: 18px; @media (min-width: 768px) and (max-width: 1024px) { -webkit-line-clamp: 2; - width: 93vw; + width: 96vw; } @media (max-width: 767px) { From f3a000ec24d7f0900ca91cee7883e983d31af635 Mon Sep 17 00:00:00 2001 From: Vitalii <98163405+MementoMorj@users.noreply.github.com> Date: Tue, 26 Sep 2023 02:19:52 +0300 Subject: [PATCH 4/4] 1 --- .../NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss b/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss index 4f8d1a0f1..68494413b 100644 --- a/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss +++ b/src/features/MainPage/NewsSlider/NewsSliderItem/NewsSliderItem.styles.scss @@ -166,7 +166,7 @@ line-height: 18px; @media (min-width: 768px) and (max-width: 1024px) { -webkit-line-clamp: 2; - width: 96vw; + width: 93vw; } @media (max-width: 767px) {