diff --git a/Gemfile b/Gemfile index 9a105bd..9be37ab 100644 --- a/Gemfile +++ b/Gemfile @@ -39,6 +39,7 @@ gem 'globalize', '~> 4.0.2' gem 'bootstrap-sass' gem 'bootstrap-sass-extras' +gem 'bootswatch-rails' gem 'autoprefixer-rails' group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 97a2743..f563267 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,6 +44,8 @@ GEM sass (~> 3.2) bootstrap-sass-extras (0.0.6) rails (>= 3.1.0) + bootswatch-rails (3.2.4) + railties (>= 3.1) builder (3.2.2) capistrano (3.2.1) i18n @@ -270,6 +272,7 @@ DEPENDENCIES autoprefixer-rails bootstrap-sass bootstrap-sass-extras + bootswatch-rails capistrano capistrano-rails capistrano-rvm diff --git a/app/assets/stylesheets/management/application.css.scss b/app/assets/stylesheets/management/application.css.scss index 2721681..9539166 100644 --- a/app/assets/stylesheets/management/application.css.scss +++ b/app/assets/stylesheets/management/application.css.scss @@ -1,5 +1,6 @@ //= require_directory . @import "bootstrap-sprockets"; +@import "bootswatch/simplex/variables"; @import "bootstrap"; -@import "bootstrap/theme"; +@import "bootswatch/simplex/bootswatch"; diff --git a/app/views/layouts/management.html.slim b/app/views/layouts/management.html.slim index be1a419..fee2c2c 100644 --- a/app/views/layouts/management.html.slim +++ b/app/views/layouts/management.html.slim @@ -5,7 +5,7 @@ html meta charset="utf-8" meta http-equiv="X-UA-Compatible" content="IE=edge" meta name="viewport" content="width=device-width, initial-scale=1" - title "Clarion" + title Clarion = stylesheet_link_tag "management/application" = csrf_meta_tags body