Fix last push widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
558084f403
commit
a635e1a395
3 changed files with 29 additions and 23 deletions
|
@ -36,6 +36,11 @@
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.clear-block {
|
||||||
|
margin-bottom: $gl-padding - 1px;
|
||||||
|
padding-bottom: $gl-padding;
|
||||||
|
}
|
||||||
|
|
||||||
&.second-block {
|
&.second-block {
|
||||||
margin-top: -1px;
|
margin-top: -1px;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
- if show_last_push_widget?(event)
|
- if show_last_push_widget?(event)
|
||||||
|
.gray-content-block.clear-block
|
||||||
.event-last-push
|
.event-last-push
|
||||||
.event-last-push-text
|
.event-last-push-text
|
||||||
%span You pushed to
|
%span You pushed to
|
||||||
|
@ -11,4 +12,3 @@
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
||||||
Create Merge Request
|
Create Merge Request
|
||||||
%hr
|
|
||||||
|
|
|
@ -1,14 +1,15 @@
|
||||||
- if event = last_push_event
|
- if event = last_push_event
|
||||||
- if show_last_push_widget?(event)
|
- if show_last_push_widget?(event)
|
||||||
.hidden-xs.center
|
|
||||||
.slead
|
.gray-content-block.top-block.clear-block.hidden-xs
|
||||||
|
.event-last-push
|
||||||
|
.event-last-push-text
|
||||||
%span You pushed to
|
%span You pushed to
|
||||||
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
|
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
|
||||||
%strong= event.ref_name
|
%strong= event.ref_name
|
||||||
branch
|
branch
|
||||||
#{time_ago_with_tooltip(event.created_at)}
|
#{time_ago_with_tooltip(event.created_at)}
|
||||||
|
|
||||||
%div
|
.pull-right
|
||||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
||||||
Create Merge Request
|
Create Merge Request
|
||||||
%hr
|
|
||||||
|
|
Loading…
Reference in a new issue