From b098c9c16af61818b2b74b28407416d374f4f231 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Wed, 14 Dec 2016 14:08:14 +0100
Subject: [PATCH] Fix #355 -- Compatibility problems with recent
 (django-)libsass

---
 src/static/fontawesome/scss/_path.scss        | 14 +++----
 src/static/pretixbase/scss/cachedfiles.scss   |  1 -
 src/static/pretixbase/scss/error.scss         |  1 -
 src/static/pretixbase/scss/webfont.scss       | 42 +++++++++----------
 src/static/pretixcontrol/scss/_variables.scss |  1 -
 src/static/pretixcontrol/scss/main.scss       |  1 -
 src/static/pretixpresale/scss/_variables.scss |  1 -
 src/static/pretixpresale/scss/index.scss      |  1 -
 src/static/pretixpresale/scss/main.scss       |  1 -
 src/static/pretixpresale/scss/waiting.scss    |  1 -
 10 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/src/static/fontawesome/scss/_path.scss b/src/static/fontawesome/scss/_path.scss
index bb457c23a..59a049c9b 100644
--- a/src/static/fontawesome/scss/_path.scss
+++ b/src/static/fontawesome/scss/_path.scss
@@ -3,13 +3,13 @@
 
 @font-face {
   font-family: 'FontAwesome';
-  src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
-  src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
-    url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),
-    url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
-    url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
-    url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
-//  src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+  src: url(static('fontawesome/fonts/fontawesome-webfont.eot?v=#{$fa-version}'));
+  src: url(static('fontawesome/fonts/fontawesome-webfont.eot?#iefix&v=#{$fa-version}')) format('embedded-opentype'),
+    url(static('fontawesome/fonts/fontawesome-webfont.woff2?v=#{$fa-version}')) format('woff2'),
+    url(static('fontawesome/fonts/fontawesome-webfont.woff?v=#{$fa-version}')) format('woff'),
+    url(static('fontawesome/fonts/fontawesome-webfont.ttf?v=#{$fa-version}')) format('truetype'),
+    url(static('fontawesome/fonts/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular')) format('svg');
+//  src: url(static('fontawesome/fonts/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }
diff --git a/src/static/pretixbase/scss/cachedfiles.scss b/src/static/pretixbase/scss/cachedfiles.scss
index 98cf23846..14371f4bc 100644
--- a/src/static/pretixbase/scss/cachedfiles.scss
+++ b/src/static/pretixbase/scss/cachedfiles.scss
@@ -1,5 +1,4 @@
 @import "../../bootstrap/scss/_bootstrap.scss";
-$fa-font-path: static("fontawesome/fonts");
 @import "../../fontawesome/scss/font-awesome.scss";
 @import "colors.scss";
 
diff --git a/src/static/pretixbase/scss/error.scss b/src/static/pretixbase/scss/error.scss
index 0fe929958..5efe6bf59 100644
--- a/src/static/pretixbase/scss/error.scss
+++ b/src/static/pretixbase/scss/error.scss
@@ -1,5 +1,4 @@
 @import "../../bootstrap/scss/_bootstrap.scss";
-$fa-font-path: static("fontawesome/fonts");
 @import "../../fontawesome/scss/font-awesome.scss";
 @import "colors.scss";
 
diff --git a/src/static/pretixbase/scss/webfont.scss b/src/static/pretixbase/scss/webfont.scss
index 3a3430b4b..5cdf715d4 100644
--- a/src/static/pretixbase/scss/webfont.scss
+++ b/src/static/pretixbase/scss/webfont.scss
@@ -1,12 +1,10 @@
-$font-path: static("fonts");
-
 @font-face {
     font-family: 'Open Sans';
-    src: url('#{$font-path}/opensans_bold_macroman/OpenSans-Bold-webfont.eot');
-    src: url('#{$font-path}/opensans_bold_macroman/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'),
-         url('#{$font-path}/opensans_bold_macroman/OpenSans-Bold-webfont.woff') format('woff'),
-         url('#{$font-path}/opensans_bold_macroman/OpenSans-Bold-webfont.ttf') format('truetype'),
-         url('#{$font-path}/opensans_bold_macroman/OpenSans-Bold-webfont.svg#open_sansbold') format('svg');
+    src: url(static('fonts/opensans_bold_macroman/OpenSans-Bold-webfont.eot'));
+    src: url(static('fonts/opensans_bold_macroman/OpenSans-Bold-webfont.eot?#iefix')) format('embedded-opentype'),
+         url(static('fonts/opensans_bold_macroman/OpenSans-Bold-webfont.woff')) format('woff'),
+         url(static('fonts/opensans_bold_macroman/OpenSans-Bold-webfont.ttf')) format('truetype'),
+         url(static('fonts/opensans_bold_macroman/OpenSans-Bold-webfont.svg#open_sansbold')) format('svg');
     font-weight: 700;
     font-style: normal;
 
@@ -14,11 +12,11 @@ $font-path: static("fonts");
 
 @font-face {
     font-family: 'Open Sans';
-    src: url('#{$font-path}/opensans_bolditalic_macroman/OpenSans-BoldItalic-webfont.eot');
-    src: url('#{$font-path}/opensans_bolditalic_macroman/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('#{$font-path}/opensans_bolditalic_macroman/OpenSans-BoldItalic-webfont.woff') format('woff'),
-         url('#{$font-path}/opensans_bolditalic_macroman/OpenSans-BoldItalic-webfont.ttf') format('truetype'),
-         url('#{$font-path}/opensans_bolditalic_macroman/OpenSans-BoldItalic-webfont.svg#open_sansbold_italic') format('svg');
+    src: url(static('fonts/opensans_bolditalic_macroman/OpenSans-BoldItalic-webfont.eot'));
+    src: url(static('fonts/opensans_bolditalic_macroman/OpenSans-BoldItalic-webfont.eot?#iefix')) format('embedded-opentype'),
+         url(static('fonts/opensans_bolditalic_macroman/OpenSans-BoldItalic-webfont.woff')) format('woff'),
+         url(static('fonts/opensans_bolditalic_macroman/OpenSans-BoldItalic-webfont.ttf')) format('truetype'),
+         url(static('fonts/opensans_bolditalic_macroman/OpenSans-BoldItalic-webfont.svg#open_sansbold_italic')) format('svg');
     font-weight: 700;
     font-style: italic;
 
@@ -26,11 +24,11 @@ $font-path: static("fonts");
 
 @font-face {
     font-family: 'Open Sans';
-    src: url('#{$font-path}/opensans_italic_macroman/OpenSans-Italic-webfont.eot');
-    src: url('#{$font-path}/opensans_italic_macroman/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('#{$font-path}/opensans_italic_macroman/OpenSans-Italic-webfont.woff') format('woff'),
-         url('#{$font-path}/opensans_italic_macroman/OpenSans-Italic-webfont.ttf') format('truetype'),
-         url('#{$font-path}/opensans_italic_macroman/OpenSans-Italic-webfont.svg#open_sansitalic') format('svg');
+    src: url(static('fonts/opensans_italic_macroman/OpenSans-Italic-webfont.eot'));
+    src: url(static('fonts/opensans_italic_macroman/OpenSans-Italic-webfont.eot?#iefix')) format('embedded-opentype'),
+         url(static('fonts/opensans_italic_macroman/OpenSans-Italic-webfont.woff')) format('woff'),
+         url(static('fonts/opensans_italic_macroman/OpenSans-Italic-webfont.ttf')) format('truetype'),
+         url(static('fonts/opensans_italic_macroman/OpenSans-Italic-webfont.svg#open_sansitalic')) format('svg');
     font-weight: normal;
     font-style: italic;
 
@@ -38,11 +36,11 @@ $font-path: static("fonts");
 
 @font-face {
     font-family: 'Open Sans';
-    src: url('#{$font-path}/opensans_regular_macroman/OpenSans-Regular-webfont.eot');
-    src: url('#{$font-path}/opensans_regular_macroman/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
-         url('#{$font-path}/opensans_regular_macroman/OpenSans-Regular-webfont.woff') format('woff'),
-         url('#{$font-path}/opensans_regular_macroman/OpenSans-Regular-webfont.ttf') format('truetype'),
-         url('#{$font-path}/opensans_regular_macroman/OpenSans-Regular-webfont.svg#open_sansregular') format('svg');
+    src: url(static('fonts/opensans_regular_macroman/OpenSans-Regular-webfont.eot'));
+    src: url(static('fonts/opensans_regular_macroman/OpenSans-Regular-webfont.eot?#iefix')) format('embedded-opentype'),
+         url(static('fonts/opensans_regular_macroman/OpenSans-Regular-webfont.woff')) format('woff'),
+         url(static('fonts/opensans_regular_macroman/OpenSans-Regular-webfont.ttf')) format('truetype'),
+         url(static('fonts/opensans_regular_macroman/OpenSans-Regular-webfont.svg#open_sansregular')) format('svg');
     font-weight: 400;
     font-style: normal;
 
diff --git a/src/static/pretixcontrol/scss/_variables.scss b/src/static/pretixcontrol/scss/_variables.scss
index cc862d727..12c1074e6 100644
--- a/src/static/pretixcontrol/scss/_variables.scss
+++ b/src/static/pretixcontrol/scss/_variables.scss
@@ -5,7 +5,6 @@ $gray-light: lighten(#000, 60%);
 $gray-lighter: lighten(#000, 93.5%);
 $gray-lightest: lighten(#000, 97.25%);
 $font-family-sans-serif:  "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
-$font-path: static("fonts");
 $brand-primary: #8E44B3 !default;
 $brand-success: #5cb85c;
 $brand-info: #5bc0de;
diff --git a/src/static/pretixcontrol/scss/main.scss b/src/static/pretixcontrol/scss/main.scss
index 994093f44..484910a40 100644
--- a/src/static/pretixcontrol/scss/main.scss
+++ b/src/static/pretixcontrol/scss/main.scss
@@ -1,6 +1,5 @@
 @import "_variables.scss";
 @import "../../bootstrap/scss/_bootstrap.scss";
-$fa-font-path: static("fontawesome/fonts");
 @import "../../fontawesome/scss/font-awesome.scss";
 @import "../../typeahead/typeahead.css";
 @import "../css/metisMenu.min.css";
diff --git a/src/static/pretixpresale/scss/_variables.scss b/src/static/pretixpresale/scss/_variables.scss
index c434da1e8..6d391c981 100644
--- a/src/static/pretixpresale/scss/_variables.scss
+++ b/src/static/pretixpresale/scss/_variables.scss
@@ -1,3 +1,2 @@
 $font-family-sans-serif:  "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
-$font-path: static("fonts");
 $brand-primary: #8E44B3 !default;
diff --git a/src/static/pretixpresale/scss/index.scss b/src/static/pretixpresale/scss/index.scss
index 09f530728..380b19a37 100644
--- a/src/static/pretixpresale/scss/index.scss
+++ b/src/static/pretixpresale/scss/index.scss
@@ -1,5 +1,4 @@
 @import "../../bootstrap/scss/_bootstrap.scss";
-$fa-font-path: static("fontawesome/fonts");
 @import "../../fontawesome/scss/font-awesome.scss";
 @import "../../pretixbase/scss/colors.scss";
 
diff --git a/src/static/pretixpresale/scss/main.scss b/src/static/pretixpresale/scss/main.scss
index 35fa52b6a..b5864f914 100644
--- a/src/static/pretixpresale/scss/main.scss
+++ b/src/static/pretixpresale/scss/main.scss
@@ -1,7 +1,6 @@
 @import "_variables.scss";
 @import "../../pretixbase/scss/colors.scss";
 @import "../../bootstrap/scss/_bootstrap.scss";
-$fa-font-path: static("fontawesome/fonts");
 @import "../../fontawesome/scss/font-awesome.scss";
 
 @import "_event.scss";
diff --git a/src/static/pretixpresale/scss/waiting.scss b/src/static/pretixpresale/scss/waiting.scss
index 3bb6fc138..d91905782 100644
--- a/src/static/pretixpresale/scss/waiting.scss
+++ b/src/static/pretixpresale/scss/waiting.scss
@@ -1,5 +1,4 @@
 @import "../../bootstrap/scss/_bootstrap.scss";
-$fa-font-path: static("fontawesome/fonts");
 @import "../../fontawesome/scss/font-awesome.scss";
 @import "../../pretixbase/scss/colors.scss";