Permalink
Browse files

merge from ywjno/code_campo

  • Loading branch information...
2 parents a7e0eff + 5e869eb commit 502acc306cd5ace460851e2947df63b8f59bf97b @chloerei committed Sep 4, 2012
View
@@ -9,7 +9,7 @@ gem 'bcrypt-ruby'
gem 'mongoid'
gem 'bson_ext'
gem 'haml'
-gem 'twitter-bootstrap-rails'
+gem 'anjlab-bootstrap-rails', '>= 2.1', :require => 'bootstrap-rails'
gem 'client_side_validations', :git => 'git://github.com/bcardarella/client_side_validations.git'
gem 'client_side_validations-mongoid'
gem 'kaminari'
@@ -28,7 +28,6 @@ group :assets do
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
- gem 'therubyracer'
end
gem 'whenever', :require => false
View
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/bcardarella/client_side_validations.git
- revision: efef76fc27838ccbdcdfb1b07a8a66b3cae978f3
+ revision: 2a4d5f431378b15d741687c5fc6691b630736528
specs:
client_side_validations (3.2.0.beta.6)
@@ -34,13 +34,16 @@ GEM
activesupport (3.2.7)
i18n (~> 0.6)
multi_json (~> 1.0)
+ anjlab-bootstrap-rails (2.1.0.5)
+ railties (>= 3.0)
+ sass (>= 3.2)
arel (3.0.2)
- bcrypt-ruby (3.0.1)
- bson (1.6.4)
- bson_ext (1.6.4)
- bson (~> 1.6.4)
+ bcrypt-ruby (3.0.1-x86-mingw32)
+ bson (1.7.0)
+ bson_ext (1.7.0)
+ bson (~> 1.7.0)
builder (3.0.0)
- capistrano (2.12.0)
+ capistrano (2.13.3)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -57,7 +60,6 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
- commonjs (0.2.6)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
@@ -67,35 +69,28 @@ GEM
factory_girl (~> 4.0.0)
railties (>= 3.0.0)
gravtastic (3.2.6)
- haml (3.1.6)
+ haml (3.1.7)
highlight_js-rails (7.1.0)
rails (>= 3.1.1)
- highline (1.6.13)
+ highline (1.6.14)
hike (1.2.1)
http_accept_language (1.0.2)
- i18n (0.6.0)
+ i18n (0.6.1)
journey (1.0.4)
- jquery-rails (2.0.2)
- railties (>= 3.2.0, < 5.0)
+ jquery-rails (2.1.1)
+ railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
- json (1.7.4)
- kaminari (0.13.0)
+ json (1.7.5)
+ kaminari (0.14.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- railties (>= 3.0.0)
- less (2.2.1)
- commonjs (~> 0.2.6)
- less-rails (2.2.3)
- actionpack (>= 3.1)
- less (~> 2.2.0)
- libv8 (3.3.10.4)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- mongo (1.6.2)
- bson (~> 1.6.2)
+ mongo (1.3.1)
+ bson (>= 1.3.1)
mongoid (2.4.12)
activemodel (~> 3.1)
mongo (<= 1.6.2)
@@ -142,9 +137,9 @@ GEM
rdoc (3.12)
json (~> 1.4)
redcarpet (2.1.1)
- rvm-capistrano (1.2.5)
+ rvm-capistrano (1.2.6)
capistrano (>= 2.0.0)
- sass (3.1.20)
+ sass (3.2.1)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -153,32 +148,26 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- therubyracer (0.10.1)
- libv8 (~> 3.3.10)
thor (0.16.0)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- twitter-bootstrap-rails (2.1.1)
- actionpack (>= 3.1)
- less-rails (~> 2.2.2)
- railties (>= 3.1)
- therubyracer (= 0.10.1)
tzinfo (0.3.33)
- uglifier (1.2.7)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (~> 1.3)
+ multi_json (~> 1.0, >= 1.0.2)
whenever (0.7.3)
activesupport (>= 2.3.4)
chronic (~> 0.6.3)
wmd-rails (0.0.7)
rails (>= 3.1.1)
PLATFORMS
- ruby
+ x86-mingw32
DEPENDENCIES
+ anjlab-bootstrap-rails (>= 2.1)
bcrypt-ruby
bson_ext
capistrano
@@ -200,8 +189,6 @@ DEPENDENCIES
redcarpet
rvm-capistrano
sass-rails
- therubyracer
- twitter-bootstrap-rails
uglifier
whenever
wmd-rails
View
@@ -7,6 +7,7 @@ It's the source of http://codecampo.com , a light weight bbs for developer.
* ruby 1.9.3
* rails 3.2.3
* mongodb 1.8+
+* nodejs (option for linux)
## Setup
@@ -1,17 +0,0 @@
-@import "twitter/bootstrap/bootstrap";
-@import "twitter/bootstrap/responsive";
-
-// Set the correct sprite paths
-@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
-@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
-
-// Your custom LESS stylesheets goes here
-//
-// Since bootstrap was imported above you have access to its mixins which
-// you may use and inherit here
-//
-// If you'd like to override bootstrap's own variables, you can do so here as well
-// See http://twitter.github.com/bootstrap/less.html for their names and documentation
-//
-// Example:
-// @linkColor: #ff0000;
@@ -0,0 +1,6 @@
+@import "twitter/bootstrap";
+@import "twitter/bootstrap-responsive";
+
+// Set the correct sprite paths
+$iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png', image);
+$iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png', image);

0 comments on commit 502acc3

Please sign in to comment.