diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-08-20 11:58:59 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-20 11:58:59 -0400 |
commit | ddc192c025862ab4e8ab9a61185c06fd553cbf1f (patch) | |
tree | 4ba5fc77e73a6f74bddf5570ec87286ef2bd941f /web | |
parent | 4fafac5225d85c603140df261ab1535a63e918b6 (diff) | |
parent | 343ff54a32905e468f199e3d6e237422267e3102 (diff) | |
download | chat-ddc192c025862ab4e8ab9a61185c06fd553cbf1f.tar.gz chat-ddc192c025862ab4e8ab9a61185c06fd553cbf1f.tar.bz2 chat-ddc192c025862ab4e8ab9a61185c06fd553cbf1f.zip |
Merge pull request #419 from mattermost/revert-416-ui-changes
Revert "Multiple UI Improvements"
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/channel_header.jsx | 2 | ||||
-rw-r--r-- | web/react/components/channel_info_modal.jsx | 2 | ||||
-rw-r--r-- | web/react/components/channel_invite_modal.jsx | 2 | ||||
-rw-r--r-- | web/react/components/channel_members.jsx | 2 | ||||
-rw-r--r-- | web/react/components/channel_notifications.jsx | 2 | ||||
-rw-r--r-- | web/react/components/post_list.jsx | 13 | ||||
-rw-r--r-- | web/react/components/removed_from_channel_modal.jsx | 2 | ||||
-rw-r--r-- | web/react/components/view_image.jsx | 20 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 7 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_popover.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 13 |
11 files changed, 21 insertions, 52 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index 0254d0e82..90a776791 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -105,7 +105,7 @@ module.exports = React.createClass({ if (!utils.areStatesEqual(newState, this.state)) { this.setState(newState); } - $('.channel-header__info .description').popover({placement: 'bottom', trigger: 'hover click', html: true, delay: {show: 500, hide: 500}}); + $('.channel-header__info .description').popover({placement: 'bottom', trigger: 'hover', html: true, delay: {show: 500, hide: 500}}); }, onSocketChange: function(msg) { if (msg.action === 'new_user') { diff --git a/web/react/components/channel_info_modal.jsx b/web/react/components/channel_info_modal.jsx index 6d999870a..18addb52f 100644 --- a/web/react/components/channel_info_modal.jsx +++ b/web/react/components/channel_info_modal.jsx @@ -32,7 +32,7 @@ module.exports = React.createClass({ <div className="modal-content"> <div className="modal-header"> <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 className="modal-title" id="myModalLabel"><span className="name">{channel.display_name}</span></h4> + <h4 className="modal-title" id="myModalLabel">{channel.display_name}</h4> </div> <div className="modal-body"> <div className="row form-group"> diff --git a/web/react/components/channel_invite_modal.jsx b/web/react/components/channel_invite_modal.jsx index b9ac2bd26..1b8fe4199 100644 --- a/web/react/components/channel_invite_modal.jsx +++ b/web/react/components/channel_invite_modal.jsx @@ -114,7 +114,7 @@ module.exports = React.createClass({ <div className="modal-content"> <div className="modal-header"> <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 className="modal-title">Add New Members to <span className="name">{this.state.channel_name}</span></h4> + <h4 className="modal-title">Add New Members to {this.state.channel_name}</h4> </div> <div className="modal-body"> { invite_error } diff --git a/web/react/components/channel_members.jsx b/web/react/components/channel_members.jsx index db4bec400..cfb8ed41c 100644 --- a/web/react/components/channel_members.jsx +++ b/web/react/components/channel_members.jsx @@ -126,7 +126,7 @@ module.exports = React.createClass({ <div className="modal-content"> <div className="modal-header"> <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 className="modal-title"><span className="name">{this.state.channel_name}</span> Members</h4> + <h4 className="modal-title">{this.state.channel_name + " Members"}</h4> <a className="btn btn-md btn-primary" data-toggle="modal" data-target="#channel_invite"><i className="glyphicon glyphicon-envelope"/> Add New Members</a> </div> <div ref="modalBody" className="modal-body"> diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx index 56ae7ae4d..38bc91682 100644 --- a/web/react/components/channel_notifications.jsx +++ b/web/react/components/channel_notifications.jsx @@ -209,7 +209,7 @@ module.exports = React.createClass({ <span aria-hidden="true">×</span> <span className="sr-only">Close</span> </button> - <h4 className="modal-title">Notification Preferences for <span className="name">{this.state.title}</span></h4> + <h4 className="modal-title">{"Notification Preferences for " + this.state.title}</h4> </div> <div className="modal-body"> <div className="settings-table"> diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 67a69985f..8b60f0251 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -75,7 +75,6 @@ module.exports = React.createClass({ utils.changeCss('.mention-link', 'color: ' + user.props.theme + ';'); utils.changeCss('@media(max-width: 768px){.search-bar__container', 'background: ' + user.props.theme + ';}'); utils.changeCss('.search-item-container:hover', 'background: ' + utils.changeOpacity(user.props.theme, 0.05) + ';'); - utils.changeCss('.nav-pills__unread-indicator', 'background: ' + utils.changeOpacity(user.props.theme, 0.05) + ';'); } if (user.props.theme !== '#000000' && user.props.theme !== '#585858') { @@ -378,8 +377,8 @@ module.exports = React.createClass({ <strong><UserProfile userId={teammate.id} /></strong> </div> <p className='channel-intro-text'> - This is the start of your private message history with <strong>{teammateName}</strong>.<br/> - Private messages and files shared here are not shown to people outside this area. + {'This is the start of your private message history with ' + teammateName + '.'}<br/> + {'Private messages and files shared here are not shown to people outside this area.'} </p> <a className='intro-links' href='#' style={userStyle} data-toggle='modal' data-target='#edit_channel' data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}><i className='fa fa-pencil'></i>Set a description</a> </div> @@ -417,9 +416,9 @@ module.exports = React.createClass({ <div className='channel-intro'> <h4 className='channel-intro__title'>Beginning of {uiName}</h4> <p className='channel-intro__content'> - Welcome to <strong>{uiName}</strong>! + Welcome to {uiName}! <br/><br/> - This is the first channel {strings.Team} mates see when they + {'This is the first channel ' + strings.Team + 'mates see when they'} <br/> sign up - use it for posting updates everyone needs to know. <br/><br/> @@ -435,7 +434,7 @@ module.exports = React.createClass({ <div className='channel-intro'> <h4 className='channel-intro__title'>Beginning of {uiName}</h4> <p className='channel-intro__content'> - This is the start of <strong>{uiName}</strong>, a channel for non-work-related conversations. + {'This is the start of ' + uiName + ', a channel for non-work-related conversations.'} <br/> </p> <a className='intro-links' href='#' style={userStyle} data-toggle='modal' data-target='#edit_channel' data-desc={channel.description} data-title={uiName} data-channelid={channel.id}><i className='fa fa-pencil'></i>Set a description</a> @@ -454,7 +453,7 @@ module.exports = React.createClass({ var createMessage; if (creatorName !== '') { - createMessage = (<span>This is the start of the <strong>{uiName}</strong> {uiType} created by <strong>{creatorName}</strong> on <strong>{utils.displayDate(channel.create_at)}</strong></span>); + createMessage = 'This is the start of the ' + uiName + ' ' + uiType + ', created by ' + creatorName + ' on ' + utils.displayDate(channel.create_at) + '.'; } else { createMessage = 'This is the start of the ' + uiName + ' ' + uiType + ', created on ' + utils.displayDate(channel.create_at) + '.'; } diff --git a/web/react/components/removed_from_channel_modal.jsx b/web/react/components/removed_from_channel_modal.jsx index 867456734..a8889a92a 100644 --- a/web/react/components/removed_from_channel_modal.jsx +++ b/web/react/components/removed_from_channel_modal.jsx @@ -45,7 +45,7 @@ module.exports = React.createClass({ <div className="modal-content"> <div className="modal-header"> <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 className="modal-title">Removed from <span className="name">{channelName}</span></h4> + <h4 className="modal-title">Removed from {channelName}</h4> </div> <div className="modal-body"> <p>{remover} removed you from {channelName}</p> diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index 70b0aea71..2b7f64030 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -109,22 +109,6 @@ module.exports = React.createClass({ } ); - $(this.refs.previewArrowLeft.getDOMNode()).hover( - function onModalHover() { - $(self.refs.imageFooter.getDOMNode()).addClass('footer--show'); - }, function offModalHover() { - $(self.refs.imageFooter.getDOMNode()).removeClass('footer--show'); - } - ); - - $(this.refs.previewArrowRight.getDOMNode()).hover( - function onModalHover() { - $(self.refs.imageFooter.getDOMNode()).addClass('footer--show'); - }, function offModalHover() { - $(self.refs.imageFooter.getDOMNode()).removeClass('footer--show'); - } - ); - $(window).on('keyup', this.handleKeyPress); // keep track of whether or not this component is mounted so we can safely set the state asynchronously @@ -268,13 +252,13 @@ module.exports = React.createClass({ var rightArrow = ''; if (this.props.filenames.length > 1) { leftArrow = ( - <a ref='previewArrowLeft' className='modal-prev-bar' href='#' onClick={this.handlePrev}> + <a className='modal-prev-bar' href='#' onClick={this.handlePrev}> <i className='image-control image-prev'/> </a> ); rightArrow = ( - <a ref='previewArrowRight' className='modal-next-bar' href='#' onClick={this.handleNext}> + <a className='modal-next-bar' href='#' onClick={this.handleNext}> <i className='image-control image-next'/> </a> ); diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 8462701c9..014f834ed 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -50,13 +50,6 @@ @include clearfix; .modal-title { float: left; - font-size: 16px; - line-height: 27px; - color: #f4f4f4; - .name { - font-weight: 600; - color: #fff; - } } .modal-action { padding: 0; diff --git a/web/sass-files/sass/partials/_popover.scss b/web/sass-files/sass/partials/_popover.scss index 126d239ec..5008331b4 100644 --- a/web/sass-files/sass/partials/_popover.scss +++ b/web/sass-files/sass/partials/_popover.scss @@ -1,8 +1,3 @@ -.channel-header__info .popover-content { - max-height: 250px; - overflow: auto; -} - .user-popover { cursor: pointer; display: inline-block; @@ -18,5 +13,4 @@ overflow: hidden; text-overflow: ellipsis; display: block; -} - +}
\ No newline at end of file diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 22b7426b1..6d9f2ad8b 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -38,25 +38,24 @@ height: 100%; position: relative; overflow: auto; + } .nav-pills__unread-indicator { position: absolute; left: 0; right: 0; - width: 72%; - color: #777; - background: #DCF0FF; - @include border-radius(50px); + width: 70%; + background-color: darken($primary-color, 5%); + color: white; margin: 0 auto; - padding: 3px 0 4px; - font-size: 13.5px; + padding: 2px; text-align: center; z-index: 1; } .nav-pills__unread-indicator-top { - top: 66px; + top: 56px; } .nav-pills__unread-indicator-bottom { bottom: 0px; |