remove CND inclusion and added fonts directly to repo. addresses #15

maschinendeck · Apr 3, 2019 · f876995 · f876995
1 parent 400e905
commit f876995
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 5 deletions.
diff --git a/_includes/head.html b/_includes/head.html
@@ -9,4 +9,5 @@
   <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
+  <script type=text/javascript src=js/jquery.3.3.1.min.js></script>
 </head>
diff --git a/_sass/_bootswatch.scss b/_sass/_bootswatch.scss
@@ -2,8 +2,8 @@
 // Bootswatch
 // -----------------------------------------------------
 
-$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700" !default;
-@import url($web-font-path);
+//$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700" !default;
+//@import url($web-font-path);
 
 // Navbar =====================================================================
 

diff --git a/_sass/_fonts.scss b/_sass/_fonts.scss
@@ -0,0 +1,33 @@
+@font-face {
+	font-family: "Open Sans";
+	src: url("../fonts/OpenSans-Regular.ttf");
+	font-weight: 400;
+}
+@font-face {
+	font-family: "Open Sans";
+	src: url("../fonts/OpenSans-Italic.ttf");
+	font-weight: 400;
+	font-style: italic;
+}
+@font-face {
+	font-family: "Open Sans";
+	src: url("../fonts/OpenSans-Light.ttf");
+	font-weight: 300;
+}
+@font-face {
+	font-family: "Open Sans";
+	src: url("../fonts/OpenSans-LightItalic.ttf");
+	font-weight: 300;
+	font-style: italic;
+}
+@font-face {
+	font-family: "Open Sans";
+	src: url("../fonts/OpenSans-Bold.ttf");
+	font-weight: 700;
+}
+@font-face {
+	font-family: "Open Sans";
+	src: url("../fonts/OpenSans-BoldItalic.ttf");
+	font-weight: 700;
+	font-style: italic;
+}
diff --git a/css/main.scss b/css/main.scss
@@ -44,7 +44,7 @@ $on-laptop:        800px;
 }
 
 
-
+@import "fonts";
 @import "variables";
 @import "bootstrap";
 @import "bootswatch";

diff --git a/fonts/OpenSans-Bold.ttf b/fonts/OpenSans-Bold.ttf
diff --git a/fonts/OpenSans-BoldItalic.ttf b/fonts/OpenSans-BoldItalic.ttf
diff --git a/fonts/OpenSans-Italic.ttf b/fonts/OpenSans-Italic.ttf
diff --git a/fonts/OpenSans-Light.ttf b/fonts/OpenSans-Light.ttf
diff --git a/fonts/OpenSans-LightItalic.ttf b/fonts/OpenSans-LightItalic.ttf
diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf
diff --git a/index.html b/index.html
@@ -19,7 +19,7 @@ <h2>Die Idee</h2>
     </div>
     <div class="col-md-4 col-md-offset-1">
       <h2>Vorbei kommen</h2>
-      <p>Packt eure Lieblingshardware ein und besucht uns beim regelmäßigen Chaostreff jeden Mittwoch um 20:00 Uhr. Ihr findet uns in Trier West, Eurener Str. 14. 
+      <p>Packt eure Lieblingshardware ein und besucht uns beim regelmäßigen Chaostreff jeden Mittwoch um 20:00 Uhr. Ihr findet uns in Trier West, Eurener Str. 14.
         </p>
     </div>
     <div class="col-md-2 col-md-offset-1">
@@ -91,7 +91,6 @@ <h2><a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.t
 </div>
 
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
 <!--script src="/js/main.js"></script>
 <script>
   $(document).ready(function(){

diff --git a/js/jquery.3.3.1.min.js b/js/jquery.3.3.1.min.js