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

apps/static/css/jumpserver.css

@@ -323,3 +323,19 @@ 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;
+}
\ No newline at end of file