From fe0aeac6fe2aaa6a9c33bd47a293d626c9d640e9 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 9 Feb 2016 20:35:40 +0500 Subject: [PATCH 1/4] Multiple UI Improvements --- config/config.json | 33 +++++++++++++++--- .../components/admin_console/user_item.jsx | 4 +-- web/react/components/member_list_item.jsx | 4 +-- .../components/member_list_team_item.jsx | 4 +-- web/react/components/more_channels.jsx | 2 +- web/react/components/posts_view.jsx | 6 ++-- .../user_settings/manage_command_hooks.jsx | 6 ++-- web/react/utils/constants.jsx | 1 + web/react/utils/utils.jsx | 1 + web/sass-files/sass/partials/_markdown.scss | 1 + web/sass-files/sass/partials/_modal.scss | 16 ++++++--- web/sass-files/sass/partials/_popover.scss | 3 ++ web/sass-files/sass/partials/_post.scss | 19 ++++++---- web/sass-files/sass/partials/_settings.scss | 15 -------- web/static/images/postArrows.png | Bin 5684 -> 0 bytes 15 files changed, 72 insertions(+), 43 deletions(-) delete mode 100644 web/static/images/postArrows.png diff --git a/config/config.json b/config/config.json index 2795546f80..fe47adf6a2 100644 --- a/config/config.json +++ b/config/config.json @@ -6,8 +6,8 @@ "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, "EnableIncomingWebhooks": false, - "EnableOutgoingWebhooks": false, - "EnableCommands": false, + "EnableOutgoingWebhooks": true, + "EnableCommands": true, "EnableOnlyAdminIntegrations": true, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, @@ -18,7 +18,9 @@ "SessionLengthWebInDays": 30, "SessionLengthMobileInDays": 30, "SessionLengthSSOInDays": 30, - "SessionCacheInMinutes": 10 + "SessionCacheInMinutes": 10, + "WebsocketSecurePort": 443, + "WebsocketPort": 80 }, "TeamSettings": { "SiteName": "Mattermost", @@ -112,5 +114,28 @@ "AuthEndpoint": "", "TokenEndpoint": "", "UserApiEndpoint": "" + }, + "GoogleSettings": { + "Enable": false, + "Secret": "", + "Id": "", + "Scope": "", + "AuthEndpoint": "", + "TokenEndpoint": "", + "UserApiEndpoint": "" + }, + "LdapSettings": { + "Enable": false, + "LdapServer": null, + "LdapPort": 389, + "BaseDN": null, + "BindUsername": null, + "BindPassword": null, + "FirstNameAttribute": null, + "LastNameAttribute": null, + "EmailAttribute": null, + "UsernameAttribute": null, + "IdAttribute": null, + "QueryTimeout": 60 } -} +} \ No newline at end of file diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx index 02b01b0901..0c1a55cc16 100644 --- a/web/react/components/admin_console/user_item.jsx +++ b/web/react/components/admin_console/user_item.jsx @@ -360,8 +360,8 @@ export default class UserItem extends React.Component { height='36' width='36' /> - {Utils.getDisplayName(user)} - {email} + {Utils.getDisplayName(user)} + {email}
-
{Utils.displayUsername(member.id)}
-
{member.email}
+
{Utils.displayUsername(member.id)}
+
{member.email}
{invite} 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' /> - {Utils.displayUsername(user.id)} - {email} + {Utils.displayUsername(user.id)} + {email}

{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 = ( -
+
-
+
{displayCmds}
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 7b5919fc3d5f9e25c9ab85bf2061079cfedd4d87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5684 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 Date: Tue, 9 Feb 2016 20:37:05 +0500 Subject: [PATCH 2/4] Reverting config --- config/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.json b/config/config.json index fe47adf6a2..787bc6a13f 100644 --- a/config/config.json +++ b/config/config.json @@ -6,8 +6,8 @@ "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, "EnableIncomingWebhooks": false, - "EnableOutgoingWebhooks": true, - "EnableCommands": true, + "EnableOutgoingWebhooks": false, + "EnableCommands": false, "EnableOnlyAdminIntegrations": true, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, From b8f76787335cca988a5cada2d1debc0b5e9b7338 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 9 Feb 2016 20:38:25 +0500 Subject: [PATCH 3/4] Reverting config.json file --- config/config.json | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/config/config.json b/config/config.json index 787bc6a13f..2795546f80 100644 --- a/config/config.json +++ b/config/config.json @@ -18,9 +18,7 @@ "SessionLengthWebInDays": 30, "SessionLengthMobileInDays": 30, "SessionLengthSSOInDays": 30, - "SessionCacheInMinutes": 10, - "WebsocketSecurePort": 443, - "WebsocketPort": 80 + "SessionCacheInMinutes": 10 }, "TeamSettings": { "SiteName": "Mattermost", @@ -114,28 +112,5 @@ "AuthEndpoint": "", "TokenEndpoint": "", "UserApiEndpoint": "" - }, - "GoogleSettings": { - "Enable": false, - "Secret": "", - "Id": "", - "Scope": "", - "AuthEndpoint": "", - "TokenEndpoint": "", - "UserApiEndpoint": "" - }, - "LdapSettings": { - "Enable": false, - "LdapServer": null, - "LdapPort": 389, - "BaseDN": null, - "BindUsername": null, - "BindPassword": null, - "FirstNameAttribute": null, - "LastNameAttribute": null, - "EmailAttribute": null, - "UsernameAttribute": null, - "IdAttribute": null, - "QueryTimeout": 60 } -} \ No newline at end of file +} From 65a00cbcf52dfc9bcd43112f2e420fad4798f2e1 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 9 Feb 2016 21:03:52 +0500 Subject: [PATCH 4/4] Improving mentions issue with long names --- web/sass-files/sass/partials/_mentions.scss | 16 ++++++++++++++++ web/sass-files/sass/partials/_settings.scss | 2 ++ 2 files changed, 18 insertions(+) diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index df6dd40a26..aa654e9e88 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -18,6 +18,13 @@ line-height: 36px; font-size: 13px; cursor: pointer; + white-space: nowrap; + + .mention-align { + @include clearfix; + text-overflow: ellipsis; + width: calc(100% - 50px); + } } .mentions-text { @@ -33,6 +40,15 @@ font-size: 20px; text-align: center; @include border-radius(32px); + + .mention-align { + max-width: 80%; + overflow: hidden; + display: inline-block; + white-space: nowrap; + text-overflow: ellipsis; + } + } .mention-fullname { diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index d92cf95ac3..1bbec566cb 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -223,6 +223,8 @@ .section-describe { @include opacity(0.7); white-space:pre; + @include clearfix; + text-overflow: ellipsis; } .divider-dark {