ouyang/typecho
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix/classic 22 (#1690)

Browse Source 
* fix: auto dark mode

* improve: pagenav style, theme color

* improve: color schema name

* fix: icon color

* improve: page navigation style
This commit is contained in:
Fen
2024-01-07 13:47:59 +08:00
committed by GitHub
parent 13282b5b84
commit 2051c040ec
5 changed files with 49 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
usr/themes/classic-22/comments.php
View File

@@ -10,7 +10,7 @@
'defaultAvatar' => 'identicon'
)); ?>
<?php $comments->pageNav(_t('前一页'), _t('后一页')); ?>
<nav><?php $comments->pageNav(_t('前一页'), _t('后一页'), 3, '...', array('wrapTag' => 'ul', 'itemTag' => 'li')); ?></nav>
<?php endif; ?>
@@ -34,7 +34,7 @@
<div class="grid">
<input type="text" placeholder="<?php _e('名字'); ?>" name="author" id="author" value="<?php $this->remember('author'); ?>" required/>
<input type="email" placeholder="<?php _e('Email'); ?>" name="mail" id="mail" value="<?php $this->remember('mail'); ?>"<?php if ($this->options->commentsRequireMail): ?> required<?php endif; ?> />
<input type="url" placeholder="<?php _e('网站'); ?><?php if (!$this->options->commentsRequireUrl): ?><?php _e('（选填）'); ?><?php endif; ?>" name="url" id="url" placeholder="<?php _e('https://'); ?>" value="<?php $this->remember('url'); ?>"<?php if ($this->options->commentsRequireUrl): ?> required<?php endif; ?> />
<input type="url" placeholder="<?php _e('http://网站'); ?><?php if (!$this->options->commentsRequireUrl): ?><?php _e('（选填）'); ?><?php endif; ?>" name="url" id="url" value="<?php $this->remember('url'); ?>"<?php if ($this->options->commentsRequireUrl): ?> required<?php endif; ?> />
</div>
<?php endif; ?>
<button type="submit"><?php _e('提交评论'); ?></button>

28
usr/themes/classic-22/index.php
View File

@@ -25,24 +25,20 @@ $this->need('header.php');
</h4>
<?php endif; ?>
<?php while ($this->next()): ?>
<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
<?php postMeta($this); ?>
<div class="entry-content fmt" itemprop="articleBody">
<?php $this->content(_t('阅读全文')); ?>
</div>
</article>
<hr class="post-separator">
<?php endwhile; ?>
<?php while ($this->next()): ?>
<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
<?php postMeta($this); ?>
<div class="entry-content fmt" itemprop="articleBody">
<?php $this->content(_t('阅读全文')); ?>
</div>
</article>
<hr class="post-separator">
<?php endwhile; ?>
<nav><?php $this->pageNav(_t('前一页'), _t('后一页'), 2, '...', array('wrapTag' => 'ul', 'itemTag' => 'li')); ?></nav>
</div>
<!-- <div class="text-center">
<a href="#">&laquo; Older Posts</a>
<span class="mx-2 text-muted">&middot;</span>
<a href="#">Newer Posts &raquo;</a>
</div> -->
<?php $this->pageNav(_t('前一页'), _t('后一页')); ?>
</main>
<?php $this->need('footer.php'); ?>

10
usr/themes/classic-22/post.php
View File

@@ -12,10 +12,12 @@
</div>
</article>
<div class="grid post-next">
<div class="prev"><?php $this->thePrev('%s', _t('没有了')); ?></div>
<div class="next text-end"><?php $this->theNext('%s', _t('没有了')); ?></div>
</div>
<nav class="post-nav">
<ul class="page-navigator">
<li class="prev"><?php $this->thePrev('%s', _t('没有了')); ?></li>
<li class="next"><?php $this->theNext('%s', _t('没有了')); ?></li>
</ul>
</nav>
<?php $this->need('comments.php'); ?>
</div>

2
usr/themes/classic-22/static/css/style.css
View File

File diff suppressed because one or more lines are too long

59
usr/themes/classic-22/static/scss/style.scss
View File

@@ -286,13 +286,13 @@ h1, h2, h3, h4, h5 { line-height: 1.25; }
}
}
.post-next {
.post-nav {
border-top: 1px solid var(--muted-border-color);
padding-top: calc(var(--spacing) * 1.5);
padding-top: var(--spacing);
margin: var(--block-spacing-vertical) 0;
a {
color: var(--h5-color);
color: inherit;
}
}
@@ -403,8 +403,12 @@ h1, h2, h3, h4, h5 { line-height: 1.25; }
font-size: .875em;
}
.comment-body .respond {
margin-top: var(--spacing);
.respond {
margin-top: calc(var(--spacing) * 1.5);
.comment-body & {
margin-top: var(--spacing);
}
}
#comment-form textarea {
@@ -413,34 +417,27 @@ h1, h2, h3, h4, h5 { line-height: 1.25; }
// page nav
.page-navigator {
list-style: none;
padding: 0;
text-align: center;
margin: 0;
flex: 1;
li {
display: inline;
margin-left: calc(var(--spacing) / 2);
margin-right: calc(var(--spacing) / 2);
.current a {
text-decoration: underline;
color: inherit;
pointer-events: none;
}
a {
color: inherit;
.prev {
margin-right: auto;
& a::before {
content: "‹";
margin-right: .25rem;
}
&.current a {
padding: 4px 12px;
border: 1px solid var(--muted-border-color);
border-radius: var(--border-radius);
color: var(--muted-color);
pointer-events: none;
}
.next {
margin-left: auto;
& a::after {
content: "›";
margin-left: .25rem;
}
}
}
.prev::before {
content: "‹";
margin-right: .25rem;
}
.next::after {
content: "›";
margin-left: .25rem;
}