Update pages to master with merged omega and nth-omega #53

Merged
merged 5 commits into from Jan 9, 2013

Projects

None yet

2 participants

@treppo
treppo commented Jan 6, 2013

Update scss files and use the new omega(4n) instead of nth-omega(4n) for the examples.
Plus: Update copyright year and remove whitespace and trailing /in Rakefile

@treppo treppo referenced this pull request Jan 6, 2013
Merged

Update copyright year to 2013 #52

@kaishin kaishin and 1 other commented on an outdated diff Jan 7, 2013
@@ -86,5 +86,5 @@
</section>
-<footer2012 thoughtbot, inc.</footer>
+<footer2013 thoughtbot, inc.</footer>
@kaishin
kaishin Jan 7, 2013

Let's go for 2012 - {{ site.time | date: '%Y' }} instead.

@treppo
treppo Jan 7, 2013

OK, I will update it.

@kaishin kaishin commented on an outdated diff Jan 7, 2013
@@ -13,7 +13,7 @@ task :default => [:watch]
desc "Watch the site and regenerate when it changes"
task :watch do
puts "Starting to watch source with Jekyll and Sass..."
-
+
system "sass --update _sass:css/ -f -l -r ./_sass/bourbon/lib/bourbon.rb"
@kaishin
kaishin Jan 7, 2013

The trailing slash should be removed here as well.

@kaishin kaishin commented on an outdated diff Jan 7, 2013
@@ -13,7 +13,7 @@ task :default => [:watch]
desc "Watch the site and regenerate when it changes"
task :watch do
puts "Starting to watch source with Jekyll and Sass..."
-
+
system "sass --update _sass:css/ -f -l -r ./_sass/bourbon/lib/bourbon.rb"
jekyllPid = Process.spawn("jekyll --auto --server --pygments")
sassPid = Process.spawn("sass --watch _sass:css/ -l -r ./_sass/bourbon/lib/bourbon.rb")
@kaishin
kaishin commented Jan 7, 2013

Looking good other than the inline comments 👍

Christian Tr... added some commits Jan 7, 2013
@kaishin kaishin merged commit ff6773c into thoughtbot:gh-pages Jan 9, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment