Skip to content
Snippets Groups Projects
Commit 84f3b624 authored by Paulina Nogal's avatar Paulina Nogal
Browse files

Update to use Red Hat font

parent 30543a68
No related branches found
No related tags found
1 merge request!36Update to use red hat
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<!-- MATERIAL DESIGN LITE STYLES --> <!-- MATERIAL DESIGN LITE STYLES -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> <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="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 --> <!-- LOCAL STYLES -->
<link rel="stylesheet" href="webapp.css"> <link rel="stylesheet" href="webapp.css">
</head> </head>
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
<!-- MATERIAL DESIGN LITE STYLES --> <!-- MATERIAL DESIGN LITE STYLES -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> <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="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 --> <!-- LOCAL STYLES -->
<link rel="stylesheet" href="webapp.css"> <link rel="stylesheet" href="webapp.css">
</head> </head>
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<!-- MATERIAL DESIGN LITE STYLES --> <!-- MATERIAL DESIGN LITE STYLES -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> <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="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 --> <!-- LOCAL STYLES -->
<link rel="stylesheet" href="webapp.css"> <link rel="stylesheet" href="webapp.css">
</head> </head>
...@@ -83,11 +85,7 @@ ...@@ -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://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/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> <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&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="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=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> <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>
......
@import url(https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700); @import url(https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700);
body, html{ body, html{
font-family: Roboto, sans-serif; font-family: Red Hat Text, sans-serif;
margin: 0; margin: 0;
} }
...@@ -25,6 +25,16 @@ a:hover{ ...@@ -25,6 +25,16 @@ a:hover{
font-size: 32px; 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 { h3 {
font-size: 22px; font-size: 22px;
line-height: 1.2; line-height: 1.2;
...@@ -33,14 +43,12 @@ h3 { ...@@ -33,14 +43,12 @@ h3 {
h4 { h4 {
font-size: 20px; font-size: 20px;
font-weight: 500;
line-height: 1.2; line-height: 1.2;
margin-bottom: 0px; margin-bottom: 0px;
} }
h5 { h5 {
font-size: 18px; font-size: 18px;
font-weight: 400;
} }
.mr-main__content { .mr-main__content {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment