From d95a6b813464c9c563d4a2bff35ee355946b87a7 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Wed, 23 May 2018 14:50:28 +0900
Subject: [PATCH] (refs #2023)Move GitBucket version from global header to
 admin page

---
 .../twirl/gitbucket/core/admin/settings_system.scala.html  | 4 ++++
 src/main/twirl/gitbucket/core/main.scala.html              | 7 ++++---
 src/main/webapp/assets/common/css/gitbucket.css            | 4 ----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/admin/settings_system.scala.html b/src/main/twirl/gitbucket/core/admin/settings_system.scala.html
index 34b9033cf..c768d6bdd 100644
--- a/src/main/twirl/gitbucket/core/admin/settings_system.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/settings_system.scala.html
@@ -8,6 +8,10 @@
     <th>Property</th>
     <th>Value</th>
   </tr>
+  <tr>
+    <td>GITBUCKET_VERSION</td>
+    <td>@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</td>
+  </tr>
   <tr>
     <td>GITBUCKET_HOME</td>
     <td>@gitbucket.core.util.Directory.GitBucketHome</td>
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html
index 8ed6c8bc2..fcc25e8f6 100644
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -48,9 +48,10 @@
       <header class="main-header">
         <a href="@context.path/" class="logo">
           <span class="logo-mini"><img src="@helpers.assets("/common/images/gitbucket.svg")" alt="GitBucket" /></span>
-          <span class="logo-lg"><img src="@helpers.assets("/common/images/gitbucket.svg")" alt="GitBucket" />
-          <span class="header-title strong">GitBucket</span>
-          <span class="header-version">@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</span></span>
+          <span class="logo-lg">
+            <img src="@helpers.assets("/common/images/gitbucket.svg")" alt="GitBucket" />
+            <span class="header-title strong">GitBucket</span>
+          </span>
         </a>
         <nav class="navbar navbar-static-top" role="navigation">
           <!-- Sidebar toggle button-->
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 9b196f108..8e3cc6f5f 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -138,10 +138,6 @@ div.content-wrapper {
 /* ======================================================================== */
 /* Global Header */
 /* ======================================================================== */
-span.header-version {
-  font-size: small;
-}
-
 .main-header .logo img {
   width: 24px;
   height: 24px;