Multiple UI Improvements

- Changing the UI for the active item in the nav
- Updating the UI for drag and drop
- Fixing z-index for date selector

3 files changed, 23 insertions, 25 deletions

diff --git a/web/react/components/file_upload_overlay.jsx b/web/react/components/file_upload_overlay.jsx
index d991dd625..dbba00022 100644
--- a/web/react/components/file_upload_overlay.jsx
+++ b/web/react/components/file_upload_overlay.jsx
@@ -12,19 +12,21 @@ export default class FileUploadOverlay extends React.Component {
 
         return (
             <div className={overlayClass}>
-                <div className='overlay__circle'>
-                    <img
-                        className='overlay__files'
-                        src='/static/images/filesOverlay.png'
-                        alt='Files'
-                    />
-                    <span><i className='fa fa-upload'></i>{'Drop a file to upload it.'}</span>
-                    <img
-                        className='overlay__logo'
-                        src='/static/images/logoWhite.png'
-                        width='100'
-                        alt='Logo'
-                    />
+                <div className='overlay__indent'>
+                    <div className='overlay__circle'>
+                        <img
+                            className='overlay__files'
+                            src='/static/images/filesOverlay.png'
+                            alt='Files'
+                        />
+                        <span><i className='fa fa-upload'></i>{'Drop a file to upload it.'}</span>
+                        <img
+                            className='overlay__logo'
+                            src='/static/images/logoWhite.png'
+                            width='100'
+                            alt='Logo'
+                        />
+                    </div>
                 </div>
             </div>
         );
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 1d856e067..e13f8228e 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -140,7 +140,7 @@ module.exports = {
             sidebarText: '#333333',
             sidebarUnreadText: '#333333',
             sidebarTextHoverBg: '#e6f2fa',
-            sidebarTextActiveBg: '#e1e1e1',
+            sidebarTextActiveBorder: '#378FD2',
             sidebarTextActiveColor: '#111111',
             sidebarHeaderBg: '#2389d7',
             sidebarHeaderTextColor: '#ffffff',
@@ -162,7 +162,7 @@ module.exports = {
             sidebarText: '#fff',
             sidebarUnreadText: '#fff',
             sidebarTextHoverBg: '#136197',
-            sidebarTextActiveBg: '#136197',
+            sidebarTextActiveBorder: '#7AB0D6',
             sidebarTextActiveColor: '#FFFFFF',
             sidebarHeaderBg: '#2f81b7',
             sidebarHeaderTextColor: '#FFFFFF',
@@ -184,7 +184,7 @@ module.exports = {
             sidebarText: '#fff',
             sidebarUnreadText: '#fff',
             sidebarTextHoverBg: '#4A5664',
-            sidebarTextActiveBg: '#39769C',
+            sidebarTextActiveBorder: '#39769C',
             sidebarTextActiveColor: '#FFFFFF',
             sidebarHeaderBg: '#1B2C3E',
             sidebarHeaderTextColor: '#FFFFFF',
@@ -206,7 +206,7 @@ module.exports = {
             sidebarText: '#fff',
             sidebarUnreadText: '#fff',
             sidebarTextHoverBg: '#302e30',
-            sidebarTextActiveBg: '#484748',
+            sidebarTextActiveBorder: '#196CAF',
             sidebarTextActiveColor: '#FFFFFF',
             sidebarHeaderBg: '#1f1f1f',
             sidebarHeaderTextColor: '#FFFFFF',
@@ -249,8 +249,8 @@ module.exports = {
             uiName: 'Sidebar Text Hover BG'
         },
         {
-            id: 'sidebarTextActiveBg',
-            uiName: 'Sidebar Text Active BG'
+            id: 'sidebarTextActiveBorder',
+            uiName: 'Sidebar Text Active Border'
         },
         {
             id: 'sidebarTextActiveColor',
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index b9084b26e..8264e6bb6 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -425,18 +425,14 @@ export function applyTheme(theme) {
         changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li:hover a', 'background:' + theme.sidebarTextHoverBg, 1);
     }
 
-    if (theme.sidebarTextActiveBg) {
-        changeCss('.sidebar--left .nav-pills__container li.active a, .sidebar--left .nav-pills__container li.active a:hover, .sidebar--left .nav-pills__container li.active a:focus, .settings-modal .nav-pills>li.active a, .settings-modal .nav-pills>li.active a:hover, .settings-modal .nav-pills>li.active a:active', 'background:' + theme.sidebarTextActiveBg, 1);
+    if (theme.sidebarTextActiveBorder) {
+        changeCss('.sidebar--left .nav li.active a:before, .settings-modal .nav-pills>li.active a:before', 'background:' + theme.sidebarTextActiveBorder, 1);
     }
 
     if (theme.sidebarTextActiveColor) {
         changeCss('.sidebar--left .nav-pills__container li.active a, .sidebar--left .nav-pills__container li.active a:hover, .sidebar--left .nav-pills__container li.active a:focus, .settings-modal .nav-pills>li.active a, .settings-modal .nav-pills>li.active a:hover, .settings-modal .nav-pills>li.active a:active', 'color:' + theme.sidebarTextActiveColor, 2);
     }
 
-    if (theme.sidebarTextActiveBg === theme.onlineIndicator) {
-        changeCss('.sidebar--left .nav-pills__container li.active a .status .online--icon', 'fill:' + theme.sidebarTextActiveColor, 1);
-    }
-
     if (theme.sidebarHeaderBg) {
         changeCss('.sidebar--left .team__header, .sidebar--menu .team__header', 'background:' + theme.sidebarHeaderBg, 1);
         changeCss('.modal .modal-header', 'background:' + theme.sidebarHeaderBg, 1);