diff --git a/assets/stylesheets/fontawesome/_variables.scss b/assets/stylesheets/fontawesome/_variables.scss index 7e1751a..20320e6 100644 --- a/assets/stylesheets/fontawesome/_variables.scss +++ b/assets/stylesheets/fontawesome/_variables.scss @@ -1,7 +1,7 @@ // Variables // -------------------------- -$fa-font-path: "../webfonts" !default; +$fa-font-path: "../fonts" !default; $fa-font-size-base: 16px !default; $fa-css-prefix: fa !default; $fa-version: "5.0.4" !default; diff --git a/assets/stylesheets/identities.scss b/assets/stylesheets/identities.scss index 213ee29..f0d4066 100644 --- a/assets/stylesheets/identities.scss +++ b/assets/stylesheets/identities.scss @@ -26,7 +26,7 @@ text-align: right; } -.identity .fa { +.identity .fab, .identity .fal, .identity .fas { color: rgba(0, 10, 25, 0.65); font-size: 1.6em; text-align: center; @@ -58,7 +58,7 @@ font-size: 0.75em; } -.identity-category .title .fa { +.identity-category .title .fal, .identity-category .title .far, .identity-category .title .fas { color: #aaa; margin: 0 0.2em; transform: rotateZ(-23deg); diff --git a/assets/stylesheets/index.scss b/assets/stylesheets/index.scss index b4a79ed..26442ef 100644 --- a/assets/stylesheets/index.scss +++ b/assets/stylesheets/index.scss @@ -1,4 +1,7 @@ -@import "../../node_modules/font-awesome/scss/font-awesome.scss"; +@import "fontawesome/fontawesome.scss"; +@import "fontawesome/fa-brands.scss"; +@import "fontawesome/fa-regular.scss"; +@import "fontawesome/fa-solid.scss"; @import "../../node_modules/unsemantic/assets/sass/unsemantic-grid-responsive.scss"; @import "header.scss"; diff --git a/gulpfile.js b/gulpfile.js index 1ad18d6..5d487a0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,12 +3,7 @@ const gulp = require('gulp') const rename = require('gulp-rename') const sass = require('gulp-sass') -gulp.task('default', ['fonts', 'stylesheet']) - -gulp.task('fonts', function () { - return gulp.src('./node_modules/font-awesome/fonts/*') - .pipe(gulp.dest('./assets/fonts/')) -}) +gulp.task('default', ['stylesheet']) gulp.task('stylesheet', function () { return gulp.src('./assets/stylesheets/index.scss') diff --git a/index.html b/index.html index a63de1d..56d0be1 100644 --- a/index.html +++ b/index.html @@ -20,41 +20,41 @@
- + 五月研究所 //futa.moe
- + LANG 汉语 / 漢語 / English
- + current Guangxi University
- + beta
- + vim
- + spaces
- + 10 - + debian gentoo - + sierra
@@ -62,23 +62,23 @@

- Naoki Rinmous + Naoki Rinmous - designer - programmer + designer + programmer

- NekoSauce + NekoSauce - sandbox - simulation - music + gamer + simulation + music-game

- Hosted by 五月研究所 //futa.moe + Hosted by 五月研究所 //futa.moe