diff --git a/src/admin/css/login.min.css b/src/admin/css/login.min.css index 4ad844d9..cf7cbd97 100644 --- a/src/admin/css/login.min.css +++ b/src/admin/css/login.min.css @@ -1 +1 @@ -*{margin:0;padding:0;letter-spacing:.6px;box-sizing:border-box}body{line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}h2{font-size:24px}.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:.2rem}.login-power{padding-top:1rem}.goindex a,.login-power a{color:#1eb867}.form-control{height:36px}#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 +*{margin:0;padding:0;letter-spacing:.6px;box-sizing:border-box}body{line-height:1.6;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}h2{font-size:24px}.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:.2rem}.login-power{padding-top:1rem}.goindex a,.login-power a{color:#1eb867}.form-control{height:36px}#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 diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php index c7b67c51..63160882 100644 --- a/src/admin/dialog/select_mimages.php +++ b/src/admin/dialog/select_mimages.php @@ -13,13 +13,13 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php'); 插入多图

系统提示

{$msg1}{$msg2}
"; + $msginfo = "系统提示

系统提示

{$msg1}{$msg2}
"; echo $msginfo.""; } function RpLine($str) diff --git a/src/install/install.html b/src/install/install.html index acab6005..a5587d4c 100644 --- a/src/install/install.html +++ b/src/install/install.html @@ -11,7 +11,7 @@ - +
diff --git a/src/static/ckeditor/contents.css b/src/static/ckeditor/contents.css index 5b446763..553b608f 100644 --- a/src/static/ckeditor/contents.css +++ b/src/static/ckeditor/contents.css @@ -1,5 +1,5 @@ body { - line-height:1.5; + line-height:1.6; letter-spacing:.6px; font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"; font-size:14px; @@ -21,7 +21,7 @@ ol,ul,dl { } h1,h2,h3,h4,h5,h6 { font-weight:600; - line-height:1.5 + line-height:1.6 } hr { border:0px; diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index b1701f09..edc1a830 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -32,7 +32,7 @@ form,h1,h2,h3,ul,ol,div { padding:0 } body,th,td { - line-height:1.5 + line-height:1.6 } li,dd { margin:0; @@ -172,8 +172,7 @@ select:focus,input:focus,textarea:focus { font-weight:600; color:#545b62; background:#f5f5f5; - border-bottom:1px solid #dee2e6; - cursor:move + border-bottom:1px solid #dee2e6 } .fullpagediv { position:absolute; diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 9dd3e762..8afb67eb 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -1,5 +1,5 @@ body { - line-height:1.5; + line-height:1.6; font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif; color:#545b62; letter-spacing:.6px @@ -23,7 +23,7 @@ ul,ol { } h1,h2,h3,h4,h5,h6 { margin:0; - line-height:1.5; + line-height:1.6; font-weight:600; color:#393d49 } @@ -297,19 +297,15 @@ input[type=file] { .table { color:#545b62 } +.form-control,.btn,.fa { + font-size:14px!important +} .form-control { height:36px; line-height:36px } -.form-control,.btn,.fa { - font-size:14px!important -} -.dedebiz-file { - position:absolute; - top:0; - right:0; - margin:0; - opacity:0; +.fa { + color:inherit; cursor:pointer } .btn+.btn,.btn-text+.btn-text { @@ -402,13 +398,13 @@ input[type=file] { padding:10px 12px; right:1rem; bottom:1rem; - z-index:9998; font-size:16px; color:#fff; cursor:pointer; background:#ec982c; border-radius:.25rem; - border:0 + border:0; + z-index:9998 } #btnScrollTop:hover { background:#e77817 diff --git a/src/system/common.func.php b/src/system/common.func.php index 87c237c7..48814a2e 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -351,7 +351,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0) } $func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}"; $rmsg = $func; - $rmsg .= "document.write(\"\");"; + $rmsg .= "document.write(\"\");"; $rmsg .= "document.write(\"

系统提示

\");"; $rmsg .= "document.write(\"
\");"; $rmsg .= "document.write(\"".str_replace("\"", "“", $msg)."\");";