Merge branch 'push-event-banner-container' into 'master'
Fixed last push event banner not being in container ## What does this MR do? Adds the last push event content into a container with the correct class. ## What are the relevant issue numbers? Closes #18567 ## Screenshots (if relevant) ![Screen_Shot_2016-06-14_at_13.17.41](/uploads/4afa3d2c73e59c5ffbd53869e49baa92/Screen_Shot_2016-06-14_at_13.17.41.png) See merge request !4644
This commit is contained in:
commit
e11aae1a07
2 changed files with 15 additions and 11 deletions
|
@ -91,6 +91,10 @@
|
|||
background-color: $white-light;
|
||||
border-top: none;
|
||||
}
|
||||
|
||||
&.top-block .container-fluid {
|
||||
background-color: inherit;
|
||||
}
|
||||
}
|
||||
|
||||
.cover-block {
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
- if event = last_push_event
|
||||
- if show_last_push_widget?(event)
|
||||
|
||||
.row-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)}
|
||||
%div{ class: (container_class) }
|
||||
.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
|
||||
.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