From 27c12776007ff6e9b96fcc73c85982b07520182d Mon Sep 17 00:00:00 2001
From: Stefan <git@stefn.co.uk>
Date: Mon, 4 Nov 2024 00:21:29 +0000
Subject: [PATCH] Update build stuff

---
 build-and-push               |  8 --------
 shell.nix                    |  3 ++-
 style/minima/_base.scss      |  8 ++++----
 style/minima/_layout.scss    | 10 +++++-----
 style/minima/initialize.scss |  5 +++--
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/build-and-push b/build-and-push
index 9915327..22b8f05 100755
--- a/build-and-push
+++ b/build-and-push
@@ -1,12 +1,4 @@
 #!/usr/bin/env
-if [ ! -d ../neocities-ruby ]
-then
-  git clone https://github.com/stefan-burke/neocities-ruby ../neocities-ruby
-else
-  cd ../neocities-ruby
-  git pull
-  cd ../vegan-prestwich
-fi
 
 npm install
 npm run build_pt1
diff --git a/shell.nix b/shell.nix
index d78ac16..078f783 100644
--- a/shell.nix
+++ b/shell.nix
@@ -2,11 +2,12 @@ with (import <nixpkgs> {});
   mkShell {
     buildInputs = [
       bundler
+      html-minifier
       lightningcss
       ruby
+      neocities-cli
       nodejs
       nodePackages_latest.npm
-      nodePackages_latest.html-minifier
     ];
     shellHook = ''
       mkdir -p .nix-gems
diff --git a/style/minima/_base.scss b/style/minima/_base.scss
index 626b81b..9896ff6 100644
--- a/style/minima/_base.scss
+++ b/style/minima/_base.scss
@@ -34,7 +34,7 @@ h1, h2, h3, h4, h5, h6,
 p, blockquote, pre,
 ul, ol, dl, figure,
 %vertical-rhythm {
-  margin-bottom: $spacing-unit / 2;
+  margin-bottom: $spacing-unit-half;
 }
 
 
@@ -112,7 +112,7 @@ a {
 blockquote {
   color: $grey-color;
   border-left: 4px solid $grey-color-light;
-  padding-left: $spacing-unit / 2;
+  padding-left: $spacing-unit-half;
   font-size: 18px;
   letter-spacing: -1px;
   font-style: italic;
@@ -165,8 +165,8 @@ pre {
 
   @include media-query($on-laptop) {
     max-width: 1000px;
-    padding-right: $spacing-unit / 2;
-    padding-left: $spacing-unit / 2;
+    padding-right: $spacing-unit-half;
+    padding-left: $spacing-unit-half;
   }
 }
 
diff --git a/style/minima/_layout.scss b/style/minima/_layout.scss
index c0a5029..0173297 100644
--- a/style/minima/_layout.scss
+++ b/style/minima/_layout.scss
@@ -49,7 +49,7 @@
   @include media-query($on-palm) {
     position: absolute;
     top: 9px;
-    right: $spacing-unit / 2;
+    right: $spacing-unit-half;
     background-color: $background-color;
     border: 1px solid $grey-color-light;
     border-radius: 5px;
@@ -103,7 +103,7 @@
 
 .footer-heading {
   font-size: 18px;
-  margin-bottom: $spacing-unit / 2;
+  margin-bottom: $spacing-unit-half;
 }
 
 .contact-list,
@@ -115,14 +115,14 @@
 .footer-col-wrapper {
   font-size: 15px;
   color: $grey-color;
-  margin-left: -$spacing-unit / 2;
+  margin-left: -$spacing-unit-half;
   @extend %clearfix;
 }
 
 .footer-col {
   float: left;
-  margin-bottom: $spacing-unit / 2;
-  padding-left: $spacing-unit / 2;
+  margin-bottom: $spacing-unit-half;
+  padding-left: $spacing-unit-half;
 }
 
 .footer-col-1 {
diff --git a/style/minima/initialize.scss b/style/minima/initialize.scss
index a5e1948..93f5330 100644
--- a/style/minima/initialize.scss
+++ b/style/minima/initialize.scss
@@ -7,6 +7,7 @@ $small-font-size:  $base-font-size * 0.875 !default;
 $base-line-height: 1.5 !default;
 
 $spacing-unit:     30px !default;
+$spacing-unit-half:     15px !default;
 
 $text-color:       #111 !default;
 $background-color: #fdfdfd !default;
@@ -26,8 +27,8 @@ $on-laptop:        800px !default;
 // Use media queries like this:
 // @include media-query($on-palm) {
 //   .wrapper {
-//     padding-right: $spacing-unit / 2;
-//     padding-left: $spacing-unit / 2;
+//     padding-right: $spacing-unit-half;
+//     padding-left: $spacing-unit-half;
 //   }
 // }
 @mixin media-query($device) {