diff options
| author | Azul <azul@leap.se> | 2013-06-20 12:25:30 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-06-20 12:25:30 +0200 |
| commit | f1d53b81bfcd9803d73b26ee025160b60f1965c6 (patch) | |
| tree | 6e501d5979965acf31e3411442d4240bf148a362 /core/lib | |
| parent | 15d48c24e529e2f944b026749c5eb35eb4c5cfa7 (diff) | |
| parent | 7b00ff01d24c968485785a71fba1501b16133ca4 (diff) | |
Merge remote-tracking branch 'origin/feature/bootswatch' into master
Diffstat (limited to 'core/lib')
| -rw-r--r-- | core/lib/leap_web_core/dependencies.rb | 3 | ||||
| -rw-r--r-- | core/lib/leap_web_core/ui_dependencies.rb | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/lib/leap_web_core/dependencies.rb b/core/lib/leap_web_core/dependencies.rb index 7f6ca87..e4a8807 100644 --- a/core/lib/leap_web_core/dependencies.rb +++ b/core/lib/leap_web_core/dependencies.rb @@ -11,7 +11,8 @@ module LeapWebCore "haml" => "~> 3.1.7", "bootstrap-sass" => "~> 2.0.4", "jquery-rails" => nil, - "simple_form" => nil + "simple_form" => nil, + "bootswatch-rails", "~> 0.5.0" } def self.require_ui_gems diff --git a/core/lib/leap_web_core/ui_dependencies.rb b/core/lib/leap_web_core/ui_dependencies.rb index e0a0b86..c2fc8cf 100644 --- a/core/lib/leap_web_core/ui_dependencies.rb +++ b/core/lib/leap_web_core/ui_dependencies.rb @@ -2,6 +2,7 @@ require "haml" require "bootstrap-sass" require "jquery-rails" require "simple_form" +require "bootswatch-rails" if Rails.env == "development" require "haml-rails" |