mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-26 19:26:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

$tertiary-fg-color -> $tertiary-content

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-08-12 11:53:54 +02:00
parent 10bc85724a
commit 8b59bf3d18
No known key found for this signature in database
GPG key ID: 55C211A1226CB17D
24 changed files with 36 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@ limitations under the License.
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
height: 1px; height: 1px;
opacity: 0.4; opacity: 0.4;
content: ''; content: '';

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

@ -48,7 +48,7 @@ limitations under the License.
line-height: $font-16px; line-height: $font-16px;
&:not(.mx_RoomSearch_inputExpanded)::placeholder { &: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
} }
} }

4
res/css/structures/_SpaceRoomDirectory.scss
View file

@ -171,7 +171,7 @@ limitations under the License.
width: 16px; width: 16px;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-position: center; mask-position: center;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
mask-size: 16px; mask-size: 16px;
transform: rotate(270deg); transform: rotate(270deg);
mask-image: url('$(res)/img/feather-customised/chevron-down.svg'); mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
@ -214,7 +214,7 @@ limitations under the License.
.mx_InfoTooltip { .mx_InfoTooltip {
display: inline; display: inline;
margin-left: 12px; margin-left: 12px;
color: $tertiary-fg-color; color: $tertiary-content;
font-size: $font-12px; font-size: $font-12px;
line-height: $font-15px; line-height: $font-15px;

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

@ -45,7 +45,7 @@ $SpaceRoomViewInnerWidth: 428px;
mask-position: center; mask-position: center;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-size: 24px; mask-size: 24px;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
} }
&:hover { &:hover {
@ -330,7 +330,7 @@ $SpaceRoomViewInnerWidth: 428px;
top: 0; top: 0;
height: 24px; height: 24px;
width: 24px; width: 24px;
background: $tertiary-fg-color; background: $tertiary-content;
mask-position: center; mask-position: center;
mask-size: contain; mask-size: contain;
mask-repeat: no-repeat; mask-repeat: no-repeat;
@ -492,7 +492,7 @@ $SpaceRoomViewInnerWidth: 428px;
left: -2px; left: -2px;
mask-position: center; mask-position: center;
mask-repeat: no-repeat; 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 { .mx_TabbedView_tabLabel_text {
font-size: 15px; font-size: 15px;
color: $tertiary-fg-color; color: $tertiary-content;
} }
} }

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

@ -58,7 +58,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: $tertiary-fg-color; background: $tertiary-content;
mask-image: url('$(res)/img/feather-customised/chevron-down.svg'); mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
} }
} }

8
res/css/views/audio_messages/_SeekBar.scss
View file

@ -42,7 +42,7 @@ limitations under the License.
width: 8px; width: 8px;
height: 8px; height: 8px;
border-radius: 8px; border-radius: 8px;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
cursor: pointer; cursor: pointer;
} }
@ -50,7 +50,7 @@ limitations under the License.
width: 8px; width: 8px;
height: 8px; height: 8px;
border-radius: 8px; border-radius: 8px;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
cursor: pointer; cursor: pointer;
// Firefox adds a border on the thumb // Firefox adds a border on the thumb
@ -63,7 +63,7 @@ limitations under the License.
// in firefox, so it's just wasted CPU/GPU time. // in firefox, so it's just wasted CPU/GPU time.
&::before { // ::before to ensure it ends up under the thumb &::before { // ::before to ensure it ends up under the thumb
content: ''; content: '';
background-color: $tertiary-fg-color; background-color: $tertiary-content;
// Absolute positioning to ensure it overlaps with the existing bar // Absolute positioning to ensure it overlaps with the existing bar
position: absolute; position: absolute;
@ -81,7 +81,7 @@ limitations under the License.
// This is firefox's built-in support for the above, with 100% less hacks. // This is firefox's built-in support for the above, with 100% less hacks.
&::-moz-range-progress { &::-moz-range-progress {
background-color: $tertiary-fg-color; background-color: $tertiary-content;
height: 1px; height: 1px;
} }

2
res/css/views/dialogs/_FeedbackDialog.scss
View file

@ -33,7 +33,7 @@ limitations under the License.
padding-left: 52px; padding-left: 52px;
> p { > p {
color: $tertiary-fg-color; color: $tertiary-content;
} }
.mx_AccessibleButton_kind_link { .mx_AccessibleButton_kind_link {

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

@ -439,7 +439,7 @@ limitations under the License.
margin-left: 6px; margin-left: 6px;
font-size: $font-12px; font-size: $font-12px;
line-height: $font-15px; line-height: $font-15px;
color: $tertiary-fg-color; color: $tertiary-content;
} }
} }

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

@ -85,7 +85,7 @@ limitations under the License.
margin-top: 8px; margin-top: 8px;
font-size: $font-12px; font-size: $font-12px;
line-height: $font-15px; line-height: $font-15px;
color: $tertiary-fg-color; color: $tertiary-content;
} }
.mx_Checkbox { .mx_Checkbox {

2
res/css/views/dialogs/_RegistrationEmailPromptDialog.scss
View file

@ -19,7 +19,7 @@ limitations under the License.
.mx_Dialog_content { .mx_Dialog_content {
margin-bottom: 24px; margin-bottom: 24px;
color: $tertiary-fg-color; color: $tertiary-content;
} }
.mx_Dialog_primary { .mx_Dialog_primary {

4
res/css/views/elements/_FacePile.scss
View file

@ -47,7 +47,7 @@ limitations under the License.
left: 0; left: 0;
height: inherit; height: inherit;
width: inherit; width: inherit;
background: $tertiary-fg-color; background: $tertiary-content;
mask-position: center; mask-position: center;
mask-size: 20px; mask-size: 20px;
mask-repeat: no-repeat; mask-repeat: no-repeat;
@ -60,6 +60,6 @@ limitations under the License.
margin-left: 12px; margin-left: 12px;
font-size: $font-14px; font-size: $font-14px;
line-height: $font-24px; line-height: $font-24px;
color: $tertiary-fg-color; color: $tertiary-content;
} }
} }

2
res/css/views/elements/_ServerPicker.scss
View file

@ -74,7 +74,7 @@ limitations under the License.
.mx_ServerPicker_desc { .mx_ServerPicker_desc {
margin-top: -12px; margin-top: -12px;
color: $tertiary-fg-color; color: $tertiary-content;
grid-column: 1 / 2; grid-column: 1 / 2;
grid-row: 3; grid-row: 3;
margin-bottom: 16px; margin-bottom: 16px;

2
res/css/views/elements/_TagComposer.scss
View file

@ -50,7 +50,7 @@ limitations under the License.
&::before { &::before {
content: ''; content: '';
border-radius: 20px; border-radius: 20px;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
opacity: 0.15; opacity: 0.15;
position: absolute; position: absolute;
top: 0; top: 0;

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

@ -87,7 +87,7 @@ limitations under the License.
position: absolute; position: absolute;
height: 13px; height: 13px;
width: 13px; width: 13px;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-size: contain; mask-size: contain;
} }
@ -144,7 +144,7 @@ limitations under the License.
height: 16px; height: 16px;
width: 16px; width: 16px;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-size: contain; mask-size: contain;
mask-position: center; mask-position: center;

4
res/css/views/messages/_ReactionsRow.scss
View file

@ -36,7 +36,7 @@ limitations under the License.
mask-size: 16px; mask-size: 16px;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-position: center; mask-position: center;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
mask-image: url('$(res)/img/element-icons/room/message-bar/emoji.svg'); mask-image: url('$(res)/img/element-icons/room/message-bar/emoji.svg');
} }
@ -64,7 +64,7 @@ limitations under the License.
vertical-align: middle; vertical-align: middle;
&:link, &:visited { &:link, &:visited {
color: $tertiary-fg-color; color: $tertiary-content;
} }
&:hover { &:hover {

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

@ -93,7 +93,7 @@ limitations under the License.
} }
> h1 { > h1 {
color: $tertiary-fg-color; color: $tertiary-content;
font-size: $font-12px; font-size: $font-12px;
font-weight: 500; font-weight: 500;
} }

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

@ -115,7 +115,7 @@ limitations under the License.
// as we will be applying it in its children // as we will be applying it in its children
padding: 0; padding: 0;
height: auto; height: auto;
color: $tertiary-fg-color; color: $tertiary-content;
.mx_RoomSummaryCard_icon_app { .mx_RoomSummaryCard_icon_app {
padding: 10px 48px 10px 12px; // based on typical mx_RoomSummaryCard_Button padding padding: 10px 48px 10px 12px; // based on typical mx_RoomSummaryCard_Button padding

2
res/css/views/rooms/_EventTile.scss
View file

@ -161,7 +161,7 @@ $hover-select-border: 4px;
// up with the other read receipts // up with the other read receipts
&::before { &::before {
background-color: $tertiary-fg-color; background-color: $tertiary-content;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-position: center; mask-position: center;
mask-size: 14px; mask-size: 14px;

2
res/css/views/spaces/_SpaceBasicSettings.scss
View file

@ -27,7 +27,7 @@ limitations under the License.
position: relative; position: relative;
height: 80px; height: 80px;
width: 80px; width: 80px;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
border-radius: 16px; border-radius: 16px;
} }

2
res/css/views/spaces/_SpaceCreateMenu.scss
View file

@ -77,7 +77,7 @@ $spacePanelWidth: 71px;
width: 28px; width: 28px;
top: 0; top: 0;
left: 0; left: 0;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
transform: rotate(90deg); transform: rotate(90deg);
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-position: 2px 3px; mask-position: 2px 3px;

6
res/css/views/toasts/_IncomingCallToast.scss
View file

@ -36,7 +36,7 @@ limitations under the License.
.mx_CallEvent_type { .mx_CallEvent_type {
font-size: $font-12px; font-size: $font-12px;
line-height: $font-15px; line-height: $font-15px;
color: $tertiary-fg-color; color: $tertiary-content;
margin-top: 4px; margin-top: 4px;
margin-bottom: 6px; margin-bottom: 6px;
@ -55,7 +55,7 @@ limitations under the License.
position: absolute; position: absolute;
height: inherit; height: inherit;
width: inherit; width: inherit;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-size: contain; mask-size: contain;
} }
@ -132,7 +132,7 @@ limitations under the License.
height: inherit; height: inherit;
width: inherit; width: inherit;
background-color: $tertiary-fg-color; background-color: $tertiary-content;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-size: contain; mask-size: contain;
mask-position: center; mask-position: center;

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

@ -32,9 +32,6 @@ $room-highlight-color: #343a46;
// typical text (dark-on-white in light skin) // typical text (dark-on-white in light skin)
$muted-fg-color: $header-panel-text-primary-color; $muted-fg-color: $header-panel-text-primary-color;
// additional text colors
$tertiary-fg-color: $tertiary-content;
// used for dialog box text // used for dialog box text
$light-fg-color: $header-panel-text-secondary-color; $light-fg-color: $header-panel-text-secondary-color;
@ -132,7 +129,7 @@ $dialpad-button-bg-color: $quinary-content;
$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons $roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
$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-content;
$roomsublist-divider-color: $primary-content; $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%);

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);
$tertiary-fg-color: #8D99A5;
$header-panel-bg-color: #f3f8fd; $header-panel-bg-color: #f3f8fd;
// typical text (dark-on-white in light skin) // typical text (dark-on-white in light skin)
@ -193,7 +192,7 @@ $dialpad-button-bg-color: $quinary-content;
$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons $roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
$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-content;
$roomsublist-divider-color: $primary-content; $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%);
@ -350,7 +349,7 @@ $voice-record-live-circle-color: #ff4b55;
$voice-record-stop-border-color: $quinary-content; $voice-record-stop-border-color: $quinary-content;
$voice-record-waveform-incomplete-fg-color: $quaternary-content; $voice-record-waveform-incomplete-fg-color: $quaternary-content;
$voice-record-icon-color: $tertiary-fg-color; $voice-record-icon-color: $tertiary-content;
$voice-playback-button-bg-color: $message-body-panel-icon-bg-color; $voice-playback-button-bg-color: $message-body-panel-icon-bg-color;
$voice-playback-button-fg-color: $message-body-panel-icon-fg-color; $voice-playback-button-fg-color: $message-body-panel-icon-fg-color;