From c1c28d3ceadb51b0a676d19f5addf687f5e3e080 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 17 Jul 2013 00:46:27 +0300
Subject: [PATCH] Restyle last push widget

---
 app/assets/stylesheets/sections/events.scss | 30 +++++----------------
 app/views/events/_event_last_push.html.haml |  8 +++---
 app/views/projects/compare/_form.html.haml  |  2 +-
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index 2e658a32b38..4bc8de4266e 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -129,30 +129,6 @@
   }
 }
 
-/**
- * Push event widget
- *
- */
-.event_lp {
-  color: #777;
-  padding: 10px;
-  min-height: 22px;
-  border-left: 5px solid $primary_color;
-  margin-bottom: 20px;
-  background: #f9f9f9;
-
-  .avatar {
-    width: 24px;
-  }
-
-  .btn-new-mr {
-    @extend .btn-primary;
-    @extend .small;
-    @extend .pull-right;
-    margin: -2px;
-  }
-}
-
 /**
  * Event filter
  *
@@ -182,3 +158,9 @@
     }
   }
 }
+
+.event-last-push .btn-create {
+  position: relative;
+  top: -3px;
+  right: -30px;
+}
diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml
index 2c2f270cf6c..fe79ecd5885 100644
--- a/app/views/events/_event_last_push.html.haml
+++ b/app/views/events/_event_last_push.html.haml
@@ -1,5 +1,5 @@
 - if show_last_push_widget?(event)
-  .event_lp
+  .alert.alert-success.event-last-push
     %span You pushed to
     = link_to project_commits_path(event.project, event.ref_name) do
       %strong= truncate(event.ref_name, length: 28)
@@ -8,6 +8,6 @@
     %span
       = time_ago_in_words(event.created_at)
       ago.
-
-    = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-new-mr" do
-      Create Merge Request
+    .pull-right
+      = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do
+        Create Merge Request
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml
index ccdd0fc98eb..0d388651e14 100644
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
@@ -19,7 +19,7 @@
         = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
       .pull-left
         &nbsp;
-        = submit_tag "Compare", class: "btn btn-primary wide commits-compare-btn"
+        = submit_tag "Compare", class: "btn btn-create commits-compare-btn"
     - if @refs_are_same
       .alert
         %span Refs are the same
-- 
GitLab