From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 15 Jul 2018 13:39:04 +0000 (+0100)
Subject: Use Karla instead of Ubuntu font
X-Git-Url: http://git.ipfire.org/?p=ipfire.org.git;a=commitdiff_plain;h=616bd6a5cb34e140d4437c5f0e30a477906856fe

Use Karla instead of Ubuntu font

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/.gitmodules b/.gitmodules
index 65441b73..487cbd07 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src/bootstrap"]
 	path = src/bootstrap
 	url = https://github.com/twbs/bootstrap.git
+[submodule "src/fonts"]
+	path = src/fonts
+	url = https://github.com/google/fonts.git
diff --git a/Makefile.am b/Makefile.am
index 292291aa..9a2ac226 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,6 +130,7 @@ templates_staticdir = $(templatesdir)/static
 SCSS_FILES = \
 	src/scss/style.scss \
 	src/scss/_donation.scss \
+	src/scss/_fonts.scss \
 	src/scss/_icons.scss \
 	src/scss/_variables.scss
 
@@ -151,7 +152,8 @@ EXTRA_DIST += \
 staticdir = $(datadir)/static
 
 static_fonts_DATA = \
-	# TODO
+	src/fonts/ofl/karla/Karla-Bold.ttf \
+	src/fonts/ofl/karla/Karla-Regular.ttf
 
 static_fontsdir = $(staticdir)/fonts
 
diff --git a/src/fonts b/src/fonts
new file mode 160000
index 00000000..3ca591da
--- /dev/null
+++ b/src/fonts
@@ -0,0 +1 @@
+Subproject commit 3ca591dae7372a26e254ec6d22e7b453813b9530
diff --git a/src/scss/_fonts.scss b/src/scss/_fonts.scss
new file mode 100644
index 00000000..0b01270f
--- /dev/null
+++ b/src/scss/_fonts.scss
@@ -0,0 +1,35 @@
+/* latin-ext */
+@font-face {
+	font-family: "Karla";
+	font-style: normal;
+	font-weight: 400;
+	src: local("Karla"), local("Karla-Regular"), url(fonts/Karla-Regular.ttf) format("ttf");
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+	font-family: "Karla";
+	font-style: normal;
+	font-weight: 400;
+	src: local("Karla"), local("Karla-Regular"), url(fonts/Karla-Regular.ttf) format("ttf");
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* latin-ext */
+@font-face {
+	font-family: "Karla";
+	font-style: normal;
+	font-weight: 700;
+	src: local("Karla Bold"), local("Karla-Bold"), url(fonts/Karla-Bold.ttf) format("ttf");
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+	font-family: "Karla";
+	font-style: normal;
+	font-weight: 700;
+	src: local("Karla Bold"), local("Karla-Bold"), url(fonts/Karla-Bold.ttf) format("ttf");
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index aac1fd61..780493bd 100644
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -56,10 +56,10 @@ $border-radius:				2px;
 $border-radius-lg:			2px;
 
 // Fonts
-$font-family-sans-serif:	"Ubuntu", sans-serif;
+$font-family-sans-serif:	"Karla", sans-serif;
 
-$font-weight-light:			300;
-$font-weight-normal:		500;
+$font-weight-light:			200;
+$font-weight-normal:		400;
 $font-weight-bold:			700;
 
 // Typo
diff --git a/src/scss/style.scss b/src/scss/style.scss
index 07d4fb2f..3e08f7d2 100644
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -30,6 +30,9 @@
 @import "../bootstrap/scss/utilities";
 @import "../bootstrap/scss/print";
 
+// Include fonts
+@import "fonts";
+
 // Donation Box
 @import "_donation";
 
diff --git a/src/templates/base.html b/src/templates/base.html
index 54390c58..4bf32ac9 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -12,10 +12,6 @@
 
 		<!-- styling stuff -->
 		<link rel="stylesheet" type="text/css" href="{{ static_url("main.css") }}" />
-
-		<!-- Ubuntu font - TODO needs to be delivered locally -->
-		<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Ubuntu:300,500,700" />
-
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 		{% if rss_url %}