Merge remote-tracking branch 'site/1.1' into 1.1

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",

themes/modern2/assets/css/components/2-layout/newsCard.scss

@@ -53,6 +53,9 @@
         line-height: $h4-height;
         margin: 10px 0 0 0;
         display: block;
+        height: 75px;
+        overflow: hidden;
+        text-overflow: ellipsis;
     }
     &__box {
         padding: 30px 0;

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 {

themes/modern2/assets/css/components/3-page/home.scss

@@ -88,6 +88,7 @@
 }
 // banner end
 .advertisiment__item {
+    display: block;
     img {
         width: 100%;
     }
@@ -214,6 +215,15 @@
             margin-bottom: 80px;
             color: $text-light-black;
         }
+        .card {
+            &.other {
+                padding: 0 0 30px 0;
+            }
+            &__link {
+                height: unset;
+                text-overflow: unset;
+            }
+        }
         a.progressive {
             position: relative;
             display: block;
@@ -258,7 +268,7 @@
 }
 // main end
 .banner__mobile {
-    display: none ;
+    display: none;
 }
 // event start
 .event {

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 {

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;
@@ -1266,6 +1269,9 @@ li {
   width: 100%;
 }
 
+.advertisiment__item {
+  display: block;
+}
 .advertisiment__item img {
   width: 100%;
 }
@@ -1398,6 +1404,13 @@ li {
   margin-bottom: 80px;
   color: #242424;
 }
+.main__sidebar .card.other {
+  padding: 0 0 30px 0;
+}
+.main__sidebar .card__link {
+  height: unset;
+  text-overflow: unset;
+}
 .main__sidebar a.progressive {
   position: relative;
   display: block;
@@ -1851,6 +1864,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;
@@ -2406,9 +2423,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;
@@ -2511,10 +2532,6 @@ li {
     width: 100%;
     padding: 8px 0;
   }
-
-  .banner__mobile {
-    display: block;
-  }
 }
 @media (max-width: 540px) {
   .swiper-slide-content-category {