summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile14
-rw-r--r--config.toml2
-rw-r--r--gulpfile.js12
-rw-r--r--layouts/404.html38
-rw-r--r--layouts/_default/list.html2
-rw-r--r--layouts/index.html6
-rw-r--r--layouts/partials/css.tmpl7
-rw-r--r--layouts/partials/footer.tmpl8
-rw-r--r--layouts/projects.html39
-rw-r--r--layouts/projects/single.html32
-rw-r--r--static/custom.css13
11 files changed, 98 insertions, 75 deletions
diff --git a/Makefile b/Makefile
index 3dcfa83..639a59e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,17 @@
all: clean build
build: clean
- cd static && cat normalize.css skeleton.css font.css custom.css > concat.css
- gulp
- HUGO_TEST= hugo --ignoreCache --log=true --logFile=./log/hugo.log --verbose=false 1>/dev/null
+ @# Concat all CSS files
+ gulp concat
+ @# Build the HTML the first time to be ...
+ HUGO_GULP=0 hugo --ignoreCache --log=true --logFile=./log/hugo.log --verbose=false 1>/dev/null
+ @# ... spidered by uncss to remove the unnecessary selector rules.
+ gulp uncss
+ @# Builds the site again, but this time the minified CSS will be inlined by Hugo.
+ HUGO_GULP=1 hugo --ignoreCache --log=true --logFile=./log/hugo.log --verbose=false 1>/dev/null
+ @# Minifies the HTML!
gulp minifyhtml
+ @# Cleans up.
rm -rf public/gulp.css/
rm -f public/*.css
@@ -20,6 +27,7 @@ index:
cat public/index.html
deploy: clean build
+ @# Deploy to the server!
if [ -d /var/www/www.iamfabulous.de ]; then\
( rsync --delete -avz public/ /var/www/www.iamfabulous.de/ 1>/dev/null 2>/dev/null && \
echo "Success: Site www.iamfabulous.de was built.") || ./error.sh; \
diff --git a/config.toml b/config.toml
index 790fea9..22bb5e0 100644
--- a/config.toml
+++ b/config.toml
@@ -1,6 +1,6 @@
baseurl = "https://www.iamfabulous.de/"
languageCode = "en-us"
-title = "moehring"
+title = "welcome"
disableHugoGeneratorInject = true
disableRSS = false
disableSitemap = true
diff --git a/gulpfile.js b/gulpfile.js
index dbf1406..e413a14 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,11 +2,19 @@ var gulp = require('gulp');
var cssnano = require('gulp-cssnano');
var htmlmin = require('gulp-htmlmin');
var uncss = require('gulp-uncss');
+var concat = require('gulp-concat');
-gulp.task('default', function() {
+gulp.task('concat', function() {
+ return gulp.src(['static/normalize.css', 'static/skeleton.css', 'static/font.css', 'static/custom.css'])
+ .pipe(concat('concat.css'))
+ .pipe(gulp.dest('./static/'));
+});
+
+gulp.task('uncss', function() {
return gulp.src('static/concat.css')
.pipe(uncss({
- html: ['layouts/*.html', 'layouts/partials/*.html', 'layouts/_default/*.html']
+ html: ['public/*.html', 'public/projects/*.html', 'public/journal/*.html', 'public/journal/**/*.html'],
+ ignore: ['.text-right', '.text-left']
}))
.pipe(cssnano())
.pipe(gulp.dest('./static/gulp.css'));
diff --git a/layouts/404.html b/layouts/404.html
index b40f7ea..3171635 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,7 +1,37 @@
{{partial "header.tmpl" .}}
- <header><p>404 - not found</p><br></header>
- <p class="twelve columns" style="margin-top: 20px">
- <a class="button" href="/" title="back to index">click to go back</a>
- </p>
+<div class="row">
+ <header><p>404 - not found</p></header>
+</div>
+
+<div class="container journal">
+ <div class="row">
+ <div class="twelve columns article">
+ <ul>
+ <li class="journal-li">
+ <div class="margin-top">Here is nothing.</div>
+ <br>
+ <pre>
+_ ___ _.--.
+\`.|\..----...-'` `-._.-'_.-'`
+/ ' ` , __.--'
+)/' _/ \ `-_, /
+`-'" `"\_ ,_.-;_.-\_ ',
+ _.-'_./ {_.' ; /
+ {_.-``-' {_/
+ ~~~~~~ ~~~~~
+ </pre>
+ </li>
+ </ul>
+ </div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="row center">
+ <p class="twelve columns" style="margin-top: 20px">
+ <a class="button" href="/" title="back to index">click to go back</a>
+ </p>
+ </div>
+</div>
{{partial "footer.tmpl"}}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 690e09f..4f9b3aa 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,6 +1,6 @@
{{partial "header.tmpl" .}}
<div class="row">
- <header><p>journal</p></header>
+ <header><p>journal</p></header>
</div>
{{ range .Data.Pages }}
<div class="container journal">
diff --git a/layouts/index.html b/layouts/index.html
index 522daf5..94aa532 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -7,13 +7,13 @@
<div class="twelve columns">
<a href="https://www.complicissimus.de" title="blog">my blog</a>
</div>
- <div class="twelve columns margin-top">
+ <div class="twelve columns margin-top-small">
<a href="projects/" title="side projects">projects</a>
</div>
- <div class="twelve columns margin-top">
+ <div class="twelve columns margin-top-small">
<a href="journal/" title="journal">journal</a>
</div>
- <div class="twelve columns margin-top">
+ <div class="twelve columns margin-top-small">
<a href="https://www.complicissimus.de/about/#kontakt" title="contact">contact</a>
</div>
</div>
diff --git a/layouts/partials/css.tmpl b/layouts/partials/css.tmpl
index a10e818..45efad7 100644
--- a/layouts/partials/css.tmpl
+++ b/layouts/partials/css.tmpl
@@ -6,6 +6,11 @@
<link href="/custom.css" rel="stylesheet" type="text/css">
{{else}}
<style>
- {{readFile "static/gulp.css/concat.css" | safeCSS}}
+ {{$tmp := getenv "HUGO_GULP"}}
+ {{if eq $tmp "1"}}
+ {{readFile "static/gulp.css/concat.css" | safeCSS}}
+ {{else}}
+ {{readFile "static/concat.css" | safeCSS}}
+ {{end}}
</style>
{{end}}
diff --git a/layouts/partials/footer.tmpl b/layouts/partials/footer.tmpl
index 8cc61ad..408626b 100644
--- a/layouts/partials/footer.tmpl
+++ b/layouts/partials/footer.tmpl
@@ -1,7 +1,6 @@
{{$tmp := getenv "HUGO_TEST"}}
{{if eq $tmp "1"}}
{{else}}
- <script>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
@@ -10,15 +9,14 @@
_paq.push(['enableLinkTracking']);
(function() {
var u="//a.iamfabulous.de/";
- _paq.push(['setTrackerUrl', u+'piwik.php']);
+ _paq.push(['setTrackerUrl', u+'js/index.php']);
_paq.push(['setSiteId', '6']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
- g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+ g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'js/index.php'; s.parentNode.insertBefore(g,s);
})();
</script>
-<noscript><p><img src="//a.iamfabulous.de/piwik.php?idsite=6&rec=1" style="border:0;" alt="" /></p></noscript>
+<noscript><p><img src="//a.iamfabulous.de/js/index.php?idsite=6&rec=1" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
- </script>
{{end}}
</body>
</html>
diff --git a/layouts/projects.html b/layouts/projects.html
deleted file mode 100644
index 103c7e0..0000000
--- a/layouts/projects.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- THIS FILE IS NOT USED ANYMORE -->
-{{partial "header.tmpl" "projects"}}
- <header><p>projects</p><br></header>
- <nav>
- <ul class="offset-by-three three columns">
- <li><a href="https://www.maxmail.xyz" title="mail server">maxmail.xyz</a></li>
- <li><a href="https://webmail.maxmail.xyz" title="webmail">webmail</a></li>
- <li><a href="https://lists.iamfabulous.de" title="mailing lists">mailing lists</a></li>
- <li><a href="https://irc.iamfabulous.de" title="chat">irc server</a></li>
- <li><a href="https://www.gospeladlershof.de" title="gospelchor adlershof">gospelchor</a></li>
- </ul>
- <ul class="three columns">
- <li><a href="https://images.iamfabulous.de" title="images">images</a></li>
- <li><a href="https://scribble.iamfabulous.de" title="scribble">scribble</a></li>
- <li><a href="https://uhttpd.iamfabulous.de" title="uhttpd">uhttpd</a></li>
- <li><a href="https://ifconfig.iamfabulous.de" title="your ip">your ip</a></li>
- <li><a href="https://bitch.iamfabulous.de" title="bitch">bitch</a></li>
- <li><a href="https://jungegemeinde.iamfabulous.de" title="junge gemeinde">jg</a></li>
- <!--li><a href="/teaching/" title="teaching (german)">teaching</a></li>
- <li>&nbsp;</li>
- <div class="container">
- <li class="font-size">websites:</li>
- <li class="font-size"><ul>tools:</ul></li>
- <li>––––––</li>
- <li><a href="https://tracker.iamfabulous.de" title="do not abuse">file sharing</a></li>
- <li><a href="https://files.iamfabulous.de" title="files">files</a></li>
- <li><a href="index.html" title="back to index">../go back</a></li>
- <li><a href="https://irc.iamfabulous.de" title="chat">chat (irc)</a></li>
- <li><a href="https://jungegemeinde.iamfabulous.de" title="junge gemeinde">junge gemeinde</a></li>
- <li><a href="https://files.iamfabulous.de" title="files">files</a></li>
- <li><a href="https://www.maxmail.xyz" title="www.maxmail.xyz">mail server</a></li>
- <li><a href="https://www.maxmail.xyz" title="maxmail">maxmail.xyz</a></li>
- <li><a href="https://status.iamfabulous.de" title="status page">status page</a></li-->
- </ul>
- <p class="twelve columns" style="margin-top: 20px">
- <a href="index.html" title="back to index">../go back</a>
- </p>
- </nav>
-{{partial "footer.tmpl"}}
diff --git a/layouts/projects/single.html b/layouts/projects/single.html
index 6304f7d..71030c8 100644
--- a/layouts/projects/single.html
+++ b/layouts/projects/single.html
@@ -2,23 +2,23 @@
<div class="row">
<header><p>{{.Title}}</p></header>
</div>
-<div class="container main">
+<div class="main container">
<div class="row">
- <ul class="offset-by-three three columns">
- <li><a href="https://www.maxmail.xyz" title="mail server">maxmail.xyz</a></li>
- <li><a href="https://webmail.maxmail.xyz" title="webmail">webmail</a></li>
- <li><a href="https://lists.iamfabulous.de" title="mailing lists">mailing lists</a></li>
- <li><a href="https://irc.iamfabulous.de" title="chat">irc server</a></li>
- <li><a href="https://www.gospeladlershof.de" title="gospelchor adlershof">gospelchor</a></li>
- </ul>
- <ul class="three columns">
- <li><a href="https://images.iamfabulous.de" title="images">images</a></li>
- <li><a href="https://scribble.iamfabulous.de" title="scribble">scribble</a></li>
- <li><a href="https://uhttpd.iamfabulous.de" title="uhttpd">uhttpd</a></li>
- <li><a href="https://ifconfig.iamfabulous.de" title="your ip">your ip</a></li>
- <li><a href="https://bitch.iamfabulous.de" title="bitch">bitch</a></li>
- <li><a href="https://jungegemeinde.iamfabulous.de" title="junge gemeinde">jg</a></li>
- </ul>
+ <div class="text-right offset-by-two four columns">
+ <a href="https://www.maxmail.xyz" title="mail server">maxmail.xyz</a><br>
+ <a href="https://webmail.maxmail.xyz" title="webmail">webmail</a><br>
+ <a href="https://lists.iamfabulous.de" title="mailing lists">mailing lists</a><br>
+ <a href="https://irc.iamfabulous.de" title="chat">irc server</a><br>
+ <a href="https://www.gospeladlershof.de" title="gospelchor adlershof">gospelchor</a>
+ </div>
+ <div class="text-left four columns">
+ <a href="https://images.iamfabulous.de" title="images">images</a><br>
+ <a href="https://scribble.iamfabulous.de" title="scribble">scribble</a><br>
+ <a href="https://uhttpd.iamfabulous.de" title="uhttpd">uhttpd</a><br>
+ <a href="https://ifconfig.iamfabulous.de" title="your ip">your ip</a><br>
+ <a href="https://bitch.iamfabulous.de" title="bitch">bitch</a><br>
+ <a href="https://jungegemeinde.iamfabulous.de" title="junge gemeinde">jg</a>
+ </div>
</div>
<div class="row">
<p class="twelve columns margin-top">
diff --git a/static/custom.css b/static/custom.css
index 3c513ca..57fde38 100644
--- a/static/custom.css
+++ b/static/custom.css
@@ -88,3 +88,16 @@ a:hover {
.margin-top {
margin-top: 20px;
}
+.margin-top-small {
+ margin-top: 10px;
+}
+
+/* Für projects/, damit der Text nicht überlappt, aber nah beieinander steht. */
+@media (min-width: 755px) {
+ .text-right {
+ text-align: right;
+ }
+ .text-left{
+ text-align: left;
+ }
+}