From 969da2c63bc17a88f97680edb4986c2caea332ac Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sun, 27 Mar 2016 22:53:54 +0900
Subject: [PATCH] Tweak CSS styles

---
 .../core/account/application.scala.html       |  5 ++-
 .../gitbucket/core/account/edit.scala.html    | 19 +++++-----
 .../gitbucket/core/account/group.scala.html   |  2 +-
 .../gitbucket/core/account/menu.scala.html    |  7 ++--
 .../gitbucket/core/account/newrepo.scala.html |  2 +-
 .../gitbucket/core/account/ssh.scala.html     |  5 ++-
 .../gitbucket/core/admin/menu.scala.html      |  4 +--
 src/main/twirl/gitbucket/core/main.scala.html |  3 --
 src/main/twirl/gitbucket/core/menu.scala.html | 36 ++++++++++---------
 .../gitbucket/core/repo/branches.scala.html   |  2 +-
 .../webapp/assets/common/css/gitbucket.css    | 16 +++++++++
 11 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html
index 9275cc286..fd23ca6c9 100644
--- a/src/main/twirl/gitbucket/core/account/application.scala.html
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -5,8 +5,7 @@
 @import gitbucket.core.view.helpers._
 @html.main("Applications"){
 <div class="container body">
-  @menu("application", settings.ssh)
-  <div style="margin-left: 260px;">
+  @menu("application", settings.ssh){
     <div class="panel panel-default">
       <div class="panel-heading strong">Personal access tokens</div>
       <div class="panel-body">
@@ -51,6 +50,6 @@
         </div>
       </div>
     </form>
-  </div>
+  }
 </div>
 }
diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html
index 3520ca751..d303e18d5 100644
--- a/src/main/twirl/gitbucket/core/account/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/account/edit.scala.html
@@ -4,8 +4,7 @@
 @import gitbucket.core.view.helpers._
 @html.main("Edit your profile"){
 <div class="container body">
-  @menu("profile", settings.ssh)
-  <div style="margin-left: 260px;">
+  @menu("profile", settings.ssh){
     @helper.html.information(info)
     @if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
     <form action="@url(account.userName)/_edit" method="POST" validate="true">
@@ -46,17 +45,17 @@
               </fieldset>
             </div>
           </div>
-          <div style="margin-top: 20px;">
-            <div class="pull-right">
-              <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
-            </div>
-            <input type="submit" class="btn btn-success" value="Save"/>
-            @if(!LDAPUtil.isDummyMailAddress(account)){<a href="@url(account.userName)" class="btn btn-default">Cancel</a>}
-          </div>
         </div>
       </div>
+      <div>
+        <div class="pull-right">
+          <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
+        </div>
+        <input type="submit" class="btn btn-success" value="Save"/>
+        @if(!LDAPUtil.isDummyMailAddress(account)){<a href="@url(account.userName)" class="btn btn-default">Cancel</a>}
+      </div>
     </form>
-  </div>
+  }
 </div>
 }
 <script>
diff --git a/src/main/twirl/gitbucket/core/account/group.scala.html b/src/main/twirl/gitbucket/core/account/group.scala.html
index 653d467e9..469d68743 100644
--- a/src/main/twirl/gitbucket/core/account/group.scala.html
+++ b/src/main/twirl/gitbucket/core/account/group.scala.html
@@ -2,7 +2,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(if(account.isEmpty) "Create group" else "Edit group"){
-<div class="container body">
+<div class="body main-center">
   <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
       <div class="row">
         <div class="col-md-5">
diff --git a/src/main/twirl/gitbucket/core/account/menu.scala.html b/src/main/twirl/gitbucket/core/account/menu.scala.html
index 2125e3b77..fedff609c 100644
--- a/src/main/twirl/gitbucket/core/account/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/account/menu.scala.html
@@ -1,6 +1,6 @@
-@(active: String, ssh: Boolean)(implicit context: gitbucket.core.controller.Context)
+@(active: String, ssh: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import context._
-<div style="float: left; width: 250px;">
+<div class="main-sidebar">
   <ul class="nav nav-pills nav-stacked">
     <li@if(active=="profile"){ class="active"}>
       <a href="@path/@loginAccount.get.userName/_edit">Profile</a>
@@ -15,3 +15,6 @@
     </li>
   </ul>
 </div>
+<div class="main-content">
+  @body
+</div>
diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
index fbb7645eb..586d12ca3 100644
--- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html
+++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
@@ -3,7 +3,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main("Create a New Repository"){
-<div class="body" style="width: 600px; margin: 10px auto;">
+<div class="body main-center">
   <h2>Create a new repository</h2>
   <p class="muted">
     A repository contains all the files for your project, including the revision history.
diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html
index 1e463858a..7e1c7d83f 100644
--- a/src/main/twirl/gitbucket/core/account/ssh.scala.html
+++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html
@@ -4,8 +4,7 @@
 @import gitbucket.core.view.helpers._
 @html.main("SSH Keys"){
 <div class="container body">
-  @menu("ssh", settings.ssh)
-  <div style="margin-left: 260px;">
+  @menu("ssh", settings.ssh){
     <div class="panel panel-default">
       <div class="panel-heading strong">SSH Keys</div>
       <div class="panel-body">
@@ -39,6 +38,6 @@
         </div>
       </div>
     </form>
-  </div>
+  }
 </div>
 }
diff --git a/src/main/twirl/gitbucket/core/admin/menu.scala.html b/src/main/twirl/gitbucket/core/admin/menu.scala.html
index d88465988..0558996fb 100644
--- a/src/main/twirl/gitbucket/core/admin/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html
@@ -1,7 +1,7 @@
 @(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import context._
 <div class="container body">
-  <div style="width: 250px; float: left;">
+  <div class="main-sidebar">
     <ul class="nav nav-pills nav-stacked" id="system-admin-menu-container">
       <li@if(active=="users"){ class="active"}>
         <a href="@path/admin/users">User Management</a>
@@ -17,7 +17,7 @@
       </li>
    </ul>
   </div>
-  <div style="margin-left: 260px;">
+  <div class="main-content">
     @body
   </div>
 </div>
\ No newline at end of file
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html
index 33b43d111..ea3f4ab7c 100644
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -12,9 +12,6 @@
     <link rel="icon" href="@assets/common/images/gitbucket.png" type="image/vnd.microsoft.icon" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="@assets/vendors/bootstrap-3.3.6/css/bootstrap.min.css" rel="stylesheet">
-    @*
-    <link href="@assets/vendors/bootstrap-theme-github-3.1.1/css/bootstrap-responsive.css" rel="stylesheet">
-    *@
     <link href="@assets/vendors/octicons/octicons.css" rel="stylesheet">
     <link href="@assets/vendors/datepicker/css/bootstrap-datetimepicker.min.css" rel="stylesheet">
     <link href="@assets/vendors/colorpicker/css/bootstrap-colorpicker.css" rel="stylesheet">
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index d2933a228..417ca5531 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -59,23 +59,25 @@
   </div>
 </div>
 <div class="container body">
-  <ul class="nav nav-pills nav-stacked" style="width: 250px; float: left;">
-    @menuitem(""                   ,"files"      ,"Files")
-    @if(repository.commitCount != 0) {
-      @menuitem("/branches"        ,"branches"   ,"Branches", repository.branchList.length)
-      @menuitem("/tags"            ,"tags"       ,"Tags", repository.tags.length)
-    }
-    @menuitem("/issues"            ,"issues"     ,"Issues", repository.issueCount)
-    @menuitem("/pulls"             ,"pulls"      ,"Pull Requests", repository.pullCount)
-    @menuitem("/issues/labels"     ,"labels"     ,"Labels")
-    @menuitem("/issues/milestones" ,"milestones" ,"Milestones")
-    @menuitem("/wiki"              ,"wiki"       ,"Wiki")
-    @menuitem("/network/members", "fork", "Forks", repository.forkedCount)
-    @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
-      @menuitem("/settings" , "settings" , "Settings")
-    }
-  </ul>
-  <div style="margin-left: 260px;">
+  <div class="main-sidebar">
+    <ul class="nav nav-pills nav-stacked">
+      @menuitem(""                   ,"files"      ,"Files")
+      @if(repository.commitCount != 0) {
+        @menuitem("/branches"        ,"branches"   ,"Branches", repository.branchList.length)
+        @menuitem("/tags"            ,"tags"       ,"Tags", repository.tags.length)
+      }
+      @menuitem("/issues"            ,"issues"     ,"Issues", repository.issueCount)
+      @menuitem("/pulls"             ,"pulls"      ,"Pull Requests", repository.pullCount)
+      @menuitem("/issues/labels"     ,"labels"     ,"Labels")
+      @menuitem("/issues/milestones" ,"milestones" ,"Milestones")
+      @menuitem("/wiki"              ,"wiki"       ,"Wiki")
+      @menuitem("/network/members", "fork", "Forks", repository.forkedCount)
+      @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
+        @menuitem("/settings" , "settings" , "Settings")
+      }
+    </ul>
+  </div>
+  <div class="main-content">
     @body
   </div>
 </div>
diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html
index 8caf95bc7..b563400f9 100644
--- a/src/main/twirl/gitbucket/core/repo/branches.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html
@@ -5,7 +5,7 @@
 @import gitbucket.core.view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @html.menu("branches", repository){
-    <table class="table table-bordered table-hover table-issues branches">
+    <table class="table table-bordered table-hover branches">
       <thead>
         <tr>
           <th style="background: #f5f5f5;color: #666;">All branches</th>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index d74d09ea0..3857c6958 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -193,6 +193,20 @@ div.container-wide {
   padding-right: 10px;
 }
 
+div.main-sidebar {
+  width: 250px;
+  float: left;
+}
+
+div.main-content {
+  margin-left: 260px;
+}
+
+div.main-center {
+  width: 980px;
+  margin: 0 auto;
+}
+
 div.body {
   margin-top: 20px;
   margin-bottom: 40px;
@@ -244,10 +258,12 @@ div.show-more a {
   color: #7aa1d3;
 }
 
+/*
 span.count-right {
   float: right;
   font-weight: bold;
 }
+*/
 
 .monospace {
   font-family: Consolas, 'Courier New', Courier, Monaco, monospace;