Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 4529813

Browse files
author
Kerry Archibald
committed
remove warning banner
Signed-off-by: Kerry Archibald <[email protected]>
1 parent 7bc55b4 commit 4529813

File tree

9 files changed

+21
-161
lines changed

9 files changed

+21
-161
lines changed

res/css/_components.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
@import "./_font-sizes.scss";
55
@import "./_font-weights.scss";
66
@import "./_spacing.scss";
7-
@import "./components/views/beacon/_LeftPanelLiveShareWarning.scss";
87
@import "./components/views/location/_LocationShareMenu.scss";
98
@import "./components/views/location/_MapError.scss";
109
@import "./components/views/location/_ShareDialogButtons.scss";

res/css/components/views/beacon/_LeftPanelLiveShareWarning.scss

Lines changed: 0 additions & 31 deletions
This file was deleted.

res/css/structures/_LeftPanel.scss

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,13 @@ $roomListCollapsedWidth: 68px;
2323
}
2424
}
2525

26-
.mx_LeftPanel_outerWrapper {
26+
.mx_LeftPanel_wrapper {
2727
display: flex;
28-
flex-direction: column;
2928
max-width: 50%;
3029
position: relative;
3130

3231
// Contain the amount of layers rendered by constraining what actually needs re-layering via css
3332
contain: layout paint;
34-
}
35-
36-
.mx_LeftPanel_wrapper {
37-
display: flex;
38-
flex-direction: row;
39-
flex: 1;
4033

4134
.mx_LeftPanel_wrapper--user {
4235
background-color: $roomlist-bg-color;

res/css/structures/_MatrixChat.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ limitations under the License.
6363
}
6464

6565
/* not the left panel, and not the resize handle, so the roomview/groupview/... */
66-
.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle):not(.mx_LeftPanel_outerWrapper) {
66+
.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle):not(.mx_LeftPanel_wrapper) {
6767
background-color: $background;
6868

6969
flex: 1 1 0;

src/components/structures/LoggedInView.tsx

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ import RightPanelStore from '../../stores/right-panel/RightPanelStore';
7575
import { TimelineRenderingType } from "../../contexts/RoomContext";
7676
import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
7777
import { SwitchSpacePayload } from "../../dispatcher/payloads/SwitchSpacePayload";
78-
import LeftPanelLiveShareWarning from '../views/beacon/LeftPanelLiveShareWarning';
7978

8079
// We need to fetch each pinned message individually (if we don't already have it)
8180
// so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -695,10 +694,8 @@ class LoggedInView extends React.Component<IProps, IState> {
695694
>
696695
<ToastContainer />
697696
<div className={bodyClasses}>
698-
<div className='mx_LeftPanel_outerWrapper'>
699-
<LeftPanelLiveShareWarning isMinimized={this.props.collapseLhs || false} />
700-
<div className='mx_LeftPanel_wrapper'>
701-
{ SettingsStore.getValue('TagPanel.enableTagPanel') &&
697+
<div className='mx_LeftPanel_wrapper'>
698+
{ SettingsStore.getValue('TagPanel.enableTagPanel') &&
702699
(<div className="mx_GroupFilterPanelContainer">
703700
<BackdropPanel
704701
blurMultiplier={0.5}
@@ -707,27 +704,26 @@ class LoggedInView extends React.Component<IProps, IState> {
707704
<GroupFilterPanel />
708705
{ SettingsStore.getValue("feature_custom_tags") ? <CustomRoomTagPanel /> : null }
709706
</div>)
710-
}
711-
{ SpaceStore.spacesEnabled ? <>
712-
<BackdropPanel
713-
blurMultiplier={0.5}
714-
backgroundImage={this.state.backgroundImage}
715-
/>
716-
<SpacePanel />
717-
</> : null }
707+
}
708+
{ SpaceStore.spacesEnabled ? <>
718709
<BackdropPanel
710+
blurMultiplier={0.5}
719711
backgroundImage={this.state.backgroundImage}
720712
/>
721-
<div
722-
className="mx_LeftPanel_wrapper--user"
723-
ref={this._resizeContainer}
724-
data-collapsed={this.props.collapseLhs ? true : undefined}
725-
>
726-
<LeftPanel
727-
isMinimized={this.props.collapseLhs || false}
728-
resizeNotifier={this.props.resizeNotifier}
729-
/>
730-
</div>
713+
<SpacePanel />
714+
</> : null }
715+
<BackdropPanel
716+
backgroundImage={this.state.backgroundImage}
717+
/>
718+
<div
719+
className="mx_LeftPanel_wrapper--user"
720+
ref={this._resizeContainer}
721+
data-collapsed={this.props.collapseLhs ? true : undefined}
722+
>
723+
<LeftPanel
724+
isMinimized={this.props.collapseLhs || false}
725+
resizeNotifier={this.props.resizeNotifier}
726+
/>
731727
</div>
732728
</div>
733729
<ResizeHandle passRef={this.resizeHandler} id="lp-resizer" />

src/components/views/beacon/LeftPanelLiveShareWarning.tsx

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/i18n/strings/en_EN.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2956,7 +2956,6 @@
29562956
"Beta": "Beta",
29572957
"Leave the beta": "Leave the beta",
29582958
"Join the beta": "Join the beta",
2959-
"You are sharing your live location": "You are sharing your live location",
29602959
"Avatar": "Avatar",
29612960
"This room is public": "This room is public",
29622961
"Away": "Away",

test/components/views/beacon/LeftPanelLiveShareWarning-test.tsx

Lines changed: 0 additions & 37 deletions
This file was deleted.

test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)