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

Merge branch 'develop' into feat/add-plain-text-mode

Browse source
This commit is contained in:
Florian Duros 2022-10-26 17:16:34 +02:00 • committed by GitHub
commit 423f87a43a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 1008 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

11
res/css/_components.pcss
View file

@ -4,7 +4,6 @@
@import "./_font-sizes.pcss";
@import "./_font-weights.pcss";
@import "./_spacing.pcss";
@import "./compound/_Icon.pcss";
@import "./components/views/beacon/_BeaconListItem.pcss";
@import "./components/views/beacon/_BeaconStatus.pcss";
@import "./components/views/beacon/_BeaconStatusTooltip.pcss";
@ -19,6 +18,7 @@
@import "./components/views/beacon/_StyledLiveBeaconIcon.pcss";
@import "./components/views/context_menus/_KebabContextMenu.pcss";
@import "./components/views/elements/_FilterDropdown.pcss";
@import "./components/views/elements/_LearnMore.pcss";
@import "./components/views/location/_EnableLiveShare.pcss";
@import "./components/views/location/_LiveDurationDropdown.pcss";
@import "./components/views/location/_LocationShareMenu.pcss";
@ -44,6 +44,7 @@
@import "./components/views/settings/shared/_SettingsSubsectionHeading.pcss";
@import "./components/views/spaces/_QuickThemeSwitcher.pcss";
@import "./components/views/typography/_Caption.pcss";
@import "./compound/_Icon.pcss";
@import "./structures/_AutoHideScrollbar.pcss";
@import "./structures/_BackdropPanel.pcss";
@import "./structures/_CompatibilityPage.pcss";
@ -299,10 +300,10 @@
@import "./views/rooms/_TopUnreadMessagesBar.pcss";
@import "./views/rooms/_VoiceRecordComposerTile.pcss";
@import "./views/rooms/_WhoIsTypingTile.pcss";
@import "./views/rooms/wysiwyg_composer/_EditWysiwygComposer.pcss";
@import "./views/rooms/wysiwyg_composer/_SendWysiwygComposer.pcss";
@import "./views/rooms/wysiwyg_composer/components/_Editor.pcss";
@import "./views/rooms/wysiwyg_composer/components/_FormattingButtons.pcss";
@import "./views/rooms/wysiwyg_composer/_SendWysiwygComposer.pcss";
@import "./views/rooms/wysiwyg_composer/_EditWysiwygComposer.pcss";
@import "./views/settings/_AvatarSetting.pcss";
@import "./views/settings/_CrossSigningPanel.pcss";
@import "./views/settings/_CryptographyPanel.pcss";
@ -373,6 +374,4 @@
@import "./voice-broadcast/atoms/_PlaybackControlButton.pcss";
@import "./voice-broadcast/atoms/_VoiceBroadcastControl.pcss";
@import "./voice-broadcast/atoms/_VoiceBroadcastHeader.pcss";
@import "./voice-broadcast/molecules/_VoiceBroadcastPlaybackBody.pcss";
@import "./voice-broadcast/molecules/_VoiceBroadcastRecordingBody.pcss";
@import "./voice-broadcast/molecules/_VoiceBroadcastRecordingPip.pcss";
@import "./voice-broadcast/molecules/_VoiceBroadcastBody.pcss";

12
res/css/voice-broadcast/molecules/_VoiceBroadcastPlaybackBody.pcss → res/css/components/views/elements/_LearnMore.pcss
View file

@ -14,14 +14,6 @@ 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;
.mx_LearnMore_button {
margin-left: $spacing-4;
}

2
res/css/views/dialogs/_SpotlightDialog.pcss
View file

@ -247,7 +247,7 @@ limitations under the License.
}
&.mx_SpotlightDialog_result_multiline {
align-items: start;
align-items: flex-start;
.mx_AccessibleButton {
padding: $spacing-4 $spacing-20;

2
res/css/views/elements/_UseCaseSelection.pcss
View file

@ -65,7 +65,7 @@ limitations under the License.
.mx_UseCaseSelection_skip {
display: flex;
flex-direction: column;
align-self: start;
align-self: flex-start;
}
}

2
res/css/views/rooms/wysiwyg_composer/components/_FormattingButtons.pcss
View file

@ -16,7 +16,7 @@ limitations under the License.
.mx_FormattingButtons {
display: flex;
justify-content: start;
justify-content: flex-start;
.mx_FormattingButtons_Button {
--size: 28px;

14
res/css/voice-broadcast/molecules/_VoiceBroadcastRecordingPip.pcss → res/css/voice-broadcast/molecules/_VoiceBroadcastBody.pcss
View file

@ -14,22 +14,26 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_VoiceBroadcastRecordingPip {
background-color: $system;
.mx_VoiceBroadcastBody {
background-color: $quinary-content;
border-radius: 8px;
box-shadow: 0 2px 8px 0 #0000004a;
display: inline-block;
padding: $spacing-12;
}
.mx_VoiceBroadcastRecordingPip_divider {
.mx_VoiceBroadcastBody--pip {
background-color: $system;
box-shadow: 0 2px 8px 0 #0000004a;
}
.mx_VoiceBroadcastBody_divider {
background-color: $quinary-content;
border: 0;
height: 1px;
margin: $spacing-12 0;
}
.mx_VoiceBroadcastRecordingPip_controls {
.mx_VoiceBroadcastBody_controls {
display: flex;
justify-content: space-around;
}

29
res/css/voice-broadcast/molecules/_VoiceBroadcastRecordingBody.pcss
View file

@ -1,29 +0,0 @@
/*
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_VoiceBroadcastRecordingBody {
align-items: flex-start;
background-color: $quinary-content;
border-radius: 8px;
display: inline-flex;
gap: $spacing-8;
padding: 12px;
}
.mx_VoiceBroadcastRecordingBody_title {
font-size: $font-12px;
font-weight: $font-semi-bold;
}