From 29e4c0aea870bb44f3605abf151f9973c770b56e Mon Sep 17 00:00:00 2001
From: = <=>
Date: Mon, 24 May 2021 16:18:16 +0500
Subject: [PATCH] 123

---
 .../css/components/2-layout/newsCard.scss     |  3 --
 .../css/components/2-layout/responsive.scss   |  3 ++
 .../assets/css/components/3-page/home.scss    |  3 ++
 .../assets/css/components/3-page/news.scss    |  9 ++++--
 themes/modern2/assets/css/main.css            | 20 +++++++++----
 themes/modern2/pages/post.htm                 | 28 ++++++++++---------
 6 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/themes/modern2/assets/css/components/2-layout/newsCard.scss b/themes/modern2/assets/css/components/2-layout/newsCard.scss
index 961c83192..492c78e33 100755
--- a/themes/modern2/assets/css/components/2-layout/newsCard.scss
+++ b/themes/modern2/assets/css/components/2-layout/newsCard.scss
@@ -53,9 +53,6 @@
     line-height: $h4-height;
     margin: 10px 0 0 0;
     display: block;
-    height: 75px;
-    overflow: hidden;
-    text-overflow: ellipsis;
   }
   &__box {
     padding: 30px 0;
diff --git a/themes/modern2/assets/css/components/2-layout/responsive.scss b/themes/modern2/assets/css/components/2-layout/responsive.scss
index 94f902658..aa17ab676 100755
--- a/themes/modern2/assets/css/components/2-layout/responsive.scss
+++ b/themes/modern2/assets/css/components/2-layout/responsive.scss
@@ -568,6 +568,9 @@
             }
         }
     }
+    .banner__mobile {
+        display: block;
+    }
 }
 @include xsm-sm {
     .swiper-slide-content-category {
diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss
index 71d2da29b..4663202af 100755
--- a/themes/modern2/assets/css/components/3-page/home.scss
+++ b/themes/modern2/assets/css/components/3-page/home.scss
@@ -257,6 +257,9 @@
     }
 }
 // main end
+.banner__mobile {
+    display: none ;
+}
 // event start
 .event {
     margin: 80px 0;
diff --git a/themes/modern2/assets/css/components/3-page/news.scss b/themes/modern2/assets/css/components/3-page/news.scss
index da9d3246d..f98ce44be 100755
--- a/themes/modern2/assets/css/components/3-page/news.scss
+++ b/themes/modern2/assets/css/components/3-page/news.scss
@@ -60,9 +60,9 @@
         p {
             font-size: $p-size;
             line-height: $p-height;
-            margin-bottom: 30px;
+            margin-bottom: 20px;
             img {
-                width: 70%;
+                width: 90%;
                 margin: 30px auto;
                 display: block;
                 height: auto;
@@ -74,7 +74,7 @@
             }
         }
         img {
-            width: 70%;
+            width: 90%;
             margin: 30px auto;
             display: block;
             height: auto;
@@ -90,6 +90,9 @@
             &-link {
                 margin-right: 20px;
                 fill: $main-color;
+                svg {
+                    color: $main-color;
+                }
             }
         }
         &-name {
diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css
index f123d988a..89ae90530 100755
--- a/themes/modern2/assets/css/main.css
+++ b/themes/modern2/assets/css/main.css
@@ -634,9 +634,6 @@ li {
   line-height: 25px;
   margin: 10px 0 0 0;
   display: block;
-  height: 75px;
-  overflow: hidden;
-  text-overflow: ellipsis;
 }
 .card__box {
   padding: 30px 0;
@@ -1442,6 +1439,10 @@ li {
   margin: 5px;
 }
 
+.banner__mobile {
+  display: none;
+}
+
 .event {
   margin: 80px 0;
 }
@@ -1889,10 +1890,10 @@ li {
 .news__body p {
   font-size: 16px;
   line-height: 30px;
-  margin-bottom: 30px;
+  margin-bottom: 20px;
 }
 .news__body p img {
-  width: 70%;
+  width: 90%;
   margin: 30px auto;
   display: block;
   height: auto;
@@ -1901,7 +1902,7 @@ li {
   color: #4285f4;
 }
 .news__body img {
-  width: 70%;
+  width: 90%;
   margin: 30px auto;
   display: block;
   height: auto;
@@ -1919,6 +1920,9 @@ li {
   margin-right: 20px;
   fill: #fd4c24;
 }
+.news__footer-social-link svg {
+  color: #fd4c24;
+}
 .news__footer-name {
   font-size: 22px;
   line-height: 30px;
@@ -2504,6 +2508,10 @@ li {
     width: 100%;
     padding: 8px 0;
   }
+
+  .banner__mobile {
+    display: block;
+  }
 }
 @media (max-width: 540px) {
   .swiper-slide-content-category {
diff --git a/themes/modern2/pages/post.htm b/themes/modern2/pages/post.htm
index c76349329..a2abf2384 100644
--- a/themes/modern2/pages/post.htm
+++ b/themes/modern2/pages/post.htm
@@ -55,15 +55,17 @@ post = "post"
     </header>
     <div class="news__body">
         {{post.content|md}}
-        {% if post.author %}
-        <p style="text-align: right"><em><strong>{{post.author}}</strong></em></p>
-        {% endif %}
+
     </div>
     <div class="news__footer">
         <div class="news__footer-social">
             {% partial 'social' %}
         </div>
-
+        <div class="news__footer-name">
+            {% if post.author %}
+            <p style="text-align: right"><em><strong>{{post.author}}</strong></em></p>
+            {% endif %}
+        </div>
     </div>
 </article>
 <div class="news__sidebar">
@@ -78,20 +80,20 @@ post = "post"
     })
     var re = /\[video poster=\"(.+?)\".+?mp4=\"(.+?)\"/g;
     //  re = /(\S+)=["']?((?:.(?!["']?\s+(?:\S+)=|\s*\/?[>"']))+.)["']?/g
-    var ptags  = document.querySelectorAll('p');
+    var ptags = document.querySelectorAll('p');
 
-    ptags.forEach(s =>{
+    ptags.forEach(s => {
 
         var m;
         m = re.exec(s.innerText);
         if (m) {
-            var video =document.createElement('video');
-            video.setAttribute('src',m[2]);
-            video.setAttribute('controls',"")
-            video.setAttribute('width',"100%")
-            video.setAttribute('type',"video/mp4")
-            video.setAttribute('poster',m[1])
-            s.parentNode.replaceChild(video,s);
+            var video = document.createElement('video');
+            video.setAttribute('src', m[2]);
+            video.setAttribute('controls', "")
+            video.setAttribute('width', "100%")
+            video.setAttribute('type', "video/mp4")
+            video.setAttribute('poster', m[1])
+            s.parentNode.replaceChild(video, s);
 
         }
     });