ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-05 22:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters

Browse Source
This commit is contained in:
Erik Johnston
2019-01-10 16:56:47 +00:00
parent fa6b33d629 1c42f4f5a0
commit cbf9ff6aee
58 changed files with 1168 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/css/views/rooms/_MemberList.scss
+4
View File
@@ -53,6 +53,10 @@ limitations under the License.
.mx_MemberList_query,
.mx_GroupMemberList_query,
.mx_GroupRoomList_query {
flex: 0 0 auto;
}
.mx_MemberList .gm-scrollbar-container {
flex: 1 1 0;
}
res/css/views/rooms/_RoomTile.scss
+2 -1
View File
@@ -54,12 +54,14 @@ limitations under the License.
align-items: center;
flex: 1;
vertical-align: middle;
min-width: 0;
}
.mx_RoomTile_labelContainer {
display: flex;
flex-direction: column;
flex: 1;
min-width: 0;
}
.mx_RoomTile_subtext {
@@ -99,7 +101,6 @@ limitations under the License.
}
.mx_RoomTile_name {
flex: 1 5 auto;
font-size: 14px;
font-weight: 600;
padding: 0 6px;