imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into gsouquet/fix-18264

Browse source
This commit is contained in:
Germain Souquet 2021-07-28 10:30:29 +02:00
commit a4cf147d72
28 changed files with 781 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/css/views/rooms/_EventTile.scss
View file

@ -267,7 +267,7 @@ $hover-select-border: 4px;
.mx_ReactionsRow {
margin: 0;
padding: 6px 60px;
padding: 4px 64px;
}
}

2
res/css/views/rooms/_MessageComposer.scss
View file

@ -165,8 +165,6 @@ limitations under the License.
font-size: $font-14px;
max-height: 120px;
overflow: auto;
/* needed for FF */
font-family: $font-family;
}
/* hack for FF as vertical alignment of custom placeholder text is broken */