Merge pull request #67 from youranreus/dev3.0

version 3.3.1

archives.php

@@ -10,7 +10,7 @@
     <div class="PAP" id="archives">
         <div id="page-banner" class="PAP-banner">
             <div>
-                <h2 itemprop="name headline"><?php $this->title() ?></h2>
+                <h1 itemprop="name headline"><?php $this->title() ?></h1>
             </div>
         </div>
         <div id="archives-content">

components/header.php

@@ -26,7 +26,7 @@
     <?php if($this->options->enableKatex == 1): ?>
         <link rel="stylesheet" href="<?php echo G::staticUrl('static/css/katex.min.css'); ?>">
     <?php endif; ?>
-    <link rel="stylesheet" href="<?php echo G::staticUrl('static/css/G.css'); ?>?v=3.2337">
+    <link rel="stylesheet" href="<?php echo G::staticUrl('static/css/G.css'); ?>?v=3.3340">
     <link rel="stylesheet <?php if (!isset($_COOKIE['night']) || $_COOKIE['night'] != '1') {
         echo 'alternate';
     } ?>" href="<?php echo G::staticUrl("static/css/dark$minInfix.css"); ?>?v=3.228" title="dark">

index.php

@@ -4,7 +4,7 @@
  *
  * @package G
  * @author 季悠然
- * @version 3.3.0
+ * @version 3.3.1
  * @link https://季悠然.space
  */
 

libs/G.class.php

@@ -10,7 +10,7 @@ class G
      *
      * @var string
      */
-    public static $version = "3.3.0";
+    public static $version = "3.3.1";
 
     /**
      * 主题配置

link.php

@@ -17,7 +17,7 @@
                     <div class="PAP-banner-mask"></div>
                 <?php endif; ?>
                 <div>
-                    <h2 itemprop="name headline"><?php $this->title() ?></h2>
+                    <h1 itemprop="name headline"><?php $this->title() ?></h1>
                 </div>
             </div>
             <div class="post-content PAP-content" itemprop="articleBody">

link_old.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * 友情链接_旧
+ *
+ * @package custom
+ */
+$this->need('components/header.php');
+?>
+
+    <div class="PAP" id="link">
+        <article itemscope itemtype="http://schema.org/BlogPosting">
+            <div id="post-banner" class="PAP-banner <?php $img = G::getArticleFieldsBanner($this);
+            if ($img != 'none') echo 'PAP-IMG-Banner'; ?>">
+                <?php $img = G::getArticleFieldsBanner($this);
+                if ($img != 'none'): ?>
+                    <div class="PAP-banner-background" style="background-image: url('<?php echo $img; ?>');"></div>
+                    <div class="PAP-banner-mask"></div>
+                <?php endif; ?>
+                <div>
+                    <h1 itemprop="name headline"><?php $this->title() ?></h1>
+                </div>
+            </div>
+            <div class="post-content PAP-content" itemprop="articleBody">
+                <?php echo G::analyzeContent($this->content); ?>
+            </div>
+            <div class="friends">
+				<?php if (isset($this->options->plugins['activated']['Links'])) : ?>
+					<?php Links_Plugin::output("
+					<li class='clear'>
+						<a href='{url}' target='_blank'></a>
+						<img src='{image}' alt='{name}'/>
+						<div class='link-item-content-old'>
+							<h3>{name}</h3>
+							<span>{sort}</span>
+							<p>{description}</p>
+						</div>
+					</li>
+					", 0); ?>
+				<?php else: ?>
+					<p>请启用Link插件</p>
+				<?php endif; ?>
+		    </div>
+        </article>
+    </div>
+
+<?php if ($this->fields->enableComment == 1): ?>
+    <?php $this->need('components/comments.php'); ?>
+<?php endif; ?>
+<?php $this->need('components/footer.php'); ?>

page.php

@@ -13,7 +13,7 @@
                 <div class="PAP-banner-mask"></div>
             <?php endif; ?>
             <div>
-                <h2 itemprop="name headline"><?php $this->title() ?></h2>
+                <h1 itemprop="name headline"><?php $this->title() ?></h1>
             </div>
         </div>
         <div id="page-content" class="PAP-content" itemprop="articleBody">

post.php

@@ -19,7 +19,7 @@
                 <div class="PAP-banner-mask"></div>
             <?php endif; ?>
             <div>
-                <h2 itemprop="name headline"><?php $this->title() ?></h2>
+                <h1 itemprop="name headline"><?php $this->title() ?></h1>
                 <p><?php echo G::getSemanticDate($this->created); ?> · <?php $this->category(' · '); ?> · <?php echo G::getPostView($this); ?>次阅读</p>
             </div>
         </div>

static/css/G.less

@@ -925,7 +925,7 @@ h3.archive-title {
   div {
     width: 100%;
 
-    h2 {
+    h1 {
       font-size: 2rem;
       color: @color_7;
       font-weight: 200;
@@ -956,12 +956,12 @@ h3.archive-title {
       left: 1.5rem;
     }
 
-    h2 {
+    h1 {
       opacity: 0.85;
       font-size: 1.5rem;
     }
 
-    h2,
+    h1,
     p,
     p a {
       text-align: left;
@@ -1566,6 +1566,87 @@ pre[class*='language-'] {
   display: none;
 }
 
+.friends {
+  width: 100%;
+  margin-top: 30px;
+  text-align: center;
+
+  li {
+    display: inline-block;
+    list-style-type: none;
+    width: 40%;
+    margin: 10px;
+    border-radius: 15px;
+    position: relative;
+    display: inline-block;
+    list-style-type: none;
+    width: 40%;
+    margin: 10px 10px 20px;
+    height: 60px;
+    border-radius: 0;
+    padding-left: 10px;
+    border-left: 2px solid var(--theme-table-td-border);
+
+    .link-item-content-old {
+      float: left;
+      padding: 0 10px 10px 20px;
+      text-align: left;
+      width: calc(100% - 90px);
+
+      h3 {
+        margin: 0 0 5px;
+        font-size: 16px;
+        color: @color_3;
+      }
+
+      span {
+        display: block;
+        margin: 0 0 5px;
+        color: @color_3;
+        opacity: .6;
+        font-size: 13px;
+
+        &::before {
+          content: '#';
+          color: @color_3;
+        }
+      }
+
+      p {
+        margin: 0 0 5px;
+        font-size: 13px;
+        color: @color_3;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        -webkit-text-stroke: unset;
+        opacity: .6;
+        position: relative;
+        bottom: 0;
+        right: 0;
+      }
+    }
+
+    a {
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      width: 100%;
+      height: 100%;
+      z-index: 1;
+    }
+
+    img {
+      height: 60px;
+      width: 60px;
+      border-radius: 100rem;
+      float: left;
+    }
+  }
+}
+
 #comments-form {
   background: var(--theme-bg-main);
   border-radius: var(--theme-radius);
@@ -2248,7 +2329,7 @@ span#toggleOwO {
     height: 13.5rem;
 
     div {
-      h2 {
+      h1 {
         font-size: 1.2rem;
       }
     }
@@ -2318,6 +2399,14 @@ span#toggleOwO {
     display: none;
   }
 
+  .friends li {
+    width: 100%;
+
+    .link-item-content-old {
+      width: calc(100% - 150px);
+    }
+  }
+
   .link-item-m-content {
     display: flex;
     align-items: center;
@@ -2348,4 +2437,9 @@ span#toggleOwO {
       width: 26%;
     }
   }
+
+  #toolbar {
+    bottom: 10rem;
+    right: .5rem;
+  }
 }