merge 34 and spring themes, fix spring theme

This commit is contained in:
ida schmidt 2020-03-12 06:23:59 -07:00
commit bdf40ba2d8
2 changed files with 26 additions and 0 deletions
app/javascript/styles

View file

@ -0,0 +1,2 @@
@import 'mastodon-spring/variables';
@import 'application';

View file

@ -0,0 +1,24 @@
// Dependent colors
$black: #000000;
$classic-base-color: #224021;
$classic-primary-color: #bd9083;
$classic-secondary-color: #ffffff;
$classic-highlight-color: #b8c401;
$ui-base-color: $classic-base-color !default;
$ui-primary-color: $classic-primary-color !default;
$ui-secondary-color: $classic-secondary-color !default;
// Differences
$ui-highlight-color: $classic-highlight-color !default;
$gold-star: $classic-highlight-color !default;
$darker-text-color: lighten($ui-primary-color, 20%) !default;
$dark-text-color: lighten($ui-primary-color, 12%) !default;
$secondary-text-color: lighten($ui-secondary-color, 6%) !default;
$highlight-text-color: $classic-highlight-color !default;
$action-button-color: #f1a801;
$inverted-text-color: $black !default;
$lighter-text-color: darken($ui-base-color, 6%) !default;
$light-text-color: darken($ui-primary-color, 40%) !default;