优化整体行高，文档管理界面优化

src/dede/css/base.css

@@ -5,14 +5,14 @@ td{line-height:1.5}
 td,th,div{word-break:break-all;word-wrap:break-word}
 b,strong{font-weight:400}
 li,dd{margin:0;padding:0;list-style-type:none}
-select{height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-size:1rem;font-weight:400;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}
-input[type="button"],input[type="submit"],input[type="reset"]{padding:.25rem .5rem;color:#fff;background-color:#28a745;border-radius:.2rem;border:none;cursor:pointer}
-input[type="text"],input[type="password"]{padding:.375rem .75rem;height:calc(1.5em + .75rem + 2px);font-size:1rem;font-weight:400;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;line-height:18px;vertical-align:middle}
-input[type="text"]:focus,input[type="password"]:focus{border-color:#28a745;color:#333;-moz-box-shadow:0 0 3px #28a745;-webkit-box-shadow:0 0 3px #28a745;box-shadow:0 0 3px #28a745;outline:none}
-input:disabled,input[readonly]{background-color:#e9ecef;opacity:1}
+select{height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-size:1rem;font-weight:400;color:#495057;background:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}
+input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;line-height:1.5;color:#fff;background:#28a745;border-radius:.2rem;border:none;cursor:pointer}
+input[type=text],input[type=password]{padding:.375rem .75rem;height:calc(1.5em + .75rem + 2px);font-size:1rem;font-weight:400;color:#495057;background:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;line-height:18px;vertical-align:middle}
+input[type=text]:focus,input[type="password"]:focus{border-color:#28a745;color:#333;-moz-box-shadow:0 0 3px #28a745;-webkit-box-shadow:0 0 3px #28a745;box-shadow:0 0 3px #28a745;outline:none}
+input:disabled,input[readonly]{background:#e9ecef;opacity:1}
 label{display:inline-block;margin:.5rem 0}
 .alltxt{padding:.25rem .5rem;line-height:18px;vertical-align:middle;border-width:1px;border-style:solid;border-color:#707070 #CECECE #CECECE #707070}
-textarea{padding:.25rem .5rem;font-size:1rem;font-weight:400;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;vertical-align:middle;line-height:16px;overflow:auto;resize:vertical}
+textarea{padding:.25rem .5rem;font-size:1rem;font-weight:400;color:#495057;background:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;vertical-align:middle;line-height:16px;overflow:auto;resize:vertical}
 textarea:focus{border-color:#28a745;color:#333;-moz-box-shadow:0 0 3px #28a745;-webkit-box-shadow:0 0 3px #28a745;box-shadow:0 0 3px #28a745}
 img{margin-right:6px;vertical-align:baseline}
 h1,h2,h3{font-size:18px;color:#424b51}
@@ -26,22 +26,22 @@ a:visited{color:#666}
 .np{border:none}
 .linerow{border-bottom:1px solid #ACACAC}
 .coolbg{padding:.25rem .5rem;border:none;border-right:1px solid #ccc;border-bottom:1px solid #ccc;background:#f2f2f2;cursor:pointer}
-.coolbg2{border:1px solid #000;background-color:#DFDDD2;height:18px}
-.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background-color:#E6E6E6}
-.bline{height:36px;background-color:#fff}
+.coolbg2{border:1px solid #000;background:#DFDDD2;height:18px}
+.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}
+.bline{height:36px;background:#fff}
 #uploadfield{float:left}
 .bline2{border-bottom:1px solid #BCBCBC}
-.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-right:1px solid #ACACAC;border-bottom:1px solid #ACACAC;background-color:#E4F7D7;cursor:pointer}
-.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-right:1px solid #ACACAC;border-bottom:1px solid #ACACAC;background-color:#F7FCDA}
-.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background-color:#DFDDD2;text-align:right}
-.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background-color:#E7F3B1;text-align:right}
-.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background-color:#F8FDF0}
-.coolbg4{width:190px;height:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background-color:#F9FCDC;background:url(../images/dlgtitle.gif) repeat-x;text-align:right}
-.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background-color:#F9FCDC}
-.wsselect{height:60px;line-height:24px overflow-y:auto;background-color:#FCFEF1;overflow:auto}
-.dlg{padding:.25rem .5rem;border:2px solid #008E38;background-color:#F0FAEB;width:360px;line-height:160%}
-.pubdlg{z-index:8888;border:4px solid #008E38;background-color:#fff}
-.pubdlg .title{border-bottom:1px solid #C9CFC1;background-color:#F9FCDC;background:url(../images/dlgtitle.gif) repeat-x;height:28px;line-height:28px;text-align:left;cursor:move}
+.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-right:1px solid #ACACAC;border-bottom:1px solid #ACACAC;background:#E4F7D7;cursor:pointer}
+.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-right:1px solid #ACACAC;border-bottom:1px solid #ACACAC;background:#F7FCDA}
+.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}
+.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background:#E7F3B1;text-align:right}
+.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background:#F8FDF0}
+.coolbg4{width:190px;height:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background:#F9FCDC;background:url(../images/dlgtitle.gif) repeat-x;text-align:right}
+.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}
+.wsselect{height:60px;line-height:24px overflow-y:auto;background:#FCFEF1;overflow:auto}
+.dlg{padding:.25rem .5rem;border:2px solid #008E38;background:#F0FAEB;width:360px;line-height:160%}
+.pubdlg{z-index:8888;border:4px solid #008E38;background:#fff}
+.pubdlg .title{border-bottom:1px solid #C9CFC1;background:#F9FCDC;background:url(../images/dlgtitle.gif) repeat-x;height:28px;line-height:28px;text-align:left;cursor:move}
 .pubdlg .titLeft{float:left;padding-left:8px;line-height:28px;font-weight:bold;color:#555}
 .pubdlg .titRight{float:right;padding:0}
 .fullpagediv{position:absolute;width:100%;height:120%;top:0;left:0;background:#cdcdcd;filter:Alpha(opacity=50);-moz-opacity:.5;opacity:.5;z-index:1999}
@@ -51,17 +51,17 @@ a:visited{color:#666}
 .quickselItem .topcat{padding-left:6px;line-height:24px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both}
 .quickselItem .soncat{padding-left:10px}
 .quickselItem .item{float:left;margin-right:8px}
-.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background-color:#F0FAEB;z-index:10001}
+.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background:#F0FAEB;z-index:10001}
 .dlgws div{width:100%}
-.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background-color:#F0FAEB}
+.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background:#F0FAEB}
 #_mysource{z-index:10003}
 #_mywriter{z-index:10004}
 #uploadwait{z-index:19999}
-.option1{background-color:#DCECA6}
-.option2{background-color:#F7FBD2}
-.option3{background-color:#fff}
+.option1{background:#DCECA6}
+.option2{background:#F7FBD2}
+.option3{background:#fff}
 .ininput{width:96%;height:20px;border:1px solid #fff}
-.nbt{padding:2px;background-image:url(../images/allbtbg.gif);background-color:#fff;border:1px solid #A5AF83}
+.nbt{padding:2px;background-image:url(../images/allbtbg.gif);background:#fff;border:1px solid #A5AF83}
 .tdt{padding-left:6px}
 .waitpage{position:absolute;top:0;left:0;filter:Alpha(opacity=70);-moz-opacity:.7;background:url(../../images/loading1.gif) #ababab center no-repeat;z-index:10000}
 .divpre img{max-width:150px;max-height:100px}
@@ -73,15 +73,15 @@ a:visited{color:#666}
 .tbtitle td{padding:6px}
 .tblist td{padding:6px;background:#fff}
 .tblist td.tbsname{padding:6px;background:#F9FFE6}
-.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background-color:#F0FAEB;z-index:10005}
+.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background:#F0FAEB;z-index:10005}
 option.alltype{padding-left:16px;height:18px;line-height:18px;font-size:12px;background:url(../images/arr4.gif) 3px 4px no-repeat}
 option.btype{padding-left:16px;height:18px;line-height:18px;font-size:12px;background:url(../images/arr4.gif) 3px 4px no-repeat}
 option.stype{padding-left:24px;font-size:12px;height:18px;line-height:18px;background:url(../images/arrr.gif) 11px 4px no-repeat}
 .ilist{border-top:1px dashed #BCBCBC;border-bottom:1px dashed #BCBCBC;border-left:1px dashed #BCBCBC}
 .ilist td{border-right:1px dashed #BCBCBC}
 #typeid2{float:left;font-size:12px;padding:0;height:18px;background:url(../images/typeid2bg.gif) no-repeat;border:0}
-.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer}
 #litpic{margin-left:-20px;width:85px;height:20px;filter:alpha(opacity=00);-moz-opacity:.0;opacity:.0;cursor:pointer}
+.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer}
 #starttime,#endtime,#pubdate{padding-left:20px;background:url(../images/calendar.gif) 3px no-repeat}
 #title{background:url(../images/ruler.gif) repeat-x 0px 10px}
 .spec{width:60px}
@@ -89,7 +89,7 @@ option.stype{padding-left:24px;font-size:12px;height:18px;line-height:18px;backg
 .albCt img{cursor:pointer}
 .maintable{width:98%!important;border:1px solid #dee2e6}
 a.btn{color:white!important}
-span.page-link{color:#fff;background-color:#28a745}
-.btn-success{background-color:#28a745;border-color:#28a745}
-.table td,.table th{padding:.65rem}
+span.page-link{color:#fff;background:#28a745}
+.btn-success{background:#28a745;border-color:#28a745}
+.table td,.table th{padding:.60rem;vertical-align:middle}
 .table th img,.table td img{vertical-align:text-bottom}

src/dede/css/codemirror.css

@@ -1,382 +1,97 @@
-.CodeMirror {
-	font-family:monospace;
-	height:450px;
-	color:black
-}
-.CodeMirror-lines {
-	padding:4px 0
-}
-.CodeMirror pre {
-	padding:0 4px
-}
-.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler {
-	background-color:white
-}
-.CodeMirror-gutters {
-	border-right:1px solid #ddd;
-	background-color:#f7f7f7;
-	white-space:nowrap
-}
-.CodeMirror-linenumber {
-	padding:0 3px 0 5px;
-	min-width:20px;
-	text-align:right;
-	color:#999;
-	white-space:nowrap
-}
-.CodeMirror-guttermarker {
-	color:black
-}
-.CodeMirror-guttermarker-subtle {
-	color:#999
-}
-.CodeMirror-cursor {
-	border-left:1px solid black;
-	border-right:none;
-	width:0
-}
-.CodeMirror div.CodeMirror-secondarycursor {
-	border-left:1px solid silver
-}
-.cm-fat-cursor .CodeMirror-cursor {
-	width:auto;
-	border:0 !important;
-	background:#7e7
-}
-.cm-fat-cursor div.CodeMirror-cursors {
-	z-index:1
-}
-.cm-animate-fat-cursor {
-	width:auto;
-	border:0;
-	-webkit-animation:blink 1.06s steps(1) infinite;
-	-moz-animation:blink 1.06s steps(1) infinite;
-	animation:blink 1.06s steps(1) infinite;
-	background-color:#7e7
-}
-@-moz-keyframes blink {
-	0% {
-	}50% {
-	background-color:transparent
-}
-100% {
-	}
-}
-@-webkit-keyframes blink {
-	0% {
-	}50% {
-	background-color:transparent
-}
-100% {
-	}
-}
-@keyframes blink {
-	0% {
-	}50% {
-	background-color:transparent
-}
-100% {
-	}
-}
-.CodeMirror-overwrite .CodeMirror-cursor {
-	}.cm-tab {
-	display:inline-block;
-	text-decoration:inherit
-}
-.CodeMirror-rulers {
-	position:absolute;
-	left:0;
-	right:0;
-	top:-50px;
-	bottom:-20px;
-	overflow:hidden
-}
-.CodeMirror-ruler {
-	border-left:1px solid #ccc;
-	top:0;
-	bottom:0;
-	position:absolute
-}
-.cm-s-default .cm-header {
-	color:blue
-}
-.cm-s-default .cm-quote {
-	color:#090
-}
-.cm-negative {
-	color:#d44
-}
-.cm-positive {
-	color:#292
-}
-.cm-header,.cm-strong {
-	font-weight:bold
-}
-.cm-em {
-	font-style:italic
-}
-.cm-link {
-	text-decoration:underline
-}
-.cm-strikethrough {
-	text-decoration:line-through
-}
-.cm-s-default .cm-keyword {
-	color:#708
-}
-.cm-s-default .cm-atom {
-	color:#219
-}
-.cm-s-default .cm-number {
-	color:#164
-}
-.cm-s-default .cm-def {
-	color:#00f
-}
-.cm-s-default .cm-variable,.cm-s-default .cm-punctuation,.cm-s-default .cm-property,.cm-s-default .cm-operator {
-	}.cm-s-default .cm-variable-2 {
-	color:#05a
-}
-.cm-s-default .cm-variable-3 {
-	color:#085
-}
-.cm-s-default .cm-comment {
-	color:#a50
-}
-.cm-s-default .cm-string {
-	color:#a11
-}
-.cm-s-default .cm-string-2 {
-	color:#f50
-}
-.cm-s-default .cm-meta {
-	color:#555
-}
-.cm-s-default .cm-qualifier {
-	color:#555
-}
-.cm-s-default .cm-builtin {
-	color:#30a
-}
-.cm-s-default .cm-bracket {
-	color:#997
-}
-.cm-s-default .cm-tag {
-	color:#170
-}
-.cm-s-default .cm-attribute {
-	color:#00c
-}
-.cm-s-default .cm-hr {
-	color:#999
-}
-.cm-s-default .cm-link {
-	color:#00c
-}
-.cm-s-default .cm-error {
-	color:#f00
-}
-.cm-invalidchar {
-	color:#f00
-}
-.CodeMirror-composing {
-	border-bottom:2px solid
-}
-div.CodeMirror span.CodeMirror-matchingbracket {
-	color:#0f0
-}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {
-	color:#f22
-}
-.CodeMirror-matchingtag {
-	background:rgba(255,150,0,.3)
-}
-.CodeMirror-activeline-background {
-	background:#e8f2ff
-}
-.CodeMirror {
-	position:relative;
-	overflow:hidden;
-	background:white
-}
-.CodeMirror-scroll {
-	overflow:scroll !important;
-	margin-bottom:-30px;
-	margin-right:-30px;
-	padding-bottom:30px;
-	height:100%;
-	outline:none;
-	position:relative
-}
-.CodeMirror-sizer {
-	position:relative;
-	border-right:30px solid transparent
-}
-.CodeMirror-vscrollbar,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler {
-	position:absolute;
-	z-index:6;
-	display:none
-}
-.CodeMirror-vscrollbar {
-	right:0;
-	top:0;
-	overflow-x:hidden;
-	overflow-y:scroll
-}
-.CodeMirror-hscrollbar {
-	bottom:0;
-	left:0;
-	overflow-y:hidden;
-	overflow-x:scroll
-}
-.CodeMirror-scrollbar-filler {
-	right:0;
-	bottom:0
-}
-.CodeMirror-gutter-filler {
-	left:0;
-	bottom:0
-}
-.CodeMirror-gutters {
-	position:absolute;
-	left:0;
-	top:0;
-	min-height:100%;
-	z-index:3
-}
-.CodeMirror-gutter {
-	white-space:normal;
-	height:100%;
-	display:inline-block;
-	vertical-align:top;
-	margin-bottom:-30px
-}
-.CodeMirror-gutter-wrapper {
-	position:absolute;
-	z-index:4;
-	background:none !important;
-	border:none !important
-}
-.CodeMirror-gutter-background {
-	position:absolute;
-	top:0;
-	bottom:0;
-	z-index:4
-}
-.CodeMirror-gutter-elt {
-	position:absolute;
-	cursor:default;
-	z-index:4
-}
-.CodeMirror-gutter-wrapper {
-	-webkit-user-select:none;
-	-moz-user-select:none;
-	user-select:none
-}
-.CodeMirror-lines {
-	cursor:text;
-	min-height:1px
-}
-.CodeMirror pre {
-	-moz-border-radius:0;
-	-webkit-border-radius:0;
-	border-radius:0;
-	border-width:0;
-	background:transparent;
-	font-family:inherit;
-	font-size:inherit;
-	margin:0;
-	white-space:pre;
-	word-wrap:normal;
-	line-height:inherit;
-	color:inherit;
-	z-index:2;
-	position:relative;
-	overflow:visible;
-	-webkit-tap-highlight-color:transparent;
-	-webkit-font-variant-ligatures:contextual;
-	font-variant-ligatures:contextual
-}
-.CodeMirror-wrap pre {
-	word-wrap:break-word;
-	white-space:pre-wrap;
-	word-break:normal
-}
-.CodeMirror-linebackground {
-	position:absolute;
-	left:0;
-	right:0;
-	top:0;
-	bottom:0;
-	z-index:0
-}
-.CodeMirror-linewidget {
-	position:relative;
-	z-index:2;
-	overflow:auto
-}
-.CodeMirror-widget {
-	}.CodeMirror-code {
-	outline:none
-}
-.CodeMirror-scroll,.CodeMirror-sizer,.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber {
-	-moz-box-sizing:content-box;
-	box-sizing:content-box
-}
-.CodeMirror-measure {
-	position:absolute;
-	width:100%;
-	height:0;
-	overflow:hidden;
-	visibility:hidden
-}
-.CodeMirror-cursor {
-	position:absolute;
-	pointer-events:none
-}
-.CodeMirror-measure pre {
-	position:static
-}
-div.CodeMirror-cursors {
-	visibility:hidden;
-	position:relative;
-	z-index:3
-}
-div.CodeMirror-dragcursors {
-	visibility:visible
-}
-.CodeMirror-focused div.CodeMirror-cursors {
-	visibility:visible
-}
-.CodeMirror-selected {
-	background:#d9d9d9
-}
-.CodeMirror-focused .CodeMirror-selected {
-	background:#d7d4f0
-}
-.CodeMirror-crosshair {
-	cursor:crosshair
-}
-.CodeMirror-line::selection,.CodeMirror-line > span::selection,.CodeMirror-line > span > span::selection {
-	background:#d7d4f0
-}
-.CodeMirror-line::-moz-selection,.CodeMirror-line > span::-moz-selection,.CodeMirror-line > span > span::-moz-selection {
-	background:#d7d4f0
-}
-.cm-searching {
-	background:#ffa;
-	background:rgba(255,255,0,.4)
-}
-.cm-force-border {
-	padding-right:.1px
-}
-@media print {
-	.CodeMirror div.CodeMirror-cursors {
-	visibility:hidden
-}
-}.cm-tab-wrap-hack:after {
-	content:''
-}
-span.CodeMirror-selectedtext {
-	background:none
-}
+.CodeMirror{font-family:monospace;height:450px;color:black}
+.CodeMirror-lines{padding:4px 0}
+.CodeMirror pre{padding:0 4px}
+.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{background:white}
+.CodeMirror-gutters{border-right:1px solid #ddd;background:#f7f7f7;white-space:nowrap}
+.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}
+.CodeMirror-guttermarker{color:black}
+.CodeMirror-guttermarker-subtle{color:#999}
+.CodeMirror-cursor{border-left:1px solid black;border-right:none;width:0}
+.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}
+.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0 !important;background:#7e7}
+.cm-fat-cursor div.CodeMirror-cursors{z-index:1}
+.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background:#7e7}
+@-moz-keyframes blink{0%{}
+50%{background:transparent}
+100%{}
+}@-webkit-keyframes blink{0%{}
+50%{background:transparent}
+100%{}
+}@keyframes blink{0%{}
+50%{background:transparent}
+100%{}
+}.CodeMirror-overwrite .CodeMirror-cursor{}
+.cm-tab{display:inline-block;text-decoration:inherit}
+.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:-20px;overflow:hidden}
+.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}
+.cm-s-default .cm-header{color:blue}
+.cm-s-default .cm-quote{color:#090}
+.cm-negative{color:#d44}
+.cm-positive{color:#292}
+.cm-header,.cm-strong{font-weight:bold}
+.cm-em{font-style:italic}
+.cm-link{text-decoration:underline}
+.cm-strikethrough{text-decoration:line-through}
+.cm-s-default .cm-keyword{color:#708}
+.cm-s-default .cm-atom{color:#219}
+.cm-s-default .cm-number{color:#164}
+.cm-s-default .cm-def{color:#00f}
+.cm-s-default .cm-variable,.cm-s-default .cm-punctuation,.cm-s-default .cm-property,.cm-s-default .cm-operator{}
+.cm-s-default .cm-variable-2{color:#05a}
+.cm-s-default .cm-variable-3{color:#085}
+.cm-s-default .cm-comment{color:#a50}
+.cm-s-default .cm-string{color:#a11}
+.cm-s-default .cm-string-2{color:#f50}
+.cm-s-default .cm-meta{color:#555}
+.cm-s-default .cm-qualifier{color:#555}
+.cm-s-default .cm-builtin{color:#30a}
+.cm-s-default .cm-bracket{color:#997}
+.cm-s-default .cm-tag{color:#170}
+.cm-s-default .cm-attribute{color:#00c}
+.cm-s-default .cm-hr{color:#999}
+.cm-s-default .cm-link{color:#00c}
+.cm-s-default .cm-error{color:#f00}
+.cm-invalidchar{color:#f00}
+.CodeMirror-composing{border-bottom:2px solid}
+div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}
+div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}
+.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}
+.CodeMirror-activeline-background{background:#e8f2ff}
+.CodeMirror{position:relative;overflow:hidden;background:white}
+.CodeMirror-scroll{overflow:scroll !important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:none;position:relative}
+.CodeMirror-sizer{position:relative;border-right:30px solid transparent}
+.CodeMirror-vscrollbar,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{position:absolute;z-index:6;display:none}
+.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}
+.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}
+.CodeMirror-scrollbar-filler{right:0;bottom:0}
+.CodeMirror-gutter-filler{left:0;bottom:0}
+.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}
+.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}
+.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:none !important;border:none !important}
+.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}
+.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}
+.CodeMirror-gutter-wrapper{-webkit-user-select:none;-moz-user-select:none;user-select:none}
+.CodeMirror-lines{cursor:text;min-height:1px}
+.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:transparent;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}
+.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}
+.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}
+.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}
+.CodeMirror-widget{}
+.CodeMirror-code{outline:none}
+.CodeMirror-scroll,.CodeMirror-sizer,.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber{-moz-box-sizing:content-box;box-sizing:content-box}
+.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}
+.CodeMirror-cursor{position:absolute;pointer-events:none}
+.CodeMirror-measure pre{position:static}
+div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}
+div.CodeMirror-dragcursors{visibility:visible}
+.CodeMirror-focused div.CodeMirror-cursors{visibility:visible}
+.CodeMirror-selected{background:#d9d9d9}
+.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}
+.CodeMirror-crosshair{cursor:crosshair}
+.CodeMirror-line::selection,.CodeMirror-line > span::selection,.CodeMirror-line > span > span::selection{background:#d7d4f0}
+.CodeMirror-line::-moz-selection,.CodeMirror-line > span::-moz-selection,.CodeMirror-line > span > span::-moz-selection{background:#d7d4f0}
+.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}
+.cm-force-border{padding-right:.1px}
+@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}
+}.cm-tab-wrap-hack:after{content:''}
+span.CodeMirror-selectedtext{background:none}

src/dede/css/frame.css

@@ -55,7 +55,7 @@ body.hidemenu .right{left:0}
 .qucikmenu ul li a{height:30px;line-height:30px;display:block;color:#666;padding-left:10px;padding-right:10px}
 .qucikmenu ul li a:hover{background:#F7F7F7}
 .pagemask{width:100%;height:100%;background:#000;position:absolute;z-index:100;filter:alpha(opacity=70);-moz-opacity:.7;opacity:.7;display:none}
-.iframemask{position:absolute;z-index:80;top:0;left:0;background-color:#fff;border:none;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;height:100%;width:100%;display:none}
+.iframemask{position:absolute;z-index:80;top:0;left:0;background:#fff;border:none;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;height:100%;width:100%;display:none}
 .allmenu{width:800px;background:#fff;z-index:999;position:absolute;left:50%;top:76px;margin-left:-400px;display:none;padding:10px}
 .allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px}
 .maptop{float:left;width:130px;overflow:hidden;padding-right:6px;padding-left:6px;margin-left:-1px}

src/dede/dialog/select_images.php

@@ -55,7 +55,7 @@ if (!empty($noeditor)) {
     <link rel="stylesheet" href="../css/base.css">
     <style>
 html{background:#f2f2f2}
-body{margin:0;line-height:22px;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
+body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
 a{text-decoration:none!important}
 table{background:#fff}
 .bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}

src/dede/dialog/select_soft.php

@@ -48,7 +48,7 @@ if (!empty($noeditor)) {
     <link rel="stylesheet" href="../css/base.css">
     <style>
 html{background:#f2f2f2}
-body{margin:0;line-height:22px;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
+body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
 a{text-decoration:none!important}
 table{background:#fff}
 .bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}

src/dede/dialog/select_templets.php

@@ -40,7 +40,7 @@ if (empty($comeback)) {
     <link rel="stylesheet" href="../css/base.css">
     <style>
 html{background:#f2f2f2}
-body{margin:0;line-height:22px;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
+body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
 a{text-decoration:none!important}
 table{background:#fff}
 .bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}

src/dede/templets/content_list.htm

@@ -1,7 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+	<meta charset="<?php echo $cfg_soft_lang; ?>">
 	<title>文档管理</title>
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
 	<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
@@ -13,144 +13,122 @@
 	<script src="js/context_menu.js"></script>
 	<script src="js/main.js"></script>
 	<script src="js/list.js"></script>
+	<style>
+.btn+.btn{margin-left:10px}
+	</style>
 </head>
-
-<body leftmargin="8" topmargin="8" background='images/allbg.gif' onLoad="ContextMenu.intializeContextMenu()">
-	<!--快速转换位置按钮-->
-	<table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" class="table maintable table-bordered mt-3">
+<body leftmargin="8" topmargin="8" background="images/allbg.gif" onLoad="ContextMenu.intializeContextMenu()">
+	<table width="98%" cellspacing="0" cellpadding="0" align="center" class="table maintable table-bordered mt-3">
 		<tr>
-			<td align="center">
-				<button type='button' class="btn btn-success btn-sm" onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';">添加文档</button>
-				{dede:if $adminid==$mid }
-				<button type='button' class="btn btn-success btn-sm" onClick="location='content_list.php?cid={dede:global.cid/}&mid=0';">全部文档</button>
+			<td>
+				<button type="button" class="btn btn-success btn-sm" onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';">添加文档</button>
+				{dede:if $adminid==$mid}
+				<button type="button" class="btn btn-success btn-sm" onClick="location='content_list.php?cid={dede:global.cid/}&mid=0';">全部文档</button>
 				{else}
-				<button type='button' class="btn btn-success btn-sm" onClick="location='content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';">我的文档</button>
+				<button type="button" class="btn btn-success btn-sm" onClick="location='content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';">我的文档</button>
 				{/dede:if}
 				{dede:global.CheckUserSend/}
-				<button type='button' class="btn btn-success btn-sm" onClick="location='catalog_main.php';">栏目管理</button>
-				<button type='button' class="btn btn-success btn-sm" name='bb1' onClick="location='makehtml_list.php?cid={dede:global.cid/}';">更新列表</button>
-				<button type='button' class="btn btn-success btn-sm" name='bb2' onClick="location='makehtml_archives.php?cid={dede:global.cid/}';">更新文档</button>
-				<button type='button' class="btn btn-success btn-sm" name='bb1' onClick="location='recycling.php?cid={dede:global.cid/}';">文章回收站</button>
+				<button type="button" class="btn btn-success btn-sm" onClick="location='catalog_main.php';">栏目管理</button>
+				<button type="button" class="btn btn-success btn-sm" name="bb1" onClick="location='makehtml_list.php?cid={dede:global.cid/}';">更新列表</button>
+				<button type="button" class="btn btn-success btn-sm" name="bb2" onClick="location='makehtml_archives.php?cid={dede:global.cid/}';">更新文档</button>
+				<button type="button" class="btn btn-success btn-sm" name="bb1" onClick="location='recycling.php?cid={dede:global.cid/}';">文档回收站</button>
 			</td>
 		</tr>
 	</table>
-	<!--内容列表-->
-	<form name="form2">
-		<table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#CFCFCF" align="center"
-			style="margin-top:8px" class="table table-bordered maintable">
-			<tr bgcolor="#E7E7E7">
-				<td height="28" colspan="10" background="images/tbg.gif" style="padding-left:10px;">◆ {dede:global.positionname/}文档列表 &nbsp;(使用鼠标右键弹出菜单)
+	<form name="form3" action="content_list.php" method="get">
+		<input type="hidden" name="dopost" value="listArchives">
+		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mb-3" style="margin-top:10px;border:1px solid #dee2e6">
+			<tr>
+				<td style="background:#f2f2f2">
+					<table cellpadding="0" cellspacing="0" height="36">
+						<tr>
+							<td>
+								<select name="cid" style="margin:0 10px;width:160px">
+									<option value="0">选择栏目</option>
+									{dede:global.optionarr/}
+								</select>
+							</td>
+							<td>关键字：</td>
+							<td><input name="keyword" type="text" value="{dede:global.keyword/}" style="margin-right:10px;width:260px"></td>
+							<td>
+								<select name="orderby" style="margin-right:10px;width:160px">
+									<option value="id">选择排序</option>
+									<option value="pubdate">更新时间</option>
+									<option value="sortrank">置顶权值</option>
+									<option value="click">点击量</option>
+									<option value="scores">评论积分</option>
+									<option value="lastpost">最后评论</option>
+								</select>
+							</td>
+							<td>
+								<select name="flag" style="margin-right:10px;width:160px">
+									<option value="">选择属性</option>
+									{dede:global.flagsArr/}
+								</select>
+							</td>
+							<td><button type="submit" class="btn btn-success btn-sm">搜索</button></td>
+						</tr>
+					</table>
 				</td>
 			</tr>
-			<tr align="center" bgcolor="#FBFCE2" height="25">
+		</table>
+	</form>
+	<form name="form2">
+		<table width="98%" cellpadding="2" cellspacing="1" bgcolor="#CFCFCF" align="center" class="table table-bordered maintable" style="margin-top:10px">
+			<tr>
+				<td height="30" colspan="10" style="margin-left:10px;background:#f2f2f2">{dede:global.positionname/}文档列表（使用鼠标右键弹出菜单）</td>
+			</tr>
+			<tr align="center" bgcolor="#FBFCE2" height="26">
 				<td width="6%">ID</td>
-				<td width="4%">选择</td>
-				<td width="25%">文章标题</td>
+				<td width="6%">选择</td>
+				<td width="30%">文章标题</td>
 				<td width="10%">更新时间</td>
-				<td width="10%">类目</td>
-				<td width="8%">点击</td>
+				<td width="14%">类目</td>
+				<td width="6%">点击</td>
 				<td width="6%">HTML</td>
-				<td width="8%">权限</td>
-				<td width="8%">发布人</td>
-				<td width="12%">操作</td>
+				<td width="6%">权限</td>
+				<td width="6%">发布人</td>
+				<td width="10%">操作</td>
 			</tr>
 			{dede:datalist}
-			<tr align='center' bgcolor="#FFFFFF" height="26" align="center" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
-				<td nowrap>
-					{dede:field.id/}
-				</td>
-				<td>
-					<input name="arcID" type="checkbox" id="arcID" value="{dede:field.id/}" class="np" />
-				</td>
-				<td align='left'>
+			<tr align="center" bgcolor="#fff" height="26" align="center" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#fff';">
+				<td>{dede:field.id/}</td>
+				<td><input name="arcID" type="checkbox" id="arcID" value="{dede:field.id/}" class="np"></td>
+				<td align="left">
 					<span id="arc{dede:field.id/}">
-						<a href='archives_do.php?aid={dede:field.id/}&dopost=editArchives'
-							oncontextmenu="ShowMenu(event,this,{dede:field.id/},'{dede:field.title function="
-							str_replace('\'', '' , @me)" /}')">
-							<u>{dede:field.title/}</u>
-						</a>
+						<a href="archives_do.php?aid={dede:field.id/}&dopost=editArchives" oncontextmenu="ShowMenu(event,this,{dede:field.id/},'{dede:field.title function="str_replace('\'','',@me)"/}')">{dede:field.title/}</a>
 					</span>
 					{dede:field.flag function='IsCommendArchives(@me)'/}
 				</td>
 				<td>{dede:field.senddate function='GetDateMk(@me)'/}</td>
-				<td><a href='content_list.php?cid={dede:field.typeid/}'>{dede:field.typeid function='GetTypename(@me)'/}</a></td>
+				<td><a href="content_list.php?cid={dede:field.typeid/}">{dede:field.typeid function='GetTypename(@me)'/}</a></td>
 				<td>{dede:field.click/}</td>
 				<td>{dede:field.ismake function="IsHtmlArchives(@me)"/}</td>
 				<td>{dede:field.arcrank function="GetRankName(@me)"/}</td>
 				<td>{dede:field.mid function=GetMemberName(@me)/}</td>
 				<td>
-					<a href="javascript:;" title="编辑属性" class="btn btn-success btn-sm" onClick="QuickEdit('{dede:field.id/}', event, this);"> <i class="fa fa-cogs" aria-hidden="true"></i></a>
-					<a href="javascript:;" title="编辑" class="btn btn-success btn-sm" onClick="editArc({dede:field.id/});"> <i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
-					<a href="javascript:;" title="预览" class="btn btn-success btn-sm" onClick="viewArc({dede:field.id/});"> <i class="fa fa-globe" aria-hidden="true"></i></a>
+					<a href="javascript:;" title="属性" class="btn btn-success btn-sm" onClick="QuickEdit('{dede:field.id/}',event,this);"><i class="fa fa-cogs" aria-hidden="true"></i></a>
+					<a href="javascript:;" title="编辑" class="btn btn-success btn-sm" onClick="editArc({dede:field.id/});"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
+					<a href="javascript:;" title="预览" class="btn btn-success btn-sm" onClick="viewArc({dede:field.id/});"><i class="fa fa-globe" aria-hidden="true"></i></a>
 				</td>
 			</tr>
 			{/dede:datalist}
-			<tr bgcolor="#ffffff">
-				<td height="36" colspan="10">
-					&nbsp;
+			<tr>
+				<td height="36" colspan="10" style="margin-left:10px;background:#fff">
 					<a class="btn btn-success btn-sm" href="javascript:selAll()">全选</a>
 					<a class="btn btn-success btn-sm" href="javascript:noSelAll()">取消</a>
-					<a class="btn btn-success btn-sm" href="javascript:updateArc(0)">&nbsp;更新&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:checkArc(0)">&nbsp;审核&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:adArc(0)">&nbsp;推荐&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:;"
-						onClick="moveArc(event,this,<?php echo (empty($channelid) ? 0 : $channelid); ?>)"
-						class="coolbg">&nbsp;移动&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:delArc(0)">&nbsp;删除&nbsp;</a>
-					<?php if($channelid==1) echo "	<a class='btn btn-success btn-sm' href='javascript:kwArc(0)' class='coolbg'>&nbsp;自动关键字&nbsp;</a>\r\n"; ?>
-					<a class="btn btn-success btn-sm" href="javascript:;" onClick="cAtts('attsAdd',event,this)" class="coolbg">&nbsp;增加属性&nbsp;</a>
-					<a href="javascript:;" onClick="cAtts('attsDel',event,this)" class="btn btn-success btn-sm">&nbsp;删除属性&nbsp;</a>
-				</td>
-			</tr>
-			<tr align="right" bgcolor="#F9FCEF">
-				<td height="36" colspan="10" align="center">
-					{dede:pagelist listsize=3/}
+					<a class="btn btn-success btn-sm" href="javascript:updateArc(0)">更新</a>
+					<a class="btn btn-success btn-sm" href="javascript:checkArc(0)">审核</a>
+					<a class="btn btn-success btn-sm" href="javascript:adArc(0)">推荐</a>
+					<a class="btn btn-success btn-sm" href="javascript:;" onClick="moveArc(event,this,<?php echo (empty($channelid)?0:$channelid); ?>)" class="coolbg">移动</a>
+					<a class="btn btn-success btn-sm" href="javascript:delArc(0)">删除</a>
+					<?php if($channelid==1) echo "<a class='btn btn-success btn-sm' href='javascript:kwArc(0)'>自动关键字</a>"; ?>
+					<a class="btn btn-success btn-sm" href="javascript:;" onClick="cAtts('attsAdd',event,this)">增加属性</a>
+					<a class="btn btn-success btn-sm" href="javascript:;" onClick="cAtts('attsDel',event,this)">删除属性</a>
 				</td>
 			</tr>
-		</table>
-	</form>
-	<!--搜索表单-->
-	<form name='form3' action='content_list.php' method='get'>
-		<input type='hidden' name='dopost' value='listArchives' />
-		<table width='98%' border='0' cellpadding='1' cellspacing='1' bgcolor='#cfcfcf' align="center" style="margin-top:8px;border:1px solid #dee2e6" class="mb-3">
-			<tr bgcolor='#EEF4EA'>
-				<td background='images/wbg.gif' align='center'>
-					<table border='0' cellpadding='0' cellspacing='0' height="32">
-						<tr>
-							<td width='160'>
-								<select name='cid' style='width:150px'>
-									<option value='0'>选择栏目...</option>
-									{dede:global.optionarr /}
-								</select>
-							</td>
-							<td nowrap>
-								关键字：
-							</td>
-							<td width='130'>
-								<input type='text' name='keyword' value='{dede:global.keyword/}' style='width:120px' />
-							</td>
-							<td width='90'>
-								<select name='orderby' style='width:80px'>
-									<option value='id'>排序...</option>
-									<option value='pubdate'>更新时间</option>
-									<option value='sortrank'>置顶权值</option>
-									<option value='click'>点击量</option>
-									<option value='scores'>评论积分</option>
-									<option value='lastpost'>最后评论</option>
-								</select>
-							</td>
-							<td width='90'>
-								<select name='flag' style='width:80px'>
-									<option value=''>属性...</option>
-									{dede:global.flagsArr /}
-								</select>
-							</td>
-							<td>
-								<button type="submit" class="btn btn-success">搜索</button>
-							</td>
-						</tr>
-					</table>
-				</td>
+			<tr>
+				<td height="36" colspan="10" align="center" style="background:#f2f2f2">{dede:pagelist listsize=6/}</td>
 			</tr>
 		</table>
 	</form>

src/dede/templets/login.htm

@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="../static/css/dede.css">
 	<title><?php echo $cfg_webname; ?>后台登录</title>
 	<style>
-body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;background-color:#f2f2f2}
+body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;background:#f2f2f2}
 header{background:#fff}
 header .logo{width:260px;padding:1em 0}
 .login-from{max-width:580px;width:100%}