Merge pull request #189 from mediasanctuary/oct-upgrades

Oct upgrades

.github/workflows/main.yml

@@ -36,4 +36,6 @@ jobs:
                     --human-readable \
                     --filter='P uploads' \
                     --exclude wp-content/uploads \
+                    --exclude deploy_key \
                     ./wp-content/ ${{env.dest}}
+                  rm deploy_key

.nvmrc

@@ -0,0 +1 @@
+v20

bin/start

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -o errexit
 set -o pipefail
@@ -7,6 +7,12 @@ set -o nounset
 dir="$( cd "$(dirname "$( dirname "${BASH_SOURCE[0]}" )" )" >/dev/null 2>&1 && pwd )"
 mkdir -p "$dir/wp-content/uploads"
 
+# use nvm if it's installed
+if [ -f ~/.nvm/nvm.sh ] ; then
+  source ~/.nvm/nvm.sh
+  nvm use
+fi
+
 stop_containers() {
   echo "Shutting off containers..."
   echo

docker-compose.yml → compose.yaml

@@ -1,4 +1,3 @@
-version: "3.5"
 services:
   web:
     build:
@@ -22,7 +21,7 @@ services:
   db:
     image: mariadb:10.5.8
     ports:
-      - 3307:3306
+      - 3306:3306
     restart: always
     environment:
       MYSQL_DATABASE: wordpress

wp-content/themes/mediasanctuary/contribute/contribute.scss

@@ -1,3 +1,5 @@
+@use 'sass:color';
+
 $ff-system: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
 
 body.contribute {
@@ -44,7 +46,7 @@ body.contribute {
 			transition: color 0.2s linear;
 
 			&:hover {
-				color: lighten(#BC3A2E, 20%);
+				color: color.scale(#BC3A2E, $lightness: 20%);
 			}
 		}
 
@@ -156,7 +158,7 @@ body.contribute {
 		.feedback--error {
 			color: #BC3A2E;
 			border: 1px solid #BC3A2E;
-			background: lighten(#BC3A2E, 90%);
+			background: color.scale(#BC3A2E, $lightness: 90%);
 		}
 	}
 

wp-content/themes/mediasanctuary/css/partials/_header.scss

@@ -6,7 +6,7 @@
 	padding-bottom: 30px;
 
 	.container {
-  	min-height: 85px;
+  		min-height: 85px;
 	}
 
 	&:before {
@@ -73,9 +73,9 @@
 		font-family: $f-system;
 		font-size: $s-xxs;
 		border: none;
-    -webkit-appearance: none;
-    appearance: none;
-    border-radius: 0;		
+		-webkit-appearance: none;
+		appearance: none;
+		border-radius: 0;
 
 		&:focus {
 			border: none;
@@ -95,18 +95,19 @@
 		text-indent: -99999em;
 	}
 
-
-	position:relative;
+	& {
+		position: relative;
+	}
 
 	&:before {
-  	display: block;
-    content:'';
-  	background-color: rgba(0, 66, 78, 0.1);
-    position: absolute;
-    top:0;
-    left: 0;
-    right: 0;
-    bottom:0;
+		display: block;
+		content:'';
+		background-color: rgba(0, 66, 78, 0.1);
+		position: absolute;
+		top:0;
+		left: 0;
+		right: 0;
+		bottom:0;
 	}  	  	
 
 
@@ -153,20 +154,17 @@
     }  	
 	}
 
-  @media only screen and (max-width: 600px) {
-    padding-bottom:10px;  
-  }  		
+	@media only screen and (max-width: 600px) {
+		padding-bottom:10px;  
+	}
 
 	.initiative-logo {
-  	display: block;
-  	margin: 0px auto;
-  	padding: 100px 0 20px;
-    @media only screen and (max-width: 860px) {
-      padding: 20px 0;
-    }  	
+		display: block;
+		margin: 0px auto;
+		padding: 100px 0 20px;
+
+		@media only screen and (max-width: 860px) {
+			padding: 20px 0;
+		}
 	}
-
-
-
-
 }