gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-05-07 12:16:14 +00:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Merge 6162001c16 into 8b34daf254

Browse Source
This commit is contained in:
Nick Schonning 2025-05-03 11:04:45 +00:00 committed by GitHub
commit 9e53ee2917
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
@use '../mastodon/functions' as *; @use '../mastodon/functions' as *;
// Dependent colors // Dependent colors
$black: #000000; $black: #000;
$classic-base-color: hsl(240deg, 16%, 19%); $classic-base-color: hsl(240deg, 16%, 19%);
$classic-primary-color: hsl(240deg, 29%, 70%); $classic-primary-color: hsl(240deg, 29%, 70%);

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

@ -5,8 +5,8 @@
$lighten-multiplier: -1 $lighten-multiplier: -1
); );
$black: #000000; // Black $black: #000; // Black
$white: #ffffff; // White $white: #fff; // White
$blurple-500: #6364ff; // Brand purple $blurple-500: #6364ff; // Brand purple
$grey-600: hsl(240deg, 8%, 33%); // Trout $grey-600: hsl(240deg, 8%, 33%); // Trout
$grey-100: hsl(240deg, 51%, 90%); // Topaz $grey-100: hsl(240deg, 51%, 90%); // Topaz

4
app/javascript/styles/mastodon/_variables.scss
View File

@ -2,8 +2,8 @@
@use 'functions' as *; @use 'functions' as *;
// Commonly used web colors // Commonly used web colors
$black: #000000; // Black $black: #000; // Black
$white: #ffffff; // White $white: #fff; // White
$red-600: #b7253d !default; // Deep Carmine $red-600: #b7253d !default; // Deep Carmine
$red-500: #df405a !default; // Cerise $red-500: #df405a !default; // Cerise
$blurple-600: #563acc; // Iris $blurple-600: #563acc; // Iris

1
stylelint.config.js
View File

@ -15,7 +15,6 @@ module.exports = {
rules: { rules: {
'at-rule-empty-line-before': null, 'at-rule-empty-line-before': null,
'color-function-notation': null, 'color-function-notation': null,
'color-hex-length': null,
'declaration-block-no-redundant-longhand-properties': null, 'declaration-block-no-redundant-longhand-properties': null,
'no-descending-specificity': null, 'no-descending-specificity': null,
'no-duplicate-selectors': null, 'no-duplicate-selectors': null,