Commit 32dbcd29 authored by Richard Perry's avatar Richard Perry
Browse files

Merged pages branch into source branch

- Added the following Gems that can be used with GitLab Pages natively (actually,
  anything can be used with GitLab Pages and their shared runners setup. No more
  safe mode Jekyll for me 😃)
  - jemoji
  - jekyll-paginate
  - jekyll-gist
  - jekyll-redirect-from
  - jekyll-sitemap
- Removed the pages.rb plugin and moved the pages into the Pages folder so that
  Jekyll would process them.
- Removed the redirect pages and added the necessary YAML frontmatter for the
  jekyll-redirect-from gem
- Removed the RSS Feed xsl and css files
- Removed the need for the Rakefile, Gruntfile etc
- Put the css into a sass file so Jekyll could combine them itself and added the
  sas declarations to _config.yml
- Removed the sitemap.xml file in lieu of the jekyll-sitemap gem
- Removed the defunct javascript files
- Removed the CNAME file as it isn't needed in GitLab
- Changed back to the old Flickr plugin as it seems to work better
- Added site.baseurl to a couple of the asset links as best practice
parents d3f78f7c a231a283
Pipeline #1715089 passed with stage
image: ruby:2.3
pages:
stage: deploy
script:
- mkdir -p ./_cache/flickr
- bundle install
- bundle exec jekyll build -d public
artifacts:
paths:
- public
only:
- pages
source 'https://rubygems.org'
gem 'github-pages'
gem 'jekyll'
# gem 'stringex'
gem 'titleize'
gem 'jekyll-oembed', :require => 'jekyll_oembed'
gem 'flickraw'
gem 'emoji_for_jekyll'
gem 'jemoji'
gem 'execjs'
gem 'therubyracer', :platforms => :ruby
gem 'jekyll-gist'
gem 'jekyll-redirect-from'
gem 'jekyll-paginate'
gem 'jekyll-sitemap'
gem 'jekyll-gist'
\ No newline at end of file
The MIT License (MIT)
 
Copyright (c) 2014 Richard Perry
Copyright (c) 2016 Richard Perry
 
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
......
......@@ -2,12 +2,12 @@
 
Here resides the source code for our travel blog. At the beginning of 2014, after a number of years using
[WordPress][wp] as my main blogging platform, I decided it was time for a change. So, I have adopted the
[Jekyll][jk] blogging platform hosted at [GitHub Pages][gp].
[Jekyll][jk] blogging platform hosted at [GitLab Pages][gp].
 
For more information about the migration process I followed see my [blog series][bs] at my personal [blog][bl].
 
[wp]: //wordpress.org/ "WordPress › Blog Tool, Publishing Platform, and CMS"
[jk]: //jekyllrb.com/ "Jekyll • Simple, blog-aware, static sites"
[gp]: //pages.github.com/ "GitHub Pages"
[gp]: //pages.gitlab.io/ "GitLab Pages"
[bs]: //richard.perry-online.me.uk/series/jekyll/ "Series: Migrating to Jekyll | Richard Perry"
[bl]: //richard.perry-online.me.uk/ "Richard Perry | Just another blog about nothing"
\ No newline at end of file
......@@ -2,25 +2,30 @@ name: Rosie & Jim's Travel Blog
description: A blog of all our travels
owner: rosiejim
authors:
- richard
- rosie
- richard
- rosie
url: http://travel.perry-online.me.uk
email: travel@perry-online.me.uk
 
markdown: kramdown
kramdown:
use_coderay: true
pygments: true
exclude:
- 'changes'
- 'Gemfile'
- 'Gemfile.lock'
- 'Gruntfile.js'
- 'node_modules'
- 'package.json'
- 'Rakefile'
- 'README.md'
gems: ["emoji_for_jekyll"]
- 'changes'
- 'Gemfile'
- 'Gemfile.lock'
- 'Gruntfile.js'
- 'node_modules'
- 'package.json'
- 'Rakefile'
- 'README.md'
gems:
- jemoji
- jekyll-paginate
- jekyll-gist
- jekyll-redirect-from
- jekyll-sitemap
sass:
sass_dir: _sass
style: compressed
 
encoding: utf-8
 
......@@ -37,9 +42,9 @@ category_dir: /
 
flickr:
enabled: yes
cache_dir: ./_cache/flickr
cache_dir: _cache/flickr
screen_name: Richard Perry
api_key: 4389a0eb79c41ca17e149830c22fc7c2
shared_secret: ef41108edae962b0
access_token: 72157641557984045-92a5dbebf3e01418
access_secret: 1625dbdd3cf26db6
/* Flexnav Base Styles */
.flexnav {
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
transition: none;
-webkit-transform-style: preserve-3d;
overflow: hidden;
margin: 0 auto;
max-height: 0;
width: 100%; }
.flexnav.opacity {
opacity: 0; }
.flexnav.flexnav-show {
max-height: 2000px;
opacity: 1;
-webkit-transition: all .5s ease-in-out;
-moz-transition: all .5s ease-in-out;
-ms-transition: all .5s ease-in-out;
transition: all .5s ease-in-out; }
.flexnav.one-page {
position: fixed;
top: 50px;
right: 5%;
max-width: 200px; }
.flexnav li {
font-size: 100%;
position: relative;
overflow: hidden; }
.flexnav li a {
position: relative;
display: block;
padding: .96em;
z-index: 2;
overflow: hidden;
color: #222222;
background: #a6a6a2;
border-bottom: 1px solid rgba(0, 0, 0, 0.15); }
.flexnav li ul {
width: 100%; }
.flexnav li ul li {
font-size: 100%;
position: relative;
overflow: hidden; }
.flexnav li ul.flexnav-show li {
overflow: visible; }
.flexnav li ul li a {
display: block;
background: #b2b2af; }
.flexnav ul li ul li a {
background: #bfbfbc; }
.flexnav ul li ul li ul li a {
background: #cbcbc9; }
.flexnav .touch-button {
position: absolute;
z-index: 999;
top: 0;
right: 0;
width: 50px;
height: 50px;
display: inline-block;
background: #acaca1;
background: rgba(0, 0, 0, 0.075);
text-align: center; }
.flexnav .touch-button:hover {
cursor: pointer; }
.flexnav .touch-button .navicon {
position: relative;
top: 1.4em;
font-size: 12px;
color: #666; }
.btn-menu {
position: relative;
display: block;
padding: 1em;
background: #a6a6a2;
color: #222222;
cursor: pointer;
border-bottom: 1px solid rgba(0, 0, 0, 0.2); }
.btn-menu.one-page {
position: fixed;
top: 0;
right: 5%;
padding-right: 45px; }
.btn-menu .touch-button {
background: transparent;
position: absolute;
z-index: 999;
top: 0;
right: 0;
width: 50px;
height: 50px;
display: inline-block;
text-align: center; }
.btn-menu .touch-button .navicon {
font-size: 16px;
position: relative;
top: 1em;
color: #666; }
@media all and (min-width: 768px) {
body.one-page {
padding-top: 70px; }
.flexnav {
max-height: 0px;
overflow: visible; }
.flexnav.opacity {
opacity: 1; }
.flexnav.one-page {
top: 0;
right: auto;
max-width: 1080px; }
.flexnav li {
position: relative;
list-style: none;
float: left;
display: block;
background-color: #a6a6a2;
overflow: visible;
width: 20%; }
.flexnav li a {
border-left: 1px solid #acaca1;
border-bottom: none; }
.flexnav li > ul {
position: absolute;
top: auto;
left: 0; }
.flexnav li > ul li {
width: 100%; }
.flexnav li ul li > ul {
margin-left: 100%;
top: 0; }
.flexnav li ul li a {
border-bottom: none; }
.flexnav li ul.open {
display: block;
opacity: 1;
visibility: visible;
z-index: 1; }
.flexnav li ul.open li {
overflow: visible;
max-height: 100px; }
.flexnav li ul.open ul.open {
margin-left: 100%;
top: 0; }
.btn-menu {
display: none; } }
.oldie body.one-page {
padding-top: 70px; }
.oldie .flexnav {
overflow: visible; }
.oldie .flexnav.one-page {
top: 0;
right: auto;
max-width: 1080px; }
.oldie .flexnav li {
position: relative;
list-style: none;
float: left;
display: block;
background-color: #a6a6a2;
width: 20%;
min-height: 50px;
overflow: visible; }
.oldie .flexnav li:hover > ul {
display: block;
width: 100%;
overflow: visible; }
.oldie .flexnav li:hover > ul li {
width: 100%;
float: none; }
.oldie .flexnav li a {
border-left: 1px solid #acaca1;
border-bottom: none;
overflow: visible; }
.oldie .flexnav li > ul {
background: #acaca1;
position: absolute;
top: auto;
left: 0;
display: none;
z-index: 1;
overflow: visible; }
.oldie .flexnav li ul li ul {
top: 0; }
.oldie .flexnav li ul li a {
border-bottom: none; }
.oldie .flexnav li ul.open {
display: block;
width: 100%;
overflow: visible; }
.oldie .flexnav li ul.open li {
width: 100%; }
.oldie .flexnav li ul.open ul.open {
margin-left: 100%;
top: 0;
display: block;
width: 100%;
overflow: visible; }
.oldie .flexnav ul li:hover ul {
margin-left: 100%;
top: 0; }
.oldie .btn-menu {
display: none; }
.oldie.ie7 .flexnav li {
width: 19.9%; }
.highlight { background: #ffffff; }
.highlight .c { color: #999988; font-style: italic } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { font-weight: bold } /* Keyword */
.highlight .o { font-weight: bold } /* Operator */
.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #999999 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #800080; font-weight: bold; } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { font-weight: bold } /* Keyword.Constant */
.highlight .kd { font-weight: bold } /* Keyword.Declaration */
.highlight .kn { font-weight: bold } /* Keyword.Namespace */
.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
.highlight .kr { font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #009999 } /* Literal.Number */
.highlight .s { color: #d14 } /* Literal.String */
.highlight .na { color: #008080 } /* Name.Attribute */
.highlight .nb { color: #0086B3 } /* Name.Builtin */
.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
.highlight .no { color: #008080 } /* Name.Constant */
.highlight .ni { color: #800080 } /* Name.Entity */
.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
.highlight .nn { color: #555555 } /* Name.Namespace */
.highlight .nt { color: #000080 } /* Name.Tag */
.highlight .nv { color: #008080 } /* Name.Variable */
.highlight .ow { font-weight: bold } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mf { color: #009999 } /* Literal.Number.Float */
.highlight .mh { color: #009999 } /* Literal.Number.Hex */
.highlight .mi { color: #009999 } /* Literal.Number.Integer */
.highlight .mo { color: #009999 } /* Literal.Number.Oct */
.highlight .sb { color: #d14 } /* Literal.String.Backtick */
.highlight .sc { color: #d14 } /* Literal.String.Char */
.highlight .sd { color: #d14 } /* Literal.String.Doc */
.highlight .s2 { color: #d14 } /* Literal.String.Double */
.highlight .se { color: #d14 } /* Literal.String.Escape */
.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
.highlight .si { color: #d14 } /* Literal.String.Interpol */
.highlight .sx { color: #d14 } /* Literal.String.Other */
.highlight .sr { color: #009926 } /* Literal.String.Regex */
.highlight .s1 { color: #d14 } /* Literal.String.Single */
.highlight .ss { color: #990073 } /* Literal.String.Symbol */
.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
.highlight .vc { color: #008080 } /* Name.Variable.Class */
.highlight .vg { color: #008080 } /* Name.Variable.Global */
.highlight .vi { color: #008080 } /* Name.Variable.Instance */
.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
.type-csharp .highlight .k { color: #0000FF }
.type-csharp .highlight .kt { color: #0000FF }
.type-csharp .highlight .nf { color: #000000; font-weight: normal }
.type-csharp .highlight .nc { color: #2B91AF }
.type-csharp .highlight .nn { color: #000000 }
.type-csharp .highlight .s { color: #A31515 }
.type-csharp .highlight .sc { color: #A31515 }
......@@ -10,7 +10,7 @@
<hr />
{% include partials/social.html %}
<small class='copyright'>{{ copyright }}</small> &nbsp; &nbsp; | &nbsp; &nbsp;
<small class='site-meta'>Powered by <a href='//jekyllrb.com/' title='Jekyll &bull; Simple, blog-aware, static sites'>Jekyll</a> &amp; Hosted at <a href='//github.com' title='GitHub'>GitHub</a></small>
<small class='site-meta'>Powered by <a href='//jekyllrb.com/' title='Jekyll &bull; Simple, blog-aware, static sites'>Jekyll</a> &amp; Hosted at <a href='//gitlab.com' title='GitLab'>GitLab.com</a></small>
</footer><!-- #page-footer -->
</div><!-- #container -->
......
......@@ -10,12 +10,12 @@
<link rel='stylesheet' href='//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600'>
<link rel='stylesheet' href='//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css'>
<link rel='stylesheet' href='/assets/css/main.min.css'>
<link rel='stylesheet' href='{{site.baseurl}}/assets/css/main.min.css'>
<link rel='alternate' href='{{site.url}}/feed.xml' type='application/rss+xml' title='{{ site.name }}'>
<link rel='author' href="https://plus.google.com/{{auth.google}}">
<link rel='canonical' href="{{site.url}}{{page.url}}">
<script src='/assets/scripts/vendor/modernizr-2.6.2-respond-1.1.0.min.js'></script>
<script src='{{site.baseurl}}/assets/scripts/vendor/modernizr-2.6.2-respond-1.1.0.min.js'></script>
<meta property='og:type' content='article'>
<meta property='og:title' content="{{title}}">
......
......@@ -5,7 +5,7 @@
{% when 'image' %}
{% if post.image %}<img src='{{ post.image }}' title='{{ post.title }}' alt='{{ post.title }}' class='aligncentre' />{% endif %}
{% if post.flickimg %}{% flickr_image post.flickimg aligncentre d %}{% endif %}
{{ post.content }}
{{ post.content | xml_escape }}
{% when 'video' %}
{% oembed https://www.youtube.com/watch?v={{post.video}}&rel=0 width=560 height=315 %}
{{ post.content }}
......
<nav class='post-nav'>{% if page.next.url %}
<span class='alignleft'><a href='{{page.next.url}}'><i class='fa fa-chevron-left'></i> {{page.next.title}}</a></span>{% endif %}{% if page.previous.url %}
<span class='alignright'><a href='{{page.previous.url}}'>{{page.previous.title}} <i class='fa fa-chevron-right'></i></a></span>{% endif %}
<span class='alignleft'><a href='{{site.baseurl}}{{page.next.url}}'><i class='fa fa-chevron-left'></i> {{page.next.title}}</a></span>{% endif %}{% if page.previous.url %}
<span class='alignright'><a href='{{site.baseurl}}{{page.previous.url}}'>{{page.previous.title}} <i class='fa fa-chevron-right'></i></a></span>{% endif %}
</nav>
\ No newline at end of file
---
permalink: /china/beijing/china-2009/
layout: none
---
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0;url=/china-2009/" />
</head>
</html>
\ No newline at end of file
---
permalink: /china/chengdu/china-2009/
layout: none
---
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0;url=/china-2009/" />
</head>
</html>
\ No newline at end of file
---
permalink: /china/chongqing/china-2009/
layout: none
---
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0;url=/china-2009/" />
</head>
</html>
\ No newline at end of file
---
permalink: /china/guilin/china-2009/
layout: none
---
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0;url=/china-2009/" />
</head>
</html>
\ No newline at end of file
---
permalink: /china/hong-kong/china-2009/
layout: none
---
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0;url=/china-2009/" />
</head>
</html>
\ No newline at end of file
---
permalink: /tibet/lhasa/china-2009/
layout: none
---
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0;url=/china-2009/" />
</head>
</html>
\ No newline at end of file
---
permalink: /china/macau/china-2009/
layout: none
---
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0;url=/china-2009/" />
</head>
</html>
\ No newline at end of file
---
permalink: /china/shanghai/china-2009/
layout: none
---
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0;url=/china-2009/" />
</head>
</html>
\ No newline at end of file
---
permalink: /china/beijing/china-2009/three-nations/
layout: none
---
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0;url=/china-2009/three-nations/" />
</head>
</html>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment