diff --git a/src/admin/css/login.min.css b/src/admin/css/login.min.css index 2d65eaf8..20739569 100644 --- a/src/admin/css/login.min.css +++ b/src/admin/css/login.min.css @@ -1 +1 @@ -body{line-height:1.6;letter-spacing:.6px;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}h2{line-height:1.6;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.logo{height:36px}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.admin-btn{color:#545b62}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.login-from{margin:0 auto;width:500px}.login-box{padding:1.25rem;background:#fff;border-radius:.5rem}.login-power{padding-top:1rem}.goindex a,.login-power a{color:#1eb867}.form-control,.btn,.alert,.rounded{border-radius:.5rem!important}#validateimg{cursor:pointer}#browsehappy{padding:20px 30px;font-size:14px;line-height:16px;color:#856404;background:#fff3cd;border-radius:.25rem;border:0}.browsehappy-close{float:right;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}} \ No newline at end of file +body{line-height:1.6;letter-spacing:.6px;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.6;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.logo,.form-control{height:36px}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.admin-btn{color:#545b62}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.login-from{margin:0 auto;width:500px}.login-box{padding:1.25rem;background:#fff;border-radius:.5rem}.login-power{padding-top:1rem}.form-control,.btn-md,.alert,.rounded{border-radius:.5rem!important}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}#validateimg{border-radius:0 .5rem .5rem 0;cursor:pointer}#browsehappy{padding:20px 30px;font-size:14px;line-height:16px;color:#856404;background:#fff3cd;border-radius:.25rem;border:0}.browsehappy-close{float:right;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}} \ No newline at end of file diff --git a/src/admin/index_body.php b/src/admin/index_body.php index ae2264cd..bb32059d 100644 --- a/src/admin/index_body.php +++ b/src/admin/index_body.php @@ -61,7 +61,7 @@ else if ($dopost == 'setskin') { } } else { ?> - 暂无文档 + 暂无文档 - +
+ +
- +
-
+
帮助中心 技术服务 @@ -73,7 +73,7 @@
-
+
@@ -99,7 +99,7 @@
-
+
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index e5881dd4..7caadfec 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -25,7 +25,7 @@ a { text-decoration:none } a:hover { - color:#ec982c; + color:#ff8400; text-decoration:none } h1,h2,h3,div,form,ul,ol,li,dd { @@ -46,7 +46,8 @@ img { } table { border-collapse:separate; - border-spacing:0 + border-spacing:0; + background:#fff } table tr:first-child td:first-child { border-top-left-radius:.5rem; @@ -74,7 +75,7 @@ input { background:#fff; border:1px solid #dee2e6; vertical-align:middle; - transition:all .3s + transition:all .5s } input[type=file] { padding:0; @@ -87,7 +88,7 @@ input[type=button],input[type=submit],input[type=reset] { color:#fff; background:#1eb867; border:0; - transition:all .3s + transition:all .5s } input[type=radio],input[type=checkbox],input[type=radio]:focus,input[type=checkbox]:focus { height:auto; @@ -102,14 +103,14 @@ select { background:#fff; border:1px solid #dee2e6; vertical-align:middle; - transition:all .3s + transition:all .5s } textarea { padding:.25rem .65rem; color:#545b62; background:#fff; border:1px solid #dee2e6; - transition:all .3s + transition:all .5s } input:focus,select:focus,textarea:focus { color:#495057; @@ -129,11 +130,11 @@ body.hidemenu .body-left { } body.showmenu .body-right { left:220px; - transition:all .3s + transition:all .5s } body.hidemenu .body-right { left:0; - transition:all .3s + transition:all .5s } .body-left { position:absolute; @@ -150,13 +151,50 @@ body.hidemenu .body-right { } .main,.menu { width:100%; - height:100% + height:98% } .main iframe,.menu iframe { width:100%; height:98%; border:0 } +.menu-box { + margin:0; + padding:1rem 5px +} +.menu-body { + width:100%; + background:#fff; + box-shadow:0 .125rem .25rem rgba(0,0,0,.075) +} +.item-menu .link { + position:relative; + padding-left:50px; + display:block; + height:40px; + line-height:40px; + cursor:pointer; + transition:all .5s +} +.item-menu li:last-child .link { + border-bottom:0 +} +.item-menu li i { + position:absolute; + top:12px; + left:20px; + color:#545b62 +} +.item-menu li i.fa-angle-down { + right:20px; + left:auto +} +.item-menu li.open .link,.item-menu li.open i { + color:#1eb867 +} +.item-menu li.open i.fa-angle-down { + transform:rotate(180deg) +} .head { width:100%; height:60px; @@ -256,53 +294,15 @@ body.hidemenu .body-right { border-radius:50%; border:1px solid #dee2e6 } -.menu-box { - margin:0; - padding:1rem 5px -} -.menu { - width:100%; - background:#fff; - box-shadow:0 .125rem .25rem rgba(0,0,0,.075) -} -.menu .link { - position:relative; - padding-left:50px; - display:block; - height:40px; - line-height:40px; - cursor:pointer; - transition:all .3s -} -.menu li:last-child .link { - border-bottom:0 -} -.menu li i { - position:absolute; - top:13px; - left:20px; - color:#545b62 -} -.menu li i.fa-angle-down { - right:20px; - left:auto -} -.menu li.open .link,.menu li.open i { - color:#1eb867 -} -.menu li.open i.fa-angle-down { - transform:rotate(180deg) -} .submenu { display:none; padding:6px 0; - background:#adb5bd; - border-radius:0 0 .5rem .5rem + background:#adb5bd } .submenu li { height:40px; line-height:40px; - transition:all .3s + transition:all .5s } .submenu li:hover { background:#009688 @@ -609,7 +609,7 @@ span.page-link { direction:ltr; cursor:pointer } -table,input,select,textarea,.search,.menu,.coolbg,.mysource,.mywriter,.pubdlg,.quickselItem .topcat,.web-info,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn-sm,.alert,.rounded { +table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubdlg,.quickselItem .topcat,.web-info,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn-sm,.alert,.rounded { border-radius:.5rem!important } .btn-xs { @@ -618,7 +618,7 @@ table,input,select,textarea,.search,.menu,.coolbg,.mysource,.mywriter,.pubdlg,.q .coolbg4,.pubdlg .title,.cke_top { border-radius:.5rem .5rem 0 0 } -.wsselect,.cke_bottom { +.submenu,.wsselect,.cke_bottom { border-radius:0 0 .5rem .5rem } .page-item:first-child .page-link { diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 77b61cab..02b425bc 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -39,10 +39,10 @@ h1,h2,h3,h4,h5,h6 { color:#393d49 } h1 { - font-size:36px + font-size:30px } h2 { - font-size:24px + font-size:22px } h3,h4 { font-size:18px @@ -67,8 +67,15 @@ input[type=file] { background-repeat:no-repeat; background-position:top center } +.carousel-caption { + bottom:0 +} +.carousel-caption h2 { + font-size:18px; + color:#fff +} .item-title h2 { - font-size:24px + font-size:22px } .item-article h2,.item-vote h2,.item-tag h2,.list-info-search h2 { font-size:18px @@ -85,15 +92,14 @@ input[type=file] { } .item-theme { margin-bottom:2rem; - transition:all .3s + transition:all .5s } .item-theme-box { padding:1.5rem } .item-theme-img img { width:100%; - height:250px; - border-radius:.5rem .5rem 0 0 + height:250px } .item-theme p,.item-news p { margin-bottom:0; @@ -107,7 +113,7 @@ input[type=file] { .item-news { margin-bottom:2rem; padding:1.5rem; - transition:all .3s + transition:all .5s } .item-theme:hover,.item-news:hover { box-shadow:0 14px 30px -16px rgba(0,36,100,.25); @@ -128,11 +134,7 @@ input[type=file] { } .list-article-img img { width:100%; - height:260px; - border-radius:.5rem .5rem 0 0 -} -.list-article-body { - border-radius:0 0 .5rem .5rem + height:260px } .list-article-body h2 { font-size:18px; @@ -143,22 +145,16 @@ input[type=file] { .list-article-body h2 a { color:#393d49 } -.list-article-body p { - margin-bottom:0 -} .list-info-select a { display:inline-block; margin-right:10px; color:#1eb867 } -.item-vote .table { - margin-bottom:0 -} .article-theme-title h1 { margin-bottom:1rem; - font-size:24px + font-size:22px } -.article-theme-img { +.article-theme-img,.article-hot-img img { width:100% } .article-theme-info .item { @@ -169,7 +165,7 @@ input[type=file] { font-size:18px; font-weight:600 } -.article-theme-body p:last-child,.article-hot:last-child { +.list-article-body p,.item-vote .table,.article-theme-body p:last-child,.article-hot:last-child { margin-bottom:0 } .article-theme-body h2,.article-right h2 { @@ -179,10 +175,6 @@ input[type=file] { .article-hot { margin-bottom:1.5rem } -.article-hot-img img { - width:100%; - border-radius:.5rem .5rem 0 0 -} .article-hot-box { padding:1rem 1.5rem; background:#fff @@ -291,20 +283,20 @@ input[type=file] { .navbar-dark .navbar-nav .nav-link { color:#eee } +.nav-item .active { + color:#ff8400 +} .logo img { height:40px } .login-from { - margin:6rem 0 + margin:5rem 0 } .login-box { padding:1.25rem; width:500px; background:#fff } -#validateimg { - border-radius:0 .5rem .5rem 0 -} .user-login { line-height:40px } @@ -330,8 +322,8 @@ input[type=file] { height:345px } .user-img-md { - width:70px; - height:70px; + width:60px; + height:60px; border-radius:50%; border:1px solid #eee } @@ -348,7 +340,7 @@ input[type=file] { border:1px solid #eee } .user-meter i { - font-size:24px!important; + font-size:22px!important; color:#1eb867 } .list-group-item.active a { @@ -378,7 +370,7 @@ input[type=file] { cursor:pointer } .btn+.btn,.btn-text+.btn-text { - margin-left:10px + margin-left:1rem } .form-control,.btn,.fa { font-size:14px!important @@ -403,18 +395,24 @@ input[type=file] { .admin-input-xs { width:60px } -.navbar-toggler,.dropdown-menu,.breadcrumb,.cke_chrome,.cke_inner,.pagination,.form-control,.alert,.rounded { +.navbar-toggler,.dropdown-menu,.breadcrumb,.cke_chrome,.cke_inner,.pagination,.form-control,.btn-md,.btn-sm,.alert,.rounded { border-radius:.5rem!important } .btn-xs { border-radius:.35rem!important } -.cke_top { +.cke_top,.item-theme-img img,.list-article-img img,.article-hot-img img { border-radius:.5rem .5rem 0 0 } -.cke_bottom { +.cke_bottom,.list-article-body { border-radius:0 0 .5rem .5rem } +#validateimg { + border-radius:0 .5rem .5rem 0 +} +.rounded-circle { + border-radius:50%!important +} .page-item:first-child .page-link { border-top-left-radius:.5rem; border-bottom-left-radius:.5rem diff --git a/src/theme/dedebiz/article_article.htm b/src/theme/dedebiz/article_article.htm index b2afa505..29a4ed01 100644 --- a/src/theme/dedebiz/article_article.htm +++ b/src/theme/dedebiz/article_article.htm @@ -74,7 +74,7 @@
- +
diff --git a/src/theme/dedebiz/article_default.htm b/src/theme/dedebiz/article_default.htm index 3e46449c..c4f4373f 100644 --- a/src/theme/dedebiz/article_default.htm +++ b/src/theme/dedebiz/article_default.htm @@ -86,7 +86,7 @@
- +
diff --git a/src/theme/dedebiz/article_default_sg.htm b/src/theme/dedebiz/article_default_sg.htm index c8662007..1743e136 100644 --- a/src/theme/dedebiz/article_default_sg.htm +++ b/src/theme/dedebiz/article_default_sg.htm @@ -88,7 +88,7 @@
- +
diff --git a/src/theme/dedebiz/article_image.htm b/src/theme/dedebiz/article_image.htm index 2574b620..10c24290 100644 --- a/src/theme/dedebiz/article_image.htm +++ b/src/theme/dedebiz/article_image.htm @@ -149,7 +149,7 @@
- +
diff --git a/src/theme/dedebiz/article_infos.htm b/src/theme/dedebiz/article_infos.htm index cab59962..897503af 100644 --- a/src/theme/dedebiz/article_infos.htm +++ b/src/theme/dedebiz/article_infos.htm @@ -80,7 +80,7 @@
- +
diff --git a/src/theme/dedebiz/article_soft.htm b/src/theme/dedebiz/article_soft.htm index a8973190..f7d1214d 100644 --- a/src/theme/dedebiz/article_soft.htm +++ b/src/theme/dedebiz/article_soft.htm @@ -88,7 +88,7 @@
- +
diff --git a/src/theme/dedebiz/article_spec.htm b/src/theme/dedebiz/article_spec.htm index ff014577..bc6d81bf 100644 --- a/src/theme/dedebiz/article_spec.htm +++ b/src/theme/dedebiz/article_spec.htm @@ -53,7 +53,7 @@
- +
diff --git a/src/theme/dedebiz/index.htm b/src/theme/dedebiz/index.htm index 6868b927..1e6143c7 100644 --- a/src/theme/dedebiz/index.htm +++ b/src/theme/dedebiz/index.htm @@ -25,15 +25,21 @@
  • {/dede:arclist}
    {dede:arclist row='5' orderby='id'} -
    [field:fulltitle/]
    {/dede:arclist} +
    + [field:fulltitle/] +
    +

    [field:title/]

    +

    [field:description function="cn_substr(@me,120)"/]...

    +
    +
    {/dede:arclist}
    - 上一个 + 上篇 - 下一个 + 下篇 @@ -42,7 +48,7 @@
    -
    {dede:channelartlist typeid='18,18'} +
    {dede:channelartlist typeid='1,1'}

    {dede:field.typename/}

    @@ -69,7 +75,7 @@
    -
    {dede:channelartlist typeid='17,17'} +
    {dede:channelartlist typeid='2,2'}

    {dede:field.typename/}

    @@ -91,7 +97,7 @@
    -
    {dede:channelartlist typeid='18,18'} +
    {dede:channelartlist typeid='3,3'}

    {dede:field.typename/}

    @@ -99,7 +105,7 @@
  • [field:global.autoindex/].[field:title/]
    • {/dede:arclist}
    -
    {/dede:channelartlist}{dede:channelartlist typeid='19,19'} +
    {/dede:channelartlist}{dede:channelartlist typeid='4,4'}

    {dede:field.typename/}

    @@ -107,7 +113,7 @@
  • [field:global.autoindex/].[field:title/]
    • {/dede:arclist}
    -
    {/dede:channelartlist}{dede:channelartlist typeid='17,17'} +
    {/dede:channelartlist}{dede:channelartlist typeid='5,5'}

    {dede:field.typename/}

    diff --git a/src/theme/dedebiz/index_article.htm b/src/theme/dedebiz/index_article.htm index e4314b73..bd887dbc 100644 --- a/src/theme/dedebiz/index_article.htm +++ b/src/theme/dedebiz/index_article.htm @@ -49,7 +49,7 @@
    - +
    diff --git a/src/theme/dedebiz/index_default.htm b/src/theme/dedebiz/index_default.htm index e4314b73..bd887dbc 100644 --- a/src/theme/dedebiz/index_default.htm +++ b/src/theme/dedebiz/index_default.htm @@ -49,7 +49,7 @@
    - +
    diff --git a/src/theme/dedebiz/index_default_sg.htm b/src/theme/dedebiz/index_default_sg.htm index e4314b73..bd887dbc 100644 --- a/src/theme/dedebiz/index_default_sg.htm +++ b/src/theme/dedebiz/index_default_sg.htm @@ -49,7 +49,7 @@
    - +
    diff --git a/src/theme/dedebiz/index_infos.htm b/src/theme/dedebiz/index_infos.htm index b41e7f53..5d0f4bd9 100644 --- a/src/theme/dedebiz/index_infos.htm +++ b/src/theme/dedebiz/index_infos.htm @@ -49,7 +49,7 @@
    - +
    diff --git a/src/theme/dedebiz/list_article.htm b/src/theme/dedebiz/list_article.htm index fe949cf3..b8749c58 100644 --- a/src/theme/dedebiz/list_article.htm +++ b/src/theme/dedebiz/list_article.htm @@ -53,7 +53,7 @@
    - +
    diff --git a/src/theme/dedebiz/list_default.htm b/src/theme/dedebiz/list_default.htm index fe949cf3..b8749c58 100644 --- a/src/theme/dedebiz/list_default.htm +++ b/src/theme/dedebiz/list_default.htm @@ -53,7 +53,7 @@
    - +
    diff --git a/src/theme/dedebiz/list_default_sg.htm b/src/theme/dedebiz/list_default_sg.htm index ca5ac098..de86fbae 100644 --- a/src/theme/dedebiz/list_default_sg.htm +++ b/src/theme/dedebiz/list_default_sg.htm @@ -53,7 +53,7 @@
    - +
    diff --git a/src/theme/dedebiz/list_image.htm b/src/theme/dedebiz/list_image.htm index 2f78263e..06122b1d 100644 --- a/src/theme/dedebiz/list_image.htm +++ b/src/theme/dedebiz/list_image.htm @@ -54,7 +54,7 @@
    - +
    diff --git a/src/theme/dedebiz/list_infos.htm b/src/theme/dedebiz/list_infos.htm index bc13991f..a2b8fcae 100644 --- a/src/theme/dedebiz/list_infos.htm +++ b/src/theme/dedebiz/list_infos.htm @@ -64,7 +64,7 @@
    - +
    diff --git a/src/theme/dedebiz/list_soft.htm b/src/theme/dedebiz/list_soft.htm index 6dbbdb6a..c0feaab6 100644 --- a/src/theme/dedebiz/list_soft.htm +++ b/src/theme/dedebiz/list_soft.htm @@ -57,7 +57,7 @@
    - +
    diff --git a/src/theme/dedebiz/list_spec.htm b/src/theme/dedebiz/list_spec.htm index f729c897..d6145bc1 100644 --- a/src/theme/dedebiz/list_spec.htm +++ b/src/theme/dedebiz/list_spec.htm @@ -53,7 +53,7 @@
    - +
    diff --git a/src/theme/dedebiz/search.htm b/src/theme/dedebiz/search.htm index d2f6f124..93bc0b66 100644 --- a/src/theme/dedebiz/search.htm +++ b/src/theme/dedebiz/search.htm @@ -54,7 +54,7 @@
    - +
    diff --git a/src/theme/dedebiz/taglist.htm b/src/theme/dedebiz/taglist.htm index c3f05115..77f966d1 100644 --- a/src/theme/dedebiz/taglist.htm +++ b/src/theme/dedebiz/taglist.htm @@ -55,7 +55,7 @@
    - +
    diff --git a/src/theme/dedebiz/widget_article_feedback.htm b/src/theme/dedebiz/widget_article_feedback.htm index 85c569d2..f6f4ed36 100644 --- a/src/theme/dedebiz/widget_article_feedback.htm +++ b/src/theme/dedebiz/widget_article_feedback.htm @@ -25,7 +25,7 @@ -
    +
    {dede:feedback} diff --git a/src/user/templets/login.htm b/src/user/templets/login.htm index 62386f4d..f2bcdce1 100755 --- a/src/user/templets/login.htm +++ b/src/user/templets/login.htm @@ -31,7 +31,6 @@
    -
    忘记会员密码？
    -
    -
    注册
    +
    忘记会员密码？
    +
    +
    注册
    diff --git a/src/user/templets/reg-new.htm b/src/user/templets/reg-new.htm index 70e8036f..9c4b1fdd 100755 --- a/src/user/templets/reg-new.htm +++ b/src/user/templets/reg-new.htm @@ -44,8 +44,8 @@ -
    -
    登录
    +
    +
    登录
    diff --git a/src/user/templets/resetpassword.htm b/src/user/templets/resetpassword.htm index e987f4fa..3b1e5eb9 100755 --- a/src/user/templets/resetpassword.htm +++ b/src/user/templets/resetpassword.htm @@ -43,7 +43,7 @@ -
    +
    diff --git a/src/user/templets/resetpassword2.htm b/src/user/templets/resetpassword2.htm index cab1d70d..a7604e80 100755 --- a/src/user/templets/resetpassword2.htm +++ b/src/user/templets/resetpassword2.htm @@ -40,7 +40,7 @@ -
    +
    diff --git a/src/user/templets/resetpassword3.htm b/src/user/templets/resetpassword3.htm index 40b56437..9fc77229 100755 --- a/src/user/templets/resetpassword3.htm +++ b/src/user/templets/resetpassword3.htm @@ -34,7 +34,7 @@ -
    +