From a1e880fc899478eada3e3a4e0ef1f999b2250659 Mon Sep 17 00:00:00 2001 From: TheFrenchGhosty Date: Fri, 15 May 2020 18:21:35 +0200 Subject: [PATCH 1/4] Change the color of context-divider to follow the design wanted --- src/site/sass/themes/_pussthecat.org.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/sass/themes/_pussthecat.org.scss b/src/site/sass/themes/_pussthecat.org.scss index 358e1d0..12f0452 100644 --- a/src/site/sass/themes/_pussthecat.org.scss +++ b/src/site/sass/themes/_pussthecat.org.scss @@ -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 #d3d3d3, "edge-thumbnail-hover": solid #ffffff, "edge-go-control": 1px solid #000, "edge-power-divider": 1px solid #343a40, From 9aeea0c647293da32ca3e7feef4ec21c53bd2c5a Mon Sep 17 00:00:00 2001 From: TheFrenchGhosty Date: Fri, 15 May 2020 18:40:57 +0200 Subject: [PATCH 2/4] Create a secondary PussTheCat.org closer to the original vision --- src/lib/constants.js | 3 +- src/site/sass/pussthecat.org-v2.sass | 9 ++++ src/site/sass/themes/_pussthecat.org-v2.scss | 49 ++++++++++++++++++++ src/site/sass/themes/_pussthecat.org.scss | 10 ++-- 4 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 src/site/sass/pussthecat.org-v2.sass create mode 100644 src/site/sass/themes/_pussthecat.org-v2.scss diff --git a/src/lib/constants.js b/src/lib/constants.js index 2c8ef93..f7c4e9c 100644 --- a/src/lib/constants.js +++ b/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}[]` diff --git a/src/site/sass/pussthecat.org-v2.sass b/src/site/sass/pussthecat.org-v2.sass new file mode 100644 index 0000000..479ce9e --- /dev/null +++ b/src/site/sass/pussthecat.org-v2.sass @@ -0,0 +1,9 @@ +@use "themes/pussthecat.org-v2" as * +@use "includes/main" with ($theme: $theme) + +.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") diff --git a/src/site/sass/themes/_pussthecat.org-v2.scss b/src/site/sass/themes/_pussthecat.org-v2.scss new file mode 100644 index 0000000..12f0452 --- /dev/null +++ b/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 #d3d3d3, + "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 +)); diff --git a/src/site/sass/themes/_pussthecat.org.scss b/src/site/sass/themes/_pussthecat.org.scss index 12f0452..232fa17 100644 --- a/src/site/sass/themes/_pussthecat.org.scss +++ b/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, @@ -26,11 +26,11 @@ $theme: map-merge(classic.$theme, ( "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-tertiary": #d3d3d3, + "foreground-power-secondary": #ffffff, + "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 #d3d3d3, + "edge-context-divider": 2px solid #ffffff, "edge-thumbnail-hover": solid #ffffff, "edge-go-control": 1px solid #000, "edge-power-divider": 1px solid #343a40, From d290d4f612642ad697f83642ee374ebc17d46d62 Mon Sep 17 00:00:00 2001 From: TheFrenchGhosty Date: Fri, 15 May 2020 18:43:04 +0200 Subject: [PATCH 3/4] Forgot a change --- src/site/sass/themes/_pussthecat.org.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/site/sass/themes/_pussthecat.org.scss b/src/site/sass/themes/_pussthecat.org.scss index 232fa17..a7d34d1 100644 --- a/src/site/sass/themes/_pussthecat.org.scss +++ b/src/site/sass/themes/_pussthecat.org.scss @@ -20,8 +20,8 @@ $theme: map-merge(classic.$theme, ( "background-power-primary": #343a40, "background-power-secondary": #121212, "background-power-tertiary": #121212, - "background-power-palest": #585e64, - "background-power-pale": #474c51, + "background-power-palest": #121212, + "background-power-pale": #343a40, "background-power-quote": #343a40, "background-go-input": #687078, "background-primary-quote": #343a40, From d0cd7b34c0eb610c79757a93c5a618a9fb14aa43 Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Sat, 16 May 2020 21:15:34 +1200 Subject: [PATCH 4/4] Fix things up --- src/site/sass/includes/_dimensions.sass | 5 +++++ src/site/sass/includes/_main.sass | 7 +------ src/site/sass/pussthecat.org-v2.sass | 12 +++++++----- src/site/sass/pussthecat.org.sass | 12 +++++++----- src/site/sass/themes/_pussthecat.org-v2.scss | 2 +- 5 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 src/site/sass/includes/_dimensions.sass diff --git a/src/site/sass/includes/_dimensions.sass b/src/site/sass/includes/_dimensions.sass new file mode 100644 index 0000000..493a1aa --- /dev/null +++ b/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 diff --git a/src/site/sass/includes/_main.sass b/src/site/sass/includes/_main.sass index cce57f4..a9f4a12 100644 --- a/src/site/sass/includes/_main.sass +++ b/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 diff --git a/src/site/sass/pussthecat.org-v2.sass b/src/site/sass/pussthecat.org-v2.sass index 479ce9e..f305694 100644 --- a/src/site/sass/pussthecat.org-v2.sass +++ b/src/site/sass/pussthecat.org-v2.sass @@ -1,9 +1,11 @@ @use "themes/pussthecat.org-v2" as * +@use "includes/dimensions" as * @use "includes/main" with ($theme: $theme) -.post-page-divider - border-left: map-get($theme, "edge-context-divider") - border-right: map-get($theme, "edge-context-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 - border-left: map-get($theme, "edge-context-divider") + .images-gallery + border-left: map-get($theme, "edge-context-divider") diff --git a/src/site/sass/pussthecat.org.sass b/src/site/sass/pussthecat.org.sass index 68759eb..c96fa9d 100644 --- a/src/site/sass/pussthecat.org.sass +++ b/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 - border-left: map-get($theme, "edge-context-divider") - border-right: map-get($theme, "edge-context-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 - border-left: map-get($theme, "edge-context-divider") + .images-gallery + border-left: map-get($theme, "edge-context-divider") diff --git a/src/site/sass/themes/_pussthecat.org-v2.scss b/src/site/sass/themes/_pussthecat.org-v2.scss index 12f0452..358e1d0 100644 --- a/src/site/sass/themes/_pussthecat.org-v2.scss +++ b/src/site/sass/themes/_pussthecat.org-v2.scss @@ -39,7 +39,7 @@ $theme: map-merge(classic.$theme, ( "link-power": $link, "link-error-page": $link, "link-hashtag": #7eae74, - "edge-context-divider": 2px solid #d3d3d3, + "edge-context-divider": 2px solid #000, "edge-thumbnail-hover": solid #ffffff, "edge-go-control": 1px solid #000, "edge-power-divider": 1px solid #343a40,