Compare commits

..

No commits in common. "330594077a9ade8e967bb22417b4a4c00c0b254b" and "44d1e2bd80858c26f34790e225bdf900abc7b426" have entirely different histories.

18 changed files with 22 additions and 204 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View file

@ -1,26 +1,12 @@
// Dependent colors
$black: #000000;
$white: #ffffff;
$blurple-500: #4b85ac;
$blurple-600: darken($blurple-500, 8%);
$blurple-400: lighten($blurple-500, 8%);
$blurple-300: lighten($blurple-500, 12%);
$classic-base-color: #dadada;
$classic-primary-color: #303030;
$classic-secondary-color: #222222;
$classic-highlight-color: #cc7dcc;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !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;
// Differences
$success-green: #3c754d;

View file

@ -1,26 +1,12 @@
// Dependent colors
$black: #000000;
$white: #ffffff;
$blurple-500: #fa3636;
$blurple-600: darken($blurple-500, 8%);
$blurple-400: lighten($blurple-500, 8%);
$blurple-300: lighten($blurple-500, 12%);
$classic-base-color: #a6bbb5;
$classic-primary-color: #293236;
$classic-secondary-color: #012429;
$classic-highlight-color: #e24b4b;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !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;
// Differences
$success-green: #509b95;

View file

@ -1,26 +1,12 @@
// Dependent colors
$black: #000000;
$white: #ffffff;
$blurple-500: #f09f5d;
$blurple-600: darken($blurple-500, 8%);
$blurple-400: lighten($blurple-500, 8%);
$blurple-300: lighten($blurple-500, 12%);
$classic-base-color: #dadada;
$classic-primary-color: #303030;
$classic-secondary-color: #222222;
$classic-highlight-color: #cc7dcc;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !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;
// Differences
$success-green: #3c754d;

View file

@ -1,10 +1,5 @@
// Dependent colors
$black: #000000;
$white: #ffffff;
$blurple-600: #c0512c;
$blurple-500: #d65a31;
$blurple-400: #da6a45;
$blurple-300: #de7a5a;
$classic-base-color: #222831;
$classic-primary-color: #808080;
@ -15,19 +10,9 @@ $ui-base-color: $classic-base-color !default;
$ui-primary-color: $classic-primary-color !default;
$ui-secondary-color: $classic-secondary-color !default;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !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;
// Differences
$ui-highlight-color: $classic-highlight-color !default;
$gold-star: $classic-highlight-color !default;
$ui-highlight-color: #d65a31;
$gold-star: #d65a31;
$darker-text-color: lighten($ui-primary-color, 20%) !default;
$dark-text-color: lighten($ui-primary-color, 12%) !default;

View file

@ -1,3 +0,0 @@
@import 'mastodon-black/variables';
@import 'application';
@import 'mastodon-black/diff';

View file

@ -12,11 +12,6 @@ li.selected li.selected a.selected,
background: #000 !important;
}
.button.button.button-secondary {
color: #fff!important;
background: #000!important;
}
.button.logo-button {
background: #fff;
}

View file

@ -37,4 +37,3 @@ $action-button-color: #444444;
$inverted-text-color: $black !default;
$lighter-text-color: darken($ui-base-color, 6%) !default;
$light-text-color: darken($ui-primary-color, 40%) !default;

View file

@ -1,39 +0,0 @@
// Dependent colors
$black: #000000;
$white: #ffffff;
$blurple-600: #a5b000;
$blurple-500: #b8c401;
$blurple-400: #bfc91a;
$blurple-300: #c6cf33;
$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;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !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;
// 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;

View file

@ -1,3 +0,0 @@
@import 'mastodon-summer/variables';
@import 'application';
@import 'mastodon-summer/diff';

View file

@ -22,17 +22,6 @@ $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-color: $black !default;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !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;
// Differences
$success-green: #029666;

View file

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

View file

@ -1,40 +0,0 @@
// Dependent colors
$black: #000000;
$white: #ffffff;
$blurple-600: #b2d8cf;
$blurple-500: #c6f1e7;
$blurple-400: #d1f3eb;
$blurple-300: #dcf6f0;
$classic-base-color: #29486a;
$classic-primary-color: #70acb1;
$classic-secondary-color: #f0fff3;
$classic-highlight-color: #c6f1e7;
$ui-base-color: $classic-base-color !default;
$ui-primary-color: $classic-primary-color !default;
$ui-secondary-color: $classic-secondary-color !default;
$ui-button-color: $black !default;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !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;
// Differences
$ui-highlight-color: #70acb1;
$gold-star: #c6f1e7;
$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: #70acb1;
$inverted-text-color: $black !default;
$lighter-text-color: darken($ui-base-color, 6%) !default;
$light-text-color: darken($ui-primary-color, 40%) !default;

View file

@ -21,14 +21,6 @@
}
}
.content-wrapper,
.sidebar-wrapper--empty,
.account__section-headline,
.about__section__title,
.about__meta {
background: $ui-base-color;
}
.link-footer p {
color: $darker-text-color;

View file

@ -1,26 +1,12 @@
// Dependent colors
$black: #000000;
$white: #ffffff;
$blurple-500: #ff2e62;
$blurple-600: darken($blurple-500, 8%);
$blurple-400: lighten($blurple-500, 8%);
$blurple-300: lighten($blurple-500, 12%);
$classic-base-color: #a6abbb;
$classic-primary-color: #f372e2;
$classic-secondary-color: #011929;
$classic-highlight-color: #e342f8;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !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;
// Differences
$success-green: #3c754d;

View file

@ -1803,20 +1803,16 @@ en:
tags:
does_not_match_previous_name: does not match the previous name
themes:
chillstep: radtown (Chillstep)
contrast: Mastodon (High contrast)
default: Mastodon (Dark)
demogorgon: radtown (Demogorgon)
dx7: radtown (DX7)
mastodon-34: notalive (34)
mastodon-autumn: notalive (Autumn)
mastodon-black: notalive (Black)
mastodon-light: Mastodon (Light)
mastodon-spring: notalive (Spring)
mastodon-summer: notalive (Summer)
mastodon-winter: notalive (Winter)
mastodon-autumn: Mastodon (Autumn)
mastodon-winter: Mastodon (Winter)
synthwave: Radtown (Synthwave)
chillstep: Radtown (Chillstep)
demogorgon: Radtown (Demogorgon)
dx7: Radtown (DX7)
nzws: nzwsme (nzws)
synthwave: radtown (Synthwave)
system: Automatic (use system theme)
time:
formats:

View file

@ -3,10 +3,6 @@ contrast: styles/contrast.scss
mastodon-light: styles/mastodon-light.scss
mastodon-autumn: styles/mastodon-autumn.scss
mastodon-winter: styles/mastodon-winter.scss
mastodon-spring: styles/mastodon-spring.scss
mastodon-summer: styles/mastodon-summer.scss
mastodon-34: styles/mastodon-34.scss
mastodon-black: styles/mastodon-black.scss
synthwave: styles/synthwave.scss
chillstep: styles/chillstep.scss
demogorgon: styles/demogorgon.scss