mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update CSS color variables to match our latest design system (#31510)

pull/2818/head
Renaud Chaput 2024-08-20 17:56:44 +02:00 committed by GitHub
parent 6c26fb0ed6
commit 4016fd5128
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/styles/contrast/variables.scss
View File

@ -1,10 +1,10 @@
// Dependent colors // Dependent colors
$black: #000000; $black: #000000;
$classic-base-color: #282c37; $classic-base-color: hsl(240deg, 16%, 19%);
$classic-primary-color: #9baec8; $classic-primary-color: hsl(240deg, 29%, 70%);
$classic-secondary-color: #d9e1e8; $classic-secondary-color: hsl(255deg, 25%, 88%);
$classic-highlight-color: #6364ff; $classic-highlight-color: hsl(240deg, 100%, 69%);
$ui-base-color: $classic-base-color !default; $ui-base-color: $classic-base-color !default;
$ui-primary-color: $classic-primary-color !default; $ui-primary-color: $classic-primary-color !default;

34
app/javascript/styles/mastodon-light/variables.scss
View File

@ -2,25 +2,25 @@
$black: #000000; $black: #000000;
$white: #ffffff; $white: #ffffff;
$classic-base-color: #282c37; $classic-base-color: hsl(240deg, 16%, 19%);
$classic-primary-color: #9baec8; $classic-primary-color: hsl(240deg, 29%, 70%);
$classic-secondary-color: #d9e1e8; $classic-secondary-color: hsl(255deg, 25%, 88%);
$classic-highlight-color: #6364ff; $classic-highlight-color: hsl(240deg, 100%, 69%);
$blurple-600: #563acc; // Iris $blurple-600: hsl(252deg, 59%, 51%); // Iris
$blurple-500: #6364ff; // Brand purple $blurple-500: hsl(240deg, 100%, 69%); // Brand purple
$blurple-300: #858afa; // Faded Blue $blurple-300: hsl(237deg, 92%, 75%); // Faded Blue
$grey-600: #4e4c5a; // Trout $grey-600: hsl(240deg, 8%, 33%); // Trout
$grey-100: #dadaf3; // Topaz $grey-100: hsl(240deg, 51%, 90%); // Topaz
// Differences // Differences
$success-green: lighten(#3c754d, 8%); $success-green: lighten(hsl(138deg, 32%, 35%), 8%);
$base-overlay-background: $white !default; $base-overlay-background: $white !default;
$valid-value-color: $success-green !default; $valid-value-color: $success-green !default;
$ui-base-color: $classic-secondary-color !default; $ui-base-color: $classic-secondary-color !default;
$ui-base-lighter-color: #b0c0cf; $ui-base-lighter-color: hsl(250deg, 24%, 75%);
$ui-primary-color: $classic-primary-color !default; $ui-primary-color: $classic-primary-color !default;
$ui-secondary-color: $classic-base-color !default; $ui-secondary-color: $classic-base-color !default;
$ui-highlight-color: $classic-highlight-color !default; $ui-highlight-color: $classic-highlight-color !default;
@ -35,12 +35,12 @@ $ui-button-tertiary-border-color: $blurple-500 !default;
$primary-text-color: $black !default; $primary-text-color: $black !default;
$darker-text-color: $classic-base-color !default; $darker-text-color: $classic-base-color !default;
$highlight-text-color: $ui-highlight-color !default; $highlight-text-color: $ui-highlight-color !default;
$dark-text-color: #444b5d; $dark-text-color: hsl(240deg, 16%, 32%);
$action-button-color: #606984; $action-button-color: hsl(240deg, 16%, 45%);
$inverted-text-color: $black !default; $inverted-text-color: $black !default;
$lighter-text-color: $classic-base-color !default; $lighter-text-color: $classic-base-color !default;
$light-text-color: #444b5d; $light-text-color: hsl(240deg, 16%, 32%);
// Newly added colors // Newly added colors
$account-background-color: $white !default; $account-background-color: $white !default;
@ -57,11 +57,11 @@ $account-background-color: $white !default;
$emojis-requiring-inversion: 'chains'; $emojis-requiring-inversion: 'chains';
body { body {
--dropdown-border-color: #d9e1e8; --dropdown-border-color: hsl(240deg, 25%, 88%);
--dropdown-background-color: #fff; --dropdown-background-color: #fff;
--modal-border-color: #d9e1e8; --modal-border-color: hsl(240deg, 25%, 88%);
--modal-background-color: var(--background-color-tint); --modal-background-color: var(--background-color-tint);
--background-border-color: #d9e1e8; --background-border-color: hsl(240deg, 25%, 88%);
--background-color: #fff; --background-color: #fff;
--background-color-tint: rgba(255, 255, 255, 80%); --background-color-tint: rgba(255, 255, 255, 80%);
--background-filter: blur(10px); --background-filter: blur(10px);

12
app/javascript/styles/mastodon/variables.scss
View File

@ -7,8 +7,8 @@ $blurple-600: #563acc; // Iris
$blurple-500: #6364ff; // Brand purple $blurple-500: #6364ff; // Brand purple
$blurple-400: #7477fd; // Medium slate blue $blurple-400: #7477fd; // Medium slate blue
$blurple-300: #858afa; // Faded Blue $blurple-300: #858afa; // Faded Blue
$grey-600: #4e4c5a; // Trout $grey-600: hsl(240deg, 8%, 33%); // Trout
$grey-100: #dadaf3; // Topaz $grey-100: hsl(240deg, 51%, 90%); // Topaz
$success-green: #79bd9a !default; // Padua $success-green: #79bd9a !default; // Padua
$error-red: $red-500 !default; // Cerise $error-red: $red-500 !default; // Cerise
@ -18,10 +18,10 @@ $gold-star: #ca8f04 !default; // Dark Goldenrod
$red-bookmark: $warning-red; $red-bookmark: $warning-red;
// Values from the classic Mastodon UI // Values from the classic Mastodon UI
$classic-base-color: #282c37; // Midnight Express $classic-base-color: hsl(240deg, 16%, 19%);
$classic-primary-color: #9baec8; // Echo Blue $classic-primary-color: hsl(240deg, 29%, 70%);
$classic-secondary-color: #d9e1e8; // Pattens Blue $classic-secondary-color: hsl(255deg, 25%, 88%);
$classic-highlight-color: #6364ff; // Brand purple $classic-highlight-color: $blurple-500;
// Variables for defaults in UI // Variables for defaults in UI
$base-shadow-color: $black !default; $base-shadow-color: $black !default;

2
app/lib/themes.rb
View File

@ -7,7 +7,7 @@ class Themes
include Singleton include Singleton
THEME_COLORS = { THEME_COLORS = {
dark: '#191b22', dark: '#181820',
light: '#ffffff', light: '#ffffff',
}.freeze }.freeze