From 3f8310b09ca66e70e028b5166274fb7afafb13be Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 20 Oct 2021 09:20:07 +0200
Subject: [PATCH] fix css content

---
 GPW_Admin/Content/Site.css     |  6 ++----
 GPW_Admin/Content/Site.less    |  6 ++----
 GPW_Admin/Content/Style.css    |  1 +
 GPW_Admin/Content/font.css     | 24 ++++++++++++++++++++++++
 GPW_Admin/Content/font.less    | 24 ++++++++++++------------
 GPW_Admin/Content/font.min.css |  1 +
 6 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 GPW_Admin/Content/font.css
 create mode 100644 GPW_Admin/Content/font.min.css

diff --git a/GPW_Admin/Content/Site.css b/GPW_Admin/Content/Site.css
index 84bc566..4768ba7 100644
--- a/GPW_Admin/Content/Site.css
+++ b/GPW_Admin/Content/Site.css
@@ -1,15 +1,13 @@
 /* Move down content because we have a fixed navbar that is 50px tall */
 body {
-  /*padding-top: 50px;
-    padding-bottom: 20px;*/
   font: 'Roboto', sans-serif;
+  /*font: 'Open Sans', sans-serif;*/
 }
 /* Wrapping element */
 /* Set some basic padding to keep content from hitting the edges */
 .body-content {
-  /*padding-left: 15px;
-    padding-right: 15px;*/
   font: 'Roboto', sans-serif;
+  /*font: 'Open Sans', sans-serif;*/
 }
 .textCondens {
   font-family: 'Roboto Condensed', sans-serif;
diff --git a/GPW_Admin/Content/Site.less b/GPW_Admin/Content/Site.less
index 0080181..7bc8b23 100644
--- a/GPW_Admin/Content/Site.less
+++ b/GPW_Admin/Content/Site.less
@@ -1,16 +1,14 @@
 /* Move down content because we have a fixed navbar that is 50px tall */
 body {
-    /*padding-top: 50px;
-    padding-bottom: 20px;*/
     font: 'Roboto', sans-serif;
+    /*font: 'Open Sans', sans-serif;*/
 }
 
 /* Wrapping element */
 /* Set some basic padding to keep content from hitting the edges */
 .body-content {
-    /*padding-left: 15px;
-    padding-right: 15px;*/
     font: 'Roboto', sans-serif;
+    /*font: 'Open Sans', sans-serif;*/
 }
 
 .textCondens {
diff --git a/GPW_Admin/Content/Style.css b/GPW_Admin/Content/Style.css
index 19078b1..310c558 100644
--- a/GPW_Admin/Content/Style.css
+++ b/GPW_Admin/Content/Style.css
@@ -3,6 +3,7 @@
 @import url('ExtraComp.css');
 @import url('BtnReport.css');
 @import url('JQClock.css');
+@import url('../font.css');
 * {
   -webkit-box-sizing: content-box;
   -moz-box-sizing: content-box;
diff --git a/GPW_Admin/Content/font.css b/GPW_Admin/Content/font.css
new file mode 100644
index 0000000..77b5c23
--- /dev/null
+++ b/GPW_Admin/Content/font.css
@@ -0,0 +1,24 @@
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: url('OpenSans.woff') format('woff');
+}
+@font-face {
+  font-family: 'Open Sans Condensed';
+  font-style: normal;
+  font-weight: 300;
+  src: url('OpenSansCondensed.woff') format('woff');
+}
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  src: url('Roboto.woff2') format('woff2');
+}
+@font-face {
+  font-family: 'Roboto Condensed';
+  font-style: normal;
+  font-weight: 300;
+  src: url('RobotoCondensed.woff2') format('woff2');
+}
\ No newline at end of file
diff --git a/GPW_Admin/Content/font.less b/GPW_Admin/Content/font.less
index cc6208e..59d1297 100644
--- a/GPW_Admin/Content/font.less
+++ b/GPW_Admin/Content/font.less
@@ -1,4 +1,4 @@
-/*@font-face {
+@font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 400;
@@ -10,18 +10,18 @@
     font-style: normal;
     font-weight: 300;
     src: url('OpenSansCondensed.woff') format('woff');
-}*/
-
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 400;
-  src: url('Roboto.woff2') format('woff2');
 }
 
 @font-face {
-  font-family: 'Roboto Condensed';
-  font-style: normal;
-  font-weight: 300;
-  src: url('RobotoCondensed.woff2') format('woff2');
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 400;
+    src: url('Roboto.woff2') format('woff2');
 }
+
+@font-face {
+    font-family: 'Roboto Condensed';
+    font-style: normal;
+    font-weight: 300;
+    src: url('RobotoCondensed.woff2') format('woff2');
+}
\ No newline at end of file
diff --git a/GPW_Admin/Content/font.min.css b/GPW_Admin/Content/font.min.css
new file mode 100644
index 0000000..8b10746
--- /dev/null
+++ b/GPW_Admin/Content/font.min.css
@@ -0,0 +1 @@
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('Roboto.woff2') format('woff2');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:300;src:url('RobotoCondensed.woff2') format('woff2');}
\ No newline at end of file