-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6f748e5
commit 34b0a1c
Showing
30 changed files
with
952 additions
and
178 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,56 +1,2 @@ | ||
*.gem | ||
*.rbc | ||
/.config | ||
/coverage/ | ||
/InstalledFiles | ||
/pkg/ | ||
/spec/reports/ | ||
/spec/examples.txt | ||
/test/tmp/ | ||
/test/version_tmp/ | ||
/tmp/ | ||
|
||
# Used by dotenv library to load environment variables. | ||
# .env | ||
|
||
# Ignore Byebug command history file. | ||
.byebug_history | ||
|
||
## Specific to RubyMotion: | ||
.dat* | ||
.repl_history | ||
build/ | ||
*.bridgesupport | ||
build-iPhoneOS/ | ||
build-iPhoneSimulator/ | ||
|
||
## Specific to RubyMotion (use of CocoaPods): | ||
# | ||
# We recommend against adding the Pods directory to your .gitignore. However | ||
# you should judge for yourself, the pros and cons are mentioned at: | ||
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control | ||
# | ||
# vendor/Pods/ | ||
|
||
## Documentation cache and generated files: | ||
/.yardoc/ | ||
/_yardoc/ | ||
/doc/ | ||
/rdoc/ | ||
|
||
## Environment normalization: | ||
/.bundle/ | ||
/vendor/bundle | ||
/lib/bundler/man/ | ||
|
||
# for a library or gem, you might want to ignore these files since the code is | ||
# intended to run in multiple environments; otherwise, check them in: | ||
# Gemfile.lock | ||
# .ruby-version | ||
# .ruby-gemset | ||
|
||
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: | ||
.rvmrc | ||
|
||
# Used by RuboCop. Remote config files pulled in from inherit_from directive. | ||
# .rubocop-https?--* | ||
_cache | ||
_site |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
image: ruby:2.3 | ||
|
||
pages: | ||
script: | ||
- gem install jekyll jekyll-paginate jekyll-sitemap | ||
- jekyll build -d public | ||
artifacts: | ||
paths: | ||
- public |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
source "https://rubygems.org" | ||
|
||
gem 'jekyll-feed' | ||
gem 'jekyll-sitemap' | ||
gem 'jekyll-paginate' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
GEM | ||
remote: https://rubygems.org/ | ||
specs: | ||
addressable (2.8.7) | ||
public_suffix (>= 2.0.2, < 7.0) | ||
bigdecimal (3.1.8) | ||
colorator (1.1.0) | ||
concurrent-ruby (1.3.4) | ||
em-websocket (0.5.3) | ||
eventmachine (>= 0.12.9) | ||
http_parser.rb (~> 0) | ||
eventmachine (1.2.7) | ||
ffi (1.17.0) | ||
ffi (1.17.0-x86_64-linux-gnu) | ||
forwardable-extended (2.6.0) | ||
google-protobuf (4.27.3) | ||
bigdecimal | ||
rake (>= 13) | ||
google-protobuf (4.27.3-x86_64-linux) | ||
bigdecimal | ||
rake (>= 13) | ||
http_parser.rb (0.8.0) | ||
i18n (1.14.5) | ||
concurrent-ruby (~> 1.0) | ||
jekyll (4.3.3) | ||
addressable (~> 2.4) | ||
colorator (~> 1.0) | ||
em-websocket (~> 0.5) | ||
i18n (~> 1.0) | ||
jekyll-sass-converter (>= 2.0, < 4.0) | ||
jekyll-watch (~> 2.0) | ||
kramdown (~> 2.3, >= 2.3.1) | ||
kramdown-parser-gfm (~> 1.0) | ||
liquid (~> 4.0) | ||
mercenary (>= 0.3.6, < 0.5) | ||
pathutil (~> 0.9) | ||
rouge (>= 3.0, < 5.0) | ||
safe_yaml (~> 1.0) | ||
terminal-table (>= 1.8, < 4.0) | ||
webrick (~> 1.7) | ||
jekyll-feed (0.17.0) | ||
jekyll (>= 3.7, < 5.0) | ||
jekyll-paginate (1.1.0) | ||
jekyll-sass-converter (3.0.0) | ||
sass-embedded (~> 1.54) | ||
jekyll-sitemap (1.4.0) | ||
jekyll (>= 3.7, < 5.0) | ||
jekyll-watch (2.2.1) | ||
listen (~> 3.0) | ||
kramdown (2.4.0) | ||
rexml | ||
kramdown-parser-gfm (1.1.0) | ||
kramdown (~> 2.0) | ||
liquid (4.0.4) | ||
listen (3.9.0) | ||
rb-fsevent (~> 0.10, >= 0.10.3) | ||
rb-inotify (~> 0.9, >= 0.9.10) | ||
mercenary (0.4.0) | ||
pathutil (0.16.2) | ||
forwardable-extended (~> 2.6) | ||
public_suffix (6.0.1) | ||
rake (13.2.1) | ||
rb-fsevent (0.11.2) | ||
rb-inotify (0.11.1) | ||
ffi (~> 1.0) | ||
rexml (3.3.5) | ||
strscan | ||
rouge (4.3.0) | ||
safe_yaml (1.0.5) | ||
sass-embedded (1.77.8) | ||
google-protobuf (~> 4.26) | ||
rake (>= 13) | ||
sass-embedded (1.77.8-x86_64-linux-gnu) | ||
google-protobuf (~> 4.26) | ||
strscan (3.1.0) | ||
terminal-table (3.0.2) | ||
unicode-display_width (>= 1.1.1, < 3) | ||
unicode-display_width (2.5.0) | ||
webrick (1.8.1) | ||
|
||
PLATFORMS | ||
ruby | ||
x86_64-linux-gnu | ||
|
||
DEPENDENCIES | ||
jekyll-feed | ||
jekyll-paginate | ||
jekyll-sitemap | ||
|
||
BUNDLED WITH | ||
2.5.17 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,199 @@ | ||
# combinesoldier14.site | ||
Jekyll Clean | ||
============ | ||
|
||
* Get it from [github](https://github.com/scotte/jekyll-clean). | ||
* See the [live demo](https://scotte.github.io/jekyll-clean). | ||
|
||
A simple and clean Jekyll theme using [bootstrap](http://getbootstrap.com) | ||
(not to be confused with jekyll-bootstrap) that's easy to modify and very | ||
modular in component and element reuse. | ||
|
||
It uses Disqus for comments and includes Google Analytics support. Both of | ||
these features are disabled by default and can be enabled via \_config.yml. You | ||
can also rip this code out of the templates if you like (footer.html and post.html). | ||
The beauty of Jekyll - keep things clean... Jekyll Clean! | ||
|
||
The theme works well on mobile phones, using a collapsable nav bar and hiding the | ||
sidebar. The links pane in the sidebar is available on mobile through the nav menu, | ||
and you can do the same thing for any other sections added to the sidebar. | ||
|
||
Don't forget to occassionally merge against my upstream repository so you can get | ||
the latest changes. Pull requests are encouraged and accepted! | ||
|
||
Installation | ||
============ | ||
|
||
If you don't have a blog already on github, start by cloning this repository. | ||
Best to do that directly on github and then clone that down to your computer. | ||
|
||
If you already do have a blog, You can certainly apply this theme to your existing | ||
blog in place, but then you won't be able to merge as the theme changes. If you | ||
re-apply your blog history on top of this theme's **gh-pages** branch, it's then | ||
easy to update to the latest version of the theme. You also don't want to have to | ||
deal with resolving old conflicts from your existing history, so you may wish to to | ||
push your existing master off to a new branch so you have the old history and start | ||
a new branch with this as the start, merging in your \_posts and other assets (after | ||
git rm'ing the current \_posts. | ||
|
||
Not ideal, but you have to make a choice - either apply it manually or base your | ||
blog off this theme's branch. Either way it will work, and both have their own | ||
pros and cons. | ||
|
||
You can setup an upstream tracking repository like so: | ||
|
||
``` | ||
$ git remote add upstream [email protected]:scotte/jekyll-clean.git | ||
``` | ||
|
||
And now when you wish to merge your own branch onto the latest version of the | ||
theme, simply do: | ||
|
||
``` | ||
$ git fetch upstream | ||
$ git merge upstream/gh-pages | ||
``` | ||
|
||
Of course you will have to resolve conflicts for \_config.yml, \_includes/links-list.html, | ||
and \_posts, and so on, but in practice this is pretty simple. | ||
|
||
This is how I maintain my own blog which is based on this theme. The old history is | ||
sitting in an **old-master** branch that I can refer to when I need to. | ||
|
||
Running Locally | ||
=============== | ||
|
||
Here's the exact set of packages I need to install on Debian to run jekyll | ||
locally with this theme for testing. | ||
|
||
``` | ||
$ sudo aptitude install ruby ruby-dev rubygems nodejs | ||
$ sudo gem install jekyll jekyll-paginate | ||
``` | ||
|
||
And then it's just a simple matter of running jekyll locally: | ||
|
||
``` | ||
$ jekyll serve --baseurl='' | ||
``` | ||
|
||
Now browse to http://127.0.0.1:4000 | ||
|
||
Using gh-pages | ||
============== | ||
|
||
Running a jekyll site is a bit outside the scope of this doc, but | ||
sometimes it can be a bit confusing how to configure jekyll for | ||
project pages versus user pages, for example. | ||
|
||
To start with, read through | ||
[the documentation here](https://help.github.com/articles/user-organization-and-project-pages/). | ||
This will provide a good overview on how it all works. The git branch and | ||
baseurl (in _config.yml) will change depending on the sort of site deployed. | ||
|
||
When you clone this repository, it's set up for project pages, so the | ||
deployed branch is "gh-pages" and baseurl is configured to 'jekyll-clean', | ||
because that's the name of this project. | ||
|
||
If you plan to deploy this as user pages, the deployed branch is "master" | ||
and baseurl is configured to '' (i.e. empty). | ||
|
||
Using Gitlab Pages | ||
================== | ||
|
||
A basic .gitlab-ci.yml is provided with this project. | ||
|
||
Comment Systems | ||
=============== | ||
|
||
Jekyll clean supports both [isso](https://posativ.org/isso) and | ||
[disqus](https://disqus.com) comment systems. | ||
|
||
After enabling **comments**, either **isso** or **disquss** must | ||
be configured. Don't try configuring both! | ||
|
||
Isso Comments | ||
============= | ||
|
||
Isso requires running a local server, so is not suitable for hosting | ||
in github pages, for example. Isso is open source and keeps all your | ||
data local, unlike Disqus (who knows exactly what they are doing with | ||
your data). | ||
|
||
In _config.yml you'll need to set **isso** to the fully-qualified URL | ||
if your isso server (this is the value for **data-isso** passed to the | ||
isso JS). Make sure **comments** is true. | ||
|
||
Disqus Comments | ||
=============== | ||
|
||
Getting Disqus to work can be a bit more work than it seems like it should be. | ||
Make sure your Disqus account is correctly configured with the right domain | ||
of your blog and you know your Disqus shortname. | ||
|
||
In _config.yml you'll need to set **disqus** to your Disqus shortname and | ||
make sure **comments** is true. | ||
|
||
Finally, in posts, make sure you have **comments: true** in the YAML front | ||
matter. | ||
|
||
More information on using Disqus with Jekyll is | ||
[documented here](https://help.disqus.com/customer/portal/articles/472138-jekyll-installation-instructions). | ||
|
||
Code Syntax Highlighting | ||
======================== | ||
|
||
To use code syntax highlighting, use the following syntax: | ||
|
||
``` | ||
```python | ||
import random | ||
# Roll the die | ||
roll = random.randint(1, 20) | ||
print('You rolled a %d.' % roll) | ||
``` #REMOVE | ||
``` | ||
|
||
(Remove #REMOVE from the end of the last line). Which will look like this in | ||
the rendered jekyll output using the default css/syntax.css provided with this | ||
theme (which is the **colorful** theme from [https://github.com/iwootten/jekyll-syntax](https://github.com/iwootten/jekyll-syntax)): | ||
|
||
```python | ||
import random | ||
|
||
# Roll the die | ||
roll = random.randint(1, 20) | ||
print('You rolled a %d.' % roll) | ||
``` | ||
|
||
NOTE: The example in this README.md will render differently than in the | ||
final jekyll output. See the [live demo](https://scotte.github.io/jekyll-clean) | ||
to see how it really looks. | ||
|
||
You can, of course, use any theme you wish, see the jekyll and pygments | ||
documentation for more details. | ||
|
||
License | ||
======= | ||
|
||
The content of this theme is distributed and licensed under a | ||
![License Badge](/images/cc_by_88x31.png) | ||
[Creative Commons Attribution 4.0 License](https://creativecommons.org/licenses/by/4.0/legalcode) | ||
|
||
This license lets others distribute, remix, tweak, and build upon your work, | ||
even commercially, as long as they credit you for the original creation. This | ||
is the most accommodating of licenses offered. Recommended for maximum | ||
dissemination and use of licensed materials. | ||
|
||
In other words: you can do anything you want with this theme on any site, just please | ||
provide a link to [the original theme on github](https://github.com/scotte/jekyll-clean) | ||
so I get credit for the original design. Beyond that, have at it! | ||
|
||
This theme includes the following files which are the properties of their | ||
respective owners: | ||
|
||
* js/bootstrap.min.js - [bootstrap](http://getbootstrap.com) | ||
* css/bootstrap.min.css - [bootstrap](http://getbootstrap.com) | ||
* js/jquery.min.js - [jquery](https://jquery.com) | ||
* images/cc_by_88x31.png - [creative commons](https://creativecommons.org) | ||
* css/colorful.css - [iwootten/jekyll-syntax](https://github.com/iwootten/jekyll-syntax) |
Oops, something went wrong.