From ab728f05b36337b56d1bbc50c0e800a9ffe8a139 Mon Sep 17 00:00:00 2001 From: lfbrock Date: Tue, 8 Dec 2015 10:03:46 -0500 Subject: [PATCH 1/8] Update Messaging --- doc/help/Messaging.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/help/Messaging.md b/doc/help/Messaging.md index cc26a948ed..b1fc22b2bf 100644 --- a/doc/help/Messaging.md +++ b/doc/help/Messaging.md @@ -18,7 +18,8 @@ Mattermost messages are formatted using a standard called "markdown". Here are e |`![embedded image](https://travis-ci.org/mattermost/platform.svg)`|![embedded image](https://travis-ci.org/mattermost/platform.svg)| |`:smile:` `:sheep:` `:alien:`|:smile: :sheep: :alien:| -Check out a full list of Emojis [here](http://www.emoji-cheat-sheet.com/). +Emojis provided free from [Emoji One](http://emojione.com/). Check out a full list of Emojis [here](http://emoji.codes/). + ## Mentioning Teammates From 5192d65ab033eabc9f895ff135cd7e7cfcd36056 Mon Sep 17 00:00:00 2001 From: lfbrock Date: Tue, 8 Dec 2015 10:07:41 -0500 Subject: [PATCH 2/8] Update Markdown.md --- doc/help/Markdown.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/help/Markdown.md b/doc/help/Markdown.md index 1befed8d44..64ce4fc836 100644 --- a/doc/help/Markdown.md +++ b/doc/help/Markdown.md @@ -88,7 +88,7 @@ and ## Emojis -Check out a full list of emojis [here](http://www.emoji-cheat-sheet.com/). +Emoji provided free by [Emoji One](http://emojione.com/). Check out a full list of emojis [here](http://http://emoji.codes/). ``` :smile: :+1: :sheep: @@ -132,6 +132,17 @@ Renders as: 1. Item one 2. Item two +Make a task list by including square brackets: +``` +- [ ] Item one +- [ ] Item two +- [x] Completed item +``` +Renders as: +- [ ] Item one +- [ ] Item two +- [x] Completed item + ## Tables: Create a table by placing a dashed line under the header row and separating the columns with a pipe `|`. (The columns don’t need to line up exactly for it to work). Choose how to align table columns by including colons `:` within the header row. From cca7e02ce8fc032976b41119e15265149f19a2d0 Mon Sep 17 00:00:00 2001 From: lfbrock Date: Tue, 8 Dec 2015 10:16:03 -0500 Subject: [PATCH 3/8] Update Account-Settings.md --- doc/help/Account-Settings.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/help/Account-Settings.md b/doc/help/Account-Settings.md index a0c55d3e9f..1e05ef2ad2 100644 --- a/doc/help/Account-Settings.md +++ b/doc/help/Account-Settings.md @@ -93,6 +93,9 @@ Outgoing webhooks use trigger words to fire new message events to external integ ##Display Settings to configure clock and teammate name display preferences. +#### Display Font +Select what font is used. + #### Clock Display Choose a 12-hour or 24-hour time preference that appears on the time stamp for all posts. @@ -104,3 +107,9 @@ Setting to configure when messages are sent. #### Send Messages on Ctrl+Enter If enabled, press **Enter** to insert a new line and **Ctrl + Enter** posts the message. If disabled, **Shift + Enter** inserts a new line and **Enter** posts the message. + +#### Preview pre-release features +Turn on preview features to view them early, ahead of their official release: +- **Show markdown preview option in message input box:** Turning this on will show a "Preview" option when typing in the text input box. Pressing "Preview" shows what the Markdown formatting in the message looks like before the message is sent. +- **Show preview snippet of links below message:** Turning this on will show a preview snippet posted below links from select websites. + From fcd7800bdca4be3b13bbd24c2603541442819a10 Mon Sep 17 00:00:00 2001 From: lfbrock Date: Tue, 8 Dec 2015 11:30:15 -0500 Subject: [PATCH 4/8] Update Messaging.md --- doc/help/Messaging.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/help/Messaging.md b/doc/help/Messaging.md index b1fc22b2bf..6de9c112c4 100644 --- a/doc/help/Messaging.md +++ b/doc/help/Messaging.md @@ -36,3 +36,12 @@ Which sends a special mention notification to **alice** to check your message. To mention a teammate, press `@` and you should see a list of team members who can be messaged. You can either type their username or use the **Up** and **Down** arrow keys and then **ENTER** to select them to be mentioned. You can configure how you'd like to be alerted about mentions of your username, your first name, your nickname, or other keywords from **Account Settings** > **Notifications** and you can set channel-specific preferences from **[Channel Name]** > **Notification Preferences** + +## Messages Dropdown Menu + +The Messages Dropdown Menu contains additional actions you can perform on a message: + +- **Reply:** Opens up the sidebar so you can reply to a message in a comment thread. +- **Permalink:** Creates a link to the message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. +- **Delete:** Deletes the message so it is no longer visible. Team Administrators can also delete another user's message. +- **Edit:** Lets you edit a message. From 9ab6ddfb45b9b8b9c47ceb841c42dc4955085570 Mon Sep 17 00:00:00 2001 From: lfbrock Date: Tue, 8 Dec 2015 11:50:28 -0500 Subject: [PATCH 5/8] Update Messaging.md --- doc/help/Messaging.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/help/Messaging.md b/doc/help/Messaging.md index 6de9c112c4..5488926509 100644 --- a/doc/help/Messaging.md +++ b/doc/help/Messaging.md @@ -39,9 +39,9 @@ You can configure how you'd like to be alerted about mentions of your username, ## Messages Dropdown Menu -The Messages Dropdown Menu contains additional actions you can perform on a message: +To get to the Messages Dropdown Menu, hover over a message and click on the [...] menu. This shows a dropdown list containing additional actions you can perform on a message: - **Reply:** Opens up the sidebar so you can reply to a message in a comment thread. - **Permalink:** Creates a link to the message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. -- **Delete:** Deletes the message so it is no longer visible. Team Administrators can also delete another user's message. -- **Edit:** Lets you edit a message. +- **Delete:** Deletes the message so it is no longer visible. Team Administrators and System Administrators can also delete another user's message. +- **Edit:** Lets you edit your own message. From 39447d4072db5147be14d226cb0f3b1d4f763db8 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 8 Dec 2015 22:42:59 +0500 Subject: [PATCH 6/8] Multiple UI Improvements --- .../components/admin_console/user_item.jsx | 2 -- web/react/components/create_comment.jsx | 2 +- web/react/components/create_post.jsx | 6 ++--- web/react/components/member_list_item.jsx | 6 ++--- .../components/member_list_team_item.jsx | 4 +-- web/react/components/navbar.jsx | 2 -- web/sass-files/sass/partials/_content.scss | 1 - web/sass-files/sass/partials/_error-bar.scss | 1 + web/sass-files/sass/partials/_files.scss | 2 +- web/sass-files/sass/partials/_modal.scss | 1 + web/sass-files/sass/partials/_post.scss | 12 ++++----- web/sass-files/sass/partials/_post_right.scss | 8 ++++++ web/sass-files/sass/partials/_responsive.scss | 9 +++---- web/sass-files/sass/partials/_settings.scss | 25 +++++++++++++------ 14 files changed, 44 insertions(+), 37 deletions(-) diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx index bd64564c9a..ef0b614607 100644 --- a/web/react/components/admin_console/user_item.jsx +++ b/web/react/components/admin_console/user_item.jsx @@ -227,7 +227,6 @@ export default class UserItem extends React.Component { href='#' className='dropdown-toggle theme' type='button' - id='channel_header_dropdown' data-toggle='dropdown' aria-expanded='true' > @@ -237,7 +236,6 @@ export default class UserItem extends React.Component {
    {makeAdmin} {makeMember} diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx index fac40e895a..b0f33eda1a 100644 --- a/web/react/components/create_comment.jsx +++ b/web/react/components/create_comment.jsx @@ -362,11 +362,11 @@ export default class CreateComment extends React.Component { onClick={this.handleSubmit} /> {uploadsInProgressText} + {preview} {postError} {serverError} - {preview} ); } diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index f7f63fb92a..89e984e27e 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -470,13 +470,13 @@ export default class CreatePost extends React.Component { {tutorialTip}
    - {postError} - {serverError} - {preview} + {preview} + {postError} + {serverError}
    diff --git a/web/react/components/member_list_item.jsx b/web/react/components/member_list_item.jsx index f7f77f48a5..a7273f2805 100644 --- a/web/react/components/member_list_item.jsx +++ b/web/react/components/member_list_item.jsx @@ -78,17 +78,15 @@ export default class MemberListItem extends React.Component { href='#' className='dropdown-toggle theme' type='button' - id='channel_header_dropdown' data-toggle='dropdown' aria-expanded='true' > + {member.roles || 'Member'} -
      {makeAdminOption} {handleRemoveOption} @@ -96,7 +94,7 @@ export default class MemberListItem extends React.Component { ); } else { - invite =
      {member.roles || 'Member'}
      ; + invite =
      {member.roles || 'Member'}
      ; } return ( diff --git a/web/react/components/member_list_team_item.jsx b/web/react/components/member_list_team_item.jsx index 316fad01a2..7967c410d8 100644 --- a/web/react/components/member_list_team_item.jsx +++ b/web/react/components/member_list_team_item.jsx @@ -181,17 +181,15 @@ export default class MemberListTeamItem extends React.Component { href='#' className='dropdown-toggle theme' type='button' - id='channel_header_dropdown' data-toggle='dropdown' aria-expanded='true' > + {currentRoles} -
        {makeAdmin} {makeMember} diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx index 3bdc9eface..ae14fca2fa 100644 --- a/web/react/components/navbar.jsx +++ b/web/react/components/navbar.jsx @@ -272,7 +272,6 @@ export default class Navbar extends React.Component { href='#' className='dropdown-toggle theme' type='button' - id='channel_header_dropdown' data-toggle='dropdown' aria-expanded='true' > @@ -282,7 +281,6 @@ export default class Navbar extends React.Component {
          {viewInfoOption} {addMembersOption} diff --git a/web/sass-files/sass/partials/_content.scss b/web/sass-files/sass/partials/_content.scss index da75bc61ba..4bfdb7a094 100644 --- a/web/sass-files/sass/partials/_content.scss +++ b/web/sass-files/sass/partials/_content.scss @@ -1,7 +1,6 @@ @charset "UTF-8"; .inner__wrap { - @include single-transition(all, 0.5s, ease); &.move--left { margin-right: 400px; .search-bar__container { diff --git a/web/sass-files/sass/partials/_error-bar.scss b/web/sass-files/sass/partials/_error-bar.scss index 249bbeaa5d..0bfcbe0be6 100644 --- a/web/sass-files/sass/partials/_error-bar.scss +++ b/web/sass-files/sass/partials/_error-bar.scss @@ -19,6 +19,7 @@ font-weight: 600; text-decoration: none; padding: 0 10px; + font-family: 'Open Sans', sans-serif; &:hover { color: #FFF; text-decoration: none; diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index aeb04e931d..2c341f61e1 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -2,7 +2,7 @@ .preview-container { position: relative; - margin-top: 25px; + margin: 1px 0 10px; width: 100%; max-height: 100px; height: 100px; diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 55725abe0f..9279cf0c4c 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -186,6 +186,7 @@ padding: 8px 15px 8px 8px; width: 80px; vertical-align: middle; + position: relative; &.lg { width: 110px; } diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 81cc311e1e..df519c7524 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -319,13 +319,11 @@ body.ios { @include clearfix; padding: 3px 0 0 0; font-size: 13px; - .has-error { - .control-label { - height: 0; - display: block; - font-weight: normal; - margin-bottom: 0; - } + .control-label { + font-weight: normal; + margin-bottom: 0; + top: -5px; + position: relative; } .msg-typing { min-height: 25px; diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 4f04a266b2..fa52e29721 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -44,6 +44,9 @@ .textarea-wrapper { min-height: 100px; } + .btn { + margin-bottom: 10px; + } .custom-textarea { min-height: 100px; } @@ -123,6 +126,11 @@ overflow: auto; -webkit-overflow-scrolling: touch; @include flex(1 1 auto); + + .preview-container { + margin-top: 5px; + } + } .post-right-comment-time { diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index bdf04ff824..ed2d0bbe98 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -377,10 +377,8 @@ .msg-typing { display: none; } - .has-error { - .control-label { - height: auto; - } + .control-label { + top: 0; } } .post-create-body { @@ -409,8 +407,7 @@ } } .preview-container { - padding: 0px; - margin-top: 5px; + margin: 5px 0 0; .preview-div { margin-top: 0; } diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index ee0c400675..f078cafb47 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -135,9 +135,10 @@ .input-group-addon { padding: 4px 5px; width: 40px; - img { - border: 1px solid rgba(black, 0.15); - } + } + img { + border: 1px solid rgba(black, 0.15); + width: 29px; } } .premade-themes { @@ -325,12 +326,22 @@ overflow: hidden; text-overflow: ellipsis; } +} - .member-role, .member-drop { - position:absolute; - right: 15px; - top: 8px; +.member-role, .member-drop { + position:absolute; + right: 15px; + top: 8px; + + .fa { + margin-right: 5px; } + + .member-menu { + top: -50%; + right: 110%; + } + } .member-invite { From 2b93b37738f30011e9aa0428d6b162d404e3d350 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 8 Dec 2015 23:32:26 +0500 Subject: [PATCH 7/8] Adding jump text instead of icon --- web/react/components/search_results_item.jsx | 2 +- web/sass-files/sass/partials/_search.scss | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx index 1d49830265..731e047b15 100644 --- a/web/react/components/search_results_item.jsx +++ b/web/react/components/search_results_item.jsx @@ -65,7 +65,7 @@ export default class SearchResultsItem extends React.Component { className='search-item__jump' onClick={this.handleClick} > - {} + {'Jump'}
        diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index a29e940e6d..a5b2a78ddb 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -111,7 +111,14 @@ .search-item__jump { position: absolute; right: 0; - top: 0; + top: 0px; + font-size: 13px; + @include opacity(0.8); + + &:hover { + @include opacity(1); + } + } .search-item-time { From bf9814f2653575a4c3f375c887eff484fcd1e706 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 8 Dec 2015 23:40:49 +0500 Subject: [PATCH 8/8] Closing RHS if jump is clicked for archives --- web/react/components/search_results_item.jsx | 5 +++++ web/sass-files/sass/partials/_content.scss | 1 + 2 files changed, 6 insertions(+) diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx index 731e047b15..cd8359df56 100644 --- a/web/react/components/search_results_item.jsx +++ b/web/react/components/search_results_item.jsx @@ -19,6 +19,11 @@ export default class SearchResultsItem extends React.Component { e.preventDefault(); EventHelpers.emitPostFocusEvent(this.props.post.id); + + if ($(window).width() < 768) { + $('.sidebar--right').removeClass('move--left'); + $('.inner__wrap').removeClass('move--left'); + } } render() { diff --git a/web/sass-files/sass/partials/_content.scss b/web/sass-files/sass/partials/_content.scss index 4bfdb7a094..da75bc61ba 100644 --- a/web/sass-files/sass/partials/_content.scss +++ b/web/sass-files/sass/partials/_content.scss @@ -1,6 +1,7 @@ @charset "UTF-8"; .inner__wrap { + @include single-transition(all, 0.5s, ease); &.move--left { margin-right: 400px; .search-bar__container {