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

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

Browse source
This commit is contained in:
Jorik Schellekens 2020-04-28 15:38:46 +01:00
commit 1b83faaa8d
51 changed files with 1699 additions and 333 deletions
Download patch file Download diff file Expand all files Collapse all files

3
res/css/views/elements/_EditableItemList.scss
View file

@ -53,6 +53,9 @@ limitations under the License.
.mx_EditableItem_item {
flex: auto 1 0;
order: 1;
width: calc(100% - 14px); // leave space for the remove button
overflow-x: hidden;
text-overflow: ellipsis;
}
.mx_EditableItemList_label {

3
res/css/views/elements/_RichText.scss
View file

@ -12,7 +12,6 @@
border-radius: $font-16px;
line-height: $font-15px;
padding-left: 0;
padding-right: $font-5px;
}
a.mx_Pill {
@ -25,7 +24,7 @@ a.mx_Pill {
.mx_Pill {
padding: $font-1px;
padding-right: $font-6px;
padding-right: 0.4em;
}
/* More specific to override `.markdown-body a` color */