Merge remote-tracking branch 'github/dev' into dev

2018-01-10 17:41:57 +08:00 · 2018-01-10 17:41:57 +08:00 · d415e81add
parent 3223d3b74d 7f3d32a876
commit d415e81add
1 changed files with 16 additions and 0 deletions
--- a/apps/static/css/jumpserver.css
+++ b/apps/static/css/jumpserver.css
@ -322,4 +322,20 @@ div.dataTables_wrapper div.dataTables_filter {

 .welcome-message img {
    margin: -11px 0;
+}
+
+.nav.nav-tabs li.active {
+    background-color: #FFF;
+}
+
+.ibox-title {
+    border-top: none;
+}
+
+.nav.nav-tabs li > a {
+    max-height: 38px;
+}
+
+.nav.nav-tabs li.active a {
+    border: none;
 }