Skip to content

Commit

Permalink
样式修改
Browse files Browse the repository at this point in the history
  • Loading branch information
@movieatravelove
movieatravelove committed Sep 8, 2020
1 parent b5f4f71 commit c14d79e
Show file tree
Hide file tree
Showing 11 changed files with 226 additions and 61 deletions.
14 changes: 14 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
# Webstack网址导航

### 项目介绍

本项目是一个Typecho网址导航主题，基于 [Webstack钻芒二开版](https://www.zmki.cn/5366.html) 。

原项目为 [WebStackPage.github.io](https://github.com/WebStackPage/WebStackPage.github.io)，基于bootstrap前端框架开发，各后台及主题版本由广大网友提供。

### 样式修改

- [x] 后台设置增加网站ico选项
- [x] 日间模式网站模块增加描边，方便看的清楚
- [x] 调整标题字体大小
- [x] 自定义网站logo若为空，显示为名称首字
- [x] 修改关于本站页面，增加顶栏
- [x] 调整侧栏字体大小
- [x] 调整主页标签字体大小，增加分类描述

- [ ] 评论样式修改

147 changes: 127 additions & 20 deletions comments.php
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
<div id="comments">
<?php $this->comments()->to($comments); ?>
<?php if ($comments->have()): ?>
<h3><?php $this->commentsNum(_t('暂无评论'), _t('仅有一条评论'), _t('已有 %d 条评论')); ?></h3>

<?php $comments->listComments(); ?>

<?php $comments->pageNav('&laquo; 前一页', '后一页 &raquo;'); ?>

<?php endif; ?>

<?php if($this->allow('comment')): ?>

<!--添加新评论-->
<div id="<?php $this->respondId(); ?>" class="respond">
<div class="cancel-comment-reply">
<?php $comments->cancelReply(); ?>
</div>

<h3 id="response"><?php _e('添加新评论'); ?></h3>
</div>
<h3 id="response">添加新评论</h3>
<form method="post" action="<?php $this->commentUrl() ?>" id="comment-form" role="form">
<?php if($this->user->hasLogin()): ?>
<p><?php _e('登录身份: '); ?><a href="<?php $this->options->profileUrl(); ?>"><?php $this->user->screenName(); ?></a>. <a href="<?php $this->options->logoutUrl(); ?>" title="Logout"><?php _e('退出'); ?> &raquo;</a></p>
<?php else: ?>


<ul class="compost">
<li>
<input type="text" name="author" id="author" class="text" placeholder="<?php _e('昵称（必填）'); ?>" value="<?php $this->remember('author'); ?>" required />
Expand All @@ -39,10 +32,124 @@
<p>
<button type="submit" class="submit"><?php _e('提交评论'); ?></button>
</p>
</form>
</div>
<?php else: ?>
<h3><?php _e('评论已关闭'); ?></h3>
<?php endif; ?>
</div>
<style>#comments{padding-top:15px}.comment-list,.comment-list ol{list-style:none;margin:0;padding:0}.comment-list li{padding:14px;margin-top:10px;border:1px solid #EEE}.comment-list li.comment-level-odd{background:#f6f6f3}.comment-list li.comment-level-even{background:#FFF}.comment-list li.comment-by-author{background:#fff9e8}.comment-list li .comment-reply{text-align:right;font-size:.92857em}.comment-meta a{color:#999;font-size:.92857em}.comment-author{display:block;margin-bottom:3px;color:#444}.comment-author .avatar{float:left;margin-right:10px}.comment-author cite{font-weight:bold;font-style:normal}.comment-list .respond{margin-top:15px;border-top:1px solid #EEE}.respond .cancel-comment-reply{float:right;margin-top:15px;font-size:.92857em}#comment-form label{display:block;margin-bottom:.5em;font-weight:bold}#comment-form .required:after{content:" *";color:#C00}.respond ul{margin:0}.respond .compost{overflow:hidden;padding:10px 0 0}.respond .compost li input{width:160px;height:24px;padding-left:4px;border:1px solid #ddd;color:#666}.respond .compost li{float:left;margin-right:6px;margin-bottom:10px;list-style-type:none}.respond .textarea{width:100%;border:1px solid #ddd}.comment-content{margin:10px 0 0 45px}</style>
</form>
</div>


<!--评论列表-->
<?php if ($comments->have()): ?>
<h3><?php $this->commentsNum(_t('暂无评论'), _t('仅有 1 条评论'), _t('已有 %d 条评论')); ?></h3>

<?php $comments->listComments(); ?>

<?php $comments->pageNav('&laquo; 前一页', '后一页 &raquo;'); ?>

<?php endif; ?>

<?php if($this->allow('comment')): ?>

</div>
<?php else: ?>
<!--<h3><?php _e('评论已关闭'); ?></h3>-->
<?php endif; ?>


<style>
#comments {
padding-top:150px
}
.respond{
margin-top: 30px;
}
#response{
color: #373e4a;
font-weight: 600;
font-size: 18px;
margin-top: 30px;
}
.comment-list,.comment-list ol {
list-style:none;
margin:0;
padding:0
}
.comment-list li {
padding:14px;
margin-top:10px;
border:1px solid #EEE
}
.comment-list li.comment-level-odd {
background:#f6f6f3
}
.comment-list li.comment-level-even {
background:#FFF
}
.comment-list li.comment-by-author {
background:#fff9e8
}
.comment-list li .comment-reply {
text-align:right;
font-size:.92857em
}
.comment-meta a {
color:#999;
font-size:.92857em
}
.comment-author {
display:block;
margin-bottom:3px;
color:#444
}
.comment-author .avatar {
float:left;
margin-right:10px
}
.comment-author cite {
font-weight:bold;
font-style:normal
}
.comment-list .respond {
margin-top:15px;
border-top:1px solid #EEE
}
.respond .cancel-comment-reply {
float:right;
margin-top:15px;
font-size:.92857em
}
#comment-form label {
display:block;
margin-bottom:.5em;
font-weight:bold
}
#comment-form .required:after {
content:" *";
color:#C00
}
.respond ul {
margin:0
}
.respond .compost {
overflow:hidden;
padding:10px 0 0
}
.respond .compost li input {
width:160px;
height:24px;
padding-left:4px;
border:1px solid #ddd;
color:#666
}
.respond .compost li {
float:left;
margin-right:6px;
margin-bottom:10px;
list-style-type:none
}
.respond .textarea {
width:100%;
border:1px solid #ddd
}
.comment-content {
margin:10px 0 0 45px
}
</style>
41 changes: 23 additions & 18 deletions css/xenon-core.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,12 +381,12 @@ body.night .EKHJj {
}

.fk_service_consult {
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -366px -16px #fff
background: url(../images/20190827-5d652476ab305.png) no-repeat -366px -16px #fff
}

.fk_service_consult:hover {
border: 0;
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -410px -16px #4f7cfc
background: url(../images/20190827-5d652476ab305.png) no-repeat -410px -16px #4f7cfc
}

.fk_service_consult:hover .fk_service_consult_cont {
Expand Down Expand Up @@ -456,7 +456,7 @@ body.night .EKHJj {
}

.fk_service_hint>.fk_service_icon {
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -460px -25px;
background: url(../images/20190827-5d652476ab305.png) no-repeat -460px -25px;
width: 15px;
height: 15px;
margin: 13px 2px 0 18px
Expand Down Expand Up @@ -496,19 +496,19 @@ body.night .EKHJj {
}

.fk_service_check_site>.fk_service_icon {
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -461px -75px;
background: url(../images/20190827-5d652476ab305.png) no-repeat -461px -75px;
width: 20px;
height: 20px;
margin: 15px 2px 0 45px
}

.fk_service_feedback {
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -363px -64px #fff
background: url(../images/20190827-5d652476ab305.png) no-repeat -363px -64px #fff
}

.fk_service_feedback:hover {
border: 0;
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -407px -64px #4f7cfc;
background: url(../images/20190827-5d652476ab305.png) no-repeat -407px -64px #4f7cfc;
cursor: pointer
}

Expand Down Expand Up @@ -537,12 +537,12 @@ body.night .EKHJj {


.fk_service_qr {
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -365px -113px #fff
background: url(../images/20190827-5d652476ab305.png) no-repeat -365px -113px #fff
}

.fk_service_qr:hover {
border: 0;
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -409px -113px #4f7cfc
background: url(../images/20190827-5d652476ab305.png) no-repeat -409px -113px #4f7cfc
}

.fk_service_qr:hover .fk_service_qr_cont {
Expand Down Expand Up @@ -584,7 +584,7 @@ body.night .EKHJj {
height: 119px;
float: left;
margin: 12px 12px 5px 12px;
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -198px -26px
background: url(../images/20190827-5d652476ab305.png) no-repeat -198px -26px
}

.fk_service_qrimg_wxast {
Expand All @@ -600,23 +600,23 @@ body.night .EKHJj {
height: 119px;
float: left;
margin: 12px 12px 5px 12px;
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -41px -177px
background: url(../images/20190827-5d652476ab305.png) no-repeat -41px -177px
}

.fk_service_qrimg_wxapp {
width: 119px;
height: 119px;
float: left;
margin: 12px 12px 5px 12px;
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -198px -177px
background: url(../images/20190827-5d652476ab305.png) no-repeat -198px -177px
}

.fk_service_qrimg_fkmall {
width: 119px;
height: 119px;
float: left;
margin: 12px 12px 5px 12px;
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -41px -326px
background: url(../images/20190827-5d652476ab305.png) no-repeat -41px -326px
}

.fk_service_qr_cont>.fk_service_qrtext {
Expand All @@ -637,12 +637,12 @@ body.night .EKHJj {

.fk_service_upward {
display: none;
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -363px -159px #fff
background: url(../images/20190827-5d652476ab305.png) no-repeat -363px -159px #fff
}

.fk_service_upward:hover {
border: 0;
background: url(https://a-oss.zmki.cn/2019/20190827-5d652476ab305.png) no-repeat -407px -159px #4f7cfc;
background: url(../images/20190827-5d652476ab305.png) no-repeat -407px -159px #4f7cfc;
cursor: pointer
}

Expand Down Expand Up @@ -956,13 +956,13 @@ body.night .EKHJj {
/* 暗黑 新增图标->zmki 开始*/
.fk_service_zmkiah {
z-index: 555;
background: url(https://a-oss.zmki.cn/2020/20200209-8bab92321b7d9.png) no-repeat center center #fff;
background: url(../images/20200209-8bab92321b7d9.png) no-repeat center center #fff;
background-size: 50%50%;
}

.fk_service_zmkiah:hover {
border: 0;
background: url(https://a-oss.zmki.cn/2020/20200209-838b4c0ed71c3.png) no-repeat center center #4f7cfc;
background: url(../images/20200209-838b4c0ed71c3.png) no-repeat center center #4f7cfc;
background-size: 50%50%;
cursor: pointer
}
Expand Down Expand Up @@ -2084,7 +2084,9 @@ body {
text-decoration: none;
display: block;
padding: 13px 5px;
border-bottom: 1px solid #313437
border-bottom: 1px solid #313437;
font-size: 15px;
font-weight: 500;
}

.sidebar-menu .main-menu a>i {
Expand Down Expand Up @@ -10271,7 +10273,10 @@ a.text-yellow:hover {
}

.text-gray {
color: #555
color: #373e4a;
font-weight: 600;
font-size: 18px;
margin-top: 30px;
}

a.text-gray:hover {
Expand Down
4 changes: 2 additions & 2 deletions functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ function themeConfig($form) {
$Biglogo = new Typecho_Widget_Helper_Form_Element_Text('Biglogo', NULL, '/usr/themes/WebStack/images/logo@2x.png', _t('大LOGO地址(必填)'), _t('大logo地址，尺寸178*40'));
$form->addInput($Biglogo);
echo '<svg class="icon zmki_aliico" aria-hidden="true"><use xlink:href="#icon-set"></use></svg> <b>提示：主题设置选择后回车可快捷保存</b><hr>';
// 默认网站icon
$logo = new Typecho_Widget_Helper_Form_Element_Text('logo', NULL, '/usr/themes/WebStack/images/logo.png', _t('默认网站icon(必填)'), _t('大logo地址，尺寸178*40'));
// 网站icon
$logo = new Typecho_Widget_Helper_Form_Element_Text('logo', NULL, '/usr/themes/WebStack/images/logo.png', _t('网站icon(必填)'), _t('网站icon地址'));
$form->addInput($logo);
// 手机端每行显示数量
$zmki_wapsl = new Typecho_Widget_Helper_Form_Element_Radio('zmki_wapsl', array('0' => _t('单栏'), '1' => _t('双栏'), '2' => _t('三栏')), '0', _t('<svg class="icon zmki_aliico" aria-hidden="true"><use xlink:href="#icon-phone"></use></svg> 手机端栏目数量'), _t("选择相应的栏目数量,手机端每行将显示不同数量的布局。此功能可避免页面过于庸长，默认单栏，推荐双栏显示 <br>注意：如调整失效，请刷新请浏览器缓存"));
Expand Down
Binary file added images/20190827-5d652476ab305.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/20200209-838b4c0ed71c3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/20200209-8bab92321b7d9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/20200211-efbcc3deadd01.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@
<?php while ($categories->next()): ?>
<?php if(count($categories->children) === 0): ?>
<?php $this->widget('Widget_Archive@category-' . $categories->mid, 'order=order&pageSize=10000&type=category', 'mid=' . $categories->mid)->to($posts); ?>

<h4 class="text-gray"><i class="linecons-tag" style="margin-right: 7px;" id="<?php $categories->name(); ?>"></i><?php $categories->name(); ?></h4>
<h5><?php $categories->description(); ?></h5>
<div class="row">
<?php while ($posts->next()): ?>
<div class="col-sm-3">
Expand Down
Loading

0 comments on commit c14d79e

Please sign in to comment.