diff options
author | Phil Hughes <me@iamphill.com> | 2016-06-14 13:18:19 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-06-14 13:18:19 +0100 |
commit | b8beb0b8aceb003b940a3a4695b3e7cb67216e5f (patch) | |
tree | 1c2c3e719b9be053805669447cd6ee6e532738fd | |
parent | 0068ba8db597a0396ce1eddd51776981dd12d970 (diff) | |
download | gitlab-ce-b8beb0b8aceb003b940a3a4695b3e7cb67216e5f.tar.gz |
Fixed last push event banner not being in containerpush-event-banner-container
Closes #18567
-rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 4 | ||||
-rw-r--r-- | app/views/projects/_last_push.html.haml | 22 |
2 files changed, 15 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index fab96404a6c..d5fe5bc2ef1 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -91,6 +91,10 @@ background-color: $white-light; border-top: none; } + + &.top-block .container-fluid { + background-color: inherit; + } } .cover-block { diff --git a/app/views/projects/_last_push.html.haml b/app/views/projects/_last_push.html.haml index 7c2b8d01508..e0ca2a3109c 100644 --- a/app/views/projects/_last_push.html.haml +++ b/app/views/projects/_last_push.html.haml @@ -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 |