Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-09-22 00:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move min-height to RoomList; remove bottommost prop

Browse Source
This commit is contained in:
Kegan Dougal 2015-12-18 17:13:57 +00:00
parent dc1e2010a6
commit dcea0dd601
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/RoomSubList.js
View File

@ -61,7 +61,6 @@ var RoomSubList = React.createClass({
tagName: React.PropTypes.string, tagName: React.PropTypes.string,
editable: React.PropTypes.bool, editable: React.PropTypes.bool,
order: React.PropTypes.string.isRequired, order: React.PropTypes.string.isRequired,
bottommost: React.PropTypes.bool,
selectedRoom: React.PropTypes.string.isRequired, selectedRoom: React.PropTypes.string.isRequired,
activityMap: React.PropTypes.object.isRequired, activityMap: React.PropTypes.object.isRequired,
startAsHidden: React.PropTypes.bool, startAsHidden: React.PropTypes.bool,
@ -290,8 +289,7 @@ var RoomSubList = React.createClass({
if (this.state.sortedList.length > 0 || this.props.editable) { if (this.state.sortedList.length > 0 || this.props.editable) {
var subList; var subList;
var classes = "mx_RoomSubList" + var classes = "mx_RoomSubList";
(this.props.bottommost ? " mx_RoomSubList_bottommost" : "");
if (!this.state.hidden) { if (!this.state.hidden) {
subList = <div className={ classes }> subList = <div className={ classes }>

1
src/skins/vector/css/organisms/RoomList.css
View File

@ -17,6 +17,7 @@ limitations under the License.
.mx_RoomList { .mx_RoomList {
padding-top: 24px; padding-top: 24px;
padding-bottom: 12px; padding-bottom: 12px;
min-height: 400px;
} }
.mx_RoomList_expandButton { .mx_RoomList_expandButton {

5
src/skins/vector/css/organisms/RoomSubList.css
View File

@ -20,11 +20,6 @@ limitations under the License.
width: 100%; width: 100%;
} }
.mx_RoomSubList_bottommost {
/* XXX: this should really be 100% of the RoomList height, but can't seem to get at it */
min-height: 400px;
}
.mx_RoomSubList_label { .mx_RoomSubList_label {
text-transform: uppercase; text-transform: uppercase;
color: #3d3b39; color: #3d3b39;