summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas "Cakeisalie5" Touhey <thomas@touhey.fr>2018-09-29 16:06:47 +0200
committerThomas "Cakeisalie5" Touhey <thomas@touhey.fr>2018-09-29 16:06:47 +0200
commit6205ea35ef5db8d703fdb54843f59e1c6af290b6 (patch)
tree916987f2bae1a8800cd292b370df7b2b2e0c37bd
parentc939633ef22202a8cb0e72bd437b21273d90c8fb (diff)
Working on the design for mobile devices.
-rwxr-xr-xMakefile17
-rwxr-xr-x_config/preprod.yml38
-rw-r--r--_layouts/default.html15
3 files changed, 61 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index d973e63..13c3d9f 100755
--- a/Makefile
+++ b/Makefile
@@ -11,16 +11,20 @@ show: -all-prod -install-prod
# Show the drafts, for friends.
showdrafts: -all-prod-drafts -install-prod
+# Show preprod.
+showpre showpreprod: -all-preprod -install-preprod
+
# Preview production before pushing.
check preview-prod: -all-prod-watch
-.PHONY: show showdrafts preview prev check preview-prod
+.PHONY: show showdrafts showpre showpreprod preview prev check preview-prod
#*****************************************************************************#
# Internal rules #
#*****************************************************************************#
BUNDLE := bundle
JEK := $(BUNDLE) exec jekyll
ROOT := john@john.touhey.fr:blog
+ POOT := john@john.touhey.fr:pv/preprod
# Prepare.
-prepare:
@@ -29,6 +33,8 @@ check preview-prod: -all-prod-watch
# Make it all.
-all-prod: -prepare
$(JEK) build --config _config/prod.yml $(OPTS)
+ -all-preprod: -prepare
+ $(JEK) build --config _config/preprod.yml $(OPTS)
-all-dev: -prepare
$(JEK) build --config _config/dev.yml $(OPTS)
@@ -49,7 +55,12 @@ check preview-prod: -all-prod-watch
find _site/prod -type f -exec chmod 644 {} \;
rsync -Prlt --delete --exclude=up/ _site/prod/ "$(ROOT)"
+ -install-preprod:
+ find _site/preprod -type f -exec chmod 644 {} \;
+ rsync -Prlt --delete --exclude=up/ _site/preprod/ "$(POOT)"
+
.PHONY: -prepare
-.PHONY: -all-prod -all-dev -all-prod-drafts -all-dev-drafts -all-dev-watch
-.PHONY: -install-prod
+.PHONY: -all-prod -all-preprod -all-dev
+.PHONY: -all-prod-drafts -all-dev-drafts -all-dev-watch
+.PHONY: -install-prod -install-preprod
# End of file.
diff --git a/_config/preprod.yml b/_config/preprod.yml
new file mode 100755
index 0000000..2724c22
--- /dev/null
+++ b/_config/preprod.yml
@@ -0,0 +1,38 @@
+#******************************************************************************
+# _config/preprod.yml -- Pre-production environment configuration.
+#
+# For technical reasons, this file is *NOT* reloaded automatically when you use
+# 'bundle exec jekyll serve'. If you change this file, please restart the
+# server process.
+#******************************************************************************
+# Site settings.
+name: John Touhey
+email: john.touhey@orange.fr
+url: "https://john.touhey.fr"
+baseurl: "/up/pv/preprod"
+author: john
+description: "John Touhey's personal website."
+thumb: me.jpg
+
+# Build settings.
+destination: _site/preprod
+plugins:
+ - jekyll-assets
+markdown: kramdown
+exclude:
+ - Gemfile
+ - Gemfile.lock
+ - Makefile
+ - README.md
+ - vendor
+
+# Assets settings.
+assets:
+ compress:
+ css: false
+ js: false
+ sources:
+ - _assets/css
+ - _assets
+
+# End of file.
diff --git a/_layouts/default.html b/_layouts/default.html
index 975972c..6c8bc70 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -54,6 +54,15 @@
{% asset css/main.css %}
</head><body><div class="container">
+
+<section class="content-wrapper"><div class="content-subwrapper">
+<h2>{% if page.layout == "post" %}{{ page.date | date_to_string }}: {% endif %}{% if page.title %}{{ page.title }}{% else %}About myself{% endif %}</h2>
+<hr />
+
+<div class="content">
+{{ content }}
+</div></div></section>
+
<div class="side">
<a href="{{ site.url }}{{ site.baseurl }}/">
{% asset profile.jpg magick:resize=300x300 alt="Photo of me during a concert" class="picture" %}
@@ -68,13 +77,7 @@
<li><a href="{{ site.baseurl }}/biography.html">Biography</a></li>
<li><a href="{{ site.baseurl }}/paintings.html">Paintings</a></li>
</ul></nav></div></div>
-<section class="content-wrapper"><div class="content-subwrapper">
-<h2>{% if page.layout == "post" %}{{ page.date | date_to_string }}: {% endif %}{% if page.title %}{{ page.title }}{% else %}About myself{% endif %}</h2>
-<hr />
-<div class="content">
-{{ content }}
-</div></div></section>
<hr /><footer>
<p>Copyright (C) 2017 - {{ site.time | date: "%Y" }} <a href="{{ site.url }}{{ site.baseurl }}/">John Touhey</a> &lt;<a href="mailto:john.touhey@orange.fr">john.touhey@orange.fr</a>&gt;. All&nbsp;rights&nbsp;reserved.<br />
Website design by <a href="https://thomas.touhey.fr/">Thomas Touhey</a> &lt;<a href="mailto:thomas@touhey.fr">thomas@touhey.fr</a>&gt;</p>