UI美化色调微调,表单控件小圆角增强平滑感
7
.gitignore
vendored
@@ -3,6 +3,8 @@
|
|||||||
**/webapp/userfiles
|
**/webapp/userfiles
|
||||||
**/WEB-INF/classes
|
**/WEB-INF/classes
|
||||||
**/logs/*.log*
|
**/logs/*.log*
|
||||||
|
*.lic
|
||||||
|
*.epoch
|
||||||
|
|
||||||
.classpath
|
.classpath
|
||||||
.project
|
.project
|
||||||
@@ -11,9 +13,6 @@
|
|||||||
*.ipr
|
*.ipr
|
||||||
*.iml
|
*.iml
|
||||||
*.iws
|
*.iws
|
||||||
*.lic
|
|
||||||
|
|
||||||
.DS_Store
|
.DS_Store
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
|
|
||||||
*.epoch
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
/*!
|
/*
|
||||||
* AdminLTE v2.4.0
|
* AdminLTE v2.4.0
|
||||||
* Author: Almsaeed Studio
|
* Author: Almsaeed Studio
|
||||||
* Website: Almsaeed Studio <https://adminlte.io>
|
* Website: Almsaeed Studio <https://adminlte.io>
|
||||||
@@ -198,7 +198,7 @@ a:focus {
|
|||||||
margin-left: 230px;
|
margin-left: 230px;
|
||||||
border: none;
|
border: none;
|
||||||
min-height: 50px;
|
min-height: 50px;
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
}
|
}
|
||||||
.layout-top-nav .main-header .navbar {
|
.layout-top-nav .main-header .navbar {
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
@@ -727,7 +727,7 @@ a:focus {
|
|||||||
border-left-width: 0;
|
border-left-width: 0;
|
||||||
}
|
}
|
||||||
.nav-tabs.control-sidebar-tabs > li > a {
|
.nav-tabs.control-sidebar-tabs > li > a {
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
}
|
}
|
||||||
.nav-tabs.control-sidebar-tabs > li > a,
|
.nav-tabs.control-sidebar-tabs > li > a,
|
||||||
.nav-tabs.control-sidebar-tabs > li > a:hover {
|
.nav-tabs.control-sidebar-tabs > li > a:hover {
|
||||||
@@ -1233,7 +1233,7 @@ a:focus {
|
|||||||
* ---------------
|
* ---------------
|
||||||
*/
|
*/
|
||||||
.form-control {
|
.form-control {
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
border-color: #d2d6de;
|
border-color: #d2d6de;
|
||||||
}
|
}
|
||||||
@@ -1287,14 +1287,14 @@ a:focus {
|
|||||||
}
|
}
|
||||||
/* Input group */
|
/* Input group */
|
||||||
.input-group .input-group-addon {
|
.input-group .input-group-addon {
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
border-color: #d2d6de;
|
border-color: #d2d6de;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
/* button groups */
|
/* button groups */
|
||||||
.btn-group-vertical .btn.btn-flat:first-of-type,
|
.btn-group-vertical .btn.btn-flat:first-of-type,
|
||||||
.btn-group-vertical .btn.btn-flat:last-of-type {
|
.btn-group-vertical .btn.btn-flat:last-of-type {
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
}
|
}
|
||||||
.icheck > label {
|
.icheck > label {
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
@@ -2026,7 +2026,7 @@ a:focus {
|
|||||||
}
|
}
|
||||||
.info-box .progress,
|
.info-box .progress,
|
||||||
.info-box .progress .progress-bar {
|
.info-box .progress .progress-bar {
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
}
|
}
|
||||||
.info-box .progress .progress-bar {
|
.info-box .progress .progress-bar {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
@@ -2177,7 +2177,7 @@ a:focus {
|
|||||||
* -----------------
|
* -----------------
|
||||||
*/
|
*/
|
||||||
.btn {
|
.btn {
|
||||||
border-radius: 3px;
|
border-radius: 4px;
|
||||||
-webkit-box-shadow: none;
|
-webkit-box-shadow: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
@@ -2186,7 +2186,7 @@ a:focus {
|
|||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
.btn.btn-flat {
|
.btn.btn-flat {
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
-webkit-box-shadow: none;
|
-webkit-box-shadow: none;
|
||||||
-moz-box-shadow: none;
|
-moz-box-shadow: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
@@ -2421,7 +2421,7 @@ a:focus {
|
|||||||
}
|
}
|
||||||
/* NAV PILLS */
|
/* NAV PILLS */
|
||||||
.nav-pills > li > a {
|
.nav-pills > li > a {
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
border-top: 3px solid transparent;
|
border-top: 3px solid transparent;
|
||||||
color: #444;
|
color: #444;
|
||||||
}
|
}
|
||||||
@@ -2440,7 +2440,7 @@ a:focus {
|
|||||||
}
|
}
|
||||||
/* NAV STACKED */
|
/* NAV STACKED */
|
||||||
.nav-stacked > li > a {
|
.nav-stacked > li > a {
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
border-top: 0;
|
border-top: 0;
|
||||||
border-left: 3px solid transparent;
|
border-left: 3px solid transparent;
|
||||||
color: #444;
|
color: #444;
|
||||||
@@ -2482,7 +2482,7 @@ a:focus {
|
|||||||
}
|
}
|
||||||
.nav-tabs-custom > .nav-tabs > li > a {
|
.nav-tabs-custom > .nav-tabs > li > a {
|
||||||
color: #444;
|
color: #444;
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
}
|
}
|
||||||
.nav-tabs-custom > .nav-tabs > li > a.text-muted {
|
.nav-tabs-custom > .nav-tabs > li > a.text-muted {
|
||||||
color: #999;
|
color: #999;
|
||||||
@@ -2630,7 +2630,7 @@ a:focus {
|
|||||||
.product-list-in-box > .item {
|
.product-list-in-box > .item {
|
||||||
-webkit-box-shadow: none;
|
-webkit-box-shadow: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
border-bottom: 1px solid #f4f4f4;
|
border-bottom: 1px solid #f4f4f4;
|
||||||
}
|
}
|
||||||
.product-list-in-box > .item:last-of-type {
|
.product-list-in-box > .item:last-of-type {
|
||||||
@@ -2967,7 +2967,7 @@ table.text-center th {
|
|||||||
background: rgba(0, 0, 0, 0.3);
|
background: rgba(0, 0, 0, 0.3);
|
||||||
}
|
}
|
||||||
.modal-content {
|
.modal-content {
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
-webkit-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
|
-webkit-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
|
||||||
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
|
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
|
||||||
border: 0;
|
border: 0;
|
||||||
@@ -4232,7 +4232,7 @@ table.text-center th {
|
|||||||
.select2-container--default .select2-selection--single,
|
.select2-container--default .select2-selection--single,
|
||||||
.select2-selection .select2-selection--single {
|
.select2-selection .select2-selection--single {
|
||||||
border: 1px solid #d2d6de;
|
border: 1px solid #d2d6de;
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
padding: 6px 12px;
|
padding: 6px 12px;
|
||||||
height: 34px;
|
height: 34px;
|
||||||
}
|
}
|
||||||
@@ -4241,7 +4241,7 @@ table.text-center th {
|
|||||||
}
|
}
|
||||||
.select2-dropdown {
|
.select2-dropdown {
|
||||||
border: 1px solid #d2d6de;
|
border: 1px solid #d2d6de;
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
}
|
}
|
||||||
.select2-container--default .select2-results__option--highlighted[aria-selected] {
|
.select2-container--default .select2-results__option--highlighted[aria-selected] {
|
||||||
background-color: #3c8dbc;
|
background-color: #3c8dbc;
|
||||||
@@ -4293,7 +4293,7 @@ table.text-center th {
|
|||||||
}
|
}
|
||||||
.select2-container--default .select2-selection--multiple {
|
.select2-container--default .select2-selection--multiple {
|
||||||
border: 1px solid #d2d6de;
|
border: 1px solid #d2d6de;
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
}
|
}
|
||||||
.select2-container--default .select2-selection--multiple:focus {
|
.select2-container--default .select2-selection--multiple:focus {
|
||||||
border-color: #3c8dbc;
|
border-color: #3c8dbc;
|
||||||
@@ -4662,7 +4662,7 @@ table.text-center th {
|
|||||||
.list-group-unbordered > .list-group-item {
|
.list-group-unbordered > .list-group-item {
|
||||||
border-left: 0;
|
border-left: 0;
|
||||||
border-right: 0;
|
border-right: 0;
|
||||||
border-radius: 0;
|
/*border-radius: 0;*/
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.main-header .logo {
|
.main-header .logo {
|
||||||
background-color: #367fa9;
|
/* background-color: #367fa9; */
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
border-bottom: 0 solid transparent;
|
border-bottom: 0 solid transparent;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.main-header .logo {
|
.main-header .logo {
|
||||||
background-color: #008d4c;
|
/* background-color: #008d4c; */
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
border-bottom: 0 solid transparent;
|
border-bottom: 0 solid transparent;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.main-header .logo {
|
.main-header .logo {
|
||||||
background-color: #555299;
|
/* background-color: #555299; */
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
border-bottom: 0 solid transparent;
|
border-bottom: 0 solid transparent;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.main-header .logo {
|
.main-header .logo {
|
||||||
background-color: #d73925;
|
/* background-color: #d73925; */
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
border-bottom: 0 solid transparent;
|
border-bottom: 0 solid transparent;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.main-header .logo {
|
.main-header .logo {
|
||||||
background-color: #e08e0b;
|
/* background-color: #e08e0b; */
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
border-bottom: 0 solid transparent;
|
border-bottom: 0 solid transparent;
|
||||||
}
|
}
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
common/src/main/resources/static/icheck/1.0/minimal/grey.psd
Normal file
BIN
common/src/main/resources/static/icheck/1.0/minimal/greyold.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
@@ -98,7 +98,7 @@ ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height
|
|||||||
/* 树搜索相关 */
|
/* 树搜索相关 */
|
||||||
.treeSearchInput {padding:13px 0 0 20px;}
|
.treeSearchInput {padding:13px 0 0 20px;}
|
||||||
.treeSearchInput label {padding:5px 0 3px 0;font-size:13px;font-weight:normal;vertical-align:middle;}
|
.treeSearchInput label {padding:5px 0 3px 0;font-size:13px;font-weight:normal;vertical-align:middle;}
|
||||||
.treeSearchInput input {width:140px;vertical-align:middle;line-height:24px;height:26px;border:1px solid #bbb;padding:0 4px;}
|
.treeSearchInput input {width:140px;vertical-align:middle;line-height:24px;height:26px;border:1px solid #bbb;padding:0 4px;border-radius:4px;}
|
||||||
.treeSearchInput button {border:1px solid #bbb;vertical-align:middle;height:26px;height:26px\9;font-size:13px;background:#efefef;padding:0 8px;}
|
.treeSearchInput button {border:1px solid #bbb;vertical-align:middle;height:26px;height:26px\9;font-size:13px;background:#efefef;padding:0 8px;}
|
||||||
.treeShowHideButton {position:absolute;right:8px;top:-3px;font-size:12px;color:#333;z-index:3;}
|
.treeShowHideButton {position:absolute;right:8px;top:-3px;font-size:12px;color:#333;z-index:3;}
|
||||||
.treeShowHideButton label {cursor:pointer;}
|
.treeShowHideButton label {cursor:pointer;}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
.Wdate,.Wdate-date,.Wdate-datetime{background:#fff url(datePicker.gif) no-repeat right;}
|
.Wdate,.Wdate-date,.Wdate-datetime{background:#fff url(datePicker.png) no-repeat right;}
|
||||||
.Wdate-date{width:105px!important}.Wdate-datetime{width:147px!important}
|
.Wdate-date{width:105px!important}.Wdate-datetime{width:147px!important}
|
||||||
.WdateFmtErr{font-weight:bold;color:red;}
|
.WdateFmtErr{font-weight:bold;color:red;}
|
||||||
.Wdate::-ms-clear{display:none;}
|
.Wdate::-ms-clear{display:none;}
|
||||||
BIN
common/src/main/resources/static/my97/skin/datePicker-old.gif
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
BIN
common/src/main/resources/static/my97/skin/datePicker.png
Normal file
|
After Width: | Height: | Size: 682 B |
@@ -71,6 +71,10 @@ spring:
|
|||||||
main:
|
main:
|
||||||
bannerMode: "off"
|
bannerMode: "off"
|
||||||
|
|
||||||
|
# 日志配置
|
||||||
|
logging:
|
||||||
|
config: classpath:config/logback-spring.xml
|
||||||
|
|
||||||
#======================================#
|
#======================================#
|
||||||
#========== System settings ===========#
|
#========== System settings ===========#
|
||||||
#======================================#
|
#======================================#
|
||||||
@@ -447,10 +451,6 @@ web:
|
|||||||
error:
|
error:
|
||||||
page:
|
page:
|
||||||
printErrorInfo: true
|
printErrorInfo: true
|
||||||
|
|
||||||
# 日志配置
|
|
||||||
logging:
|
|
||||||
config: classpath:config/logback-spring.xml
|
|
||||||
|
|
||||||
#======================================#
|
#======================================#
|
||||||
#======== FileUpload settings =========#
|
#======== FileUpload settings =========#
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|
||||||
<finalName>web</finalName><!-- war包的名称 ${project.artifactId} -->
|
<finalName>web</finalName><!-- war包的名称 -->
|
||||||
<start-class>com.jeesite.modules.Application</start-class>
|
<start-class>com.jeesite.modules.Application</start-class>
|
||||||
|
|
||||||
<!-- environment setting -->
|
<!-- environment setting -->
|
||||||
|
|||||||
@@ -145,6 +145,10 @@ spring:
|
|||||||
profiles:
|
profiles:
|
||||||
active: default
|
active: default
|
||||||
|
|
||||||
|
# 打印横幅
|
||||||
|
main:
|
||||||
|
bannerMode: "off"
|
||||||
|
|
||||||
# # Redis 连接参数 (RedisProperties)
|
# # Redis 连接参数 (RedisProperties)
|
||||||
# redis:
|
# redis:
|
||||||
# host: 127.0.0.1
|
# host: 127.0.0.1
|
||||||
@@ -167,6 +171,10 @@ spring:
|
|||||||
# # 清理全部缓存按钮所清理的缓存列表
|
# # 清理全部缓存按钮所清理的缓存列表
|
||||||
# clearNames: sysCache,corpCache,userCache,cmsCache
|
# clearNames: sysCache,corpCache,userCache,cmsCache
|
||||||
|
|
||||||
|
# 日志配置
|
||||||
|
logging:
|
||||||
|
config: classpath:config/logback-spring.xml
|
||||||
|
|
||||||
#======================================#
|
#======================================#
|
||||||
#========== System settings ===========#
|
#========== System settings ===========#
|
||||||
#======================================#
|
#======================================#
|
||||||
|
|||||||