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;
|
||||
}
|
||||
|
||||
&.clear-block {
|
||||
margin-bottom: $gl-padding - 1px;
|
||||
padding-bottom: $gl-padding;
|
||||
}
|
||||
|
||||
&.second-block {
|
||||
margin-top: -1px;
|
||||
margin-bottom: 0;
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
- if show_last_push_widget?(event)
|
||||
.event-last-push
|
||||
.event-last-push-text
|
||||
%span You pushed to
|
||||
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
|
||||
%strong= event.ref_name
|
||||
%span at
|
||||
%strong= link_to_project event.project
|
||||
#{time_ago_with_tooltip(event.created_at)}
|
||||
.gray-content-block.clear-block
|
||||
.event-last-push
|
||||
.event-last-push-text
|
||||
%span You pushed to
|
||||
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
|
||||
%strong= event.ref_name
|
||||
%span at
|
||||
%strong= link_to_project event.project
|
||||
#{time_ago_with_tooltip(event.created_at)}
|
||||
|
||||
.pull-right
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
||||
Create Merge Request
|
||||
%hr
|
||||
.pull-right
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
||||
Create Merge Request
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
- if event = last_push_event
|
||||
- if show_last_push_widget?(event)
|
||||
.hidden-xs.center
|
||||
.slead
|
||||
%span You pushed to
|
||||
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
|
||||
%strong= event.ref_name
|
||||
branch
|
||||
#{time_ago_with_tooltip(event.created_at)}
|
||||
|
||||
%div
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
||||
Create Merge Request
|
||||
%hr
|
||||
.gray-content-block.top-block.clear-block.hidden-xs
|
||||
.event-last-push
|
||||
.event-last-push-text
|
||||
%span You pushed to
|
||||
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
|
||||
%strong= event.ref_name
|
||||
branch
|
||||
#{time_ago_with_tooltip(event.created_at)}
|
||||
|
||||
.pull-right
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
||||
Create Merge Request
|
||||
|
|
Loading…
Reference in a new issue