summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile24
-rw-r--r--content/blogs.md8
-rw-r--r--content/snippets/convert-losless.md (renamed from content/journal/convert-losless.md)0
-rw-r--r--content/snippets/disk-usage.md (renamed from content/journal/disk-usage.md)0
-rw-r--r--content/snippets/my-ip.md (renamed from content/journal/my-ip.md)0
-rw-r--r--content/snippets/screen-off.md (renamed from content/journal/screen-off.md)0
-rw-r--r--content/snippets/ssh-force-password-authentification.md (renamed from content/journal/ssh-force-password-authentification.md)0
-rw-r--r--content/snippets/tar-usage.md (renamed from content/journal/tar-usage.md)0
-rw-r--r--layouts/_default/list.html2
-rw-r--r--layouts/_default/single.html2
-rw-r--r--layouts/blogs/single.html32
-rw-r--r--layouts/error/single.html2
-rw-r--r--layouts/index.html13
-rw-r--r--layouts/projects/single.html4
-rw-r--r--static/captcha.js4
-rw-r--r--static/custom.css10
16 files changed, 92 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 77a6ea6..86629ba 100644
--- a/Makefile
+++ b/Makefile
@@ -40,3 +40,27 @@ serve:
test:
export HUGO_TEST=1 && hugo --ignoreCache --verbose=false
+
+buildmoehring: clean
+ @# Concat all CSS files
+ gulp concat
+ @# Build the HTML the first time to be ...
+ HUGO_GULP=0 hugo --baseURL=https://www.moehring.guru/ --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 --baseURL=https://www.moehring.guru/ --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
+
+deploymoehring: buildmoehring
+ @# Deploy to the server!
+ if [ -d /var/www/www.moehring.guru ]; then\
+ ( rsync --delete -avz public/ /var/www/www.moehring.guru/ 1>/dev/null 2>/dev/null && \
+ echo "Success: Site www.moehring.guru was built.") || ./error.sh; \
+ else \
+ rsync --delete -avze ssh public/ online:/var/www/www.moehring.guru/; \
+ fi
diff --git a/content/blogs.md b/content/blogs.md
new file mode 100644
index 0000000..97d70c1
--- /dev/null
+++ b/content/blogs.md
@@ -0,0 +1,8 @@
++++
+date = "2016-11-18T11:10:19+02:00"
+draft = false
+title = "my blogs"
+type = "blogs"
+layout = "single"
+
++++
diff --git a/content/journal/convert-losless.md b/content/snippets/convert-losless.md
index 0fc4042..0fc4042 100644
--- a/content/journal/convert-losless.md
+++ b/content/snippets/convert-losless.md
diff --git a/content/journal/disk-usage.md b/content/snippets/disk-usage.md
index 15920b3..15920b3 100644
--- a/content/journal/disk-usage.md
+++ b/content/snippets/disk-usage.md
diff --git a/content/journal/my-ip.md b/content/snippets/my-ip.md
index 2e4cebd..2e4cebd 100644
--- a/content/journal/my-ip.md
+++ b/content/snippets/my-ip.md
diff --git a/content/journal/screen-off.md b/content/snippets/screen-off.md
index 3e45e77..3e45e77 100644
--- a/content/journal/screen-off.md
+++ b/content/snippets/screen-off.md
diff --git a/content/journal/ssh-force-password-authentification.md b/content/snippets/ssh-force-password-authentification.md
index 9fd1313..9fd1313 100644
--- a/content/journal/ssh-force-password-authentification.md
+++ b/content/snippets/ssh-force-password-authentification.md
diff --git a/content/journal/tar-usage.md b/content/snippets/tar-usage.md
index d7a8aa9..d7a8aa9 100644
--- a/content/journal/tar-usage.md
+++ b/content/snippets/tar-usage.md
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 8f648dd..f18b449 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,6 +1,6 @@
{{partial "header.tmpl" .}}
<div class="row">
- <header><p><a href="{{$.Site.BaseURL}}" class="black-link header-link" title="go back">journal</a></p></header>
+ <header><p><a href="{{$.Site.BaseURL}}" class="black-link header-link" title="go back">snippets</a></p></header>
</div>
{{ range .Data.Pages }}
<div class="container journal content">
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 6f53645..6ac900a 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -12,7 +12,7 @@
</div>
<div class="row center">
<p class="twelve columns" style="margin-top: 20px">
- <a class="button" href="../" title="back to index">back to journal</a>
+ <a class="button" href="../" title="back to index">back to snippets</a>
</p>
</div>
{{partial "footer.tmpl"}}
diff --git a/layouts/blogs/single.html b/layouts/blogs/single.html
new file mode 100644
index 0000000..b84d572
--- /dev/null
+++ b/layouts/blogs/single.html
@@ -0,0 +1,32 @@
+{{partial "header.tmpl" .}}
+<div class="row">
+ <header><p>{{.Title}}</p></header>
+</div>
+<div class="container content journal">
+ <div class="row">
+ <div class="twelve columns article">
+ <h6><a class="header-link" href="//www.complicissimus.de" title="Der Complicissimus.de">Der Complicissimus.de</a></h6>
+ <p>My Blog, where I collect interesting articles on the web and post my random thoughts (in German).</p>
+ <div class="row center">
+ <a class="button button-dark" href="//www.complicissimus.de">Read More</a>
+ </div>
+ </div>
+ </div>
+</div>
+<div class="container content journal">
+ <div class="row">
+ <div class="twelve columns article">
+ <h6><a href="//www.fuselkönig.de" title="Fuselkönig.de" class="header-link">Fuselkönig.de</a></h6>
+ <p>I write over Alcohol and Spirits and keep notes of the taste. It's in German as well.</p>
+ <div class="row center">
+ <a class="button button-dark" href="//www.fuselkoenig.de">Read More</a>
+ </div>
+ </div>
+ </div>
+</div>
+<div class="row center">
+ <p class="twelve columns" style="margin-top: 20px">
+ <a class="button" href="../" title="back to index">go back</a>
+ </p>
+</div>
+{{partial "footer.tmpl" .}}
diff --git a/layouts/error/single.html b/layouts/error/single.html
index d126d2f..959476f 100644
--- a/layouts/error/single.html
+++ b/layouts/error/single.html
@@ -29,7 +29,7 @@ _ ___ _.--.
<div class="row center">
<p class="twelve columns" style="margin-top: 20px">
- <a class="button" href="../" title="back to index">go back</a>
+ <a class="button" href="../" title="go back" onclick="javascript:history.go(-1);return false;">go back</a>
</p>
</div>
{{partial "footer.tmpl" .}}
diff --git a/layouts/index.html b/layouts/index.html
index 79e4bdc..6e3e448 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -5,17 +5,26 @@
<div class="container main">
<div class="row">
<div class="twelve columns">
- <a href="https://www.complicissimus.de" title="blog">the blog</a>
+ <a href="blogs/" title="blogs">blogs</a>
</div>
<div class="twelve columns margin-top-small">
<a href="projects/" title="side projects">projects</a>
</div>
- <div class="twelve columns margin-top-small">
+ <!--div class="twelve columns margin-top-small">
+ <a href="projects/" title="side projects">websites</a>
+ </div-->
+ <!--div class="twelve columns margin-top-small">
<a href="journal/" title="journal">journal</a>
+ </div-->
+ <div class="twelve columns margin-top-small">
+ <a href="snippets/ " title="snippets">snippets</a>
</div>
<div class="twelve columns margin-top-small">
<a href="contact/" title="contact">contact</a>
</div>
+ <!--div class="twelve columns margin-top-small">
+ <a href="projects/" title="side projects">more</a>
+ </div-->
</div>
</div>
{{partial "footer.tmpl"}}
diff --git a/layouts/projects/single.html b/layouts/projects/single.html
index 8f7db35..8b92906 100644
--- a/layouts/projects/single.html
+++ b/layouts/projects/single.html
@@ -15,9 +15,9 @@
<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="{{$.Site.BaseURL}}uhttpd/" title="µhttpd">µhttpd</a><br>
+ <!--a href="{{$.Site.BaseURL}}uhttpd/" title="µhttpd">µhttpd</a><br-->
<!--a href="https://ifconfig.iamfabulous.de" title="your ip">your ip</a><br-->
- <a href="{{$.Site.BaseURL}}journal/my-ip" title="your ip">your ip</a><br>
+ <a href="{{$.Site.BaseURL}}snippets/my-ip" 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>
diff --git a/static/captcha.js b/static/captcha.js
index 6b895bb..7b16e7c 100644
--- a/static/captcha.js
+++ b/static/captcha.js
@@ -16,11 +16,11 @@ function loadJSON(path, success, error)
xhr.open("GET", path, true);
xhr.send();
};
-loadJSON('http://127.0.0.1:3333/json/newcaptcha',
+loadJSON('/json/newcaptcha',
function(data){
console.log("success", data);
var captcha = document.getElementById('captcha-img');
- captcha.src = "http://127.0.0.1:3333/captcha/" + data.captcha_id + ".png";
+ captcha.src = "/captcha/" + data.captcha_id + ".png";
var captcha_input = document.getElementById('captcha-id');
captcha_input.value = data.captcha_id;
},
diff --git a/static/custom.css b/static/custom.css
index 5dbbc64..b3d3784 100644
--- a/static/custom.css
+++ b/static/custom.css
@@ -48,6 +48,9 @@ a:hover {
.button:hover {
color:#efefef;
}
+.button-dark {
+ background-color: #171717;
+}
.center {
text-align: center;
}
@@ -177,6 +180,13 @@ select:focus {
.hp {
display: none;
}
+
+.header-link {
+ font-size: inherit;
+}
+.header-link:hover {
+ color: #171717;
+}
#captcha-img {
background-color: #efefef;
background: #efefef;