Skip to content

Themes removed, README updated #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,18 @@ A default blog scaffold for **ruhoh** compatible static blog parsers.

### ruby 1.9.2+

#### Clone the Blog Scaffold
#### Clone the Blog Scaffold and set your Theme

$ git clone git://github.com/ruhoh/blog.git blog
$ cd blog

You'll need to download a theme. The recommended theme is twitter-bootstrap-2

$ git submodule add https://github.com/ruhoh/theme-twitter-bootstrap-2.git twitter-bootstrap-2
$ vim config.yml # change from twitter to twitter-bootstrap-2

You can also choose from [one of the other themes](https://github.com/search?q=theme+%40ruhoh&type=Repositories).

#### Get Bundler

It is recommended to use bundler to manage ruhoh versions.
Expand Down
59 changes: 59 additions & 0 deletions THEMES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Themes

This readme is for the sake of the users who were using ruhoh
before the theme was made modular and are confused as to why
their blog doesn't build and how to fix it quickly.

## Re-adding the default theme

There's almost no work to do
if you haven't modified the default twitter theme.

Get a fresh clone of `twitter-bootstrap-2` (it's the exact same as what you were using before):

git submodule add https://github.com/ruhoh/theme-twitter-bootstrap-2.git twitter-bootstrap-2

And then edit `config.yml` such that the line that reads `twitter` above the line `use: theme`
now reads `twitter-bootstrap-2`.

rsync -av config.yml config.yml.bak
sed -e 's/twitter/twitter-bootstrap-2/' config.yml.bak > config.yml

You can `rm config.yml.bak` once you're sure that your site builds.

# Creating a repo for a custom theme

The very fact that you're reading this points to the probability that
you had modified the default theme, made commits, and got a bunch of merge conflicts.

(and you might be really angry about it, but don't be. stay calm. drink the ruhoh kool-aid)

1. Head over to <https://github.com/new>
(or whatever your favorite git site is)
and create a new empty repository for your theme.

2. Undo the merge conflicts you just created.

git reset HEAD
git checkout twitter

3. Add your new empty repository as a submodule

git submodule add <your repo> twitter-custom

3. Copy your modified theme into the empty repository

rsync -av twitter/ twitter-custom/

4. Remove the old custom theme

git rm -rf twitter

5. And then try the merge again

git pull upstream master

5. There's a possibility that you'll need to remove the old theme again and commit

git rm -rf twitter
git commit -m "added my custom theme as a submodule"
13 changes: 0 additions & 13 deletions twitter/layouts/_root.html

This file was deleted.

68 changes: 0 additions & 68 deletions twitter/layouts/default.html

This file was deleted.

32 changes: 0 additions & 32 deletions twitter/layouts/paginator.html

This file was deleted.

58 changes: 0 additions & 58 deletions twitter/layouts/posts.html

This file was deleted.

4 changes: 0 additions & 4 deletions twitter/manifest.json

This file was deleted.

Binary file removed twitter/media/glyphicons-halflings-white.png
Binary file not shown.
Binary file removed twitter/media/glyphicons-halflings.png
Binary file not shown.
Loading