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

$secondary-fg-color -> $secondary-content 

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

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

@ -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;
}
}
}

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

@ -130,7 +130,7 @@ $roomListCollapsedWidth: 68px;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $secondary-fg-color;
background: $secondary-content;
}
}
@ -153,7 +153,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 {

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

@ -78,7 +78,7 @@ limitations under the License.
margin: 40px auto 60px;
font-size: $font-14px;
line-height: $font-20px;
color: $secondary-fg-color;
color: $secondary-content;
max-width: 464px; // easier reading
}

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

@ -33,7 +33,7 @@ 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;
}
@ -53,7 +53,7 @@ limitations under the License.
}
&.mx_RoomSearch_hasQuery {
border-color: $secondary-fg-color;
border-color: $secondary-content;
}
&.mx_RoomSearch_focused {
@ -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;
}
}

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

@ -20,7 +20,7 @@ $gutterSize: 16px;
$activeBorderTransparentGap: 1px;
$activeBackgroundColor: $roomtile-selected-bg-color;
$activeBorderColor: $secondary-fg-color;
$activeBorderColor: $secondary-content;
.mx_SpacePanel {
flex: 0 0 auto;

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

@ -52,7 +52,7 @@ limitations under the License.
> div {
font-weight: 400;
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-15px;
line-height: $font-24px;
}
@ -74,7 +74,7 @@ limitations under the License.
> div {
font-size: $font-15px;
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
@ -143,7 +143,7 @@ limitations under the License.
margin-left: 8px;
font-size: $font-15px;
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
@ -235,7 +235,7 @@ limitations under the License.
.mx_SpaceRoomDirectory_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;
@ -300,7 +300,7 @@ limitations under the License.
font-weight: normal;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
}
}

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

@ -32,7 +32,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
> span {
color: $secondary-fg-color;
color: $secondary-content;
}
&::before {
@ -78,7 +78,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_description {
font-size: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
margin-top: 12px;
margin-bottom: 24px;
max-width: $SpaceRoomViewInnerWidth;
@ -176,7 +176,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 +207,7 @@ $SpaceRoomViewInnerWidth: 428px;
.mx_SpaceRoomView_preview_inviter_mxid {
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
}
@ -224,7 +224,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;
@ -257,7 +257,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;
@ -388,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 {
@ -415,7 +415,7 @@ $SpaceRoomViewInnerWidth: 428px;
position: absolute;
top: 14px;
left: 14px;
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
}
@ -438,7 +438,7 @@ $SpaceRoomViewInnerWidth: 428px;
}
.mx_SpaceRoomView_inviteTeammates_buttons {
color: $secondary-fg-color;
color: $secondary-content;
margin-top: 28px;
.mx_AccessibleButton {
@ -454,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;
@ -473,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;

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

@ -163,7 +163,7 @@ limitations under the License.
}
.mx_Toast_detail {
color: $secondary-fg-color;
color: $secondary-content;
}
.mx_Toast_deviceID {

2
res/css/views/avatars/_DecoratedRoomAvatar.scss
View File

@ -47,7 +47,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $secondary-fg-color;
background: $secondary-content;
mask-image: url('$(res)/img/globe.svg');
}

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

@ -40,7 +40,7 @@ limitations under the License.
.mx_BetaCard_caption {
font-size: $font-15px;
line-height: $font-20px;
color: $secondary-fg-color;
color: $secondary-content;
margin-bottom: 20px;
}
@ -54,7 +54,7 @@ limitations under the License.
.mx_BetaCard_disclaimer {
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
margin-top: 20px;
}
}
@ -78,7 +78,7 @@ limitations under the License.
margin-top: 4px;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
}

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

@ -44,7 +44,7 @@ limitations under the License.
> h3 {
margin: 0;
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-12px;
font-weight: $font-semi-bold;
line-height: $font-15px;
@ -66,7 +66,7 @@ limitations under the License.
flex-grow: 1;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
.mx_ProgressBar {
height: 8px;
@ -188,7 +188,7 @@ limitations under the License.
padding-left: 0;
flex: unset;
height: unset;
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-15px;
line-height: $font-24px;
@ -221,7 +221,7 @@ limitations under the License.
}
.mx_SubspaceSelector_onlySpace {
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-15px;
line-height: $font-24px;
}

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

@ -73,7 +73,7 @@ limitations under the License.
flex-grow: 1;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
.mx_ProgressBar {
height: 8px;

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

@ -57,7 +57,7 @@ limitations under the License.
flex-grow: 1;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
> * {
vertical-align: middle;

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

@ -25,7 +25,7 @@ limitations under the License.
> h3 {
margin: 0 0 6px;
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-12px;
font-weight: $font-semi-bold;
line-height: $font-15px;

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

@ -74,7 +74,7 @@ limitations under the License.
}
.mx_HostSignupDialog_text_light {
color: $secondary-fg-color;
color: $secondary-content;
}
.mx_HostSignup_maximize_button {

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

@ -418,7 +418,7 @@ limitations under the License.
> h4 {
font-size: $font-15px;
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
font-weight: normal;
}

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

@ -44,7 +44,7 @@ limitations under the License.
top: 8px;
mask-repeat: no-repeat;
mask-position: center;
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
}
}

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

@ -63,7 +63,7 @@ limitations under the License.
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
&::before {
content: '';
@ -72,7 +72,7 @@ limitations under the License.
top: calc(50% - 8px); // vertical centering
height: 16px;
width: 16px;
background-color: $secondary-fg-color;
background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');

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

@ -52,7 +52,7 @@ limitations under the License.
> h3 {
margin: 0;
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-12px;
font-weight: $font-semi-bold;
line-height: $font-15px;
@ -113,7 +113,7 @@ limitations under the License.
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
&::before {
content: '';
@ -122,7 +122,7 @@ limitations under the License.
top: calc(50% - 8px); // vertical centering
height: 16px;
width: 16px;
background-color: $secondary-fg-color;
background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');

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

@ -22,7 +22,7 @@ limitations under the License.
margin-bottom: 0;
> p {
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-14px;
margin: 16px 0;
@ -38,7 +38,7 @@ limitations under the License.
> h4 {
font-size: $font-15px;
font-weight: $font-semi-bold;
color: $secondary-fg-color;
color: $secondary-content;
margin-left: 8px;
}

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

@ -56,7 +56,7 @@ limitations under the License.
& + span {
font-size: $font-15px;
line-height: $font-18px;
color: $secondary-fg-color;
color: $secondary-content;
margin-left: 26px;
}
}

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

@ -32,12 +32,12 @@ limitations under the License.
justify-content: center;
align-items: center;
cursor: pointer;
color: $secondary-fg-color;
color: $secondary-content;
&::before {
content: "";
margin-right: 8px;
background-color: $secondary-fg-color;
background-color: $secondary-content;
mask-image: url('$(res)/img/feather-customised/eye.svg');
display: inline-block;
width: 18px;

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

@ -45,7 +45,7 @@ limitations under the License.
height: 100%;
width: 100%;
background-color: $secondary-fg-color;
background-color: $secondary-content;
mask-position: center;
mask-repeat: no-repeat;
mask-image: url('$(res)/img/element-icons/camera.svg');

4
res/css/views/messages/_CallEvent.scss
View File

@ -71,7 +71,7 @@ limitations under the License.
.mx_CallEvent_type {
font-weight: 400;
color: $secondary-fg-color;
color: $secondary-content;
font-size: 1.2rem;
line-height: $font-13px;
display: flex;
@ -100,7 +100,7 @@ limitations under the License.
display: flex;
flex-direction: row;
align-items: center;
color: $secondary-fg-color;
color: $secondary-content;
margin-right: 16px;
.mx_CallEvent_content_button {

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

@ -77,7 +77,7 @@ limitations under the License.
mask-size: 18px;
mask-repeat: no-repeat;
mask-position: center;
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
.mx_MessageActionBar_maskButton:hover::after {

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

@ -145,7 +145,7 @@ limitations under the License.
justify-content: space-around;
.mx_AccessibleButton_kind_secondary {
color: $secondary-fg-color;
color: $secondary-content;
background-color: rgba(141, 151, 165, 0.2);
font-weight: $font-semi-bold;
font-size: $font-14px;

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

@ -83,7 +83,7 @@ limitations under the License.
> span {
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
}
}
}

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

@ -27,7 +27,7 @@ limitations under the License.
.mx_RoomSummaryCard_alias {
font-size: $font-13px;
color: $secondary-fg-color;
color: $secondary-content;
}
h2, .mx_RoomSummaryCard_alias {

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

@ -51,7 +51,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
background-color: $secondary-fg-color;
background-color: $secondary-content;
}
}
}

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

@ -67,6 +67,6 @@ limitations under the License.
> p {
margin: 0;
font-size: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
}
}

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

@ -67,7 +67,7 @@ limitations under the License.
//left: 0;
height: inherit;
width: inherit;
background: $secondary-fg-color;
background: $secondary-content;
mask-position: center;
mask-size: 8px;
mask-repeat: no-repeat;
@ -87,7 +87,7 @@ limitations under the License.
.mx_PinnedEventTile_timestamp {
font-size: inherit;
line-height: inherit;
color: $secondary-fg-color;
color: $secondary-content;
}
.mx_AccessibleButton_kind_link {

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

@ -64,7 +64,7 @@ limitations under the License.
position: absolute;
top: 8px;
left: 8px;
background: $secondary-fg-color;
background: $secondary-content;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;

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

@ -48,7 +48,7 @@ limitations under the License.
.mx_VoiceRecordComposerTile_uploadingState {
margin-right: 10px;
color: $secondary-fg-color;
color: $secondary-content;
}
.mx_VoiceRecordComposerTile_failedState {

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

@ -34,7 +34,7 @@ limitations under the License.
}
tr > th:nth-child(n + 2) {
color: $secondary-fg-color;
color: $secondary-content;
font-size: $font-12px;
vertical-align: middle;
width: 66px;

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

@ -82,7 +82,7 @@ limitations under the License.
margin-top: 4px;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
}
.mx_SettingsTab_section .mx_SettingsFlag .mx_ToggleSwitch {

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

@ -22,7 +22,7 @@ limitations under the License.
.mx_SecurityRoomSettingsTab_spacesWithAccess {
> h4 {
color: $secondary-fg-color;
color: $secondary-content;
font-weight: $font-semi-bold;
font-size: $font-12px;
line-height: $font-15px;
@ -33,7 +33,7 @@ limitations under the License.
font-weight: 500;
font-size: $font-14px;
line-height: 32px; // matches height of avatar for v-align
color: $secondary-fg-color;
color: $secondary-content;
display: inline-block;
img.mx_RoomAvatar_isSpaceRoom,
@ -100,7 +100,7 @@ limitations under the License.
margin-bottom: 16px;
font-size: $font-15px;
line-height: $font-24px;
color: $secondary-fg-color;
color: $secondary-content;
& + .mx_RadioButton {
border-top: 1px solid $menu-border-color;

5
res/css/views/spaces/_SpaceCreateMenu.scss
View File

@ -40,7 +40,8 @@ $spacePanelWidth: 71px;
> p {
font-size: $font-15px;
color: $secondary-fg-color;
color: $secondary-content;
margin: 0;
}
.mx_SpaceFeedbackPrompt {
@ -108,7 +109,7 @@ $spacePanelWidth: 71px;
line-height: $font-24px;
> span {
color: $secondary-fg-color;
color: $secondary-content;
position: relative;
font-size: inherit;
line-height: inherit;

6
res/css/views/voip/_CallViewHeader.scss
View File

@ -53,7 +53,7 @@ limitations under the License.
height: 20px;
width: 20px;
vertical-align: middle;
background-color: $secondary-fg-color;
background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-position: center;
@ -90,7 +90,7 @@ limitations under the License.
.mx_CallViewHeader_callTypeSmall {
font-size: 12px;
color: $secondary-fg-color;
color: $secondary-content;
line-height: initial;
height: 15px;
overflow: hidden;
@ -113,7 +113,7 @@ limitations under the License.
height: 16px;
width: 16px;
background-color: $secondary-fg-color;
background-color: $secondary-content;
mask-repeat: no-repeat;
mask-size: contain;
mask-position: center;

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

@ -33,7 +33,6 @@ $room-highlight-color: #343a46;
$muted-fg-color: $header-panel-text-primary-color;
// additional text colors
$secondary-fg-color: $secondary-content;
$tertiary-fg-color: $tertiary-content;
// used for dialog box text
@ -139,7 +138,7 @@ $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%)
$groupFilterPanel-divider-color: $roomlist-header-color;
$roomtile-preview-color: $secondary-fg-color;
$roomtile-preview-color: $secondary-content;
$roomtile-default-badge-bg-color: #61708b;
$roomtile-selected-bg-color: rgba(141, 151, 165, 0.2);
@ -217,10 +216,10 @@ $breadcrumb-placeholder-bg-color: #272c35;
$user-tile-hover-bg-color: $header-panel-bg-color;
$message-body-panel-fg-color: $secondary-fg-color;
$message-body-panel-fg-color: $secondary-content;
$message-body-panel-bg-color: $quinary-content;
$message-body-panel-icon-fg-color: $secondary-fg-color;
$message-body-panel-icon-bg-color: $system; // "System Dark"
$message-body-panel-icon-bg-color: $system;
$message-body-panel-icon-fg-color: $secondary-content;
$voice-record-stop-border-color: $quaternary-content;
$voice-record-waveform-incomplete-fg-color: $quaternary-content;

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

@ -37,7 +37,6 @@ $accent-color: $accent;
$accent-bg-color: rgba(3, 179, 129, 0.16);
$notice-primary-color: #ff4b55;
$notice-primary-bg-color: rgba(255, 75, 85, 0.16);
$secondary-fg-color: $secondary-content;
$tertiary-fg-color: #8D99A5;
$header-panel-bg-color: #f3f8fd;
@ -200,7 +199,7 @@ $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%)
$groupFilterPanel-divider-color: $roomlist-header-color;
$roomtile-preview-color: $secondary-fg-color;
$roomtile-preview-color: $secondary-content;
$roomtile-default-badge-bg-color: #61708b;
$roomtile-selected-bg-color: #FFF;
@ -339,10 +338,10 @@ $breadcrumb-placeholder-bg-color: #e8eef5;
$user-tile-hover-bg-color: $header-panel-bg-color;
$message-body-panel-fg-color: $secondary-fg-color;
$message-body-panel-fg-color: $secondary-content;
$message-body-panel-bg-color: $quinary-content;
$message-body-panel-icon-fg-color: $secondary-fg-color;
$message-body-panel-icon-bg-color: $system;
$message-body-panel-icon-fg-color: $secondary-content;
// These two don't change between themes. They are the $warning-color, but we don't
// want custom themes to affect them by accident.