OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

move aux panel into room body 

to put a resize handle between the body and the right panel later on
pull/21833/head
Bruno Windels 2018-10-30 13:25:06 +01:00
parent 3d07f45370
commit 4972b1ba7c
3 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/css/structures/_RoomView.scss
View File

@ -24,12 +24,6 @@ limitations under the License.
flex-direction: column; flex-direction: column;
} }
.mx_RoomView .mx_RoomHeader {
order: 1;
flex: 0 0 52px;
}
.mx_RoomView_fileDropTarget { .mx_RoomView_fileDropTarget {
min-width: 0px; min-width: 0px;
width: 100%; width: 100%;
@ -69,8 +63,6 @@ limitations under the License.
margin: 0px auto; margin: 0px auto;
overflow: auto; overflow: auto;
border-bottom: 1px solid $primary-hairline-color;
flex: 0 0 auto; flex: 0 0 auto;
} }

7
res/css/views/rooms/_RoomHeader.scss
View File

@ -14,6 +14,13 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_RoomHeader {
order: 1;
flex: 0 0 52px;
border-bottom: 1px solid $primary-hairline-color;
}
/* add 20px to the height of the header when editing */ /* add 20px to the height of the header when editing */
.mx_RoomHeader_editing { .mx_RoomHeader_editing {
flex: 0 0 93px ! important; flex: 0 0 93px ! important;

6
src/components/structures/RoomView.js
View File

@ -1507,6 +1507,7 @@ module.exports = React.createClass({
oobData={this.props.oobData} oobData={this.props.oobData}
collapsedRhs={this.props.collapsedRhs} collapsedRhs={this.props.collapsedRhs}
/> />
<div className="mx_RoomView_body">
<div className="mx_RoomView_auxPanel"> <div className="mx_RoomView_auxPanel">
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked} <RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
onForgetClick={this.onForgetClick} onForgetClick={this.onForgetClick}
@ -1520,6 +1521,7 @@ module.exports = React.createClass({
room={this.state.room} room={this.state.room}
/> />
</div> </div>
</div>
<div className="mx_RoomView_messagePanel"></div> <div className="mx_RoomView_messagePanel"></div>
</div> </div>
); );
@ -1552,6 +1554,7 @@ module.exports = React.createClass({
room={this.state.room} room={this.state.room}
collapsedRhs={this.props.collapsedRhs} collapsedRhs={this.props.collapsedRhs}
/> />
<div className="mx_RoomView_body">
<div className="mx_RoomView_auxPanel"> <div className="mx_RoomView_auxPanel">
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked} <RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
onForgetClick={this.onForgetClick} onForgetClick={this.onForgetClick}
@ -1563,6 +1566,7 @@ module.exports = React.createClass({
room={this.state.room} room={this.state.room}
/> />
</div> </div>
</div>
<div className="mx_RoomView_messagePanel"></div> <div className="mx_RoomView_messagePanel"></div>
</div> </div>
); );
@ -1824,8 +1828,8 @@ module.exports = React.createClass({
onForgetClick={(myMembership === "leave") ? this.onForgetClick : null} onForgetClick={(myMembership === "leave") ? this.onForgetClick : null}
onLeaveClick={(myMembership === "join") ? this.onLeaveClick : null} onLeaveClick={(myMembership === "join") ? this.onLeaveClick : null}
/> />
{ auxPanel }
<div className={fadableSectionClasses}> <div className={fadableSectionClasses}>
{ auxPanel }
{ topUnreadMessagesBar } { topUnreadMessagesBar }
{ messagePanel } { messagePanel }
{ searchResultsPanel } { searchResultsPanel }