From 92d3b1a9fc80164a417f37090258d8e14788118b Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 11 Aug 2017 14:10:54 +0200 Subject: [PATCH] actually pull in open-sans, move fonts to own include --- customize.dist/src/less/cryptpad.less | 3 +++ customize.dist/src/less2/include/font.less | 9 +++++++++ customize.dist/src/less2/main.less | 8 +++----- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 customize.dist/src/less2/include/font.less diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less index 138ba5817..e7f81db51 100644 --- a/customize.dist/src/less/cryptpad.less +++ b/customize.dist/src/less/cryptpad.less @@ -4,6 +4,7 @@ @import "../less2/include/alertify.less"; @import "../less2/include/colortheme.less"; @import "../less2/include/modal.less"; +@import "../less2/include/font.less"; @import "./bar.less"; @import "./loading.less"; @import "./dropdown.less"; @@ -12,6 +13,8 @@ @toolbar-green: #5cb85c; +.font-open-sans(); + .alertify_main(); html.cp, .cp body { diff --git a/customize.dist/src/less2/include/font.less b/customize.dist/src/less2/include/font.less new file mode 100644 index 000000000..adb5c844f --- /dev/null +++ b/customize.dist/src/less2/include/font.less @@ -0,0 +1,9 @@ +.font-neuropolitical () { + @font-face { + font-family: Neuropolitical; + src: url(./customize/fonts/neuropolitical.ttf) + } +} +.font-open-sans () { + @import (once) '/customize/fonts/open-sans.less'; +} diff --git a/customize.dist/src/less2/main.less b/customize.dist/src/less2/main.less index 2524b6d0f..b26394425 100644 --- a/customize.dist/src/less2/main.less +++ b/customize.dist/src/less2/main.less @@ -1,8 +1,6 @@ -@font-face { - font-family: Neuropolitical; - src: url(./customize/fonts/neuropolitical.ttf) -} -@import (once) '/customize/fonts/open-sans.less'; +@import (once) './include/font.less'; +.font-neuropolitical(); +.font-open-sans(); body.cp-page-index { @import "./pages/page-index.less"; } body.cp-page-contact { @import "./pages/page-contact.less"; }