diff --git a/web/react/components/member_list_team_item.jsx b/web/react/components/member_list_team_item.jsx
index 6e1006911b..30086d1b2a 100644
--- a/web/react/components/member_list_team_item.jsx
+++ b/web/react/components/member_list_team_item.jsx
@@ -208,8 +208,8 @@ export default class MemberListTeamItem extends React.Component {
height='36'
width='36'
/>
-
|
{channel.display_name}
- {channel.purpose}
+ {channel.purpose}
|
{joinButton}
diff --git a/web/react/components/posts_view.jsx b/web/react/components/posts_view.jsx
index f108ace2e2..ebe19abad3 100644
--- a/web/react/components/posts_view.jsx
+++ b/web/react/components/posts_view.jsx
@@ -94,7 +94,7 @@ export default class PostsView extends React.Component {
});
}
- this.scrollStopAction.fireAfter(1000);
+ this.scrollStopAction.fireAfter(2000);
}
handleScrollStop() {
this.setState({
@@ -564,6 +564,8 @@ function ScrollToBottomArrows({isScrolling, atBottom, onClick}) {
+ >
+
+
);
}
diff --git a/web/react/components/user_settings/manage_command_hooks.jsx b/web/react/components/user_settings/manage_command_hooks.jsx
index d23d2957e3..3656424b23 100644
--- a/web/react/components/user_settings/manage_command_hooks.jsx
+++ b/web/react/components/user_settings/manage_command_hooks.jsx
@@ -271,7 +271,7 @@ export default class ManageCommandCmds extends React.Component {
cmds.push(
@@ -400,7 +400,7 @@ export default class ManageCommandCmds extends React.Component {
}
const existingCmds = (
-
+
-
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 9689591a6f..b1e84202d5 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -173,6 +173,7 @@ export default {
MENU_ICON: " ",
COMMENT_ICON: " ",
REPLY_ICON: " ",
+ SCROLL_BOTTOM_ICON: " ",
UPDATE_TYPING_MS: 5000,
THEMES: {
default: {
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 896a94ac5e..c2487f2908 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -680,6 +680,7 @@ export function applyTheme(theme) {
}
if (theme.centerChannelColor) {
+ changeCss('.post-list__arrows', 'fill:' + changeOpacity(theme.centerChannelColor, 0.3), 1);
changeCss('.sidebar--left, .sidebar--right .sidebar--right__header', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
changeCss('.app__content, .post-create__container .post-create-body .btn-file, .post-create__container .post-create-footer .msg-typing, .command-name, .modal .modal-content, .dropdown-menu, .popover, .mentions-name, .tip-overlay', 'color:' + theme.centerChannelColor, 1);
changeCss('#archive-link-home', 'background:' + changeOpacity(theme.centerChannelColor, 0.15), 1);
diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss
index 14e12ecd2b..0ba1929e07 100644
--- a/web/sass-files/sass/partials/_markdown.scss
+++ b/web/sass-files/sass/partials/_markdown.scss
@@ -39,6 +39,7 @@
padding: 4px 10px 5px 10px;
font-size: 13px;
opacity: 0.7;
+ z-index: 5;
}
.post__body {
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index b451adb759..db99e840b2 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -103,7 +103,7 @@
background: rgba(0, 0, 0, 0.1);
}
span {
- font-family: 'Open Sans', sans-serif;
+ font-family: 'Open Sans', sans-serif;
line-height: 10px;
}
}
@@ -170,6 +170,12 @@
overflow: hidden;
text-overflow: ellipsis;
}
+ .more-description {
+ @include opacity(0.7);
+ display: block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
tbody {
> tr {
&:hover td {
@@ -425,9 +431,9 @@
}
.modal-body.edit-modal-body {
- overflow: visible;
+ overflow: visible;
- .suggestion-content {
- max-height: 150px;
- }
+ .suggestion-content {
+ max-height: 150px;
+ }
}
diff --git a/web/sass-files/sass/partials/_popover.scss b/web/sass-files/sass/partials/_popover.scss
index 8a61758f1f..bf762d2c9c 100644
--- a/web/sass-files/sass/partials/_popover.scss
+++ b/web/sass-files/sass/partials/_popover.scss
@@ -150,6 +150,9 @@
}
.more-name {
margin-left: 6px;
+ max-width: 140px;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
}
}
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index cc22cc9136..323691d896 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -264,32 +264,37 @@ body.ios {
line-height: 25px;
margin-left: -60px;
-webkit-font-smoothing: initial;
- @include single-transition(all, 0.3s, ease);
+ @include single-transition(all, 0.6s, ease);
@include translateY(-45px);
@include opacity(0);
display: none;
&.scrolling {
- @include single-transition(all, 0.3s, ease);
@include translateY(0);
@include opacity(0.8);
}
}
.post-list__arrows {
- background: url('../images/postArrows.png') center;
- @include background-size(28px 28px);
background-repeat: no-repeat;
width: 40px;
height: 40px;
+ text-align: center;
+ fill: #444;
position: absolute;
bottom: 0;
- left: 10px;
+ left: 9px;
z-index: 50;
@include opacity(0);
- @include single-transition(all, 0.3s);
+ @include single-transition(all, 0.6s);
display: none;
+ svg {
+ color: inherit;
+ width: 28px;
+ height: 28px;
+ }
+
&.scrolling {
display: block;
@include opacity(1);
@@ -487,7 +492,7 @@ body.ios {
position: absolute;
top: -2px;
left: -7px;
- font-size: 11px;
+ font-size: 11px;
line-height: 37px;
@include opacity(0);
}
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index bf296e9137..d92cf95ac3 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -341,21 +341,6 @@ h3 {
@include border-radius(50px);
margin-right: 8px;
}
- .member-name {
- font-weight:500;
- display: block;
- max-width: 80%;
- overflow: hidden;
- text-overflow: ellipsis;
- }
-
- .member-email {
- color:darkgrey;
- display: block;
- max-width: 80%;
- overflow: hidden;
- text-overflow: ellipsis;
- }
}
.member-role, .member-drop {
diff --git a/web/static/images/postArrows.png b/web/static/images/postArrows.png
deleted file mode 100644
index 7b5919fc3d..0000000000
Binary files a/web/static/images/postArrows.png and /dev/null differ
|