mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 02:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move Jitsi widget above Explore/Filter

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2019-10-23 13:05:02 +01:00
parent c6023ca461
commit efcda54c3f
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
res/css/structures/_LeftPanel.scss
View file

@ -48,16 +48,12 @@ limitations under the License.
.mx_LeftPanel { .mx_LeftPanel {
flex: 1; flex: 1;
overflow: hidden; overflow-x: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: 0; min-height: 0;
} }
.mx_LeftPanel .mx_LeftPanel_Rooms {
flex: 1 1 0;
}
.mx_LeftPanel .mx_AppTile_mini { .mx_LeftPanel .mx_AppTile_mini {
height: 132px; height: 132px;
} }

2
src/components/structures/LeftPanel.js
View file

@ -272,6 +272,7 @@ const LeftPanel = createReactClass({
<aside className="mx_LeftPanel dark-panel"> <aside className="mx_LeftPanel dark-panel">
<TopLeftMenuButton collapsed={this.props.collapsed} /> <TopLeftMenuButton collapsed={this.props.collapsed} />
{ breadcrumbs } { breadcrumbs }
<CallPreview ConferenceHandler={VectorConferenceHandler} />
<div className="mx_LeftPanel_Rooms" onKeyDown={this._onKeyDown} onFocus={this._onFocus} onBlur={this._onBlur}> <div className="mx_LeftPanel_Rooms" onKeyDown={this._onKeyDown} onFocus={this._onFocus} onBlur={this._onBlur}>
<div className="mx_LeftPanel_exploreAndFilterRow"> <div className="mx_LeftPanel_exploreAndFilterRow">
{ exploreButton } { exploreButton }
@ -284,7 +285,6 @@ const LeftPanel = createReactClass({
searchFilter={this.state.searchFilter} searchFilter={this.state.searchFilter}
ConferenceHandler={VectorConferenceHandler} /> ConferenceHandler={VectorConferenceHandler} />
</div> </div>
<CallPreview ConferenceHandler={VectorConferenceHandler} />
</aside> </aside>
</div> </div>
); );