Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make google fonts and MaterialIcons available locally #4749

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
312 changes: 312 additions & 0 deletions src/Ombi/ClientApp/src/fonts/roboto-v30-latin-300.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
305 changes: 305 additions & 0 deletions src/Ombi/ClientApp/src/fonts/roboto-v30-latin-500.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
308 changes: 308 additions & 0 deletions src/Ombi/ClientApp/src/fonts/roboto-v30-latin-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
7 changes: 2 additions & 5 deletions src/Ombi/ClientApp/src/index.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<!DOCTYPE html>
<html lang="en">

<head>
<head>
<script type='text/javascript'>window["baseHref"] = '/';</script>
<base href="/" />
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
<link id="favicon" rel="icon" type="image/png" href="images/favicon/favicon.ico"/>
<link rel="apple-touch-icon" type="image/png" href="images/favicon/apple-touch-icon.png"/>
<meta charset="utf-8" />
Expand All @@ -20,12 +18,11 @@

<title>Ombi</title>

<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500&display=swap" rel="stylesheet">
</head>

<body class="mat-typography my-theme">


<app-ombi>
</app-ombi>
</body>
Expand Down
9 changes: 5 additions & 4 deletions src/Ombi/ClientApp/src/styles/Styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import '~@angular/material/theming';
@import "./variables.scss";
@import "./fonts.scss";
// Plus imports for other components in your app.
// Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app.
Expand Down Expand Up @@ -47,11 +48,11 @@
.mat-form-field-appearance-outline.mat-focused .mat-form-field-outline-thick{
color: $ombi-active;
}

.mat-form-field.mat-focused .mat-form-field-label{
color: $ombi-active;
}

.mat-input-element{
caret-color: $ombi-active;
}
Expand Down Expand Up @@ -104,7 +105,7 @@

.mat-tooltip{
background: $ombi-background-accent;
}
}

//Wizard CSS
.mat-stepper-horizontal, .mat-stepper-vertical{
Expand Down Expand Up @@ -177,4 +178,4 @@

.right-buttons {
float:right;
}
}
54 changes: 54 additions & 0 deletions src/Ombi/ClientApp/src/styles/fonts.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/* roboto-300 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: url('../fonts/roboto-v30-latin-300.eot'); /* IE9 Compat Modes */
src: local(''),
url('../fonts/roboto-v30-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/roboto-v30-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/roboto-v30-latin-300.woff') format('woff'), /* Modern Browsers */
url('../fonts/roboto-v30-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/roboto-v30-latin-300.svg#Roboto') format('svg'); /* Legacy iOS */
}

/* roboto-regular - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('../fonts/roboto-v30-latin-regular.eot'); /* IE9 Compat Modes */
src: local(''),
url('../fonts/roboto-v30-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/roboto-v30-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/roboto-v30-latin-regular.woff') format('woff'), /* Modern Browsers */
url('../fonts/roboto-v30-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/roboto-v30-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */
}

/* roboto-500 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 500;
src: url('../fonts/roboto-v30-latin-500.eot'); /* IE9 Compat Modes */
src: local(''),
url('../fonts/roboto-v30-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/roboto-v30-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/roboto-v30-latin-500.woff') format('woff'), /* Modern Browsers */
url('../fonts/roboto-v30-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/roboto-v30-latin-500.svg#Roboto') format('svg'); /* Legacy iOS */
}

/* material icons */
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
//src: url(https://example.com/MaterialIcons-Regular.eot); /* For IE6-8 */
src: local('Material Icons'),
local('MaterialIcons-Regular'),
url('../fonts/MaterialIcons-Regular.woff2') format('woff2'),
//url(https://example.com/MaterialIcons-Regular.woff) format('woff'),
//url(https://example.com/MaterialIcons-Regular.ttf) format('truetype');
}