Compare commits

..

No commits in common. "f3932cf879df8db4ada973195b83099db2ad526c" and "6b7b0d5b157329a149142dcba5933c899a4363d6" have entirely different histories.

2 changed files with 6 additions and 30 deletions

View file

@ -1,20 +1,12 @@
// Commonly used web colors
$black: #000000;
$white: #ffffff;
$red-600: #b7253d !default; // Deep Carmine
$red-500: #df405a !default; // Cerise
$blurple-600: #de18a3;
$blurple-500: lighten($blurple-600, 7%);
$blurple-300: lighten($blurple-600, 21%);
$grey-600: #4e4c5a; // Trout
$grey-100: #dadaf3; // Topaz
$success-green: #5fe43d;
$error-red: #c9343b;
$warning-red: #c96932;
$gold-star: #e4ba3d;
$success-green: #5fe43d !default;
$error-red: #c9343b !default;
$warning-red: #c96932 !default;
$gold-star: #e4ba3d !default;
$red-bookmark: $success-green !default;
$red-bookmark: $success-green;
// Values from the classic Mastodon UI
$classic-base-color: #150f21;
@ -36,22 +28,6 @@ $ui-base-lighter-color: #5f4a6e !default;
$ui-primary-color: $classic-primary-color !default;
$ui-secondary-color: $classic-secondary-color !default;
$ui-highlight-color: $classic-highlight-color !default;
$ui-button-color: $white;
$ui-button-background-color: $blurple-500;
$ui-button-focus-background-color: $blurple-600;
$ui-button-secondary-color: $grey-100 !default;
$ui-button-secondary-border-color: $grey-100 !default;
$ui-button-secondary-focus-background-color: $grey-600 !default;
$ui-button-secondary-focus-color: $white !default;
$ui-button-tertiary-color: $blurple-300 !default;
$ui-button-tertiary-border-color: $blurple-300 !default;
$ui-button-tertiary-focus-background-color: $blurple-600 !default;
$ui-button-tertiary-focus-color: $white !default;
$ui-button-destructive-background-color: $red-500 !default;
$ui-button-destructive-focus-background-color: $red-600 !default;
// Variables for texts
$primary-text-color: $classic-secondary-color !default;

View file

@ -29,7 +29,7 @@ module Mastodon
end
def post_suffix_version
'-1.1.11'
'-1.1.10'
end
def to_a