Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix dark theme codeblock colors #6384

Merged
merged 2 commits into from
Oct 23, 2021
Merged

Fix dark theme codeblock colors #6384

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94afdf1
I shall be murdered by design people for this
SimonBrandner Jul 15, 2021
127b8ea
Merge remote-tracking branch 'upstream/develop' into fix/codeblock-co…
SimonBrandner Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ $hover-select-border: 4px;

pre, code {
font-family: $monospace-font-family !important;
background-color: $header-panel-bg-color;
background-color: $codeblock-background-color;
}

pre {
Expand Down
2 changes: 2 additions & 0 deletions res/themes/dark/css/_dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ $groupFilterPanel-background-blur-amount: 30px;

$composer-shadow-color: rgba(0, 0, 0, 0.28);

$codeblock-background-color: #2a3039;

// ***** Mixins! *****

@define-mixin mx_DialogButton {
Expand Down
2 changes: 2 additions & 0 deletions res/themes/legacy-dark/css/_legacy-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ $appearance-tab-border-color: $room-highlight-color;

$composer-shadow-color: tranparent;

$codeblock-background-color: #2a3039;

// ***** Mixins! *****

@define-mixin mx_DialogButton {
Expand Down
8 changes: 5 additions & 3 deletions res/themes/legacy-light/css/_legacy-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
/* Noto Color Emoji contains digits, in fixed-width, therefore causing
digits in flowed text to stand out.
TODO: Consider putting all emoji fonts to the end rather than the front. */
$font-family: Nunito, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
$font-family: nunito, twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', arial, helvetica, sans-serif, 'Noto Color Emoji';

$monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Courier, monospace, 'Noto Color Emoji';
$monospace-font-family: inconsolata, twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', courier, monospace, 'Noto Color Emoji';

// unified palette
// try to use these colors when possible
Expand Down Expand Up @@ -347,6 +347,8 @@ $appearance-tab-border-color: $input-darker-bg-color;

$composer-shadow-color: tranparent;

$codeblock-background-color: $header-panel-bg-color;

// ***** Mixins! *****

@define-mixin mx_DialogButton {
Expand Down Expand Up @@ -383,7 +385,7 @@ $composer-shadow-color: tranparent;
@define-mixin mx_DialogButton_secondary {
// flip colours for the secondary ones
font-weight: 600;
border: 1px solid $accent-color ! important;
border: 1px solid $accent-color !important;
color: $accent-color;
background-color: $button-secondary-bg-color;
}
Expand Down
8 changes: 5 additions & 3 deletions res/themes/light/css/_light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
/* Noto Color Emoji contains digits, in fixed-width, therefore causing
digits in flowed text to stand out.
TODO: Consider putting all emoji fonts to the end rather than the front. */
$font-family: Inter, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
$font-family: inter, twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', arial, helvetica, sans-serif, 'Noto Color Emoji';

$monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Courier, monospace, 'Noto Color Emoji';
$monospace-font-family: inconsolata, twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', courier, monospace, 'Noto Color Emoji';

// unified palette
// try to use these colors when possible
Expand Down Expand Up @@ -349,6 +349,8 @@ $groupFilterPanel-background-blur-amount: 20px;

$composer-shadow-color: rgba(0, 0, 0, 0.04);

$codeblock-background-color: $header-panel-bg-color;

// ***** Mixins! *****

@define-mixin mx_DialogButton {
Expand Down Expand Up @@ -385,7 +387,7 @@ $composer-shadow-color: rgba(0, 0, 0, 0.04);
@define-mixin mx_DialogButton_secondary {
// flip colours for the secondary ones
font-weight: 600;
border: 1px solid $accent-color ! important;
border: 1px solid $accent-color !important;
color: $accent-color;
background-color: $button-secondary-bg-color;
}
Expand Down