diff --git a/adhocracy-plus/assets/fonts/SourceSansPro-Bold.otf b/adhocracy-plus/assets/fonts/SourceSansPro-Bold.otf
deleted file mode 100755
index 98dbee74d..000000000
Binary files a/adhocracy-plus/assets/fonts/SourceSansPro-Bold.otf and /dev/null differ
diff --git a/adhocracy-plus/assets/fonts/SourceSansPro-It.otf b/adhocracy-plus/assets/fonts/SourceSansPro-It.otf
deleted file mode 100755
index 2d627d9cf..000000000
Binary files a/adhocracy-plus/assets/fonts/SourceSansPro-It.otf and /dev/null differ
diff --git a/adhocracy-plus/assets/fonts/SourceSansPro-Regular.otf b/adhocracy-plus/assets/fonts/SourceSansPro-Regular.otf
deleted file mode 100755
index bdcfb27a4..000000000
Binary files a/adhocracy-plus/assets/fonts/SourceSansPro-Regular.otf and /dev/null differ
diff --git a/adhocracy-plus/assets/fonts/SourceSansPro-Semibold.otf b/adhocracy-plus/assets/fonts/SourceSansPro-Semibold.otf
deleted file mode 100755
index fffdbafeb..000000000
Binary files a/adhocracy-plus/assets/fonts/SourceSansPro-Semibold.otf and /dev/null differ
diff --git a/adhocracy-plus/assets/fonts/SourceSerifPro-Bold.otf b/adhocracy-plus/assets/fonts/SourceSerifPro-Bold.otf
deleted file mode 100755
index 034d9d4e8..000000000
Binary files a/adhocracy-plus/assets/fonts/SourceSerifPro-Bold.otf and /dev/null differ
diff --git a/adhocracy-plus/assets/fonts/SourceSerifPro-It.otf b/adhocracy-plus/assets/fonts/SourceSerifPro-It.otf
deleted file mode 100755
index a0dec7e2f..000000000
Binary files a/adhocracy-plus/assets/fonts/SourceSerifPro-It.otf and /dev/null differ
diff --git a/adhocracy-plus/assets/fonts/SourceSerifPro-Regular.otf b/adhocracy-plus/assets/fonts/SourceSerifPro-Regular.otf
deleted file mode 100755
index dde2fd412..000000000
Binary files a/adhocracy-plus/assets/fonts/SourceSerifPro-Regular.otf and /dev/null differ
diff --git a/adhocracy-plus/assets/scss/_fonts.scss b/adhocracy-plus/assets/scss/_fonts.scss
index f97d1f9ff..656056d29 100644
--- a/adhocracy-plus/assets/scss/_fonts.scss
+++ b/adhocracy-plus/assets/scss/_fonts.scss
@@ -1,41 +1,59 @@
@font-face {
font-family: "SourceSerifPro";
- src: url("../fonts/SourceSerifPro-Regular.otf");
font-style: normal;
font-weight: normal;
+ src: local(""),
+ url("../fonts/SourceSerifPro-Regular.woff2") format("woff2"),
+ url("../fonts/SourceSerifPro-Regular.woff") format("woff");
+ font-display: swap;
}
@font-face {
font-family: "SourceSerifPro";
- src: url("../fonts/SourceSerifPro-It.otf");
font-style: italic;
font-weight: normal;
+ src: local(""),
+ url("../fonts/SourceSerifPro-It.woff2") format("woff2"),
+ url("../fonts/SourceSerifPro-It.woff") format("woff");
+ font-display: swap;
}
@font-face {
font-family: "SourceSansPro";
- src: url("../fonts/SourceSansPro-Regular.otf");
font-style: normal;
font-weight: normal;
+ src: local(""),
+ url("../fonts/SourceSansPro-Regular.woff2") format("woff2"),
+ url("../fonts/SourceSansPro-Regular.woff") format("woff");
+ font-display: swap;
}
@font-face {
font-family: "SourceSansPro";
- src: url("../fonts/SourceSansPro-It.otf");
font-style: italic;
font-weight: normal;
+ src: local(""),
+ url("../fonts/SourceSansPro-It.woff2") format("woff2"),
+ url("../fonts/SourceSansPro-It.woff") format("woff");
+ font-display: swap;
}
@font-face {
font-family: "SourceSansPro";
- src: url("../fonts/SourceSansPro-Semibold.otf");
font-style: normal;
font-weight: 600;
+ src: local(""),
+ url("../fonts/SourceSansPro-Semibold.woff2") format("woff2"),
+ url("../fonts/SourceSansPro-Semibold.woff") format("woff");
+ font-display: swap;
}
@font-face {
font-family: "SourceSansPro";
- src: url("../fonts/SourceSansPro-Bold.otf");
font-style: bold;
font-weight: 900;
+ src: local(""),
+ url("../fonts/SourceSansPro-Bold.woff2") format("woff2"),
+ url("../fonts/SourceSansPro-Bold.woff") format("woff");
+ font-display: swap;
}
diff --git a/adhocracy-plus/assets/scss/style.scss b/adhocracy-plus/assets/scss/style.scss
index e0204fb76..32faedb16 100644
--- a/adhocracy-plus/assets/scss/style.scss
+++ b/adhocracy-plus/assets/scss/style.scss
@@ -54,8 +54,6 @@
@import "layout";
@import "form";
-@import "fonts";
-
@import "icons/style";
@import "components/a4-comments";
diff --git a/adhocracy-plus/templates/base.html b/adhocracy-plus/templates/base.html
index 209a46237..4990fd9bb 100644
--- a/adhocracy-plus/templates/base.html
+++ b/adhocracy-plus/templates/base.html
@@ -41,6 +41,8 @@
{% endif %}
{% endblock %}
+
+
diff --git a/webpack.common.js b/webpack.common.js
index 377d849de..6987aa4bf 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -7,11 +7,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin')
module.exports = {
entry: {
adhocracy4: {
- import: [ // array of entry points
- '@fortawesome/fontawesome-free/scss/fontawesome.scss',
- '@fortawesome/fontawesome-free/scss/brands.scss',
- '@fortawesome/fontawesome-free/scss/regular.scss',
- '@fortawesome/fontawesome-free/scss/solid.scss',
+ import: [ // array of elements in entry point
'select2/dist/css/select2.min.css',
'slick-carousel/slick/slick.css',
'./adhocracy-plus/assets/extra_css/_slick-theme.css',
@@ -24,6 +20,15 @@ module.exports = {
type: 'this'
}
},
+ fonts: {
+ import: [
+ '@fortawesome/fontawesome-free/scss/fontawesome.scss',
+ '@fortawesome/fontawesome-free/scss/brands.scss',
+ '@fortawesome/fontawesome-free/scss/regular.scss',
+ '@fortawesome/fontawesome-free/scss/solid.scss',
+ './adhocracy-plus/assets/scss/_fonts.scss'
+ ]
+ },
captcheck: {
import: [
'./apps/captcha/assets/captcheck.js'