From a786fa980d56ab24a31cb394ff606ea0693576e8 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Thu, 6 Jan 2022 10:34:56 +0000
Subject: [PATCH] Rename assets-hugo directory to assets (#3259)

Now that we've dropped the old build pipeline (and an assets directory does not exist in the repo any longer, we can rename the hugo version of the assets (assets-hugo) created during the build tools migration back to simply assets.
---
 .gitignore                                           | 3 +--
 {assets-hugo => assets}/icons/logo.svg               | 0
 {assets-hugo => assets}/scss/_variables_project.scss | 0
 {assets-hugo => assets}/scss/custom.scss             | 0
 config.toml                                          | 4 ----
 static/css/fonts/README.md                           | 4 ++--
 6 files changed, 3 insertions(+), 8 deletions(-)
 rename {assets-hugo => assets}/icons/logo.svg (100%)
 rename {assets-hugo => assets}/scss/_variables_project.scss (100%)
 rename {assets-hugo => assets}/scss/custom.scss (100%)

diff --git a/.gitignore b/.gitignore
index cce5848f..a0c5cef0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 /api/node_modules
-/assets
 /assets.tar.gz
 /data/msc
 /env*
@@ -18,4 +17,4 @@
 _rendered.rst
 /.vscode/
 /.idea/
-/spec/
\ No newline at end of file
+/spec/
diff --git a/assets-hugo/icons/logo.svg b/assets/icons/logo.svg
similarity index 100%
rename from assets-hugo/icons/logo.svg
rename to assets/icons/logo.svg
diff --git a/assets-hugo/scss/_variables_project.scss b/assets/scss/_variables_project.scss
similarity index 100%
rename from assets-hugo/scss/_variables_project.scss
rename to assets/scss/_variables_project.scss
diff --git a/assets-hugo/scss/custom.scss b/assets/scss/custom.scss
similarity index 100%
rename from assets-hugo/scss/custom.scss
rename to assets/scss/custom.scss
diff --git a/config.toml b/config.toml
index c18c024e..21108fb8 100644
--- a/config.toml
+++ b/config.toml
@@ -12,10 +12,6 @@ theme = ["docsy"]
 
 disableKinds = ["taxonomy", "taxonomyTerm"]
 
-# Change the default for assets, because the old Python toolchain uses "assets" for build output.
-# When the old toolchain is retired we can switch back to the default here.
-assetDir = "assets-hugo"
-
 [languages]
 [languages.en]
 title = "Matrix Specification"
diff --git a/static/css/fonts/README.md b/static/css/fonts/README.md
index e6eb74eb..aca33304 100644
--- a/static/css/fonts/README.md
+++ b/static/css/fonts/README.md
@@ -22,9 +22,9 @@ python3 download_google_fonts_css.py \
   
 Which would pop out a `Inter.css` file that should be `@import url("Inter.css")`d
 somewhere in the site's SCSS (currently in
-[/assets-hugo/scss/_variables_project.scss](/assets-hugo/scss/_variables_project.scss)).
+[/assets/scss/_variables_project.scss](/assets/scss/_variables_project.scss)).
 
 Re-running the script and committing any new files is only necessary when a desired 
 font updates (not very often), or we want to change the font we're using. In that case,
 remove the existing font files at `/static/fonts/*.woff2` and re-run the script with a
-different URL.
\ No newline at end of file
+different URL.