diff --git a/myuw-root-webapp/src/main/webapp/403.html b/myuw-root-webapp/src/main/webapp/403.html
index e815793047bcab3ca5bf396b0fc37a820ccae07b..7db551dabaf01b492c4af5225767a5aeef20451d 100644
--- a/myuw-root-webapp/src/main/webapp/403.html
+++ b/myuw-root-webapp/src/main/webapp/403.html
@@ -5,6 +5,8 @@
<!-- MATERIAL DESIGN LITE STYLES -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.indigo-pink.min.css">
+ <link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-display-latin.v14.woff2" as="font" type="font/woff2" crossorigin>
+ <link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-text-latin.v13.woff2" as="font" type="font/woff2" crossorigin>
<!-- LOCAL STYLES -->
<link rel="stylesheet" href="webapp.css">
</head>
diff --git a/myuw-root-webapp/src/main/webapp/404.html b/myuw-root-webapp/src/main/webapp/404.html
index 0f63a8364020b8da28cfdca304fdda23e4314944..de6bdba440fd38a70162120b54d171e30ef15d7c 100644
--- a/myuw-root-webapp/src/main/webapp/404.html
+++ b/myuw-root-webapp/src/main/webapp/404.html
@@ -7,6 +7,8 @@
<!-- MATERIAL DESIGN LITE STYLES -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.indigo-pink.min.css">
+ <link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-display-latin.v14.woff2" as="font" type="font/woff2" crossorigin>
+ <link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-text-latin.v13.woff2" as="font" type="font/woff2" crossorigin>
<!-- LOCAL STYLES -->
<link rel="stylesheet" href="webapp.css">
</head>
diff --git a/myuw-root-webapp/src/main/webapp/500.html b/myuw-root-webapp/src/main/webapp/500.html
index 7b211f6a345c151d7ea9eaff9aad7833a6792c7c..3bd86a299a3cbe6f57f2cb9f0672f6d50a573857 100644
--- a/myuw-root-webapp/src/main/webapp/500.html
+++ b/myuw-root-webapp/src/main/webapp/500.html
@@ -5,6 +5,8 @@
<!-- MATERIAL DESIGN LITE STYLES -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.indigo-pink.min.css">
+ <link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-display-latin.v14.woff2" as="font" type="font/woff2" crossorigin>
+ <link rel="preload" href="https://cdn.wisc.cloud/fonts/uw-rh/0.0.1/redhat-text-latin.v13.woff2" as="font" type="font/woff2" crossorigin>
<!-- LOCAL STYLES -->
<link rel="stylesheet" href="webapp.css">
</head>
@@ -83,11 +85,7 @@
<li role="menuitem"><a href="https://madison.sis.wisc.edu/psp/sissso/EMPLOYEE/SA/c/SA_LEARNING_MANAGEMENT.SS_FACULTY.GBL">Faculty Center</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/EOAWMA_MAIN_FL.EOAWMA_MAIN_FL.GBL">Human Resources Approvals</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=TimeAbsenceDashboard">Manager Time and Absence Dashboard</a></li>
-<<<<<<< HEAD
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID:PTPPNAVCOL&scname=HC_SELF_SERVICE_PAYROLL&PTPPB_GROUPLET_ID=PAYROLL&CRefName=HC_PY_SS_NAVCOLL_FL">Payroll Information (earnings, tax statements, W4, direct deposit, etc.)</a></li>
-=======
- <li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID:PTPPNAVCOL&scname=HC_SELF_SERVICE_PAYROLL&PTPPB_GROUPLET_ID=PAYROLL&ptgpid=ADMN_S202001071517395625097148">Payroll Information (earnings, tax statements, W4, direct deposit, etc.)</a></li>
->>>>>>> f1800d5 (Update 500 error page to include Applications and Resources kb link)
<li role="menuitem"><a href="http://performance-managment-development-program">Performance Management (PMPD)</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=PersonalInformation">Personal Information</a></li>
<li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=RequestAbsence">Request absence</a></li>
diff --git a/myuw-root-webapp/src/main/webapp/webapp.css b/myuw-root-webapp/src/main/webapp/webapp.css
index d6439da3d8abfe3956886d7a7f3d41fdc025484c..52355c91aa7a27197ac8b212df8339327d07baa6 100644
--- a/myuw-root-webapp/src/main/webapp/webapp.css
+++ b/myuw-root-webapp/src/main/webapp/webapp.css
@@ -1,7 +1,7 @@
@import url(https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700);
body, html{
- font-family: Roboto, sans-serif;
+ font-family: Red Hat Text, sans-serif;
margin: 0;
}
@@ -25,6 +25,16 @@ a:hover{
font-size: 32px;
}
+h1 {
+ font-family: Red Hat Display, sans-serif;
+ font-weight: 630;
+}
+
+h2, h3, h4, h5, h6 {
+ font-family: Red Hat Display, sans-serif;
+ font-weight: 650;
+}
+
h3 {
font-size: 22px;
line-height: 1.2;
@@ -33,14 +43,12 @@ h3 {
h4 {
font-size: 20px;
- font-weight: 500;
line-height: 1.2;
margin-bottom: 0px;
}
h5 {
font-size: 18px;
- font-weight: 400;
}
.mr-main__content {