Selectively merging history and checking out work in git
Directions
Now that you have a responsive version of your site, it's time to break it up into a Jekyll theme so that Github can publish it for you automatically. You should:
Setup
Small(1)
[x] Create a new branch on your [username].github.io and TIY-Assignments repos called return-of-jekyll.
[x] Create a branch in both repos called return-of-jekyll and commit your work into those
[x] Create a folder in your TIY-Assignments repository called 02--Return-of-the-Jekyll to put your work in
Objectives
Demonstrate understanding of:
Directions
Now that you have a responsive version of your site, it's time to break it up into a Jekyll theme so that Github can publish it for you automatically. You should:
Setup
Small (1)
[username].github.io
andTIY-Assignments
repos calledreturn-of-jekyll
.return-of-jekyll
and commit your work into thoseTIY-Assignments
repository called02--Return-of-the-Jekyll
to put your work inPart One
Large (5)
_layouts/
and_includes/
directory and_config.yml
fileindex.html
file into_layouts/default.html
_layouts/default.html
with the{{content}}
template tagindex.html
except the contents of the main column.index.html
so that Jekyll will build_site/index.html
using_layout/default.html
jekyll build
and check the results! If your site builds, merge tomaster
but keep your branch...!git checkout
to selectively merge the content from the_posts/
directory in yourold-master
; see me if you're lostjekyll build
should create posts in_site/
that are also wrapped in_layout/default.html
; if not, fix itindex.html
file, rebuild, and follow the 2:+1:'s process