Getting the project working again
Replace Twitter Bootstrap by Zurb Foundation Used @import in SCSS instad of require_tree for proper order and use of variables like $debian_color Moved old files out of the way (renamed them to xx*) Welcome controller (/) works Moved templates from ERB to SLIM format Fixed database settings Reduced routes to working ones Tidied up Gemfile Checked in experimental lab files Tried to find a good description for this massive commit :)
This commit is contained in:
parent
a7e05b2b78
commit
87f545414f
38 changed files with 3341 additions and 156 deletions
49
Gemfile.lock
49
Gemfile.lock
|
|
@ -1,11 +1,3 @@
|
|||
GIT
|
||||
remote: git://github.com/anjlab/bootstrap-rails.git
|
||||
revision: 3707d98b1f27bec87b1dd6de7129e3f52a72e413
|
||||
specs:
|
||||
anjlab-bootstrap-rails (3.0.2.0)
|
||||
railties (>= 3.0)
|
||||
sass (>= 3.2)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
|
|
@ -33,6 +25,7 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
ansi (1.4.3)
|
||||
arel (4.0.1)
|
||||
atomic (1.1.14)
|
||||
better_errors (1.0.1)
|
||||
|
|
@ -51,13 +44,14 @@ GEM
|
|||
execjs
|
||||
coffee-script-source (1.6.3)
|
||||
debug_inspector (0.0.2)
|
||||
elasticsearch-ruby (0.0.4)
|
||||
activesupport (>= 3.0.0)
|
||||
thrift
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
fancybox2-rails (0.2.5)
|
||||
railties (>= 3.1.0)
|
||||
foundation-rails (5.4.5.0)
|
||||
railties (>= 3.1.0)
|
||||
sass (>= 3.2.0)
|
||||
hashr (0.0.22)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.5)
|
||||
jbuilder (1.5.2)
|
||||
|
|
@ -70,7 +64,6 @@ GEM
|
|||
kaminari (0.14.1)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
libv8 (3.16.14.3)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
|
|
@ -104,7 +97,8 @@ GEM
|
|||
rake (10.1.0)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
ref (1.0.5)
|
||||
rest-client (1.6.7)
|
||||
mime-types (>= 1.16)
|
||||
sass (3.2.12)
|
||||
sass-rails (4.0.1)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
|
|
@ -113,6 +107,14 @@ GEM
|
|||
sdoc (0.3.20)
|
||||
json (>= 1.1.3)
|
||||
rdoc (~> 3.10)
|
||||
slim (2.0.2)
|
||||
temple (~> 0.6.6)
|
||||
tilt (>= 1.3.3, < 2.1)
|
||||
slim-rails (2.0.3)
|
||||
actionpack (>= 3.0, < 4.1)
|
||||
activesupport (>= 3.0, < 4.1)
|
||||
railties (>= 3.0, < 4.1)
|
||||
slim (~> 2.0)
|
||||
sprockets (2.10.0)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
|
|
@ -122,15 +124,19 @@ GEM
|
|||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
sqlite3 (1.3.8)
|
||||
therubyracer (0.12.0)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
temple (0.6.7)
|
||||
thor (0.18.1)
|
||||
thread_safe (0.1.3)
|
||||
atomic
|
||||
thrift (0.9.1)
|
||||
tilt (1.4.1)
|
||||
tire (0.6.1)
|
||||
activemodel (>= 3.0)
|
||||
activesupport
|
||||
ansi
|
||||
hashr (~> 0.0.19)
|
||||
multi_json (~> 1.3)
|
||||
rake
|
||||
rest-client (~> 1.6)
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
|
|
@ -143,12 +149,11 @@ PLATFORMS
|
|||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
anjlab-bootstrap-rails!
|
||||
better_errors
|
||||
binding_of_caller
|
||||
coffee-rails (~> 4.0.0)
|
||||
elasticsearch-ruby
|
||||
fancybox2-rails (~> 0.2.4)
|
||||
foundation-rails
|
||||
jbuilder (~> 1.2)
|
||||
jquery-rails
|
||||
kaminari
|
||||
|
|
@ -157,6 +162,6 @@ DEPENDENCIES
|
|||
rails (= 4.0.0)
|
||||
sass-rails (~> 4.0.0)
|
||||
sdoc
|
||||
sqlite3
|
||||
therubyracer
|
||||
slim-rails
|
||||
tire
|
||||
uglifier (>= 1.3.0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue