From 0ab58b8c22e8f228846d635b17df85162aee4a61 Mon Sep 17 00:00:00 2001
From: Daniel Barber <github@danbarber.me>
Date: Sun, 8 Sep 2019 11:59:04 -0400
Subject: [PATCH] Refactor to match new CSS structure

---
 .../audio.css.scss => objects/_audio.scss}    |  0
 _assets/stylesheets/styles.scss               |  2 ++
 music/index.markdown                          | 20 +++++++++----------
 3 files changed, 12 insertions(+), 10 deletions(-)
 rename _assets/stylesheets/{includes/audio.css.scss => objects/_audio.scss} (100%)

diff --git a/_assets/stylesheets/includes/audio.css.scss b/_assets/stylesheets/objects/_audio.scss
similarity index 100%
rename from _assets/stylesheets/includes/audio.css.scss
rename to _assets/stylesheets/objects/_audio.scss
diff --git a/_assets/stylesheets/styles.scss b/_assets/stylesheets/styles.scss
index 8dcbeaa..0d4f66b 100644
--- a/_assets/stylesheets/styles.scss
+++ b/_assets/stylesheets/styles.scss
@@ -29,6 +29,7 @@
 
 // 5. Objects – class-based selectors which define undecorated design patterns,
 //    for example media object known from OOCSS
+@import "objects/audio";
 @import "objects/container";
 @import "objects/highlight";
 @import "objects/video-container";
@@ -45,6 +46,7 @@
 @import "components/photos-container";
 @import "components/photos";
 @import "components/photo-thumb";
+@import "components/music-artwork";
 
 // 7. Utilities – utilities and helper classes with ability to override
 //    anything which goes before in the triangle, eg. hide helper class
diff --git a/music/index.markdown b/music/index.markdown
index 31bf72b..84add98 100644
--- a/music/index.markdown
+++ b/music/index.markdown
@@ -18,7 +18,7 @@ in the streaming music compo.
   <source
     src="https://f001.backblazeb2.com/file/danbarber-music/Airport+Lounge.m4a"
     type="audio/mp4">
-</audio> </p>
+</audio></p>
 
 ### Recorded
 
@@ -34,7 +34,7 @@ recorded on my iPhone using a Shure MV88 mic and mixed in Reaper.
   <source
     src="https://f001.backblazeb2.com/file/danbarber-music/Home.m4a"
     type="audio/mp4">
-</audio> </p>
+</audio></p>
 
 #### Times Like These
 
@@ -48,7 +48,7 @@ and mastered in Reaper.
   <source
     src="https://f001.backblazeb2.com/file/danbarber-music/Times Like These.m4a"
     type="audio/mp4">
-</audio> </p>
+</audio></p>
 
 ### Drums
 
@@ -65,7 +65,7 @@ project. I played drums and bass on this track and also mastered it.
   <source
     src="https://f001.backblazeb2.com/file/danbarber-music/Colours.m4a"
     type="audio/mp4">
-</audio> </p>
+</audio></p>
 
 #### Tired of Your Love
 
@@ -80,7 +80,7 @@ Tucker, the brother of one of my fellow students.
   <source
     src="https://f001.backblazeb2.com/file/danbarber-music/Tired Of Your Love.m4a"
     type="audio/mp4">
-</audio> </p>
+</audio></p>
 
 #### Genie in a Bottle
 
@@ -94,7 +94,7 @@ drums and mixed/mastered the version here.
   <source
     src="https://f001.backblazeb2.com/file/danbarber-music/genie_2007-07-01_mastered.m4a"
     type="audio/mp4">
-</audio> </p>
+</audio></p>
 
 #### Substitute
 
@@ -108,7 +108,7 @@ mixed/mastered this track.
   <source
     src="https://f001.backblazeb2.com/file/danbarber-music/substitute_2007-06-23.m4a"
     type="audio/mp4">
-</audio> </p>
+</audio></p>
 
 #### Is Vic There?
 
@@ -121,7 +121,7 @@ Another track from the punk band demo.
   <source
     src="https://f001.backblazeb2.com/file/danbarber-music/isvicthere_cdready.m4a"
     type="audio/mp4">
-</audio> </p>
+</audio></p>
 
 ### Invisible Opera Company of Tibet
 
@@ -140,7 +140,7 @@ purchased on CD via
   <source
     src="https://f001.backblazeb2.com/file/danbarber-music/Templesong.m4a"
     type="audio/mp4">
-</audio> </p>
+</audio></p>
 
 #### Spirit of Joy
 
@@ -151,4 +151,4 @@ purchased on CD via
   <source
     src="https://f001.backblazeb2.com/file/danbarber-music/Spirit of Joy.m4a"
     type="audio/mp4">
-</audio> </p>
+</audio></p>