DedeBIZ
/
DedeV6
Watch 2
Star 0
Fork 0
Code Pull Requests 0 Releases 31 Activity
Browse Source

行高

tags/6.2.5
叙述、别离 2 years ago
parent
56bcf28761
commit
d86f90b985
8 changed files with 19 additions and 24 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/admin/css/login.min.css
  2. +2
    -2
      src/admin/dialog/select_mimages.php
  3. +1
    -1
      src/admin/sys_data_done.php
  4. +1
    -1
      src/install/install.html
  5. +2
    -2
      src/static/ckeditor/contents.css
  6. +2
    -3
      src/static/web/css/admin.css
  7. +9
    -13
      src/static/web/css/style.css
  8. +1
    -1
      src/system/common.func.php

+ 1
- 1
src/admin/css/login.min.css View File

@@ -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%}}
*{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%}}

+ 2
- 2
src/admin/dialog/select_mimages.php View File

@@ -13,13 +13,13 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<title>插入多图</title> <title>插入多图</title>
<style> <style>
body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#fff}
body{margin:0;line-height:1.6;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#fff}
ul{margin:0;padding:0;list-style:none} ul{margin:0;padding:0;list-style:none}
input[type=radio],input[type=checkbox]{margin:0;height:auto;box-shadow:none;outline:none;vertical-align:text-top} input[type=radio],input[type=checkbox]{margin:0;height:auto;box-shadow:none;outline:none;vertical-align:text-top}
button+button{margin-left:10px} button+button{margin-left:10px}
#wrap{padding:10px} #wrap{padding:10px}
#topbar{padding:10px 0;border-bottom:1px solid #ccc;text-align:right} #topbar{padding:10px 0;border-bottom:1px solid #ccc;text-align:right}
#topbar button{display:inline-block;border:0;padding:.25rem .5rem;line-height:1.5;font-size:12px;color:#fff;background:#1eb867;border-color:#1eb867;border-radius:.25rem;transition:all .6s;text-align:center}
#topbar button{display:inline-block;border:0;padding:.25rem .5rem;line-height:1.6;font-size:12px;color:#fff;background:#1eb867;border-color:#1eb867;border-radius:.25rem;transition:all .6s;text-align:center}
.topbar button+.topbar button{margin-left:10px} .topbar button+.topbar button{margin-left:10px}
#topbar button:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5);outline:none} #topbar button:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5);outline:none}
#file_list{display:grid;grid-gap:10px;grid-template-columns:repeat(auto-fill,minmax(160px,1fr));padding-top:10px} #file_list{display:grid;grid-gap:10px;grid-template-columns:repeat(auto-fill,minmax(160px,1fr));padding-top:10px}


+ 1
- 1
src/admin/sys_data_done.php View File

@@ -257,7 +257,7 @@ else if ($dopost == 'redat') {
function PutInfo($msg1, $msg2) function PutInfo($msg1, $msg2)
{ {
global $cfg_soft_lang; global $cfg_soft_lang;
$msginfo = "<!DOCTYPE html><html><head><meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='IE=Edge,chrome=1'><title>系统提示</title><style>body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#1eb867;text-decoration:none}.tips-box{margin:70px auto 0;width:500px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.tips-head{margin:0 20px;padding:18px 0;border-bottom:1px solid #f5f5f5}.tips-head p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #dc3545}.tips-body{padding:20px;min-height:130px;color:#545b62}.btn{margin-top:20px;text-align:center}.btn a{display:inline-block;padding:.375rem .75rem;font-size:12px;color:#fff;background:#1eb867;border-radius:.2rem;text-align:center;transition:all .3s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(72,180,97,.5)}.text-primary{color:#007bff}@media (max-width:768px){.tips{padding:0 15px}.tips,.tips-box{width:100%}}</style></head><body><div class='tips'><div class='tips-box'><div class='tips-head'><p>系统提示</p></div><div class='tips-body'>{$msg1}{$msg2}</div></div></div>";
$msginfo = "<!DOCTYPE html><html><head><meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='IE=Edge,chrome=1'><title>系统提示</title><style>body{margin:0;line-height:1.6;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#1eb867;text-decoration:none}.tips-box{margin:70px auto 0;width:500px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.tips-head{margin:0 20px;padding:18px 0;border-bottom:1px solid #f5f5f5}.tips-head p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #dc3545}.tips-body{padding:20px;min-height:130px;color:#545b62}.btn{margin-top:20px;text-align:center}.btn a{display:inline-block;padding:.375rem .75rem;font-size:12px;color:#fff;background:#1eb867;border-radius:.2rem;text-align:center;transition:all .3s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(72,180,97,.5)}.text-primary{color:#007bff}@media (max-width:768px){.tips{padding:0 15px}.tips,.tips-box{width:100%}}</style></head><body><div class='tips'><div class='tips-box'><div class='tips-head'><p>系统提示</p></div><div class='tips-body'>{$msg1}{$msg2}</div></div></div>";
echo $msginfo."</body></html>"; echo $msginfo."</body></html>";
} }
function RpLine($str) function RpLine($str)


+ 1
- 1
src/install/install.html View File

@@ -11,7 +11,7 @@
<script src="../static/web/js/popper.min.js"></script> <script src="../static/web/js/popper.min.js"></script>
<script src="../static/web/js/bootstrap.min.js"></script> <script src="../static/web/js/bootstrap.min.js"></script>
<script src="../static/web/js/style.js"></script> <script src="../static/web/js/style.js"></script>
<style>*{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,legend{font-size:18px;font-weight:600}input,select,.btn{font-size:14px!important}.install-box{margin:0 auto;width:860px}.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:36px;line-height:36px;font-size:14px;color:#545b62!important}.fa{font-size:14px!important;color:inherit;cursor:pointer}@media (max-width:760px){.install-box{width:100%}.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}}</style>
<style>*{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,legend{font-size:18px;font-weight:600}input,select,.btn{font-size:14px!important}.install-box{margin:0 auto;width:860px}.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:36px;line-height:36px;font-size:14px;color:#545b62!important}.fa{font-size:14px!important;color:inherit;cursor:pointer}@media (max-width:760px){.install-box{width:100%}.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}}</style>
</head> </head>
<body> <body>
<div class="d-flex flex-md-row align-items-center shadow-sm admin-head mb-5"> <div class="d-flex flex-md-row align-items-center shadow-sm admin-head mb-5">


+ 2
- 2
src/static/ckeditor/contents.css View File

@@ -1,5 +1,5 @@
body { body {
line-height:1.5;
line-height:1.6;
letter-spacing:.6px; letter-spacing:.6px;
font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"; font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";
font-size:14px; font-size:14px;
@@ -21,7 +21,7 @@ ol,ul,dl {
} }
h1,h2,h3,h4,h5,h6 { h1,h2,h3,h4,h5,h6 {
font-weight:600; font-weight:600;
line-height:1.5
line-height:1.6
} }
hr { hr {
border:0px; border:0px;


+ 2
- 3
src/static/web/css/admin.css View File

@@ -32,7 +32,7 @@ form,h1,h2,h3,ul,ol,div {
padding:0 padding:0
} }
body,th,td { body,th,td {
line-height:1.5
line-height:1.6
} }
li,dd { li,dd {
margin:0; margin:0;
@@ -172,8 +172,7 @@ select:focus,input:focus,textarea:focus {
font-weight:600; font-weight:600;
color:#545b62; color:#545b62;
background:#f5f5f5; background:#f5f5f5;
border-bottom:1px solid #dee2e6;
cursor:move
border-bottom:1px solid #dee2e6
} }
.fullpagediv { .fullpagediv {
position:absolute; position:absolute;


+ 9
- 13
src/static/web/css/style.css View File

@@ -1,5 +1,5 @@
body { body {
line-height:1.5;
line-height:1.6;
font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif; font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
color:#545b62; color:#545b62;
letter-spacing:.6px letter-spacing:.6px
@@ -23,7 +23,7 @@ ul,ol {
} }
h1,h2,h3,h4,h5,h6 { h1,h2,h3,h4,h5,h6 {
margin:0; margin:0;
line-height:1.5;
line-height:1.6;
font-weight:600; font-weight:600;
color:#393d49 color:#393d49
} }
@@ -297,19 +297,15 @@ input[type=file] {
.table { .table {
color:#545b62 color:#545b62
} }
.form-control,.btn,.fa {
font-size:14px!important
}
.form-control { .form-control {
height:36px; height:36px;
line-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 cursor:pointer
} }
.btn+.btn,.btn-text+.btn-text { .btn+.btn,.btn-text+.btn-text {
@@ -402,13 +398,13 @@ input[type=file] {
padding:10px 12px; padding:10px 12px;
right:1rem; right:1rem;
bottom:1rem; bottom:1rem;
z-index:9998;
font-size:16px; font-size:16px;
color:#fff; color:#fff;
cursor:pointer; cursor:pointer;
background:#ec982c; background:#ec982c;
border-radius:.25rem; border-radius:.25rem;
border:0
border:0;
z-index:9998
} }
#btnScrollTop:hover { #btnScrollTop:hover {
background:#e77817 background:#e77817


+ 1
- 1
src/system/common.func.php View File

@@ -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;}}"; $func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}";
$rmsg = $func; $rmsg = $func;
$rmsg .= "document.write(\"<style>body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#1eb867;text-decoration:none}.tips-box{margin:70px auto 0;width:500px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.tips-head{margin:0 20px;padding:18px 0;border-bottom:1px solid #f5f5f5}.tips-head p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #dc3545}.tips-body{padding:20px;min-height:130px;color:#545b62}.btn{margin-top:20px;text-align:center}.btn a{display:inline-block;padding:.375rem .75rem;font-size:12px;color:#fff;background:#1eb867;border-radius:.2rem;text-align:center;transition:all .3s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(72,180,97,.5)}.text-primary{color:#007bff}@media (max-width:768px){.tips{padding:0 15px}.tips,.tips-box{width:100%}}</style>\");";
$rmsg .= "document.write(\"<style>body{margin:0;line-height:1.6;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#1eb867;text-decoration:none}.tips-box{margin:70px auto 0;width:500px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.tips-head{margin:0 20px;padding:18px 0;border-bottom:1px solid #f5f5f5}.tips-head p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #dc3545}.tips-body{padding:20px;min-height:130px;color:#545b62}.btn{margin-top:20px;text-align:center}.btn a{display:inline-block;padding:.375rem .75rem;font-size:12px;color:#fff;background:#1eb867;border-radius:.2rem;text-align:center;transition:all .3s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(72,180,97,.5)}.text-primary{color:#007bff}@media (max-width:768px){.tips{padding:0 15px}.tips,.tips-box{width:100%}}</style>\");";
$rmsg .= "document.write(\"<div class='tips'><div class='tips-box'><div class='tips-head'><p>系统提示</p></div>\");"; $rmsg .= "document.write(\"<div class='tips'><div class='tips-box'><div class='tips-head'><p>系统提示</p></div>\");";
$rmsg .= "document.write(\"<div class='tips-body'>\");"; $rmsg .= "document.write(\"<div class='tips-body'>\");";
$rmsg .= "document.write(\"".str_replace("\"", "“", $msg)."\");"; $rmsg .= "document.write(\"".str_replace("\"", "“", $msg)."\");";


Write Preview
Loading…
Cancel
Save