Restyle last push widget

Dmitriy Zaporozhets
1 parent d20f78f7
Showing 3 changed files with 11 additions and 29 deletions Show diff stats
app/assets/stylesheets/sections/events.scss
app/views/events/_event_last_push.html.haml
app/views/projects/compare/_form.html.haml
@@ -130,30 +130,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;
+}
 - 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
@@ -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
...	...	@@ -130,30 +130,6 @@
130	130	}
131	131
132	132	/**
133		- * Push event widget
134		- *
135		- */
136		-.event_lp {
137		- color: #777;
138		- padding: 10px;
139		- min-height: 22px;
140		- border-left: 5px solid $primary_color;
141		- margin-bottom: 20px;
142		- background: #f9f9f9;
143		-
144		- .avatar {
145		- width: 24px;
146		- }
147		-
148		- .btn-new-mr {
149		- @extend .btn-primary;
150		- @extend .small;
151		- @extend .pull-right;
152		- margin: -2px;
153		- }
154		-}
155		-
156		-/**
157	133	* Event filter
158	134	*
159	135	*/
...	...	@@ -182,3 +158,9 @@
182	158	}
183	159	}
184	160	}
	161	+
	162	+.event-last-push .btn-create {
	163	+ position: relative;
	164	+ top: -3px;
	165	+ right: -30px;
	166	+}
...	...
1	1	- if show_last_push_widget?(event)
2		- .event_lp
	2	+ .alert.alert-success.event-last-push
3	3	%span You pushed to
4	4	= link_to project_commits_path(event.project, event.ref_name) do
5	5	%strong= truncate(event.ref_name, length: 28)
...	...	@@ -8,6 +8,6 @@
8	8	%span
9	9	= time_ago_in_words(event.created_at)
10	10	ago.
11		-
12		- = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-new-mr" do
13		- Create Merge Request
	11	+ .pull-right
	12	+ = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do
	13	+ Create Merge Request
...	...
...	...	@@ -19,7 +19,7 @@
19	19	= text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
20	20	.pull-left
21	21
22		- = submit_tag "Compare", class: "btn btn-primary wide commits-compare-btn"
	22	+ = submit_tag "Compare", class: "btn btn-create commits-compare-btn"
23	23	- if @refs_are_same
24	24	.alert
25	25	%span Refs are the same
...	...