From 20cd862413efa617f1f0c5c056a7c14af10f72ee Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 13 Nov 2018 21:45:35 +0000 Subject: [PATCH] CSS: Add file with only fonts Is included from Bugzilla Signed-off-by: Michael Tremer --- .gitignore | 1 + Makefile.am | 6 ++++++ src/scss/listing.scss | 2 +- src/scss/style.scss | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 389a7458..53e64486 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /build-aux /configure /config.* +/src/scss/fonts.css /src/scss/listing.css /src/scss/main.css /src/scripts/ipfire.org diff --git a/Makefile.am b/Makefile.am index a7d21571..6fe92dd2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -288,10 +288,12 @@ CLEANFILES += \ static_DATA = \ src/static/favicon.ico \ src/static/robots.txt \ + src/scss/fonts.css \ src/scss/listing.css \ src/scss/main.css CLEANFILES += \ + src/scss/fonts.css \ src/scss/listing.css \ src/scss/main.css @@ -950,6 +952,10 @@ SED_PROCESS = \ %: %.in Makefile $(SED_PROCESS) +%.css: _%.scss Makefile + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(SASSC) --style compressed $< > $@ + %.css: %.scss Makefile $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(SASSC) --style compressed $< > $@ diff --git a/src/scss/listing.scss b/src/scss/listing.scss index 3a9464f2..c40a5b57 100644 --- a/src/scss/listing.scss +++ b/src/scss/listing.scss @@ -11,7 +11,7 @@ @import "../bootstrap/scss/tables"; // Include fonts -@import "fonts"; +@import "_fonts.scss"; body { padding: $spacer * 2; diff --git a/src/scss/style.scss b/src/scss/style.scss index e6522a0a..04e05d7d 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -34,7 +34,7 @@ @import "../bootstrap/scss/print"; // Include fonts -@import "fonts"; +@import "_fonts.scss"; // Custom stuff @import "icons"; -- 2.39.2