Merge branch 'cool-theme'

src/lib/constants.js

@@ -76,7 +76,8 @@ let constants = {
 		official: [
 			{file: "classic", name: "Vanilla sard"},
 			{file: "blue", name: "Vanilla sky"},
-			{file: "pussthecat.org", name: "Dark by PussTheCat.org"}
+			{file: "pussthecat.org", name: "PussTheCat.org dark v1"},
+			{file: "pussthecat.org-v2", name: "PussTheCat.org dark v2"}
 		],
 		// To add your own theme, create an entry that replaces this array in config.js, then add your theme to it.
 		// Format: `{file: string, name: string}[]`

src/site/sass/includes/_dimensions.sass

@@ -0,0 +1,5 @@
+$layout-a-max: 820px
+$layout-b-min: 821px
+$layout-c-max: 680px
+$layout-home-a-max: 520px
+$layout-home-b-min: 521px

src/site/sass/includes/_main.sass

@@ -1,13 +1,8 @@
 @use "forms"
+@use "dimensions" as *
 
 $theme: () !default
 
-$layout-a-max: 820px
-$layout-b-min: 821px
-$layout-c-max: 680px
-$layout-home-a-max: 520px
-$layout-home-b-min: 521px
-
 @font-face
 	font-family: "Bariol"
 	font-display: swap

src/site/sass/pussthecat.org-v2.sass

@@ -0,0 +1,11 @@
+@use "themes/pussthecat.org-v2" as *
+@use "includes/dimensions" as *
+@use "includes/main" with ($theme: $theme)
+
+@media screen and (min-width: $layout-b-min)
+	.post-page-divider
+		border-left: map-get($theme, "edge-context-divider")
+		border-right: map-get($theme, "edge-context-divider")
+
+	.images-gallery
+		border-left: map-get($theme, "edge-context-divider")

src/site/sass/pussthecat.org.sass

@@ -1,9 +1,11 @@
 @use "themes/pussthecat.org" as *
+@use "includes/dimensions" as *
 @use "includes/main" with ($theme: $theme)
 
-.post-page-divider
+@media screen and (min-width: $layout-b-min)
+	.post-page-divider
 		border-left: map-get($theme, "edge-context-divider")
 		border-right: map-get($theme, "edge-context-divider")
 
-.images-gallery
+	.images-gallery
 		border-left: map-get($theme, "edge-context-divider")

src/site/sass/themes/_pussthecat.org-v2.scss

@@ -0,0 +1,49 @@
+// Defined in scss file instead of sass because indented syntax does not have multiline maps
+// This is based on the classic theme, so it pulls that in as the base and then overwrites only the properties it cares about
+// This also makes it future-proof because future additions to classic will be automatically available in this style too
+
+@use "classic";
+
+$link: #6ca9e6;
+
+$theme: map-merge(classic.$theme, (
+	"background-primary": #121212,
+	"background-timeline-profile": #121212,
+	"background-timeline-loading": #343a40,
+	"background-post-distraction": #0a0a0a,
+	"background-post-overlay": #0a0a0a95,
+	"background-post-header": #343a40,
+	"background-post-pfp-loading": #343a40,
+	"background-post-caption": #121212,
+	"background-post-gallery": #121212,
+	"background-post-loading": #121212,
+	"background-power-primary": #343a40,
+	"background-power-secondary": #121212,
+	"background-power-tertiary": #121212,
+	"background-power-palest": #585e64,
+	"background-power-pale": #474c51,
+	"background-power-quote": #343a40,
+	"background-go-input": #687078,
+	"background-primary-quote": #343a40,
+	"background-banner-success": #343a40,
+	"foreground-primary": #d3d3d3,
+	"foreground-header": #fff,
+	"foreground-power-primary": #fff,
+	"foreground-power-secondary": #d3d3d3,
+	"foreground-power-tertiary": #d3d3d3,
+	"foreground-go-control": #fff,
+	"foreground-thumbnail-alt": #ccc,
+	"foreground-timeline-page": #aaa,
+	"foreground-post-header": #fff,
+	"link-primary": $link,
+	"link-power": $link,
+	"link-error-page": $link,
+	"link-hashtag": #7eae74,
+	"edge-context-divider": 2px solid #000,
+	"edge-thumbnail-hover": solid #ffffff,
+	"edge-go-control": 1px solid #000,
+	"edge-power-divider": 1px solid #343a40,
+	"shadow-down": none,
+	"shadow-right": none,
+	"shadow-down-inset": none
+));

src/site/sass/themes/_pussthecat.org.scss

@@ -4,7 +4,7 @@
 
 @use "classic";
 
-$link: #6ca9e6;
+$link: #808080;
 
 $theme: map-merge(classic.$theme, (
 	"background-primary": #121212,
@@ -20,17 +20,17 @@ $theme: map-merge(classic.$theme, (
 	"background-power-primary": #343a40,
 	"background-power-secondary": #121212,
 	"background-power-tertiary": #121212,
-	"background-power-palest": #585e64,
+	"background-power-palest": #121212,
-	"background-power-pale": #474c51,
+	"background-power-pale": #343a40,
 	"background-power-quote": #343a40,
 	"background-go-input": #687078,
 	"background-primary-quote": #343a40,
 	"background-banner-success": #343a40,
-	"foreground-primary": #d3d3d3,
+	"foreground-primary": #ffffff,
 	"foreground-header": #fff,
 	"foreground-power-primary": #fff,
-	"foreground-power-secondary": #d3d3d3,
+	"foreground-power-secondary": #ffffff,
-	"foreground-power-tertiary": #d3d3d3,
+	"foreground-power-tertiary": #ffffff,
 	"foreground-go-control": #fff,
 	"foreground-thumbnail-alt": #ccc,
 	"foreground-timeline-page": #aaa,
@@ -39,7 +39,7 @@ $theme: map-merge(classic.$theme, (
 	"link-power": $link,
 	"link-error-page": $link,
 	"link-hashtag": #7eae74,
-	"edge-context-divider": 2px solid #000,
+	"edge-context-divider": 2px solid #ffffff,
 	"edge-thumbnail-hover": solid #ffffff,
 	"edge-go-control": 1px solid #000,
 	"edge-power-divider": 1px solid #343a40,