From 37114b2ad668a4951a2a83b51b21297a6e6dbdb9 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Thu, 25 Oct 2018 06:54:25 +1100
Subject: [PATCH] The rest of the cleanup is going to be hard, so this is the
 last commit before I go test my last changes and get them working.

---
 public/objects/window/_window95.scss | 10 +++++-----
 public/styles/common.scss            |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/public/objects/window/_window95.scss b/public/objects/window/_window95.scss
index a3abe44..c4a7516 100644
--- a/public/objects/window/_window95.scss
+++ b/public/objects/window/_window95.scss
@@ -21,25 +21,25 @@ $o-window--one-third: #{"33.333333333%"};//I needed greater accuracy than SCSS p
 
 @mixin o-window-border($thickness) {
   border: (3px * $thickness) solid black;
-  border-image-source: url($s-asset--directory+'images/window/window.svg');
+  border-image-source: url('~@assets/images/window/window.svg');
   border-image-slice: $o-window--one-third;
 }
 
 @mixin o-window-button($thickness) {
   border: (2px * $thickness) solid black;
-  border-image-source: url($s-asset--directory+'images/window/button.svg');
+  border-image-source: url('~@assets/images/window/button.svg');
   border-image-slice: $o-window--one-third;
   display: inline-block;
   background: $o-window--color-background;
 
   &:not(.is-disabled):active {
-    border-image-source: url($s-asset--directory+'images/window/button-inverted.svg');
+    border-image-source: url('~@assets/images/window/button-inverted.svg');
   }
 }
 
 @mixin o-window-frame($thickness) {
   border: (2px * $thickness) solid black;
-  border-image: url($s-asset--directory+'images/window/frame.svg') $o-window--one-third repeat;
+  border-image: url('~@assets/images/window/frame.svg') $o-window--one-third repeat;
 }
 
 //Classes
@@ -88,7 +88,7 @@ $o-window--one-third: #{"33.333333333%"};//I needed greater accuracy than SCSS p
       height: 14px * $o-window--scale;
       font-size: $o-window--font-size;
 
-      background-image: url($s-asset--directory+'images/window/icons.png');
+      background-image: url('~@assets/images/window/icons.png');
       background-position: 0px 0px;
       background-size: 48px*$o-window--scale 20px*$o-window--scale;
 
diff --git a/public/styles/common.scss b/public/styles/common.scss
index 3872b18..e3d93ab 100644
--- a/public/styles/common.scss
+++ b/public/styles/common.scss
@@ -42,6 +42,12 @@
 @import './elements/_body.scss';
 @import './elements/_headings.scss';
 
+//TEMP
+@import './objects/_page-transition.scss';
+@import './pages/_contact-page.scss';
+@import './pages/_home-page.scss';
+@import './pages/_privacy-policy-page.scss';
+
 //Utilities
 @import './utilities/text-align.scss';