summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/application.scss6
-rw-r--r--core/lib/leap_web_core/dependencies.rb3
-rw-r--r--core/lib/leap_web_core/ui_dependencies.rb1
-rw-r--r--ui_dependencies.rb1
4 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index bb3b8bc..3e1b42c 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -3,6 +3,9 @@
//
@import "tail";
+// First import journal variables
+@import "bootswatch/cerulean/variables";
+
//
// import bootstrap.
//
@@ -19,6 +22,9 @@ table.table-hover tr:hover .btn {
}
@import "bootstrap-editable";
+// And finally bootswatch style itself
+@import "bootswatch/cerulean/bootswatch";
+
//
// import custom scss, content to be set in deployment.
//
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"
diff --git a/ui_dependencies.rb b/ui_dependencies.rb
index 2eb1e77..b24eef1 100644
--- a/ui_dependencies.rb
+++ b/ui_dependencies.rb
@@ -6,6 +6,7 @@ gem 'client_side_validations'
gem 'client_side_validations-simple_form'
gem 'kaminari', "0.13.0" # for pagination. trying 0.13.0 as there seem to be issues with 0.14.0 when using couchrest
gem 'bootstrap-editable-rails', "~>0.0.4"
+gem "bootswatch-rails", "~> 0.5.0"
group :assets do
gem "haml-rails", "~> 0.3.4"