diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css new file mode 100644 index 00000000..62985f39 --- /dev/null +++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css @@ -0,0 +1,194 @@ +/* + * http://jeesite.com + */ +.main-header .navbar { + background-color: #1890ff; +} +.main-header .navbar .nav > li > a { + color: #ffffff; +} +.main-header .navbar .nav > li > a:hover, +.main-header .navbar .nav > li > a:active, +.main-header .navbar .nav > li > a:focus, +.main-header .navbar .nav .open > a, +.main-header .navbar .nav .open > a:hover, +.main-header .navbar .nav .open > a:focus, +.main-header .navbar .nav > .active > a { + background: rgba(0, 0, 0, 0.1); + color: #f6f6f6; +} +.main-header .navbar .sidebar-toggle { + color: #ffffff; +} +.main-header .navbar .sidebar-toggle:hover { + color: #f6f6f6; + background: rgba(0, 0, 0, 0.1); +} +.main-header .navbar .sidebar-toggle { + color: #fff; +} +.main-header .navbar .sidebar-toggle:hover { + background-color: #367fa9; +} +@media (max-width: 767px) { + .main-header .navbar .dropdown-menu li.divider { + background-color: rgba(255, 255, 255, 0.1); + } + .main-header .navbar .dropdown-menu li a { + color: #fff; + } + .main-header .navbar .dropdown-menu li a:hover { + background: #367fa9; + } +} +.main-header .logo { + background-color: #1890ff; + color: #ffffff; + border-bottom: 0 solid transparent; +} +.main-header .logo:hover { + background-color: #1681e5; +} +.main-header li.user-header { + background-color: #1890ff; +} +.content-header { + background: transparent; +} +.sidebar, +.left-side { + background-color: #E3E7EC; +} +.content-wrapper, +.main-footer { + border-left: 1px solid #d2d6de; +} +.user-panel > .info, +.user-panel > .info > a { + color: #555; +} +.sidebar-menu > li { + -webkit-transition: border-left-color 0.3s ease; + -o-transition: border-left-color 0.3s ease; + transition: border-left-color 0.3s ease; +} +.sidebar-menu > li.header { + color: #848484; + background: #E3E7EC; +} +.sidebar-menu > li > a { + border-left: 3px solid transparent; + font-weight: 600; +} +.sidebar-menu > li:hover > a, +.sidebar-menu > li.active > a { + color: #000; + background: #EAEDF1; +} +.sidebar-menu > li.active { + border-left-color: #1890ff; +} +.sidebar-menu > li.active > a { + font-weight: 600; +} +.sidebar-menu > li > .treeview-menu { + background: #EAEDF1; +} +.sidebar a { + color: #555; +} +.sidebar a:hover { + text-decoration: none; +} +.treeview-menu > li > a { + color: #555; +} +.treeview-menu > li.active > a, +.treeview-menu > li > a:hover { + color: #000; +} +.sidebar-form { + border-radius: 3px; + border: 1px solid #d2d6de; + margin: 10px 10px; +} +.sidebar-form input[type="text"], +.sidebar-form .btn { + box-shadow: none; + background-color: #fff; + border: 1px solid transparent; + height: 35px; +} +.sidebar-form input[type="text"] { + color: #666; + border-top-left-radius: 2px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 2px; +} +.sidebar-form input[type="text"]:focus, +.sidebar-form input[type="text"]:focus + .input-group-btn .btn { + background-color: #fff; + color: #666; +} +.sidebar-form input[type="text"]:focus + .input-group-btn .btn { + border-left-color: #fff; +} +.sidebar-form .btn { + color: #999; + border-top-left-radius: 0; + border-top-right-radius: 2px; + 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; +} +.skin-blue.layout-top-nav .main-header > .logo { + background-color: #1890ff; + color: #ffffff; + border-bottom: 0 solid transparent; +} +.skin-blue.layout-top-nav .main-header > .logo:hover { + background-color: #3b8ab8; +} + +.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;} + +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, +.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover, +.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus, +.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0, +.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;} + +.tabpanel_mover li {padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4; + border-radius:3px;box-shadow:0 0 8px #e0e0e0;background:#fff;box-shadow:0 0 5px #e6e6e6;} +.tabpanel_mover li.active {background-color:#3aa0ff;} +.tabpanel_mover li.active div {color:#fff;} +.tabpanel_mover li .closer {font:6px/1 FontAwesome;top:6px;right:2px;background:none;opacity:0.8} +.tabpanel_mover li .closer:before {content:"\f00d";} +.tabpanel_mover li .closer:hover {background:none;} +.tabpanel_tab_content {border-bottom-color:#eeeeee;} + +.main-content {padding:10px;} +.ui-layout-container {padding:10px;} +.ui-layout-pane>.main-content {padding:0;} +.ui-layout-resizer {background:transparent;} +.ui-layout-content>.wrapper>.main-content {padding:0;} +.box-main,.nav-main{border-radius:3px;box-shadow:0 0 5px #e0e0e0;} +.box-main>.box-header {border-bottom-color:#cae6ff;} +.box-main>.box-header .box-title .fa {color:#1890ff;} +.form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple, +.select2-container--default .select2-search--dropdown .select2-search__field {border-color:#66afe9!important;} +.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-green-light.css b/common/src/main/resources/static/adminlte/css/skins/skin-green-light.css index 511f53c1..e2958c0d 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-green-light.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-green-light.css @@ -150,7 +150,8 @@ .sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;} -a, a:hover, a:active, a:focus, .form-unit {color:#00a65a;} +a, a:hover, a:active, a:focus, .form-unit, +th[aria-selected=true] .ui-jqgrid-sortable {color:#00a65a;} .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, @@ -158,5 +159,5 @@ a, a:hover, a:active, a:focus, .form-unit {color:#00a65a;} .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus, .open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0, .select2-container--default .select2-selection--multiple .select2-selection__choice, -.select2-container--default .select2-results__option--highlighted[aria-selected] - {background-color:#00a65a!important;border-color:#00a65a;} +.select2-container--default .select2-results__option--highlighted[aria-selected], +.wup_container .placeholder .webuploader-pick {background-color:#00a65a!important;border-color:#00a65a;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-green.css b/common/src/main/resources/static/adminlte/css/skins/skin-green.css index e41d0562..3208b646 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-green.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-green.css @@ -131,7 +131,8 @@ .sidebar-menu .treeview-item.active > a {color:#fff;background-color:#00a65a;} -a, a:hover, a:active, a:focus, .form-unit {color:#00a65a;} +a, a:hover, a:active, a:focus, .form-unit, +th[aria-selected=true] .ui-jqgrid-sortable {color:#00a65a;} .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, @@ -139,5 +140,5 @@ a, a:hover, a:active, a:focus, .form-unit {color:#00a65a;} .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus, .open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0, .select2-container--default .select2-selection--multiple .select2-selection__choice, -.select2-container--default .select2-results__option--highlighted[aria-selected] - {background-color:#00a65a!important;border-color:#00a65a;} +.select2-container--default .select2-results__option--highlighted[aria-selected], +.wup_container .placeholder .webuploader-pick {background-color:#00a65a!important;border-color:#00a65a;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-purple-light.css b/common/src/main/resources/static/adminlte/css/skins/skin-purple-light.css index 21e33f42..a30a767b 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-purple-light.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-purple-light.css @@ -150,7 +150,8 @@ .sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;} -a, a:hover, a:active, a:focus, .form-unit {color:#605ca8;} +a, a:hover, a:active, a:focus, .form-unit, +th[aria-selected=true] .ui-jqgrid-sortable {color:#605ca8;} .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, @@ -158,5 +159,5 @@ a, a:hover, a:active, a:focus, .form-unit {color:#605ca8;} .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus, .open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0, .select2-container--default .select2-selection--multiple .select2-selection__choice, -.select2-container--default .select2-results__option--highlighted[aria-selected] - {background-color:#605ca8!important;border-color:#605ca8;} +.select2-container--default .select2-results__option--highlighted[aria-selected], +.wup_container .placeholder .webuploader-pick {background-color:#605ca8!important;border-color:#605ca8;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-purple.css b/common/src/main/resources/static/adminlte/css/skins/skin-purple.css index 212d5e95..5ad5656c 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-purple.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-purple.css @@ -131,7 +131,8 @@ .sidebar-menu .treeview-item.active > a {color:#fff;background-color:#605ca8;} -a, a:hover, a:active, a:focus, .form-unit {color:#605ca8;} +a, a:hover, a:active, a:focus, .form-unit, +th[aria-selected=true] .ui-jqgrid-sortable {color:#605ca8;} .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, @@ -139,5 +140,5 @@ a, a:hover, a:active, a:focus, .form-unit {color:#605ca8;} .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus, .open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0, .select2-container--default .select2-selection--multiple .select2-selection__choice, -.select2-container--default .select2-results__option--highlighted[aria-selected] - {background-color:#605ca8!important;border-color:#605ca8;} +.select2-container--default .select2-results__option--highlighted[aria-selected], +.wup_container .placeholder .webuploader-pick {background-color:#605ca8!important;border-color:#605ca8;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-red-light.css b/common/src/main/resources/static/adminlte/css/skins/skin-red-light.css index 0b80b3ad..d745b516 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-red-light.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-red-light.css @@ -150,7 +150,8 @@ .sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;} -a, a:hover, a:active, a:focus, .form-unit {color:#dd4b39;} +a, a:hover, a:active, a:focus, .form-unit, +th[aria-selected=true] .ui-jqgrid-sortable {color:#dd4b39;} .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, @@ -158,5 +159,5 @@ a, a:hover, a:active, a:focus, .form-unit {color:#dd4b39;} .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus, .open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0, .select2-container--default .select2-selection--multiple .select2-selection__choice, -.select2-container--default .select2-results__option--highlighted[aria-selected] - {background-color:#dd4b39!important;border-color:#dd4b39;} +.select2-container--default .select2-results__option--highlighted[aria-selected], +.wup_container .placeholder .webuploader-pick {background-color:#dd4b39!important;border-color:#dd4b39;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-red.css b/common/src/main/resources/static/adminlte/css/skins/skin-red.css index a628d35f..22144149 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-red.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-red.css @@ -131,7 +131,8 @@ .sidebar-menu .treeview-item.active > a {color:#fff;background-color:#dd4b39;} -a, a:hover, a:active, a:focus, .form-unit {color:#dd4b39;} +a, a:hover, a:active, a:focus, .form-unit, +th[aria-selected=true] .ui-jqgrid-sortable {color:#dd4b39;} .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, @@ -139,5 +140,5 @@ a, a:hover, a:active, a:focus, .form-unit {color:#dd4b39;} .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus, .open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0, .select2-container--default .select2-selection--multiple .select2-selection__choice, -.select2-container--default .select2-results__option--highlighted[aria-selected] - {background-color:#dd4b39!important;border-color:#dd4b39;} +.select2-container--default .select2-results__option--highlighted[aria-selected], +.wup_container .placeholder .webuploader-pick {background-color:#dd4b39!important;border-color:#dd4b39;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-yellow-light.css b/common/src/main/resources/static/adminlte/css/skins/skin-yellow-light.css index e1709b5a..56993e93 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-yellow-light.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-yellow-light.css @@ -150,7 +150,8 @@ .sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;} -a, a:hover, a:active, a:focus, .form-unit {color:#f39c12;} +a, a:hover, a:active, a:focus, .form-unit, +th[aria-selected=true] .ui-jqgrid-sortable {color:#f39c12;} .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, @@ -158,5 +159,5 @@ a, a:hover, a:active, a:focus, .form-unit {color:#f39c12;} .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus, .open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0, .select2-container--default .select2-selection--multiple .select2-selection__choice, -.select2-container--default .select2-results__option--highlighted[aria-selected] - {background-color:#f39c12!important;border-color:#f39c12;} +.select2-container--default .select2-results__option--highlighted[aria-selected], +.wup_container .placeholder .webuploader-pick {background-color:#f39c12!important;border-color:#f39c12;} diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-yellow.css b/common/src/main/resources/static/adminlte/css/skins/skin-yellow.css index 8cd98625..028508fa 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-yellow.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-yellow.css @@ -131,7 +131,8 @@ .sidebar-menu .treeview-item.active > a {color:#fff;background-color:#f39c12;} -a, a:hover, a:active, a:focus, .form-unit {color:#f39c12;} +a, a:hover, a:active, a:focus, .form-unit, +th[aria-selected=true] .ui-jqgrid-sortable {color:#f39c12;} .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, @@ -139,5 +140,5 @@ a, a:hover, a:active, a:focus, .form-unit {color:#f39c12;} .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus, .open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0, .select2-container--default .select2-selection--multiple .select2-selection__choice, -.select2-container--default .select2-results__option--highlighted[aria-selected] - {background-color:#f39c12!important;border-color:#f39c12;} +.select2-container--default .select2-results__option--highlighted[aria-selected], +.wup_container .placeholder .webuploader-pick {background-color:#f39c12!important;border-color:#f39c12;} diff --git a/modules/core/src/main/resources/views/modules/sys/onlineList.html b/modules/core/src/main/resources/views/modules/sys/onlineList.html index 29cf8887..e65687c4 100644 --- a/modules/core/src/main/resources/views/modules/sys/onlineList.html +++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html @@ -10,7 +10,7 @@
- <#form:form id="searchForm" action="${ctx}/sys/online/listData" method="post" class="form-inline hide" + <#form:form id="searchForm" action="${ctx}/sys/online/listData" method="post" class="form-inline hide2" data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
diff --git a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html index b4e7038d..99021b9e 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html +++ b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html @@ -1,7 +1,6 @@ <% layout('/layouts/default.html', {title: '', bodyClass: ''}){ %>
-
@@ -21,10 +20,7 @@
- -
-
@@ -45,9 +41,8 @@
-
-
+

月度报告

@@ -213,15 +208,9 @@
-
-
-
- -
- - - - +
+
+
@@ -244,9 +233,7 @@
-

沟通

-
@@ -351,9 +332,7 @@
-

任务列表

-
  • «
    • @@ -371,9 +350,9 @@
  • - - - + + + @@ -387,10 +366,10 @@
  • - - - - + + + + Make the theme responsive 4 hours @@ -400,10 +379,10 @@
  • - - - - + + + + Let theme shine like a star 1 day @@ -413,10 +392,10 @@
  • - - - - + + + + Let theme shine like a star 3 days @@ -426,10 +405,10 @@
  • - - - - + + + + Check your messages and notifications 1 week @@ -439,10 +418,10 @@
  • - - - - + + + + Let theme shine like a star 1 month @@ -461,8 +440,6 @@
    • - -
    @@ -476,9 +453,7 @@
    - -

    访问

    @@ -539,19 +514,16 @@
    -
    新订购
    -
    进行中
    -
    已成交
    @@ -566,7 +538,6 @@
    -

    日程表

    @@ -605,7 +576,6 @@
    -
    任务 #2 70% @@ -623,7 +593,6 @@
    -
    任务 #4 40% @@ -640,8 +609,7 @@ - -
    +