From a81f85884808f684215866da358082f21f6412e9 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 10 Sep 2020 22:23:24 +0200 Subject: [PATCH] setup prettier --- .github/settings.yml | 2 - .prettierignore | 8 + .prettierrc | 10 + exampleSite/content/shortcodes/buttons.md | 2 + exampleSite/content/shortcodes/hints.md | 6 +- exampleSite/content/shortcodes/includes.md | 11 +- exampleSite/content/shortcodes/mermaid.md | 3 + exampleSite/content/shortcodes/tabs.md | 2 +- exampleSite/content/shortcodes/toc.md | 2 + exampleSite/content/toc-tree/_index.md | 2 + .../content/toc-tree/level-1/_index.md | 2 + .../toc-tree/level-1/level-1-3/_index.md | 2 + exampleSite/content/usage/code_blocks.md | 5 + exampleSite/content/usage/color_schemes.md | 4 + gulpfile.js | 327 +++++++++--------- src/favicon/faviconData.json | 2 +- src/sass/_defaults.scss | 4 +- src/sass/_fonts.scss | 21 +- static/custom.css | 1 - 19 files changed, 239 insertions(+), 177 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc diff --git a/.github/settings.yml b/.github/settings.yml index 907196d..31ef313 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -57,5 +57,3 @@ branches: restrictions: users: [] teams: [] - -... diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..0df6830 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,8 @@ +*.html +.drone.yml +search*.js +_normalize.css +.lighthouseci/ +themes/ +static/js/ +src/favicon/ diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..c99d7d5 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,10 @@ +{ + "overrides": [ + { + "files": ["*.html"], + "options": { + "parser": "go-template" + } + } + ] +} diff --git a/exampleSite/content/shortcodes/buttons.md b/exampleSite/content/shortcodes/buttons.md index 4444820..f633588 100644 --- a/exampleSite/content/shortcodes/buttons.md +++ b/exampleSite/content/shortcodes/buttons.md @@ -8,6 +8,8 @@ Buttons are styled links that can lead to local page or external link. ## Example + {{< button relref="/" >}}Get Home{{< /button >}} {{< button href="https://github.com/xoxys/hugo-geekdoc" >}}Contribute{{< /button >}} + diff --git a/exampleSite/content/shortcodes/hints.md b/exampleSite/content/shortcodes/hints.md index 8ba24df..f7d84c5 100644 --- a/exampleSite/content/shortcodes/hints.md +++ b/exampleSite/content/shortcodes/hints.md @@ -14,17 +14,17 @@ Dolor sit, sumo unique argument um no. Gracie nominal id xiv. Romanesque acclima {{< hint info >}} **Markdown content**\ Dolor sit, sumo unique argument um no. Gracie nominal id xiv. Romanesque acclimates investiture. - Ornateness bland it ex enc, est yeti am bongo detract re. +Ornateness bland it ex enc, est yeti am bongo detract re. {{< /hint >}} {{< hint warning >}} **Markdown content**\ Dolor sit, sumo unique argument um no. Gracie nominal id xiv. Romanesque acclimates investiture. - Ornateness bland it ex enc, est yeti am bongo detract re. +Ornateness bland it ex enc, est yeti am bongo detract re. {{< /hint >}} {{< hint danger >}} **Markdown content**\ Dolor sit, sumo unique argument um no. Gracie nominal id xiv. Romanesque acclimates investiture. - Ornateness bland it ex enc, est yeti am bongo detract re. +Ornateness bland it ex enc, est yeti am bongo detract re. {{< /hint >}} diff --git a/exampleSite/content/shortcodes/includes.md b/exampleSite/content/shortcodes/includes.md index fc0e675..8fca752 100644 --- a/exampleSite/content/shortcodes/includes.md +++ b/exampleSite/content/shortcodes/includes.md @@ -8,6 +8,7 @@ Include shortcode can include files of different types. By specifying a language Attributes: + | Name | Usage | default | |---|---|---| | file | path to the included file relative to the hugo root | empty value | @@ -17,17 +18,19 @@ Attributes: \* if not set, the content will be rendered as plain HTML -### Include *.yml file with options +### Include \*.yml file with options ```tpl {{}} ``` + {{< include file="config.yaml" language="yaml" options="linenos=table,hl_lines=5-6,linenostart=100">}} + -### Include *.md file +### Include \*.md file Included markdown files will be rendered using the `markdownify` filter. @@ -41,10 +44,12 @@ If you include markdown files that should not get a menu entry, place them outsi ``` + {{< include file="static/includes/table.md.part" markdown="true" >}} + -### Include *.html file +### Include \*.html file HTML content will be filtered by the `safeHTML` filter and added to the rendered page output. diff --git a/exampleSite/content/shortcodes/mermaid.md b/exampleSite/content/shortcodes/mermaid.md index d0f637f..1bb743e 100644 --- a/exampleSite/content/shortcodes/mermaid.md +++ b/exampleSite/content/shortcodes/mermaid.md @@ -4,6 +4,7 @@ {{< columns >}} + ```tpl {{}} sequenceDiagram @@ -22,6 +23,7 @@ sequenceDiagram <---> + {{< mermaid class="text-center" >}} sequenceDiagram Alice->>Bob: Hello Bob, how are you? @@ -34,6 +36,7 @@ sequenceDiagram Bob->>Alice: Thanks for asking end {{< /mermaid >}} + {{< /columns >}} diff --git a/exampleSite/content/shortcodes/tabs.md b/exampleSite/content/shortcodes/tabs.md index 1a5040f..42ea492 100644 --- a/exampleSite/content/shortcodes/tabs.md +++ b/exampleSite/content/shortcodes/tabs.md @@ -30,7 +30,7 @@ fastidious copious quo ad. Stet probates in duo. This is tab **Linux** content. Dolor sit, sumo unique argument um no. Gracie nominal id xiv. Romanesque acclimates -investiture. __Ornateness__ bland it ex enc, est yeti am bongo detract re. Pro ad +investiture. **Ornateness** bland it ex enc, est yeti am bongo detract re. Pro ad prompts feud gait, quid exercise emeritus bis e. In pro quints consequent, denim fastidious copious quo ad. Stet probates in duo. {{< /tab >}} diff --git a/exampleSite/content/shortcodes/toc.md b/exampleSite/content/shortcodes/toc.md index d2cbada..15fdada 100644 --- a/exampleSite/content/shortcodes/toc.md +++ b/exampleSite/content/shortcodes/toc.md @@ -5,7 +5,9 @@ Simple wrapper to generate a page Table of Content from a shortcode. ``` + {{< toc >}} + ## Level 1 diff --git a/exampleSite/content/toc-tree/_index.md b/exampleSite/content/toc-tree/_index.md index 2576dcd..fc69826 100644 --- a/exampleSite/content/toc-tree/_index.md +++ b/exampleSite/content/toc-tree/_index.md @@ -6,5 +6,7 @@ geekdocFlatSection: true This is just a demo section for the [toc-tree](/shortcodes/toc-tree/) shortcode. + {{< toc-tree >}} + diff --git a/exampleSite/content/toc-tree/level-1/_index.md b/exampleSite/content/toc-tree/level-1/_index.md index f0eb0d0..acab06a 100644 --- a/exampleSite/content/toc-tree/level-1/_index.md +++ b/exampleSite/content/toc-tree/level-1/_index.md @@ -1,5 +1,7 @@ Level 1 + {{< toc-tree >}} + diff --git a/exampleSite/content/toc-tree/level-1/level-1-3/_index.md b/exampleSite/content/toc-tree/level-1/level-1-3/_index.md index dbeee29..39898e9 100644 --- a/exampleSite/content/toc-tree/level-1/level-1-3/_index.md +++ b/exampleSite/content/toc-tree/level-1/level-1-3/_index.md @@ -5,5 +5,7 @@ title: Level 1.3 Level 1.3 + {{< toc-tree >}} + diff --git a/exampleSite/content/usage/code_blocks.md b/exampleSite/content/usage/code_blocks.md index aefb344..7f9dca3 100644 --- a/exampleSite/content/usage/code_blocks.md +++ b/exampleSite/content/usage/code_blocks.md @@ -67,6 +67,7 @@ pygmentsCodeFences: true You can use it like every other shortcode: + ```markdown {{}} # some code @@ -77,8 +78,12 @@ echo "Hello World" **Example:** + + {{< highlight Shell "linenos=table" >}} # some code echo "Hello World" {{< /highlight >}} + + diff --git a/exampleSite/content/usage/color_schemes.md b/exampleSite/content/usage/color_schemes.md index 520e21f..e704a61 100644 --- a/exampleSite/content/usage/color_schemes.md +++ b/exampleSite/content/usage/color_schemes.md @@ -4,6 +4,8 @@ All necessary class names are listed below. If you miss some classes required fo + + {{< highlight CSS "linenos=table" >}} /* default link color */ a { color: #1c388e; } @@ -32,6 +34,8 @@ a:visited { color: #73bfb8 } .gdoc-hint.warning { background: #fef5dc; border-color: #e4ba48; color: black; } .gdoc-hint.danger { background: #fae1db; border-color: #cf5f46; color: black; } {{< /highlight >}} + + diff --git a/gulpfile.js b/gulpfile.js index 124c2ef..cb7e3d9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,173 +1,186 @@ -const gulp = require('gulp'); -const rename = require('gulp-rename'); -const sass = require('gulp-sass'); -const cleanCSS = require('gulp-clean-css'); -const autoprefixer = require('gulp-autoprefixer'); -const iconfont = require('gulp-iconfont'); +const gulp = require("gulp"); +const rename = require("gulp-rename"); +const sass = require("gulp-sass"); +const cleanCSS = require("gulp-clean-css"); +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 realFavicon = require("gulp-real-favicon"); +const path = require("path"); +const fs = require("fs"); -const svgSprite = require('gulp-svg-sprite'); +const svgSprite = require("gulp-svg-sprite"); -var CSSDEST = 'static/' -var FAVICON_DATA_FILE = 'src/favicon/faviconData.json'; +var CSSDEST = "static/"; +var FAVICON_DATA_FILE = "src/favicon/faviconData.json"; var TIMESTAMP = Math.round(Date.now() / 1000); -gulp.task('sass', function () { - return gulp.src('src/sass/main.scss') - .pipe(sass({ errLogToConsole: true })) - .pipe(cleanCSS({ format: 'beautify' })) - .pipe(autoprefixer({ - cascade: false - })) - .pipe(gulp.dest(CSSDEST)) - .pipe(cleanCSS()) - .pipe(rename({ extname: '.min.css' })) - .pipe(gulp.dest(CSSDEST)) +gulp.task("sass", function () { + return gulp + .src("src/sass/main.scss") + .pipe(sass({ errLogToConsole: true })) + .pipe(cleanCSS({ format: "beautify" })) + .pipe( + autoprefixer({ + cascade: false, + }) + ) + .pipe(gulp.dest(CSSDEST)) + .pipe(cleanCSS()) + .pipe(rename({ extname: ".min.css" })) + .pipe(gulp.dest(CSSDEST)); }); -gulp.task('favicon-generate', function (done) { - realFavicon.generateFavicon({ - masterPicture: 'src/favicon/favicon-master.svg', - dest: 'static/favicon', - iconsPath: '/', - design: { - ios: { - pictureAspect: 'backgroundAndMargin', - backgroundColor: '#ffffff', - margin: '14%', - assets: { - ios6AndPriorIcons: false, - ios7AndLaterIcons: false, - precomposedIcons: false, - declareOnlyDefaultIcon: true - } - }, - desktopBrowser: {}, - windows: { - pictureAspect: 'whiteSilhouette', - backgroundColor: '#2b5797', - onConflict: 'override', - assets: { - windows80Ie10Tile: false, - windows10Ie11EdgeTiles: { - small: false, - medium: true, - big: false, - rectangle: false - } - } - }, - androidChrome: { - pictureAspect: 'shadow', - themeColor: '#ffffff', - manifest: { - display: 'standalone', - orientation: 'notSet', - onConflict: 'override', - declared: true - }, - assets: { - legacyIcon: false, - lowResolutionIcons: false - } - }, - safariPinnedTab: { - pictureAspect: 'blackAndWhite', - threshold: 74.21875, - themeColor: '#5bbad5' - } +gulp.task("favicon-generate", function (done) { + realFavicon.generateFavicon( + { + masterPicture: "src/favicon/favicon-master.svg", + dest: "static/favicon", + iconsPath: "/", + design: { + ios: { + pictureAspect: "backgroundAndMargin", + backgroundColor: "#ffffff", + margin: "14%", + assets: { + ios6AndPriorIcons: false, + ios7AndLaterIcons: false, + precomposedIcons: false, + declareOnlyDefaultIcon: true, + }, }, - settings: { - scalingAlgorithm: 'Mitchell', - errorOnImageTooSmall: false, - readmeFile: false, - htmlCodeFile: false, - usePathAsIs: false + desktopBrowser: {}, + windows: { + pictureAspect: "whiteSilhouette", + backgroundColor: "#2b5797", + onConflict: "override", + assets: { + windows80Ie10Tile: false, + windows10Ie11EdgeTiles: { + small: false, + medium: true, + big: false, + rectangle: false, + }, + }, }, - markupFile: FAVICON_DATA_FILE - }, function () { - done(); - }); -}); - -gulp.task('favicon-check-update', function (done) { - var currentVersion = JSON.parse(fs.readFileSync(FAVICON_DATA_FILE)).version; - realFavicon.checkForUpdates(currentVersion, function (err) { - if (err) { - throw err; - } - }); - done(); -}); - -gulp.task('svg-sprite', function () { - config = { - svg: { - xmlDeclaration: false, - rootAttributes: { - style: "position: absolute; width: 0; height: 0; overflow: hidden;" - } + androidChrome: { + pictureAspect: "shadow", + themeColor: "#ffffff", + manifest: { + display: "standalone", + orientation: "notSet", + onConflict: "override", + declared: true, + }, + assets: { + legacyIcon: false, + lowResolutionIcons: false, + }, }, - mode: { - inline: true, - symbol: { - dest: './', - sprite: 'svg-icon-symbols.html', - bust: false, - } - } - }; - - return gulp.src('src/icons/*.svg') - .pipe(svgSprite(config)) - .pipe(gulp.dest('layouts/partials/')); + safariPinnedTab: { + pictureAspect: "blackAndWhite", + threshold: 74.21875, + themeColor: "#5bbad5", + }, + }, + settings: { + scalingAlgorithm: "Mitchell", + errorOnImageTooSmall: false, + readmeFile: false, + htmlCodeFile: false, + usePathAsIs: false, + }, + markupFile: FAVICON_DATA_FILE, + }, + function () { + done(); + } + ); }); -gulp.task('iconfont', function () { - 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({ - startUnicode: lastUnicode, - fontName: 'GeekdocIcons', // required - prependUnicode: true, // recommended option - 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 - })) - .pipe(gulp.dest('static/fonts/')); +gulp.task("favicon-check-update", function (done) { + var currentVersion = JSON.parse(fs.readFileSync(FAVICON_DATA_FILE)).version; + realFavicon.checkForUpdates(currentVersion, function (err) { + if (err) { + throw err; + } + }); + done(); }); -gulp.task('default', gulp.series( - 'sass', - 'svg-sprite', - 'iconfont', - 'favicon-check-update', - 'favicon-generate' -)); +gulp.task("svg-sprite", function () { + config = { + svg: { + xmlDeclaration: false, + rootAttributes: { + style: "position: absolute; width: 0; height: 0; overflow: hidden;", + }, + }, + mode: { + inline: true, + symbol: { + dest: "./", + sprite: "svg-icon-symbols.html", + bust: false, + }, + }, + }; -gulp.task('devel', function () { - gulp.watch('src/sass/**/*.*css', gulp.series('sass')); + return gulp + .src("src/icons/*.svg") + .pipe(svgSprite(config)) + .pipe(gulp.dest("layouts/partials/")); +}); + +gulp.task("iconfont", function () { + 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({ + startUnicode: lastUnicode, + fontName: "GeekdocIcons", // required + prependUnicode: true, // recommended option + 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 + }) + ) + .pipe(gulp.dest("static/fonts/")); +}); + +gulp.task( + "default", + gulp.series( + "sass", + "svg-sprite", + "iconfont", + "favicon-check-update", + "favicon-generate" + ) +); + +gulp.task("devel", function () { + gulp.watch("src/sass/**/*.*css", gulp.series("sass")); }); diff --git a/src/favicon/faviconData.json b/src/favicon/faviconData.json index 8e0c9e4..bd8f348 100644 --- a/src/favicon/faviconData.json +++ b/src/favicon/faviconData.json @@ -1 +1 @@ -{"result":{"status":"success"},"favicon":{"package_url":"https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/favicon_package_v0.16.zip","files_urls":["https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/android-chrome-192x192.png","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/android-chrome-512x512.png","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/apple-touch-icon.png","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/browserconfig.xml","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/favicon-16x16.png","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/favicon-32x32.png","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/favicon.ico","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/mstile-144x144.png","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/mstile-150x150.png","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/mstile-310x150.png","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/mstile-310x310.png","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/mstile-70x70.png","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/package_files/safari-pinned-tab.svg","https://realfavicongenerator.net/files/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/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/80e254dbfa2672ac1e4b404bddc9607fdb8612e8/favicon_preview.png","version":"0.16"} \ No newline at end of file +{"result":{"status":"success"},"favicon":{"package_url":"https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/favicon_package_v0.16.zip","files_urls":["https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/android-chrome-192x192.png","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/android-chrome-512x512.png","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/apple-touch-icon.png","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/browserconfig.xml","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/favicon-16x16.png","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/favicon-32x32.png","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/favicon.ico","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/mstile-144x144.png","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/mstile-150x150.png","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/mstile-310x150.png","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/mstile-310x310.png","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/mstile-70x70.png","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/package_files/safari-pinned-tab.svg","https://realfavicongenerator.net/files/aa75226dc492eb362022432f442086163ba2f707/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/aa75226dc492eb362022432f442086163ba2f707/favicon_preview.png","version":"0.16"} \ No newline at end of file diff --git a/src/sass/_defaults.scss b/src/sass/_defaults.scss index ddea01c..9c7a7a8 100644 --- a/src/sass/_defaults.scss +++ b/src/sass/_defaults.scss @@ -27,7 +27,7 @@ $black: rgba(0, 0, 0, 1) !default; $color-link: rgba(10, 83, 154, 1) !default; $color-link-visited: rgba(119, 73, 191, 1) !default; -$color-link-footer: rgba(255,163,30,1.0) !default; +$color-link-footer: rgba(255, 163, 30, 1) !default; $color-code: rgba($gray-200, 0.5) !default; @@ -53,5 +53,5 @@ $sm-breakpoint: $menu-width + $body-min-width + 3rem !default; $hint-colors: ( info: rgba(102, 187, 255, 1), warning: rgba(255, 221, 102, 1), - danger: rgba(255, 102, 102, 1) + danger: rgba(255, 102, 102, 1), ) !default; diff --git a/src/sass/_fonts.scss b/src/sass/_fonts.scss index 5040cd9..150024b 100644 --- a/src/sass/_fonts.scss +++ b/src/sass/_fonts.scss @@ -1,6 +1,7 @@ @font-face { font-family: "Liberation Sans"; - src: url("fonts/LiberationSans-Bold.woff2") format("woff2"), url("fonts/LiberationSans-Bold.woff") format("woff"); + src: url("fonts/LiberationSans-Bold.woff2") format("woff2"), + url("fonts/LiberationSans-Bold.woff") format("woff"); font-weight: bold; font-style: normal; font-display: swap; @@ -17,7 +18,8 @@ @font-face { font-family: "Liberation Sans"; - src: url("fonts/LiberationSans-Italic.woff2") format("woff2"), url("fonts/LiberationSans-Italic.woff") format("woff"); + src: url("fonts/LiberationSans-Italic.woff2") format("woff2"), + url("fonts/LiberationSans-Italic.woff") format("woff"); font-weight: normal; font-style: italic; font-display: swap; @@ -25,7 +27,8 @@ @font-face { font-family: "Liberation Sans"; - src: url("fonts/LiberationSans.woff2") format("woff2"), url("fonts/LiberationSans.woff") format("woff"); + src: url("fonts/LiberationSans.woff2") format("woff2"), + url("fonts/LiberationSans.woff") format("woff"); font-weight: normal; font-style: normal; font-display: swap; @@ -33,7 +36,8 @@ @font-face { font-family: "Liberation Mono"; - src: url("fonts/LiberationMono.woff2") format("woff2"), url("fonts/LiberationMono.woff") format("woff"); + src: url("fonts/LiberationMono.woff2") format("woff2"), + url("fonts/LiberationMono.woff") format("woff"); font-weight: normal; font-style: normal; font-display: swap; @@ -41,7 +45,8 @@ @font-face { font-family: "Droid Sans"; - src: url("fonts/DroidSans.woff2") format("woff2"), url("fonts/DroidSans.woff") format("woff"); + src: url("fonts/DroidSans.woff2") format("woff2"), + url("fonts/DroidSans.woff") format("woff"); font-weight: normal; font-style: normal; font-display: swap; @@ -49,7 +54,8 @@ @font-face { font-family: "Metropolis"; - src: url("fonts/Metropolis.woff2") format("woff2"), url("fonts/Metropolis.woff") format("woff"); + src: url("fonts/Metropolis.woff2") format("woff2"), + url("fonts/Metropolis.woff") format("woff"); font-weight: normal; font-style: normal; font-display: swap; @@ -57,7 +63,8 @@ @font-face { font-family: "GeekdocIcons"; - src: url("fonts/GeekdocIcons.woff2") format("woff2"), url("fonts/GeekdocIcons.woff") format("woff"); + src: url("fonts/GeekdocIcons.woff2") format("woff2"), + url("fonts/GeekdocIcons.woff") format("woff"); font-weight: normal; font-style: normal; font-display: swap; diff --git a/static/custom.css b/static/custom.css index 889d482..e488c91 100644 --- a/static/custom.css +++ b/static/custom.css @@ -1,2 +1 @@ /* You can add custom styles here. */ -