nzws theme v4.3 port

normalize english locales for themes
# This is a combination of 2 commits.
2025-03-11 16:33:36 +00:00 · 2025-03-10 19:53:41 +00:00 · 2025-03-10 19:47:15 +00:00 · 2025-03-10 19:46:31 +00:00 · 2025-03-10 19:44:17 +00:00 · 2025-03-10 19:22:54 +00:00
18 changed files with 204 additions and 22 deletions
--- a/app/javascript/images/logo-skull.png
+++ b/app/javascript/images/logo-skull.png
--- a/app/javascript/images/logo.svg
+++ b/app/javascript/images/logo.svg
--- a/app/javascript/styles/chillstep/variables.scss
+++ b/app/javascript/styles/chillstep/variables.scss
@ -1,12 +1,26 @@
 // 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;

@ -26,4 +40,4 @@ $action-button-color: #74b8c4;

 $inverted-text-color: #597264 !default;
 $lighter-text-color: #594461 !default;
-$light-text-color: #444b5d;
+$light-text-color: #444b5d;
--- a/app/javascript/styles/demogorgon/variables.scss
+++ b/app/javascript/styles/demogorgon/variables.scss
@ -1,12 +1,26 @@
 // 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;

@ -26,4 +40,4 @@ $action-button-color: #71a3cc;

 $inverted-text-color: $black !default;
 $lighter-text-color: $classic-base-color !default;
-$light-text-color: #c5e7e7;
+$light-text-color: #c5e7e7;
--- a/app/javascript/styles/dx7/variables.scss
+++ b/app/javascript/styles/dx7/variables.scss
@ -1,12 +1,26 @@
 // 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;

@ -26,4 +40,4 @@ $action-button-color: $ui-primary-color;

 $inverted-text-color: #597264 !default;
 $lighter-text-color: #594461 !default;
-$light-text-color: #444b5d;
+$light-text-color: #444b5d;
--- a/app/javascript/styles/mastodon-autumn/variables.scss
+++ b/app/javascript/styles/mastodon-autumn/variables.scss
@ -1,5 +1,10 @@
 // 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;
@ -10,9 +15,19 @@ $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: #d65a31;
-$gold-star: #d65a31;
+$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;
--- a/app/javascript/styles/mastodon-black.scss
+++ b/app/javascript/styles/mastodon-black.scss
@ -0,0 +1,3 @@
+@import 'mastodon-black/variables';
+@import 'application';
+@import 'mastodon-black/diff';
--- a/app/javascript/styles/mastodon-black/diff.scss
+++ b/app/javascript/styles/mastodon-black/diff.scss
@ -12,6 +12,11 @@ li.selected li.selected a.selected,
  background: #000 !important;
 }

+.button.button.button-secondary {
+  color: #fff!important;
+  background: #000!important;
+}
+
 .button.logo-button {
  background: #fff;
 }
--- a/app/javascript/styles/mastodon-black/variables.scss
+++ b/app/javascript/styles/mastodon-black/variables.scss
@ -37,3 +37,4 @@ $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;
+
--- a/app/javascript/styles/mastodon-spring/variables.scss
+++ b/app/javascript/styles/mastodon-spring/variables.scss
@ -0,0 +1,39 @@
+// 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;
--- a/app/javascript/styles/mastodon-summer.scss
+++ b/app/javascript/styles/mastodon-summer.scss
@ -0,0 +1,3 @@
+@import 'mastodon-summer/variables';
+@import 'application';
+@import 'mastodon-summer/diff';
--- a/app/javascript/styles/mastodon-summer/variables.scss
+++ b/app/javascript/styles/mastodon-summer/variables.scss
@ -22,6 +22,17 @@ $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;

--- a/app/javascript/styles/mastodon-winter.scss
+++ b/app/javascript/styles/mastodon-winter.scss
@ -0,0 +1,2 @@
+@import 'mastodon-winter/variables';
+@import 'application';
--- a/app/javascript/styles/mastodon-winter/variables.scss
+++ b/app/javascript/styles/mastodon-winter/variables.scss
@ -0,0 +1,40 @@
+// 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;
--- a/app/javascript/styles/nzws/diff.scss
+++ b/app/javascript/styles/nzws/diff.scss
@ -21,6 +21,14 @@
  }
 }

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

--- a/app/javascript/styles/synthwave/variables.scss
+++ b/app/javascript/styles/synthwave/variables.scss
@ -1,12 +1,26 @@
 // 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;

@ -26,4 +40,4 @@ $action-button-color: #bd9ac4;

 $inverted-text-color: $black !default;
 $lighter-text-color: $classic-base-color !default;
-$light-text-color: #444b5d;
+$light-text-color: #444b5d;
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -1803,16 +1803,20 @@ 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-autumn: Mastodon (Autumn)
-    mastodon-winter: Mastodon (Winter)
-    synthwave: Radtown (Synthwave)
-    chillstep: Radtown (Chillstep) 
-    demogorgon: Radtown (Demogorgon)
-    dx7: Radtown (DX7)
+    mastodon-spring: notalive (Spring)
+    mastodon-summer: notalive (Summer)
+    mastodon-winter: notalive (Winter)
    nzws: nzwsme (nzws)
+    synthwave: radtown (Synthwave)
    system: Automatic (use system theme)
  time:
    formats:
--- a/config/themes.yml
+++ b/config/themes.yml
@ -3,6 +3,10 @@ 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
Author	SHA1	Message	Date
ida	330594077a	nzws theme v4.3 port	2025-03-11 16:33:36 +00:00
ida	681799a2cf	normalize english locales for themes	2025-03-10 19:53:41 +00:00
ida	c9ca203554	# This is a combination of 2 commits. # This is the 1st commit message: fix seasonal themes # The commit message #2 will be skipped: # fix radtown themes	2025-03-10 19:47:15 +00:00
ida	a86f607ec2	add summer theme	2025-03-10 19:46:31 +00:00
ida	36be83d3b8	copy over 34 to summer, so we can start work on that	2025-03-10 19:44:17 +00:00
ida	af1de9aeef	change naming scheme for custom themes, and make radtown names lowercase for consistency	2025-03-10 19:22:54 +00:00
ida	3fb8643ec5	add beanskull	2025-03-10 19:22:54 +00:00
ida	dec66e64aa	add r34 theme	2025-03-10 19:18:03 +00:00
ida	d33b71baf9	start work on black/white theme	2025-03-10 19:15:21 +00:00
ida	b9a0df21b9	add winter theme	2025-03-10 19:14:45 +00:00