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

Merge branch 'update-to-use-red-hat' into 'master'

Update to use red hat

See merge request !36
parents 8984c925 84f3b624
Branches sadBucky
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>
......
@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