diff options
author | Thomas "Cakeisalie5" Touhey <thomas@touhey.fr> | 2018-02-04 22:37:25 +0100 |
---|---|---|
committer | Thomas "Cakeisalie5" Touhey <thomas@touhey.fr> | 2018-02-04 22:37:25 +0100 |
commit | 66d0371b5a899c015aecd0da8ec60524f0f06f4a (patch) | |
tree | a83b13bcf43c5f7be9a6a37cb5330abff4bd5554 | |
parent | 5da2b7e44af0ff4c591fdbfaefa17838e746d0f2 (diff) |
Continued the work
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | Gemfile | 4 | ||||
-rwxr-xr-x | Makefile | 20 | ||||
-rw-r--r-- | _assets/css/main.scss (renamed from _sass/_main.scss) | 33 | ||||
-rw-r--r-- | _assets/css/normalize.scss (renamed from _sass/normalize.scss) | 0 | ||||
-rwxr-xr-x | _assets/paintings/2015-05-06 22.26.25.jpg (renamed from assets/paintings/2015-05-06 22.26.25.jpg) | bin | 681573 -> 681573 bytes | |||
-rwxr-xr-x | _assets/paintings/2015-06-17 21.49.36.jpg (renamed from assets/paintings/2015-06-17 21.49.36.jpg) | bin | 820977 -> 820977 bytes | |||
-rwxr-xr-x | _assets/paintings/IMG_20120411_191105.jpg (renamed from assets/paintings/IMG_20120411_191105.jpg) | bin | 1513309 -> 1513309 bytes | |||
-rwxr-xr-x | _assets/paintings/IMG_20120411_191148.jpg (renamed from assets/paintings/IMG_20120411_191148.jpg) | bin | 1248016 -> 1248016 bytes | |||
-rwxr-xr-x | _assets/paintings/IMG_20120411_191222.jpg (renamed from assets/paintings/IMG_20120411_191222.jpg) | bin | 1605747 -> 1605747 bytes | |||
-rwxr-xr-x | _assets/paintings/IMG_20120411_213623.jpg (renamed from assets/paintings/IMG_20120411_213623.jpg) | bin | 1026706 -> 1026706 bytes | |||
-rwxr-xr-x | _assets/paintings/IMG_20120619_214117.jpg (renamed from assets/paintings/IMG_20120619_214117.jpg) | bin | 1799799 -> 1799799 bytes | |||
-rw-r--r-- | _assets/profile.jpg (renamed from assets/profile.jpg) | bin | 386657 -> 386657 bytes | |||
-rw-r--r-- | _assets/tordus_ninjazz.jpg | bin | 0 -> 399398 bytes | |||
-rw-r--r-- | _config/dev.yml | 16 | ||||
-rwxr-xr-x | _config/prod.yml | 16 | ||||
-rw-r--r-- | _layouts/default.html | 21 | ||||
-rw-r--r-- | _layouts/home.html | 13 | ||||
-rwxr-xr-x | _layouts/post.html | 4 | ||||
-rw-r--r-- | _music_notes.txt | 76 | ||||
-rw-r--r-- | _plugins/youtube.rb | 20 | ||||
-rw-r--r-- | assets/main.scss | 3 | ||||
-rw-r--r-- | music.md | 58 | ||||
-rw-r--r-- | paintings.md | 15 |
24 files changed, 247 insertions, 55 deletions
@@ -2,7 +2,10 @@ _site .sass-cache .jekyll-metadata +.jekyll-cache Gemfile.lock +.bundle +/vendor # Temporary files for various apps .DS_Store @@ -2,11 +2,11 @@ source 'http://rubygems.org' ruby RUBY_VERSION # Jekylling it. -gem "jekyll", "3.4.3" +gem "jekyll", "3.7.0" # Plugins! group :jekyll_plugins do - gem 'octopress-minify-html' + gem 'jekyll-assets' end gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] @@ -18,36 +18,38 @@ check preview-prod: -all-prod-watch #*****************************************************************************# # Internal rules # #*****************************************************************************# - JEK := bundle exec jekyll + BUNDLE := bundle + JEK := $(BUNDLE) exec jekyll ROOT := john@john.touhey.fr:blog -# Prepare the bundle. +# Prepare. -prepare: - bundle check || bundle prepare + $(BUNDLE) check || $(BUNDLE) install --path vendor/bundle # Make it all. -all-prod: -prepare - $(JEK) build --config _config/prod.yml + $(JEK) build --config _config/prod.yml $(OPTS) -all-dev: -prepare - $(JEK) build --config _config/dev.yml + $(JEK) build --config _config/dev.yml $(OPTS) # Make the drafts, for prod. -all-prod-drafts: -prepare - $(JEK) build --config _config/prod.yml --drafts + $(JEK) build --config _config/prod.yml --drafts $(OPTS) -all-dev-drafts: -prepare - $(JEK) build --config _config/dev.yml --drafts + $(JEK) build --config _config/dev.yml --drafts $(OPTS) # Make the drafts and watch. -all-dev-watch: -prepare - $(JEK) serve --config _config/dev.yml --drafts --watch + $(JEK) serve --config _config/dev.yml --drafts --watch $(OPTS) -all-prod-watch: -prepare - $(JEK) serve --config _config/prod.yml --watch + $(JEK) serve --config _config/prod.yml --watch $(OPTS) # Install the prod site onto the prod server. -install-prod: find _site/prod -type f -exec chmod 644 {} \; rsync -Prlt --delete --exclude=up/ _site/prod/ "$(ROOT)" +.PHONY: -prepare .PHONY: -all-prod -all-dev -all-prod-drafts -all-dev-drafts -all-dev-watch .PHONY: -install-prod # End of file. diff --git a/_sass/_main.scss b/_assets/css/main.scss index 94ac0e1..56c55ba 100644 --- a/_sass/_main.scss +++ b/_assets/css/main.scss @@ -1,20 +1,29 @@ * { box-sizing: border-box; - font-family: "Times New Roman", Times, serif; + font-family: "Helvetica", Times, serif; } @import "normalize"; body { margin: 0; - background-color: #CEF6F5; + background-color: #F0F0F0; } .container { width: 100%; - max-width: 800px; - margin: 0 auto; - padding: 30px 0; + max-width: 840px; + margin: 10px auto 50px; + padding: 20px 20px 10px; + background-color: white; +} + +.container:after { + content: " "; + visibility: hidden; + display: block; + height: 0; + clear: both; } .side { @@ -43,6 +52,7 @@ nav li:before { .content { width: 100%; padding-left: 20%; + text-align: justify; } .content-wrapper { padding-left: 10px; @@ -53,7 +63,11 @@ footer { padding: 0 5px; } -@media (max-width: 500px) { +footer p { + font-size: 12px; +} + +@media (max-width: 550px) { .side { position: static; width: 100%; @@ -72,11 +86,13 @@ h1, h2, h3, h4, h5, h6 { line-height: 1; margin: 0; } -h1 { font-size: 26px; } -h2 { font-size: 24px; } +h1 { font-size: 18px; } +h2 { font-size: 24px; margin-top: 0; } h3 { font-size: 18px; } p { margin: 5px 0; + line-height: 1.2; + padding-bottom: 0.5em; } hr { @@ -102,6 +118,7 @@ blockquote { .video_wrapper iframe { width: 100%; height: 100%; + border: none; background-color: black; position: absolute; left: 0; diff --git a/_sass/normalize.scss b/_assets/css/normalize.scss index fa4e73d..fa4e73d 100644 --- a/_sass/normalize.scss +++ b/_assets/css/normalize.scss diff --git a/assets/paintings/2015-05-06 22.26.25.jpg b/_assets/paintings/2015-05-06 22.26.25.jpg Binary files differindex aff9872..aff9872 100755 --- a/assets/paintings/2015-05-06 22.26.25.jpg +++ b/_assets/paintings/2015-05-06 22.26.25.jpg diff --git a/assets/paintings/2015-06-17 21.49.36.jpg b/_assets/paintings/2015-06-17 21.49.36.jpg Binary files differindex 56dd415..56dd415 100755 --- a/assets/paintings/2015-06-17 21.49.36.jpg +++ b/_assets/paintings/2015-06-17 21.49.36.jpg diff --git a/assets/paintings/IMG_20120411_191105.jpg b/_assets/paintings/IMG_20120411_191105.jpg Binary files differindex 983b8fc..983b8fc 100755 --- a/assets/paintings/IMG_20120411_191105.jpg +++ b/_assets/paintings/IMG_20120411_191105.jpg diff --git a/assets/paintings/IMG_20120411_191148.jpg b/_assets/paintings/IMG_20120411_191148.jpg Binary files differindex 3db0def..3db0def 100755 --- a/assets/paintings/IMG_20120411_191148.jpg +++ b/_assets/paintings/IMG_20120411_191148.jpg diff --git a/assets/paintings/IMG_20120411_191222.jpg b/_assets/paintings/IMG_20120411_191222.jpg Binary files differindex a58004f..a58004f 100755 --- a/assets/paintings/IMG_20120411_191222.jpg +++ b/_assets/paintings/IMG_20120411_191222.jpg diff --git a/assets/paintings/IMG_20120411_213623.jpg b/_assets/paintings/IMG_20120411_213623.jpg Binary files differindex 12d1e56..12d1e56 100755 --- a/assets/paintings/IMG_20120411_213623.jpg +++ b/_assets/paintings/IMG_20120411_213623.jpg diff --git a/assets/paintings/IMG_20120619_214117.jpg b/_assets/paintings/IMG_20120619_214117.jpg Binary files differindex fd8af0d..fd8af0d 100755 --- a/assets/paintings/IMG_20120619_214117.jpg +++ b/_assets/paintings/IMG_20120619_214117.jpg diff --git a/assets/profile.jpg b/_assets/profile.jpg Binary files differindex d6c83fb..d6c83fb 100644 --- a/assets/profile.jpg +++ b/_assets/profile.jpg diff --git a/_assets/tordus_ninjazz.jpg b/_assets/tordus_ninjazz.jpg Binary files differnew file mode 100644 index 0000000..ce83dc7 --- /dev/null +++ b/_assets/tordus_ninjazz.jpg diff --git a/_config/dev.yml b/_config/dev.yml index 746ac46..312759d 100644 --- a/_config/dev.yml +++ b/_config/dev.yml @@ -14,17 +14,23 @@ bio: Hi, I'm John # Build settings. destination: _site/dev -minify_html: false +plugins: + - jekyll-assets markdown: kramdown -gems: [] exclude: - Gemfile - Gemfile.lock - Makefile - README.md + - vendor -# Sass settings. -sass: - style: :expanded +# Assets settings. +assets: + compress: + css: false + js: false + sources: + - _assets/css + - _assets # End of file. diff --git a/_config/prod.yml b/_config/prod.yml index 6c4e49d..c0ba40e 100755 --- a/_config/prod.yml +++ b/_config/prod.yml @@ -14,17 +14,23 @@ bio: Hi, I'm John # Build settings. destination: _site/prod -minify_html: true +plugins: + - jekyll-assets markdown: kramdown -gems: [] exclude: - Gemfile - Gemfile.lock - Makefile - README.md + - vendor -# Sass settings. -sass: - style: :compressed +# Assets settings. +assets: + compress: + css: true + js: true + sources: + - _assets/css + - _assets # End of file. diff --git a/_layouts/default.html b/_layouts/default.html index f312777..45704ef 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -6,34 +6,35 @@ <link rel="canonical" href="{{ site.url }}{{ page.url }}"> <meta name="author" content="John Touhey"> <link rel="author" href="{{ page.url }}"> -<link rel="icon" type="image/png" href="favicon.png"> +<link rel="icon" type="image/png" href="{{ site.baseurl }}/favicon.png"> <!--[if IE]> -<link rel="shortcut icon" type="image/ico" href="favicon.ico"> +<link rel="shortcut icon" type="image/ico" href="{{ site.baseurl }}/favicon.ico"> <[endif]--> -<link rel="stylesheet" href="assets/main.css"> +{% asset css/main.css %} </head><body><div class="container"> <div class="side"><header> -<img class="picture" src="assets/profile.jpg"> +<img class="picture" src="{% asset profile.jpg @path %}" alt="Photo of me during a concert"> <h1>John Touhey</h1> <p>Musician, painter, father.</p> </header><nav> <ul> -<li><a href="index.html">Home</a></li> -<li><a href="paintings.html">Paintings</a></li> -<li><a href="music.html">Music</a></li> -<li><a href="contact.html">Contact</a></li> +<li><a href="{{ site.baseurl }}/index.html">Home</a></li> +<li><a href="{{ site.baseurl }}/paintings.html">Paintings</a></li> +<li><a href="{{ site.baseurl }}/music.html">Music</a></li> +<li><a href="{{ site.baseurl }}/contact.html">Contact</a></li> </ul> </nav></div> <section class="content"><div class="content-wrapper"> -<h2>{% if page.title %}{{ page.title }}{% else %}About myself{% endif %}</h2> +<h2>{% if page.layout == "post" %}{{ page.date | date_to_string }}: {% endif %}{% if page.title %}{{ page.title }}{% else %}About myself{% endif %}</h2> <hr /> {{ content }} </div></section> <hr /><footer> -<p>Copyright (C) 2017 John Touhey <<a href="mailto:john.touhey@orange.fr">john.touhey@orange.fr</a>></p> +<p>Copyright (C) 2017 - {{ site.time | date: "%Y" }} <a href="{{ site.url }}{{ site.baseurl }}/">John Touhey</a> <<a href="mailto:john.touhey@orange.fr">john.touhey@orange.fr</a>><br /> +Site design by <a href="https://thomas.touhey.fr/">Thomas Touhey</a> <<a href="mailto:thomas@touhey.fr">thomas@touhey.fr</a>></p> </footer> </div></body></html> diff --git a/_layouts/home.html b/_layouts/home.html new file mode 100644 index 0000000..fdb604b --- /dev/null +++ b/_layouts/home.html @@ -0,0 +1,13 @@ +--- +layout: default +title: "Blog" +--- +{% if site.posts %} +<ul> +{% for post in site.posts %} +<li><a href="{{ post.url }}">{{ post.date | date_to_string }} — {{ post.title }}</a></li> +{% endfor %} +</ul> +{% else %} +<p><i>No article for now.</i></p> +{% endif %} diff --git a/_layouts/post.html b/_layouts/post.html new file mode 100755 index 0000000..73dae17 --- /dev/null +++ b/_layouts/post.html @@ -0,0 +1,4 @@ +--- +layout: default +--- +{{ content }} diff --git a/_music_notes.txt b/_music_notes.txt new file mode 100644 index 0000000..4c26579 --- /dev/null +++ b/_music_notes.txt @@ -0,0 +1,76 @@ +(Roy bought the microphone and things) + + + +"Silver Zodiac" from 1973 until 1976, used to practice at a youth club, +looking for a guitarist, they were impressed because J. told "I played the +guitar", playing in pubs. + +- Base guitarist: David Andrews +- Singer: Roy Beard +- Guitar: You +- Keyboards & Guitar: Brian Gamble +- Various drummers: Malcolm Guest, Phil Black, Reg ("Rej", as in Reginald) + +Split up in early 1976 (24/01), because of musical differences: Brian, +Reg and John wanted to continue covers, and Roy and Dave wanted to make +original music. + +Became "Mantis" (original songs, wrote "You Fly Blind, ...", Roy' +influence :p), play at biker's club, jams, custom fuzz boxes in tin boxes, +never used to play normally, kick the box on stage until it started working. +Used to have no money because all spent on beer in cigarets. Wild. + +- Singer: Roy Beard +- Guitarist: Roger Pierce +- Guitar: you +- Base guitarist: David Andrews +- Keyboards: Ernie + +Hazard already existed (Mick's group, Mick sex symbol), knew somebody from +someone close (Dave Brown), met with Mick, introduced Kim to Mick (Phil was +already playing with them). Interested in recording, small output music-wise. +He was interested in the studio-side, he organized concerts. + +Robert Reed new manager, put all of the money. +Concert hall "Corn Exchange" (biggest), had to hire PA system and the +hall (400 people), didn't cover the expenses. +John left soon after in 1981, Tim new guitarist, STB recorded. Didn't +last long before the group split up. + +Almost 21 when they had their last concert, John was invited on stage and +was really drunk and did terribly (split up). + +Hazard from 1978 to 1981 + +- Guitar & Singer: Mick Venning +- Base guitar: Kim Hayward +- Guitar (sang one or two, "The Prophet"): you +- Drummer: Phil Blackwell + +Record project, vinyl, tried to get a record contract, own material. +Island records. + +Carbon Fourteen (one gig, concert) +- Guitar & Singing: Richard Longstuff +- Base guitar: David Horn +- Guitar: you +- Keyboard: Steve Dye +- Drummer: Steve Law + +(Secrets with Terry Cubberley, he was from the backing group of Hazard, +bass guitarist) +(other guitarist is Bing, flamengo guitarist, Malcom, animal drummer, +they formed a group) + +Heavier (met with a guy, not the style we have on the label). + +Charlotte's Party (pop). Two days party at Matt's, playing music. +Began in 1984, ended when Matt was 18 (probably 1985), ended +because of studies. +Last tape is "Tomorrow...". (also see Spacewards) +- Base guitar: Matthew Steinberg +- Singer & flute: Charlotte Ellis +- Keyboard: Dave Kendall +- Drums: Paul Creswell (died at 30 :<) +- Guitars: you diff --git a/_plugins/youtube.rb b/_plugins/youtube.rb new file mode 100644 index 0000000..6cbda17 --- /dev/null +++ b/_plugins/youtube.rb @@ -0,0 +1,20 @@ +#Generates a named anchor and wrapping tag from a string. + +module Jekyll + class YoutubeTag < Liquid::Tag + def initialize(tag_name, text, tokens) + super + @id = text.strip() + end + + def render(context) + content = "<div class=\"video_wrapper\">" + content += "<iframe src=\"https://www.youtube.com/embed/#{@id}\">" + content += "</iframe></div>" + + content + end + end +end + +Liquid::Template.register_tag("youtube", Jekyll::YoutubeTag) diff --git a/assets/main.scss b/assets/main.scss deleted file mode 100644 index 9e5cbc6..0000000 --- a/assets/main.scss +++ /dev/null @@ -1,3 +0,0 @@ ---- ---- -@import "main"; @@ -2,9 +2,57 @@ layout: default title: Music --- -Music is good, I like music. I've played on TV once with one of my groups, -Charlotte's Party, here's the video! +I started learning the guitar when I was 13, in 1973. I told Roy Beard, +a friend of mine, I was playing the guitar, and he invited me to play in +the group he was running at the time, “_Silver Zodiac_”. We only did covers. -<div class="video_wrapper"> -<iframe src="https://www.youtube.com/embed/s-UC411IPJQ"></iframe> -</div> +I practiced there until 1976, when the group split up because of musical +disagreements <schisms?>: a part of the group, including me, wanted to +continue the covers, and the other part did not. We formed a group named +“_Mantis_”, and used to play at biker's clubs and in jams. + +In 1978, a friend of mine, Dave Brown, introduced me to Mick Venning, who +used to manage a band called “_Hazard_”. Mick was mainly interested in +the studio-side, recording and organizing concerts. I stayed in the band +until 1981, when the band played in the [Cambridge Corn Exchange][cornex]. + +[...] + +Met Matthew Steinberg's at **Duxford Workshop** (turn up and learn instrument +for free), run by his mother. Also met Laurent later. I gave lessons, +met a lot of musicians. + +In 1984, we had a two days party at Matthew Steinberg's, playing music: +that's how “_Charlotte's Party_” started. I did the guitars. We also played +on TV with that group: + +{% youtube s-UC411IPJQ %} + +“Tolpuddle episode”, did that all by myself. + +[...] + +'90 to '92/'93 in Cambridge, “_Jazz Ripples_” with Laurent at the +Duxford Workshop. + +[...] + +I came in France in May '93, + +so I stopped my musical activity for a while. + +In 1996, I started going at Grigny's conservatoire. In '97, we moved to +Ris-Orangis, + +From 1998 to around 2000, I was in a group named “Tordus Ninjazz” with people +I met in the conservatoire in Ris-Orangis. At the “Fête des vins”, we did +a last concert + +2003 -> Brunoy + +[...] + +I started playing with [Smiles Davis][smdvis] in November 2015. + +[cornex]: https://www.cambridgelivetrust.co.uk/cornex +[smdvis]: https://www.smiledavisband.com/ diff --git a/paintings.md b/paintings.md index f85ed60..9e3f1b6 100644 --- a/paintings.md +++ b/paintings.md @@ -4,11 +4,10 @@ title: Paintings --- I paint sometimes. -![1st](assets/paintings/2015-05-06 22.26.25.jpg) -![2nd](assets/paintings/2015-06-17 21.49.36.jpg) -![3rd](assets/paintings/IMG_20120411_191105.jpg) -![4th](assets/paintings/IMG_20120411_191148.jpg) -![5th](assets/paintings/IMG_20120411_191222.jpg) -![6th](assets/paintings/IMG_20120411_213623.jpg) -![7th](assets/paintings/IMG_20120619_214117.jpg) -{: class="gallery" } +{% asset "paintings/2015-05-06 22.26.25.jpg" %} +{% asset "paintings/2015-06-17 21.49.36.jpg" %} +{% asset paintings/IMG_20120411_191105.jpg %} +{% asset paintings/IMG_20120411_191148.jpg %} +{% asset paintings/IMG_20120411_191222.jpg %} +{% asset paintings/IMG_20120411_213623.jpg %} +{% asset paintings/IMG_20120619_214117.jpg %} |