Merge branch 'feature/localfontsfiles' into 'master'

Move font files to /static



See merge request !141

website/thaliawebsite/settings/production.py

@@ -43,7 +43,7 @@ STATIC_ROOT = '/static'
 COMPRESS_ENABLED = True
 
 COMPRESS_PRECOMPILERS = (
-    ('text/x-scss', 'sass --scss {infile} {outfile}'),
+    ('text/x-scss', 'django_libsass.SassCompiler'),
 )
 
 COMPRESS_CSS_FILTERS = ['compressor.filters.css_default.CssAbsoluteFilter',

website/thaliawebsite/static/css/fonts.scss

+@font-face {
+	font-family: 'Open Sans';
+	src: url('../fonts/OpenSans-Italic.eot');
+	src: url('../fonts/OpenSans-Italic.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/OpenSans-Italic.woff2') format('woff2'),
+		url('../fonts/OpenSans-Italic.woff') format('woff'),
+		url('../fonts/OpenSans-Italic.ttf') format('truetype'),
+		url('../fonts/OpenSans-Italic.svg#OpenSans-Italic') format('svg');
+	font-weight: normal;
+	font-style: italic;
+}
+
+@font-face {
+	font-family: 'Open Sans';
+	src: url('../fonts/OpenSans-BoldItalic.eot');
+	src: url('../fonts/OpenSans-BoldItalic.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/OpenSans-BoldItalic.woff2') format('woff2'),
+		url('../fonts/OpenSans-BoldItalic.woff') format('woff'),
+		url('../fonts/OpenSans-BoldItalic.ttf') format('truetype'),
+		url('../fonts/OpenSans-BoldItalic.svg#OpenSans-BoldItalic') format('svg');
+	font-weight: bold;
+	font-style: italic;
+}
+
+@font-face {
+	font-family: 'Open Sans';
+	src: url('../fonts/OpenSans-Bold.eot');
+	src: url('../fonts/OpenSans-Bold.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/OpenSans-Bold.woff2') format('woff2'),
+		url('../fonts/OpenSans-Bold.woff') format('woff'),
+		url('../fonts/OpenSans-Bold.ttf') format('truetype'),
+		url('../fonts/OpenSans-Bold.svg#OpenSans-Bold') format('svg');
+	font-weight: bold;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: 'Open Sans';
+	src: url('../fonts/OpenSans.eot');
+	src: url('../fonts/OpenSans.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/OpenSans.woff2') format('woff2'),
+		url('../fonts/OpenSans.woff') format('woff'),
+		url('../fonts/OpenSans.ttf') format('truetype'),
+		url('../fonts/OpenSans.svg#OpenSans') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: 'Oswald';
+	src: url('../fonts/Oswald-Regular.eot');
+	src: url('../fonts/Oswald-Regular.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/Oswald-Regular.woff2') format('woff2'),
+		url('../fonts/Oswald-Regular.woff') format('woff'),
+		url('../fonts/Oswald-Regular.ttf') format('truetype'),
+		url('../fonts/Oswald-Regular.svg#Oswald-Regular') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}

website/thaliawebsite/static/css/skin.scss

 @import "presets/defaults.scss";
+@import "fonts.scss";
 
 /* -------------------------------------------------------------------------------- /
 	[1]	SETUP - general settings, common classes

website/thaliawebsite/static/css/style.scss

-@import "presets/defaults.scss";
-
 /* -------------------------------------------------------------------------------- /
 
 	imbus - Simple HTML Template v1.0
@@ -4963,3 +4961,5 @@ ul.rslides > li {
 .loginForm input {
     margin: .5em;
 }
+
+@import "skin.scss";

website/thaliawebsite/templates/base.html

@@ -16,8 +16,6 @@
 
 <!-- css stylesheets -->
 {% block css_head %}
-<link href="https://fonts.googleapis.com/css?family=Open+Sans:400italic,400,700" rel="stylesheet" type="text/css">
-<link href="https://fonts.googleapis.com/css?family=Oswald:400" rel="stylesheet" type="text/css">
 {% compress css %}
 <link href="{% static "plugins/font-awesome/css/font-awesome.min.css" %}" rel="stylesheet" type="text/css">
 
@@ -26,7 +24,6 @@
 <link href="{% static "css/jquery.fancybox.css" %}" rel="stylesheet" type="text/css">
 
 <link href="{% static "css/style.scss" %}" rel="stylesheet" type="text/x-scss">
-<link href="{% static "css/skin.scss" %}" rel="stylesheet" type="text/x-scss">
 {% endcompress %}{% endblock %}
 
 <!-- js head -->