diff --git a/Gemfile b/Gemfile index f659a0724..7ee724d73 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ ruby '2.3.1' gem 'pg', '~> 0.18.4' gem 'rails', '4.2.6' -gem 'scrivito', '~> 1.3.0.rc1' +gem 'scrivito', '~> 1.3.0' gem 'scrivito_section_widgets', '1.0.0' gem 'scrivito_teaser_widget', '0.1.1' @@ -13,6 +13,8 @@ gem 'coffee-rails', '~> 4.1.0' gem 'jbuilder', '~> 2.0' gem 'jquery-rails' +gem "bootstrap-sass", "~> 3.3.5" +gem 'bootstrap-material-design' gem 'sass-rails', '~> 5.0' gem 'sdoc', '~> 0.4.0', group: :doc gem 'uglifier', '>= 1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index c678a5780..488e09061 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,8 +38,15 @@ GEM tzinfo (~> 1.1) addressable (2.4.0) arel (6.0.3) + autoprefixer-rails (6.3.6) + execjs binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) + bootstrap-material-design (0.2.2) + bootstrap-sass (~> 3.0) + bootstrap-sass (3.3.6) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) builder (3.2.2) coffee-rails (4.1.1) coffee-script (>= 2.2.0) @@ -122,20 +129,20 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - scrivito (1.3.0.rc3) + scrivito (1.3.0) railties - scrivito_content_browser (= 1.3.0.rc3) - scrivito_editors (= 1.3.0.rc3) - scrivito_sdk (= 1.3.0.rc3) - scrivito_content_browser (1.3.0.rc3) + scrivito_content_browser (= 1.3.0) + scrivito_editors (= 1.3.0) + scrivito_sdk (= 1.3.0) + scrivito_content_browser (1.3.0) railties - scrivito_sdk (= 1.3.0.rc3) - scrivito_editors (1.3.0.rc3) + scrivito_sdk (= 1.3.0) + scrivito_editors (1.3.0) jquery-ui-rails (>= 5.0.0) railties - scrivito_content_browser (= 1.3.0.rc3) - scrivito_sdk (= 1.3.0.rc3) - scrivito_sdk (1.3.0.rc3) + scrivito_content_browser (= 1.3.0) + scrivito_sdk (= 1.3.0) + scrivito_sdk (1.3.0) addressable (~> 2.3) connection_pool (~> 2.2) diff-lcs (~> 1.2) @@ -182,13 +189,15 @@ PLATFORMS ruby DEPENDENCIES + bootstrap-material-design + bootstrap-sass (~> 3.3.5) coffee-rails (~> 4.1.0) jbuilder (~> 2.0) jquery-rails pg (~> 0.18.4) rails (= 4.2.6) sass-rails (~> 5.0) - scrivito (~> 1.3.0.rc1) + scrivito (~> 1.3.0) scrivito_section_widgets (= 1.0.0) scrivito_teaser_widget (= 0.1.1) sdoc (~> 0.4.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index eecc5887b..98d0d015b 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,7 @@ //= require jquery_ujs //= require scrivito //= require scrivito_section_widgets +//= require scrivito +//= require bootstrap-sprockets +//= require bootstrap-material-design + diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss similarity index 86% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.scss index c7263740d..afda0f893 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.scss @@ -12,8 +12,12 @@ * *= require scrivito *= require scrivito_section_widgets + *= require bootstrap-material-design */ + +@import "bootstrap-sprockets"; +@import "bootstrap"; + body { - text-align: center + align-content: center } - diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ca857d712..33fd6dd40 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,7 +9,9 @@ - <%= yield %> - <%= scrivito_body_tags %> +
+ <%= yield %> + <%= scrivito_body_tags %> +