Permalink
Browse files

Updat jekyll and dependecies. Spiff for contributions by others.

  • Loading branch information...
1 parent bdb7493 commit 813002fc3827aea563804702f6743553e511f4d3 @rwdaigle rwdaigle committed Dec 29, 2010
View
@@ -1,4 +1,6 @@
+.bundle
site
.sass-cache
test
source/_stash
+.DS_Store
View
1 .rvmrc
@@ -0,0 +1 @@
+rvm --create ree-1.8.7-2010.02@edgerails > /dev/null
View
11 Gemfile
@@ -0,0 +1,11 @@
+source 'http://rubygems.org'
+
+gem 'activesupport', "2.3.5"
+gem 'jekyll', :git => "https://github.com/henrik/jekyll.git"
+gem 'compass'
+gem 'compass-colors'
+gem 'rdiscount'
+gem 'fssm'
+gem 'serve'
+gem 'mongrel'
+gem 'rake'
View
@@ -0,0 +1,61 @@
+GIT
+ remote: https://github.com/henrik/jekyll.git
+ revision: b6bbb99894fbd27f41a50ca4ef4a5e78ed54872c
+ specs:
+ jekyll (0.5.2)
+ RedCloth (>= 4.0.4)
+ classifier (>= 1.3.1)
+ directory_watcher (>= 1.1.1)
+ liquid (>= 1.9.0)
+ maruku (>= 0.5.9)
+ open4 (>= 0.9.6)
+
+GEM
+ remote: http://rubygems.org/
+ specs:
+ RedCloth (4.2.3)
+ activesupport (2.3.5)
+ cgi_multipart_eof_fix (2.5.0)
+ classifier (1.3.3)
+ fast-stemmer (>= 1.0.0)
+ compass (0.10.6)
+ haml (>= 3.0.4)
+ compass-colors (0.3.1)
+ compass (>= 0.8.7)
+ daemons (1.1.0)
+ directory_watcher (1.3.2)
+ fast-stemmer (1.0.0)
+ fastthread (1.0.7)
+ fssm (0.2.3)
+ gem_plugin (0.2.3)
+ haml (3.0.25)
+ liquid (2.2.2)
+ maruku (0.6.0)
+ syntax (>= 1.0.0)
+ mongrel (1.1.5)
+ cgi_multipart_eof_fix (>= 2.4)
+ daemons (>= 1.0.3)
+ fastthread (>= 1.0.1)
+ gem_plugin (>= 0.2.3)
+ open4 (1.0.1)
+ rack (1.2.1)
+ rake (0.8.7)
+ rdiscount (1.6.5)
+ serve (0.11.7)
+ activesupport (>= 2.3.5)
+ rack (>= 1.2.1)
+ syntax (1.0.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ activesupport (= 2.3.5)
+ compass
+ compass-colors
+ fssm
+ jekyll!
+ mongrel
+ rake
+ rdiscount
+ serve
View
@@ -1,72 +0,0 @@
-# What is Octopress?
-Octopress gives developers a well designed starting point for a Jekyll blog. It's easy to configure and easy to deploy. Sweet huh?
-
-#### Octopress comes with
-1. A nice, easy to configure theme that focuses on readability.
-2. Built in support for Twitter, Delicious, Disqus Comments, Google Analytics, and Custom Search.
-3. Rake tasks that make development fast, and deploying easy.
-
-## Why?
-1. Building a Jekyll blog from scratch is a lot of work.
-2. Jekyll doesn't have default layouts or themes.
-3. Most developers don't want to do design.
-
-## Octopress is made of
-- [Jekyll](http://github.com/henrik/jekyll) a blog aware static site generator (Henrik's fork adds [HAML](http://haml-lang.com) support)
-- [Compass](http://compass-style.org) an awesome [SASS](http://sass-lang.com) framework
-- [FSSM](http://github.com/ttilley/fssm/tree/master) + a rake task, automatically regenerates the blog as you work
-- [Serve](http://github.com/jlong/serve) for live previews of the site while in development
-- [Rsync](http://samba.anu.edu.au/rsync/) for easy deployment
-
-## Setup
-Setup is really simple.
-
-1. Download Octopress: <code>git clone git://github.com/imathis/octopress.git</code>
-2. Install required gems:
- sudo gem install henrik-jekyll
- sudo gem install compass
- sudo gem install fssm
- sudo gem install serve
-3. Run <code>rake preview</code> to build the site and preview it in a local webserver.
-
-You'll want to change some settings, so check out the wiki for [Setup & Configurations](http://wiki.github.com/imathis/octopress/setup-configuration).
-
-## Usage
-Octopress is almost like a front-end for Jekyll. It provides some really handy rake tasks and automation to make blogging as simple as possible. With Octopress you can:
-
-- Preview the site locally with the power of Serve.
-- Automatically regenerate your blog while you work.
-- Generate and deploy with a single command.
-
-See the wiki to learn more about [Usage](http://wiki.github.com/imathis/octopress/usage).
-
-## Third Party Integration
-With search, comments, and analytics, you have no need for a database. This is what makes a statically generated blog possible.
-
-- Twitter
-- Disqus Comments
-- Google Custom Search
-- Google Analytics
-- Delicious Bookmarks
-
-If you already have an account with these services, you can get set up within seconds. Check out the wiki for [Third Party Configuration](http://wiki.github.com/imathis/octopress/third-party-integration) details, and to learn how to setup or remove these services.
-
-## Octopress Style
-- Stylesheets use [SASS](http://sass-lang.com) and [Compass](http://compass-style.org)
-- They're broken up into Layout, Typography, Theme (colors), and Partials
-- Checkout [the wiki](http://wiki.github.com/imathis/octopress/style-customization) for help with customization.
-
-## License
-(The MIT License)
-
-Copyright © 2009 Brandon Mathis
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#### If you want to be awesome.
-- Proudly display the 'Powered by Octopress' credit in the footer.
-- Add your site to the wiki so we can watch the community grow.
View
@@ -0,0 +1,30 @@
+h1. EdgeRails.info
+
+By Ryan Daigle and many other contributors
+
+EdgeRails.info is a community site for keeping up with the latest features, changes and additions to the Ruby on Rails framework. What is contained in this repository is the source to the site (live at http://edgerails.info) that can be generated with Jekyll.
+
+h2. How to Make an Article Contribution
+
+h3. Install Source & Jekyll
+
+* Checkout the source: git clone git@github.com:rwdaigle/edgerails.git
+* Install dependencies: bundle install
+* Make sure you can generate the site: bundle exec rake generate
+
+h3. Write Article
+
+* Create new article template in the source/_posts directory: bundle exec rake post['my new post title']
+* Use existing articles as guide for proper CSS etc... and write your article
+
+h3. Regenerate the Site
+
+To ensure your article is being generated properly you will need to regenerate the site (perhaps several times)
+
+* Run: bundle exec rake generate
+* To view the site in the browser: bundle exec rake preview
+
+The site takes a VERY long time to regenerate given the number of articles. To reduce this when working on only a single article you can isolate the article you're working on (which will move all other articles to a temp directory).
+
+* To isolate a single article run: bundle exec rake isolate['my new post title']
+* When you're done editing the article and regenerating (but before committing), move the existing articles back into place: bundle exec rake integrate
View
@@ -1,5 +1,6 @@
-gem 'activesupport', "~> 2.3"
+# gem 'activesupport', "~> 2.3"
require 'active_support'
+require 'source/_helpers'
domain = "edgerails.info"
site_url = "http://#{domain}" # deployed site url for sitemap.xml generator
@@ -93,7 +94,7 @@ end
desc "Generate styles only"
task :generate_style do
puts ">>> Generating styles <<<"
- system "compass"
+ system "compass compile"
end
desc "Generate site files only"
@@ -5,6 +5,7 @@
%meta(name="description" content="#{page.description}")/
- if page.respond_to? :keywords
%meta(name="keywords" content="#{page.keywords}")/
+ %meta(http-equiv="Content-Type" content="text/html; charset=utf-8")
%meta(name="google-site-verification" content="2mKA7BQdzoMID17KsbMUeJRDNiJ014GEDJ5f1XTyKVg")
%link(href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css")
View
@@ -4,7 +4,7 @@ title: Articles
nav: articles
---
.blog
- - site.posts.sort_by(&:date).reverse[0..9].each_with_index do |post,index|
+ - site.posts.sort_by(&:date).reverse[0..5].each_with_index do |post,index|
.article
%h2= link_to(post.title, post.url, {:class=>"title"})
.meta
View
@@ -1,3 +1,4 @@
//compass default reset
+global-reset
-@import compass/utilities.sass
+
+@import compass/utilities
View
@@ -1,31 +1,33 @@
-!page_pad = 15px
-!sidebar_margin = 20px
-!sidebar_width = 350px
-!pad = 15px
-!default_border_radius = 4px
+$page_pad: 15px
+$sidebar_margin: 20px
+$sidebar_width: 350px
+$pad: 15px
+$default_border_radius: 4px
html body
- background-color: !body_bg
- color= !body_color
+ background-color: $body_bg
+ color: $body_color
max-width: 1260px
margin: 0 auto
background-image: url("/images/top.png")
background-repeat: repeat-x
background-position: 0 -30px
padding: 0 60px
a
- color: #{!link_color}
+ color: #{$link_color}
&:hover, &:focus
- color: #{saturate(darken(!link_color, 15), 20)}
+ color: #{saturate(darken($link_color, 15), 20)}
&:visited
- color: #{darken(adjust_hue(!link_color, 70), 10)}
+ color: #{darken(adjust_hue($link_color, 70), 10)}
#page, #nav, #footer, #header
min-width: 990px
+
#page
.page_width
width: auto
- padding-right: #{!sidebar_width}
+ padding-right: #{$sidebar_width}
+
#main
padding-top: 20px
float: left
@@ -35,8 +37,8 @@ html body
#sidebar
float: left
- width: #{!sidebar_width - 2}
+ width: #{$sidebar_width - 2}
margin-right: -100%
padding: 20px 0 15px
.contents
- padding: 0 15px
+ padding: 0 15px
@@ -4,4 +4,4 @@
@import library/typography.sass
@import library/link_colors.sass
@import library/gradient.sass
-@import library/button_style.sass
+@import library/button_style.sass
View
@@ -1,48 +1,50 @@
// Link Colors
-!link_color = lighten(#165B94, .30)
+$link_color: lighten(#165b94, 0.3)
+
// Base Colors
-!darkgray = #303030
+$darkgray: #303030
+
// Main Section Colors
-!body_color = #333
-!light_text = #999
-!body_bg = #fff
-!body_border_top = #222
-
-!header_bg = #fff
-!header_border_top = #C1272D
-!title_color = #ddd
-
-!nav_color = #ccc
-!nav_color_hover = #fff
-!nav_color_here = #fff
-!nav_bg = !darkgray
-!nav_border_top = #fff
-!nav_border_bottom = #aaa
-!nav_border_left = #484848
-!nav_border_right = #1c1c1c
-
-!page_border_sides = #ccc
-!page_bg = #fff
-
-// Blog
-!article_border = #eee
-!blog_bg = #fff
-
-!footer_color = #999
-!footer_bg = !darkgray
+$body_color: #333333
+$light_text: #999999
+$body_bg: white
+$body_border_top: #222222
+
+$header_bg: white
+$header_border_top: #c1272d
+$title_color: #dddddd
+
+$nav_color: #cccccc
+$nav_color_hover: white
+$nav_color_here: white
+$nav_bg: $darkgray
+$nav_border_top: white
+$nav_border_bottom: #aaaaaa
+$nav_border_left: #484848
+$nav_border_right: #1c1c1c
+
+$page_border_sides: #cccccc
+$page_bg: white
+
+// Blog
+$article_border: #eeeeee
+$blog_bg: white
+
+$footer_color: #999999
+$footer_bg: $darkgray
// Form Colors
-!fieldset_bg = #ececec
-!fieldset_border = #c3c3c3
+$fieldset_bg: #ececec
+$fieldset_border: #c3c3c3
-!textinput_color = #333
-!textinput_bg = #f4f4f4
-!textinput_bg_focus = #fefeee
+$textinput_color: #333333
+$textinput_bg: #f4f4f4
+$textinput_bg_focus: #fefeee
-!textinput_border_top = #aaa
-!textinput_border_bottom = #c6c6c6
-!textinput_border_left = #c3c3c3
-!textinput_border_right = #c3c3c3
-!textinput_border_focus = #989898
+$textinput_border_top: #aaaaaa
+$textinput_border_bottom: #c6c6c6
+$textinput_border_left: #c3c3c3
+$textinput_border_right: #c3c3c3
+$textinput_border_focus: #989898
-!twitter_topic = #888
+$twitter_topic: #888888
Oops, something went wrong.

0 comments on commit 813002f

Please sign in to comment.