GitList
Browse code

updated rake file, reorganized stylesheets, added google site search, added google analytics

B Mathis authored on 06/11/2009 at 03:30:03
Showing 20 changed files
Rakefile
History View file @ 145f810
... ... 
@@ -18,8 +18,13 @@ def ok_failed(condition)
18 18 
   end
19 19 
 end
20 20
21 
+desc "generate website in output directory"
22 
+task :default => [:generate_site, :generate_style] do
23 
+  puts "--Site Generating Complete!--"
24 
+end
25 
+
21 26 
 desc "list tasks"
22 
-task :default do
27 
+task :list do
23 28 
   puts "Tasks: #{(Rake::Task.tasks - [Rake::Task[:default]]).to_sentence}"
24 29 
   puts "(type rake -T for more detail)\n\n"
25 30 
 end
... ... 
@@ -35,18 +40,29 @@ task :clean_debug do
35 35 
   Dir["#{site}/debug"].each { |f| rm_rf(f) }
36 36 
 end
37 37
38 
-desc "generate website in output directory"
39 
-task :generate => :clean do
38 
+desc "Generate styles only"
39 
+task :generate_style do
40 
+  puts "Generating website..."
41 
+  system "compass"
42 
+end
43 
+
44 
+desc "Generate site files only"
45 
+task :generate_site => :clean do
40 46 
   puts "Generating website..."
41 47 
   system "jekyll"
42 48 
   Dir["#{site}/stylesheets/*.sass"].each { |f| rm_rf(f) }
43 
-  system "compass"
44 49 
   system "mv #{site}/atom.html #{site}/atom.xml"
45 50 
 end
46 51
47 52 
 def rebuild_site(relative)
48 53 
   puts ">>> Change Detected to: #{relative} <<<"
49 
-  IO.popen('rake generate'){|io| print(io.readpartial(512)) until io.eof?}
54 
+  IO.popen('rake generate_site'){|io| print(io.readpartial(512)) until io.eof?}
55 
+  puts '>>> Update Complete <<<'
56 
+end
57 
+
58 
+def rebuild_style(relative)
59 
+  puts ">>> Change Detected to: #{relative} <<<"
60 
+  IO.popen('rake generate_style'){|io| print(io.readpartial(512)) until io.eof?}
50 61 
   puts '>>> Update Complete <<<'
51 62 
 end
52 63
... ... 
@@ -54,15 +70,25 @@ desc "Watch the site and regenerate when it changes"
54 54 
 task :watch do
55 55 
   require 'fssm'
56 56 
   puts ">>> Watching for Changes <<<"
57 
-  FSSM.monitor("#{File.dirname(__FILE__)}/#{source}", '**/*') do
58 
-    update {|base, relative| rebuild_site(relative)}
59 
-    delete {|base, relative| rebuild_site(relative)}
60 
-    create {|base, relative| rebuild_site(relative)}
57 
+  FSSM.monitor do
58 
+    path "#{File.dirname(__FILE__)}/#{source}" do
59 
+      update {|base, relative| rebuild_site(relative)}
60 
+      delete {|base, relative| rebuild_site(relative)}
61 
+      create {|base, relative| rebuild_site(relative)}
62 
+    end
63 
+    path "#{File.dirname(__FILE__)}/#{source}/stylesheets" do
64 
+      glob '**/*.sass'
65 
+      update {|base, relative| rebuild_style(relative)}
66 
+      delete {|base, relative| rebuild_style(relative)}
67 
+      create {|base, relative| rebuild_style(relative)}
68 
+    end
61 69 
   end
70 
+  FSSM.monitor("#{File.dirname(__FILE__)}/#{source}/stylesheets", '**/*') do
71 
+
62 72 
 end
63 73
64 74 
 desc "generate and deploy website"
65 
-multitask :deploy => [:generate, :clean_debug] do
75 
+multitask :deploy => [:default, :clean_debug] do
66 76 
   print "Deploying website..."
67 77 
   ok_failed system("rsync -avz --delete #{site}/ #{ssh_user}:#{document_root}")
68 78 
 end
... ... 
@@ -87,13 +113,13 @@ task :stop_serve do
87 87 
 end
88 88
89 89 
 desc "preview the site in a web browser"
90 
-multitask :preview => [:generate, :start_serve] do
90 
+multitask :preview => [:default, :start_serve] do
91 91 
   system "open http://localhost:#{port}"
92 92 
 end
93 93
94 94
95 95 
 desc "Build an XML sitemap of all html files."
96 
-task :sitemap => :generate do
96 
+task :sitemap => :default do
97 97 
   html_files = FileList.new("#{site}/**/*.html").map{|f| f[("#{site}".size)..-1]}.map do |f|
98 98 
     if f.ends_with?("index.html")
99 99 
       f[0..(-("index.html".size + 1))]
config.rb
History View file @ 145f810
... ... 
@@ -4,7 +4,7 @@ project_type = :stand_alone
4 4 
 # Set this to the root of your project when deployed:
5 5 
 http_path = "/"
6 6 
 css_dir = "site/stylesheets"
7 
-sass_dir = "source/stylesheets"
7 
+sass_dir = "/stylesheets"
8 8 
 images_dir = "images"
9 9
10 10 
 # To enable relative paths to assets via compass helper functions. Uncomment:
source/_layouts/default.haml
History View file @ 145f810
... ... 
@@ -1,6 +1,6 @@
1 1 
 ---
2 2 
 blog_title: My Octopress Blog
3 
-root_url:
3 
+google_site_search_id:
4 4 
 ---
5 5
6 6 
 !!! 1.1 Transitional
... ... 
@@ -13,24 +13,29 @@ root_url:
13 13 
       %meta(name="keywords" content="#{page.keywords}")/
14 14 
     %link(href="/stylesheets/screen.css" rel="stylesheet" media="screen projection" type="text/css")
15 15 
     %link(href="/atom.xml" rel="alternate" title="#{page.blog_title}" type="application/atom+xml")
16 
-    /%script(src="http://ajax.googleapis.com/ajax/libs/mootools/1.2.3/mootools-yui-compressed.js" type="text/javascript")/
17 16 
     %script(src="/javascripts/mootools-yui-compressed.js" type="text/javascript")
18 17 
     %script(src="/javascripts/jsonp.js" type="text/javascript")
19 18 
     %script(src="/javascripts/twitter_gitter.js" type="text/javascript")
20 19 
     %script(src="/javascripts/twitter.js" type="text/javascript")
20 
+    %script(src="http://www.google-analytics.com/ga.js" type="text/javascript")
21 21 
   %body
22 22 
     #header
23 23 
       .page_width
24 24 
         %a.title(href="/")=page.blog_title
25 
+        #search
26 
+          %form(action="http://www.google.com/cse" id="cse-search-box")
27 
+            %input(type="hidden" name="cx" value="#{page.google_site_search_id}")
28 
+            %input(type="hidden" name="ie" value="UTF-8")
29 
+            %input#q(type="text" name="q")
25 30 
     #nav
26 31 
       .page_width
27 32 
         %ul
28 33 
           %li.alpha
29 
-            %a(href="#{page.root_url}/") Blog
34 
+            %a(href="/") Blog
30 35 
           %li.omega
31 
-            %a(href="#{page.root_url}/about") About
36 
+            %a(href="/about") About
32 37 
           %li.subscribe
33 
-            %a(href="#{page.root_url}/atom.xml") Subscribe
38 
+            %a(href="/atom.xml") Subscribe
34 39 
     #page
35 40 
       .page_width
36 41 
         #main
... ... 
@@ -49,4 +54,11 @@ root_url:
49 49 
     #footer
50 50 
       .page_width
51 51 
         = "Copyright &copy; #{Time.now.strftime('%Y')} - #{page.blog_title} | "
52 
-        %span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a>
53 52 
\ No newline at end of file
53 
+        %span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a>
54 
+
55 
+    //Google Analytics code
56 
+    :javascript
57 
+      try {
58 
+      var pageTracker = _gat._getTracker("UA-10876422-1");
59 
+      pageTracker._trackPageview();
60 
+      } catch(err) {}
54 61 
\ No newline at end of file
source/images/search_bg.png
History View file @ 145f810
55 62 
new file mode 100644
56 63 
Binary files /dev/null and b/source/images/search_bg.png differ
source/stylesheets/_base.sass
History View file @ 145f810
57 64 
new file mode 100644
... ... 
@@ -0,0 +1,3 @@
0 
+//compass default reset
1 
++global-reset
2 
+@import compass/utilities.sass
0 3 
\ No newline at end of file
source/stylesheets/_layout.sass
History View file @ 145f810
1 4 
new file mode 100644
... ... 
@@ -0,0 +1,119 @@
0 
+!page_width = 900px
1 
+!sidebar_width = 250px
2 
+!sidebar_margin = 30px
3 
+!pad = 15px
4 
+!default_border_radius = 4px
5 
+
6 
+html body
7 
+  background-color= !body_bg
8 
+  color= !body_color
9 
+  a
10 
+    color= !link_color
11 
+
12 
+#footer a
13 
+  color= #ddd
14 
+  &:hover
15 
+    color = #fff
16 
+#header
17 
+  background-color= !header_bg
18 
+  border-bottom= "1px solid" !header_border
19 
+  padding: 30px 0
20 
+  .page_width
21 
+    position: relative
22 
+  a.title
23 
+    font-size= !h1
24 
+    +heading-font
25 
+    display: inline-block
26 
+    color= !title_color
27 
+    text-decoration: none
28 
+
29 
+#nav
30 
+  +clearfix
31 
+  position: relative
32 
+  z-index: 1
33 
+  padding: 6px 0
34 
+  background:
35 
+    color= !nav_bg
36 
+    image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4))
37 
+    image: -moz-linear-gradient(left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4))
38 
+  border:
39 
+    top= "1px solid" !nav_border_top
40 
+    bottom= "1px solid" !nav_border_bottom
41 
+  ul
42 
+    position: relative
43 
+    +horizontal-list
44 
+    margin: 0 auto
45 
+    overflow: visible
46 
+    li
47 
+      padding: 0 15px
48 
+      border-left= "1px solid" !nav_border_left
49 
+      border-right= "1px solid" !nav_border_right
50 
+      &.alpha
51 
+        border-left: none
52 
+        padding-left: 0
53 
+      &.omega
54 
+        border-right: 0
55 
+      &.subscribe
56 
+        position: absolute
57 
+        left= !page_width - !sidebar_width - !sidebar_margin/2
58 
+        border: none
59 
+        a
60 
+          display: inline-block
61 
+          padding-left: 28px
62 
+          background: url("/images/rss.png") left top no-repeat
63 
+      a
64 
+        display: inline-block
65 
+        color= !nav_color
66 
+        line-height: 150%
67 
+        text-decoration: none
68 
+        &:hover
69 
+          color= !nav_color_hover
70 
+
71 
+.page_width
72 
+  width= !page_width
73 
+  margin: 0 auto
74 
+  padding:
75 
+    left: 30px
76 
+    right: 30px
77 
+
78 
+#page
79 
+  +clearfix
80 
+  background-color= !page_bg
81 
+  .page_width
82 
+    +clearfix
83 
+    padding:
84 
+      top: 25px
85 
+      bottom: 25px
86 
+    background-color= !blog_bg
87 
+    +easy-box-shadow(#ccc)
88 
+    border:
89 
+      left= "1px solid" !page_border_sides
90 
+      right= "1px solid" !page_border_sides
91 
+#main
92 
+  width= !page_width - !sidebar_width - !sidebar_margin
93 
+#sidebar
94 
+  width= !sidebar_width
95 
+  margin-left= !sidebar_margin
96 
+
97 
+#main, #sidebar
98 
+  float: left
99 
+
100 
+.blog
101 
+  .article
102 
+    padding= !base_font_size * 1.5 0 !base_font_size * 1.5
103 
+    border-bottom= "1px solid" !article_border
104 
+    &:first-child
105 
+      padding-top: 0
106 
+  .footer
107 
+    padding-top= !base_font_size
108 
+
109 
+
110 
+#footer
111 
+  position: relative
112 
+  z-index: 2
113 
+  font-size= !base_font_size_small
114 
+  clear: both
115 
+  padding= !base_font_size * 1.5 0
116 
+  color= !footer_color
117 
+  +h-linear-gradient(darken(!body_bg, 25), !body_bg)
118 
+  border-top= "14px solid" !footer_bg
0 119 
\ No newline at end of file
source/stylesheets/_partials.sass
History View file @ 145f810
1 120 
new file mode 100644
... ... 
@@ -0,0 +1,2 @@
0 
+@import partials/twitter.sass
1 
+@import partials/search.sass
0 2 
\ No newline at end of file
source/stylesheets/_theme.sass
History View file @ 145f810
1 3 
new file mode 100644
... ... 
@@ -0,0 +1,49 @@
0 
+// Link Colors
1 
+!link_color = #165B94
2 
+
3 
+// Main Section Colors
4 
+!body_color = #333
5 
+!body_bg = #323232
6 
+
7 
+!header_bg = #323232
8 
+!header_border = #181818
9 
+!title_color = #ddd
10 
+
11 
+!nav_color = #555
12 
+!nav_color_hover = #000
13 
+!nav_bg = #e8e8e8
14 
+!nav_border_top = #fff
15 
+!nav_border_bottom = #aaa
16 
+!nav_border_left = #ccc
17 
+!nav_border_right = #fff
18 
+
19 
+!page_border_sides = #ccc
20 
+!page_bg = #f0f0f0
21 
+
22 
+// Blog
23 
+!article_border = #eee
24 
+!blog_bg = #fff
25 
+
26 
+!footer_color = #999
27 
+!footer_bg = #444
28 
+
29 
+// Form Colors
30 
+!fieldset_bg = #ececec
31 
+!fieldset_border = #c3c3c3
32 
+
33 
+!textinput_color = #333
34 
+!textinput_bg = #f4f4f4
35 
+!textinput_bg_focus = #fefeee
36 
+
37 
+!textinput_border_top = #aaa
38 
+!textinput_border_bottom = #c6c6c6
39 
+!textinput_border_left = #c3c3c3
40 
+!textinput_border_right = #c3c3c3
41 
+!textinput_border_focus = #989898
42 
+
43 
+!cancel_link = #555
44 
+
45 
+// Button Colors
46 
+!default_button_text_color = #fff
47 
+!default_button_bg = yellow
48 
+!blue_btn = desaturate(adjust_hue(!default_button_bg, -16), 25)
0 49 
\ No newline at end of file
source/stylesheets/_typography.sass
History View file @ 145f810
1 50 
new file mode 100644
... ... 
@@ -0,0 +1,27 @@
0 
+!base_font_size = 16px
1 
+!base_font_size_small = 13px
2 
+!base_font_color = #333
3 
+!default_border_radius = 6px
4 
+
5 
++general-typography
6 
+=heading-font
7 
+  +serif-font
8 
+=quote-font
9 
+  +serif-font
10 
+
11 
+body
12 
+  font-size= !base_font_size
13 
+  +sans-font
14 
+
15 
+h1,h2,h3,h4,h5,h6
16 
+  color: #333
17 
+  font-weight: bold
18 
+  +heading-font
19 
+
20 
+blockquote
21 
+  +heading-font
22 
+  font-size= !base_font_size * 1.2
23 
+.quote blockquote
24 
+  font-size= !h4
25 
+  line-height= !h5 * 1.625
26 
+  color: #555
0 27 
\ No newline at end of file
source/stylesheets/partials/_base.sass
History View file @ 145f810
1 28 
deleted file mode 100644
... ... 
@@ -1,16 +0,0 @@
1 
-//compass default reset
2 
-+global-reset
3 
-//my reset
4 
-button
5 
-  margin: 0
6 
-  padding: 0
7 
-  background: none
8 
-  border: none
9 
-  cursor: pointer
10 
-
11 
-button::-moz-focus-inner
12 
-  border: none
13 
-  padding: 0
14 
-
15 
-@import compass/utilities.sass
16 
-@import base/typography.sass
17 1 
\ No newline at end of file
source/stylesheets/partials/_main.sass
History View file @ 145f810
18 2 
deleted file mode 100644
... ... 
@@ -1,4 +0,0 @@
1 
-@import main/theme.sass
2 
-@import main/layout.sass
3 
-@import main/form.sass
4 
-@import main/twitter.sass
5 1 
\ No newline at end of file
source/stylesheets/partials/_search.sass
History View file @ 145f810
6 2 
new file mode 100644
... ... 
@@ -0,0 +1,18 @@
0 
+#search
1 
+  position: absolute
2 
+  left= !page_width + !sidebar_margin - !sidebar_width
3 
+  top= 10%
4 
+  form
5 
+    background: url(/images/search_bg.png) no-repeat
6 
+    padding: 2px 0 0
7 
+    height: 28px
8 
+    width: 218px
9 
+  #q
10 
+    background: none
11 
+    width: 160px
12 
+    margin-left: 30px
13 
+    font-size: 15px
14 
+    border: none
15 
+    color: #aaa
16 
+    &:focus
17 
+      outline: none
0 18 
\ No newline at end of file
source/stylesheets/partials/_twitter.sass
History View file @ 145f810
1 19 
new file mode 100644
... ... 
@@ -0,0 +1,2 @@
0 
+#twitter
1 
+  font-size: 85%
0 2 
\ No newline at end of file
source/stylesheets/partials/base/_typography.sass
History View file @ 145f810
1 3 
deleted file mode 100644
... ... 
@@ -1,27 +0,0 @@
1 
-!base_font_size = 16px
2 
-!base_font_size_small = 13px
3 
-!base_font_color = #333
4 
-!default_border_radius = 6px
5 
-
6 
-+general-typography
7 
-=heading-font
8 
-  +serif-font
9 
-=quote-font
10 
-  +serif-font
11 
-
12 
-body
13 
-  font-size= !base_font_size
14 
-  +sans-font
15 
-
16 
-h1,h2,h3,h4,h5,h6
17 
-  color: #333
18 
-  font-weight: bold
19 
-  +heading-font
20 
-
21 
-blockquote
22 
-  +heading-font
23 
-  font-size= !base_font_size * 1.2
24 
-.quote blockquote
25 
-  font-size= !h4
26 
-  line-height= !h5 * 1.625
27 
-  color: #555
28 1 
\ No newline at end of file
source/stylesheets/partials/main/_flash_messages.sass
History View file @ 145f810
29 2 
deleted file mode 100644
... ... 
@@ -1,36 +0,0 @@
1 
-!flash_notice       ||= #00529B
2 
-!flash_success      ||= #4F8A10
3 
-!flash_warning      ||= #FBF4BD
4 
-!flash_error        ||= #D8000C
5 
-!flash_notice_bg    ||= #BDE5F8
6 
-!flash_success_bg   ||= #DFF2BF
7 
-!flash_warning_bg   ||= #FBF4BD
8 
-!flash_error_bg     ||= #FFD9DA
9 
-
10 
-=flash-message-style
11 
-  +flash-message-structure
12 
-  &.notice
13 
-    +flash-color(!flash_notice, !flash_notice_bg)
14 
-  &.success
15 
-    +flash-color(!flash_success, !flash_success_bg)
16 
-  &.warning
17 
-    +flash-color(!flash_warning, !flash_warning_bg)
18 
-  &.error
19 
-    +flash-color(!flash_error, !flash_error_bg)
20 
-
21 
-=flash-message-structure
22 
-  background-repeat: no-repeat
23 
-  background-position: 10px center
24 
-  border: 1px dashed
25 
-  padding: 10px 15px
26 
-  margin: 0 0 15px
27 
-
28 
-=flash-color(!color, !bg = 0)
29 
-  color= !color
30 
-  @if !bg == 0
31 
-    background-color= desaturate(lighten(adjust_hue(!color, -10), 83), 20)
32 
-  @else
33 
-    background-color= !bg
34 
-
35 
-#flash
36 
-  +flash-message-style
37 1 
\ No newline at end of file
source/stylesheets/partials/main/_form.sass
History View file @ 145f810
38 2 
deleted file mode 100644
... ... 
@@ -1,61 +0,0 @@
1 
-#page
2 
-  form
3 
-    clear: both
4 
-    padding-bottom= !pad
5 
-    fieldset, fieldset input.textbox, fieldset textarea
6 
-      +border-radius
7 
-    fieldset
8 
-      background-color= !fieldset_bg
9 
-      width: 480px
10 
-      border= "1px solid" !fieldset_border
11 
-      padding: 35px 25px 20px
12 
-      margin-bottom= !pad*2.2
13 
-    label
14 
-      font-size: 90%
15 
-      display: block
16 
-      padding-bottom: 4px
17 
-    select
18 
-      font-size: 110%
19 
-    input.textbox, textarea
20 
-      font-size: 115%
21 
-      color= !textinput_color
22 
-      background-color= !textinput_bg
23 
-
24 
-      width: 70%
25 
-      padding: 6px 8px
26 
-      outline: 0
27 
-      display: inline-block
28 
-
29 
-      border: 1px solid
30 
-      border-top-color= !textinput_border_top
31 
-      border-bottom-color= !textinput_border_bottom
32 
-      border-left-color= !textinput_border_left
33 
-      border-right-color= !textinput_border_right
34 
-
35 
-      &:focus
36 
-        background= !textinput_bg_focus
37 
-        border-color= !textinput_border_focus
38 
-
39 
-    input.checkbox, label.checkbox
40 
-      display: inline-block
41 
-    p
42 
-      +clearfix
43 
-      padding= 0 8px !pad
44 
-    input.wrong:focus
45 
-      outline: 2px solid #d0a5a5
46 
-      background: #fef2f2
47 
-    button
48 
-      +border-radius(5px)
49 
-      +btn-style(!blue_btn)
50 
-      +btn-structure(18px, 1px)
51 
-      color= !default_button_text_color
52 
-      border:
53 
-        width: 1px
54 
-        style: solid
55 
-      &:hover, &:focus
56 
-        +btn-style-hover(!blue_btn)
57 
-        outline: none
58 
-      &:active
59 
-        +btn-style-active(!blue_btn)
60 
-    a.cancel
61 
-      color= !cancel_link
62 1 
\ No newline at end of file
source/stylesheets/partials/main/_layout.sass
History View file @ 145f810
63 2 
deleted file mode 100644
... ... 
@@ -1,117 +0,0 @@
1 
-!page_width = 900px
2 
-!sidebar_width = 250px
3 
-!sidebar_margin = 30px
4 
-!pad = 15px
5 
-!default_border_radius = 4px
6 
-
7 
-html body
8 
-  background-color= !body_bg
9 
-  color= !body_color
10 
-  a
11 
-    color= !link_color
12 
-
13 
-#footer a
14 
-  color= #ddd
15 
-  &:hover
16 
-    color = #fff
17 
-#header
18 
-  background-color= !header_bg
19 
-  border-bottom= "1px solid" !header_border
20 
-  padding: 30px 0
21 
-  a.title
22 
-    font-size= !h1
23 
-    +heading-font
24 
-    display: inline-block
25 
-    color= !title_color
26 
-    text-decoration: none
27 
-
28 
-#nav
29 
-  +clearfix
30 
-  position: relative
31 
-  z-index: 1
32 
-  padding: 6px 0
33 
-  background:
34 
-    color= !nav_bg
35 
-    image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4))
36 
-    image: -moz-linear-gradient(left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4))
37 
-  border:
38 
-    top= "1px solid" !nav_border_top
39 
-    bottom= "1px solid" !nav_border_bottom
40 
-  ul
41 
-    position: relative
42 
-    +horizontal-list
43 
-    margin: 0 auto
44 
-    overflow: visible
45 
-    li
46 
-      padding: 0 15px
47 
-      border-left= "1px solid" !nav_border_left
48 
-      border-right= "1px solid" !nav_border_right
49 
-      &.alpha
50 
-        border-left: none
51 
-        padding-left: 0
52 
-      &.omega
53 
-        border-right: 0
54 
-      &.subscribe
55 
-        position: absolute
56 
-        left= !page_width - !sidebar_width - !sidebar_margin/2
57 
-        border: none
58 
-        a
59 
-          display: inline-block
60 
-          padding-left: 28px
61 
-          background: url("/images/rss.png") left top no-repeat
62 
-      a
63 
-        display: inline-block
64 
-        color= !nav_color
65 
-        line-height: 150%
66 
-        text-decoration: none
67 
-        &:hover
68 
-          color= !nav_color_hover
69 
-
70 
-.page_width
71 
-  width= !page_width
72 
-  margin: 0 auto
73 
-  padding:
74 
-    left: 30px
75 
-    right: 30px
76 
-
77 
-#page
78 
-  +clearfix
79 
-  background-color= !page_bg
80 
-  .page_width
81 
-    +clearfix
82 
-    padding:
83 
-      top: 25px
84 
-      bottom: 25px
85 
-    background-color= !blog_bg
86 
-    +easy-box-shadow(#ccc)
87 
-    border:
88 
-      left= "1px solid" !page_border_sides
89 
-      right= "1px solid" !page_border_sides
90 
-#main
91 
-  width= !page_width - !sidebar_width - !sidebar_margin
92 
-#sidebar
93 
-  width= !sidebar_width
94 
-  margin-left= !sidebar_margin
95 
-
96 
-#main, #sidebar
97 
-  float: left
98 
-
99 
-.blog
100 
-  .article
101 
-    padding= !base_font_size * 1.5 0 !base_font_size * 1.5
102 
-    border-bottom= "1px solid" !article_border
103 
-    &:first-child
104 
-      padding-top: 0
105 
-  .footer
106 
-    padding-top= !base_font_size
107 
-
108 
-
109 
-#footer
110 
-  position: relative
111 
-  z-index: 2
112 
-  font-size= !base_font_size_small
113 
-  clear: both
114 
-  padding= !base_font_size * 1.5 0
115 
-  color= !footer_color
116 
-  +h-linear-gradient(darken(!body_bg, 25), !body_bg)
117 
-  border-top= "14px solid" !footer_bg
118 1 
\ No newline at end of file
source/stylesheets/partials/main/_theme.sass
History View file @ 145f810
119 2 
deleted file mode 100644
... ... 
@@ -1,49 +0,0 @@
1 
-// Link Colors
2 
-!link_color = #165B94
3 
-
4 
-// Main Section Colors
5 
-!body_color = #333
6 
-!body_bg = #323232
7 
-
8 
-!header_bg = #323232
9 
-!header_border = #181818
10 
-!title_color = #ddd
11 
-
12 
-!nav_color = #555
13 
-!nav_color_hover = #000
14 
-!nav_bg = #e8e8e8
15 
-!nav_border_top = #fff
16 
-!nav_border_bottom = #aaa
17 
-!nav_border_left = #ccc
18 
-!nav_border_right = #fff
19 
-
20 
-!page_border_sides = #ccc
21 
-!page_bg = #f0f0f0
22 
-
23 
-// Blog
24 
-!article_border = #eee
25 
-!blog_bg = #fff
26 
-
27 
-!footer_color = #999
28 
-!footer_bg = #444
29 
-
30 
-// Form Colors
31 
-!fieldset_bg = #ececec
32 
-!fieldset_border = #c3c3c3
33 
-
34 
-!textinput_color = #333
35 
-!textinput_bg = #f4f4f4
36 
-!textinput_bg_focus = #fefeee
37 
-
38 
-!textinput_border_top = #aaa
39 
-!textinput_border_bottom = #c6c6c6
40 
-!textinput_border_left = #c3c3c3
41 
-!textinput_border_right = #c3c3c3
42 
-!textinput_border_focus = #989898
43 
-
44 
-!cancel_link = #555
45 
-
46 
-// Button Colors
47 
-!default_button_text_color = #fff
48 
-!default_button_bg = yellow
49 
-!blue_btn = desaturate(adjust_hue(!default_button_bg, -16), 25)
50 1 
\ No newline at end of file
source/stylesheets/partials/main/_twitter.sass
History View file @ 145f810
51 2 
deleted file mode 100644
... ... 
@@ -1,2 +0,0 @@
1 
-#twitter
2 
-  font-size: 85%
3 1 
\ No newline at end of file
source/stylesheets/screen.sass
History View file @ 145f810
... ... 
@@ -1,3 +1,11 @@
1 
+/* SASS mixins */
1 2 
 @import library.sass
2 
-@import partials/base.sass
3 
-@import partials/main.sass
4 3 
\ No newline at end of file
4 
+
5 
+/* primary SASS */
6 
+@import base.sass
7 
+@import theme.sass
8 
+@import typography.sass
9 
+@import layout.sass
10 
+
11 
+/* specific SASS */
12 
+@import partials.sass
5 13 
\ No newline at end of file