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

d415e81a · ibuler · 3223d3b7 · 7f3d32a8 · d415e81a
Commit d415e81a authored Jan 10, 2018 by ibuler
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 0 deletions

jumpserver.css apps/static/css/jumpserver.css +17 -0

No files found.
--- 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;
 }
\ No newline at end of file