MM-63851 Fix mobile view (#30836)

* MM-63851 Re-add divs around mobile view header

* Revert layout changes in mobile view header

* Finish removing CSS rule

webapp/channels/src/components/mobile_channel_header/mobile_channel_header.tsx

@@ -93,34 +93,38 @@ export default class MobileChannelHeader extends React.PureComponent<Props> {
         }
 
         return (
-            <nav
-                id='navbar'
-                className='navbar navbar-default navbar-fixed-top'
-                role='navigation'
-            >
-                <div className='container-fluid theme'>
-                    <div className='navbar-header'>
-                        <CollapseLhsButton/>
-                        <div className={classNames('navbar-brand', {GlobalThreads___title: inGlobalThreads})}>
-                            {heading}
+            <div className='row header'>
+                <div id='navbar_wrapper'>
+                    <nav
+                        id='navbar'
+                        className='navbar navbar-default navbar-fixed-top'
+                        role='navigation'
+                    >
+                        <div className='container-fluid theme'>
+                            <div className='navbar-header'>
+                                <CollapseLhsButton/>
+                                <div className={classNames('navbar-brand', {GlobalThreads___title: inGlobalThreads})}>
+                                    {heading}
+                                </div>
+                                <div className='spacer'/>
+                                {channel && (
+                                    <ChannelInfoButton
+                                        channel={channel}
+                                    />
+                                )}
+                                {channel && (
+                                    <MobileChannelHeaderPlugins
+                                        channel={channel}
+                                        isDropdown={false}
+                                    />
+                                )}
+                                <ShowSearchButton/>
+                                <CollapseRhsButton/>
+                            </div>
                         </div>
-                        <div className='spacer'/>
-                        {channel && (
-                            <ChannelInfoButton
-                                channel={channel}
-                            />
-                        )}
-                        {channel && (
-                            <MobileChannelHeaderPlugins
-                                channel={channel}
-                                isDropdown={false}
-                            />
-                        )}
-                        <ShowSearchButton/>
-                        <CollapseRhsButton/>
-                    </div>
+                    </nav>
                 </div>
-            </nav>
+            </div>
         );
     }
 }

webapp/channels/src/sass/responsive/_mobile.scss

@@ -10,9 +10,8 @@
             }
 
             .navbar-header {
-                display: flex;
-                align-items: center;
-                gap: 4px;
+                margin: 0 -15px;
+                float: none;
 
                 .dropdown__icon {
                     display: inline-block;
@@ -20,10 +19,6 @@
                     height: 16px;
                     background-size: 100% 100%;
                 }
-
-                button.navbar-toggle.navbar-right__icon {
-                    margin: 0;
-                }
             }
 
             .navbar-toggle {
@@ -683,8 +678,7 @@
     }
 
     .sidebar--left .team__header .Avatar,
-    #SidebarContainer .team__header .Avatar,
-    .team__header .Avatar {
+    #SidebarContainer .team__header .Avatar {
         display: none;
     }