ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-07 23:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'experimental' into bwindels/roomheader1

Browse Source
This commit is contained in:
Bruno Windels
2018-10-23 21:39:13 +02:00
parent 18fedb23ec 466062e872
commit e479c72e3c
26 changed files with 370 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/css/views/rooms/_EventTile.scss
-5
View File
@@ -55,11 +55,6 @@ limitations under the License.
line-height: 22px;
}
.mx_EventTile .mx_SenderProfile .mx_SenderProfile_name,
.mx_EventTile .mx_SenderProfile .mx_SenderProfile_aux {
opacity: 0.5;
}
.mx_EventTile .mx_SenderProfile .mx_Flair {
opacity: 0.7;
margin-left: 5px;
res/css/views/rooms/_MessageComposer.scss
+2 -3
View File
@@ -62,8 +62,7 @@ limitations under the License.
}
.mx_MessageComposer .mx_MessageComposer_avatar {
padding-left: 10px;
padding-right: 28px;
padding: 0 28px;
}
.mx_MessageComposer .mx_MessageComposer_avatar .mx_BaseAvatar {
@@ -76,7 +75,7 @@ limitations under the License.
.mx_MessageComposer_e2eIcon {
position: absolute;
left: 44px;
left: 60px;
}
.mx_MessageComposer_noperm_error {
res/css/views/rooms/_RoomTooltip.scss
+2 -2
View File
@@ -21,7 +21,7 @@ limitations under the License.
width: 0;
height: 0;
border-top: 8px solid transparent;
border-right: 8px solid $menu-border-color;
border-right: 8px solid $menu-bg-color;
border-bottom: 8px solid transparent;
}
@@ -40,8 +40,8 @@ limitations under the License.
.mx_RoomTooltip {
display: none;
position: fixed;
border: 1px solid $menu-border-color;
border-radius: 5px;
box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.21);
background-color: $primary-bg-color;
z-index: 2000;
padding: 5px;