matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-22 04:02:40 +03:00
Code Activity

Room list fixes for custom status

Browse Source
This commit is contained in:
J. Ryan Stinnett
2019-01-03 18:36:57 -06:00
parent 46aa543934
commit 920911c0a1
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/css/views/rooms/_RoomTile.scss
View File

@@ -50,11 +50,18 @@ limitations under the License.
.mx_RoomTile_nameContainer { .mx_RoomTile_nameContainer {
display: inline-block; display: flex;
align-items: center;
width: 180px; width: 180px;
vertical-align: middle; vertical-align: middle;
} }
.mx_RoomTile_labelContainer {
display: flex;
flex-direction: column;
flex: 1;
}
.mx_RoomTile_avatar { .mx_RoomTile_avatar {
flex: 0; flex: 0;
padding: 4px; padding: 4px;
@@ -103,7 +110,7 @@ limitations under the License.
flex: 1 5 auto; flex: 1 5 auto;
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
padding: 6px; padding: 0 6px;
color: $roomtile-name-color; color: $roomtile-name-color;
white-space: nowrap; white-space: nowrap;
overflow-x: hidden; overflow-x: hidden;

2
src/components/views/rooms/RoomTile.js
View File

@@ -354,8 +354,10 @@ module.exports = React.createClass({
</div> </div>
</div> </div>
<div className="mx_RoomTile_nameContainer"> <div className="mx_RoomTile_nameContainer">
<div className="mx_RoomTile_labelContainer">
{ label } { label }
{ subtextLabel } { subtextLabel }
</div>
{ contextMenuButton } { contextMenuButton }
{ badge } { badge }
</div> </div>