From b51214ab6fae430b36e4ce86be7cae33e73766c6 Mon Sep 17 00:00:00 2001
From: Yuki Kimoto <kimoto.yuki@gmail.com>
Date: Wed, 30 Nov 2016 17:28:48 +0900
Subject: [PATCH] improve button design

---
 public/css/common.css                    |  9 +++++++--
 templates/auto/_login.html.ep            |  2 +-
 templates/auto/_new.html.ep              | 16 ++--------------
 templates/auto/_start.html.ep            |  2 +-
 templates/auto/reset-password.html.ep    |  2 +-
 templates/issues.html.ep                 |  2 +-
 templates/labels.html.ep                 |  2 +-
 templates/pull.html.ep                   |  4 ++--
 templates/pulls.html.ep                  |  4 ++--
 templates/settings/collaboration.html.ep |  2 +-
 templates/user-settings/ssh.html.ep      |  4 ++--
 11 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/public/css/common.css b/public/css/common.css
index c4bd3b5b..b7041828 100644
--- a/public/css/common.css
+++ b/public/css/common.css
@@ -240,7 +240,7 @@ a:hover {
 .labels-tag {
   border-radius:5px;
   display:inline-block;
-  padding:7px 12px;
+  padding:5px 10px;
   font-weight:bold;
   border:1px solid #dddddd;
 }
@@ -1952,12 +1952,17 @@ button.close {
   cursor: default;
 }
 
-.btn-fork {
+.btn-fork, .btn-new {
   font-size:13px;
   padding:5px 20px;
   height:28px;
 }
 
+.btn-delete {
+  padding:1px 10px;
+  height:20px;
+}
+
 .btn-primary {
   color: #ffffff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
diff --git a/templates/auto/_login.html.ep b/templates/auto/_login.html.ep
index 060ca5db..65116b43 100644
--- a/templates/auto/_login.html.ep
+++ b/templates/auto/_login.html.ep
@@ -131,7 +131,7 @@
         </div>
         <div>
           <div>
-            <button type="submit" class="btn">Login</button>
+            <button type="submit" class="btn btn-green btn-new">Login</button>
           </div>
         </div>
       </div>
diff --git a/templates/auto/_new.html.ep b/templates/auto/_new.html.ep
index 88aadcd4..3e9c1c65 100644
--- a/templates/auto/_new.html.ep
+++ b/templates/auto/_new.html.ep
@@ -101,9 +101,6 @@
       <div class="new-title">
         Create a new repository
       </div>
-      <div class="new-description">
-        A repository contains all the files for your project, including the revision history.
-      </div>
     </div>
     <form action="<%= url_for->query(op => 'create') %>" method="post">
       <div class="new-repository">
@@ -143,30 +140,21 @@
           <div>
             <%= radio_button private => 0, checked => undef %><span>Public</span>
           </div>
-          <div class="last-child">
-            Anyone can see this repository. You choose who can commit.
-          </div>
         </li>
         <li>
           <div>
             <%= radio_button private => 1 %><span>Private</span>
           </div>
-          <div class="last-child">
-            You choose who can see and commit to this repository.
-          </div>
         </li>
       </ul>
       
       <div class="new-readme">
         <div>
-          <%= check_box readme => 1 %><span>Initialize this this repository with a README<span>
-        </div>
-        <div class="last-child">
-          This will let you immediately clone the repository to your computer. Skip this step if you’re importing an existing repository.
+          <%= check_box readme => 1 %><span>Initialize this repository with a README<span>
         </div>
       </div>
       
-      <input type="submit" class="btn btn-green" value="Create repository">
+      <input type="submit" class="btn btn-green btn-new" value="Create repository">
     </form>
   </div>
   %= include '/include/footer';
diff --git a/templates/auto/_start.html.ep b/templates/auto/_start.html.ep
index 3758cebd..ac558b1c 100644
--- a/templates/auto/_start.html.ep
+++ b/templates/auto/_start.html.ep
@@ -94,7 +94,7 @@
           </div>
         </div>
         <div>
-          <button type="submit" class="btn btn-green" style="margin-top:20px">Create Admin User</button>
+          <button type="submit" class="btn btn-green btn-new" style="margin-top:20px">Create Admin User</button>
         </div>
       </div>
     </form>
diff --git a/templates/auto/reset-password.html.ep b/templates/auto/reset-password.html.ep
index 7fe1e495..8ca96437 100644
--- a/templates/auto/reset-password.html.ep
+++ b/templates/auto/reset-password.html.ep
@@ -129,7 +129,7 @@
           </div>
         </div>
         <div style="margin-top:20px">
-          <button type="submit" class="btn btn-green">Reset Password</button>
+          <button type="submit" class="btn btn-green btn-new">Reset Password</button>
         </div>
       </div>
     </form>
diff --git a/templates/issues.html.ep b/templates/issues.html.ep
index 188ce52c..4c6734c8 100644
--- a/templates/issues.html.ep
+++ b/templates/issues.html.ep
@@ -70,7 +70,7 @@
       </div>
       <div class="issues-button-container-right">
         % if ($api->logined) {
-          <a href="<%= url_for("/$user_id/$project_id/issues/new") %>" class="btn btn-green">New issue</a>
+          <a href="<%= url_for("/$user_id/$project_id/issues/new") %>" class="btn btn-green btn-new">New issue</a>
         % }
       </div>
     </div>
diff --git a/templates/labels.html.ep b/templates/labels.html.ep
index 3f0b0e4d..0893a08a 100644
--- a/templates/labels.html.ep
+++ b/templates/labels.html.ep
@@ -193,7 +193,7 @@
   %= include '/include/errors', errors => $errors;
   % if ($can_write_access) {
     <div class="labels-new-panel">
-      <div class="labels-new-btn btn btn-green">
+      <div class="labels-new-btn btn btn-green btn-new">
         New label
       </div>
     </div>
diff --git a/templates/pull.html.ep b/templates/pull.html.ep
index 2c64125b..67f3e2b4 100644
--- a/templates/pull.html.ep
+++ b/templates/pull.html.ep
@@ -469,7 +469,7 @@
             <div class="pull-request-form-button">
               <form action="<%= url_for %>" method="post">
                 <%= hidden_field op => 'merge' %>
-                <%= submit_button 'Merge pull request', class => "btn btn-green" %>
+                <%= submit_button 'Merge pull request', class => "btn btn-green btn-new" %>
                 <span style="margin-left:5px">
                   You can also view <a href="javascript:void(0)" onclick="$('#command-line-instructions').toggle()" >command line instructions</a>.
                 </span>
@@ -564,7 +564,7 @@ git push origin <%= $base_branch %>
                   % } else {
                     <input type="submit" value="Reopen pull request" onclick="$(this).closest('form').find('[name=op]').val('reopen-issue'); $(this).closest('form').submit();" class="btn">
                   % }
-                  <input type="submit" value="Comment" onclick="$(this).closest('form').find('[name=op]').val('add-comment'); $(this).closest('form').submit();" class="btn btn-green">
+                  <input type="submit" value="Comment" onclick="$(this).closest('form').find('[name=op]').val('add-comment'); $(this).closest('form').submit();" class="btn btn-green btn-new">
                 </div>
               </div>
             </div>
diff --git a/templates/pulls.html.ep b/templates/pulls.html.ep
index 53c48a64..e79f0259 100644
--- a/templates/pulls.html.ep
+++ b/templates/pulls.html.ep
@@ -50,9 +50,9 @@
     % if ($api->logined) {
       <div class="pulls-button-container">
         % if ($original_project) {
-          <a href="<%= url_for("/$original_project->{'user.id'}/$original_project->{id}/compare/$original_project->{default_branch}...$user_id:$default_branch") %>" class="btn btn-green">New pull request</a>
+          <a href="<%= url_for("/$original_project->{'user.id'}/$original_project->{id}/compare/$original_project->{default_branch}...$user_id:$default_branch") %>" class="btn btn-green btn-new">New pull request</a>
         % } else {
-          <a href="<%= url_for("/$user_id/$project_id/compare") %>" class="btn btn-green">New pull request</a>
+          <a href="<%= url_for("/$user_id/$project_id/compare") %>" class="btn btn-green btn-new">New pull request</a>
         % }
       </div>
     % }
diff --git a/templates/settings/collaboration.html.ep b/templates/settings/collaboration.html.ep
index 85b8ce09..318a0b31 100644
--- a/templates/settings/collaboration.html.ep
+++ b/templates/settings/collaboration.html.ep
@@ -152,7 +152,7 @@
             <form action="<%= url_for->query(op => 'add') %>" method="post">
               <div>
                 <%= text_field 'collaborator' %>
-                <input type="submit" value="Add"" >
+                <input type="submit" value="Add" class="btn" >
               </div>
             </form>
           </div>
diff --git a/templates/user-settings/ssh.html.ep b/templates/user-settings/ssh.html.ep
index 144458c0..8a4433fc 100644
--- a/templates/user-settings/ssh.html.ep
+++ b/templates/user-settings/ssh.html.ep
@@ -195,7 +195,7 @@
                 <form action="<%= url_for->query(op => 'delete') %>" method="post">
                   <div>
                     <b><%= $key->{title} %></b>
-                    <a class="btn btn-small btn-danger" href="javascript:void(0)" onclick="$(this).closest('form').submit()">Delete</a>
+                    <a class="btn btn-danger btn-delete" href="javascript:void(0)" onclick="$(this).closest('form').submit()">Delete</a>
                     <%= hidden_field 'row-id' => $key->{row_id} %>
                   </div>
                 </form>
@@ -228,7 +228,7 @@
               <div>
                 <%= text_area 'key' %>
               </div>
-              <input type="submit" class="btn btn-green" value="Add key">
+              <input type="submit" class="btn btn-green btn-new" value="Add key">
             </form>
           </div>
         </div>