Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
* upstream/develop: (42 commits) Fix formatting in oc.json avoid using global class fix logo moving bug when lightbox is open Reserve scrollbar gap when body scroll is locked setting display: initial makes trouble, instead, toggle display: none using classname lock body scroll add body-scroll-lock directive install body-scroll-lock wire up props with PostStatusModal rename component recover autofocusing behavior refactor MobilePostStatusModal using new PostStatusModal add new module and modal to post new status remove needless condition add mention button wire up user state with global store collapse fav/repeat notifications from muted users do not collapse thread muted posts in conversation detect thread-muted posts do not change word based muting logic ...
Showing with 958 additions and 285 deletions
src/components/mobile_post_status_modal/mobile_post_status_modal.js → src/components/mobile_post_status_button/mobile_post_status_button.js
src/components/mobile_post_status_modal/mobile_post_status_modal.vue → src/components/mobile_post_status_button/mobile_post_status_button.vue