From f8dabda75be6f6cd37463a2633d86fbed929d64b Mon Sep 17 00:00:00 2001
From: N-Shar-ma <bablinaneh@gmail.com>
Date: Thu, 7 Oct 2021 06:04:38 +0530
Subject: [PATCH 1/3] Updated position and content of news banner

Signed-off-by: N-Shar-ma <bablinaneh@gmail.com>
---
 microsite/pages/en/index.js     | 24 +++++++++++++++---------
 microsite/static/css/custom.css |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/microsite/pages/en/index.js b/microsite/pages/en/index.js
index 56b6c122ae..45d8c3cdfa 100644
--- a/microsite/pages/en/index.js
+++ b/microsite/pages/en/index.js
@@ -20,6 +20,21 @@ class Index extends React.Component {
 
     return (
       <main className="MainContent">
+
+        <Banner.Container>
+          <Banner.Dismissable storageKey="k8s-launch">
+            🚀Feature updates!{' '}
+            <a href = "https://backstage.io/blog/2021/07/26/software-templates-are-now-in-beta">
+              Software Templates
+            </a>
+            {' '}and{' '}
+            <a href = "https://backstage.io/blog/2021/09/16/the-techdocs-beta-has-landed">
+              TechDocs
+            </a>
+            {' '}are now in beta.
+          </Banner.Dismissable>
+        </Banner.Container>
+        
         <Block small className="bg-black-grey stripe-bottom">
           <Block.Container>
             <Block.TextBox>
@@ -54,15 +69,6 @@ class Index extends React.Component {
           </Block.Container>
         </Block>
 
-        <Banner.Container>
-          <Banner.Dismissable storageKey="k8s-launch">
-            🎉 New feature: Kubernetes for service owners.{' '}
-            <a href="https://backstage.io/blog/2021/01/12/new-backstage-feature-kubernetes-for-service-owners">
-              Learn more.
-            </a>
-          </Banner.Dismissable>
-        </Banner.Container>
-
         <Block small className="stripe-top bg-black">
           <Block.Container wrapped>
             <Block.TextBox>
diff --git a/microsite/static/css/custom.css b/microsite/static/css/custom.css
index 393a5af118..19bf5c9590 100644
--- a/microsite/static/css/custom.css
+++ b/microsite/static/css/custom.css
@@ -1097,7 +1097,7 @@ code {
 
   max-width: 1430px;
   height: 0;
-  margin: -14px auto 14px auto;
+  margin: calc(55px - 1vw) auto 14px auto;
 }
 
 .Banner__DismissButton {

From e1f72b8581315c1aee58b2d6075de81ef4cfcd86 Mon Sep 17 00:00:00 2001
From: N-Shar-ma <bablinaneh@gmail.com>
Date: Thu, 7 Oct 2021 17:23:25 +0530
Subject: [PATCH 2/3] Minor suggested fixes

Signed-off-by: N-Shar-ma <bablinaneh@gmail.com>
---
 microsite/pages/en/index.js     | 19 +++++++++----------
 microsite/static/css/custom.css | 21 +++++++++++++++++++--
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/microsite/pages/en/index.js b/microsite/pages/en/index.js
index 45d8c3cdfa..3804c45478 100644
--- a/microsite/pages/en/index.js
+++ b/microsite/pages/en/index.js
@@ -20,21 +20,20 @@ class Index extends React.Component {
 
     return (
       <main className="MainContent">
-
         <Banner.Container>
-          <Banner.Dismissable storageKey="k8s-launch">
-            🚀Feature updates!{' '}
-            <a href = "https://backstage.io/blog/2021/07/26/software-templates-are-now-in-beta">
+          <Banner.Dismissable storageKey="2021-10-07-software-templates-techdocs-beta">
+            🚀 Feature updates!{' '}
+            <a href="https://backstage.io/blog/2021/07/26/software-templates-are-now-in-beta">
               Software Templates
-            </a>
-            {' '}and{' '}
-            <a href = "https://backstage.io/blog/2021/09/16/the-techdocs-beta-has-landed">
+            </a>{' '}
+            and{' '}
+            <a href="https://backstage.io/blog/2021/09/16/the-techdocs-beta-has-landed">
               TechDocs
-            </a>
-            {' '}are now in beta.
+            </a>{' '}
+            are now in beta.
           </Banner.Dismissable>
         </Banner.Container>
-        
+
         <Block small className="bg-black-grey stripe-bottom">
           <Block.Container>
             <Block.TextBox>
diff --git a/microsite/static/css/custom.css b/microsite/static/css/custom.css
index 19bf5c9590..8fcf7845ef 100644
--- a/microsite/static/css/custom.css
+++ b/microsite/static/css/custom.css
@@ -1094,10 +1094,27 @@ code {
   position: relative;
   overflow: visible;
   z-index: 100;
-
+  margin: 25px auto 0 auto;
   max-width: 1430px;
   height: 0;
-  margin: calc(55px - 1vw) auto 14px auto;
+}
+ 
+@media only screen and (max-width: 1024px) {
+  .Banner__Container {
+    margin-top: 20px;
+  }
+} 
+
+@media only screen and (max-width: 645px) {
+  .Banner__Container {
+    margin-top: 60px;
+  }
+}
+
+@media only screen and (max-width: 335px) {
+  .Banner__Container {
+    margin-top: 90px;
+  }
 }
 
 .Banner__DismissButton {

From ef98644381741a2767861f79544dd8df5ff612b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 7 Oct 2021 21:42:35 +0200
Subject: [PATCH 3/3] prettier
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 microsite/static/css/custom.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/microsite/static/css/custom.css b/microsite/static/css/custom.css
index 8fcf7845ef..ac432372b1 100644
--- a/microsite/static/css/custom.css
+++ b/microsite/static/css/custom.css
@@ -1098,12 +1098,12 @@ code {
   max-width: 1430px;
   height: 0;
 }
- 
+
 @media only screen and (max-width: 1024px) {
   .Banner__Container {
     margin-top: 20px;
   }
-} 
+}
 
 @media only screen and (max-width: 645px) {
   .Banner__Container {