From 8160425672f1ba358e930218b181ae4b0d434105 Mon Sep 17 00:00:00 2001 From: q4speed Date: Tue, 2 Jan 2018 17:07:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/static/css/jumpserver.css | 25 +++++++ apps/templates/_header_bar.html | 21 +++++- apps/templates/_user_profile.html | 36 ++-------- jumpserver/apps/templates/_header_bar.html | 72 -------------------- jumpserver/apps/templates/_user_profile.html | 30 -------- 5 files changed, 50 insertions(+), 134 deletions(-) delete mode 100644 jumpserver/apps/templates/_header_bar.html delete mode 100644 jumpserver/apps/templates/_user_profile.html diff --git a/apps/static/css/jumpserver.css b/apps/static/css/jumpserver.css index fd15945b9..a3f452ab7 100644 --- a/apps/static/css/jumpserver.css +++ b/apps/static/css/jumpserver.css @@ -289,4 +289,29 @@ div.dataTables_wrapper div.dataTables_filter { margin-bottom:0; margin-left: 10px; margin-right: 10px +} + +.navbar-default { + background-color: #2f4050; + border-color: #2f4050; +} + +.nav-header { + padding: 0; + background: #202c37; +} + +.profile-element { + margin-left: 20px; +} + +.profile-element div { + line-height: 60px; + float: left; + font-size: 22px; + color: #1ab394; +} + +.profile-element div + div { + margin-left: 5px; } \ No newline at end of file diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html index 7cbb5fc87..dd89b8853 100644 --- a/apps/templates/_header_bar.html +++ b/apps/templates/_header_bar.html @@ -18,11 +18,26 @@ {% trans 'Help' %} -
  • +