From d0cd7b34c0eb610c79757a93c5a618a9fb14aa43 Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Sat, 16 May 2020 21:15:34 +1200 Subject: [PATCH] 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,