From c91cae925e0f9a6519cd10ef180bd85a933b0dae Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 24 May 2021 16:43:30 +0500 Subject: [PATCH 1/8] 1234 --- .../css/components/2-layout/newsCard.scss | 153 +++++++++--------- .../assets/css/components/3-page/home.scss | 6 + themes/modern2/assets/css/main.css | 7 + 3 files changed, 91 insertions(+), 75 deletions(-) diff --git a/themes/modern2/assets/css/components/2-layout/newsCard.scss b/themes/modern2/assets/css/components/2-layout/newsCard.scss index 492c78e33..19547b71c 100755 --- a/themes/modern2/assets/css/components/2-layout/newsCard.scss +++ b/themes/modern2/assets/css/components/2-layout/newsCard.scss @@ -1,81 +1,84 @@ .card { - position: relative; - padding: 30px; - background: $text-color-white; - &__header { - display: flex; - align-items: center; - justify-content: space-between; position: relative; - &-category { - padding: 5px 10px; - background: $main-color; - font-size: $h5-size; - line-height: $h5-height; - color: $text-color-white; - font-weight: 700; - max-width: 115px; - text-align: center; - margin-bottom: 10px; - } - &-view { - display: flex; - align-items: center; - color: $text-color-grey; - font-weight: 400; - font-size: $h5-size; - line-height: $h5-height - 5px; - svg { - margin-right: 5px; - stroke: $text-color-grey; - width: 21px; - height: 14px; - } - } - &-date { - display: flex; - align-items: center; - font-size: $h5-size; - line-height: $h5-height; - color: $text-color-grey; - font-weight: 400; - svg { - margin: 0 5px; - width: 4px; - height: 4px; - } - } - } - &__link { - color: $text-black; - font-weight: 700; - font-size: $h4-size; - line-height: $h4-height; - margin: 10px 0 0 0; - display: block; - } - &__box { - padding: 30px 0; - - &:last-child { - border-top: 1px solid $text-color-grey; - padding: 30px 0 0 0; - } - &:nth-child(2) { - padding: 0 0 30px 0; - } - } - &.other { padding: 30px; - .card__header { - &-category { - background: $text-light-black; - color: $text-color-white; - } + background: $text-color-white; + &__header { + display: flex; + align-items: center; + justify-content: space-between; + position: relative; + &-category { + padding: 5px 10px; + background: $main-color; + font-size: $h5-size; + line-height: $h5-height; + color: $text-color-white; + font-weight: 700; + max-width: 115px; + text-align: center; + margin-bottom: 10px; + } + &-view { + display: flex; + align-items: center; + color: $text-color-grey; + font-weight: 400; + font-size: $h5-size; + line-height: $h5-height - 5px; + svg { + margin-right: 5px; + stroke: $text-color-grey; + width: 21px; + height: 14px; + } + } + &-date { + display: flex; + align-items: center; + font-size: $h5-size; + line-height: $h5-height; + color: $text-color-grey; + font-weight: 400; + svg { + margin: 0 5px; + width: 4px; + height: 4px; + } + } } - border-bottom: 1px solid #e6e6e6; - &:last-child { - border-bottom: none; + &__link { + color: $text-black; + font-weight: 700; + font-size: $h4-size; + line-height: $h4-height; + margin: 10px 0 0 0; + display: block; + height: 75px; + overflow: hidden; + text-overflow: ellipsis; + } + &__box { + padding: 30px 0; + + &:last-child { + border-top: 1px solid $text-color-grey; + padding: 30px 0 0 0; + } + &:nth-child(2) { + padding: 0 0 30px 0; + } + } + &.other { + padding: 30px; + .card__header { + &-category { + background: $text-light-black; + color: $text-color-white; + } + } + border-bottom: 1px solid #e6e6e6; + &:last-child { + border-bottom: none; + } } - } } diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index 4663202af..7510d888a 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -214,6 +214,12 @@ margin-bottom: 80px; color: $text-light-black; } + .card { + &__link { + height: unset; + text-overflow: unset; + } + } a.progressive { position: relative; display: block; diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 35329a38b..0078570b7 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -634,6 +634,9 @@ li { line-height: 25px; margin: 10px 0 0 0; display: block; + height: 75px; + overflow: hidden; + text-overflow: ellipsis; } .card__box { padding: 30px 0; @@ -1398,6 +1401,10 @@ li { margin-bottom: 80px; color: #242424; } +.main__sidebar .card__link { + height: unset; + text-overflow: unset; +} .main__sidebar a.progressive { position: relative; display: block; From 4f3d64c1fbf680fb94b5e366619db39e297b1b65 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 24 May 2021 16:45:35 +0500 Subject: [PATCH 2/8] 123 --- themes/modern2/assets/css/components/3-page/home.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index 7510d888a..612f789b4 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -219,7 +219,7 @@ height: unset; text-overflow: unset; } - } + } a.progressive { position: relative; display: block; From 8a71bf0bcade17f682f2048d7c257075e785559c Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 24 May 2021 16:49:21 +0500 Subject: [PATCH 3/8] 123 --- themes/modern2/assets/css/components/3-page/home.scss | 3 +++ themes/modern2/assets/css/components/3-page/news.scss | 4 ++++ themes/modern2/assets/css/main.css | 7 +++++++ 3 files changed, 14 insertions(+) diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index 612f789b4..85029329d 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -215,6 +215,9 @@ color: $text-light-black; } .card { + &.other { + padding: 0 0 30px 0; + } &__link { height: unset; text-overflow: unset; diff --git a/themes/modern2/assets/css/components/3-page/news.scss b/themes/modern2/assets/css/components/3-page/news.scss index 3db81f41f..534eef1ce 100755 --- a/themes/modern2/assets/css/components/3-page/news.scss +++ b/themes/modern2/assets/css/components/3-page/news.scss @@ -18,6 +18,10 @@ .card { padding: 30px 0; border-bottom: 1px solid #dcdcdc; + &__link { + height: unset; + text-overflow: unset; + } } } &__content { diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 0078570b7..aa91e5399 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -1401,6 +1401,9 @@ li { margin-bottom: 80px; color: #242424; } +.main__sidebar .card.other { + padding: 0 0 30px 0; +} .main__sidebar .card__link { height: unset; text-overflow: unset; @@ -1858,6 +1861,10 @@ li { padding: 30px 0; border-bottom: 1px solid #dcdcdc; } +.news__sidebar .card__link { + height: unset; + text-overflow: unset; +} .news__content { width: calc(70% - 25px); margin-right: 25px; From 524a1aede8a1d00b1c798c5b3522f1382844a3a2 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 24 May 2021 16:54:31 +0500 Subject: [PATCH 4/8] 123 --- themes/modern2/assets/css/components/3-page/home.scss | 1 + themes/modern2/assets/css/main.css | 3 +++ 2 files changed, 4 insertions(+) diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index 85029329d..8414b8a7a 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -88,6 +88,7 @@ } // banner end .advertisiment__item { + display: block; img { width: 100%; } diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index aa91e5399..2d7f188e1 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -1269,6 +1269,9 @@ li { width: 100%; } +.advertisiment__item { + display: block; +} .advertisiment__item img { width: 100%; } From c3850c58bbfd8fda8233e4cd9ecc3901990716c4 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 24 May 2021 16:56:46 +0500 Subject: [PATCH 5/8] 123 --- themes/modern2/pages/index.htm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/modern2/pages/index.htm b/themes/modern2/pages/index.htm index 03d927196..b024ff930 100644 --- a/themes/modern2/pages/index.htm +++ b/themes/modern2/pages/index.htm @@ -116,11 +116,11 @@ random = 0
{% partial 'sidebar__cards' %} - {% component 'right_top' css_class= 'main__sidebar-adv' %} + {% partial 'tags' %} - {% component 'right_middle' css_class = 'main__sidebar-adv' %} + {% partial 'calendar' %} - {% component 'right_bottom' css_class= 'main__sidebar-adv' %} +
From 625686a85bbfa0f6b39bed18ed15c69e634743f6 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 24 May 2021 17:00:00 +0500 Subject: [PATCH 6/8] 123 --- themes/modern2/assets/css/components/3-page/home.scss | 4 +--- themes/modern2/assets/css/main.css | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index 8414b8a7a..d2fbd839a 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -267,9 +267,7 @@ } } // main end -.banner__mobile { - display: none ; -} + // event start .event { margin: 80px 0; diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 2d7f188e1..41a92a4f6 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -1452,10 +1452,6 @@ li { margin: 5px; } -.banner__mobile { - display: none; -} - .event { margin: 80px 0; } From aeac8571ce4aad0c5c89099ab9025d5d3f7b8e78 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 24 May 2021 17:06:07 +0500 Subject: [PATCH 7/8] 1234 --- .../tps/reklama/components/advertisement/slider.htm | 8 -------- .../assets/css/components/2-layout/responsive.scss | 10 +++++----- themes/modern2/assets/css/main.css | 10 +++++----- themes/modern2/pages/index.htm | 6 +++--- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/plugins/tps/reklama/components/advertisement/slider.htm b/plugins/tps/reklama/components/advertisement/slider.htm index e3387737a..fd5259134 100644 --- a/plugins/tps/reklama/components/advertisement/slider.htm +++ b/plugins/tps/reklama/components/advertisement/slider.htm @@ -35,14 +35,6 @@ // Sliding settings $slideshow.on("afterChange", function (event, slick, currentSlide) { - // Console log, can be removed - console.log( - "Current slide: " + - currentSlide + - ". Setting speed to: " + - ImagePauses[currentSlide] - ); - // Update autoplay speed according to slide index $slideshow.slick( "slickSetOption", diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss index aa17ab676..64fc884f5 100755 --- a/themes/modern2/assets/css/components/2-layout/responsive.scss +++ b/themes/modern2/assets/css/components/2-layout/responsive.scss @@ -445,10 +445,13 @@ .main { &__body { &-row { - flex-direction: column; - -ms-flex-direction: column; + display: block; margin: 0; } + .banner__mobile { + display: block; + width: 100%; + } &-column { width: 100%; margin: 15px 0; @@ -568,9 +571,6 @@ } } } - .banner__mobile { - display: block; - } } @include xsm-sm { .swiper-slide-content-category { diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 41a92a4f6..299d0200d 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -2419,9 +2419,13 @@ li { } .main__body-row { - flex-direction: column; + display: block; margin: 0; } + .main__body .banner__mobile { + display: block; + width: 100%; + } .main__body-column { width: 100%; margin: 15px 0; @@ -2524,10 +2528,6 @@ li { width: 100%; padding: 8px 0; } - - .banner__mobile { - display: block; - } } @media (max-width: 540px) { .swiper-slide-content-category { diff --git a/themes/modern2/pages/index.htm b/themes/modern2/pages/index.htm index b024ff930..03d927196 100644 --- a/themes/modern2/pages/index.htm +++ b/themes/modern2/pages/index.htm @@ -116,11 +116,11 @@ random = 0
{% partial 'sidebar__cards' %} - + {% component 'right_top' css_class= 'main__sidebar-adv' %} {% partial 'tags' %} - + {% component 'right_middle' css_class = 'main__sidebar-adv' %} {% partial 'calendar' %} - + {% component 'right_bottom' css_class= 'main__sidebar-adv' %}
From 320c45c66d18d990a70d9a0f1418e06fdea04093 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 24 May 2021 17:08:20 +0500 Subject: [PATCH 8/8] 123 --- themes/modern2/assets/css/components/3-page/home.scss | 6 ++++-- themes/modern2/assets/css/main.css | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index d2fbd839a..1687464d3 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -223,7 +223,7 @@ height: unset; text-overflow: unset; } - } + } a.progressive { position: relative; display: block; @@ -267,7 +267,9 @@ } } // main end - +.banner__mobile { + display: none; +} // event start .event { margin: 80px 0; diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 299d0200d..f23d5b228 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -1452,6 +1452,10 @@ li { margin: 5px; } +.banner__mobile { + display: none; +} + .event { margin: 80px 0; }