From 2bbae4cf6899f2620ce5764a7b91b79eaee4b424 Mon Sep 17 00:00:00 2001
From: danpros <dan@danpros.com>
Date: Fri, 23 Feb 2024 13:17:10 +0700
Subject: [PATCH] Fix styling

---
 themes/blog/css/styles.css            |  7 +++++++
 themes/clean/css/style.css            |  7 +++++++
 themes/doks/css/style.css             | 18 ++++++++++++++++--
 themes/doks/main.html.php             | 16 +++++++++-------
 themes/doks/post.html.php             |  2 +-
 themes/doks/profile.html.php          | 16 +++++++++-------
 themes/logs/css/style.css             |  7 +++++++
 themes/readable/css/style.css         |  7 +++++++
 themes/twentyfifteen/css/style.css    |  7 +++++++
 themes/twentyfifteen/css/style_v2.css |  7 +++++++
 themes/twentysixteen/css/style.css    |  7 +++++++
 11 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/themes/blog/css/styles.css b/themes/blog/css/styles.css
index 5429919..b671b9c 100644
--- a/themes/blog/css/styles.css
+++ b/themes/blog/css/styles.css
@@ -629,3 +629,10 @@ ul.month {
   margin:0 0 0 10px;
   float:right;	
 }
+
+#more {
+	display:block;
+	height:2rem;
+	margin-top:-2rem;
+	content:""
+}
\ No newline at end of file
diff --git a/themes/clean/css/style.css b/themes/clean/css/style.css
index 2e8ef50..b2c84ff 100644
--- a/themes/clean/css/style.css
+++ b/themes/clean/css/style.css
@@ -950,3 +950,10 @@ ul.archivegroup {
     list-style: none;
     background:none;
 }   
+
+#more {
+	display:block;
+	height:2rem;
+	margin-top:-2rem;
+	content:""
+}
\ No newline at end of file
diff --git a/themes/doks/css/style.css b/themes/doks/css/style.css
index fda6a10..a7d4d24 100644
--- a/themes/doks/css/style.css
+++ b/themes/doks/css/style.css
@@ -3178,6 +3178,12 @@ table {
   margin-top:-6rem;
   content:""
 }
+#more {
+  display:block;
+  height:6rem;
+  margin-top:-6rem;
+  content:""
+}
 .anchor {
   visibility:hidden;
   padding-left:0.5rem
@@ -3217,12 +3223,11 @@ p.meta {
 .blog.list .card {
   margin-top:2rem;
   margin-bottom:2rem;
-  transition:transform 0.3s
 }
 .home .card:hover,
 .contributors.list .card:hover,
 .blog.list .card:hover {
-  transform:scale(1.025)
+
 }
 .home .card-body,
 .contributors.list .card-body,
@@ -3533,3 +3538,12 @@ body.dark .docs-bar .menu-icon .navicon::before, body.dark .docs-bar .menu-icon
 .float-right {
   float:right;
 }
+
+.jump-link a {
+  border: 1px solid #e9ecef;
+}
+
+.dark .jump-link a {
+  color: #8ed6fb;
+  border: 1px solid #1b1f22;
+}
\ No newline at end of file
diff --git a/themes/doks/main.html.php b/themes/doks/main.html.php
index ca299d8..a6442d0 100644
--- a/themes/doks/main.html.php
+++ b/themes/doks/main.html.php
@@ -69,9 +69,9 @@
         <div class="card">
 
             <?php if (!empty($post->image)) {?>
-                <img src="<?php echo $post->image;?>" width="100%">
-            <?php } elseif (!empty($img)) {?>
-                <img src="<?php echo $img;?>" width="100%">
+                <a href="<?php echo $post->url;?>"><img alt="<?php echo $post->title;?>" src="<?php echo $post->image;?>" width="100%"></a>
+            <?php } elseif (!empty($img) && config('teaser.type') === 'trimmed') {?>
+                <a href="<?php echo $post->url;?>"><img alt="<?php echo $post->title;?>" src="<?php echo $img;?>" width="100%"></a>
             <?php } ?>
             
             <?php if(!empty($post->video)):?>
@@ -90,17 +90,18 @@
             <div class="card-body">
 
                 <?php if(!empty($post->link)) { ?>
-                    <h2 class="h3">
-                        <a class="stretched-link text-body" href="<?php echo $post->link;?>" target="_blank"><?php echo $post->title;?> 
+                    <h2>
+                        <a class="text-body" href="<?php echo $post->link;?>" target="_blank"><?php echo $post->title;?> 
                             <svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" fill="currentColor" class="bi bi-link-45deg" viewBox="0 0 16 16"><path d="M4.715 6.542 3.343 7.914a3 3 0 1 0 4.243 4.243l1.828-1.829A3 3 0 0 0 8.586 5.5L8 6.086a1 1 0 0 0-.154.199 2 2 0 0 1 .861 3.337L6.88 11.45a2 2 0 1 1-2.83-2.83l.793-.792a4 4 0 0 1-.128-1.287z"/><path d="M6.586 4.672A3 3 0 0 0 7.414 9.5l.775-.776a2 2 0 0 1-.896-3.346L9.12 3.55a2 2 0 1 1 2.83 2.83l-.793.792c.112.42.155.855.128 1.287l1.372-1.372a3 3 0 1 0-4.243-4.243z"/></svg>
                         </a>
                     </h2>
                 <?php } else {?>
-                    <h2 class="h3"><a class="stretched-link text-body" href="<?php echo $post->url;?>"><?php echo $post->title;?></a></h2>
+                    <h2><a class="text-body" href="<?php echo $post->url;?>"><?php echo $post->title;?></a></h2>
                 <?php } ?>
 
                 <div class="content-body">
-                    <?php echo $post->description;?>
+                    <?php echo get_teaser($post->body, $post->url); ?>
+                    <?php if (config('teaser.type') === 'trimmed'):?><a class="more-link" href="<?php echo $post->url; ?>"><?php echo config('read.more'); ?></a><?php endif;?>
                 </div>
 
                 <p>
@@ -115,6 +116,7 @@
                             <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-clock" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentcolor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M3 12a9 9 0 1018 0A9 9 0 003 12"></path><path d="M12 7v5l3 3"></path></svg> 
                             <?php echo $post->readTime;?> min
                         </strong>
+                        <?php if (login()) { echo ' <span class="mx-2">—</span> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentcolor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit-2"><path d="M17 3a2.828 2.828.0 114 4L7.5 20.5 2 22l1.5-5.5L17 3z"></path></svg> <span class="edit-post"><a href="'. $post->url .'/edit?destination=post">' . i18n('Edit') . '</a></span>'; } ?>
                     </small>
                 </p>
 
diff --git a/themes/doks/post.html.php b/themes/doks/post.html.php
index 60a9054..5534970 100644
--- a/themes/doks/post.html.php
+++ b/themes/doks/post.html.php
@@ -31,7 +31,7 @@
     <div class="content-media">
 
         <?php if(!empty($post->image)):?>
-            <img src="<?php echo $post->image;?>"/>
+            <img alt="<?php echo $post->title;?>" src="<?php echo $post->image;?>"/>
         <?php endif;?>
         <?php if(!empty($post->video)):?>
             <iframe width="100%" height="315px" class="embed-responsive-item" src="https://www.youtube.com/embed/<?php echo get_video_id($post->video); ?>" frameborder="0" allowfullscreen></iframe>
diff --git a/themes/doks/profile.html.php b/themes/doks/profile.html.php
index 173bf7a..d6ddf28 100644
--- a/themes/doks/profile.html.php
+++ b/themes/doks/profile.html.php
@@ -16,9 +16,9 @@
                 <div class="card">
 
                     <?php if (!empty($post->image)) {?>
-                        <img src="<?php echo $post->image;?>" width="100%">
-                    <?php } elseif (!empty($img)) {?>
-                        <img src="<?php echo $img;?>" width="100%">
+                        <a href="<?php echo $post->url;?>"><img alt="<?php echo $post->title;?>" src="<?php echo $post->image;?>" width="100%"></a>
+                    <?php } elseif (!empty($img) && config('teaser.type') === 'trimmed') {?>
+                        <a href="<?php echo $post->url;?>"><img alt="<?php echo $post->title;?>" src="<?php echo $img;?>" width="100%"></a>
                     <?php } ?>
                     
                     <?php if(!empty($post->video)):?>
@@ -37,17 +37,18 @@
                     <div class="card-body">
 
                         <?php if(!empty($post->link)) { ?>
-                            <h2 class="h3">
-                                <a class="stretched-link text-body" href="<?php echo $post->link;?>" target="_blank"><?php echo $post->title;?> 
+                            <h2>
+                                <a class="text-body" href="<?php echo $post->link;?>" target="_blank"><?php echo $post->title;?> 
                                     <svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" fill="currentColor" class="bi bi-link-45deg" viewBox="0 0 16 16"><path d="M4.715 6.542 3.343 7.914a3 3 0 1 0 4.243 4.243l1.828-1.829A3 3 0 0 0 8.586 5.5L8 6.086a1 1 0 0 0-.154.199 2 2 0 0 1 .861 3.337L6.88 11.45a2 2 0 1 1-2.83-2.83l.793-.792a4 4 0 0 1-.128-1.287z"/><path d="M6.586 4.672A3 3 0 0 0 7.414 9.5l.775-.776a2 2 0 0 1-.896-3.346L9.12 3.55a2 2 0 1 1 2.83 2.83l-.793.792c.112.42.155.855.128 1.287l1.372-1.372a3 3 0 1 0-4.243-4.243z"/></svg>
                                 </a>
                             </h2>
                         <?php } else {?>
-                            <h2 class="h3"><a class="stretched-link text-body" href="<?php echo $post->url;?>"><?php echo $post->title;?></a></h2>
+                            <h2><a class="text-body" href="<?php echo $post->url;?>"><?php echo $post->title;?></a></h2>
                         <?php } ?>
 
                         <div class="content-body">
-                            <?php echo $post->description;?>
+                            <?php echo get_teaser($post->body, $post->url); ?>
+                            <?php if (config('teaser.type') === 'trimmed'):?><a class="more-link" href="<?php echo $post->url; ?>"><?php echo config('read.more'); ?></a><?php endif;?>
                         </div>
 
                         <p>
@@ -62,6 +63,7 @@
                                     <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-clock" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentcolor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M3 12a9 9 0 1018 0A9 9 0 003 12"></path><path d="M12 7v5l3 3"></path></svg> 
                                     <?php echo $post->readTime;?> min
                                 </strong>
+                                <?php if (login()) { echo ' <span class="mx-2">—</span> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentcolor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit-2"><path d="M17 3a2.828 2.828.0 114 4L7.5 20.5 2 22l1.5-5.5L17 3z"></path></svg> <span class="edit-post"><a href="'. $post->url .'/edit?destination=post">' . i18n('Edit') . '</a></span>'; } ?>
                             </small>
                         </p>
 
diff --git a/themes/logs/css/style.css b/themes/logs/css/style.css
index 937c94e..f33fa7f 100644
--- a/themes/logs/css/style.css
+++ b/themes/logs/css/style.css
@@ -980,3 +980,10 @@ ul.archivegroup {
 .archivegroup li.expanded, .archivegroup li.collapsed {
     list-style: none;
 }
+
+#more {
+	display:block;
+	height:2rem;
+	margin-top:-2rem;
+	content:""
+}
\ No newline at end of file
diff --git a/themes/readable/css/style.css b/themes/readable/css/style.css
index 9474775..5256acd 100644
--- a/themes/readable/css/style.css
+++ b/themes/readable/css/style.css
@@ -1031,3 +1031,10 @@ ul.archivegroup {
 .archivegroup li.expanded, .archivegroup li.collapsed {
     list-style: none;
 }
+
+#more {
+	display:block;
+	height:2rem;
+	margin-top:-2rem;
+	content:""
+}
\ No newline at end of file
diff --git a/themes/twentyfifteen/css/style.css b/themes/twentyfifteen/css/style.css
index 6d9cfb8..c46f895 100644
--- a/themes/twentyfifteen/css/style.css
+++ b/themes/twentyfifteen/css/style.css
@@ -6140,3 +6140,10 @@ ul.month {
 .feed-link a {
 	height:100%;
 }
+
+#more {
+	display:block;
+	height:2rem;
+	margin-top:-2rem;
+	content:""
+}
\ No newline at end of file
diff --git a/themes/twentyfifteen/css/style_v2.css b/themes/twentyfifteen/css/style_v2.css
index 845d427..141a21e 100644
--- a/themes/twentyfifteen/css/style_v2.css
+++ b/themes/twentyfifteen/css/style_v2.css
@@ -6147,3 +6147,10 @@ ul.month {
 .feed-link a {
 	height:100%;
 }
+
+#more {
+	display:block;
+	height:2rem;
+	margin-top:-2rem;
+	content:""
+}
\ No newline at end of file
diff --git a/themes/twentysixteen/css/style.css b/themes/twentysixteen/css/style.css
index ef2c6bd..230e15c 100644
--- a/themes/twentysixteen/css/style.css
+++ b/themes/twentysixteen/css/style.css
@@ -4066,3 +4066,10 @@ ul.month {
 	margin:0 0 0 10px;
 	float:right;	
 }
+
+#more {
+	display:block;
+	height:2rem;
+	margin-top:-2rem;
+	content:""
+}
\ No newline at end of file