gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix broken RoomView CSS due to name clashes and splitting an element in 

two.
This commit is contained in:
Erik Johnston 2015-07-16 09:43:00 +01:00
parent bc93aeb50e
commit edc3302d89
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
skins/base/css/organisms/RoomView.css
View File

@ -24,6 +24,7 @@ limitations under the License.
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
width: 100%; width: 100%;
height: 100%;
flex-direction: column; flex-direction: column;
-webkit-flex-direction: column; -webkit-flex-direction: column;
} }

2
skins/base/css/pages/MatrixChat.css
View File

@ -38,7 +38,7 @@ limitations under the License.
height: 100%; height: 100%;
} }
.mx_MatrixChat .mx_MainView { .mx_MatrixChat .mx_MatrixChat_MiddleView {
-webkit-box-ordinal-group: 2; -webkit-box-ordinal-group: 2;
-moz-box-ordinal-group: 2; -moz-box-ordinal-group: 2;
-ms-flex-order: 2; -ms-flex-order: 2;

2
skins/base/views/pages/MatrixChat.js
View File

@ -51,7 +51,7 @@ module.exports = React.createClass({
return ( return (
<div className="mx_MatrixChat"> <div className="mx_MatrixChat">
<LeftPanel selectedRoom={this.state.currentRoom} /> <LeftPanel selectedRoom={this.state.currentRoom} />
<div className="mx_MainView"> <div className="mx_MatrixChat_MiddleView">
{page_element} {page_element}
</div> </div>
{right_panel} {right_panel}