summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/help/Account-Settings.md9
-rw-r--r--doc/help/Markdown.md13
-rw-r--r--doc/help/Messaging.md12
-rw-r--r--web/react/components/admin_console/user_item.jsx2
-rw-r--r--web/react/components/create_comment.jsx2
-rw-r--r--web/react/components/create_post.jsx6
-rw-r--r--web/react/components/member_list_item.jsx6
-rw-r--r--web/react/components/member_list_team_item.jsx4
-rw-r--r--web/react/components/navbar.jsx2
-rw-r--r--web/react/components/search_results_item.jsx7
-rw-r--r--web/sass-files/sass/partials/_error-bar.scss1
-rw-r--r--web/sass-files/sass/partials/_files.scss2
-rw-r--r--web/sass-files/sass/partials/_modal.scss1
-rw-r--r--web/sass-files/sass/partials/_post.scss12
-rw-r--r--web/sass-files/sass/partials/_post_right.scss8
-rw-r--r--web/sass-files/sass/partials/_responsive.scss9
-rw-r--r--web/sass-files/sass/partials/_search.scss11
-rw-r--r--web/sass-files/sass/partials/_settings.scss25
18 files changed, 91 insertions, 41 deletions
diff --git a/doc/help/Account-Settings.md b/doc/help/Account-Settings.md
index a0c55d3e9..1e05ef2ad 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.
+
diff --git a/doc/help/Markdown.md b/doc/help/Markdown.md
index 1befed8d4..64ce4fc83 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.
diff --git a/doc/help/Messaging.md b/doc/help/Messaging.md
index cc26a948e..548892650 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
@@ -35,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
+
+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 and System Administrators can also delete another user's message.
+- **Edit:** Lets you edit your own message.
diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx
index bd64564c9..ef0b61460 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 {
<ul
className='dropdown-menu member-menu'
role='menu'
- aria-labelledby='channel_header_dropdown'
>
{makeAdmin}
{makeMember}
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index fac40e895..b0f33eda1 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}
</div>
</div>
- {preview}
</form>
);
}
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index f7f63fb92..89e984e27 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}
</div>
<div className={postFooterClassName}>
- {postError}
- {serverError}
- {preview}
<MsgTyping
channelId={this.state.channelId}
parentId=''
/>
+ {preview}
+ {postError}
+ {serverError}
</div>
</div>
</form>
diff --git a/web/react/components/member_list_item.jsx b/web/react/components/member_list_item.jsx
index f7f77f48a..a7273f280 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'
>
+ <span className='fa fa-pencil'></span>
<span className='text-capitalize'>{member.roles || 'Member'} </span>
- <span className='caret'></span>
</a>
<ul
className='dropdown-menu member-menu'
role='menu'
- aria-labelledby='channel_header_dropdown'
>
{makeAdminOption}
{handleRemoveOption}
@@ -96,7 +94,7 @@ export default class MemberListItem extends React.Component {
</div>
);
} else {
- invite = <div className='member-role text-capitalize'>{member.roles || 'Member'}<span className='caret hidden'></span></div>;
+ invite = <div className='member-role text-capitalize'><span className='fa fa-pencil hidden'></span>{member.roles || 'Member'}</div>;
}
return (
diff --git a/web/react/components/member_list_team_item.jsx b/web/react/components/member_list_team_item.jsx
index 316fad01a..7967c410d 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'
>
+ <span className='fa fa-pencil'></span>
<span>{currentRoles} </span>
- <span className='caret'></span>
</a>
<ul
className='dropdown-menu member-menu'
role='menu'
- aria-labelledby='channel_header_dropdown'
>
{makeAdmin}
{makeMember}
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 3bdc9efac..ae14fca2f 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 {
<ul
className='dropdown-menu'
role='menu'
- aria-labelledby='channel_header_dropdown'
>
{viewInfoOption}
{addMembersOption}
diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx
index 7ae64f651..f71abf971 100644
--- a/web/react/components/search_results_item.jsx
+++ b/web/react/components/search_results_item.jsx
@@ -22,6 +22,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');
+ }
}
handleFocusRHSClick(e) {
@@ -74,7 +79,7 @@ export default class SearchResultsItem extends React.Component {
className='search-item__jump'
onClick={this.handleClick}
>
- <i className='fa fa-mail-reply'></i>
+ {'Jump'}
</a>
</li>
<li>
diff --git a/web/sass-files/sass/partials/_error-bar.scss b/web/sass-files/sass/partials/_error-bar.scss
index 249bbeaa5..0bfcbe0be 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 aeb04e931..2c341f61e 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 55725abe0..9279cf0c4 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 81cc311e1..df519c752 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 4f04a266b..fa52e2972 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 bdf04ff82..ed2d0bbe9 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/_search.scss b/web/sass-files/sass/partials/_search.scss
index 226449ba2..eceeb9a8c 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -111,13 +111,20 @@
.search-item__jump {
position: absolute;
right: 0;
- top: 0;
+ top: 0px;
+ font-size: 13px;
+ @include opacity(0.8);
+
+ &:hover {
+ @include opacity(1);
+ }
+
}
.search-item__comment {
position: absolute;
right: 0;
- margin-right: 20px;
+ margin-right: 35px;
top: 0;
}
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index ee0c40067..f078cafb4 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;
+
+ .fa {
+ margin-right: 5px;
+ }
- .member-role, .member-drop {
- position:absolute;
- right: 15px;
- top: 8px;
+ .member-menu {
+ top: -50%;
+ right: 110%;
}
+
}
.member-invite {
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-28 19:49:58 +0000