From b5da3f21346655496a356536b43328d27df419a4 Mon Sep 17 00:00:00 2001
From: jesusbotella <jesus.botella@gmail.com>
Date: Wed, 22 Jan 2020 13:30:52 +0100
Subject: [PATCH 1/5] Make ShareViaUrl dialog styles specific to dialog footer

---
 .../new-dashboard/components/Backbone/Dialogs/ShareViaUrl.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/assets/javascripts/new-dashboard/components/Backbone/Dialogs/ShareViaUrl.vue b/lib/assets/javascripts/new-dashboard/components/Backbone/Dialogs/ShareViaUrl.vue
index f13ba8f6411c..fd55b0113fd5 100644
--- a/lib/assets/javascripts/new-dashboard/components/Backbone/Dialogs/ShareViaUrl.vue
+++ b/lib/assets/javascripts/new-dashboard/components/Backbone/Dialogs/ShareViaUrl.vue
@@ -18,7 +18,7 @@
     </div>
 
     <div class="Dialog-stickyFooter u-flex">
-      <div class="Dialog-footer u-inner">
+      <div class="Dialog-shareViaUrl-footer Dialog-footer u-inner">
         <button class="CDB-Button CDB-Button--secondary" @click="close">
           <span class="CDB-Button-Text CDB-Text is-semibold CDB-Size-small u-upperCase">{{ $t('Dialogs.ShareViaURL.close') }}</span>
         </button>
@@ -79,7 +79,7 @@ export default {
 @import 'new-dashboard/styles/variables';
 @import 'assets/stylesheets/editor-3/_cards.scss';
 
-.Dialog-footer {
+.Dialog-shareViaUrl-footer.Dialog-footer {
   display: flex;
   align-items: center;
   justify-content: flex-end;

From 74a331afe714ff7fc6e7ac090af6f73c1e440aab Mon Sep 17 00:00:00 2001
From: jesusbotella <jesus.botella@gmail.com>
Date: Wed, 22 Jan 2020 13:31:01 +0100
Subject: [PATCH 2/5] Semicolon ;

---
 .../new-dashboard/components/QuickActions/MapQuickActions.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/assets/javascripts/new-dashboard/components/QuickActions/MapQuickActions.vue b/lib/assets/javascripts/new-dashboard/components/QuickActions/MapQuickActions.vue
index c0314b808dba..005a5ddbbb6a 100644
--- a/lib/assets/javascripts/new-dashboard/components/QuickActions/MapQuickActions.vue
+++ b/lib/assets/javascripts/new-dashboard/components/QuickActions/MapQuickActions.vue
@@ -67,7 +67,7 @@ export default {
       return !this.isOutOfPublicMapsQuota || this.isSelectedMapPrivate;
     },
     isKuviz () {
-      return this.map.type === 'kuviz'
+      return this.map.type === 'kuviz';
     }
   },
   methods: {

From ca09bfcf1289828127ea642ccae6493919afdf24 Mon Sep 17 00:00:00 2001
From: jesusbotella <jesus.botella@gmail.com>
Date: Wed, 22 Jan 2020 15:02:16 +0100
Subject: [PATCH 3/5] Update NEWS.md

---
 NEWS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS.md b/NEWS.md
index 11a12209f6e2..24fb58e3cce9 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -12,6 +12,7 @@ sudo make install
 - None yet
 
 ### Bug fixes / enhancements
+- Fix misplaced footer in Dialogs ([#15418](https://github.com/CartoDB/cartodb/pull/15418))
 - Remove directo connections debug trace ([#15274](https://github.com/CartoDB/cartodb/pull/15274))
 - New versioned sanitization of column names ([#15326](https://github.com/CartoDB/cartodb/issues/15326))
 - Change Catalog dropdown placeholders (([#15335](https://github.com/CartoDB/cartodb/issues/15335)))

From 7d05aed5659ca6ea2ea7f957bb2efd87d1108e82 Mon Sep 17 00:00:00 2001
From: jesusbotella <jesus.botella@gmail.com>
Date: Wed, 22 Jan 2020 17:28:31 +0100
Subject: [PATCH 4/5] Do not push bump commit to master

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

diff --git a/package.json b/package.json
index 890957dfe357..e48723160fff 100644
--- a/package.json
+++ b/package.json
@@ -212,7 +212,7 @@
     "lint:css": "stylelint './app/assets/stylesheets/**/*.scss'",
     "lint:fix": "eslint . --fix",
     "bump": "npm --no-git-tag-version version prerelease --preid=assets",
-    "postversion": "git add package.json package-lock.json && git commit -m 'Bump assets version' && git push origin master",
+    "postversion": "git add package.json package-lock.json && git commit -m 'Bump assets version' && git push",
     "update-internal-deps": "rm -rf node_modules && npm install",
     "branch-files": "node lib/build/branchFiles/branchFiles.js",
     "affected_specs": "node lib/build/branchFiles/branchFiles.js | xargs node lib/build/affectedFiles/affectedFiles.js",

From 3091236862d01305c9e692e4f5d5617fd80b21ba Mon Sep 17 00:00:00 2001
From: jesusbotella <jesus.botella@gmail.com>
Date: Wed, 22 Jan 2020 17:29:31 +0100
Subject: [PATCH 5/5] Bump assets version

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

diff --git a/package-lock.json b/package-lock.json
index cf69e7a85298..64ec31823ef6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.151",
+  "version": "1.0.0-assets.152",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e48723160fff..7b7e176172fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.151",
+  "version": "1.0.0-assets.152",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",