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

Merge remote-tracking branch 'upstream/develop' into feature/improved-composer

Browse source
This commit is contained in:
Šimon Brandner 2021-08-06 08:02:28 +02:00
commit 3677d0c5f2
No known key found for this signature in database
GPG key ID: CC823428E9B582FB
15 changed files with 180 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -271,7 +271,7 @@ limitations under the License.
display: flex;
align-items: center;
justify-content: start;
justify-content: flex-start;
padding: 5px 0;
.mx_EventTile_avatar {

17
res/css/views/rooms/_VoiceRecordComposerTile.scss
View file

@ -46,6 +46,21 @@ limitations under the License.
mask-image: url('$(res)/img/element-icons/trashcan.svg');
}
.mx_VoiceRecordComposerTile_uploadingState {
margin-right: 10px;
color: $secondary-fg-color;
}
.mx_VoiceRecordComposerTile_failedState {
margin-right: 21px;
.mx_VoiceRecordComposerTile_uploadState_badge {
display: inline-block;
margin-right: 4px;
vertical-align: middle;
}
}
.mx_MessageComposer_row .mx_VoiceMessagePrimaryContainer {
// Note: remaining class properties are in the PlayerContainer CSS.
@ -68,7 +83,7 @@ limitations under the License.
height: 10px;
position: absolute;
left: 12px; // 12px from the left edge for container padding
top: 18px; // vertically center (middle align with clock)
top: 16px; // vertically center (middle align with clock)
border-radius: 10px;
}
}