From 34e9509ceacddb6c1a6d9a9d575075ccf432305e Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Mon, 23 Dec 2019 06:54:13 +0100 Subject: [PATCH] Adjust layout for Bootstrap 4. --- Makefile | 3 +- index.html | 245 ++++++++++++++++++++++----------------------- package.json | 1 + src/bovender.scss | 3 + src/component.scss | 7 +- src/config.scss | 1 + src/fonts.scss | 37 +++++++ webpack.config.js | 12 +++ yarn.lock | 10 +- 9 files changed, 187 insertions(+), 132 deletions(-) create mode 100644 src/bovender.scss create mode 100644 src/config.scss create mode 100644 src/fonts.scss diff --git a/Makefile b/Makefile index a8380fd..6868612 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ .PHONY: upload upload: - rsync -r --exclude .git/ . doktorkraus.de:/var/www/bovender + yarn exec webpack && \ + rsync -r --exclude .git/ --exclude src/ --exclude node_modules/ . doktorkraus.de:/var/www/bovender diff --git a/index.html b/index.html index 32d3fa2..895ee4c 100644 --- a/index.html +++ b/index.html @@ -4,13 +4,12 @@ - Daniel Kraus is (a) bovender + Daniel Kraus ~ bovender - {{/* */}} @@ -24,36 +23,37 @@
-
-
-

- Daniel Kraus - Daniel Kraus is (a) Bovender +
+
+ Daniel Kraus +

+ Daniel Kraus ~ Bovender

-
+
@@ -73,154 +73,146 @@

A selection of my projects:

-
-
-

Daniel's XL Toolbox

+ +
+
+ Daniel's XL Toolbox
-
-
- XL Toolbox -
-

- - www.xltoolbox.net - -

-

- VBA - C# + XL Toolbox +

+

+ VBA + C# An Excel® add-in with power features aimed at scientists and engineers. This is my most popular project. People especially love the ability to export high-resolution graphics directly from Excel®.

+ www.xltoolbox.net
-
-
-

IP Indicator

+ +
+
+ IP Indicator
-
-

- - github.com/bovender/indicator-ip - -

-

- indicator-ip screenshot - Python + indicator-ip screenshot +

+

+ Python Ubuntu Unity indicator that displays the current IP address(es) in the indicator bar.

+ 

sudo apt-add-repository ppa:bovender/bovender
 sudo apt-get update
 sudo apt-get install indicator-ip
+

+

+ github.com/bovender/indicator-ip +

+
-
-
-

LinkTitles

+
+
+ LinkTitles
-
-

- - www.mediawiki.org/wiki/Extension:LinkTitles - -

-

- PHP +

+

+ PHP A MediaWiki extension that automatically adds links to existing titles to pages that you edit.

+ + www.mediawiki.org/wiki/Extension:LinkTitles +
-
-
-

PubmedParser

+
+
+ PubmedParser
-
-

- - www.mediawiki.org/wiki/Extension:PubmedParser - -

-

- PHP +

+

+ PHP A MediaWiki extension that creates citations from Pubmed ID numbers.

+ + www.mediawiki.org/wiki/Extension:PubmedParser +
-
-
-

Gemeinsam gegen Armut auf den Philippinen e.V.

+ +
+
+ Gemeinsam gegen Armut auf den Philippinen e.V.
-
-

- - www.gemeinsam-gegen-armut.org - -

-
- Gemeinsam gegen Armut auf den Philippinen (GGAP) e.V. -
-

- Ruby on Rails + Gemeinsam gegen Armut auf den Philippinen (GGAP) e.V. +

+

+ Ruby on Rails Website with membership management for an NGO that gives scholarships to job trainees on the Philippines. + + www.gemeinsam-gegen-armut.org +

-
-
-

Create Changelog

+ +
+
+ Create Changelog
-
-

- - github.com/bovender/create-changelog - -

-

- Ruby +

+

+ Ruby Command-line utility that creates an end-user-friendly changelog from special comments in Git commits. 

sudo apt-add-repository ppa:bovender/bovender
 sudo apt-get update
 sudo apt-get install create-changelog
+ + github.com/bovender/create-changelog +
-
-
-

VstoAddinInstaller

+ +
+
+ VstoAddinInstaller
-
-

- - github.com/bovender/VstoAddinInstaller - -

-

- VstoAddinInstaller screenshot -

-

- InnoSetup + VstoAddinInstaller screenshot +

+

+ InnoSetup + Pascal InnoSetup scripts to create installers for VSTO add-ins for Microsoft® Office®.

+ + github.com/bovender/VstoAddinInstaller +
+

- See more over at my - GitHub repository - and have a look at my - Ubuntu PPA. + See more over at my GitHub repository + and my self-hosted Gitea repository + and have a look at my Ubuntu PPA.

+ +
- The Plesse castle near Bovenden -

Why Bovender?

+ The Plesse castle near Bovenden +

Why Bovender?

Bovenden is the place where I grew up, which makes me a 'Bovender'. @@ -273,23 +265,24 @@ sudo apt-get install create-changelog

-

- - This microsite was hand-coded using - Vim and - Bootstrap. - +

+ This microsite was created with + VS Code and + Bootstrap 4 using + Webpack. +
+ A previous version of this site was hand-coded using + Vim and + Bootstrap 3.

-
- - Impressum ~ Daniel Kraus ~ - Höhenstraße 15 ~ 65451 Kelsterbach ~ - bovender at bovender . de ~ - (0 61 07) 7 56 88 40 ~ - telegram.me/bovender - ~ - Datenschutz ~ Privacy - +
+ Impressum ~ Daniel Kraus ~ + Höhenstraße 15 ~ 65451 Kelsterbach ~ + bovender at bovender . de ~ + (0 61 07) 7 56 88 40 ~ + telegram.me/bovender + ~ + Datenschutz ~ Privacy
diff --git a/package.json b/package.json index 3b5a3ee..af2579d 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "autoprefixer": "^9.7.3", "bootstrap": "4", "css-loader": "^3.4.0", + "file-loader": "^5.0.2", "mini-css-extract-plugin": "^0.9.0", "node-sass": "^4.13.0", "postcss-loader": "^3.0.0", diff --git a/src/bovender.scss b/src/bovender.scss new file mode 100644 index 0000000..0e46974 --- /dev/null +++ b/src/bovender.scss @@ -0,0 +1,3 @@ +body { + padding: 1rem !important; +} diff --git a/src/component.scss b/src/component.scss index 58e3317..a45cccb 100644 --- a/src/component.scss +++ b/src/component.scss @@ -1,5 +1,4 @@ +@import "fonts"; +@import "config"; @import "~bootstrap/scss/bootstrap"; - -.dummy { - background-color: transparent; -} +@import "bovender"; diff --git a/src/config.scss b/src/config.scss new file mode 100644 index 0000000..f9b1b71 --- /dev/null +++ b/src/config.scss @@ -0,0 +1 @@ +$font-family-base: "IBM Plex Sans Condensed"; diff --git a/src/fonts.scss b/src/fonts.scss new file mode 100644 index 0000000..8b43aee --- /dev/null +++ b/src/fonts.scss @@ -0,0 +1,37 @@ +/* https://google-webfonts-helper.herokuapp.com/fonts/ibm-plex-sans-condensed?subsets=latin */ +/* ibm-plex-sans-condensed-regular - latin */ +@font-face { + font-family: 'IBM Plex Sans Condensed'; + font-style: normal; + font-weight: 400; + src: local('IBM Plex Sans Condensed'), local('IBMPlexSansCond'), + url('../fonts/ibm-plex-sans-condensed-v6-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/ibm-plex-sans-condensed-v6-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} +/* ibm-plex-sans-condensed-italic - latin */ +@font-face { + font-family: 'IBM Plex Sans Condensed'; + font-style: italic; + font-weight: 400; + src: local('IBM Plex Sans Condensed Italic'), local('IBMPlexSansCond-Italic'), + url('../fonts/ibm-plex-sans-condensed-v6-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/ibm-plex-sans-condensed-v6-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} +/* ibm-plex-sans-condensed-600 - latin */ +@font-face { + font-family: 'IBM Plex Sans Condensed'; + font-style: normal; + font-weight: 600; + src: local('IBM Plex Sans Condensed SemiBold'), local('IBMPlexSansCond-SemiBold'), + url('../fonts/ibm-plex-sans-condensed-v6-latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/ibm-plex-sans-condensed-v6-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} +/* ibm-plex-sans-condensed-600italic - latin */ +@font-face { + font-family: 'IBM Plex Sans Condensed'; + font-style: italic; + font-weight: 600; + src: local('IBM Plex Sans Condensed SemiBold Italic'), local('IBMPlexSansCond-SemiBoldItalic'), + url('../fonts/ibm-plex-sans-condensed-v6-latin-600italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/ibm-plex-sans-condensed-v6-latin-600italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} diff --git a/webpack.config.js b/webpack.config.js index 7be5527..1abcaf0 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -30,6 +30,18 @@ module.exports = { 'sass-loader' ], }, + { + test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, + use: [ + { + loader: 'file-loader', + options: { + name: '[name].[ext]', + outputPath: 'fonts/' + } + } + ] + } ], }, }; diff --git a/yarn.lock b/yarn.lock index 9839f5f..74c6373 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1238,6 +1238,14 @@ figgy-pudding@^3.5.1: resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== +file-loader@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.0.2.tgz#7f3d8b4ac85a5e8df61338cfec95d7405f971caa" + integrity sha512-QMiQ+WBkGLejKe81HU8SZ9PovsU/5uaLo0JdTCEXOYv7i7jfAjHZi1tcwp9tSASJPOmmHZtbdCervFmXMH/Dcg== + dependencies: + loader-utils "^1.2.3" + schema-utils "^2.5.0" + file-uri-to-path@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" @@ -3143,7 +3151,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.0.1, schema-utils@^2.1.0, schema-utils@^2.6.0: +schema-utils@^2.0.1, schema-utils@^2.1.0, schema-utils@^2.5.0, schema-utils@^2.6.0: version "2.6.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f" integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==