diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-08-14 10:00:24 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-08-14 11:33:33 -0700 |
| commit | 2c098d7711eda893f903329ab64528a7d387a6e8 (patch) | |
| tree | 0fc11f7915df446f97b4128c773435b8d32ed0d1 | |
| parent | bcea7ae74fab36d7633db3b06a13f0a221fb0ed0 (diff) | |
| download | chat-2c098d7711eda893f903329ab64528a7d387a6e8.tar.gz chat-2c098d7711eda893f903329ab64528a7d387a6e8.tar.bz2 chat-2c098d7711eda893f903329ab64528a7d387a6e8.zip | |
Small changes to css to clean up code
| -rw-r--r-- | web/react/components/file_upload.jsx | 18 | ||||
| -rw-r--r-- | web/react/components/file_upload_overlay.jsx | 2 | ||||
| -rw-r--r-- | web/react/pages/channel.jsx | 2 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_post.scss | 7 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 1 |
5 files changed, 9 insertions, 21 deletions
diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx index bc0cf70c8..7497ec330 100644 --- a/web/react/components/file_upload.jsx +++ b/web/react/components/file_upload.jsx @@ -152,32 +152,26 @@ module.exports = React.createClass({ if (this.props.postType === 'post') { $('.row.main').dragster({ enter: function() { - $('.center-file-overlay').removeClass('invisible'); - $('.center-file-overlay').addClass('visible'); + $('.center-file-overlay').removeClass('hidden'); }, leave: function() { - $('.center-file-overlay').removeClass('visible'); - $('.center-file-overlay').addClass('invisible'); + $('.center-file-overlay').addClass('hidden'); }, drop: function(dragsterEvent, e) { - $('.center-file-overlay').removeClass('visible'); - $('.center-file-overlay').addClass('invisible'); + $('.center-file-overlay').addClass('hidden'); self.handleDrop(e); } }); } else if (this.props.postType === 'comment') { $('.post-right__container').dragster({ enter: function() { - $('.right-file-overlay').removeClass('invisible'); - $('.right-file-overlay').addClass('visible'); + $('.right-file-overlay').removeClass('hidden'); }, leave: function() { - $('.right-file-overlay').removeClass('visible'); - $('.right-file-overlay').addClass('invisible'); + $('.right-file-overlay').addClass('hidden'); }, drop: function(dragsterEvent, e) { - $('.right-file-overlay').removeClass('visible'); - $('.right-file-overlay').addClass('invisible'); + $('.right-file-overlay').addClass('hidden'); self.handleDrop(e); } }); diff --git a/web/react/components/file_upload_overlay.jsx b/web/react/components/file_upload_overlay.jsx index 28d66d817..f35556371 100644 --- a/web/react/components/file_upload_overlay.jsx +++ b/web/react/components/file_upload_overlay.jsx @@ -7,7 +7,7 @@ module.exports = React.createClass({ overlayType: React.PropTypes.string }, render: function() { - var overlayClass = 'file-overlay invisible'; + var overlayClass = 'file-overlay hidden'; if (this.props.overlayType === 'right') { overlayClass += ' right-file-overlay'; } else if (this.props.overlayType === 'center') { diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index 3ef6817f3..1f07cb519 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -225,7 +225,7 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann ); React.render( - <FileUploadOverlay + <FileUploadOverlay overlayType='center' />, document.getElementById('file_upload_overlay') ); diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index bbf36ea93..56b31205b 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -130,13 +130,6 @@ body.ios { font-size: 2em; margin: 0 0 0.3em; } - - .invisible { - visibility: hidden; - } - .visible { - visibility: visible; - } } #post-list { diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 5d866715e..2376c9212 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -6,6 +6,7 @@ border-right: $border-gray; padding: 0 0 2em 0; background: #fafafa; + z-index: 5; &.sidebar--padded { padding-top: 44px; } |