From bc9bdf9cd24eccbc313d31579ef282951803c6a6 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Sat, 30 Nov 2024 07:21:03 -0500
Subject: [PATCH] De-sass Admin css styling

---
 app/assets/stylesheets/admin.css             | 19 +++++++++++++++++
 app/assets/stylesheets/admin.css.scss        | 22 --------------------
 app/assets/stylesheets/bootstrap-add-bs5.css |  2 +-
 app/assets/stylesheets/fonts.css             |  8 +++----
 4 files changed, 24 insertions(+), 27 deletions(-)
 create mode 100644 app/assets/stylesheets/admin.css
 delete mode 100644 app/assets/stylesheets/admin.css.scss

diff --git a/app/assets/stylesheets/admin.css b/app/assets/stylesheets/admin.css
new file mode 100644
index 000000000..af29a8d30
--- /dev/null
+++ b/app/assets/stylesheets/admin.css
@@ -0,0 +1,19 @@
+/*
+ * This is a manifest file that'll be compiled into admin.css, which will include all the files
+ * listed below.
+ *
+ *
+ * This loads the Bootstrap 5 defined in package.json and in node_modules/bootstrap
+ *= require bootstrap/dist/css/bootstrap
+ *
+ * We use Bootstrap Icons to have icons that work between core and the rest of the app
+ *= require bootstrap-icons/font/bootstrap-icons
+ *
+ *= require codemirror/lib/codemirror
+ *= require cal-heatmap
+ *
+ *= require fonts
+ *
+ *= require bootstrap-add-bs5
+ *= require admin2
+ */
diff --git a/app/assets/stylesheets/admin.css.scss b/app/assets/stylesheets/admin.css.scss
deleted file mode 100644
index 49e5a04d3..000000000
--- a/app/assets/stylesheets/admin.css.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into admin.css, which will include all the files
- * listed below.
- */
-
-// This loads the Bootstrap 5 defined in package.json and in node_modules/bootstrap
-@import "bootstrap/scss/bootstrap";
-
-// We use Bootstrap Icons to have icons that work between core and the rest of the app
-@import "bootstrap-icons/font/bootstrap-icons";
-
-@import "codemirror/lib/codemirror";
-
-@import "fonts";
-
-// Styling for Bootstrap 5 for Quepid
-@import "bootstrap-add-bs5";
-
-@import "cal-heatmap";
-
-// This is the css for the admin pages only.
-@import "admin2";
diff --git a/app/assets/stylesheets/bootstrap-add-bs5.css b/app/assets/stylesheets/bootstrap-add-bs5.css
index a219582b6..add1e69b3 100644
--- a/app/assets/stylesheets/bootstrap-add-bs5.css
+++ b/app/assets/stylesheets/bootstrap-add-bs5.css
@@ -8,7 +8,7 @@ and updated to Bootstrap 5 standards.
 }
 
 body {
-  background: image-url('blue_bg.jpg') top center repeat;
+  background: url('blue_bg.jpg') top center repeat;
 }
 
 .footer-bar {
diff --git a/app/assets/stylesheets/fonts.css b/app/assets/stylesheets/fonts.css
index ca8246b4a..f07c5e5f0 100644
--- a/app/assets/stylesheets/fonts.css
+++ b/app/assets/stylesheets/fonts.css
@@ -1,27 +1,27 @@
 @font-face {
     font-family: 'allerregular';
-    src: font-url('aller_rg-webfont.woff2') format('woff2');
+    src: url('aller_rg-webfont.woff2') format('woff2');
     font-weight: normal;
     font-style: normal;
 }
 
 @font-face {
     font-family: 'alleritalic';
-    src: font-url('aller_it-webfont.woff2') format('woff2');
+    src: url('aller_it-webfont.woff2') format('woff2');
     font-weight: normal;
     font-style: normal;
 }
 
 @font-face {
     font-family: 'allerbold';
-    src: font-url('aller_bd-webfont.woff2') format('woff2');
+    src: url('aller_bd-webfont.woff2') format('woff2');
     font-weight: normal;
     font-style: normal;
 }
 
 @font-face {
     font-family: 'allerbold_italic';
-    src: font-url('aller_bdit-webfont.woff2') format('woff2');
+    src: url('aller_bdit-webfont.woff2') format('woff2');
     font-weight: normal;
     font-style: normal;
 }