From 3805a055abc76d7d883c2705df2b474aa8214d05 Mon Sep 17 00:00:00 2001
From: Kaan Kabalak <kaankabalak@gmail.com>
Date: Thu, 22 Mar 2018 23:49:27 -0700
Subject: [PATCH] Fix New UX related bugs for Alerts, BucketList and Abort
 Upload modal (#5694)

- Center text on Alert component appearing on top
- Change "Upload" to "Continue" on New UX Abort Upload modal
- Fix issue where long bucket names were overflowing instead of
continuing on the next line
- Fix word wrap issue similar to the last one for the alerts that appear
on top
- Help fix the cluttering issue on #5690 as the right margin has been
increased in alerts

Fixes #5689, #5691 and #5695
---
 browser/app/js/uploads/AbortConfirmModal.js | 2 +-
 browser/app/less/inc/alert.less             | 6 ++++--
 browser/app/less/inc/sidebar.less           | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/browser/app/js/uploads/AbortConfirmModal.js b/browser/app/js/uploads/AbortConfirmModal.js
index 9958d8fb5..686580729 100644
--- a/browser/app/js/uploads/AbortConfirmModal.js
+++ b/browser/app/js/uploads/AbortConfirmModal.js
@@ -50,7 +50,7 @@ export class AbortConfirmModal extends React.Component {
         sub="This cannot be undone!"
         okText="Abort"
         okIcon={okIcon}
-        cancelText="Upload"
+        cancelText="Continue"
         cancelIcon={cancelIcon}
         okHandler={this.abortUploads.bind(this)}
         cancelHandler={hideAbort}
diff --git a/browser/app/less/inc/alert.less b/browser/app/less/inc/alert.less
index 5c92ccc54..2188a3fb6 100644
--- a/browser/app/less/inc/alert.less
+++ b/browser/app/less/inc/alert.less
@@ -3,13 +3,15 @@
     box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
     color: @white;
     width: 100%;
-    padding: 1.5rem 3rem 1.5rem 2rem;
+    padding: 1.5rem 4rem 1.5rem 2rem;
     z-index: 1000000;
     .animation-duration(800ms);
     .animation-fill-mode(both);
     font-size: @font-size-small;
+    word-wrap: break-word;
 
     &:not(.alert--upload) {
+        text-align: center;
         top: 1.5rem;
         max-width: 500px;
         border-radius: @border-radius-base;
@@ -22,7 +24,7 @@
 
     @media(max-width: (@screen-xs-max)) {
         left: 1.5rem;
-        width: ~"calc(100% - 3rem)";
+        width: ~"calc(100% - 4rem)";
         max-width: 100%;
     }
 
diff --git a/browser/app/less/inc/sidebar.less b/browser/app/less/inc/sidebar.less
index 9129bd920..dd382eda6 100644
--- a/browser/app/less/inc/sidebar.less
+++ b/browser/app/less/inc/sidebar.less
@@ -88,10 +88,11 @@
 }
 
 .buckets__item {
-    padding: 0.8rem @sidebar-padding 0.8rem @sidebar-padding*2.2;
+    padding: 0.8rem @sidebar-padding*1.2 0.8rem @sidebar-padding*2.2;
     background: url(../../img/icons/bucket.svg) no-repeat left 2.2rem center;
     position: relative;
     cursor: pointer;
+    word-wrap: break-word;
 
     & > a {
         &, &:focus, &:hover {