Merge branch '3604-ee-license-banner-hidden' into 'master'

Render EE trial expiration banner under nav

Closes #3604

See merge request gitlab-org/gitlab-ee!3113

app/assets/stylesheets/pages/ee_start_trial.scss

@@ -17,17 +17,11 @@
 
 /* Trial Banner */
 .gitlab-ee-license-banner.alert {
-  display: flex;
-  align-content: center;
-  justify-content: center;
   padding: 15px 35px;
-  position: fixed;
-  top: 0;
-  width: 100%;
+  position: relative;
   background: $red-400;
   color: $white-light;
   text-align: center;
-  z-index: 400;
 
   @media (max-width: $screen-md-min) {
     padding: 10px 35px;
@@ -54,8 +48,8 @@
 
   .close {
     position: absolute;
-    top: 15%;
-    right: 10px;
+    top: 12px;
+    right: $gl-padding;
   }
 }
 

app/views/layouts/_page.html.haml

@@ -4,6 +4,7 @@
   .content-wrapper.page-with-new-nav
     .mobile-overlay
     .alert-wrapper
+      = render "layouts/header/ee_license_banner"
       = render "layouts/broadcast"
       = yield :flash_message
       - unless @hide_breadcrumbs

app/views/layouts/header/_default.html.haml

-= render "layouts/header/ee_license_banner"
-
 %header.navbar.navbar-gitlab.navbar-gitlab-new
   %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
   .container-fluid