diff --git a/assets/css/joe.census.min.css b/assets/css/joe.census.min.css index e86765c..9fe92f3 100644 --- a/assets/css/joe.census.min.css +++ b/assets/css/joe.census.min.css @@ -1 +1 @@ -.joe_census__basic{display:grid;grid-template-columns:repeat(2, 1fr);gap:15px;margin-bottom:15px}.joe_census__basic-item.list{display:grid;grid-template-columns:repeat(2, 1fr);gap:15px}.joe_census__basic-item.list .list{display:flex;align-items:center;justify-content:space-between;background:var(--background);box-shadow:var(--box-shadow);border-radius:var(--radius-inner) var(--radius-wrap) var(--radius-wrap) var(--radius-inner);padding:15px 15px 12px}.joe_census__basic-item.list .list .count{display:flex;flex-direction:column;justify-content:space-between;height:100%}.joe_census__basic-item.list .list .count h6{font-size:12px;margin-bottom:10px;color:var(--seat)}.joe_census__basic-item.list .list .count p{font-size:28px;font-weight:700}.joe_census__basic-item.list .list .icon{fill:var(--classA)}.joe_census__basic-item.list .list:nth-child(1){border-left:5px solid #1cc88a;color:#1cc88a}.joe_census__basic-item.list .list:nth-child(2){border-left:5px solid #36b9cc;color:#36b9cc}.joe_census__basic-item.list .list:nth-child(3){border-left:5px solid #2196f3;color:#2196f3}.joe_census__basic-item.list .list:nth-child(4){border-left:5px solid #9c27b0;color:#9c27b0}.joe_census__basic-item.category{background:var(--background);box-shadow:var(--box-shadow);border-radius:var(--radius-wrap)}.joe_census__basic-item.category #category{height:230px}.joe_census__lately{background:var(--background);margin-bottom:15px;border-radius:var(--radius-wrap);box-shadow:var(--box-shadow)}.joe_census__lately .title{display:flex;align-items:center;height:45px;padding:0 12px;border-bottom:1px solid var(--classC);color:var(--main);justify-content:space-between;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.joe_census__lately .content{padding:15px}.joe_census__lately .content #lately{height:300px}.joe_census__server{display:grid;grid-template-columns:repeat(2, 1fr);gap:15px;margin-bottom:15px}.joe_census__server-item{background:var(--background);box-shadow:var(--box-shadow);border-radius:var(--radius-wrap)}.joe_census__server-item .title{display:flex;align-items:center;height:45px;padding:0 12px;border-bottom:1px solid var(--classC);color:var(--main);justify-content:space-between;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.joe_census__server-item .title .count{color:var(--minor);font-size:12px}.joe_census__server-item .title .count .split{margin:0 5px}.joe_census__server-item .content{padding:15px}.joe_census__server-item .content #work,.joe_census__server-item .content #flow{height:315px}.joe_census__filing{background:var(--background);box-shadow:var(--box-shadow);border-radius:var(--radius-wrap)}.joe_census__filing .title{display:flex;align-items:center;height:45px;padding:0 12px;border-bottom:1px solid var(--classC);color:var(--main);justify-content:space-between;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.joe_census__filing .content{padding:15px}.joe_census__filing .content .item{position:relative}.joe_census__filing .content .item:last-child .wrapper{padding-bottom:0}.joe_census__filing .content .item .head{position:absolute;top:14px;width:13px;height:13px;background:var(--classC);border-radius:50%}.joe_census__filing .content .item .tail{position:absolute;left:6px;top:0;width:1px;height:100%;background:var(--classC)}.joe_census__filing .content .item .wrapper{padding-left:30px;padding-bottom:15px}.joe_census__filing .content .item .wrapper .panel{position:relative;display:flex;align-items:center;justify-content:space-between;color:var(--routine);cursor:pointer;background:var(--classD);padding:10px;height:40px;border-radius:4px}.joe_census__filing .content .item .wrapper .panel svg{width:10px;height:10px;fill:var(--minor);-webkit-transform:rotate(180deg);transform:rotate(180deg);transition:-webkit-transform 0.25s;transition:transform 0.25s;transition:transform 0.25s, -webkit-transform 0.25s}.joe_census__filing .content .item .wrapper .panel.in svg{-webkit-transform:rotate(90deg);transform:rotate(90deg)}.joe_census__filing .content .item .wrapper .panel::before{content:'';position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);left:-8px;width:0;height:0;border-right:8px solid var(--classD);border-top:8px solid transparent;border-bottom:8px solid transparent}.joe_census__filing .content .item .wrapper .panel-body{display:none;padding-left:20px}.joe_census__filing .content .item .wrapper .panel-body li{margin-top:20px}.joe_census__filing .content .item .wrapper .panel-body li a{color:var(--routine)}.joe_census__filing .content .item .wrapper .panel-body li a:hover{color:var(--theme)}.joe_census__filing .content .item.load{padding-top:15px}.joe_census__filing .content .item.load .head{top:25px;background:#2db7f5}.joe_census__filing .content .item.load .button{position:relative;margin-left:30px;border:none;background:#2db7f5;color:#fff;border-radius:4px;padding:0 12px;height:34px;font-size:13px}.joe_census__filing .content .item.load .button::before{content:'';position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);left:-8px;width:0;height:0;border-right:8px solid #2db7f5;border-top:8px solid transparent;border-bottom:8px solid transparent} +.joe_census__basic{display:grid;grid-template-columns:repeat(2, 1fr);gap:15px;margin-bottom:15px}.joe_census__basic-item.list{display:grid;grid-template-columns:repeat(2, 1fr);gap:15px}.joe_census__basic-item.list .list{display:flex;align-items:center;justify-content:space-between;background:var(--background);box-shadow:var(--box-shadow);border-radius:var(--radius-inner) var(--radius-wrap) var(--radius-wrap) var(--radius-inner);padding:15px 15px 12px}.joe_census__basic-item.list .list .count{display:flex;flex-direction:column;justify-content:space-between;height:100%}.joe_census__basic-item.list .list .count h6{font-size:12px;margin-bottom:10px;color:var(--seat)}.joe_census__basic-item.list .list .count p{font-size:28px;font-weight:700}.joe_census__basic-item.list .list .icon{fill:var(--classA)}.joe_census__basic-item.list .list:nth-child(1){border-left:5px solid #1cc88a;color:#1cc88a}.joe_census__basic-item.list .list:nth-child(2){border-left:5px solid #36b9cc;color:#36b9cc}.joe_census__basic-item.list .list:nth-child(3){border-left:5px solid #2196f3;color:#2196f3}.joe_census__basic-item.list .list:nth-child(4){border-left:5px solid #9c27b0;color:#9c27b0}.joe_census__basic-item.category{background:var(--background);box-shadow:var(--box-shadow);border-radius:var(--radius-wrap)}.joe_census__basic-item.category #category{height:230px}.joe_census__lately{background:var(--background);margin-bottom:15px;border-radius:var(--radius-wrap);box-shadow:var(--box-shadow)}.joe_census__lately .title{display:flex;align-items:center;height:45px;padding:0 12px;border-bottom:1px solid var(--classC);color:var(--main);justify-content:space-between;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.joe_census__lately .content{padding:15px}.joe_census__lately .content #lately{height:300px}.joe_census__server{display:grid;grid-template-columns:repeat(2, 1fr);gap:15px;margin-bottom:15px}.joe_census__server-item{background:var(--background);box-shadow:var(--box-shadow);border-radius:var(--radius-wrap)}.joe_census__server-item .title{display:flex;align-items:center;height:45px;padding:0 12px;border-bottom:1px solid var(--classC);color:var(--main);justify-content:space-between;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.joe_census__server-item .title .count{color:var(--minor);font-size:12px}.joe_census__server-item .title .count .split{margin:0 5px}.joe_census__server-item .content{padding:15px}.joe_census__server-item .content #work,.joe_census__server-item .content #flow{height:315px}.joe_census__filing{background:var(--background);box-shadow:var(--box-shadow);border-radius:var(--radius-wrap)}.joe_census__filing .title{display:flex;align-items:center;height:45px;padding:0 12px;border-bottom:1px solid var(--classC);color:var(--main);justify-content:space-between;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.joe_census__filing .content{padding:15px}.joe_census__filing .content .item{position:relative}.joe_census__filing .content .item:last-child .wrapper{padding-bottom:0}.joe_census__filing .content .item .head{position:absolute;top:14px;width:13px;height:13px;background:var(--classC);border-radius:50%}.joe_census__filing .content .item .tail{position:absolute;left:6px;top:0;width:1px;height:100%;background:var(--classC)}.joe_census__filing .content .item .wrapper{padding-left:30px;padding-bottom:15px}.joe_census__filing .content .item .wrapper .panel{position:relative;display:flex;align-items:center;justify-content:space-between;color:var(--routine);cursor:pointer;background:var(--classD);padding:10px;height:40px;border-radius:4px}.joe_census__filing .content .item .wrapper .panel svg{width:10px;height:10px;fill:var(--minor);-webkit-transform:rotate(180deg);transform:rotate(180deg);transition:-webkit-transform 0.25s;transition:transform 0.25s;transition:transform 0.25s, -webkit-transform 0.25s}.joe_census__filing .content .item .wrapper .panel.in svg{-webkit-transform:rotate(90deg);transform:rotate(90deg)}.joe_census__filing .content .item .wrapper .panel::before{content:'';position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);left:-8px;width:0;height:0;border-right:8px solid var(--classD);border-top:8px solid transparent;border-bottom:8px solid transparent}.joe_census__filing .content .item .wrapper .panel-body{display:none;padding:15px 15px 0 15px}.joe_census__filing .content .item .wrapper .panel-body li{line-height:2.5}.joe_census__filing .content .item .wrapper .panel-body li a{color:var(--routine)}.joe_census__filing .content .item .wrapper .panel-body li a:hover{color:var(--theme)}.joe_census__filing .content .item.load{padding-top:15px}.joe_census__filing .content .item.load .head{top:25px;background:#2db7f5}.joe_census__filing .content .item.load .button{position:relative;margin-left:30px;border:none;background:#2db7f5;color:#fff;border-radius:4px;padding:0 12px;height:34px;font-size:13px}.joe_census__filing .content .item.load .button::before{content:'';position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);left:-8px;width:0;height:0;border-right:8px solid #2db7f5;border-top:8px solid transparent;border-bottom:8px solid transparent} diff --git a/assets/css/joe.census.min.scss b/assets/css/joe.census.min.scss index 201d89c..c46a592 100644 --- a/assets/css/joe.census.min.scss +++ b/assets/css/joe.census.min.scss @@ -200,9 +200,9 @@ } .panel-body { display: none; - padding-left: 20px; + padding: 15px 15px 0 15px; li { - margin-top: 20px; + line-height: 2.5; a { color: var(--routine); &:hover { diff --git a/census.php b/census.php index 0af2ec2..c972a62 100644 --- a/census.php +++ b/census.php @@ -14,9 +14,9 @@ need('public/include.php'); ?> - + - + diff --git a/core/core.php b/core/core.php index e7c3ceb..d65d7d3 100644 --- a/core/core.php +++ b/core/core.php @@ -70,6 +70,9 @@ function themeInit($self) case 'article_filing': _getArticleFiling($self); break; + case 'article_filing_list': + _getArticleFilingList($self); + break; }; } diff --git a/core/function.php b/core/function.php index b1aae0b..3a4094d 100644 --- a/core/function.php +++ b/core/function.php @@ -2,7 +2,7 @@ /* 获取主题当前版本号 */ function _getVersion() { - return "7.0.8"; + return "7.0.9"; }; /* 判断是否是手机 */ diff --git a/core/route.php b/core/route.php index d5f0e77..80b7bce 100644 --- a/core/route.php +++ b/core/route.php @@ -328,6 +328,8 @@ function _getServerStatus($self) $self->response->throwJson(array( /* 状态 */ "status" => $response ? true : false, + /* 信息提示 */ + "message" => $response['msg'] ? $response['msg'] : '无', /* 上行流量KB */ "up" => $response["up"] ? $response["up"] : 0, /* 下行流量KB */ @@ -370,6 +372,7 @@ function _getCommentLately($self) ]); } +/* 获取文章归档 */ function _getArticleFiling($self) { header("HTTP/1.1 200 OK"); @@ -390,7 +393,7 @@ function _getArticleFiling($self) foreach ($temp as $item) { $date = $item['date']; $list = []; - $sql = "SELECT * FROM `{$prefix}contents` WHERE created < {$time} AND (password is NULL or password = '') AND status = 'publish' AND type = 'post' AND FROM_UNIXTIME(created, '%Y 年 %m 月') = '{$date}' ORDER BY created DESC"; + $sql = "SELECT * FROM `{$prefix}contents` WHERE created < {$time} AND (password is NULL or password = '') AND status = 'publish' AND type = 'post' AND FROM_UNIXTIME(created, '%Y 年 %m 月') = '{$date}' ORDER BY created DESC LIMIT 100"; $_list = $db->fetchAll($sql); foreach ($_list as $_item) { $type = $_item['type']; diff --git a/package.json b/package.json index e491bbe..01f711d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "typecho-joe-next", - "version": "7.0.8", + "version": "7.0.9", "description": "A Theme Of Typecho", "main": "index.php", "keywords": [