Permalink
Browse files

I think I fixed the config?

  • Loading branch information...
Soulflare3 committed Jan 18, 2016
1 parent 3c10059 commit 22348b88209af1f2879bd4f2f15110c9c6e64fab
View
@@ -1,9 +1,9 @@
-<<<<<<< HEAD
+
# ----------------------- #
# Main Configs #
# ----------------------- #
-url: http://soulflare3.github.io
+url: http://sf3soft.net
title: My Octopress Blog
subtitle: A blogging framework for hackers.
author: Soul
@@ -49,8 +49,6 @@ excerpt_link: "Read on &rarr;" # "Continue reading" link text at the bottom of
excerpt_separator: "<!--more-->"
titlecase: true # Converts page and post titles to titlecase
-gems:
- -octopress-video-tag
# list each of the sidebar modules you want to include, in the order you want them to appear.
# To add custom asides, create files in /source/_includes/custom/asides/ and add them to the list like 'custom/asides/custom_aside_name.html'
@@ -62,18 +60,36 @@ default_asides: [asides/recent_posts.html, asides/github.html, asides/delicious.
# post_asides:
# page_asides:
+# Default extension for new posts and pages
+post_ext: markdown
+page_ext: html
+
+# Default templates for posts and pages
+# Found in _templates/
+post_layout: post
+page_layout: page
+
+# Format titles with titlecase?
+titlecase: true
+
+# Change default template file (in _templates/)
+post_template: post
+page_template: page
+draft_template: draft
+
+
# ----------------------- #
# 3rd Party Settings #
# ----------------------- #
# Github repositories
-github_user:soulflare3
+github_user: soulflare3
github_repo_count: 0
github_show_profile_link: true
github_skip_forks: true
# Twitter
-twitter_user:soulflare3
+twitter_user: soulflare3
twitter_tweet_button: true
# Google +1
@@ -82,7 +98,7 @@ google_plus_one_size: medium
# Google Plus Profile
# Hidden: No visible button, just add author information to search results
-googleplus_user:+RobertSnow
+googleplus_user: +RobertSnow
googleplus_hidden: false
# Pinboard
@@ -94,25 +110,12 @@ delicious_user:
delicious_count: 3
# Disqus Comments
-disqus_short_name:sf3soft
+disqus_short_name: sf3soft
disqus_show_comment_count: true
# Google Analytics
google_analytics_tracking_id:
# Facebook Like
facebook_like: false
-=======
-# Site settings
-title: Home
-email: robert@sf3soft.net
-description: "Testing ground for Jekyll as well as playground for projects"
-baseurl: ""
-url: "http://sf3soft.net"
-twitter_username: Soulflare3
-github_username: Soulflare3
-
-# Build settings
-markdown: kramdown
-permalink: pretty
->>>>>>> dcc1c7bfddd839e021ed5ecb4d6350a29e7858f3
+
View
@@ -1,9 +1,9 @@
-<<<<<<< HEAD
+
# ----------------------- #
# Main Configs #
# ----------------------- #
-url: http://soulflare3.github.io
+url: http://sf3soft.net
title: My Octopress Blog
subtitle: A blogging framework for hackers.
author: Soul
@@ -49,6 +49,8 @@ excerpt_link: "Read on &rarr;" # "Continue reading" link text at the bottom of
excerpt_separator: "<!--more-->"
titlecase: true # Converts page and post titles to titlecase
+gems:
+ - octopress-video-tag
# list each of the sidebar modules you want to include, in the order you want them to appear.
# To add custom asides, create files in /source/_includes/custom/asides/ and add them to the list like 'custom/asides/custom_aside_name.html'
@@ -60,18 +62,36 @@ default_asides: [asides/recent_posts.html, asides/github.html, asides/delicious.
# post_asides:
# page_asides:
+# Default extension for new posts and pages
+post_ext: markdown
+page_ext: html
+
+# Default templates for posts and pages
+# Found in _templates/
+post_layout: post
+page_layout: page
+
+# Format titles with titlecase?
+titlecase: true
+
+# Change default template file (in _templates/)
+post_template: post
+page_template: page
+draft_template: draft
+
+
# ----------------------- #
# 3rd Party Settings #
# ----------------------- #
# Github repositories
-github_user:soulflare3
+github_user: soulflare3
github_repo_count: 0
github_show_profile_link: true
github_skip_forks: true
# Twitter
-twitter_user:soulflare3
+twitter_user: soulflare3
twitter_tweet_button: true
# Google +1
@@ -80,7 +100,7 @@ google_plus_one_size: medium
# Google Plus Profile
# Hidden: No visible button, just add author information to search results
-googleplus_user:+RobertSnow
+googleplus_user: +RobertSnow
googleplus_hidden: false
# Pinboard
@@ -92,25 +112,12 @@ delicious_user:
delicious_count: 3
# Disqus Comments
-disqus_short_name:sf3soft
+disqus_short_name: sf3soft
disqus_show_comment_count: true
# Google Analytics
google_analytics_tracking_id:
# Facebook Like
facebook_like: false
-=======
-# Site settings
-title: Home
-email: robert@sf3soft.net
-description: "Testing ground for Jekyll as well as playground for projects"
-baseurl: ""
-url: "http://sf3soft.net"
-twitter_username: Soulflare3
-github_username: Soulflare3
-
-# Build settings
-markdown: kramdown
-permalink: pretty
->>>>>>> dcc1c7bfddd839e021ed5ecb4d6350a29e7858f3
+
View
@@ -0,0 +1,4 @@
+---
+layout: {{ layout }}
+title: "{{ title }}"
+---
View
@@ -0,0 +1,4 @@
+---
+layout: {{ layout }}
+title: "{{ title }}"
+---
View
@@ -0,0 +1,5 @@
+---
+layout: {{ layout }}
+title: "{{ title }}"
+date: {{ date }}
+---
@@ -0,0 +1,12 @@
+---
+status: published
+layout: post
+title: "Finally"
+date: 2015-08-22 15:54:45 -0500
+comments: true
+categories:
+---
+
+I've wanted to try Ghost ever since the project went live, yet I was never able to get it running. Frankly I've never been able to get anything from NodeJS running, so I've always hated the platform. I decided to give it another shot and after some tinkering was able to get it to run! \o/
+
+Not sure how often I'll use it, but I love how fast, simple, and easy to use it is. Getting it *running* is not simple, but using it is. Also I need to learn Markdown by the looks of it... I know very little.
View
@@ -0,0 +1,4 @@
+---
+layout: {{ layout }}
+title: "{{ title }}"
+---
View
@@ -0,0 +1,4 @@
+---
+layout: {{ layout }}
+title: "{{ title }}"
+---
View
@@ -0,0 +1,5 @@
+---
+layout: {{ layout }}
+title: "{{ title }}"
+date: {{ date }}
+---

0 comments on commit 22348b8

Please sign in to comment.