Commits

Cory Li committed 15fb6b2

cleaned up some small things, cleaned up page directories, etc.

Comments (0)

Files changed (13)

 require 'slim'
 Slim::Engine.disable_option_validator!
 
-
 require 'stylus'
 
 set :markdown_engine, :redcarpet
 
 activate :blog do |blog|
   # blog.prefix = "blog"
-  # blog.permalink = ":year/:month/:day/:title.html"
-  # blog.sources = ":year-:month-:day-:title.html"
+  blog.permalink = ":title.html"
+  blog.sources = "posts/:year-:month-:day-:title.html"
   blog.taglink = "tags/:tag.html"
   blog.layout = "post"
   # blog.summary_separator = /(READMORE)/
 
 page "/feed.xml", :layout => false
 
+activate :directory_indexes
+
 ### 
 # Compass
 ###
 # end
 
 set :css_dir, 'stylesheets'
-
 set :js_dir, 'javascripts'
-
-set :images_dir, 'images'
+set :images_dir, 'img'
 
 # Build-specific configuration
 configure :build do

source/2012-01-01-example-article.html.markdown

----
-title: Example Article
-date: 2012-01-01
-tags: example, test, hi
----
-
-Your [bones](http://bones.com) don't break, mine do. That's clear. Your cells react to bacteria and viruses differently than mine. You don't get sick, I do. That's also clear. But for some reason, you and I react the exact same way to water. We swallow it too fast, we choke. We get some in our lungs, we drown. However unreal it may seem, we are connected, you and I. We're on the same curve, just on opposite ends.
-
-## Secondary Header
-
-Normally, _both_ your **asses** would be dead as fucking fried chicken, but you happen to pull this shit while I'm in a transitional period so I don't wanna kill you, I wanna help you. But I can't give you `this` case, it don't belong to me. Besides, I've already been through too much shit this morning over this case to hand it over to your dumb ass.
-
-### Tertiary Header
-
-My money's in that office, right? If she start giving me some bullshit about it ain't there, and we got to go someplace else and get it, I'm gonna shoot you in the head then and there. Then I'm `gonna shoot` that bitch in the kneecaps, find out where my goddamn money is. She gonna tell me too. Hey, look at me when I'm talking to you, motherfucker. You listen: we go in there, and that nigga Winston or anybody else is in there, you the first motherfucker to get shot. You understand?
-
-
-> hello
-> test another
-
-```
-hello
-```
-
-
-```python
-def bubbles(temp, zzz=5):
-  pass
-
-a = [i for i in range(10)]
-```
-
-
-#### Quadternary Header
-
-Well, the way they make shows is, they make one show. That show's called a pilot. Then they show that show to the people who make shows, and on the strength of that one show they decide if they're going to make more shows. Some pilots get picked and become television programs. Some don't, become nothing. She starred in one of the ones that became nothing.
-
-## Secondary Header
-
-Do you see any Teletubbies in here? Do you see a slender plastic tag clipped to my shirt with my name printed on it? Do you see a little Asian child with a blank expression on his face sitting outside on a mechanical helicopter that shakes when you put quarters in it? No? Well, that's what you see at a toy store. And you must think you're in a toy store, because you're here shopping for an infant named Jeb.
-
 ---
 title: About Cory
+description: Hi I'm Cory Li. An adventurer of programming and science!
 ---
 
 # About Me
 ----
 
 <div class='center'>
-<img src='/images/photo.jpg' class='img-polaroid' width='200' />
+<img src='/img/photo.jpg' class='img-polaroid' width='200' />
 </div>
 

source/images/header.png

Removed
Old image

source/images/photo.jpg

Removed
Old image

source/img/header.png

Added
New image

source/img/photo.jpg

Added
New image

source/index.slim

 ---
 title: Cory's Notes
+description: A collection of notes from Cory Li, a random kid studying the wonders of computers and biology.
 ---
 
 h1 Notes and Stuff

source/layout.slim

 doctype html
 html(lang='en')
   head
-
     meta(name='viewport' content='width=device-width, initial-scale=1.0')
     == javascript_include_tag 'jquery-1.8.2.min.js'
     == javascript_include_tag 'bootstrap.min.js'
     - else
       title= current_page.data.title
 
+    - unless current_page.data.title.nil?
+      meta(name='description' content=current_page.data.description)
+
   body
     .row
       #header
 
     .row
-      .span3
-        #sidebar
-          == image_tag 'header.png', :alt => 'header'
-          h2.name == link_to 'Cory Li', '/index.html'
-          ul.unstyled.nav.nav-list
-            li== link_to 'About', '/about.html'
-            li== link_to 'Posts', '/index.html'
-            li== link_to 'Feed', '/feed.xml'
-            li== link_to 'Code', 'http://code.cory.li'
 
-      .span9
-        #content
-          == yield
+      // Full Page Layout
+      - if current_page.data.minimal.nil?
+        .span3
+          #sidebar
+            == image_tag 'header.png', :alt => 'header'
+            h2.name == link_to 'Cory Li', '/index.html'
+            nav.unstyled.nav.nav-list
+              li== link_to 'About', '/about.html'
+              li== link_to 'Posts', '/index.html'
+              li== link_to 'Feed', '/feed.xml'
+              li== link_to 'Code', 'http://code.cory.li'
+
+        .span9
+          #content
+            == yield
+
+      // Minimal Page Layout
+      - else
+        .span8.offset2
+          #content
+            ==yield

source/layouts/post.slim

 - wrap_layout :layout do
-
-  / - content_for :title do 
-  /   | #{current_article.title}
-
   article
     header
       h1
         a(href='#')= current_article.title
-      date= current_article.date.strftime('Written on %A, %B %e, %Y')
+      time(datetime=current_article.date.iso8601)= current_article.date.strftime('Written on %A, %B %e, %Y')
     == yield
 
   hr

source/mako-lang.md

+---
+minimal: true
+---
+
+# this is a document
+
+Hello world today i want to talk to you about DEATH

source/posts/2012-01-01-example-article.html.markdown

+---
+title: Example Article
+date: 2012-01-01
+tags: example, longstring, fightingninjas, fourthtag, zzzzzzz
+---
+
+Your [bones](http://bones.com) don't break, mine do. That's clear. Your cells react to bacteria and viruses differently than mine. You don't get sick, I do. That's also clear. But for some reason, you and I react the exact same way to water. We swallow it too fast, we choke. We get some in our lungs, we drown. However unreal it may seem, we are connected, you and I. We're on the same curve, just on opposite ends.
+
+## Secondary Header
+
+Normally, _both_ your **asses** would be dead as fucking fried chicken, but you happen to pull this shit while I'm in a transitional period so I don't wanna kill you, I wanna help you. But I can't give you `this` case, it don't belong to me. Besides, I've already been through too much shit this morning over this case to hand it over to your dumb ass.
+
+### Tertiary Header
+
+My money's in that office, right? If she start giving me some bullshit about it ain't there, and we got to go someplace else and get it, I'm gonna shoot you in the head then and there. Then I'm `gonna shoot` that bitch in the kneecaps, find out where my goddamn money is. She gonna tell me too. Hey, look at me when I'm talking to you, motherfucker. You listen: we go in there, and that nigga Winston or anybody else is in there, you the first motherfucker to get shot. You understand?
+
+
+> hello
+> test another
+
+```
+hello
+```
+
+
+```python
+def bubbles(temp, zzz=5):
+  pass
+
+a = [i for i in range(10)]
+```
+
+
+#### Quadternary Header
+
+Well, the way they make shows is, they make one show. That show's called a pilot. Then they show that show to the people who make shows, and on the strength of that one show they decide if they're going to make more shows. Some pilots get picked and become television programs. Some don't, become nothing. She starred in one of the ones that became nothing.
+
+## Secondary Header
+
+Do you see any Teletubbies in here? Do you see a slender plastic tag clipped to my shirt with my name printed on it? Do you see a little Asian child with a blank expression on his face sitting outside on a mechanical helicopter that shakes when you put quarters in it? No? Well, that's what you see at a toy store. And you must think you're in a toy store, because you're here shopping for an infant named Jeb.
+

source/stylesheets/style.css.sass

 
 
 #content
+  padding-bottom: 150px
   header
     margin-bottom: 30px
     h1
 
 #sidebar 
   padding-top: 20px
+  padding-bottom: 20px
   padding-left: 3em
   padding-right: 1em
   text-align: right
     white-space: nowrap
 
 #footer
-  padding-bottom: 150px
   a.back
     line-height: 20px
     float: left
       text-decoration: none
 
   #tags
-    float: right
+    text-align: right
 
 .center
   text-align: center
 
+@media (max-width: 767px)
+  #sidebar
+    overflow: auto
+    width: 100%
+    padding-left: 0
+    padding-top: 0
+
+    img
+      float: right