OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

$primary-fg-color -> $primary-content 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2021-08-12 11:27:12 +02:00
parent 9ecd3b03f1
commit e5fd19c332
No known key found for this signature in database
GPG Key ID: 55C211A1226CB17D
81 changed files with 140 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
res/css/_common.scss
View File

@ -54,7 +54,7 @@ body {
font-family: $font-family; font-family: $font-family;
font-size: $font-15px; font-size: $font-15px;
background-color: $background; background-color: $background;
color: $primary-fg-color; color: $primary-content;
border: 0px; border: 0px;
margin: 0px; margin: 0px;
@ -89,7 +89,7 @@ b {
} }
h2 { h2 {
color: $primary-fg-color; color: $primary-content;
font-weight: 400; font-weight: 400;
font-size: $font-18px; font-size: $font-18px;
margin-top: 16px; margin-top: 16px;
@ -142,12 +142,12 @@ textarea::placeholder {
input[type=text], input[type=password], textarea { input[type=text], input[type=password], textarea {
background-color: transparent; background-color: transparent;
color: $primary-fg-color; color: $primary-content;
} }
/* Required by Firefox */ /* Required by Firefox */
textarea { textarea {
color: $primary-fg-color; color: $primary-content;
} }
input[type=text]:focus, input[type=password]:focus, textarea:focus { input[type=text]:focus, input[type=password]:focus, textarea:focus {
@ -173,7 +173,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
.mx_textinput > input[type=search] { .mx_textinput > input[type=search] {
border: none; border: none;
flex: 1; flex: 1;
color: $primary-fg-color; color: $primary-content;
} }
:not(.mx_textinput):not(.mx_Field):not(.mx_no_textinput) > input[type=text], :not(.mx_textinput):not(.mx_Field):not(.mx_no_textinput) > input[type=text],
@ -184,7 +184,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
background-color: transparent; background-color: transparent;
color: $input-darker-fg-color; color: $input-darker-fg-color;
border-radius: 4px; border-radius: 4px;
border: 1px solid rgba($primary-fg-color, .1); border: 1px solid rgba($primary-content, .1);
// these things should probably not be defined globally // these things should probably not be defined globally
margin: 9px; margin: 9px;
} }
@ -379,7 +379,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
.mx_Dialog_content { .mx_Dialog_content {
margin: 24px 0 68px; margin: 24px 0 68px;
font-size: $font-14px; font-size: $font-14px;
color: $primary-fg-color; color: $primary-content;
word-wrap: break-word; word-wrap: break-word;
} }
@ -488,7 +488,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
border-radius: 3px; border-radius: 3px;
border: 1px solid $input-border-color; border: 1px solid $input-border-color;
padding: 9px; padding: 9px;
color: $primary-fg-color; color: $primary-content;
background-color: $background; background-color: $background;
} }

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

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

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

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

2
res/css/structures/_GroupFilterPanel.scss
View File

@ -81,7 +81,7 @@ limitations under the License.
.mx_TagTile_selected_prototype { .mx_TagTile_selected_prototype {
.mx_TagTile_homeIcon::before { .mx_TagTile_homeIcon::before {
background-color: $primary-fg-color; // dark-on-light background-color: $primary-content; // dark-on-light
} }
} }

2
res/css/structures/_GroupView.scss
View File

@ -132,7 +132,7 @@ limitations under the License.
width: 100%; width: 100%;
height: 31px; height: 31px;
overflow: hidden; overflow: hidden;
color: $primary-fg-color; color: $primary-content;
font-weight: bold; font-weight: bold;
font-size: $font-22px; font-size: $font-22px;
padding-left: 19px; padding-left: 19px;

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

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

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

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

2
res/css/structures/_MatrixChat.scss
View File

@ -94,7 +94,7 @@ limitations under the License.
content: ' '; content: ' ';
background-color: $primary-fg-color; background-color: $primary-content;
opacity: 0.8; opacity: 0.8;
} }
} }

4
res/css/structures/_NotificationPanel.scss
View File

@ -70,7 +70,7 @@ limitations under the License.
} }
.mx_NotificationPanel .mx_EventTile_roomName a { .mx_NotificationPanel .mx_EventTile_roomName a {
color: $primary-fg-color; color: $primary-content;
} }
.mx_NotificationPanel .mx_EventTile_avatar { .mx_NotificationPanel .mx_EventTile_avatar {
@ -79,7 +79,7 @@ limitations under the License.
.mx_NotificationPanel .mx_EventTile .mx_SenderProfile, .mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
.mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp { .mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
color: $primary-fg-color; color: $primary-content;
font-size: $font-12px; font-size: $font-12px;
display: inline; display: inline;
} }

6
res/css/structures/_RoomDirectory.scss
View File

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

2
res/css/structures/_RoomSearch.scss
View File

@ -40,7 +40,7 @@ limitations under the License.
.mx_RoomSearch_input { .mx_RoomSearch_input {
border: none !important; // !important to override default app-wide styles border: none !important; // !important to override default app-wide styles
flex: 1 !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; padding: 0;
height: 100%; height: 100%;
width: 100%; width: 100%;

6
res/css/structures/_RoomStatusBar.scss
View File

@ -171,14 +171,14 @@ limitations under the License.
} }
.mx_RoomStatusBar_connectionLostBar_desc { .mx_RoomStatusBar_connectionLostBar_desc {
color: $primary-fg-color; color: $primary-content;
font-size: $font-13px; font-size: $font-13px;
opacity: 0.5; opacity: 0.5;
padding-bottom: 20px; padding-bottom: 20px;
} }
.mx_RoomStatusBar_resend_link { .mx_RoomStatusBar_resend_link {
color: $primary-fg-color !important; color: $primary-content !important;
text-decoration: underline !important; text-decoration: underline !important;
cursor: pointer; cursor: pointer;
} }
@ -187,7 +187,7 @@ limitations under the License.
height: 50px; height: 50px;
line-height: $font-50px; line-height: $font-50px;
color: $primary-fg-color; color: $primary-content;
opacity: 0.5; opacity: 0.5;
overflow-y: hidden; overflow-y: hidden;
display: block; display: block;

2
res/css/structures/_SpacePanel.scss
View File

@ -235,7 +235,7 @@ $activeBorderColor: $secondary-fg-color;
mask-size: contain; mask-size: contain;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-image: url('$(res)/img/element-icons/context-menu.svg'); mask-image: url('$(res)/img/element-icons/context-menu.svg');
background: $primary-fg-color; background: $primary-content;
} }
} }
} }

6
res/css/structures/_SpaceRoomDirectory.scss
View File

@ -22,7 +22,7 @@ limitations under the License.
.mx_SpaceRoomDirectory { .mx_SpaceRoomDirectory {
height: 100%; height: 100%;
margin-bottom: 12px; margin-bottom: 12px;
color: $primary-fg-color; color: $primary-content;
word-break: break-word; word-break: break-word;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -84,7 +84,7 @@ limitations under the License.
align-items: center; align-items: center;
font-size: $font-15px; font-size: $font-15px;
line-height: $font-24px; line-height: $font-24px;
color: $primary-fg-color; color: $primary-content;
.mx_AccessibleButton { .mx_AccessibleButton {
padding: 4px 12px; padding: 4px 12px;
@ -136,7 +136,7 @@ limitations under the License.
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
font-size: $font-18px; font-size: $font-18px;
line-height: $font-22px; line-height: $font-22px;
color: $primary-fg-color; color: $primary-content;
} }
> span { > span {

8
res/css/structures/_SpaceRoomView.scss
View File

@ -56,7 +56,7 @@ $SpaceRoomViewInnerWidth: 428px;
} }
> span { > span {
color: $primary-fg-color; color: $primary-content;
} }
} }
} }
@ -72,7 +72,7 @@ $SpaceRoomViewInnerWidth: 428px;
margin: 0; margin: 0;
font-size: $font-24px; font-size: $font-24px;
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
color: $primary-fg-color; color: $primary-content;
width: max-content; width: max-content;
} }
@ -154,7 +154,7 @@ $SpaceRoomViewInnerWidth: 428px;
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
font-size: $font-14px; font-size: $font-14px;
line-height: $font-24px; line-height: $font-24px;
color: $primary-fg-color; color: $primary-content;
margin-top: 24px; margin-top: 24px;
position: relative; position: relative;
padding-left: 24px; padding-left: 24px;
@ -354,7 +354,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceFeedbackPrompt { .mx_SpaceFeedbackPrompt {
padding: 7px; // 8px - 1px border padding: 7px; // 8px - 1px border
border: 1px solid rgba($primary-fg-color, .1); border: 1px solid rgba($primary-content, .1);
border-radius: 8px; border-radius: 8px;
width: max-content; width: max-content;
margin: 0 0 -40px auto; // collapse its own height to not push other components down margin: 0 0 -40px auto; // collapse its own height to not push other components down

6
res/css/structures/_ToastContainer.scss
View File

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

6
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 // we cheat opacity on the theme colour with an after selector here
&::after { &::after {
content: ''; content: '';
border-bottom: 1px solid $primary-fg-color; // XXX: Variable abuse border-bottom: 1px solid $primary-content; // XXX: Variable abuse
opacity: 0.2; opacity: 0.2;
display: block; display: block;
padding-top: 8px; padding-top: 8px;
@ -176,7 +176,7 @@ limitations under the License.
width: 85%; width: 85%;
opacity: 0.2; opacity: 0.2;
border: none; border: none;
border-bottom: 1px solid $primary-fg-color; // XXX: Variable abuse border-bottom: 1px solid $primary-content; // XXX: Variable abuse
} }
&.mx_IconizedContextMenu { &.mx_IconizedContextMenu {
@ -292,7 +292,7 @@ limitations under the License.
mask-position: center; mask-position: center;
mask-size: contain; mask-size: contain;
mask-repeat: no-repeat; 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 { .mx_ViewSource_heading {
font-size: $font-17px; font-size: $font-17px;
font-weight: 400; font-weight: 400;
color: $primary-fg-color; color: $primary-content;
margin-top: 0.7em; margin-top: 0.7em;
} }

2
res/css/views/audio_messages/_AudioPlayer.scss
View File

@ -33,7 +33,7 @@ limitations under the License.
} }
.mx_AudioPlayer_mediaName { .mx_AudioPlayer_mediaName {
color: $primary-fg-color; color: $primary-content;
font-size: $font-15px; font-size: $font-15px;
line-height: $font-15px; line-height: $font-15px;
text-overflow: ellipsis; text-overflow: ellipsis;

4
res/css/views/beta/_BetaCard.scss
View File

@ -29,7 +29,7 @@ limitations under the License.
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
font-size: $font-18px; font-size: $font-18px;
line-height: $font-22px; line-height: $font-22px;
color: $primary-fg-color; color: $primary-content;
margin: 4px 0 14px; margin: 4px 0 14px;
.mx_BetaCard_betaPill { .mx_BetaCard_betaPill {
@ -72,7 +72,7 @@ limitations under the License.
margin: 16px 0 0; margin: 16px 0 0;
font-size: $font-15px; font-size: $font-15px;
line-height: $font-24px; line-height: $font-24px;
color: $primary-fg-color; color: $primary-content;
.mx_SettingsFlag_microcopy { .mx_SettingsFlag_microcopy {
margin-top: 4px; margin-top: 4px;

6
res/css/views/context_menus/_IconizedContextMenu.scss
View File

@ -36,7 +36,7 @@ limitations under the License.
// //
// Therefore, we just hack in a line and border the thing ourselves // Therefore, we just hack in a line and border the thing ourselves
&::before { &::before {
border-top: 1px solid $primary-fg-color; border-top: 1px solid $primary-content;
opacity: 0.1; opacity: 0.1;
content: ''; content: '';
@ -63,7 +63,7 @@ limitations under the License.
padding-top: 12px; padding-top: 12px;
padding-bottom: 12px; padding-bottom: 12px;
text-decoration: none; text-decoration: none;
color: $primary-fg-color; color: $primary-content;
font-size: $font-15px; font-size: $font-15px;
line-height: $font-24px; line-height: $font-24px;
@ -119,7 +119,7 @@ limitations under the License.
mask-position: center; mask-position: center;
mask-size: contain; mask-size: contain;
mask-repeat: no-repeat; mask-repeat: no-repeat;
background: $primary-fg-color; background: $primary-content;
} }
} }

2
res/css/views/context_menus/_MessageContextMenu.scss
View File

@ -30,7 +30,7 @@ limitations under the License.
mask-position: center; mask-position: center;
mask-size: contain; mask-size: contain;
mask-repeat: no-repeat; mask-repeat: no-repeat;
background: $primary-fg-color; background: $primary-content;
} }
} }

8
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
View File

@ -79,7 +79,7 @@ limitations under the License.
margin-top: 8px; margin-top: 8px;
font-size: $font-15px; font-size: $font-15px;
line-height: $font-24px; line-height: $font-24px;
color: $primary-fg-color; color: $primary-content;
} }
> * { > * {
@ -105,7 +105,7 @@ limitations under the License.
margin-top: 4px; margin-top: 4px;
font-size: $font-12px; font-size: $font-12px;
line-height: $font-15px; line-height: $font-15px;
color: $primary-fg-color; color: $primary-content;
} }
} }
@ -126,7 +126,7 @@ limitations under the License.
&::before { &::before {
content: ''; content: '';
position: absolute; position: absolute;
background-color: $primary-fg-color; background-color: $primary-content;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-position: center; mask-position: center;
mask-size: contain; mask-size: contain;
@ -145,7 +145,7 @@ limitations under the License.
.mx_AddExistingToSpaceDialog { .mx_AddExistingToSpaceDialog {
width: 480px; width: 480px;
color: $primary-fg-color; color: $primary-content;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-wrap: nowrap; flex-wrap: nowrap;

2
res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss
View File

@ -65,7 +65,7 @@ limitations under the License.
.mx_CommunityPrototypeInviteDialog_personName { .mx_CommunityPrototypeInviteDialog_personName {
font-weight: 600; font-weight: 600;
font-size: $font-14px; font-size: $font-14px;
color: $primary-fg-color; color: $primary-content;
margin-left: 7px; margin-left: 7px;
} }

2
res/css/views/dialogs/_ConfirmUserActionDialog.scss
View File

@ -35,7 +35,7 @@ limitations under the License.
.mx_ConfirmUserActionDialog_reasonField { .mx_ConfirmUserActionDialog_reasonField {
font-size: $font-14px; font-size: $font-14px;
color: $primary-fg-color; color: $primary-content;
background-color: $background; background-color: $background;
border-radius: 3px; border-radius: 3px;

2
res/css/views/dialogs/_CreateGroupDialog.scss
View File

@ -29,7 +29,7 @@ limitations under the License.
border-radius: 3px; border-radius: 3px;
border: 1px solid $input-border-color; border: 1px solid $input-border-color;
padding: 9px; padding: 9px;
color: $primary-fg-color; color: $primary-content;
background-color: $background; background-color: $background;
} }

2
res/css/views/dialogs/_CreateRoomDialog.scss
View File

@ -55,7 +55,7 @@ limitations under the License.
border-radius: 3px; border-radius: 3px;
border: 1px solid $input-border-color; border: 1px solid $input-border-color;
padding: 9px; padding: 9px;
color: $primary-fg-color; color: $primary-content;
background-color: $background; background-color: $background;
width: 100%; width: 100%;
} }

8
res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
View File

@ -23,7 +23,7 @@ limitations under the License.
.mx_CreateSpaceFromCommunityDialog { .mx_CreateSpaceFromCommunityDialog {
width: 480px; width: 480px;
color: $primary-fg-color; color: $primary-content;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -86,7 +86,7 @@ limitations under the License.
margin-top: 8px; margin-top: 8px;
font-size: $font-15px; font-size: $font-15px;
line-height: $font-24px; line-height: $font-24px;
color: $primary-fg-color; color: $primary-content;
} }
> * { > * {
@ -112,7 +112,7 @@ limitations under the License.
margin-top: 4px; margin-top: 4px;
font-size: $font-12px; font-size: $font-12px;
line-height: $font-15px; line-height: $font-15px;
color: $primary-fg-color; color: $primary-content;
} }
} }
@ -138,7 +138,7 @@ limitations under the License.
&::before { &::before {
content: ''; content: '';
position: absolute; position: absolute;
background-color: $primary-fg-color; background-color: $primary-content;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-position: center; mask-position: center;
mask-size: contain; mask-size: contain;

2
res/css/views/dialogs/_CreateSubspaceDialog.scss
View File

@ -23,7 +23,7 @@ limitations under the License.
.mx_CreateSubspaceDialog { .mx_CreateSubspaceDialog {
width: 480px; width: 480px;
color: $primary-fg-color; color: $primary-content;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-wrap: nowrap; flex-wrap: nowrap;

2
res/css/views/dialogs/_ForwardDialog.scss
View File

@ -16,7 +16,7 @@ limitations under the License.
.mx_ForwardDialog { .mx_ForwardDialog {
width: 520px; width: 520px;
color: $primary-fg-color; color: $primary-content;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-wrap: nowrap; flex-wrap: nowrap;

2
res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
View File

@ -16,7 +16,7 @@ limitations under the License.
.mx_GenericFeatureFeedbackDialog { .mx_GenericFeatureFeedbackDialog {
.mx_GenericFeatureFeedbackDialog_subheading { .mx_GenericFeatureFeedbackDialog_subheading {
color: $primary-fg-color; color: $primary-content;
font-size: $font-14px; font-size: $font-14px;
line-height: $font-20px; line-height: $font-20px;
margin-bottom: 24px; margin-bottom: 24px;

2
res/css/views/dialogs/_HostSignupDialog.scss
View File

@ -70,7 +70,7 @@ limitations under the License.
} }
.mx_HostSignupDialog_text_dark { .mx_HostSignupDialog_text_dark {
color: $primary-fg-color; color: $primary-content;
} }
.mx_HostSignupDialog_text_light { .mx_HostSignupDialog_text_light {

10
res/css/views/dialogs/_InviteDialog.scss
View File

@ -56,7 +56,7 @@ limitations under the License.
box-sizing: border-box; box-sizing: border-box;
min-width: 40%; min-width: 40%;
flex: 1 !important; flex: 1 !important;
color: $primary-fg-color !important; color: $primary-content !important;
} }
} }
@ -94,7 +94,7 @@ limitations under the License.
} }
> span { > span {
color: $primary-fg-color; color: $primary-content;
} }
.mx_InviteDialog_subname { .mx_InviteDialog_subname {
@ -110,7 +110,7 @@ limitations under the License.
font-size: $font-14px; font-size: $font-14px;
> span { > span {
color: $primary-fg-color; color: $primary-content;
font-weight: 600; font-weight: 600;
} }
@ -220,7 +220,7 @@ limitations under the License.
.mx_InviteDialog_roomTile_name { .mx_InviteDialog_roomTile_name {
font-weight: 600; font-weight: 600;
font-size: $font-14px; font-size: $font-14px;
color: $primary-fg-color; color: $primary-content;
margin-left: 7px; margin-left: 7px;
} }
@ -432,7 +432,7 @@ limitations under the License.
font-size: $font-15px; font-size: $font-15px;
line-height: $font-24px; line-height: $font-24px;
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
color: $primary-fg-color; color: $primary-content;
} }
.mx_InviteDialog_multiInviterError_entry_userId { .mx_InviteDialog_multiInviterError_entry_userId {

2
res/css/views/dialogs/_JoinRuleDropdown.scss
View File

@ -19,7 +19,7 @@ limitations under the License.
font-weight: normal; font-weight: normal;
font-family: $font-family; font-family: $font-family;
font-size: $font-14px; font-size: $font-14px;
color: $primary-fg-color; color: $primary-content;
.mx_Dropdown_input { .mx_Dropdown_input {
border: 1px solid $input-border-color; border: 1px solid $input-border-color;

2
res/css/views/dialogs/_LeaveSpaceDialog.scss
View File

@ -81,7 +81,7 @@ limitations under the License.
} }
> p { > p {
color: $primary-fg-color; color: $primary-content;
} }
} }

2
res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.scss
View File

@ -23,7 +23,7 @@ limitations under the License.
.mx_ManageRestrictedJoinRuleDialog { .mx_ManageRestrictedJoinRuleDialog {
width: 480px; width: 480px;
color: $primary-fg-color; color: $primary-content;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-wrap: nowrap; flex-wrap: nowrap;

2
res/css/views/dialogs/_MessageEditHistoryDialog.scss
View File

@ -37,7 +37,7 @@ limitations under the License.
list-style-type: none; list-style-type: none;
font-size: $font-14px; font-size: $font-14px;
padding: 0; padding: 0;
color: $primary-fg-color; color: $primary-content;
span.mx_EditHistoryMessage_deletion, span.mx_EditHistoryMessage_insertion { span.mx_EditHistoryMessage_deletion, span.mx_EditHistoryMessage_insertion {
padding: 0px 2px; padding: 0px 2px;

4
res/css/views/dialogs/_RoomSettingsDialogBridges.scss
View File

@ -72,7 +72,7 @@ limitations under the License.
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
font-size: 16pt; font-size: 16pt;
color: $primary-fg-color; color: $primary-content;
} }
> * { > * {
@ -81,7 +81,7 @@ limitations under the License.
} }
.workspace-channel-details { .workspace-channel-details {
color: $primary-fg-color; color: $primary-content;
font-weight: 600; font-weight: 600;
.channel { .channel {

4
res/css/views/dialogs/_ServerOfflineDialog.scss
View File

@ -17,10 +17,10 @@ limitations under the License.
.mx_ServerOfflineDialog { .mx_ServerOfflineDialog {
.mx_ServerOfflineDialog_content { .mx_ServerOfflineDialog_content {
padding-right: 85px; padding-right: 85px;
color: $primary-fg-color; color: $primary-content;
hr { hr {
border-color: $primary-fg-color; border-color: $primary-content;
opacity: 0.1; opacity: 0.1;
border-bottom: none; border-bottom: none;
} }

4
res/css/views/dialogs/_SpaceSettingsDialog.scss
View File

@ -15,7 +15,7 @@ limitations under the License.
*/ */
.mx_SpaceSettingsDialog { .mx_SpaceSettingsDialog {
color: $primary-fg-color; color: $primary-content;
.mx_SpaceSettings_errorText { .mx_SpaceSettings_errorText {
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
@ -50,7 +50,7 @@ limitations under the License.
.mx_RadioButton_content { .mx_RadioButton_content {
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
line-height: $font-18px; line-height: $font-18px;
color: $primary-fg-color; color: $primary-content;
} }
& + span { & + span {

2
res/css/views/dialogs/security/_AccessSecretStorageDialog.scss
View File

@ -44,7 +44,7 @@ limitations under the License.
margin-right: 8px; margin-right: 8px;
position: relative; position: relative;
top: 5px; top: 5px;
background-color: $primary-fg-color; background-color: $primary-content;
} }
.mx_AccessSecretStorageDialog_resetBadge::before { .mx_AccessSecretStorageDialog_resetBadge::before {

4
res/css/views/dialogs/security/_CreateSecretStorageDialog.scss
View File

@ -56,7 +56,7 @@ limitations under the License.
margin-right: 8px; margin-right: 8px;
position: relative; position: relative;
top: 5px; top: 5px;
background-color: $primary-fg-color; background-color: $primary-content;
} }
.mx_CreateSecretStorageDialog_secureBackupTitle::before { .mx_CreateSecretStorageDialog_secureBackupTitle::before {
@ -101,7 +101,7 @@ limitations under the License.
margin-right: 8px; margin-right: 8px;
position: relative; position: relative;
top: 5px; top: 5px;
background-color: $primary-fg-color; background-color: $primary-content;
} }
.mx_CreateSecretStorageDialog_optionIcon_securePhrase { .mx_CreateSecretStorageDialog_optionIcon_securePhrase {

2
res/css/views/dialogs/security/_KeyBackupFailedDialog.scss
View File

@ -26,7 +26,7 @@ limitations under the License.
&::before { &::before {
mask: url("$(res)/img/e2e/lock-warning-filled.svg"); mask: url("$(res)/img/e2e/lock-warning-filled.svg");
mask-repeat: no-repeat; mask-repeat: no-repeat;
background-color: $primary-fg-color; background-color: $primary-content;
content: ""; content: "";
position: absolute; position: absolute;
top: -6px; top: -6px;

2
res/css/views/directory/_NetworkDropdown.scss
View File

@ -153,7 +153,7 @@ limitations under the License.
mask-position: center; mask-position: center;
mask-size: contain; mask-size: contain;
mask-image: url('$(res)/img/feather-customised/chevron-down-thin.svg'); mask-image: url('$(res)/img/feather-customised/chevron-down-thin.svg');
background-color: $primary-fg-color; background-color: $primary-content;
} }
.mx_NetworkDropdown_handle_server { .mx_NetworkDropdown_handle_server {

2
res/css/views/elements/_AddressTile.scss
View File

@ -20,7 +20,7 @@ limitations under the License.
background-color: rgba(74, 73, 74, 0.1); background-color: rgba(74, 73, 74, 0.1);
border: solid 1px $input-border-color; border: solid 1px $input-border-color;
line-height: $font-26px; line-height: $font-26px;
color: $primary-fg-color; color: $primary-content;
font-size: $font-14px; font-size: $font-14px;
font-weight: normal; font-weight: normal;
margin-right: 4px; margin-right: 4px;

4
res/css/views/elements/_Dropdown.scss
View File

@ -16,7 +16,7 @@ limitations under the License.
.mx_Dropdown { .mx_Dropdown {
position: relative; position: relative;
color: $primary-fg-color; color: $primary-content;
} }
.mx_Dropdown_disabled { .mx_Dropdown_disabled {
@ -52,7 +52,7 @@ limitations under the License.
padding-right: 9px; padding-right: 9px;
mask: url('$(res)/img/feather-customised/dropdown-arrow.svg'); mask: url('$(res)/img/feather-customised/dropdown-arrow.svg');
mask-repeat: no-repeat; mask-repeat: no-repeat;
background: $primary-fg-color; background: $primary-content;
} }
.mx_Dropdown_option { .mx_Dropdown_option {

6
res/css/views/elements/_Field.scss
View File

@ -46,7 +46,7 @@ limitations under the License.
// corners on the field above. // corners on the field above.
border-radius: 4px; border-radius: 4px;
padding: 8px 9px; padding: 8px 9px;
color: $primary-fg-color; color: $primary-content;
background-color: $background; background-color: $background;
flex: 1; flex: 1;
min-width: 0; min-width: 0;
@ -67,7 +67,7 @@ limitations under the License.
height: 6px; height: 6px;
mask: url('$(res)/img/feather-customised/dropdown-arrow.svg'); mask: url('$(res)/img/feather-customised/dropdown-arrow.svg');
mask-repeat: no-repeat; mask-repeat: no-repeat;
background-color: $primary-fg-color; background-color: $primary-content;
z-index: 1; z-index: 1;
pointer-events: none; pointer-events: none;
} }
@ -100,7 +100,7 @@ limitations under the License.
color 0.25s ease-out 0.1s, color 0.25s ease-out 0.1s,
top 0.25s ease-out 0.1s, top 0.25s ease-out 0.1s,
background-color 0.25s ease-out 0.1s; background-color 0.25s ease-out 0.1s;
color: $primary-fg-color; color: $primary-content;
background-color: transparent; background-color: transparent;
font-size: $font-14px; font-size: $font-14px;
position: absolute; position: absolute;

2
res/css/views/elements/_RichText.scss
View File

@ -43,7 +43,7 @@ a.mx_Pill {
/* More specific to override `.markdown-body a` color */ /* More specific to override `.markdown-body a` color */
.mx_EventTile_content .markdown-body a.mx_UserPill, .mx_EventTile_content .markdown-body a.mx_UserPill,
.mx_UserPill { .mx_UserPill {
color: $primary-fg-color; color: $primary-content;
background-color: $other-user-pill-bg-color; background-color: $other-user-pill-bg-color;
} }

2
res/css/views/elements/_SSOButtons.scss
View File

@ -35,7 +35,7 @@ limitations under the License.
font-size: $font-14px; font-size: $font-14px;
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
border: 1px solid $input-border-color; border: 1px solid $input-border-color;
color: $primary-fg-color; color: $primary-content;
> img { > img {
object-fit: contain; object-fit: contain;

2
res/css/views/elements/_Spinner.scss
View File

@ -37,7 +37,7 @@ limitations under the License.
} }
.mx_Spinner_icon { .mx_Spinner_icon {
background-color: $primary-fg-color; background-color: $primary-content;
mask: url('$(res)/img/spinner.svg'); mask: url('$(res)/img/spinner.svg');
mask-size: contain; mask-size: contain;
animation: 1.1s steps(12, end) infinite spin; animation: 1.1s steps(12, end) infinite spin;

2
res/css/views/elements/_Tooltip.scss
View File

@ -84,7 +84,7 @@ limitations under the License.
// These tooltips use an older style with a chevron // These tooltips use an older style with a chevron
.mx_Field_tooltip { .mx_Field_tooltip {
background-color: $menu-bg-color; background-color: $menu-bg-color;
color: $primary-fg-color; color: $primary-content;
border: 1px solid $menu-border-color; border: 1px solid $menu-border-color;
text-align: unset; text-align: unset;

4
res/css/views/emojipicker/_EmojiPicker.scss
View File

@ -57,7 +57,7 @@ limitations under the License.
} }
.mx_EmojiPicker_anchor::before { .mx_EmojiPicker_anchor::before {
background-color: $primary-fg-color; background-color: $primary-content;
content: ''; content: '';
display: inline-block; display: inline-block;
mask-size: 100%; mask-size: 100%;
@ -126,7 +126,7 @@ limitations under the License.
.mx_EmojiPicker_search_icon::after { .mx_EmojiPicker_search_icon::after {
mask: url('$(res)/img/emojipicker/search.svg') no-repeat; mask: url('$(res)/img/emojipicker/search.svg') no-repeat;
mask-size: 100%; mask-size: 100%;
background-color: $primary-fg-color; background-color: $primary-content;
content: ''; content: '';
display: inline-block; display: inline-block;
width: 100%; width: 100%;

2
res/css/views/groups/_GroupRoomList.scss
View File

@ -16,7 +16,7 @@ limitations under the License.
.mx_GroupRoomTile { .mx_GroupRoomTile {
position: relative; position: relative;
color: $primary-fg-color; color: $primary-content;
cursor: pointer; cursor: pointer;
display: flex; display: flex;
align-items: center; align-items: center;

2
res/css/views/messages/_MessageActionBar.scss
View File

@ -81,7 +81,7 @@ limitations under the License.
} }
.mx_MessageActionBar_maskButton:hover::after { .mx_MessageActionBar_maskButton:hover::after {
background-color: $primary-fg-color; background-color: $primary-content;
} }
.mx_MessageActionBar_reactButton::after { .mx_MessageActionBar_reactButton::after {

6
res/css/views/messages/_ReactionsRow.scss
View File

@ -16,7 +16,7 @@ limitations under the License.
.mx_ReactionsRow { .mx_ReactionsRow {
margin: 6px 0; margin: 6px 0;
color: $primary-fg-color; color: $primary-content;
.mx_ReactionsRow_addReactionButton { .mx_ReactionsRow_addReactionButton {
position: relative; position: relative;
@ -46,7 +46,7 @@ limitations under the License.
&:hover, &.mx_ReactionsRow_addReactionButton_active { &:hover, &.mx_ReactionsRow_addReactionButton_active {
&::before { &::before {
background-color: $primary-fg-color; background-color: $primary-content;
} }
} }
} }
@ -68,6 +68,6 @@ limitations under the License.
} }
&:hover { &:hover {
color: $primary-fg-color; color: $primary-content;
} }
} }

4
res/css/views/right_panel/_PinnedMessagesCard.scss
View File

@ -66,7 +66,7 @@ limitations under the License.
z-index: 1; z-index: 1;
&::after { &::after {
background-color: $primary-fg-color; background-color: $primary-content;
} }
} }
} }
@ -75,7 +75,7 @@ limitations under the License.
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
font-size: $font-15px; font-size: $font-15px;
line-height: $font-24px; line-height: $font-24px;
color: $primary-fg-color; color: $primary-content;
margin-top: 24px; margin-top: 24px;
margin-bottom: 20px; margin-bottom: 20px;
} }

2
res/css/views/right_panel/_RoomSummaryCard.scss
View File

@ -128,7 +128,7 @@ limitations under the License.
} }
span { span {
color: $primary-fg-color; color: $primary-content;
} }
} }

2
res/css/views/right_panel/_UserInfo.scss
View File

@ -55,7 +55,7 @@ limitations under the License.
} }
.mx_UserInfo_separator { .mx_UserInfo_separator {
border-bottom: 1px solid rgba($primary-fg-color, .1); border-bottom: 1px solid rgba($primary-content, .1);
} }
.mx_UserInfo_memberDetailsContainer { .mx_UserInfo_memberDetailsContainer {

4
res/css/views/rooms/_AppsDrawer.scss
View File

@ -64,7 +64,7 @@ $MiniAppTileHeight: 200px;
&:hover { &:hover {
.mx_AppsContainer_resizerHandle::after { .mx_AppsContainer_resizerHandle::after {
opacity: 0.8; opacity: 0.8;
background: $primary-fg-color; background: $primary-content;
} }
.mx_ResizeHandle_horizontal::before { .mx_ResizeHandle_horizontal::before {
@ -79,7 +79,7 @@ $MiniAppTileHeight: 200px;
content: ''; content: '';
background-color: $primary-fg-color; background-color: $primary-content;
opacity: 0.8; opacity: 0.8;
} }
} }

6
res/css/views/rooms/_Autocomplete.scss
View File

@ -24,7 +24,7 @@
user-select: none; user-select: none;
cursor: pointer; cursor: pointer;
align-items: center; align-items: center;
color: $primary-fg-color; color: $primary-content;
} }
.mx_Autocomplete_Completion_block * { .mx_Autocomplete_Completion_block * {
@ -40,7 +40,7 @@
user-select: none; user-select: none;
cursor: pointer; cursor: pointer;
align-items: center; align-items: center;
color: $primary-fg-color; color: $primary-content;
} }
.mx_Autocomplete_Completion_pill > * { .mx_Autocomplete_Completion_pill > * {
@ -83,7 +83,7 @@
.mx_Autocomplete_provider_name { .mx_Autocomplete_provider_name {
margin: 12px; margin: 12px;
color: $primary-fg-color; color: $primary-content;
font-weight: 400; font-weight: 400;
opacity: 0.4; opacity: 0.4;
} }

6
res/css/views/rooms/_EntityTile.scss
View File

@ -18,7 +18,7 @@ limitations under the License.
.mx_EntityTile { .mx_EntityTile {
display: flex; display: flex;
align-items: center; align-items: center;
color: $primary-fg-color; color: $primary-content;
cursor: pointer; cursor: pointer;
.mx_E2EIcon { .mx_E2EIcon {
@ -86,12 +86,12 @@ limitations under the License.
.mx_EntityTile_ellipsis .mx_EntityTile_name { .mx_EntityTile_ellipsis .mx_EntityTile_name {
font-style: italic; font-style: italic;
color: $primary-fg-color; color: $primary-content;
} }
.mx_EntityTile_invitePlaceholder .mx_EntityTile_name { .mx_EntityTile_invitePlaceholder .mx_EntityTile_name {
font-style: italic; font-style: italic;
color: $primary-fg-color; color: $primary-content;
} }
.mx_EntityTile_unavailable .mx_EntityTile_avatar, .mx_EntityTile_unavailable .mx_EntityTile_avatar,

4
res/css/views/rooms/_EventTile.scss
View File

@ -55,7 +55,7 @@ $hover-select-border: 4px;
} }
.mx_SenderProfile { .mx_SenderProfile {
color: $primary-fg-color; color: $primary-content;
font-size: $font-14px; font-size: $font-14px;
display: inline-block; /* anti-zalgo, with overflow hidden */ display: inline-block; /* anti-zalgo, with overflow hidden */
overflow: hidden; overflow: hidden;
@ -618,7 +618,7 @@ $hover-select-border: 4px;
} }
.mx_EventTile_keyRequestInfo_text a { .mx_EventTile_keyRequestInfo_text a {
color: $primary-fg-color; color: $primary-content;
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }

2
res/css/views/rooms/_MemberInfo.scss
View File

@ -111,7 +111,7 @@ limitations under the License.
.mx_MemberInfo_field { .mx_MemberInfo_field {
cursor: pointer; cursor: pointer;
font-size: $font-15px; font-size: $font-15px;
color: $primary-fg-color; color: $primary-content;
margin-left: 8px; margin-left: 8px;
line-height: $font-23px; line-height: $font-23px;
} }

2
res/css/views/rooms/_MessageComposer.scss
View File

@ -160,7 +160,7 @@ limitations under the License.
resize: none; resize: none;
outline: none; outline: none;
box-shadow: none; box-shadow: none;
color: $primary-fg-color; color: $primary-content;
background-color: $background; background-color: $background;
font-size: $font-14px; font-size: $font-14px;
max-height: 120px; max-height: 120px;

2
res/css/views/rooms/_NotificationBadge.scss
View File

@ -42,7 +42,7 @@ limitations under the License.
// These are the 3 background types // These are the 3 background types
&.mx_NotificationBadge_dot { &.mx_NotificationBadge_dot {
background-color: $primary-fg-color; // increased visibility background-color: $primary-content; // increased visibility
width: 6px; width: 6px;
height: 6px; height: 6px;

2
res/css/views/rooms/_ReplyPreview.scss
View File

@ -28,7 +28,7 @@ limitations under the License.
.mx_ReplyPreview_header { .mx_ReplyPreview_header {
margin: 8px; margin: 8px;
color: $primary-fg-color; color: $primary-content;
font-weight: 400; font-weight: 400;
opacity: 0.4; opacity: 0.4;
} }

2
res/css/views/rooms/_ReplyTile.scss
View File

@ -42,7 +42,7 @@ limitations under the License.
display: flex; display: flex;
flex-direction: column; flex-direction: column;
text-decoration: none; text-decoration: none;
color: $primary-fg-color; color: $primary-content;
} }
.mx_RedactedBody { .mx_RedactedBody {

4
res/css/views/rooms/_RoomList.scss
View File

@ -43,11 +43,11 @@ limitations under the License.
div:first-child { div:first-child {
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
line-height: $font-18px; line-height: $font-18px;
color: $primary-fg-color; color: $primary-content;
} }
.mx_AccessibleButton { .mx_AccessibleButton {
color: $primary-fg-color; color: $primary-content;
position: relative; position: relative;
padding: 8px 8px 8px 32px; padding: 8px 8px 8px 32px;
font-size: inherit; font-size: inherit;

2
res/css/views/rooms/_RoomSublist.scss
View File

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

2
res/css/views/rooms/_RoomTile.scss
View File

@ -124,7 +124,7 @@ limitations under the License.
mask-position: center; mask-position: center;
mask-size: contain; mask-size: contain;
mask-repeat: no-repeat; mask-repeat: no-repeat;
background: $primary-fg-color; background: $primary-content;
} }
} }

2
res/css/views/rooms/_SearchBar.scss
View File

@ -47,7 +47,7 @@ limitations under the License.
padding: 5px; padding: 5px;
font-size: $font-15px; font-size: $font-15px;
cursor: pointer; cursor: pointer;
color: $primary-fg-color; color: $primary-content;
border-bottom: 2px solid $accent-color; border-bottom: 2px solid $accent-color;
font-weight: 600; font-weight: 600;
} }

2
res/css/views/settings/_LayoutSwitcher.scss
View File

@ -21,7 +21,7 @@ limitations under the License.
flex-direction: row; flex-direction: row;
gap: 24px; gap: 24px;
color: $primary-fg-color; color: $primary-content;
> .mx_LayoutSwitcher_RadioButton { > .mx_LayoutSwitcher_RadioButton {
flex-grow: 0; flex-grow: 0;

2
res/css/views/settings/_Notifications.scss
View File

@ -15,7 +15,7 @@ limitations under the License.
*/ */
.mx_UserNotifSettings { .mx_UserNotifSettings {
color: $primary-fg-color; // override from default settings page styles color: $primary-content; // override from default settings page styles
.mx_UserNotifSettings_pushRulesTable { .mx_UserNotifSettings_pushRulesTable {
width: calc(100% + 12px); // +12px to line up center of 'Noisy' column with toggle switches width: calc(100% + 12px); // +12px to line up center of 'Noisy' column with toggle switches

6
res/css/views/settings/tabs/_SettingsTab.scss
View File

@ -25,7 +25,7 @@ limitations under the License.
.mx_SettingsTab_heading { .mx_SettingsTab_heading {
font-size: $font-20px; font-size: $font-20px;
font-weight: 600; font-weight: 600;
color: $primary-fg-color; color: $primary-content;
margin-bottom: 10px; margin-bottom: 10px;
} }
@ -37,7 +37,7 @@ limitations under the License.
font-size: $font-16px; font-size: $font-16px;
display: block; display: block;
font-weight: 600; font-weight: 600;
color: $primary-fg-color; color: $primary-content;
margin-bottom: 10px; margin-bottom: 10px;
margin-top: 12px; margin-top: 12px;
} }
@ -72,7 +72,7 @@ limitations under the License.
vertical-align: middle; vertical-align: middle;
display: inline-block; display: inline-block;
font-size: $font-14px; font-size: $font-14px;
color: $primary-fg-color; color: $primary-content;
max-width: calc(100% - $font-48px); // Force word wrap instead of colliding with the switch max-width: calc(100% - $font-48px); // Force word wrap instead of colliding with the switch
box-sizing: border-box; box-sizing: border-box;
padding-right: 10px; padding-right: 10px;

2
res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
View File

@ -89,7 +89,7 @@ limitations under the License.
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
font-size: $font-15px; font-size: $font-15px;
line-height: $font-24px; line-height: $font-24px;
color: $primary-fg-color; color: $primary-content;
display: block; display: block;
} }
} }

6
res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
View File

@ -24,7 +24,7 @@ limitations under the License.
} }
.mx_AppearanceUserSettingsTab_fontScaling { .mx_AppearanceUserSettingsTab_fontScaling {
color: $primary-fg-color; color: $primary-content;
} }
.mx_AppearanceUserSettingsTab_fontSlider { .mx_AppearanceUserSettingsTab_fontSlider {
@ -81,7 +81,7 @@ limitations under the License.
.mx_AppearanceUserSettingsTab_themeSection { .mx_AppearanceUserSettingsTab_themeSection {
$radio-bg-color: $input-darker-bg-color; $radio-bg-color: $input-darker-bg-color;
color: $primary-fg-color; color: $primary-content;
> .mx_ThemeSelectors { > .mx_ThemeSelectors {
display: flex; display: flex;
@ -156,7 +156,7 @@ limitations under the License.
} }
.mx_AppearanceUserSettingsTab_Advanced { .mx_AppearanceUserSettingsTab_Advanced {
color: $primary-fg-color; color: $primary-content;
> * { > * {
margin-bottom: 16px; margin-bottom: 16px;

2
res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
View File

@ -30,7 +30,7 @@ limitations under the License.
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
font-size: $font-15px; font-size: $font-15px;
line-height: $font-18px; line-height: $font-18px;
color: $primary-fg-color; color: $primary-content;
margin: 16px 0; margin: 16px 0;
.mx_BaseAvatar { .mx_BaseAvatar {

2
res/css/views/voip/_CallViewForRoom.scss
View File

@ -39,7 +39,7 @@ limitations under the License.
width: 100%; width: 100%;
max-width: 64px; max-width: 64px;
background-color: $primary-fg-color; background-color: $primary-content;
} }
} }
} }

5
res/themes/dark/css/_dark.scss
View File

@ -30,7 +30,6 @@ $search-placeholder-color: #61708b;
$room-highlight-color: #343a46; $room-highlight-color: #343a46;
// typical text (dark-on-white in light skin) // typical text (dark-on-white in light skin)
$primary-fg-color: $primary-content;
$muted-fg-color: $header-panel-text-primary-color; $muted-fg-color: $header-panel-text-primary-color;
// additional text colors // additional text colors
@ -93,7 +92,7 @@ $menu-selected-color: $room-highlight-color;
$avatar-initial-color: #ffffff; $avatar-initial-color: #ffffff;
$avatar-bg-color: $background; $avatar-bg-color: $background;
$h3-color: $primary-fg-color; $h3-color: $primary-content;
$dialog-title-fg-color: $primary-content; $dialog-title-fg-color: $primary-content;
$dialog-backdrop-color: #000; $dialog-backdrop-color: #000;
@ -135,7 +134,7 @@ $roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filt
$roomlist-filter-active-bg-color: $background; $roomlist-filter-active-bg-color: $background;
$roomlist-bg-color: rgba(33, 38, 44, 0.90); $roomlist-bg-color: rgba(33, 38, 44, 0.90);
$roomlist-header-color: $tertiary-fg-color; $roomlist-header-color: $tertiary-fg-color;
$roomsublist-divider-color: $primary-fg-color; $roomsublist-divider-color: $primary-content;
$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%); $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%);
$groupFilterPanel-divider-color: $roomlist-header-color; $groupFilterPanel-divider-color: $roomlist-header-color;

4
res/themes/light-custom/css/_custom.scss
View File

@ -69,7 +69,7 @@ $roomlist-bg-color: var(--roomlist-background-color);
// //
// --timeline-text-color // --timeline-text-color
$message-action-bar-fg-color: var(--timeline-text-color); $message-action-bar-fg-color: var(--timeline-text-color);
$primary-fg-color: var(--timeline-text-color); $primary-content: var(--timeline-text-color);
$settings-profile-overlay-placeholder-fg-color: var(--timeline-text-color); $settings-profile-overlay-placeholder-fg-color: var(--timeline-text-color);
$roomtopic-color: var(--timeline-text-color-50pct); $roomtopic-color: var(--timeline-text-color-50pct);
$tab-label-fg-color: var(--timeline-text-color); $tab-label-fg-color: var(--timeline-text-color);
@ -139,7 +139,7 @@ $event-selected-color: var(--timeline-highlights-color);
$event-highlight-bg-color: var(--timeline-highlights-color); $event-highlight-bg-color: var(--timeline-highlights-color);
// //
// redirect some variables away from their hardcoded values in the light theme // redirect some variables away from their hardcoded values in the light theme
$settings-grey-fg-color: $primary-fg-color; $settings-grey-fg-color: $primary-content;
// --eventbubble colors // --eventbubble colors
$eventbubble-self-bg: var(--eventbubble-self-bg, $eventbubble-self-bg); $eventbubble-self-bg: var(--eventbubble-self-bg, $eventbubble-self-bg);

5
res/themes/light/css/_light.scss
View File

@ -37,7 +37,6 @@ $accent-color: $accent;
$accent-bg-color: rgba(3, 179, 129, 0.16); $accent-bg-color: rgba(3, 179, 129, 0.16);
$notice-primary-color: #ff4b55; $notice-primary-color: #ff4b55;
$notice-primary-bg-color: rgba(255, 75, 85, 0.16); $notice-primary-bg-color: rgba(255, 75, 85, 0.16);
$primary-fg-color: #2e2f32;
$secondary-fg-color: $secondary-content; $secondary-fg-color: $secondary-content;
$tertiary-fg-color: #8D99A5; $tertiary-fg-color: #8D99A5;
$header-panel-bg-color: #f3f8fd; $header-panel-bg-color: #f3f8fd;
@ -196,7 +195,7 @@ $roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filt
$roomlist-filter-active-bg-color: $background; $roomlist-filter-active-bg-color: $background;
$roomlist-bg-color: rgba(245, 245, 245, 0.90); $roomlist-bg-color: rgba(245, 245, 245, 0.90);
$roomlist-header-color: $tertiary-fg-color; $roomlist-header-color: $tertiary-fg-color;
$roomsublist-divider-color: $primary-fg-color; $roomsublist-divider-color: $primary-content;
$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%); $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%);
$groupFilterPanel-divider-color: $roomlist-header-color; $groupFilterPanel-divider-color: $roomlist-header-color;
@ -317,7 +316,7 @@ $dark-panel-bg-color: $secondary-accent-color;
$panel-gradient: rgba(242, 245, 248, 0), rgba(242, 245, 248, 1); $panel-gradient: rgba(242, 245, 248, 0), rgba(242, 245, 248, 1);
$message-action-bar-bg-color: $background; $message-action-bar-bg-color: $background;
$message-action-bar-fg-color: $primary-fg-color; $message-action-bar-fg-color: $primary-content;
$message-action-bar-border-color: #e9edf1; $message-action-bar-border-color: #e9edf1;
$message-action-bar-hover-border-color: $focus-bg-color; $message-action-bar-hover-border-color: $focus-bg-color;