Commit a635e1a3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix last push widget

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 558084f4
...@@ -36,6 +36,11 @@ ...@@ -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;
......
- if show_last_push_widget?(event) - if show_last_push_widget?(event)
.event-last-push .gray-content-block.clear-block
.event-last-push-text .event-last-push
%span You pushed to .event-last-push-text
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do %span You pushed to
%strong= event.ref_name = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
%span at %strong= event.ref_name
%strong= link_to_project event.project %span at
#{time_ago_with_tooltip(event.created_at)} %strong= link_to_project event.project
#{time_ago_with_tooltip(event.created_at)}
.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
- 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
%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 .gray-content-block.top-block.clear-block.hidden-xs
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do .event-last-push
Create Merge Request .event-last-push-text
%hr %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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment