diff --git a/gulpfile.js b/gulpfile.js index a39929c..dab3fc5 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -7,6 +7,7 @@ const autoprefixer = require('gulp-autoprefixer'); const iconfont = require('gulp-iconfont'); const realFavicon = require('gulp-real-favicon'); +const path = require('path'); const fs = require('fs'); const svgSprite = require('gulp-svg-sprite'); @@ -127,23 +128,43 @@ gulp.task('svg-sprite', function () { }); gulp.task('iconfont', function () { - return gulp.src(['assets/icons/*.svg']) + var lastUnicode = 0xEA01; + var files = fs.readdirSync('src/iconfont'); + + // Filter files with containing unicode value + // and set last unicode + files.forEach(function (file) { + var basename = path.basename(file); + var matches = basename.match(/^(?:((?:u[0-9a-f]{4,6},?)+)\-)?(.+)\.svg$/i); + var currentCode = -1; + + if (matches && matches[1]) { + currentCode = parseInt(matches[1].split('u')[1], 16); + } + + if (currentCode >= lastUnicode) { + lastUnicode = ++currentCode; + } + }); + + return gulp.src(['src/iconfont/*.svg']) .pipe(iconfont({ - fontName: 'myfont', // required + startUnicode: lastUnicode, + fontName: 'GeekdocIcons', // required prependUnicode: true, // recommended option - formats: ['ttf', 'eot', 'woff'], // default, 'woff2' and 'svg' are available + normalize: true, + fontHeight: 1001, + centerHorizontally: true, + formats: ['woff', 'woff2'], // default, 'woff2' and 'svg' are available timestamp: TIMESTAMP, // recommended to get consistent builds when watching files })) - .on('glyphs', function (glyphs, options) { - // CSS templating, e.g. - console.log(glyphs, options); - }) - .pipe(gulp.dest('www/fonts/')); + .pipe(gulp.dest('static/fonts/')); }); gulp.task('default', gulp.series( 'sass', 'svg-sprite', + 'iconfont', 'favicon-check-update', 'favicon-generate' )); diff --git a/layouts/partials/page-footer.html b/layouts/partials/page-footer.html index a072581..a67e3c3 100644 --- a/layouts/partials/page-footer.html +++ b/layouts/partials/page-footer.html @@ -46,14 +46,14 @@
{{ $showPrevNext := (and (default true .Site.Params.GeekdocNextPrev) .Site.Params.GeekdocMenuBundle) }} {{ if $showPrevNext }} - + {{ with ($current.Scratch.Get "prevPage") }} - {{ .name }} + {{ .name }} {{ end }} - + {{ with ($current.Scratch.Get "nextPage") }} - {{ .name }} + {{ .name }} {{ end }} {{ end }} diff --git a/layouts/partials/svg-icon-symbols.html b/layouts/partials/svg-icon-symbols.html index 278fd6a..b529028 100644 --- a/layouts/partials/svg-icon-symbols.html +++ b/layouts/partials/svg-icon-symbols.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/favicon/faviconData.json b/src/favicon/faviconData.json index aacf991..73cb647 100644 --- a/src/favicon/faviconData.json +++ b/src/favicon/faviconData.json @@ -1 +1 @@ -{"result":{"status":"success"},"favicon":{"package_url":"https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/favicon_package_v0.16.zip","files_urls":["https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/android-chrome-192x192.png","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/android-chrome-512x512.png","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/apple-touch-icon.png","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/browserconfig.xml","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/favicon-16x16.png","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/favicon-32x32.png","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/favicon.ico","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/mstile-144x144.png","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/mstile-150x150.png","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/mstile-310x150.png","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/mstile-310x310.png","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/mstile-70x70.png","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/safari-pinned-tab.svg","https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/package_files/site.webmanifest"],"html_code":"\n\n\n\n\n\n\n","compression":"false","overlapping_markups":["link[rel=\"apple-touch-icon\"]","link[rel=\"shortcut\"]","link[rel=\"shortcut icon\"]","link[rel=\"icon\",sizes=\"16x16\"]","link[rel=\"icon\",sizes=\"32x32\"]","meta[name=\"msapplication-TileColor\"]","meta[name=\"msapplication-TileImage\"]","link[rel=\"manifest\"]","meta[name=\"theme-color\"]","link[rel=\"mask-icon\"]"]},"files_location":{"type":"path","path":"/"},"preview_picture_url":"https://realfavicongenerator.net/files/97e60a5addb014e5f9537d9028e5f16e2a5507e7/favicon_preview.png","version":"0.16"} \ No newline at end of file +{"result":{"status":"success"},"favicon":{"package_url":"https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/favicon_package_v0.16.zip","files_urls":["https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/android-chrome-192x192.png","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/android-chrome-512x512.png","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/apple-touch-icon.png","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/browserconfig.xml","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/favicon-16x16.png","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/favicon-32x32.png","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/favicon.ico","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/mstile-144x144.png","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/mstile-150x150.png","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/mstile-310x150.png","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/mstile-310x310.png","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/mstile-70x70.png","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/safari-pinned-tab.svg","https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/package_files/site.webmanifest"],"html_code":"\n\n\n\n\n\n\n","compression":"false","overlapping_markups":["link[rel=\"apple-touch-icon\"]","link[rel=\"shortcut\"]","link[rel=\"shortcut icon\"]","link[rel=\"icon\",sizes=\"16x16\"]","link[rel=\"icon\",sizes=\"32x32\"]","meta[name=\"msapplication-TileColor\"]","meta[name=\"msapplication-TileImage\"]","link[rel=\"manifest\"]","meta[name=\"theme-color\"]","link[rel=\"mask-icon\"]"]},"files_location":{"type":"path","path":"/"},"preview_picture_url":"https://realfavicongenerator.net/files/6df47a40ae616743cd933f790d5fd877fe56536b/favicon_preview.png","version":"0.16"} \ No newline at end of file diff --git a/src/iconfont/uEA01-arrow_back.svg b/src/iconfont/uEA01-arrow_back.svg new file mode 100644 index 0000000..7ab68d6 --- /dev/null +++ b/src/iconfont/uEA01-arrow_back.svg @@ -0,0 +1,5 @@ + + +arrow_back + + diff --git a/src/iconfont/uEA02-arrow_right_alt.svg b/src/iconfont/uEA02-arrow_right_alt.svg new file mode 100644 index 0000000..e303953 --- /dev/null +++ b/src/iconfont/uEA02-arrow_right_alt.svg @@ -0,0 +1,5 @@ + + +arrow_right_alt + + diff --git a/src/iconfont/uEA03-bookmark.svg b/src/iconfont/uEA03-bookmark.svg new file mode 100644 index 0000000..a9bc537 --- /dev/null +++ b/src/iconfont/uEA03-bookmark.svg @@ -0,0 +1,5 @@ + + +bookmark + + diff --git a/src/iconfont/uEA04-code.svg b/src/iconfont/uEA04-code.svg new file mode 100644 index 0000000..0a50db8 --- /dev/null +++ b/src/iconfont/uEA04-code.svg @@ -0,0 +1,5 @@ + + +code + + diff --git a/src/iconfont/uEA05-date.svg b/src/iconfont/uEA05-date.svg new file mode 100644 index 0000000..1cc7d5d --- /dev/null +++ b/src/iconfont/uEA05-date.svg @@ -0,0 +1,5 @@ + + +date + + diff --git a/src/iconfont/uEA06-download.svg b/src/iconfont/uEA06-download.svg new file mode 100644 index 0000000..c8f149f --- /dev/null +++ b/src/iconfont/uEA06-download.svg @@ -0,0 +1,5 @@ + + +download + + diff --git a/src/iconfont/uEA07-email.svg b/src/iconfont/uEA07-email.svg new file mode 100644 index 0000000..80da669 --- /dev/null +++ b/src/iconfont/uEA07-email.svg @@ -0,0 +1,5 @@ + + +email + + diff --git a/src/iconfont/uEA08-github.svg b/src/iconfont/uEA08-github.svg new file mode 100644 index 0000000..13be27a --- /dev/null +++ b/src/iconfont/uEA08-github.svg @@ -0,0 +1,5 @@ + + +github + + diff --git a/src/iconfont/uEA09-heart.svg b/src/iconfont/uEA09-heart.svg new file mode 100644 index 0000000..0265049 --- /dev/null +++ b/src/iconfont/uEA09-heart.svg @@ -0,0 +1,5 @@ + + +heart + + diff --git a/src/iconfont/uEA0A-link.svg b/src/iconfont/uEA0A-link.svg new file mode 100644 index 0000000..7be47ee --- /dev/null +++ b/src/iconfont/uEA0A-link.svg @@ -0,0 +1,4 @@ + + +link + diff --git a/src/iconfont/uEA0B-menu.svg b/src/iconfont/uEA0B-menu.svg new file mode 100644 index 0000000..620494e --- /dev/null +++ b/src/iconfont/uEA0B-menu.svg @@ -0,0 +1,5 @@ + + +menu + + diff --git a/src/iconfont/uEA0C-notification.svg b/src/iconfont/uEA0C-notification.svg new file mode 100644 index 0000000..334ad20 --- /dev/null +++ b/src/iconfont/uEA0C-notification.svg @@ -0,0 +1,5 @@ + + +notification + + diff --git a/src/iconfont/uEA0D-path.svg b/src/iconfont/uEA0D-path.svg new file mode 100644 index 0000000..7d11b60 --- /dev/null +++ b/src/iconfont/uEA0D-path.svg @@ -0,0 +1,5 @@ + + +path + + diff --git a/src/iconfont/uEA0E-person.svg b/src/iconfont/uEA0E-person.svg new file mode 100644 index 0000000..3b1366d --- /dev/null +++ b/src/iconfont/uEA0E-person.svg @@ -0,0 +1,5 @@ + + +person + + diff --git a/src/iconfont/uEA0F-search.svg b/src/iconfont/uEA0F-search.svg new file mode 100644 index 0000000..440e764 --- /dev/null +++ b/src/iconfont/uEA0F-search.svg @@ -0,0 +1,5 @@ + + +search + + diff --git a/src/iconfont/uEA10-shield.svg b/src/iconfont/uEA10-shield.svg new file mode 100644 index 0000000..4b91073 --- /dev/null +++ b/src/iconfont/uEA10-shield.svg @@ -0,0 +1,5 @@ + + +shield + + diff --git a/src/iconfont/uEA11-tags.svg b/src/iconfont/uEA11-tags.svg new file mode 100644 index 0000000..09fa933 --- /dev/null +++ b/src/iconfont/uEA11-tags.svg @@ -0,0 +1,5 @@ + + +tags + + diff --git a/src/iconfont/uEA12-telescope.svg b/src/iconfont/uEA12-telescope.svg new file mode 100644 index 0000000..9a665ec --- /dev/null +++ b/src/iconfont/uEA12-telescope.svg @@ -0,0 +1,5 @@ + + +telescope + + diff --git a/src/iconfont/uEA13-arrow_left_alt.svg b/src/iconfont/uEA13-arrow_left_alt.svg new file mode 100644 index 0000000..00d68cd --- /dev/null +++ b/src/iconfont/uEA13-arrow_left_alt.svg @@ -0,0 +1,5 @@ + + +arrow_right_alt + + diff --git a/src/icons/arrow_left_alt.svg b/src/icons/arrow_left_alt.svg new file mode 100644 index 0000000..00d68cd --- /dev/null +++ b/src/icons/arrow_left_alt.svg @@ -0,0 +1,5 @@ + + +arrow_right_alt + + diff --git a/src/sass/_base.scss b/src/sass/_base.scss index 1aff497..74f1437 100644 --- a/src/sass/_base.scss +++ b/src/sass/_base.scss @@ -56,9 +56,9 @@ img { } .wrapper { - display: flex; - flex-direction: column; - min-height: 100vh; + display: flex; + flex-direction: column; + min-height: 100vh; } .container { @@ -211,18 +211,30 @@ img { &__footer { margin-top: $padding-16 * 2; + + a:hover { + text-decoration: none; + } } &__nav { + &:hover { + background-image: linear-gradient($color-link, $color-link); + background-position: 0 100%; + background-size: 100% 1px; + background-repeat: no-repeat; + } &--prev:before { - content: "\1f828"; + font-family: GeekdocIcons; + content: "\ea13"; } &--next:after { - content: "\1f82a"; + font-family: GeekdocIcons; + content: "\ea02"; } } - &__anchor{ + &__anchor { &--left { min-width: 35px; text-align: left; @@ -459,7 +471,7 @@ img { .icon { width: $font-size-16 * 4; - height: $font-size-16 *4; + height: $font-size-16 * 4; } &__message { diff --git a/src/sass/_fonts.scss b/src/sass/_fonts.scss index 61220f6..5040cd9 100644 --- a/src/sass/_fonts.scss +++ b/src/sass/_fonts.scss @@ -47,7 +47,6 @@ font-display: swap; } - @font-face { font-family: "Metropolis"; src: url("fonts/Metropolis.woff2") format("woff2"), url("fonts/Metropolis.woff") format("woff"); @@ -56,6 +55,14 @@ font-display: swap; } +@font-face { + font-family: "GeekdocIcons"; + src: url("fonts/GeekdocIcons.woff2") format("woff2"), url("fonts/GeekdocIcons.woff") format("woff"); + font-weight: normal; + font-style: normal; + font-display: swap; +} + body { font-family: "Liberation Sans", sans-serif; } diff --git a/static/fonts/GeekdocIcons.woff b/static/fonts/GeekdocIcons.woff new file mode 100644 index 0000000..aefce96 Binary files /dev/null and b/static/fonts/GeekdocIcons.woff differ diff --git a/static/fonts/GeekdocIcons.woff2 b/static/fonts/GeekdocIcons.woff2 new file mode 100644 index 0000000..f35ef09 Binary files /dev/null and b/static/fonts/GeekdocIcons.woff2 differ