Skip to content

Commit

Permalink
move to sass from less
Browse files Browse the repository at this point in the history
  • Loading branch information
@JuddL333
JuddL333 committed Jun 29, 2013
1 parent 6c10fcd commit d9d07b5
Show file tree
Hide file tree
Showing 20 changed files with 279 additions and 178 deletions.
6 changes: 4 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ gem 'twitter'
gem 'twitter-text'
gem 'tweetstream', '~> 1.0'
gem 'foreman'
gem 'twitter-bootstrap-rails'
gem 'therubyracer'
gem 'bootstrap-sass', '~> 2.3.0.1'
gem 'font-awesome-rails'
gem 'will_paginate'
gem 'bootstrap-will_paginate'
gem 'sidekiq', '~> 2.12.3'
Expand All @@ -25,11 +25,13 @@ gem 'unicorn'
gem 'simple_form'
gem 'bootstrap-datetimepicker-rails'
gem "less-rails"
gem 'therubyracer'

group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'uglifier', '>= 1.0.3'
gem "compass-rails"
end

gem 'jquery-rails'
Expand Down
195 changes: 102 additions & 93 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ GEM
activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
airbrake (3.1.12)
activesupport
builder
Expand All @@ -40,6 +39,8 @@ GEM
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-datetimepicker-rails (0.0.11)
bootstrap-sass (2.3.0.1)
sass (~> 3.2)
bootstrap-will_paginate (0.0.9)
will_paginate
builder (3.0.4)
Expand All @@ -51,121 +52,135 @@ GEM
net-ssh-gateway (>= 1.1.0)
capistrano-unicorn (0.1.9)
capistrano
capybara (2.0.2)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 1.0.0)
xpath (~> 2.0)
celluloid (0.14.1)
timers (>= 1.0.0)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
coderay (1.0.8)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.2.8)
coderay (1.0.9)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.4.0)
coffee-script-source (1.6.2)
commonjs (0.2.6)
compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)
connection_pool (1.1.0)
daemons (1.1.9)
database_cleaner (0.9.1)
database_cleaner (1.0.1)
debug_inspector (0.0.2)
diff-lcs (1.1.3)
diff-lcs (1.2.4)
dotenv (0.8.0)
dotenv-rails (0.8.0)
dotenv (= 0.8.0)
erubis (2.7.0)
eventmachine (1.0.0)
eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.1.0)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.1.0)
factory_girl (~> 4.1.0)
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
faraday (0.8.4)
faraday (0.8.7)
multipart-post (~> 1.1)
ffi (1.2.0)
foreman (0.60.2)
ffi (1.9.0)
font-awesome-rails (3.2.1.1)
railties (>= 3.2, < 5.0)
foreman (0.63.0)
dotenv (>= 0.7)
thor (>= 0.13.6)
formatador (0.2.4)
fssm (0.2.10)
growl (1.0.3)
guard (1.6.1)
listen (>= 0.6.0)
guard (1.8.1)
formatador (>= 0.2.4)
listen (>= 1.0.0)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
guard-rspec (2.3.3)
guard (>= 1.1)
rspec (~> 2.11)
guard-spork (1.4.0)
guard-rspec (3.0.2)
guard (>= 1.8)
rspec (~> 2.13)
guard-spork (1.5.1)
childprocess (>= 0.2.3)
guard (>= 1.1)
spork (>= 0.8.4)
hashie (1.2.0)
hashie (2.0.5)
highline (1.6.19)
hike (1.2.3)
http_parser.rb (0.5.3)
i18n (0.6.4)
journey (1.0.4)
jquery-rails (2.1.4)
jquery-rails (3.0.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.0)
kgio (2.7.4)
less (2.2.2)
kgio (2.8.0)
less (2.3.2)
commonjs (~> 0.2.6)
less-rails (2.2.6)
less-rails (2.3.3)
actionpack (>= 3.1)
less (~> 2.2.0)
less (~> 2.3.1)
libnotify (0.8.0)
ffi (>= 1.0.11)
libv8 (3.11.8.17)
libwebsocket (0.1.7.1)
addressable
websocket
listen (0.7.0)
lumberjack (1.0.2)
listen (1.2.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
lumberjack (1.0.4)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
mime-types (1.21)
mime-types (1.23)
mini_portile (0.5.0)
multi_json (1.7.7)
multipart-post (1.1.5)
multipart-post (1.2.0)
net-scp (1.1.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.7)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
nokogiri (1.5.6)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
oauth (0.4.7)
omniauth (1.1.1)
hashie (~> 1.2)
omniauth (1.1.4)
hashie (>= 1.2, < 3)
rack
omniauth-oauth (1.0.1)
oauth
omniauth (~> 1.0)
omniauth-twitter (0.0.14)
omniauth-twitter (1.0.0)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
pg (0.15.1)
polyglot (0.3.3)
pry (0.9.10)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
slop (~> 3.4)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-protection (1.3.2)
rack-protection (1.5.0)
rack
rack-ssl (1.3.3)
rack
Expand All @@ -186,10 +201,12 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
raindrops (0.11.0)
rake (10.0.3)
rb-fsevent (0.9.3)
rb-inotify (0.8.8)
rb-inotify (0.9.0)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
Expand All @@ -199,38 +216,31 @@ GEM
ref (1.0.5)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.1)
rspec-rails (2.12.0)
rspec (2.13.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.1)
rspec-rails (2.13.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rubyzip (0.9.9)
sass (3.2.4)
sass-rails (3.2.5)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
sass (3.2.9)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.27.2)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
sextant (0.2.2)
activesupport (>= 3.2)
sextant (0.2.4)
rails (>= 3.2)
shoulda-matchers (1.1.0)
shoulda-matchers (2.2.0)
activesupport (>= 3.0.0)
sidekiq (2.12.3)
sidekiq (2.12.4)
celluloid (>= 0.14.1)
connection_pool (>= 1.0.0)
json
Expand All @@ -240,28 +250,28 @@ GEM
actionpack (~> 3.0)
activemodel (~> 3.0)
simple_oauth (0.1.9)
sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
sinatra (1.4.3)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
slim (2.0.0)
temple (~> 0.6.5)
tilt (~> 1.3, >= 1.3.3)
slim (1.3.5)
temple (~> 0.5.5)
tilt (~> 1.3.3)
slop (3.3.3)
slop (3.4.5)
spork (0.9.2)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
temple (0.5.5)
temple (0.6.5)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
thor (0.18.1)
tilt (1.3.7)
tilt (1.4.1)
timers (1.1.0)
treetop (1.4.12)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
tweetstream (1.1.5)
Expand All @@ -272,28 +282,25 @@ GEM
faraday (~> 0.8)
multi_json (~> 1.3)
simple_oauth (~> 0.1.6)
twitter-bootstrap-rails (2.2.7)
actionpack (>= 3.1)
execjs
rails (>= 3.1)
railties (>= 3.1)
twitter-stream (0.1.16)
eventmachine (>= 0.12.8)
http_parser.rb (~> 0.5.1)
simple_oauth (~> 0.1.4)
twitter-text (1.5.0)
activesupport
tzinfo (0.3.35)
uglifier (1.3.0)
twitter-text (1.6.1)
unf (~> 0.0.5)
tzinfo (0.3.37)
uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
unicorn (4.5.0)
unf (0.0.5)
unf_ext
unf_ext (0.0.6)
unicorn (4.6.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
websocket (1.0.6)
will_paginate (3.0.3)
xpath (1.0.0)
will_paginate (3.0.4)
xpath (2.0.0)
nokogiri (~> 1.3)

PLATFORMS
Expand All @@ -304,14 +311,17 @@ DEPENDENCIES
better_errors
binding_of_caller
bootstrap-datetimepicker-rails
bootstrap-sass (~> 2.3.0.1)
bootstrap-will_paginate
capistrano
capistrano-unicorn
capybara
coffee-rails (~> 3.2.1)
compass-rails
database_cleaner
dotenv-rails (= 0.8.0)
factory_girl_rails
font-awesome-rails
foreman
growl
guard-rspec
Expand All @@ -337,7 +347,6 @@ DEPENDENCIES
therubyracer
tweetstream (~> 1.0)
twitter
twitter-bootstrap-rails
twitter-text
uglifier (>= 1.0.3)
unicorn
Expand Down
Loading

0 comments on commit d9d07b5

Please sign in to comment.