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

2
res/css/views/avatars/_MemberStatusMessageAvatar.scss
View file

@ -17,7 +17,7 @@ limitations under the License.
.mx_MessageComposer_avatar .mx_BaseAvatar {
padding: 2px;
border: 1px solid transparent;
border-radius: 15px;
border-radius: 100%;
}
.mx_MessageComposer_avatar .mx_BaseAvatar_initial {

6
res/css/views/context_menus/_TopLeftMenu.scss
View file

@ -72,10 +72,10 @@ limitations under the License.
.mx_AccessibleButton::after {
mask-repeat: no-repeat;
mask-position: 0 center;
mask-size: 16px;
mask-size: $font-16px;
position: absolute;
width: 16px;
height: 16px;
width: $font-16px;
height: $font-16px;
content: "";
top: 5px;
left: 14px;

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 */

6
res/css/views/right_panel/_UserInfo.scss
View file

@ -98,8 +98,8 @@ limitations under the License.
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
width: 100% !important;
height: 100% !important;
}
.mx_UserInfo_avatar .mx_BaseAvatar_initial {
@ -109,7 +109,7 @@ limitations under the License.
justify-content: center;
// override the calculated sizes so that the letter isn't HUGE
font-size: 56px !important;
font-size: 6rem !important;
width: 100% !important;
transition: font-size 0.5s;
}

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

@ -110,8 +110,11 @@ limitations under the License.
user-select: none;
}
.mx_EventTile_line, .mx_EventTile_reply {
.mx_EventTile_continuation .mx_EventTile_line {
clear: both;
}
.mx_EventTile_line, .mx_EventTile_reply {
position: relative;
padding-left: 65px; /* left gutter */
padding-top: 3px;