resolve merge conflicts

3 files changed, 17 insertions, 18 deletions

diff --git a/sass/fonts/_Abridge.scss b/sass/fonts/_Abridge.scss
index 3085236..6626626 100644
--- a/sass/fonts/_Abridge.scss
+++ b/sass/fonts/_Abridge.scss
@@ -1,3 +1,8 @@
+// This is for the Abridge icon font, the css for this is adapted from fontello.
+// I experimented using this, it is still here for those that want it, but not used by default.
+// It is a pretty lightweight solution, but still not as good as svg icons directly in the css.
+// The loading of icon fonts is blocked by noscript type browser addons, but css icons are not.
+
 @font-face {
   font-family: 'Abridge';
   src: url('font/Abridge.woff2') format('woff2');
@@ -23,4 +28,4 @@
 .i-last:before { content: '\f101'; } // pagination last page
 .i-prev:before { content: '\f104'; } // pagination previous page
 .i-next:before { content: '\f105'; } // pagination next page
-.i-up:before { content: '\f106'; } // back to top button
\ No newline at end of file
+.i-up:before { content: '\f106'; } // back to top button
diff --git a/sass/fonts/_Lato.scss b/sass/fonts/_Lato.scss
deleted file mode 100644
index 70c3d49..0000000
--- a/sass/fonts/_Lato.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@font-face {
-    font-family: 'Lato';
-    src: local("Lato"), url("font/Lato.woff2");//latin regular
-    font-display: swap;
-}
-@font-face {
-    font-family: 'Lato';
-    src: local("Lato-Italic"), url("font/Lato-Italic.woff2");//latin italic
-    font-style: italic;
-    font-display: swap;
-}
-@font-face {
-    font-family: 'Lato';
-    src: local("Lato-Bold"), url("font/Lato-Bold.woff2");//latin bold
-    font-weight: bold;
-    font-display: swap;
-}
diff --git a/sass/fonts/_Roboto-Mono.scss b/sass/fonts/_Roboto-Mono.scss
new file mode 100644
index 0000000..0685c3d
--- /dev/null
+++ b/sass/fonts/_Roboto-Mono.scss
@@ -0,0 +1,11 @@
+@font-face {
+    font-family: 'Roboto Mono';
+    src: local("Roboto Mono"), local("Roboto-Mono"), local("RobotoMono"), local("Roboto-Mono-Regular"), local("RobotoMono-Regular"), url("font/Roboto-Mono.woff2");//latin regular
+    font-display: swap;
+}
+@font-face {
+    font-family: 'Roboto Mono';
+    src: local("Roboto Mono Italic"), local("Roboto-Mono-Italic"), local("RobotoMono-Italic"), url("font/Roboto-Mono-Italic.woff2");//latin italic
+    font-style: italic;
+    font-display: swap;
+}