CSS: Add file with only fonts

Is included from Bugzilla

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/.gitignore b/.gitignore
index 389a745864074d7b3128a7984b43f0241cb4ff75..53e644863e3da95a59258985d137f8b366093ec6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 /build-aux
 /configure
 /config.*
 /build-aux
 /configure
 /config.*

+/src/scss/fonts.css

 /src/scss/listing.css
 /src/scss/main.css
 /src/scripts/ipfire.org
 /src/scss/listing.css
 /src/scss/main.css
 /src/scripts/ipfire.org

diff --git a/Makefile.am b/Makefile.am
index a7d2157161dda2512342cefe4ee7f313a05085c0..6fe92dd2ffa17e0051a8f4dea1ab0cf57a77fe53 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -288,10 +288,12 @@ CLEANFILES += \
 static_DATA = \
        src/static/favicon.ico \
        src/static/robots.txt \
 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/listing.css \
        src/scss/main.css
 
 CLEANFILES += \

+       src/scss/fonts.css \

        src/scss/listing.css \
        src/scss/main.css
 
        src/scss/listing.css \
        src/scss/main.css
 


@@ -950,6 +952,10 @@ SED_PROCESS = \
 %: %.in Makefile
        $(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 $< > $@
 %.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 3a9464f21a45a6e6cc304015cb41603cee685857..c40a5b574302373d16122c554d99b7ec7084fb07 100644 (file)
--- a/src/scss/listing.scss
+++ b/src/scss/listing.scss
@@ -11,7 +11,7 @@
 @import "../bootstrap/scss/tables";
 
 // Include fonts
 @import "../bootstrap/scss/tables";
 
 // Include fonts

-@import "fonts";
+@import "_fonts.scss";

 
 body {
     padding: $spacer * 2;
 
 body {
     padding: $spacer * 2;

diff --git a/src/scss/style.scss b/src/scss/style.scss
index e6522a0a02eb8c81363cd64779529492b302fc73..04e05d7dcb5538ab10bf8f7b6e9d1ceaa6d0decb 100644 (file)
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -34,7 +34,7 @@
 @import "../bootstrap/scss/print";
 
 // Include fonts
 @import "../bootstrap/scss/print";
 
 // Include fonts

-@import "fonts";
+@import "_fonts.scss";

 
 // Custom stuff
 @import "icons";
 
 // Custom stuff
 @import "icons";