diff --git a/src/dede/css/base.css b/src/dede/css/base.css index 61219d13..0fe2712b 100644 --- a/src/dede/css/base.css +++ b/src/dede/css/base.css @@ -1,34 +1,34 @@ *{font-size:12px;letter-spacing:.4px} -body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5} +body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#ffffff;line-height:1.5} form,h1,h2,h3,ul,ol,div{margin:0;padding:0} 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:#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} +select{height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-size:1rem;font-weight:400;color:#495057;background:#ffffff;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:#ffffff;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:#ffffff;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:#333333;-moz-box-shadow:0 0 2px #28a745;-webkit-box-shadow:0 0 2px #28a745;box-shadow:0 0 2px #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:#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} +textarea{padding:.25rem .5rem;font-size:1rem;font-weight:400;color:#495057;background:#ffffff;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:#333333;-moz-box-shadow:0 0 2px #28a745;-webkit-box-shadow:0 0 2px #28a745;box-shadow:0 0 2px #28a745} img{margin-right:6px;vertical-align:baseline} h1,h2,h3{font-size:18px;color:#424b51} a:link{color:#424b51;text-decoration:none} a:hover{opacity:.8} -a:visited{color:#666} -.pubinputs{padding:.25rem .5rem;width:250px;height:16px;line-height:16px;border-width:1px;border-style:solid;border-color:#999 #ddd #ddd #999} -.iptxt{padding:.25rem .5rem;height:14px;line-height:14px;border-width:1px;border-style:solid;border-color:#999 #ddd #ddd #999} +a:visited{color:#666666} +.pubinputs{padding:.25rem .5rem;width:250px;height:16px;line-height:16px;border-width:1px;border-style:solid;border-color:#999999 #dddddd #dddddd #999999} +.iptxt{padding:.25rem .5rem;height:14px;line-height:14px;border-width:1px;border-style:solid;border-color:#999999 #dddddd #dddddd #999999} .pubinput{padding-top:6px;padding-bottom:0;height:24px;width:250px} .pubinputl{padding-top:6px;padding-bottom:0;height:24px;width:350px} .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:#DFDDD2;height:18px} +.coolbg{padding:.25rem .5rem;border:none;border-right:1px solid #cccccc;border-bottom:1px solid #cccccc;background:#f2f2f2;border-radius:.2rem;cursor:pointer} +.coolbg2{border:1px solid #000000;background:#DFDDD2;height:18px} .ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6} -.bline{height:36px;background:#fff} +.bline{height:36px;background:#ffffff} #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:#E4F7D7;cursor:pointer} @@ -40,7 +40,7 @@ a:visited{color:#666} .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{z-index:8888;border:4px solid #008E38;background:#ffffff} .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} @@ -48,7 +48,7 @@ a:visited{color:#666} .quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005} .quickselfoot{padding-top:8px;border-top:1px dashed #C0CC9D} .quickselItem{margin-bottom:8px} -.quickselItem .topcat{padding-left:6px;line-height:24px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both} +.quickselItem .topcat{padding-left:6px;line-height:24px;border-bottom:1px dashed #cccccc;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:#F0FAEB;z-index:10001} @@ -59,9 +59,9 @@ a:visited{color:#666} #uploadwait{z-index:19999} .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:#fff;border:1px solid #A5AF83} +.option3{background:#ffffff} +.ininput{width:96%;height:20px;border:1px solid #ffffff} +.nbt{padding:2px;background-image:url(../images/allbtbg.gif);background:#ffffff;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} @@ -71,7 +71,7 @@ a:visited{color:#666} .bodytitle div{float:left} .bodytitletxt{padding-left:6px;line-height:28px} .tbtitle td{padding:6px} -.tblist td{padding:6px;background:#fff} +.tblist td{padding:6px;background:#ffffff} .tblist td.tbsname{padding:6px;background:#F9FFE6} .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} @@ -88,8 +88,8 @@ option.stype{padding-left:24px;font-size:12px;height:18px;line-height:18px;backg .gtab a{display:block;float:left;width:80px;height:26px;line-height:26px;text-align:center} .albCt img{cursor:pointer} .maintable{width:98%!important;border:1px solid #dee2e6} +span.page-link{color:#ffffff;background:#28a745} a.btn{color:white!important} -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} \ No newline at end of file diff --git a/src/dede/css/codemirror.css b/src/dede/css/codemirror.css index 24337f6f..1f3b403c 100644 --- a/src/dede/css/codemirror.css +++ b/src/dede/css/codemirror.css @@ -2,10 +2,10 @@ .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-gutters{border-right:1px solid #dddddd;background:#f7f7f7;white-space:nowrap} +.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999999;white-space:nowrap} .CodeMirror-guttermarker{color:black} -.CodeMirror-guttermarker-subtle{color:#999} +.CodeMirror-guttermarker-subtle{color:#999999} .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} @@ -23,7 +23,7 @@ }.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} +.CodeMirror-ruler{border-left:1px solid #cccccc;top:0;bottom:0;position:absolute} .cm-s-default .cm-header{color:blue} .cm-s-default .cm-quote{color:#090} .cm-negative{color:#d44} @@ -48,7 +48,7 @@ .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-hr{color:#999999} .cm-s-default .cm-link{color:#00c} .cm-s-default .cm-error{color:#f00} .cm-invalidchar{color:#f00} diff --git a/src/dede/css/frame.css b/src/dede/css/frame.css index b6048fd3..1f882dc1 100644 --- a/src/dede/css/frame.css +++ b/src/dede/css/frame.css @@ -9,35 +9,35 @@ form{margin:0;padding:0} .head{width:100%;height:76px;overflow:hidden;z-index:8;position:relative} .top{height:46px;width:100%;background-image:linear-gradient(135deg,#008E38 0%,#639709 100%);overflow:hidden;clear:both} .top .top_logo{float:left;margin-left:30px;height:46px;line-height:46px} -.top .top_logo a{font-size:20px;font-weight:600;color:#fff} -.top .top_version{display:inline-block;margin-top:10px;margin-left:10px;color:#fff} +.top .top_logo a{font-size:20px;font-weight:600;color:#ffffff} +.top .top_version{display:inline-block;margin-top:10px;margin-left:10px;color:#ffffff} .top .top_link{float:right;margin-right:30px} .top .top_link ul{float:left;line-height:46px;overflow:hidden} .top .top_link ul li.welcome img{margin-top:-4px;margin-right:10px;width:30px;height:30px;vertical-align:middle} -.top .top_link ul li{float:left;color:#fff} -.top .top_link ul li a{color:#fff;padding-left:20px} -.top .top_link ul li a:hover{color:#ccc} +.top .top_link ul li{float:left;color:#ffffff} +.top .top_link ul li a{color:#ffffff;padding-left:20px} +.top .top_link ul li a:hover{color:#cccccc} .top .top_link .quick{padding:3px 0px 0px 0px;float:left} .top .top_link .quick a{display:block;color:#C60;float:left;line-height:21px;height:21px;overflow:hidden} .top .top_link .quick a.ac_qucikmenu{width:81px;background:url(../images/quick_bg.gif) left top no-repeat;letter-spacing:1px;text-indent:8px} .top .top_link .quick a.ac_qucikmenu:hover{background:url(../images/quick_bg.gif) left bottom no-repeat} .top .top_link .quick a.ac_qucikadd{width:19px;background:url(../images/quick_bg.gif) right top no-repeat} .top .top_link .quick a.ac_qucikadd:hover{background:url(../images/quick_bg.gif) right bottom no-repeat} -.topnav{width:100%;height:30px;background:#333;overflow:hidden;clear:both} +.topnav{width:100%;height:30px;background:#333333;overflow:hidden;clear:both} .topnav .menuact{width:168px;float:left;padding-left:30px;overflow:hidden;padding-top:6px} .topnav .menuact a{overflow:hidden;color:#eee;padding-right:10px} -.topnav .menuact a:hover{color:#fff} -.nav{float:left;padding-left:2px;line-height:26px;color:#999} +.topnav .menuact a:hover{color:#ffffff} +.nav{float:left;padding-left:2px;line-height:26px;color:#999999} .nav ul li{float:left;display:block;margin-left:4px} .nav ul li a{padding:0 10px 0px 10px;color:#FFCC00} -.nav ul li a:hover{color:#fff} -.nav ul li a.thisclass,.nav ul li a.thisclass:hover{color:#4E8100;display:block;font-weight:bold;background:#fff;line-height:23px;border-top:2px solid #FFDE59;margin-top:4px;padding:0 10px 0px 10px} -.sysmsg{height:30px;overflow:hidden;line-height:30px;padding-right:30px;float:right;color:#999;width:500px} +.nav ul li a:hover{color:#ffffff} +.nav ul li a.thisclass,.nav ul li a.thisclass:hover{color:#4E8100;display:block;font-weight:bold;background:#ffffff;line-height:23px;border-top:2px solid #FFDE59;margin-top:4px;padding:0 10px 0px 10px} +.sysmsg{height:30px;overflow:hidden;line-height:30px;padding-right:30px;float:right;color:#999999;width:500px} .scroll{float:right;overflow:hidden;height:30px} -.scroll ul li,.sysmsg ul li a{color:#bbb} +.scroll ul li,.sysmsg ul li a{color:#bbbbbb} .scroll ul li{height:26px;overflow:hidden;line-height:26px;float:right;clear:both;padding-left:20px;background:url(../images/ico-sysmsg.png) 5px 8px no-repeat} .scroll ul li a:hover{text-decoration:underline} -.scroll a{padding-left:10px;color:#fff} +.scroll a{padding-left:10px;color:#ffffff} body.showmenu .left{display:block} body.hidemenu .left{display:none} body.showmenu .right{left:220px} @@ -50,16 +50,16 @@ body.hidemenu .right{left:0} .main{height:100%} .main iframe{height:100%;width:99.99%;z-index:20} .qucikmenu{position:absolute;right:10px;top:32px;z-index:9;display:none} -.qucikmenu ul{width:110px;list-style:none;border:1px solid #E7E7E7;background:#fff} +.qucikmenu ul{width:110px;list-style:none;border:1px solid #E7E7E7;background:#ffffff} .qucikmenu ul li{display:block;text-align:left} -.qucikmenu ul li a{height:30px;line-height:30px;display:block;color:#666;padding-left:10px;padding-right:10px} +.qucikmenu ul li a{height:30px;line-height:30px;display:block;color:#666666;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:#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} +.pagemask{width:100%;height:100%;background:#000000;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:#ffffff;border:none;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;height:100%;width:100%;display:none} +.allmenu{width:800px;background:#ffffff;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} -.maptop dt.bigitem{padding:5px 10px;background:#333;color:#fff;line-height:18px;font-weight:600} +.maptop dt.bigitem{padding:5px 10px;background:#333333;color:#ffffff;line-height:18px;font-weight:600} .mapitem dt{line-height:21px;font-weight:bold;text-indent:10px;background:#EFF1F1} .mapitem ul{margin-top:10px;margin-bottom:10px} .mapitem ul li{text-indent:20px;line-height:24px;background:url(../images/arrr.gif) 4px 6px no-repeat} @@ -67,12 +67,12 @@ body.hidemenu .right{left:0} .allmenu a:hover{color:#F63} #login .theme{clear:both;padding:10px;width:70%;margin-top:20px} #login .theme li{margin-bottom:15px;margin-top:5px;overflow:hidden} -#login .theme span{color:#000;width:150px;display:inline-block;float:left;text-align:right;height:22px;line-height:22px} -input[type="text"],input[type="password"]{width:140px;border-width:1px;border-style:solid;border-color:#fff;padding:2px 4px;height:18px;line-height:18px;vertical-align:middle;background:#fff} -input[type="text"]:focus,input[type="password"]:focus{border-color:#6FB1DF;color:#333;-moz-box-shadow:0 0 3px #A5C760;-webkit-border-shadow:0 0 3px #A5C760;box-shadow:0 0 3px #A5C760} -* html input.text{width:220px;border:1px solid #a7a6aa;background:#fff url(../images/input.gif) 0 0 no-repeat;margin-top:-1px;margin-right:5px;margin-bottom:0;margin-left:2px;padding:3px;line-height:12px} +#login .theme span{color:#000000;width:150px;display:inline-block;float:left;text-align:right;height:22px;line-height:22px} +input[type="text"],input[type="password"]{width:140px;border-width:1px;border-style:solid;border-color:#ffffff;padding:2px 4px;height:18px;line-height:18px;vertical-align:middle;background:#ffffff} +input[type="text"]:focus,input[type="password"]:focus{border-color:#6FB1DF;color:#333333;-moz-box-shadow:0 0 3px #A5C760;-webkit-border-shadow:0 0 3px #A5C760;box-shadow:0 0 3px #A5C760} +* html input.text{width:220px;border:1px solid #a7a6aa;background:#ffffff url(../images/input.gif) 0 0 no-repeat;margin-top:-1px;margin-right:5px;margin-bottom:0;margin-left:2px;padding:3px;line-height:12px} * html input.radio{margin:-1px 0 0 -2px} -.allsearch{float:left;margin-top:7px!important;font-size:12px;border:1px solid #fff;border-radius:.2rem} -.np{margin-left:10px;width:40px;height:18px;line-height:18px;font-size:12px;color:#fff;cursor:pointer;background:#57960f;border:none;border-radius:.2rem} +.allsearch{float:left;margin-top:7px!important;font-size:12px;border:1px solid #ffffff;border-radius:.2rem} +.np{margin-left:10px;width:40px;height:18px;line-height:18px;font-size:12px;color:#ffffff;cursor:pointer;background:#57960f;border:none;border-radius:.2rem} #help{background:url(../images/dlgtitle.gif) repeat-x scroll 0 0 transparent;bottom:0;left:0;position:absolute;width:100%;height:28px;border-top:1px solid #390;line-height:28px;text-align:right;padding-top:0;padding-bottom:0} #help #content{padding-right:12px;background:url(../images/gtk-edit.png) no-repeat scroll 0px -1px;padding-left:20px} \ No newline at end of file diff --git a/src/dede/templets/content_list.htm b/src/dede/templets/content_list.htm index 7128fbcc..a0f1cca4 100755 --- a/src/dede/templets/content_list.htm +++ b/src/dede/templets/content_list.htm @@ -91,7 +91,7 @@ 操作 {dede:datalist} - + {dede:field.id/} @@ -114,17 +114,17 @@ {/dede:datalist} - + 全选 取消 更新 审核 推荐 - 移动 - 删除 + 移动 + 删除 自动关键字"; ?> 增加属性 - 删除属性 + 删除属性 diff --git a/src/dede/templets/index_menu2.htm b/src/dede/templets/index_menu2.htm index 788b51b9..5b9b2e7b 100644 --- a/src/dede/templets/index_menu2.htm +++ b/src/dede/templets/index_menu2.htm @@ -17,7 +17,7 @@ dl.bitem{margin:0 0 6px 10px;width:140px;background:url(images/menunewbg.gif) re dl.bitem2{margin:0 0 6px 10px;width:140px;background:url(images/menunewbg2.gif) repeat-x;clear:both} dl.bitem dt,dl.bitem2 dt{padding-left:30px;height:26px;line-height:26px;cursor:pointer} dl.bitem dt b,dl.bitem2 dt b{color:#4D6C2F} -dl.bitem dd,dl.bitem2 dd{padding:10px;background-color:#fff} +dl.bitem dd,dl.bitem2 dd{padding:10px;background-color:#ffffff} div.items{clear:both;padding:0;height:0} .fllct{float:left;width:80px} .flrct{float:left;padding-top:4px} diff --git a/src/dede/templets/login.htm b/src/dede/templets/login.htm index b5959043..fa1da6f9 100755 --- a/src/dede/templets/login.htm +++ b/src/dede/templets/login.htm @@ -10,10 +10,10 @@ <?php echo $cfg_webname; ?>后台登录