diff --git a/client/routes/router.js b/client/routes/router.js index b25056eaa50..beea6092bee 100644 --- a/client/routes/router.js +++ b/client/routes/router.js @@ -68,14 +68,6 @@ FlowRouter.route('/home', { } }); -// FlowRouter.route('/changeavatar', { -// name: 'changeAvatar', -// -// action() { -// BlazeLayout.render('main', {center: 'avatarPrompt'}); -// } -// }); - FlowRouter.route('/account/:group?', { name: 'account', diff --git a/packages/rocketchat-emoji/client/emojiPicker.css b/packages/rocketchat-emoji/client/emojiPicker.css index 612a8f98c94..dbb0b95964d 100644 --- a/packages/rocketchat-emoji/client/emojiPicker.css +++ b/packages/rocketchat-emoji/client/emojiPicker.css @@ -102,8 +102,32 @@ align-items: center; & .emoji-filter { + position: relative; + width: 90%; margin-bottom: 0; + + & .search { + position: relative; + + width: 100%; + height: 35px; + padding: 2px 8px; + + border-width: 1px; + border-style: solid; + border-radius: 5px; + outline: none; + + line-height: normal; + appearance: none; + } + + & .icon-search { + position: absolute; + top: 10px; + left: 7px; + } } & .change-tone { diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index b917458c1c9..a4a88674a23 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -256,6 +256,7 @@ "Away_male": "Away", "Back": "Back", "Back_to_applications": "Back to applications", + "Back_to_chat": "Back to chat", "Back_to_integrations": "Back to integrations", "Back_to_integration_detail": "Back to the integration detail", "Back_to_login": "Back to login", @@ -1380,6 +1381,8 @@ "Private_Groups": "Private Groups", "Private_Groups_list": "List of Private Groups", "Profile": "Profile", + "Profile_details": "Profile details", + "Profile_picture": "Profile picture", "Profile_saved_successfully": "Profile saved successfully", "Public": "Public", "Public_Channel": "Public Channel", diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index 5db7fe9e8f2..dc4cb61f472 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/packages/rocketchat-lib/client/MessageAction.js @@ -138,11 +138,6 @@ Meteor.startup(function() { const message = $(e.currentTarget).closest('.message')[0]; chatMessages[Session.get('openedRoom')].edit(message); RocketChat.MessageAction.hideDropDown(); - // const input = instance.find('.input-message'); - // Meteor.setTimeout(() => { - // input.focus(); - // input.change(); - // }, 200); }, validation(message) { if (RocketChat.models.Subscriptions.findOne({ diff --git a/packages/rocketchat-lib/client/views/customFieldsForm.html b/packages/rocketchat-lib/client/views/customFieldsForm.html index 20ee61b70e6..a1a5d2c9845 100644 --- a/packages/rocketchat-lib/client/views/customFieldsForm.html +++ b/packages/rocketchat-lib/client/views/customFieldsForm.html @@ -1,53 +1,55 @@ diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html index a2df355ca86..7178e270546 100644 --- a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html +++ b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html @@ -6,7 +6,7 @@ - Back to chat + {{_ "Back_to_chat"}}
diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css index 0f13e0c0b86..1c3ddec5969 100644 --- a/packages/rocketchat-theme/client/imports/components/message-box.css +++ b/packages/rocketchat-theme/client/imports/components/message-box.css @@ -107,7 +107,7 @@ border-width: var(--message-box-container-border-width); border-color: var(--message-box-container-border-color); border-radius: var(--message-box-container-border-radius); - align-items: flex-end; + align-items: center; &.editing { background-color: var(--message-box-editing-color); diff --git a/packages/rocketchat-ui-account/client/accountFlex.html b/packages/rocketchat-ui-account/client/accountFlex.html index c639765b056..258b5383a0d 100644 --- a/packages/rocketchat-ui-account/client/accountFlex.html +++ b/packages/rocketchat-ui-account/client/accountFlex.html @@ -6,7 +6,7 @@ - Back to chat + {{_ "Back_to_chat"}}
diff --git a/packages/rocketchat-ui-account/client/accountProfile.html b/packages/rocketchat-ui-account/client/accountProfile.html index 37a47c110d8..4e1843c730d 100644 --- a/packages/rocketchat-ui-account/client/accountProfile.html +++ b/packages/rocketchat-ui-account/client/accountProfile.html @@ -18,17 +18,17 @@ {{> burger}}

{{_ "My Profile"}}

- +
- Profile Details + {{_ "Profile_details"}}
- +
{{# unless avatarPreview}} diff --git a/packages/rocketchat-ui-admin/client/adminFlex.html b/packages/rocketchat-ui-admin/client/adminFlex.html index 4a8d86cbc40..15ea7e1ff3e 100644 --- a/packages/rocketchat-ui-admin/client/adminFlex.html +++ b/packages/rocketchat-ui-admin/client/adminFlex.html @@ -6,7 +6,7 @@ - Back to chat + {{_ "Back_to_chat"}}
diff --git a/packages/rocketchat-ui-sidenav/client/roomList.html b/packages/rocketchat-ui-sidenav/client/roomList.html index 74108b217db..6bbc161d40c 100644 --- a/packages/rocketchat-ui-sidenav/client/roomList.html +++ b/packages/rocketchat-ui-sidenav/client/roomList.html @@ -19,14 +19,6 @@

{{_ "No_channels_yet" }}

{{/each}} - - {{#if hasMoreChannelsButton ..}} - {{!----}} - {{/if}} - - {{#if hasMoreGroupsButton ..}} - {{!----}} - {{/if}} {{/if}} {{/with}} {{/if}} diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js index 7889cdb81ce..d1c79eff2c9 100644 --- a/packages/rocketchat-ui-sidenav/client/roomList.js +++ b/packages/rocketchat-ui-sidenav/client/roomList.js @@ -61,14 +61,6 @@ Template.roomList.helpers({ return !['unread', 'f'].includes(group.identifier) || rooms.count(); }, - hasMoreChannelsButton(room) { - return room.identifier === 'c' || room.anonymous; - }, - - hasMoreGroupsButton(room) { - return room.identifier === 'p'; - }, - roomType(room) { if (room.header || room.identifier) { return `type-${ room.header || room.identifier }`; diff --git a/packages/rocketchat-ui/client/views/app/createChannel.html b/packages/rocketchat-ui/client/views/app/createChannel.html index 78353711e34..fffa835215a 100644 --- a/packages/rocketchat-ui/client/views/app/createChannel.html +++ b/packages/rocketchat-ui/client/views/app/createChannel.html @@ -28,7 +28,6 @@ {{_ "Read_only_channel"}} - {{!--Only admin can write new messages--}}
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js index e44bf4af865..29116406355 100644 --- a/packages/rocketchat-ui/client/views/app/createChannel.js +++ b/packages/rocketchat-ui/client/views/app/createChannel.js @@ -109,7 +109,6 @@ Template.createChannel.events({ t.type.set(e.target.checked ? e.target.value : 'p'); }, 'input [name=users]'(e, t) { - console.log(this); const input = e.target; const position = input.selectionEnd || input.selectionStart; const length = input.value.length;