From f03eba74e9675252451808611dbc5fd84d71a247 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sat, 20 Jun 2015 16:03:16 -0500
Subject: [PATCH] Issue #2462221 by emma.maria, Dom., rudraram, jp.stacey,
 Manjit.Singh, sxnc, Cottser, idebr: Highlighted region has not fixed width
 layout on Bartik theme

---
 core/themes/bartik/css/components/messages.css | 2 +-
 core/themes/bartik/templates/page.html.twig    | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/themes/bartik/css/components/messages.css b/core/themes/bartik/css/components/messages.css
index de3e25e7602..aad710f61ba 100644
--- a/core/themes/bartik/css/components/messages.css
+++ b/core/themes/bartik/css/components/messages.css
@@ -5,7 +5,7 @@
   margin: 0 auto;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
-.has-featured-top #messages {
+.has-featured-top .highlighted {
   background: #f0f0f0;
   background: rgba(30, 50, 10, 0.08);
 }
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 446814ee7dc..a3583fe548b 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -109,7 +109,13 @@
         {{ page.primary_menu }}
       </div>
     </header>
-    {{ page.highlighted }}
+    {% if page.highlighted %}
+      <div class="highlighted">
+        <aside class="layout-container section clearfix" role="complementary">
+          {{ page.highlighted }}
+        </aside>
+      </div>
+    {% endif %}
     {% if page.featured_top %}
       <div class="featured-top">
         <aside class="featured-top__inner section layout-container clearfix" role="complementary">