diff options
author | Corey Hulen <corey@hulen.com> | 2015-11-30 20:35:47 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-11-30 20:35:47 -0800 |
commit | 0d3f0f348139d9749de232c50c452d95b07e6c05 (patch) | |
tree | e59a81631577a4270168f932a4af3eaef8054e33 /web/react | |
parent | 441c9991ff1a4acc613c19ea8d96f17c60bce0c4 (diff) | |
parent | d3fd017e69943adf364a0459d3c28179a97835ff (diff) | |
download | chat-0d3f0f348139d9749de232c50c452d95b07e6c05.tar.gz chat-0d3f0f348139d9749de232c50c452d95b07e6c05.tar.bz2 chat-0d3f0f348139d9749de232c50c452d95b07e6c05.zip |
Merge pull request #1547 from asaadmahmoodspin/ui-improvements
Ui improvements
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/sidebar.jsx | 4 | ||||
-rw-r--r-- | web/react/components/view_image.jsx | 34 |
2 files changed, 23 insertions, 15 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 30422ff7d..b4c037183 100644 --- a/web/react/components/sidebar.jsx +++ b/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)) { diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index 91f4b3bdc..2b505607e 100644 --- a/web/react/components/view_image.jsx +++ b/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} |