Replace beta banner with beta badge

This is part of the new header style that Tim, Stephen et al have been
working on.

This means that we lose the feedback link, so I’m trying out having it
in the top right.

app/assets/stylesheets/app.scss

@@ -4,7 +4,8 @@
   background-color: $govuk-blue;
 }
 
-#global-header {
+#global-header,
+#global-header.with-proposition {
 
   #logo {
 
@@ -18,19 +19,39 @@
 
   }
 
+  .header-wrapper {
+    .header-global {
+      .header-logo {
+
+        @include media(desktop) {
+          width: auto;
+        }
+
+        &:after {
+          display: none;
+        }
+
+      }
+    }
+  }
+
   .header-proposition {
     #proposition-links {
       li {
         padding: 0 0 0 15px;
       }
     }
-    #proposition-menu {
-      margin-top: 9px;
-    }
   }
 
 }
 
+.beta-badge {
+  @include phase-tag(beta);
+  background: $govuk-blue;
+  margin: 10px 0 0 0;
+}
+
+
 @include media(desktop) {
   #proposition-menu {
     float: right;

app/templates/admin_template.html

@@ -31,6 +31,7 @@
 {% endblock %}
 
 {% block inside_header %}
+  <strong class='beta-badge'>Beta</strong>
 {% endblock %}
 {% block header_class %}with-proposition{% endblock %}
 {% block proposition_header %}
@@ -39,6 +40,7 @@
       <a href="#proposition-links" class="js-header-toggle menu">Menu</a>
       <nav id="proposition-menu">
         <ul id="proposition-links">
+          <li><a href="{{ url_for('main.feedback') }}">Support and feedback</a></li>
           {% if current_user.is_authenticated %}
             <li>
               <a href="{{ url_for('main.user_profile') }}">{{ current_user.name }}</a>

app/templates/views/signedout.html

@@ -9,13 +9,6 @@
 
 {% block maincolumn_content %}
 
-  <div class="phase-banner-beta">
-    <p>
-      <strong class="phase-tag">BETA</strong>
-      <span>This is a new service – your <a href="{{ url_for('main.feedback') }}">feedback</a> will help us to improve it.</span>
-    </p>
-  </div>
-
   {% call banner_wrapper(type='intro') %}
     <h1 class="heading-medium">
       GOV.UK Notify makes it easy to send text messages and emails to