Update gems, Ruby and Rails, remove Bourbon

parent 31f0007c
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '2.5.1' #ruby '2.5.1'
ruby '2.6.0'
gem 'rails', '4.2.10' #gem 'rails', '4.2.10'
gem 'rails', '5.2.2'
gem 'pg' gem 'pg'
gem 'haml-rails' gem 'haml-rails'
gem 'sass-rails' gem 'sass-rails'
gem 'normalize-rails' gem 'normalize-rails'
gem 'bourbon'
gem 'uglifier', '>= 1.3.0' gem 'uglifier'
gem 'coffee-rails', '~> 4.1.0' gem 'coffee-rails'
gem 'jquery-rails' gem 'jquery-rails'
gem 'turbolinks' gem 'turbolinks'
gem 'jbuilder', '~> 2.0' gem 'jbuilder'
gem 'sdoc', '~> 0.4.0', group: :doc gem 'sdoc', group: :doc
gem 'http_accept_language' gem 'http_accept_language'
gem 'puma' gem 'puma'
group :development do group :development do
gem 'web-console', '~> 2.0' gem 'web-console'
end end
group :test do group :test do
......
This diff is collapsed.
@import "normalize-rails" @import "normalize-rails"
@import "bourbon"
// Fonts // Fonts
...@@ -108,7 +107,11 @@ strong ...@@ -108,7 +107,11 @@ strong
.site-header .site-header
color: $c-light color: $c-light
padding: 20px padding: 20px
+clearfix
&:after
content: ""
display: table
clear: both
.logo-vuash .logo-vuash
color: $c-light color: $c-light
......
...@@ -25,6 +25,5 @@ module Vuash ...@@ -25,6 +25,5 @@ module Vuash
g.helper_specs false g.helper_specs false
end end
config.active_record.raise_in_transactional_callbacks = true
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment