diff --git a/.drone.yml b/.drone.yml index 2481b43..47c41dc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -45,7 +45,7 @@ steps: LINK_VALIDATOR_RETRIES: 3 - name: page-validation - image: thegeeklab/lhci + image: thegeeklab/lhci:0.11 commands: - lhci autorun environment: @@ -288,6 +288,6 @@ depends_on: --- kind: signature -hmac: 8cd0be1e342f0c4630d15fff1b5ee18451b3ac678be2ddbad54443f60c99ef70 +hmac: b0245c09ecaa41a3fbbb9b085f4f08ad4b8997be4c932769a7791d4f7a94ee6b ... diff --git a/.lighthouserc.yml b/.lighthouserc.yml index ab79318..c2b48e7 100644 --- a/.lighthouserc.yml +++ b/.lighthouserc.yml @@ -2,21 +2,20 @@ ci: collect: numberOfRuns: 3 - psiStrategy: desktop staticDistDir: exampleSite/public url: - http://localhost/ - http://localhost/404.html - - http://localhost/posts/ + - http://localhost/posts/usage/getting-started/ settings: chromeFlags: "--no-sandbox" - throttling: - cpuSlowdownMultiplier: "2.0" assert: preset: "lighthouse:no-pwa" assertions: uses-long-cache-ttl: off csp-xss: off + # FIXME: https://github.com/GoogleChrome/lighthouse/issues/14957 + bf-cache: off tap-targets: warn unsized-images: warn # FIXME: https://github.com/GoogleChrome/lighthouse/issues/11460 diff --git a/README.md b/README.md index ec43f6f..b2ebd82 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,6 @@ [![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/hugo-geekblog)](https://github.com/thegeeklab/hugo-geekblog/graphs/contributors) [![License: MIT](https://img.shields.io/github/license/thegeeklab/hugo-geekblog)](https://github.com/thegeeklab/hugo-geekblog/blob/main/LICENSE) -> **Important:** We have switched to 'main' as default branch. The 'master' branch is no longer maintained and will be removed after June 30, 2021! - Geekblog is a simple Hugo theme for personal blogs. It is intentionally designed as a fast and lean theme and may not fit the requirements of complex projects. If a more feature-complete theme is required there are a lot of got alternatives out there. You can find a demo and the full documentation at [https://hugo-geekblog.geekdocs.de](https://hugo-geekblog.geekdocs.de). ![Desktop and mobile preview](https://github.com/thegeeklab/hugo-geekblog/blob/main/images/readme.png) diff --git a/exampleSite/content/posts/features/dark-mode/images/geekblog-dark.png b/exampleSite/content/posts/features/dark-mode/images/geekblog-dark.png index aa88b41..140283a 100644 Binary files a/exampleSite/content/posts/features/dark-mode/images/geekblog-dark.png and b/exampleSite/content/posts/features/dark-mode/images/geekblog-dark.png differ diff --git a/exampleSite/content/posts/features/theming/images/theme-example.png b/exampleSite/content/posts/features/theming/images/theme-example.png index c5ce087..808d2e3 100644 Binary files a/exampleSite/content/posts/features/theming/images/theme-example.png and b/exampleSite/content/posts/features/theming/images/theme-example.png differ diff --git a/exampleSite/content/posts/features/theming/index.md b/exampleSite/content/posts/features/theming/index.md index a15aedb..cb66734 100644 --- a/exampleSite/content/posts/features/theming/index.md +++ b/exampleSite/content/posts/features/theming/index.md @@ -14,7 +14,7 @@ tags: If you want to customize the theme's color scheme to give it your individual touch, you are only a few lines of CSS away. Generally, you need to override the default settings. The easiest way to do this is to create a file named `static/custom.css` right at the root of your site. -All the necessary CSS customization properties are listed below. If you want to customize elements that don't use these properties, you can always look up the class name and override it directly. For inspiration, you can also take a look at [https://www.color-hex.com/color-palettes/](https://www.color-hex.com/). In this simple example, we'll use the [_Beach_](https://www.color-hex.com/color-palette/895) color palette. +All the necessary CSS customization properties are listed below. If you want to customize elements that don't use these properties, you can always look up the class name and override it directly. For inspiration, you can also take a look at [https://www.color-hex.com](https://www.color-hex.com/color-palettes/). In this simple example, we'll use the [_Beach_](https://www.color-hex.com/color-palette/895) color palette. [![Beach Color Palette](images/theme-example.png)](images/theme-example.png) @@ -59,9 +59,9 @@ If you want to add more Favicon formats you have to [overwrite](https://gohugo.i - - - + + + ``` Happy customizing! diff --git a/exampleSite/content/posts/usage/getting-started.md b/exampleSite/content/posts/usage/getting-started.md index f37668c..4c96b65 100644 --- a/exampleSite/content/posts/usage/getting-started.md +++ b/exampleSite/content/posts/usage/getting-started.md @@ -67,9 +67,9 @@ To prepare your new site environment just a few steps are required: cd demosite ``` -3. Install the Geekblog theme from a [release bundle](#option-1-download-pre-build-release-bundle) (recommended) or form [Git branch](#option-2-clone-the-github-repository). +3. Install the Geekblog theme from a [release bundle](#option-1-download-pre-build-release-bundle) (recommended) or from [Git branch](#option-2-clone-the-github-repository). -4. Create the minimal required Hugo configuration `config.toml`. For all configuration options see [here](/posts/usage/configuration/#site-configuration). +4. Create the minimal required Hugo configuration `config.toml`. For all configuration options take a look at the [configuration](/posts/usage/configuration/) page. ```Toml baseURL = "http://localhost" diff --git a/exampleSite/static/custom.css.example b/exampleSite/static/custom.css.example index d0508a6..a7eabcf 100644 --- a/exampleSite/static/custom.css.example +++ b/exampleSite/static/custom.css.example @@ -26,7 +26,7 @@ --code-accent-color-lite: #eff1f3; --code-font-color: #5f5f5f; - --code-copy-background: #f5f6f8; + --code-copy-background: #f8f9fa; --code-copy-font-color: #6b7784; --code-copy-border-color: #adb4bc; --code-copy-success-color: #00c853; @@ -37,7 +37,7 @@ --control-icons: #b2bac1; - --footer-background: #2f333e; + --footer-background: #112b3c; --footer-font-color: #ffffff; --footer-link-color: #ffcc5c; --footer-link-color-visited: #ffcc5c; @@ -63,7 +63,7 @@ --code-accent-color-lite: #eff1f3; --code-font-color: #5f5f5f; - --code-copy-background: #f5f6f8; + --code-copy-background: #f8f9fa; --code-copy-font-color: #6b7784; --code-copy-border-color: #adb4bc; --code-copy-success-color: #00c853; @@ -74,7 +74,7 @@ --control-icons: #b2bac1; - --footer-background: #2f333e; + --footer-background: #112b3c; --footer-font-color: #ffffff; --footer-link-color: #ffcc5c; --footer-link-color-visited: #ffcc5c; @@ -97,7 +97,7 @@ --link-color: #7ac29e; --link-color-visited: #c27a9e; - --code-background: #2f353a; + --code-background: #f5f6f8; --code-accent-color: #262b2f; --code-accent-color-lite: #2b3035; --code-font-color: #b9b9b9; @@ -113,7 +113,7 @@ --control-icons: #b2bac1; - --footer-background: #2f333e; + --footer-background: #112b3c; --footer-font-color: #ffffff; --footer-link-color: #ffcc5c; --footer-link-color-visited: #ffcc5c; @@ -134,7 +134,7 @@ --link-color: #7ac29e; --link-color-visited: #c27a9e; - --code-background: #2f353a; + --code-background: #f5f6f8; --code-accent-color: #262b2f; --code-accent-color-lite: #2b3035; --code-font-color: #b9b9b9; @@ -150,7 +150,7 @@ --control-icons: #b2bac1; - --footer-background: #2f333e; + --footer-background: #112b3c; --footer-font-color: #ffffff; --footer-link-color: #ffcc5c; --footer-link-color-visited: #ffcc5c; diff --git a/exampleSite/static/socialmedia2.png b/exampleSite/static/socialmedia2.png index 5e53fc0..c629d0a 100644 Binary files a/exampleSite/static/socialmedia2.png and b/exampleSite/static/socialmedia2.png differ diff --git a/images/readme.png b/images/readme.png index 51e02ef..549ebd3 100644 Binary files a/images/readme.png and b/images/readme.png differ diff --git a/images/screenshot.png b/images/screenshot.png index 737391c..140283a 100644 Binary files a/images/screenshot.png and b/images/screenshot.png differ diff --git a/images/tn.png b/images/tn.png index 1da2116..b5b5059 100644 Binary files a/images/tn.png and b/images/tn.png differ diff --git a/src/sass/_base.scss b/src/sass/_base.scss index 46d89a3..edc2ec7 100644 --- a/src/sass/_base.scss +++ b/src/sass/_base.scss @@ -174,7 +174,7 @@ img { width: 100%; max-width: $container-max-width; margin: 0 auto; - padding: $padding-16; + padding: $padding-20; } svg.gblog-icon { @@ -503,16 +503,16 @@ svg.gblog-icon { } &__link { - color: var(--link-color-footer); + color: var(--footer-link-color); &:hover, &:visited:hover { - background: var(--link-color-footer); + background: var(--footer-link-color); color: $body-font-color; } &:visited { - color: var(--link-color-footer); + color: var(--footer-link-color); } } } @@ -578,6 +578,10 @@ svg.gblog-icon { .gblog-toc { margin: $padding-16 0; + li { + margin: $padding-4 0; + } + // Classes to hide nested levels of ToC/Menu &__level--1 ul ul, &__level--2 ul ul ul, diff --git a/src/sass/_color_mode.scss b/src/sass/_color_mode.scss index 8a1e692..d2905e8 100644 --- a/src/sass/_color_mode.scss +++ b/src/sass/_color_mode.scss @@ -12,7 +12,6 @@ --link-color: #{$link-color}; --link-color-visited: #{$link-color-visited}; - --link-color-footer: #{$link-color-footer}; --hint-link-color: #{$link-color}; --hint-link-color-visited: #{$link-color-visited}; @@ -55,7 +54,6 @@ --link-color: #{$link-color-dark}; --link-color-visited: #{$link-color-visited-dark}; - --link-color-footer: #{$link-color-footer}; --hint-link-color: #{$link-color}; --hint-link-color-visited: #{$link-color-visited}; diff --git a/src/sass/_defaults.scss b/src/sass/_defaults.scss index f12d412..1e7dcaf 100644 --- a/src/sass/_defaults.scss +++ b/src/sass/_defaults.scss @@ -2,7 +2,9 @@ $padding-2: 0.125rem !default; $padding-4: 0.25rem !default; $padding-8: 0.5rem !default; +$padding-12: 0.75rem !default; $padding-16: 1rem !default; +$padding-20: 1.25rem !default; $padding-24: 1.5rem !default; $padding-32: 2rem !default; $padding-64: 4rem !default; @@ -40,7 +42,7 @@ $black: rgba(0, 0, 0, 1) !default; $link-color: rgba(10, 83, 154, 1) !default; $link-color-visited: rgba(119, 73, 191, 1) !default; -$link-color-footer: rgba(255, 163, 30, 1) !default; +$link-color-footer: rgba(246, 107, 14, 1) !default; $body-background: white !default; $body-font-color: $gray-800 !default; @@ -50,21 +52,20 @@ $body-min-width: 20rem !default; $code-font-color: rgba(95, 95, 95, 1) !default; $code-font-color-dark: rgba(185, 185, 185, 1) !default; -$body-background-dark: $gray-800 !default; -$body-font-color-dark: $gray-100 !default; - $container-max-width: 60rem !default; -$main-color: rgba(65, 134, 201, 1) !default; -$second-color: rgba(47, 51, 62, 1) !default; +$main-color: rgba(32, 83, 117, 1) !default; +$second-color: rgba(17, 43, 60, 1) !default; $mark-color: rgba(255, 171, 0, 1) !default; $body-background-dark: mix(invert($body-background, 75%), $second-color) !default; +$body-font-color-dark: $gray-100 !default; + $link-color-dark: rgba(110, 168, 212, 1) !default; $link-color-visited-dark: rgba(186, 142, 240) !default; $code-background: lighten($gray-200, 4) !default; -$code-background-dark: darken($body-background-dark, 2) !default; +$code-background-dark: darken($body-background-dark, 3) !default; $header-height: 3.5rem !default; $menu-width: 16rem !default; diff --git a/src/sass/_markdown.scss b/src/sass/_markdown.scss index 6119b45..94eae78 100644 --- a/src/sass/_markdown.scss +++ b/src/sass/_markdown.scss @@ -1,5 +1,5 @@ .gblog-markdown { - line-height: $padding-24; + line-height: 1.6rem; h1, h2, diff --git a/src/static/brand.svg b/src/static/brand.svg index 2e570d4..041131a 100644 --- a/src/static/brand.svg +++ b/src/static/brand.svg @@ -1,72 +1,57 @@ + + + sodipodi:docname="brand.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + id="defs1499" /> - - - - - - image/svg+xml - - - - - + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="0.3958404" + inkscape:cx="437.04483" + inkscape:cy="915.77312" + inkscape:window-width="2560" + inkscape:window-height="1371" + inkscape:window-x="0" + inkscape:window-y="32" + inkscape:window-maximized="1" + inkscape:current-layer="agenda-pencil" /> + id="g157" + transform="translate(0.06082949)"> + id="secondary" + d="M 19.08741,5.6462257 17.258775,3.8175911 a 1.3061676,1.3061676 0 0 0 -1.828634,0 L 9.016858,10.230874 v 3.657269 h 3.657269 L 19.08741,7.4748603 a 1.3061676,1.3061676 0 0 0 0,-1.8286346 z" + style="fill:none;stroke:#f66b0e;stroke-width:2.55;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" /> + + diff --git a/src/static/favicon/favicon.svg b/src/static/favicon/favicon.svg index f6f3243..bee9aab 100644 --- a/src/static/favicon/favicon.svg +++ b/src/static/favicon/favicon.svg @@ -1,80 +1,57 @@ - + + sodipodi:docname="favicon.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + id="defs1499" /> - - - - - - image/svg+xml - - - - - + inkscape:window-y="32" + inkscape:window-maximized="1" + inkscape:current-layer="agenda-pencil" /> + id="g157" + transform="translate(0.06082953)"> + id="secondary" + d="M 19.08741,5.6462257 17.258775,3.8175911 a 1.3061676,1.3061676 0 0 0 -1.828634,0 L 9.016858,10.230874 v 3.657269 h 3.657269 L 19.08741,7.4748603 a 1.3061676,1.3061676 0 0 0 0,-1.8286346 z" + style="fill:none;stroke:#f66b0e;stroke-width:2.55;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" /> + id="primary" + d="m 15.566162,16.453545 v 2.009515 a 0.93635558,1.0047573 0 0 1 -0.936355,1.004757 H 3.3935396 A 0.93635558,1.0047573 0 0 1 2.457184,18.46306 V 2.3869423 A 0.93635558,1.0047573 0 0 1 3.3935396,1.382185 h 9.3635554" + style="fill:none;stroke:#112b3c;stroke-width:2.76437;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" /> + diff --git a/webpack.config.js b/webpack.config.js index 19e09f0..9964355 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -59,8 +59,8 @@ var config = { new WebpackFavicons({ src: path.resolve("src", "static", "favicon", "favicon.svg"), path: "favicon/", - background: "#2f333e", - theme_color: "#2f333e", + background: "#efefef", + theme_color: "#efefef", icons: { android: { offset: 10 }, appleIcon: { offset: 10 },