From 26a13475a4e196bbe64dc133d787424bae20f398 Mon Sep 17 00:00:00 2001
From: alejandraarri <alejandraarri@carto.com>
Date: Wed, 29 May 2019 19:06:21 +0200
Subject: [PATCH 1/7] Fix notification warning positioning issue overlapping
 other banners

---
 assets/stylesheets/common/account_forms.scss  |  1 -
 lib/assets/javascripts/new-dashboard/App.vue  | 29 ++++++++++++-------
 .../new-dashboard/bundles/header/header.js    |  4 +--
 .../NavigationBar/NavigationBar.vue           |  3 +-
 .../new-dashboard/components/Page.vue         |  6 +---
 .../components/StickySubheader.vue            |  7 +++--
 .../new-dashboard/pages/Home/Home.vue         |  6 ++--
 .../new-dashboard/styles/bundles/header.scss  | 10 +++++--
 .../new-dashboard/styles/layout/_grid.scss    |  4 +++
 9 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/assets/stylesheets/common/account_forms.scss b/assets/stylesheets/common/account_forms.scss
index 29961a28b4..ecd686330c 100644
--- a/assets/stylesheets/common/account_forms.scss
+++ b/assets/stylesheets/common/account_forms.scss
@@ -9,7 +9,6 @@ $sLabel-width: 140px;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  padding-top: 64px;
 }
 
 .FormAccount-container {
diff --git a/lib/assets/javascripts/new-dashboard/App.vue b/lib/assets/javascripts/new-dashboard/App.vue
index d35f583844..5d2f378dc1 100644
--- a/lib/assets/javascripts/new-dashboard/App.vue
+++ b/lib/assets/javascripts/new-dashboard/App.vue
@@ -1,16 +1,15 @@
 <template>
   <div id="app">
-
-    <NavigationBar
-      :user="user"
-      :baseUrl="baseUrl"
-      :notificationsCount="notificationsCount"
-      :isNotificationVisible=isNotificationVisible
-      :isFirstTimeInDashboard="isFirstTimeInDashboard"
-      bundleType="dashboard"/>
-    
-    <NotificationWarning v-if="isNotificationVisible" :htmlBody=user.notification />
-
+    <header :class="{ 'is-user-notification': isNotificationVisible }">
+      <NotificationWarning v-if="isNotificationVisible" :htmlBody=user.notification />
+      <NavigationBar
+        :user="user"
+        :baseUrl="baseUrl"
+        :notificationsCount="notificationsCount"
+        :isNotificationVisible=isNotificationVisible
+        :isFirstTimeInDashboard="isFirstTimeInDashboard"
+        bundleType="dashboard"/>
+    </header>
     <router-view/>
 
     <Footer :user="user"/>
@@ -85,4 +84,12 @@ export default {
   box-sizing: border-box;
 }
 
+header {
+  padding-top: 60px;
+
+  &.is-user-notification {
+    padding-top: 124px;
+  }
+}
+
 </style>
diff --git a/lib/assets/javascripts/new-dashboard/bundles/header/header.js b/lib/assets/javascripts/new-dashboard/bundles/header/header.js
index 22ce370fe6..eaf7dae365 100644
--- a/lib/assets/javascripts/new-dashboard/bundles/header/header.js
+++ b/lib/assets/javascripts/new-dashboard/bundles/header/header.js
@@ -36,14 +36,14 @@ new Vue({
     };
   },
   template: `
-    <header>
+    <header id="header" :class="{ 'is-user-notification': isNotificationVisible }">
+      <NotificationWarning v-if="isNotificationVisible" :htmlBody="userNotification" />
       <NavigationBar
         class="nd-navbar"
         :user="user"
         :baseUrl="baseUrl"
         :isNotificationVisible="isNotificationVisible"
         :notificationsCount="notificationsCount" />
-      <NotificationWarning v-if="isNotificationVisible" :htmlBody="userNotification" />
     </header>
   `
 });
diff --git a/lib/assets/javascripts/new-dashboard/components/NavigationBar/NavigationBar.vue b/lib/assets/javascripts/new-dashboard/components/NavigationBar/NavigationBar.vue
index 8df7a5db97..305e15e615 100644
--- a/lib/assets/javascripts/new-dashboard/components/NavigationBar/NavigationBar.vue
+++ b/lib/assets/javascripts/new-dashboard/components/NavigationBar/NavigationBar.vue
@@ -125,6 +125,7 @@ export default {
 .navbar {
   display: flex;
   position: fixed;
+  top: 0;
   z-index: $z-index__navbar;
   align-items: center;
   justify-content: space-between;
@@ -273,7 +274,7 @@ export default {
 }
 
 .navbar.is-user-notification {
-  margin-top: $notification-warning__height;
+  top: $notification-warning__height;
 }
 
 .feedback-popup {
diff --git a/lib/assets/javascripts/new-dashboard/components/Page.vue b/lib/assets/javascripts/new-dashboard/components/Page.vue
index 9b1b2fa105..7e34c34c76 100644
--- a/lib/assets/javascripts/new-dashboard/components/Page.vue
+++ b/lib/assets/javascripts/new-dashboard/components/Page.vue
@@ -26,15 +26,11 @@ export default {
   border-bottom: 1px solid $border-color;
 
   &.is-user-notification {
-    padding-top: 128px + $notification-warning__height;
+    padding-top: 128px - $notification-warning__height;
   }
 }
 
 .page.page__sticky-subheader {
   padding: 192px 0 120px;
-
-  &.is-user-notification {
-    padding-top: 192px + $notification-warning__height;
-  }
 }
 </style>
diff --git a/lib/assets/javascripts/new-dashboard/components/StickySubheader.vue b/lib/assets/javascripts/new-dashboard/components/StickySubheader.vue
index 7b2f5fad30..0941be8e6b 100644
--- a/lib/assets/javascripts/new-dashboard/components/StickySubheader.vue
+++ b/lib/assets/javascripts/new-dashboard/components/StickySubheader.vue
@@ -43,10 +43,11 @@ export default {
 
   &.is-visible {
     transform: translate3d(0, 64px, 0);
-  }
 
-  &.is-user-notification {
-    top: $notification-warning__height;
+    &.is-user-notification {
+      $stickyHeaderPosition: calc(64px + #{$notification-warning__height});
+      transform: translate3d(0, #{$stickyHeaderPosition}, 0);
+    }
   }
 }
 
diff --git a/lib/assets/javascripts/new-dashboard/pages/Home/Home.vue b/lib/assets/javascripts/new-dashboard/pages/Home/Home.vue
index 2a134ff6da..9c947c54fc 100644
--- a/lib/assets/javascripts/new-dashboard/pages/Home/Home.vue
+++ b/lib/assets/javascripts/new-dashboard/pages/Home/Home.vue
@@ -76,10 +76,8 @@ export default {
 <style scoped lang="scss">
 @import 'new-dashboard/styles/variables';
 
-.page.page {
-  &--welcome {
-    padding: 64px 0 0;
-  }
+header.is-user-notification + section.page--welcome {
+  padding: 0;
 }
 
 .section {
diff --git a/lib/assets/javascripts/new-dashboard/styles/bundles/header.scss b/lib/assets/javascripts/new-dashboard/styles/bundles/header.scss
index 45c15d7012..92f8be734f 100644
--- a/lib/assets/javascripts/new-dashboard/styles/bundles/header.scss
+++ b/lib/assets/javascripts/new-dashboard/styles/bundles/header.scss
@@ -4,8 +4,6 @@
 @import "../helpers/colors";
 @import "../helpers/utilities";
 
-#app,
-.FormAccount-Section,
 .FlashMessage-container {
   padding-top: 64px;
 }
@@ -26,3 +24,11 @@
   width: 24px;
   height: 24px;
 }
+
+#header {
+  padding-top: 60px;
+
+  &.is-user-notification {
+    padding-top: 124px;
+  }
+}
diff --git a/lib/assets/javascripts/new-dashboard/styles/layout/_grid.scss b/lib/assets/javascripts/new-dashboard/styles/layout/_grid.scss
index 18b14a7859..670ecc3a1c 100644
--- a/lib/assets/javascripts/new-dashboard/styles/layout/_grid.scss
+++ b/lib/assets/javascripts/new-dashboard/styles/layout/_grid.scss
@@ -50,6 +50,10 @@
   top: 0;
 }
 
+header.is-user-notification + section .grid__head--sticky {
+  top: 124px;
+}
+
 .grid-cell {
   padding-right: 10px;
   padding-left: 10px;

From fe0bc43d5ca9bd38690792f82818dfaf2063f9c1 Mon Sep 17 00:00:00 2001
From: alejandraarri <alejandraarri@carto.com>
Date: Wed, 29 May 2019 19:07:13 +0200
Subject: [PATCH 2/7] Update package.json version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4dee56a432..3585cd159b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.97",
+  "version": "1.0.0-assets.97-notification-1",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",

From 14b530a506502a2b526aa8e25b70029f1ce68d9e Mon Sep 17 00:00:00 2001
From: alejandraarri <alejandraarri@carto.com>
Date: Wed, 29 May 2019 21:37:48 +0200
Subject: [PATCH 3/7] Fix spacing above the welcome message

---
 lib/assets/javascripts/new-dashboard/components/Page.vue | 4 ++++
 package.json                                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/assets/javascripts/new-dashboard/components/Page.vue b/lib/assets/javascripts/new-dashboard/components/Page.vue
index 7e34c34c76..4dc1a4fa65 100644
--- a/lib/assets/javascripts/new-dashboard/components/Page.vue
+++ b/lib/assets/javascripts/new-dashboard/components/Page.vue
@@ -25,6 +25,10 @@ export default {
   padding: 128px 0 120px;
   border-bottom: 1px solid $border-color;
 
+  &--welcome {
+    padding-top: 64px;
+  }
+
   &.is-user-notification {
     padding-top: 128px - $notification-warning__height;
   }
diff --git a/package.json b/package.json
index 3585cd159b..3b9f0870f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.97-notification-1",
+  "version": "1.0.0-assets.97-notification-2",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",

From 8c79c975b6e096dbc251ab545a9f8fffb3a153dc Mon Sep 17 00:00:00 2001
From: alejandraarri <alejandraarri@carto.com>
Date: Wed, 29 May 2019 22:07:49 +0200
Subject: [PATCH 4/7] Remove unneeded margin in welcome message

---
 .../new-dashboard/pages/Home/WelcomeSection/Welcome.vue    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/assets/javascripts/new-dashboard/pages/Home/WelcomeSection/Welcome.vue b/lib/assets/javascripts/new-dashboard/pages/Home/WelcomeSection/Welcome.vue
index 41f8295cd3..64d9851f9e 100644
--- a/lib/assets/javascripts/new-dashboard/pages/Home/WelcomeSection/Welcome.vue
+++ b/lib/assets/javascripts/new-dashboard/pages/Home/WelcomeSection/Welcome.vue
@@ -93,10 +93,3 @@ export default {
   }
 };
 </script>
-<style scoped lang="scss">
-@import 'new-dashboard/styles/variables';
-
-.welcome-section.is-user-notification {
-  margin-top: $notification-warning__height;
-}
-</style>
\ No newline at end of file

From 51ed2d43a55778f3cdcefc021b60ba117bb305bb Mon Sep 17 00:00:00 2001
From: alejandraarri <alejandraarri@carto.com>
Date: Wed, 29 May 2019 22:08:19 +0200
Subject: [PATCH 5/7] Update package.json version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3b9f0870f5..a18f529e0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.97-notification-2",
+  "version": "1.0.0-assets.97-notification-3",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",

From 65b4d0f27b0de73ccaf1437dd6ef0b5e1d8b9936 Mon Sep 17 00:00:00 2001
From: alejandraarri <alejandraarri@carto.com>
Date: Mon, 3 Jun 2019 10:59:55 +0200
Subject: [PATCH 6/7] Update NEWS.md

---
 NEWS.md      | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index cb98e3c357..04e3bda5e3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -30,7 +30,7 @@ Development
 - Change API keys page layout ([#14907](https://github.com/CartoDB/cartodb/pull/14907))
 - Fix empty navigation for non engine users in API keys page ([#14916](https://github.com/CartoDB/cartodb/pull/14916))
 - Update Welcome message with plan info ([#14871](https://github.com/CartoDB/cartodb/issues/14871))
-
+- Fix notification warning positioning issue ([#14920](https://github.com/CartoDB/cartodb/pull/14920))
 
 4.26.1 (2019-05-06)
 -------------------
diff --git a/package.json b/package.json
index a18f529e0e..4c3152af30 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.97-notification-3",
+  "version": "1.0.0-assets.97-notification-4",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",

From 2b1ac89ed7e0b1d4d4cbf4c89324e7933d0cbbc1 Mon Sep 17 00:00:00 2001
From: alejandraarri <alejandraarri@carto.com>
Date: Mon, 3 Jun 2019 12:43:19 +0200
Subject: [PATCH 7/7] Revert package.json version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4c3152af30..4dee56a432 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.97-notification-4",
+  "version": "1.0.0-assets.97",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",