diff --git a/src/admin/module_main.php b/src/admin/module_main.php index 365e65d4..9f73044a 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -274,8 +274,8 @@ else if ($action == 'setupstart') { } ReWriteConfigAuto(); $rflwft = ""; echo $rflwft; UpDateCatCache(); @@ -440,8 +440,8 @@ else if ($action == 'uninstallok') { } ReWriteConfigAuto(); $rflwft = ""; echo $rflwft; ShowMsg('模块卸载完成', 'module_main.php'); diff --git a/src/admin/mychannel_main.php b/src/admin/mychannel_main.php index 9232fb34..c0570fc4 100644 --- a/src/admin/mychannel_main.php +++ b/src/admin/mychannel_main.php @@ -20,9 +20,9 @@ $dlist->display(); function GetSta($sta, $id) { if ($sta == 1) { - return ($id != -1 ? "启用 > 禁用" : "固定项目"); + return ($id != -1 ? "已启用 禁用" : "固定项目"); } else { - return "禁用 > 启用"; + return "已禁用 启用"; } } function IsSystem($s) diff --git a/src/admin/plus_main.php b/src/admin/plus_main.php index 7b915b5c..20d6ea44 100644 --- a/src/admin/plus_main.php +++ b/src/admin/plus_main.php @@ -20,8 +20,8 @@ $dlist->display(); function GetSta($sta, $id, $title) { if ($sta == 1) { - return "启用 > 禁用 修改 删除"; + return "已启用 禁用修改删除"; } else { - return "禁用 > 启用 修改 册除"; + return "已禁用 启用修改册除"; } } \ No newline at end of file diff --git a/src/admin/templets/module_main.htm b/src/admin/templets/module_main.htm index 0c0de91f..c79fabd8 100644 --- a/src/admin/templets/module_main.htm +++ b/src/admin/templets/module_main.htm @@ -65,9 +65,9 @@ $file = DEDEDATA."/module/{$v['hash']}.xml"; if(file_exists($file)) { if(file_exists(DEDEDATA."/module/{$v['hash']}-readme.php")){ - echo "已安装 卸载"; + echo "已安装 卸载"; } else { - echo "未安装 安装"; + echo "未安装 安装"; } } else { echo "
下载
"; diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 47f8aeee..2a8941b5 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -369,9 +369,6 @@ span.page-link { color:#fff; background:#1eb867 } -a.btn { - color:#fff!important -} .btn-xs { padding:2px; line-height:12px; diff --git a/src/static/web/css/jquery.fileupload.css b/src/static/web/css/jquery.fileupload.css index 04982eec..7af25150 100644 --- a/src/static/web/css/jquery.fileupload.css +++ b/src/static/web/css/jquery.fileupload.css @@ -1 +1,21 @@ -.fileinput-button{position:relative;overflow:hidden;display:inline-block}.fileinput-button input{position:absolute;top:0;right:0;margin:0;opacity:0;direction:ltr;cursor:pointer}@media screen\9{.fileinput-button input{filter:alpha(opacity=0);font-size:100%;height:100%}} \ No newline at end of file +.fileinput-button { + position:relative; + overflow:hidden; + display:inline-block +} +.fileinput-button input { + position:absolute; + top:0; + right:0; + margin:0; + opacity:0; + direction:ltr; + cursor:pointer +} +@media screen\9 { + .fileinput-button input { + filter:alpha(opacity=0); + font-size:100%; + height:100% +} +} \ No newline at end of file diff --git a/src/static/web/css/member.css b/src/static/web/css/member.css index e37739eb..de8e8aa7 100644 --- a/src/static/web/css/member.css +++ b/src/static/web/css/member.css @@ -1,16 +1,3 @@ -body { - line-height:1.5; - font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif; - color:#545b62; - background:#fff -} -main.login-from { - background-image:url('../img/member_bg.jpg'); - background-repeat:no-repeat; - background-position:top center; - height:620px; - padding-top:5rem -} .login-area { background-color:white; max-width:500px; diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index d946ce66..397b002c 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -1,8 +1,43 @@ body { line-height:1.5; font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif; + color:#545b62; + letter-spacing:.6px +} +a { color:#545b62 } +a:hover { + color:#ff8400; + text-decoration:none +} +img { + max-width:100%; + border-radius:.25rem +} +ul,ol { + margin:0; + padding:0; + list-style:none +} +h1,h2,h3,h4,h5,h6 { + margin:0; + line-height:1.5; + font-weight:600; + color:#393d49 +} +h1 { + font-size:32px +} +h2 { + font-size:24px +} +h3,h4 { + font-size:18px +} +h5,h6 { + font-size:16px +} .flink,.flink a,.copyright,.copyright a { color:white } @@ -486,8 +521,7 @@ nav.location .dede li.active .nav-link { line-height:1.5rem } .article-meta small { - color:#868686; - margin-left:1rem + color:#868686 } .article-main .body { word-break:break-all diff --git a/src/theme/templets/footer.htm b/src/theme/templets/footer.htm index 90d22414..73e06082 100644 --- a/src/theme/templets/footer.htm +++ b/src/theme/templets/footer.htm @@ -1,5 +1,5 @@ diff --git a/src/theme/templets/index.htm b/src/theme/templets/index.htm index 750bf01d..f645f363 100644 --- a/src/theme/templets/index.htm +++ b/src/theme/templets/index.htm @@ -15,64 +15,59 @@ {dede:include filename='header.htm'/}
-
-
-
-
-