Merge branch 'create-mr-banner' into 'master'

MR banner & flash notices updates ### What does this MR do? * Moves the create MR banner below subnav * Changes MR banner background to white * Moves flash notices underneath subnav * Adds container within flash notices to align with content Closes #22767 ### Why was this MR needed? It looked a bit out of place between the two navs & had unneeded spacing. ### Screenshots (if relevant) Before: <img src="/uploads/c1676a1923893a7ba7e1c6d6a50d4ea6/Screen_Shot_2016-09-09_at_7.17.31_PM.png" width="800px"> After: <img src="/uploads/74a2d6c8c43b9a15cd535a2a7adb2685/Screen_Shot_2016-09-28_at_3.41.29_PM.png" width="800px"> Before: <img src="/uploads/285e3de31326c48de43bb48abd4d907c/Screen_Shot_2016-09-29_at_10.57.55_AM.png" width="800px"> After: <img src="/uploads/0877e3e45755e5ca36694c52ad2e6198/Screen_Shot_2016-09-29_at_10.56.04_AM.png" width="800px"> With both alert and broadcast message: ![Screen_Shot_2016-09-29_at_11.06.51_AM](/uploads/ba3963a73b5c82940533c369ec54ec50/Screen_Shot_2016-09-29_at_11.06.51_AM.png) See merge request !6581

Merge branch 'create-mr-banner' into 'master'
fc90db7c · Fatih Acet · df100ca2 · a2af7790 · fc90db7c · fc90db7c
Commit fc90db7c authored Oct 01, 2016 by Fatih Acet
16 changed files
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,7 @@ v 8.13.0 (unreleased)
  - Add missing values to linter !6276 (Katarzyna Kobierska Ula Budziszewska)
  - Fix Long commit messages overflow viewport in file tree
  - Revert avoid touching file system on Build#artifacts?
+  - Add broadcast messages and alerts below sub-nav
  - Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe)
  - Fix unnecessary escaping of reserved HTML characters in milestone title. !6533
  - Add organization field to user profile

--- a/app/assets/stylesheets/framework/flash.scss
+++ b/app/assets/stylesheets/framework/flash.scss
@@ -3,6 +3,8 @@
  margin: 0;
  margin-bottom: $gl-padding;
  font-size: 14px;
+  position: relative;
+  z-index: 1;

  .flash-notice {
    @extend .alert;
@@ -33,6 +35,12 @@
  }
 }

+.content-wrapper {
+  .flash-notice .container-fluid {
+    background-color: transparent;
+  }
+}
+
 @media (max-width: $screen-md-min) {
  ul.notes {
    .flash-container.timeline-content {

--- a/app/views/admin/background_jobs/_head.html.haml
+++ b/app/views/admin/background_jobs/_head.html.haml
-.scrolling-tabs-container.sub-nav-scroll
+= content_for :sub_nav do
+  .scrolling-tabs-container.sub-nav-scroll
    = render 'shared/nav_scroll'
    .nav-links.sub-nav.scrolling-tabs
      %ul{ class: (container_class) }

--- a/app/views/admin/dashboard/_head.html.haml
+++ b/app/views/admin/dashboard/_head.html.haml
-.scrolling-tabs-container.sub-nav-scroll
+= content_for :sub_nav do
+  .scrolling-tabs-container.sub-nav-scroll
    = render 'shared/nav_scroll'
    .nav-links.sub-nav.scrolling-tabs
      %ul{ class: (container_class) }

--- a/app/views/layouts/_flash.html.haml
+++ b/app/views/layouts/_flash.html.haml
 .flash-container.flash-container-page
  - if alert
    .flash-alert
-      = alert
+      %div{ class: (container_class) }
+        %span= alert

  - elsif notice
    .flash-notice
-      = notice
+      %div{ class: (container_class) }
+        %span= notice
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -20,6 +20,7 @@
      .container-fluid
        = render "layouts/nav/#{nav}"
  .content-wrapper{ class: "#{layout_nav_class}" }
+    = yield :sub_nav
    = render "layouts/broadcast"
    = render "layouts/flash"
    = yield :flash_message

--- a/app/views/projects/_activity.html.haml
+++ b/app/views/projects/_activity.html.haml
-.nav-block.activity-filter-block
+- @no_container = true
+
+%div{ class: container_class }
+  .nav-block.activity-filter-block
    - if current_user
      .controls
        = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Feed", class: 'btn rss-btn' do
-        %i.fa.fa-rss
+          = icon('rss')

    = render 'shared/event_filter'

-.content_list.project-activity{:"data-href" => activity_project_path(@project)}
-= spinner
+  .content_list.project-activity{:"data-href" => activity_project_path(@project)}
+  = spinner

 :javascript
  var activity = new Activities();

--- a/app/views/projects/_last_push.html.haml
+++ b/app/views/projects/_last_push.html.haml
 - if event = last_push_event
  - if show_last_push_widget?(event)
-    .row-content-block.top-block.clear-block.hidden-xs
+    .row-content-block.top-block.hidden-xs.white
      %div{ class: container_class }
        .event-last-push
          .event-last-push-text

--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
-.scrolling-tabs-container.sub-nav-scroll
+= content_for :sub_nav do
+  .scrolling-tabs-container.sub-nav-scroll
    = render 'shared/nav_scroll'
    .nav-links.sub-nav.scrolling-tabs
      %ul{ class: (container_class) }

--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -5,7 +5,8 @@
  - if current_user
    = auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "#{@project.name}:#{@ref} commits")

-= render "head"
+= content_for :sub_nav do
+  = render "head"

 %div{ class: container_class }
  .row-content-block.second-block.content-component-block

--- a/app/views/projects/graphs/_head.html.haml
+++ b/app/views/projects/graphs/_head.html.haml
-.scrolling-tabs-container.sub-nav-scroll
+= content_for :sub_nav do
+  .scrolling-tabs-container.sub-nav-scroll
    = render 'shared/nav_scroll'
    .nav-links.sub-nav.scrolling-tabs
      %ul{ class: (container_class) }

--- a/app/views/projects/issues/_head.html.haml
+++ b/app/views/projects/issues/_head.html.haml
-.scrolling-tabs-container.sub-nav-scroll
+= content_for :sub_nav do
+  .scrolling-tabs-container.sub-nav-scroll
    = render 'shared/nav_scroll'
    .nav-links.sub-nav.scrolling-tabs
      %ul{ class: (container_class) }

--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -3,7 +3,8 @@

 - page_title "Issues"
 - new_issue_email = @project.new_issue_address(current_user)
-= render "projects/issues/head"
+= content_for :sub_nav do
+  = render "projects/issues/head"

 = content_for :meta_tags do
  - if current_user

--- a/app/views/projects/pipelines/_head.html.haml
+++ b/app/views/projects/pipelines/_head.html.haml
-.scrolling-tabs-container.sub-nav-scroll
+= content_for :sub_nav do
+  .scrolling-tabs-container.sub-nav-scroll
    = render 'shared/nav_scroll'
    .nav-links.sub-nav.scrolling-tabs
      %ul{ class: (container_class) }

--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -4,8 +4,8 @@
 = content_for :meta_tags do
  - if current_user
    = auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "#{@project.name}:#{@ref} commits")
-= render 'projects/last_push'
 = render "projects/commits/head"
+= render 'projects/last_push'

 %div{ class: container_class }
  .tree-controls

--- a/app/views/projects/wikis/_nav.html.haml
+++ b/app/views/projects/wikis/_nav.html.haml
-.scrolling-tabs-container.sub-nav-scroll
+= content_for :sub_nav do
+  .scrolling-tabs-container.sub-nav-scroll
    = render 'shared/nav_scroll'
    .nav-links.sub-nav.scrolling-tabs
      %ul{ class: (container_class) }