From 88c99be195b4b1a95a7978357214cd55df554962 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 24 Nov 2020 08:49:09 +0100
Subject: [PATCH] MOBILE-3320 theme: Move styles into theme folder

---
 angular.json                | 5 +----
 src/{ => theme}/global.scss | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename src/{ => theme}/global.scss (95%)

diff --git a/angular.json b/angular.json
index b7952db75..7caa291e1 100644
--- a/angular.json
+++ b/angular.json
@@ -33,10 +33,7 @@
             ],
             "styles": [
               {
-                "input": "src/theme/variables.scss"
-              },
-              {
-                "input": "src/global.scss"
+                "input": "src/theme/global.scss"
               }
             ],
             "scripts": [],
diff --git a/src/global.scss b/src/theme/global.scss
similarity index 95%
rename from src/global.scss
rename to src/theme/global.scss
index 55e394cfd..44997bd1f 100644
--- a/src/global.scss
+++ b/src/theme/global.scss
@@ -9,6 +9,8 @@
  * https://ionicframework.com/docs/layout/global-stylesheets
  */
 
+/* Application styles */
+@import "./variables.scss";
 
 /* Core CSS required for Ionic components to work properly */
 @import "~@ionic/angular/css/core.css";