Skip to content

[FIX] Display user status along with icon#16875

Merged
rodrigok merged 10 commits intoRocketChat:developfrom
Nikhil713:user-status
Mar 21, 2020
Merged

[FIX] Display user status along with icon#16875
rodrigok merged 10 commits intoRocketChat:developfrom
Nikhil713:user-status

Conversation

@Nikhil713
Copy link
Contributor

Closes #16868

Updated code shows the corresponding user-status descriptions.

Output:
user-status

@Nikhil713
Copy link
Contributor Author

@kb0304 @gabriellsh Could you review this?

.rc-header {
&__visual-status {
display: none;
font-size: 100%;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What effect does font-size: 100% has here? Is there any specific need for it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I see that font-size: 100%; is not required. I have removed the unnecessary code. Is it fine now?

Copy link
Member

@gabriellsh gabriellsh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@gabriellsh
Copy link
Member

Could you please merge with develop?

@Nikhil713
Copy link
Contributor Author

@gabriellsh Done.

@rodrigok rodrigok merged commit cf69e43 into RocketChat:develop Mar 21, 2020
ggazzo added a commit that referenced this pull request Mar 21, 2020
…ultiple-users

* 'develop' of github.com:RocketChat/Rocket.Chat: (35 commits)
  Change license version requested (#16956)
  Synchronize saml roles to local user (#16158)
  Fix: Padding required in the Facebook Messenger option in Livechat (#16202)
  Add some missing ES translations (#16120)
  Adding margin to click to load text (#16210)
  [FIX] Explicitly set text of confirmation button (#16138)
  Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room (#16227)
  Fixed translate variable in ArchiveRoom Modal (#16310)
  [FIX] Display user status along with icon (#16875)
  [FIX] users.setStatus and user from params (#16128)
  Update cypress to version 4.0.2 (#16685)
  [FIX] Text formatted to remain within button even on screen resize  (#14136)
  fix(slack-bridge): messages doesn't send to slack after renaming channel (#16565)
  [NEW] Route to get updated roles after a date (#16610)
  [FIX] Removed Reply in DM from livechat rooms (#16957)
  Update presence package (#16786)
  [NEW] Enterprise Edition (#16944)
  Add an index to the name field for omnichannel department (#16953)
  [FIX] Login with LinkedIn not mapping name and picture correctly (#16955)
  [IMPROVE] Allow login of non LDAP users when LDAP is enabled (#16949)
  ...
ggazzo added a commit that referenced this pull request Mar 21, 2020
…ultiple-users

* 'develop' of github.com:RocketChat/Rocket.Chat: (35 commits)
  Change license version requested (#16956)
  Synchronize saml roles to local user (#16158)
  Fix: Padding required in the Facebook Messenger option in Livechat (#16202)
  Add some missing ES translations (#16120)
  Adding margin to click to load text (#16210)
  [FIX] Explicitly set text of confirmation button (#16138)
  Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room (#16227)
  Fixed translate variable in ArchiveRoom Modal (#16310)
  [FIX] Display user status along with icon (#16875)
  [FIX] users.setStatus and user from params (#16128)
  Update cypress to version 4.0.2 (#16685)
  [FIX] Text formatted to remain within button even on screen resize  (#14136)
  fix(slack-bridge): messages doesn't send to slack after renaming channel (#16565)
  [NEW] Route to get updated roles after a date (#16610)
  [FIX] Removed Reply in DM from livechat rooms (#16957)
  Update presence package (#16786)
  [NEW] Enterprise Edition (#16944)
  Add an index to the name field for omnichannel department (#16953)
  [FIX] Login with LinkedIn not mapping name and picture correctly (#16955)
  [IMPROVE] Allow login of non LDAP users when LDAP is enabled (#16949)
  ...
ggazzo added a commit that referenced this pull request Mar 21, 2020
…ultiple-users

* 'develop' of github.com:RocketChat/Rocket.Chat: (35 commits)
  Change license version requested (#16956)
  Synchronize saml roles to local user (#16158)
  Fix: Padding required in the Facebook Messenger option in Livechat (#16202)
  Add some missing ES translations (#16120)
  Adding margin to click to load text (#16210)
  [FIX] Explicitly set text of confirmation button (#16138)
  Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room (#16227)
  Fixed translate variable in ArchiveRoom Modal (#16310)
  [FIX] Display user status along with icon (#16875)
  [FIX] users.setStatus and user from params (#16128)
  Update cypress to version 4.0.2 (#16685)
  [FIX] Text formatted to remain within button even on screen resize  (#14136)
  fix(slack-bridge): messages doesn't send to slack after renaming channel (#16565)
  [NEW] Route to get updated roles after a date (#16610)
  [FIX] Removed Reply in DM from livechat rooms (#16957)
  Update presence package (#16786)
  [NEW] Enterprise Edition (#16944)
  Add an index to the name field for omnichannel department (#16953)
  [FIX] Login with LinkedIn not mapping name and picture correctly (#16955)
  [IMPROVE] Allow login of non LDAP users when LDAP is enabled (#16949)
  ...
@sampaiodiego sampaiodiego mentioned this pull request Apr 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Display user status along with icon

3 participants

Comments