Merge pull request #1547 from asaadmahmoodspin/ui-improvements

Ui improvements

web/react/components/sidebar.jsx

@@ -173,6 +173,10 @@ export default class Sidebar extends React.Component {
         this.updateScrollbar();
 
         window.addEventListener('resize', this.handleResize);
+
+        if ($(window).width() > 768) {
+            $('.nav-pills__container').perfectScrollbar();
+        }
     }
     shouldComponentUpdate(nextProps, nextState) {
         if (!Utils.areObjectsEqual(nextState, this.state)) {

web/react/components/view_image.jsx

@@ -424,23 +424,27 @@ export default class ViewImageModal extends React.Component {
                 >
                     <div
                         className={'image-wrapper ' + bgClass}
-                        onMouseEnter={this.onMouseEnterImage}
-                        onMouseLeave={this.onMouseLeaveImage}
-                        onClick={(e) => e.stopPropagation()}
+                        onClick={this.props.onModalDismissed}
                     >
                         <div
-                            className={closeButtonClass}
-                            onClick={this.props.onModalDismissed}
-                        />
-                        {content}
-                        <ViewImagePopoverBar
-                            show={this.state.showFooter}
-                            fileId={this.state.imgId}
-                            totalFiles={this.props.filenames.length}
-                            filename={name}
-                            fileURL={fileUrl}
-                            getPublicLink={this.getPublicLink}
-                        />
+                            onMouseEnter={this.onMouseEnterImage}
+                            onMouseLeave={this.onMouseLeaveImage}
+                            onClick={(e) => e.stopPropagation()}
+                        >
+                            <div
+                                className={closeButtonClass}
+                                onClick={this.props.onModalDismissed}
+                            />
+                            {content}
+                            <ViewImagePopoverBar
+                                show={this.state.showFooter}
+                                fileId={this.state.imgId}
+                                totalFiles={this.props.filenames.length}
+                                filename={name}
+                                fileURL={fileUrl}
+                                getPublicLink={this.getPublicLink}
+                            />
+                        </div>
                     </div>
                     {leftArrow}
                     {rightArrow}