diff --git a/src/admin/css/login.min.css b/src/admin/css/login.min.css
index 6f7f71a4..00bf18ad 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}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}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.logo,.form-control{height:36px}.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
+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}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.logo,.form-control{height:36px}.login-from{margin:0 auto;width:500px}.login-box{padding:1.25rem;background:#fff}.login-power{padding-top:1rem}.login-box,.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:.35rem;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/static/web/css/admin.css b/src/static/web/css/admin.css
index d821b575..f4159aa8 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -429,7 +429,6 @@ body.hidemenu .body-right {
.pubdlg {
background:#fff;
border:2px solid #1eb867;
- border-radius:.5rem;
z-index:8888
}
.pubdlg .title {
@@ -601,7 +600,6 @@ body.hidemenu .body-right {
max-height:60px
}
.icon img {
- margin-right:10px;
width:20px;
height:20px
}
@@ -623,7 +621,7 @@ span.page-link {
color:#fff;
background:#1eb867
}
-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 {
+table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubdlg,.colordlg,.quickselItem .topcat,.web-info,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn-sm,.alert,.rounded {
border-radius:.5rem!important
}
.btn-xs {
@@ -646,13 +644,17 @@ table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubd
#timerange {
width:230px
}
+#selColor {
+ padding:0;
+ width:50px
+}
#browsehappy {
padding:20px 30px;
font-size:14px;
line-height:16px;
color:#856404;
background:#fff3cd;
- border-radius:.25rem;
+ border-radius:.35rem;
border:0
}
.browsehappy-close {
diff --git a/src/static/web/img/color.htm b/src/static/web/img/color.htm
deleted file mode 100644
index f32d2b76..00000000
--- a/src/static/web/img/color.htm
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-颜色选框
-
-
-
-
-
- | |
- |
- |
- |
- |
-
-
- | |
- |
- |
- |
- |
-
-
- | |
- |
- |
- |
- |
-
-
- | |
- |
- |
- |
- 无 |
-
-
-
-
diff --git a/src/static/web/img/colornew.htm b/src/static/web/img/colornew.htm
index 6d5251da..f131d858 100644
--- a/src/static/web/img/colornew.htm
+++ b/src/static/web/img/colornew.htm
@@ -1,33 +1,32 @@
+自定义：
+
\ No newline at end of file