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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088

Browse source 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
This commit is contained in:
Michael Telatynski 2021-09-06 11:41:09 +01:00
commit a688e5b8b3
318 changed files with 7386 additions and 4032 deletions
Download patch file Download diff file Expand all files Collapse all files

37
res/css/structures/_BackdropPanel.scss Normal file
View file

@ -0,0 +1,37 @@
/*
Copyright 2021 New Vector Ltd
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_BackdropPanel {
position: absolute;
left: 0;
top: 0;
height: 100vh;
width: 100%;
overflow: hidden;
filter: blur(var(--lp-background-blur));
// Force a new layer for the backdropPanel so it's better hardware supported
transform: translateZ(0);
}
.mx_BackdropPanel--image {
position: absolute;
top: 0;
left: 0;
min-height: 100%;
z-index: 0;
pointer-events: none;
overflow: hidden;
}

2
res/css/structures/_ContextualMenu.scss
View file

@ -34,7 +34,7 @@ limitations under the License.
border-radius: 8px;
box-shadow: 4px 4px 12px 0 $menu-box-shadow-color;
background-color: $menu-bg-color;
color: $primary-fg-color;
color: $primary-content;
position: absolute;
font-size: $font-14px;
z-index: 5001;

2
res/css/structures/_CreateRoom.scss
View file

@ -18,7 +18,7 @@ limitations under the License.
width: 960px;
margin-left: auto;
margin-right: auto;
color: $primary-fg-color;
color: $primary-content;
}
.mx_CreateRoom input,

23
res/css/structures/_GroupFilterPanel.scss
View file

@ -14,10 +14,27 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
$groupFilterPanelWidth: 56px; // only applies in this file, used for calculations
.mx_GroupFilterPanelContainer {
flex-grow: 0;
flex-shrink: 0;
width: $groupFilterPanelWidth;
height: 100%;
// Create another flexbox so the GroupFilterPanel fills the container
display: flex;
flex-direction: column;
// GroupFilterPanel handles its own CSS
}
.mx_GroupFilterPanel {
flex: 1;
z-index: 1;
background-color: $groupFilterPanel-bg-color;
flex: 1;
cursor: pointer;
position: relative;
display: flex;
flex-direction: column;
@ -69,13 +86,13 @@ limitations under the License.
}
.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_selected_prototype {
background-color: $primary-bg-color;
background-color: $background;
border-radius: 6px;
}
.mx_TagTile_selected_prototype {
.mx_TagTile_homeIcon::before {
background-color: $primary-fg-color; // dark-on-light
background-color: $primary-content; // dark-on-light
}
}

6
res/css/structures/_GroupView.scss
View file

@ -132,7 +132,7 @@ limitations under the License.
width: 100%;
height: 31px;
overflow: hidden;
color: $primary-fg-color;
color: $primary-content;
font-weight: bold;
font-size: $font-22px;
padding-left: 19px;
@ -397,7 +397,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
.mx_AccessibleButton_kind_link {
@ -422,7 +422,7 @@ limitations under the License.
mask-position: center;
mask-size: 8px;
mask-image: url('$(res)/img/image-view/close.svg');
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
}
}

55
res/css/structures/_LeftPanel.scss
View file

@ -14,31 +14,47 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
$groupFilterPanelWidth: 56px; // only applies in this file, used for calculations
$roomListCollapsedWidth: 68px;
.mx_MatrixChat--with-avatar {
.mx_LeftPanel,
.mx_LeftPanel .mx_LeftPanel_roomListContainer {
background-color: transparent;
}
}
.mx_LeftPanel_wrapper {
display: flex;
max-width: 50%;
position: relative;
// Contain the amount of layers rendered by constraining what actually needs re-layering via css
contain: layout paint;
.mx_LeftPanel_wrapper--user {
background-color: $roomlist-bg-color;
display: flex;
overflow: hidden;
position: relative;
&[data-collapsed] {
max-width: $roomListCollapsedWidth;
}
}
}
.mx_LeftPanel {
background-color: $roomlist-bg-color;
// TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
min-width: 206px;
max-width: 50%;
// Create a row-based flexbox for the GroupFilterPanel and the room list
display: flex;
contain: content;
.mx_LeftPanel_GroupFilterPanelContainer {
flex-grow: 0;
flex-shrink: 0;
flex-basis: $groupFilterPanelWidth;
height: 100%;
// Create another flexbox so the GroupFilterPanel fills the container
display: flex;
flex-direction: column;
// GroupFilterPanel handles its own CSS
}
position: relative;
flex-grow: 1;
overflow: hidden;
// Note: The 'room list' in this context is actually everything that isn't the tag
// panel, such as the menu options, breadcrumbs, filtering, etc
@ -130,7 +146,7 @@ $roomListCollapsedWidth: 68px;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $secondary-fg-color;
background: $secondary-content;
}
}
@ -153,7 +169,7 @@ $roomListCollapsedWidth: 68px;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $secondary-fg-color;
background: $secondary-content;
}
&.mx_LeftPanel_exploreButton_space::before {
@ -171,6 +187,8 @@ $roomListCollapsedWidth: 68px;
}
.mx_LeftPanel_roomListWrapper {
// Make the y-scrollbar more responsive
padding-right: 2px;
overflow: hidden;
margin-top: 10px; // so we're not up against the search/filter
flex: 1 0 0; // needed in Safari to properly set flex-basis
@ -192,6 +210,7 @@ $roomListCollapsedWidth: 68px;
// These styles override the defaults for the minimized (66px) layout
&.mx_LeftPanel_minimized {
flex-grow: 0;
min-width: unset;
width: unset !important;

2
res/css/structures/_LeftPanelWidget.scss
View file

@ -113,7 +113,7 @@ limitations under the License.
&:hover .mx_LeftPanelWidget_resizerHandle {
opacity: 0.8;
background-color: $primary-fg-color;
background-color: $primary-content;
}
.mx_LeftPanelWidget_maximizeButton {

2
res/css/structures/_MainSplit.scss
View file

@ -38,7 +38,7 @@ limitations under the License.
width: 4px !important;
border-radius: 4px !important;
background-color: $primary-fg-color;
background-color: $primary-content;
opacity: 0.8;
}
}

11
res/css/structures/_MatrixChat.scss
View file

@ -29,8 +29,6 @@ limitations under the License.
.mx_MatrixChat_wrapper {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
}
@ -42,13 +40,12 @@ limitations under the License.
}
.mx_MatrixChat {
position: relative;
width: 100%;
height: 100%;
display: flex;
order: 2;
flex: 1;
min-height: 0;
}
@ -66,8 +63,8 @@ limitations under the License.
}
/* not the left panel, and not the resize handle, so the roomview/groupview/... */
.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle) {
background-color: $primary-bg-color;
.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle):not(.mx_LeftPanel_wrapper) {
background-color: $background;
flex: 1 1 0;
min-width: 0;
@ -94,7 +91,7 @@ limitations under the License.
content: ' ';
background-color: $primary-fg-color;
background-color: $primary-content;
opacity: 0.8;
}
}

8
res/css/structures/_NotificationPanel.scss
View file

@ -49,7 +49,7 @@ limitations under the License.
bottom: 0;
left: 0;
right: 0;
background-color: $tertiary-fg-color;
background-color: $tertiary-content;
height: 1px;
opacity: 0.4;
content: '';
@ -70,7 +70,7 @@ limitations under the License.
}
.mx_NotificationPanel .mx_EventTile_roomName a {
color: $primary-fg-color;
color: $primary-content;
}
.mx_NotificationPanel .mx_EventTile_avatar {
@ -79,7 +79,7 @@ limitations under the License.
.mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
.mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
color: $primary-fg-color;
color: $primary-content;
font-size: $font-12px;
display: inline;
}
@ -118,7 +118,7 @@ limitations under the License.
}
.mx_NotificationPanel .mx_EventTile:hover .mx_EventTile_line {
background-color: $primary-bg-color;
background-color: $background;
}
.mx_NotificationPanel .mx_EventTile_content {

2
res/css/structures/_RightPanel.scss
View file

@ -43,7 +43,7 @@ limitations under the License.
.mx_RightPanel_headerButtonGroup {
height: 100%;
display: flex;
background-color: $primary-bg-color;
background-color: $background;
padding: 0 9px;
align-items: center;
}

8
res/css/structures/_RoomDirectory.scss
View file

@ -28,7 +28,7 @@ limitations under the License.
.mx_RoomDirectory {
margin-bottom: 12px;
color: $primary-fg-color;
color: $primary-content;
word-break: break-word;
display: flex;
flex-direction: column;
@ -71,14 +71,14 @@ limitations under the License.
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-18px;
color: $primary-fg-color;
color: $primary-content;
}
> p {
margin: 40px auto 60px;
font-size: $font-14px;
line-height: $font-20px;
color: $secondary-fg-color;
color: $secondary-content;
max-width: 464px; // easier reading
}
@ -97,7 +97,7 @@ limitations under the License.
}
.mx_RoomDirectory_table {
color: $primary-fg-color;
color: $primary-content;
display: grid;
font-size: $font-12px;
grid-template-columns: max-content auto max-content max-content max-content;

12
res/css/structures/_RoomSearch.scss
View file

@ -33,14 +33,14 @@ limitations under the License.
height: 16px;
mask: url('$(res)/img/element-icons/roomlist/search.svg');
mask-repeat: no-repeat;
background-color: $secondary-fg-color;
background-color: $secondary-content;
margin-left: 7px;
}
.mx_RoomSearch_input {
border: none !important; // !important to override default app-wide styles
flex: 1 !important; // !important to override default app-wide styles
color: $primary-fg-color !important; // !important to override default app-wide styles
color: $primary-content !important; // !important to override default app-wide styles
padding: 0;
height: 100%;
width: 100%;
@ -48,12 +48,12 @@ limitations under the License.
line-height: $font-16px;
&:not(.mx_RoomSearch_inputExpanded)::placeholder {
color: $tertiary-fg-color !important; // !important to override default app-wide styles
color: $tertiary-content !important; // !important to override default app-wide styles
}
}
&.mx_RoomSearch_hasQuery {
border-color: $secondary-fg-color;
border-color: $secondary-content;
}
&.mx_RoomSearch_focused {
@ -62,7 +62,7 @@ limitations under the License.
}
&.mx_RoomSearch_focused, &.mx_RoomSearch_hasQuery {
background-color: $roomlist-filter-active-bg-color;
background-color: $background;
.mx_RoomSearch_clearButton {
width: 16px;
@ -71,7 +71,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background-color: $secondary-fg-color;
background-color: $secondary-content;
margin-right: 8px;
}
}

10
res/css/structures/_RoomStatusBar.scss
View file

@ -27,7 +27,7 @@ limitations under the License.
.mx_RoomStatusBar_typingIndicatorAvatars .mx_BaseAvatar_image {
margin-right: -12px;
border: 1px solid $primary-bg-color;
border: 1px solid $background;
}
.mx_RoomStatusBar_typingIndicatorAvatars .mx_BaseAvatar_initial {
@ -39,7 +39,7 @@ limitations under the License.
display: inline-block;
color: #acacac;
background-color: #ddd;
border: 1px solid $primary-bg-color;
border: 1px solid $background;
border-radius: 40px;
width: 24px;
height: 24px;
@ -171,14 +171,14 @@ limitations under the License.
}
.mx_RoomStatusBar_connectionLostBar_desc {
color: $primary-fg-color;
color: $primary-content;
font-size: $font-13px;
opacity: 0.5;
padding-bottom: 20px;
}
.mx_RoomStatusBar_resend_link {
color: $primary-fg-color !important;
color: $primary-content !important;
text-decoration: underline !important;
cursor: pointer;
}
@ -187,7 +187,7 @@ limitations under the License.
height: 50px;
line-height: $font-50px;
color: $primary-fg-color;
color: $primary-content;
opacity: 0.5;
overflow-y: hidden;
display: block;

21
res/css/structures/_RoomView.scss
View file

@ -14,10 +14,22 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_RoomView_wrapper {
display: flex;
flex-direction: column;
flex: 1;
position: relative;
justify-content: center;
// Contain the amount of layers rendered by constraining what actually needs re-layering via css
contain: strict;
}
.mx_RoomView {
word-wrap: break-word;
display: flex;
flex-direction: column;
flex: 1;
position: relative;
}
@ -40,7 +52,7 @@ limitations under the License.
pointer-events: none;
background-color: $primary-bg-color;
background-color: $background;
opacity: 0.95;
position: absolute;
@ -87,7 +99,7 @@ limitations under the License.
left: 0;
right: 0;
z-index: 3000;
background-color: $primary-bg-color;
background-color: $background;
}
.mx_RoomView_auxPanel_hiddenHighlights {
@ -153,7 +165,6 @@ limitations under the License.
flex: 1;
display: flex;
flex-direction: column;
contain: content;
}
.mx_RoomView_statusArea {
@ -161,7 +172,7 @@ limitations under the License.
flex: 0 0 auto;
max-height: 0px;
background-color: $primary-bg-color;
background-color: $background;
z-index: 1000;
overflow: hidden;
@ -246,7 +257,7 @@ hr.mx_RoomView_myReadMarker {
}
.mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner {
background-color: $primary-bg-color;
background-color: $background;
}
.mx_RoomView_callStatusBar .mx_UploadBar_uploadFilename {

1
res/css/structures/_ScrollPanel.scss
View file

@ -15,7 +15,6 @@ limitations under the License.
*/
.mx_ScrollPanel {
.mx_RoomView_MessageList {
position: relative;
display: flex;

86
res/css/structures/_SpaceRoomDirectory.scss → res/css/structures/_SpaceHierarchy.scss
View file

@ -14,21 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_SpaceRoomDirectory_dialogWrapper > .mx_Dialog {
max-width: 960px;
height: 100%;
}
.mx_SpaceRoomDirectory {
height: 100%;
margin-bottom: 12px;
color: $primary-fg-color;
word-break: break-word;
display: flex;
flex-direction: column;
}
.mx_SpaceRoomDirectory,
.mx_SpaceRoomView_landing {
.mx_Dialog_title {
display: flex;
@ -52,7 +37,7 @@ limitations under the License.
> div {
font-weight: 400;
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-15px;
line-height: $font-24px;
}
@ -68,23 +53,29 @@ limitations under the License.
margin: 24px 0 16px;
}
.mx_SpaceRoomDirectory_noResults {
.mx_SpaceHierarchy_noResults {
text-align: center;
> div {
font-size: $font-15px;
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
.mx_SpaceRoomDirectory_listHeader {
.mx_SpaceHierarchy_listHeader {
display: flex;
min-height: 32px;
align-items: center;
font-size: $font-15px;
line-height: $font-24px;
color: $primary-fg-color;
color: $primary-content;
margin-bottom: 12px;
> h4 {
font-weight: $font-semi-bold;
margin: 0;
}
.mx_AccessibleButton {
padding: 4px 12px;
@ -105,7 +96,7 @@ limitations under the License.
}
}
.mx_SpaceRoomDirectory_error {
.mx_SpaceHierarchy_error {
position: relative;
font-weight: $font-semi-bold;
color: $notice-primary-color;
@ -124,43 +115,44 @@ limitations under the License.
background-image: url("$(res)/img/element-icons/warning-badge.svg");
}
}
}
.mx_SpaceRoomDirectory_list {
margin-top: 16px;
padding-bottom: 40px;
.mx_SpaceHierarchy_list {
list-style: none;
padding: 0;
margin: 0;
}
.mx_SpaceRoomDirectory_roomCount {
.mx_SpaceHierarchy_roomCount {
> h3 {
display: inline;
font-weight: $font-semi-bold;
font-size: $font-18px;
line-height: $font-22px;
color: $primary-fg-color;
color: $primary-content;
}
> span {
margin-left: 8px;
font-size: $font-15px;
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
.mx_SpaceRoomDirectory_subspace {
.mx_SpaceHierarchy_subspace {
.mx_BaseAvatar_image {
border-radius: 8px;
}
}
.mx_SpaceRoomDirectory_subspace_toggle {
.mx_SpaceHierarchy_subspace_toggle {
position: absolute;
left: -1px;
top: 10px;
height: 16px;
width: 16px;
border-radius: 4px;
background-color: $primary-bg-color;
background-color: $background;
&::before {
content: '';
@ -171,23 +163,23 @@ limitations under the License.
width: 16px;
mask-repeat: no-repeat;
mask-position: center;
background-color: $tertiary-fg-color;
background-color: $tertiary-content;
mask-size: 16px;
transform: rotate(270deg);
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
}
&.mx_SpaceRoomDirectory_subspace_toggle_shown::before {
&.mx_SpaceHierarchy_subspace_toggle_shown::before {
transform: rotate(0deg);
}
}
.mx_SpaceRoomDirectory_subspace_children {
.mx_SpaceHierarchy_subspace_children {
position: relative;
padding-left: 12px;
}
.mx_SpaceRoomDirectory_roomTile {
.mx_SpaceHierarchy_roomTile {
position: relative;
padding: 8px 16px;
border-radius: 8px;
@ -204,7 +196,7 @@ limitations under the License.
grid-column: 1;
}
.mx_SpaceRoomDirectory_roomTile_name {
.mx_SpaceHierarchy_roomTile_name {
font-weight: $font-semi-bold;
font-size: $font-15px;
line-height: $font-18px;
@ -214,7 +206,7 @@ limitations under the License.
.mx_InfoTooltip {
display: inline;
margin-left: 12px;
color: $tertiary-fg-color;
color: $tertiary-content;
font-size: $font-12px;
line-height: $font-15px;
@ -232,10 +224,10 @@ limitations under the License.
}
}
.mx_SpaceRoomDirectory_roomTile_info {
.mx_SpaceHierarchy_roomTile_info {
font-size: $font-14px;
line-height: $font-18px;
color: $secondary-fg-color;
color: $secondary-content;
grid-row: 2;
grid-column: 1/3;
display: -webkit-box;
@ -244,7 +236,7 @@ limitations under the License.
overflow: hidden;
}
.mx_SpaceRoomDirectory_actions {
.mx_SpaceHierarchy_actions {
text-align: right;
margin-left: 20px;
grid-column: 3;
@ -278,12 +270,12 @@ limitations under the License.
}
}
li.mx_SpaceRoomDirectory_roomTileWrapper {
li.mx_SpaceHierarchy_roomTileWrapper {
list-style: none;
}
.mx_SpaceRoomDirectory_roomTile,
.mx_SpaceRoomDirectory_subspace_children {
.mx_SpaceHierarchy_roomTile,
.mx_SpaceHierarchy_subspace_children {
&::before {
content: "";
position: absolute;
@ -295,12 +287,12 @@ limitations under the License.
}
}
.mx_SpaceRoomDirectory_actions {
.mx_SpaceRoomDirectory_actionsText {
.mx_SpaceHierarchy_actions {
.mx_SpaceHierarchy_actionsText {
font-weight: normal;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
@ -311,7 +303,7 @@ limitations under the License.
margin: 20px 0;
}
.mx_SpaceRoomDirectory_createRoom {
.mx_SpaceHierarchy_createRoom {
display: block;
margin: 16px auto 0;
width: max-content;

9
res/css/structures/_SpacePanel.scss
View file

@ -20,13 +20,16 @@ $gutterSize: 16px;
$activeBorderTransparentGap: 1px;
$activeBackgroundColor: $roomtile-selected-bg-color;
$activeBorderColor: $secondary-fg-color;
$activeBorderColor: $secondary-content;
.mx_SpacePanel {
flex: 0 0 auto;
background-color: $groupFilterPanel-bg-color;
flex: 0 0 auto;
padding: 0;
margin: 0;
position: relative;
// Fix for the blurred avatar-background
z-index: 1;
// Create another flexbox so the Panel fills the container
display: flex;
@ -240,7 +243,7 @@ $activeBorderColor: $secondary-fg-color;
mask-size: contain;
mask-repeat: no-repeat;
mask-image: url('$(res)/img/element-icons/context-menu.svg');
background: $primary-fg-color;
background: $primary-content;
}
}
}

45
res/css/structures/_SpaceRoomView.scss
View file

@ -32,7 +32,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
> span {
color: $secondary-fg-color;
color: $secondary-content;
}
&::before {
@ -45,7 +45,7 @@ $SpaceRoomViewInnerWidth: 428px;
mask-position: center;
mask-repeat: no-repeat;
mask-size: 24px;
background-color: $tertiary-fg-color;
background-color: $tertiary-content;
}
&:hover {
@ -56,12 +56,15 @@ $SpaceRoomViewInnerWidth: 428px;
}
> span {
color: $primary-fg-color;
color: $primary-content;
}
}
}
.mx_SpaceRoomView {
overflow-y: auto;
flex: 1;
.mx_MainSplit > div:first-child {
padding: 80px 60px;
flex-grow: 1;
@ -72,13 +75,13 @@ $SpaceRoomViewInnerWidth: 428px;
margin: 0;
font-size: $font-24px;
font-weight: $font-semi-bold;
color: $primary-fg-color;
color: $primary-content;
width: max-content;
}
.mx_SpaceRoomView_description {
font-size: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
margin-top: 12px;
margin-bottom: 24px;
max-width: $SpaceRoomViewInnerWidth;
@ -154,7 +157,7 @@ $SpaceRoomViewInnerWidth: 428px;
font-weight: $font-semi-bold;
font-size: $font-14px;
line-height: $font-24px;
color: $primary-fg-color;
color: $primary-content;
margin-top: 24px;
position: relative;
padding-left: 24px;
@ -176,7 +179,7 @@ $SpaceRoomViewInnerWidth: 428px;
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
}
@ -207,7 +210,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_preview_inviter_mxid {
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
}
@ -225,7 +228,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_preview_topic {
font-size: $font-14px;
line-height: $font-22px;
color: $secondary-fg-color;
color: $secondary-content;
margin: 20px 0;
max-height: 160px;
overflow-y: auto;
@ -249,6 +252,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_landing {
display: flex;
flex-direction: column;
min-width: 0;
> .mx_BaseAvatar_image,
> .mx_BaseAvatar > .mx_BaseAvatar_image {
@ -258,7 +262,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_landing_name {
margin: 24px 0 16px;
font-size: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
> span {
display: inline-block;
@ -331,7 +335,7 @@ $SpaceRoomViewInnerWidth: 428px;
top: 0;
height: 24px;
width: 24px;
background: $tertiary-fg-color;
background: $tertiary-content;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
@ -355,16 +359,11 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceFeedbackPrompt {
padding: 7px; // 8px - 1px border
border: 1px solid rgba($primary-fg-color, .1);
border: 1px solid rgba($primary-content, .1);
border-radius: 8px;
width: max-content;
margin: 0 0 -40px auto; // collapse its own height to not push other components down
}
.mx_SpaceRoomDirectory_list {
// we don't want this container to get forced into the flexbox layout
display: contents;
}
}
.mx_SpaceRoomView_privateScope {
@ -389,7 +388,7 @@ $SpaceRoomViewInnerWidth: 428px;
width: 432px;
border-radius: 8px;
background-color: $info-plinth-bg-color;
color: $secondary-fg-color;
color: $secondary-content;
box-sizing: border-box;
> h3 {
@ -416,7 +415,7 @@ $SpaceRoomViewInnerWidth: 428px;
position: absolute;
top: 14px;
left: 14px;
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
}
@ -439,7 +438,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
.mx_SpaceRoomView_inviteTeammates_buttons {
color: $secondary-fg-color;
color: $secondary-content;
margin-top: 28px;
.mx_AccessibleButton {
@ -455,7 +454,7 @@ $SpaceRoomViewInnerWidth: 428px;
width: 24px;
top: 0;
left: 0;
background-color: $secondary-fg-color;
background-color: $secondary-content;
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
@ -474,7 +473,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
.mx_SpaceRoomView_info {
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-15px;
line-height: $font-24px;
margin: 20px 0;
@ -493,7 +492,7 @@ $SpaceRoomViewInnerWidth: 428px;
left: -2px;
mask-position: center;
mask-repeat: no-repeat;
background-color: $tertiary-fg-color;
background-color: $tertiary-content;
}
}

2
res/css/structures/_TabbedView.scss
View file

@ -80,7 +80,7 @@ limitations under the License.
.mx_TabbedView_tabLabel_text {
font-size: 15px;
color: $tertiary-fg-color;
color: $tertiary-content;
}
}

12
res/css/structures/_ToastContainer.scss
View file

@ -28,7 +28,7 @@ limitations under the License.
margin: 0 4px;
grid-row: 2 / 4;
grid-column: 1;
background-color: $toast-bg-color;
background-color: $system;
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.5);
border-radius: 8px;
}
@ -36,8 +36,8 @@ limitations under the License.
.mx_Toast_toast {
grid-row: 1 / 3;
grid-column: 1;
color: $primary-fg-color;
background-color: $toast-bg-color;
background-color: $system;
color: $primary-content;
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.5);
border-radius: 8px;
overflow: hidden;
@ -63,7 +63,7 @@ limitations under the License.
&.mx_Toast_icon_verification::after {
mask-image: url("$(res)/img/e2e/normal.svg");
background-color: $primary-fg-color;
background-color: $primary-content;
}
&.mx_Toast_icon_verification_warning {
@ -82,7 +82,7 @@ limitations under the License.
&.mx_Toast_icon_secure_backup::after {
mask-image: url('$(res)/img/feather-customised/secure-backup.svg');
background-color: $primary-fg-color;
background-color: $primary-content;
}
.mx_Toast_title, .mx_Toast_body {
@ -163,7 +163,7 @@ limitations under the License.
}
.mx_Toast_detail {
color: $secondary-fg-color;
color: $secondary-content;
}
.mx_Toast_deviceID {

8
res/css/structures/_UserMenu.scss
View file

@ -35,7 +35,7 @@ limitations under the License.
// we cheat opacity on the theme colour with an after selector here
&::after {
content: '';
border-bottom: 1px solid $primary-fg-color; // XXX: Variable abuse
border-bottom: 1px solid $primary-content;
opacity: 0.2;
display: block;
padding-top: 8px;
@ -58,7 +58,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $tertiary-fg-color;
background: $tertiary-content;
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
}
}
@ -176,7 +176,7 @@ limitations under the License.
width: 85%;
opacity: 0.2;
border: none;
border-bottom: 1px solid $primary-fg-color; // XXX: Variable abuse
border-bottom: 1px solid $primary-content;
}
&.mx_IconizedContextMenu {
@ -292,7 +292,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $primary-fg-color;
background: $primary-content;
}
}

2
res/css/structures/_ViewSource.scss
View file

@ -24,7 +24,7 @@ limitations under the License.
.mx_ViewSource_heading {
font-size: $font-17px;
font-weight: 400;
color: $primary-fg-color;
color: $primary-content;
margin-top: 0.7em;
}

7
res/css/structures/auth/_Login.scss
View file

@ -96,3 +96,10 @@ div.mx_AccessibleButton_kind_link.mx_Login_forgot {
cursor: not-allowed;
}
}
.mx_Login_spinner {
display: flex;
justify-content: center;
align-items: center;
align-content: center;
padding: 14px;
}