Merge pull request #198 from TAMULib/style-fixes

Added rem rule to html and lato font
TAMULib · Oct 27, 2022 · c6cd718 · c6cd718
2 parents c576f8c + f37ac0a
commit c6cd718
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -21,6 +21,8 @@
 
   <meta name="description" content="Fedora User Interface" />
 
+  <link href='//fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
+
   <link rel="stylesheet" th:href="${@environment.getProperty('app.url')+'/wro/app.css'}" />
 
 </head>

diff --git a/src/main/webapp/app/resources/styles/sass/app.scss b/src/main/webapp/app/resources/styles/sass/app.scss
@@ -14,10 +14,11 @@
 
 html {
   height: 100%;
+  font-size: 1rem;
 }
 
 body {
-  font-family: Arial, Helvetica, Sans-Serif;
+  font-family: "Lato", sans-serif;
   opacity: 0;
   min-height: 100%;
   display: grid;
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,8 @@ @@
       <meta name="description" content="Fedora User Interface" />
+      <link href='//fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
       <link rel="stylesheet" th:href="${@environment.getProperty('app.url')+'/wro/app.css'}" />
     </head>
@@ Expand Down @@