From: Michael Tremer Date: Mon, 20 Jun 2022 17:49:59 +0000 (+0000) Subject: Pull in a recent version of Font Awesome X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85cd4dbd5947dffed79c31607442c953dc5b2879;p=pbs.git Pull in a recent version of Font Awesome Signed-off-by: Michael Tremer --- diff --git a/.gitmodules b/.gitmodules index 0172da16..90f21b7c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "src/third-party/foundation-sites"] path = src/third-party/foundation-sites url = https://git.ipfire.org/pub/git/thirdparty/foundation/foundation-sites.git +[submodule "src/third-party/Font-Awesome"] + path = src/third-party/Font-Awesome + url = https://git.ipfire.org/pub/git/thirdparty/Font-Awesome.git diff --git a/Makefile.am b/Makefile.am index f650e050..84ee7c53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -338,19 +338,12 @@ static_cssdir = $(staticdir)/css EXTRA_DIST += \ src/static/css/_fonts.scss \ + src/static/css/_icons.scss \ src/static/css/site.scss CLEANFILES += \ src/static/css/site.css -dist_static_font_DATA = \ - src/static/font/fontawesome-webfont.eot \ - src/static/font/fontawesome-webfont.svg \ - src/static/font/fontawesome-webfont.ttf \ - src/static/font/fontawesome-webfont.woff - -static_fontdir = $(staticdir)/font - static_js_DATA = \ src/static/js/foundation.min.js \ src/static/js/jquery.min.js \ @@ -382,7 +375,13 @@ dist_static_fonts_DATA = \ src/third-party/fonts/prompt/Prompt-SemiBold.ttf \ src/third-party/fonts/prompt/Prompt-SemiBoldItalic.ttf \ src/third-party/fonts/prompt/Prompt-Thin.ttf \ - src/third-party/fonts/prompt/Prompt-ThinItalic.ttf + src/third-party/fonts/prompt/Prompt-ThinItalic.ttf \ + src/third-party/Font-Awesome/webfonts/fa-brands-400.ttf \ + src/third-party/Font-Awesome/webfonts/fa-brands-400.woff2 \ + src/third-party/Font-Awesome/webfonts/fa-regular-400.ttf \ + src/third-party/Font-Awesome/webfonts/fa-regular-400.woff2 \ + src/third-party/Font-Awesome/webfonts/fa-solid-900.ttf \ + src/third-party/Font-Awesome/webfonts/fa-solid-900.woff2 static_fontsdir = $(staticdir)/fonts diff --git a/src/static/css/_icons.scss b/src/static/css/_icons.scss new file mode 100644 index 00000000..7aaa8cf5 --- /dev/null +++ b/src/static/css/_icons.scss @@ -0,0 +1,9 @@ +/* + Import Font-Awesome +*/ + +$fa-font-path: "../fonts"; + +@import "../../third-party/Font-Awesome/scss/fontawesome"; +@import "../../third-party/Font-Awesome/scss/solid"; +@import "../../third-party/Font-Awesome/scss/brands"; diff --git a/src/static/css/site.scss b/src/static/css/site.scss index 1ca2c237..642b83a5 100644 --- a/src/static/css/site.scss +++ b/src/static/css/site.scss @@ -15,6 +15,9 @@ $foundation-palette: ( // Import fonts @import "fonts"; +// Import icons +@import "icons"; + /* Import Foundation Sites */ diff --git a/src/static/font/fontawesome-webfont.eot b/src/static/font/fontawesome-webfont.eot deleted file mode 100755 index 7d81019e..00000000 Binary files a/src/static/font/fontawesome-webfont.eot and /dev/null differ diff --git a/src/static/font/fontawesome-webfont.svg b/src/static/font/fontawesome-webfont.svg deleted file mode 100755 index ba0afe5e..00000000 --- a/src/static/font/fontawesome-webfont.svg +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/static/font/fontawesome-webfont.ttf b/src/static/font/fontawesome-webfont.ttf deleted file mode 100755 index d4617247..00000000 Binary files a/src/static/font/fontawesome-webfont.ttf and /dev/null differ diff --git a/src/static/font/fontawesome-webfont.woff b/src/static/font/fontawesome-webfont.woff deleted file mode 100755 index 3c89ae09..00000000 Binary files a/src/static/font/fontawesome-webfont.woff and /dev/null differ diff --git a/src/third-party/Font-Awesome b/src/third-party/Font-Awesome new file mode 160000 index 00000000..b452a2c0 --- /dev/null +++ b/src/third-party/Font-Awesome @@ -0,0 +1 @@ +Subproject commit b452a2c086a5e3f319df61b1ce1db7d8e1ad2b7c