Jika/element-web
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge branch 'develop' into feat/add-formating-buttons-to-wysiwyg

Browse Source
This commit is contained in:
Florian Duros
2022-10-14 09:44:32 +02:00
committed by GitHub
parent 324d87699a 583d1b0318
commit 3ecd67aa80
28 changed files with 1156 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/css/_components.pcss
View File

@@ -366,5 +366,7 @@
@import "./views/voip/_PiPContainer.pcss";
@import "./views/voip/_VideoFeed.pcss";
@import "./voice-broadcast/atoms/_LiveBadge.pcss";
@import "./voice-broadcast/atoms/_PlaybackControlButton.pcss";
@import "./voice-broadcast/atoms/_VoiceBroadcastHeader.pcss";
@import "./voice-broadcast/molecules/_VoiceBroadcastPlaybackBody.pcss";
@import "./voice-broadcast/molecules/_VoiceBroadcastRecordingBody.pcss";

25
res/css/voice-broadcast/atoms/_PlaybackControlButton.pcss Normal file
View File

@@ -0,0 +1,25 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_BroadcastPlaybackControlButton {
align-items: center;
background-color: $background;
border-radius: 50%;
display: flex;
height: 32px;
justify-content: center;
width: 32px;
}

27
res/css/voice-broadcast/molecules/_VoiceBroadcastPlaybackBody.pcss Normal file
View File

@@ -0,0 +1,27 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_VoiceBroadcastPlaybackBody {
background-color: $quinary-content;
border-radius: 8px;
display: inline-block;
padding: 12px;
}
.mx_VoiceBroadcastPlaybackBody_controls {
display: flex;
justify-content: center;
}