Gemfile.locl
This commit is contained in:
commit
27809a19de
2
.gitignore
vendored
2
.gitignore
vendored
@ -26,3 +26,5 @@ attic
|
|||||||
devbin
|
devbin
|
||||||
.rvmrc
|
.rvmrc
|
||||||
*.rbc
|
*.rbc
|
||||||
|
vendor/ruby
|
||||||
|
vendor
|
||||||
|
7
Gemfile
7
Gemfile
@ -7,7 +7,8 @@ gem "rspec", "~>2.0.0"
|
|||||||
gem "rails", "~>3.0.0.rc"
|
gem "rails", "~>3.0.0.rc"
|
||||||
gem "compass-validator", "3.0.0"
|
gem "compass-validator", "3.0.0"
|
||||||
gem "css_parser", "~> 1.0.1"
|
gem "css_parser", "~> 1.0.1"
|
||||||
#gem "sass", "~> 3.1.1"
|
gem "sass", "3.1"
|
||||||
|
gem "haml", "~> 3.1"
|
||||||
gem "rcov"
|
gem "rcov"
|
||||||
gem "rubyzip"
|
gem "rubyzip"
|
||||||
gem "livereload"
|
gem "livereload"
|
||||||
@ -15,14 +16,16 @@ gem "rb-fsevent" if RUBY_PLATFORM =~ /darwin/
|
|||||||
|
|
||||||
gem "ruby-prof" unless RUBY_PLATFORM == "java"
|
gem "ruby-prof" unless RUBY_PLATFORM == "java"
|
||||||
|
|
||||||
|
|
||||||
gem 'autotest'
|
gem 'autotest'
|
||||||
gem 'autotest-fsevent' if RUBY_PLATFORM =~ /darwin/
|
gem 'autotest-fsevent' if RUBY_PLATFORM =~ /darwin/
|
||||||
gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git'
|
gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git'
|
||||||
gem 'mocha'
|
gem 'mocha'
|
||||||
gem 'timecop'
|
gem 'timecop'
|
||||||
|
<<<<<<< HEAD
|
||||||
gem 'diff-lcs', '~> 1.1.2'
|
gem 'diff-lcs', '~> 1.1.2'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> f3ea546150ded6fb0ee1ca91cde4c0349f088ddd
|
||||||
|
12
Gemfile.lock
12
Gemfile.lock
@ -119,7 +119,11 @@ GEM
|
|||||||
ruby-json (1.1.2)
|
ruby-json (1.1.2)
|
||||||
ruby-prof (0.10.5)
|
ruby-prof (0.10.5)
|
||||||
rubyzip (0.9.4)
|
rubyzip (0.9.4)
|
||||||
|
<<<<<<< HEAD
|
||||||
sass (3.1.1)
|
sass (3.1.1)
|
||||||
|
=======
|
||||||
|
sass (3.1.0)
|
||||||
|
>>>>>>> f3ea546150ded6fb0ee1ca91cde4c0349f088ddd
|
||||||
sys-uname (0.8.5)
|
sys-uname (0.8.5)
|
||||||
term-ansicolor (1.0.5)
|
term-ansicolor (1.0.5)
|
||||||
thor (0.14.6)
|
thor (0.14.6)
|
||||||
@ -140,6 +144,10 @@ DEPENDENCIES
|
|||||||
cucumber (~> 0.9.2)
|
cucumber (~> 0.9.2)
|
||||||
diff-lcs (~> 1.1.2)
|
diff-lcs (~> 1.1.2)
|
||||||
fakefs!
|
fakefs!
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
haml (~> 3.1)
|
||||||
|
>>>>>>> f3ea546150ded6fb0ee1ca91cde4c0349f088ddd
|
||||||
livereload
|
livereload
|
||||||
mocha
|
mocha
|
||||||
rails (~> 3.0.0.rc)
|
rails (~> 3.0.0.rc)
|
||||||
@ -148,4 +156,8 @@ DEPENDENCIES
|
|||||||
rspec (~> 2.0.0)
|
rspec (~> 2.0.0)
|
||||||
ruby-prof
|
ruby-prof
|
||||||
rubyzip
|
rubyzip
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
sass (= 3.1)
|
||||||
|
>>>>>>> f3ea546150ded6fb0ee1ca91cde4c0349f088ddd
|
||||||
timecop
|
timecop
|
||||||
|
1
doc-src/.gitignore
vendored
1
doc-src/.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
bin
|
bin
|
||||||
vendor
|
vendor
|
||||||
output
|
output
|
||||||
|
vendor/ruby
|
||||||
|
@ -8,8 +8,8 @@ gem 'mime-types'
|
|||||||
gem 'serve', "1.0.0"
|
gem 'serve', "1.0.0"
|
||||||
gem 'nokogiri'
|
gem 'nokogiri'
|
||||||
gem 'coderay'
|
gem 'coderay'
|
||||||
gem 'sass', ">= 3.1.0.alpha.249"
|
gem 'sass', ">= 3.1"
|
||||||
gem 'haml', ">= 3.1.0.alpha.36"
|
gem 'haml', ">= 3.1"
|
||||||
gem 'rake'
|
gem 'rake'
|
||||||
gem 'compass', :path => ".."
|
gem 'compass', :path => ".."
|
||||||
gem 'compass-susy-plugin', ">=0.7.0.pre8"
|
gem 'compass-susy-plugin', ">=0.7.0.pre8"
|
||||||
|
@ -8,7 +8,7 @@ GIT
|
|||||||
PATH
|
PATH
|
||||||
remote: ..
|
remote: ..
|
||||||
specs:
|
specs:
|
||||||
compass (0.11.1.63cae60)
|
compass (0.11.1.26f44fd)
|
||||||
chunky_png (~> 1.1)
|
chunky_png (~> 1.1)
|
||||||
fssm (>= 0.2.7)
|
fssm (>= 0.2.7)
|
||||||
sass (~> 3.1)
|
sass (~> 3.1)
|
||||||
@ -54,7 +54,7 @@ DEPENDENCIES
|
|||||||
compass-susy-plugin (>= 0.7.0.pre8)
|
compass-susy-plugin (>= 0.7.0.pre8)
|
||||||
css-slideshow (= 0.2.0)
|
css-slideshow (= 0.2.0)
|
||||||
css_parser (= 1.0.1)
|
css_parser (= 1.0.1)
|
||||||
haml (>= 3.1.0.alpha.36)
|
haml (>= 3.1)
|
||||||
json
|
json
|
||||||
mime-types
|
mime-types
|
||||||
nanoc3!
|
nanoc3!
|
||||||
@ -64,6 +64,6 @@ DEPENDENCIES
|
|||||||
rb-fsevent
|
rb-fsevent
|
||||||
rdiscount
|
rdiscount
|
||||||
ruby-prof
|
ruby-prof
|
||||||
sass (>= 3.1.0.alpha.249)
|
sass (>= 3.1)
|
||||||
serve (= 1.0.0)
|
serve (= 1.0.0)
|
||||||
thor
|
thor
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 13 KiB |
4
doc-src/content/reference.haml
Normal file
4
doc-src/content/reference.haml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
title: Compass Documentation
|
||||||
|
redirect: /reference/compass/
|
||||||
|
---
|
@ -12,7 +12,7 @@
|
|||||||
Version:
|
Version:
|
||||||
%a.number(href="/CHANGELOG/")= compass_version
|
%a.number(href="/CHANGELOG/")= compass_version
|
||||||
%article= yield
|
%article= yield
|
||||||
-#comments= render "partials/disqus_comments"
|
-comments= render "partials/disqus_comments"
|
||||||
%footer(role="contentinfo")= render "partials/footer"
|
%footer(role="contentinfo")= render "partials/footer"
|
||||||
= @item[:content_for_javascripts]
|
= @item[:content_for_javascripts]
|
||||||
= render "partials/analytics"
|
= render "partials/analytics"
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
Version:
|
Version:
|
||||||
%a.number(href="/CHANGELOG/")= compass_version
|
%a.number(href="/CHANGELOG/")= compass_version
|
||||||
%article= yield
|
%article= yield
|
||||||
-#comments= render "partials/disqus_comments"
|
-comments= render "partials/disqus_comments"
|
||||||
%footer(role="contentinfo")= render "partials/footer"
|
%footer(role="contentinfo")= render "partials/footer"
|
||||||
= @item[:content_for_javascripts]
|
= @item[:content_for_javascripts]
|
||||||
= render "partials/analytics"
|
= render "partials/analytics"
|
||||||
|
5
doc-src/layouts/redirect.haml
Normal file
5
doc-src/layouts/redirect.haml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
!!!5
|
||||||
|
- # This template redirects.
|
||||||
|
%html{:dir => "ltr", :lang => "en"}
|
||||||
|
%head
|
||||||
|
%meta{:"http-equiv" => "refresh", :content => "0;#{@item[:redirect]}"}/
|
Loading…
Reference in New Issue
Block a user