manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

主题颜色优化

Browse Source
This commit is contained in:
thinkgem
2019-12-21 20:43:54 +08:00
parent bf37a9d6de
commit 6a738b4f06
17 changed files with 27 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/resources/static/adminlte/css/skins/skin-black-light.css
View File

@@ -111,6 +111,7 @@
.sidebar-menu > li.active > a {
font-weight: 600;
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #f4f6f8;
}
@@ -161,10 +162,5 @@
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
@media (min-width: 768px) {
.skin-black-light.sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
border-left: 1px solid #d2d6de;
}
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}

10
common/src/main/resources/static/adminlte/css/skins/skin-black-light2.css
View File

@@ -6,7 +6,7 @@
background-color: #303643;
}
.main-header .navbar .nav > li > a {
color: #ffffff;
color: #eaeaea;
}
.main-header .navbar .nav > li > a:hover,
.main-header .navbar .nav > li > a:active,
@@ -44,7 +44,7 @@
}
.main-header .logo {
/* background-color: #2A579A; */
color: #ffffff;
color: #f6f6f6;
border-bottom: 0 solid transparent;
}
.main-header .logo:hover {
@@ -93,6 +93,7 @@
.sidebar-menu > li.active > a {
font-weight: 600;
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #EAEDF1;
}
@@ -143,11 +144,6 @@
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
@media (min-width: 768px) {
.skin-blue-light.sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
border-left: 1px solid #d2d6de;
}
}
.main-footer {
border-top-color: #d2d6de;
}

2
common/src/main/resources/static/adminlte/css/skins/skin-black.css
View File

@@ -97,8 +97,8 @@
background: #2c3b41;
/* border-left-color: #ffffff; */
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
margin: 0 1px;
background: #2c3b41;
}
.sidebar a {

10
common/src/main/resources/static/adminlte/css/skins/skin-black2.css
View File

@@ -6,7 +6,7 @@
background-color: #263238;
}
.main-header .navbar .nav > li > a {
color: #ffffff;
color: #eaeaea;
}
.main-header .navbar .nav > li > a:hover,
.main-header .navbar .nav > li > a:active,
@@ -44,7 +44,7 @@
}
.main-header .logo {
/* background-color: #367fa9; */
color: #ffffff;
color: #f6f6f6;
border-bottom: 0 solid transparent;
}
.main-header .logo:hover {
@@ -78,18 +78,18 @@
background: #2c3b41;
/* border-left-color: #3c8dbc; */
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
margin: 0 1px;
background: #2c3b41;
}
.sidebar a {
color: #b8c7ce;
color: #eaeaea;
}
.sidebar a:hover {
text-decoration: none;
}
.treeview-menu > li > a {
color: #abb1b7;
color: #c7d0da;
}
.treeview-menu > li.active > a,
.treeview-menu > li > a:hover {

6
common/src/main/resources/static/adminlte/css/skins/skin-blue-light.css
View File

@@ -92,6 +92,7 @@
.sidebar-menu > li.active > a {
font-weight: 600;
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #EAEDF1;
}
@@ -142,11 +143,6 @@
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
@media (min-width: 768px) {
.skin-blue-light.sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
border-left: 1px solid #d2d6de;
}
}
.main-footer {
border-top-color: #d2d6de;
}

12
common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css
View File

@@ -1,6 +1,9 @@
/*
* http://jeesite.com
*/
a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {
color:#1890ff;
}
.main-header .navbar {
background-color: #1890ff;
}
@@ -91,6 +94,7 @@
.sidebar-menu > li.active > a {
font-weight: 600;
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #ffffff;
}
@@ -141,11 +145,6 @@
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
@media (min-width: 768px) {
.skin-blue-light.sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
border-left: 1px solid #d2d6de;
}
}
.main-footer {
border-top-color: #d2d6de;
}
@@ -162,8 +161,6 @@
.content-wrapper, .right-side, body {background-color:#f8f8f8;}
a, a:hover, a:active, a:focus, .form-unit,
th[aria-selected=true] .ui-jqgrid-sortable {color:#1890ff;}
.btn-primary, .btn-primary:hover, .btn-primary:active,
.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
@@ -173,6 +170,7 @@ th[aria-selected=true] .ui-jqgrid-sortable {color:#1890ff;}
.select2-container--default .select2-selection--multiple .select2-selection__choice,
.select2-container--default .select2-results__option--highlighted[aria-selected],
.wup_container .placeholder .webuploader-pick {background-color:#1890ff!important;border-color:#1890ff;}
.form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1890ff;}
.form-unit {border-bottom: 1px solid #eee;}
.tabpanel_mover li {padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;

2
common/src/main/resources/static/adminlte/css/skins/skin-blue.css
View File

@@ -77,8 +77,8 @@
background: #2c3b41;
/* border-left-color: #3c8dbc; */
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
margin: 0 1px;
background: #2c3b41;
}
.sidebar a {

6
common/src/main/resources/static/adminlte/css/skins/skin-green-light.css
View File

@@ -92,6 +92,7 @@
.sidebar-menu > li.active > a {
font-weight: 600;
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #f4f6f8;
}
@@ -142,11 +143,6 @@
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
@media (min-width: 768px) {
.skin-green-light.sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
border-left: 1px solid #d2d6de;
}
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}

2
common/src/main/resources/static/adminlte/css/skins/skin-green.css
View File

@@ -77,8 +77,8 @@
background: #2c3b41;
/* border-left-color: #00a65a; */
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
margin: 0 1px;
background: #2c3b41;
}
.sidebar a {

6
common/src/main/resources/static/adminlte/css/skins/skin-purple-light.css
View File

@@ -92,6 +92,7 @@
.sidebar-menu > li.active > a {
font-weight: 600;
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #f4f6f8;
}
@@ -142,11 +143,6 @@
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
@media (min-width: 768px) {
.skin-purple-light.sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
border-left: 1px solid #d2d6de;
}
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}

2
common/src/main/resources/static/adminlte/css/skins/skin-purple.css
View File

@@ -77,8 +77,8 @@
background: #2c3b41;
/* border-left-color: #605ca8; */
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
margin: 0 1px;
background: #2c3b41;
}
.sidebar a {

6
common/src/main/resources/static/adminlte/css/skins/skin-red-light.css
View File

@@ -92,6 +92,7 @@
.sidebar-menu > li.active > a {
font-weight: 600;
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #f4f6f8;
}
@@ -142,11 +143,6 @@
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
@media (min-width: 768px) {
.skin-red-light.sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
border-left: 1px solid #d2d6de;
}
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}

2
common/src/main/resources/static/adminlte/css/skins/skin-red.css
View File

@@ -77,8 +77,8 @@
background: #2c3b41;
/* border-left-color: #dd4b39; */
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
margin: 0 1px;
background: #2c3b41;
}
.sidebar a {

6
common/src/main/resources/static/adminlte/css/skins/skin-yellow-light.css
View File

@@ -92,6 +92,7 @@
.sidebar-menu > li.active > a {
font-weight: 600;
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #f4f6f8;
}
@@ -142,11 +143,6 @@
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
@media (min-width: 768px) {
.skin-yellow-light.sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
border-left: 1px solid #d2d6de;
}
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}

2
common/src/main/resources/static/adminlte/css/skins/skin-yellow.css
View File

@@ -77,8 +77,8 @@
background: #2c3b41;
/* border-left-color: #f39c12; */
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
margin: 0 1px;
background: #2c3b41;
}
.sidebar a {

2
modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java
View File

@@ -142,7 +142,7 @@ public class OnlineController extends BaseController{
@RequiresPermissions("sys:online:edit")
@RequestMapping(value = "tickOut")
@ResponseBody
public String tickOut(String sessionId) {
public String kickOut(String sessionId) {
Session session = sessionDAO.readSession(sessionId);
if (session != null){
Map<String, String> onlineTickOutMap = CacheUtils.get("onlineTickOutMap");

2
modules/core/src/main/resources/views/modules/sys/sysSwitchSkin.html
View File

@@ -31,7 +31,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">黑</p>
<p class="text-center no-margin">黑（经典）</p>
</li>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-purple" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">