Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Mm 23120/picking conflicting changes #7958

Merged
merged 4 commits into from
Apr 20, 2021
Merged

Mm 23120/picking conflicting changes #7958

merged 4 commits into from
Apr 20, 2021

Commits on Apr 20, 2021

  1. MM-23120 Custom status issues (#7843) 

    * Fixed the MM-34095 issue

* Solved several issues from the MM-23120 epic
Solved the MM-33149 issue
Solved the MM-33195 issue
Solved the MM-33214 issue
Solved the MM-33220 issue
Solved the MM-33246 issue
Solved the MM-33433 issue
Solved the MM-34571 issue
Solved the MM-33431 issue

* Updated snapshots

* Fixed some UI issues
Removed the dot in channel header after custom status
Changed the marginLeft for the custom status emoji in switch channel modal
Changed opacity of custom status emoji on hover

* Update components/custom_status/custom_status_modal.tsx

Co-authored-by: Michel Engelen <[email protected]>

* Fixed lint error

* Fixed the styling in switch channel modal

Co-authored-by: Manoj <[email protected]>
Co-authored-by: Michel Engelen <[email protected]>

(cherry picked from commit c2c4725)
    @manojmalik20 @michelengelen
    manojmalik20 authored and michelengelen committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    36d7103 View commit details
    Browse the repository at this point in the history

  2. cherry pick changes to switch_channel_provider

    @michelengelen
    michelengelen committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    098ad81 View commit details
    Browse the repository at this point in the history

  3. Feature/mm 34670 (#7932) 

    * MM-34670 - moved status indicator to the avatar

* MM-33837 - added channel slug info to displayname

* make linter happy :P

* PR review remarks

* visually centered the avatar

* pulled status icon 2px up and 1px left

Co-authored-by: Mattermod <[email protected]>

(cherry picked from commit d12ce41)
    @michelengelen
    michelengelen committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    68d7665 View commit details
    Browse the repository at this point in the history

  4. make linter happy :D

    @michelengelen
    michelengelen committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    40e9cc4 View commit details
    Browse the repository at this point in the history