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

Merge branch 'develop' into PlaybackContainer

Browse source
This commit is contained in:
Suguru Hirahara 2023-03-02 18:16:04 +00:00 • committed by GitHub
commit a0f1cb4c47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
307 changed files with 4618 additions and 3366 deletions
Download patch file Download diff file Expand all files Collapse all files

132
res/css/views/dialogs/_HostSignupDialog.pcss
View file

@ -1,132 +0,0 @@
/*
Copyright 2021 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_HostSignupDialog {
width: 90vw;
max-width: 580px;
height: 80vh;
max-height: 600px;
/* Ensure dialog borders are always white as the HostSignupDialog */
/* does not yet support dark mode or theming in general. */
/* In the future we might want to pass the theme to the called */
/* iframe, should some hosting provider have that need. */
background-color: #ffffff;
.mx_HostSignupDialog_info {
text-align: center;
.mx_HostSignupDialog_content_top {
margin-bottom: 24px;
}
.mx_HostSignupDialog_paragraphs {
text-align: left;
padding-left: 25%;
padding-right: 25%;
}
.mx_HostSignupDialog_buttons {
margin-bottom: 24px;
display: flex;
justify-content: center;
button {
padding: 12px;
margin: 0 16px;
}
}
.mx_HostSignupDialog_footer {
display: flex;
justify-content: center;
align-items: baseline;
img {
padding-right: 5px;
}
}
}
iframe {
width: 100%;
height: 100%;
border: none;
background-color: #fff;
min-height: 540px;
}
}
.mx_HostSignupDialog_text_dark {
color: $primary-content;
}
.mx_HostSignupDialog_text_light {
color: $secondary-content;
}
.mx_HostSignup_maximize_button {
mask: url("$(res)/img/element-icons/maximise-expand.svg");
mask-repeat: no-repeat;
mask-position: center;
mask-size: cover;
width: 14px;
height: 14px;
background-color: $dialog-close-fg-color;
cursor: pointer;
position: absolute;
top: 10px;
right: 10px;
}
.mx_HostSignup_minimize_button {
mask: url("$(res)/img/element-icons/minimise-collapse.svg");
mask-repeat: no-repeat;
mask-position: center;
mask-size: cover;
width: 14px;
height: 14px;
background-color: $dialog-close-fg-color;
cursor: pointer;
position: absolute;
top: 10px;
right: 25px;
}
.mx_HostSignupDialog_minimized {
position: fixed;
bottom: 80px;
right: 26px;
width: 314px;
height: 217px;
overflow: hidden;
&.mx_Dialog {
padding: 12px;
}
.mx_Dialog_title {
text-align: left !important;
padding-left: 20px;
font-size: $font-15px;
}
iframe {
width: 100%;
height: 100%;
border: none;
background-color: #fff;
}
}

14
res/css/views/dialogs/polls/_PollHistoryList.pcss
View file

@ -41,10 +41,20 @@ limitations under the License.
.mx_PollHistoryList_noResults {
height: 100%;
width: 100%;
box-sizing: border-box;
padding: 0 $spacing-64;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
text-align: center;
line-height: $font-24px;
color: $secondary-content;
.mx_PollHistoryList_loadMorePolls {
margin-top: $spacing-16;
}
}
.mx_PollHistoryList_loading {
@ -57,3 +67,7 @@ limitations under the License.
margin: auto auto;
}
}
.mx_PollHistoryList_loadMorePolls {
width: max-content;
}

3
res/css/views/messages/_MessageTimestamp.pcss
View file

@ -16,8 +16,9 @@ limitations under the License.
.mx_MessageTimestamp {
--MessageTimestamp-max-width: 80px;
--MessageTimestamp-color: $event-timestamp-color;
color: $event-timestamp-color;
color: var(--MessageTimestamp-color);
font-size: $font-10px;
font-variant-numeric: tabular-nums;
display: block; /* enable the width setting below */

2
res/css/views/right_panel/_ThreadPanel.pcss
View file

@ -130,7 +130,7 @@ limitations under the License.
}
.mx_MessageTimestamp {
color: $event-timestamp-color;
color: var(--MessageTimestamp-color); /* TODO: check whether needed or not */
}
.mx_BaseCard_footer {

7
res/css/views/rooms/_IRCLayout.pcss
View file

@ -130,12 +130,17 @@ $irc-line-height: $font-18px;
.mx_TextualEvent,
.mx_ViewSourceEvent,
.mx_MTextBody {
display: inline-block;
/* add a 1px padding top and bottom because our larger
emoji font otherwise gets cropped by anti-zalgo */
padding: var(--EventTile_irc_line-padding-block) 0;
}
.mx_EventTile_e2eIcon,
.mx_TextualEvent,
.mx_MTextBody {
display: inline-block;
}
.mx_ReplyTile {
.mx_MTextBody {
display: -webkit-box; /* Enable -webkit-line-clamp */

5
res/css/views/rooms/_RoomHeader.pcss
View file

@ -191,12 +191,13 @@ limitations under the License.
}
.mx_RoomHeader_button {
position: relative;
cursor: pointer;
flex: 0 0 auto;
margin-left: 1px;
margin-right: 1px;
cursor: pointer;
height: 32px;
width: 32px;
position: relative;
border-radius: 100%;
&::before {

10
res/css/views/rooms/wysiwyg_composer/components/_Editor.pcss
View file

@ -88,17 +88,17 @@ limitations under the License.
border-radius: 2px;
}
code {
code:not(pre *) {
font-family: $monospace-font-family !important;
background-color: $inlinecode-background-color;
border: 1px solid $inlinecode-border-color;
border-radius: 4px;
padding: $spacing-2;
}
code:empty {
border: unset;
padding: unset;
&:empty {
border: unset;
padding: unset;
}
}
}

1
res/css/views/settings/_IntegrationManager.pcss
View file

@ -17,6 +17,7 @@ limitations under the License.
.mx_IntegrationManager {
.mx_Dialog {
box-sizing: border-box;
padding: 0;
width: 60%;
height: 70%;
overflow: hidden;