From 53a6debc0549e5e39eb436ffaf8dd8d10fb7c4e5 Mon Sep 17 00:00:00 2001
From: Alex Coles <alex@alexbcoles.com>
Date: Tue, 16 Dec 2014 16:41:30 +0100
Subject: [PATCH] Eliminate menu custom button styles

Instead use standard button with round modifier.

Signed-off-by: Alex Coles <alex@alexbcoles.com>
---
 app/assets/stylesheets/layout/_main_menu.sass     | 15 ---------------
 .../open_project_global/_variables.sass           |  5 -----
 app/views/activities/index.html.erb               |  2 +-
 app/views/versions/index.html.erb                 |  2 +-
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/app/assets/stylesheets/layout/_main_menu.sass b/app/assets/stylesheets/layout/_main_menu.sass
index e46439b055..ca274ce5ae 100644
--- a/app/assets/stylesheets/layout/_main_menu.sass
+++ b/app/assets/stylesheets/layout/_main_menu.sass
@@ -251,21 +251,6 @@ $toggler-width: 40px
   a:hover
     text-decoration: underline
 
-  input.button-small
-    margin-top: 14px
-    background: $main-menu-sidebar-button-bg-color
-    border-radius: 25px
-    -webkit-border-radius: 25px
-    padding: 3px 7px
-    color: $main-menu-sidebar-button-font-color
-    border: none
-    cursor: pointer
-    @include main-menu-font
-    @include default-transition
-    &:hover
-      background: $main-menu-sidebar-button-hover-bg-color
-      color: $main-menu-sidebar-button-hover-font-color
-
   ul
     border: none
     overflow-x: hidden
diff --git a/app/assets/stylesheets/open_project_global/_variables.sass b/app/assets/stylesheets/open_project_global/_variables.sass
index 43e96dabf8..c148ff6417 100644
--- a/app/assets/stylesheets/open_project_global/_variables.sass
+++ b/app/assets/stylesheets/open_project_global/_variables.sass
@@ -107,11 +107,6 @@ $main-menu-sidebar-link-color:                  #333333 !default
 $main-menu-sidebar-h3-border-top-color:         #1F4654 !default
 $main-menu-sidebar-h3-font-size:                15px !default
 
-$main-menu-sidebar-button-font-color:           #FFFFFF !default
-$main-menu-sidebar-button-hover-font-color:     #FFFFFF !default
-$main-menu-sidebar-button-bg-color:             #06799F !default
-$main-menu-sidebar-button-hover-bg-color:       #053242 !default
-
 $breadcrumb-height:                             40px !default
 $breadcrumb-bg-color:                           #F8F8F8 !default
 $breadcrumb-border-color:                       #E7E7E7 !default
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index 6d663d5482..028b7bf38e 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -94,7 +94,7 @@ See doc/COPYRIGHT.rdoc for more details.
     <% end %>
     <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
     <%= hidden_field_tag('apply', true) %>
-    <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
+    <p><%= submit_tag l(:button_apply), :class => 'button -tiny -round -highlight', :name => nil %></p>
   <% end %>
 <% end %>
 
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index f42d216806..c256bfec13 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -71,7 +71,7 @@ See doc/COPYRIGHT.rdoc for more details.
   <%= hidden_field_tag 'with_subprojects', 0 %>
   <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
 <% end %>
-<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
+<p><%= submit_tag l(:button_apply), :class => 'button -tiny -round -highlight', :name => nil %></p>
 <% end %>
 
 <h3><%= l(:label_version_plural) %></h3>