Skip to content

Commit

Permalink
Install bourbon via gem
Browse files Browse the repository at this point in the history
  • Loading branch information
stacytalbot committed Jan 14, 2020
1 parent 3559698 commit 42a5714
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 29 deletions.
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ source 'https://rubygems.org'
gem 'rails', '5.2.0'
gem 'webpacker', '~> 4.0.2'

gem 'bourbon'
gem "neat"

gem 'pg', '~> 0.21'
gem 'activerecord-postgis-adapter', '5.1.0'
gem 'dbf', '~> 2.0.7'
Expand Down
8 changes: 8 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,9 @@ GEM
best_in_place (3.0.3)
actionpack (>= 3.2)
railties (>= 3.2)
bourbon (4.2.3)
sass (~> 3.4)
thor
builder (3.2.4)
byebug (9.1.0)
capistrano (3.11.0)
Expand Down Expand Up @@ -929,6 +932,9 @@ GEM
multi_xml (0.6.0)
multipart-post (2.0.0)
mustermann (1.0.3)
neat (1.7.4)
bourbon (>= 4.0)
sass (>= 3.3)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-ssh (5.2.0)
Expand Down Expand Up @@ -1111,6 +1117,7 @@ DEPENDENCIES
autoprefixer-rails
aws-sdk (= 3.0.1)
best_in_place (~> 3.0.1)
bourbon
byebug (~> 9.0, >= 9.0.5)
bystander (= 2.0.0)!
capistrano (= 3.11.0)
Expand Down Expand Up @@ -1142,6 +1149,7 @@ DEPENDENCIES
levenshtein (~> 0.2.2)
minitest (~> 5.10, != 5.10.2)
mocha (~> 1.0.0)
neat
nokogiri (~> 1.10.4)
pg (~> 0.21)
phantompdf (~> 1.2.2)
Expand Down
27 changes: 7 additions & 20 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
@@ -1,26 +1,13 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
* compiled file so the styles you add here take precedence over styles defined in any styles
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope.
*
* *= require_self
*/

// grids
// Temporarily comment bourbon
@import '../../../node_modules/bourbon/core/bourbon.scss';
@import '../../../node_modules/bourbon-neat/app/assets/stylesheets/neat.scss';
@import 'bourbon';
@import 'neat';

// /core/bourbon';
// @import 'bourbon-neat/app/assets/stylesheets/neat';

// maps
@import '../../../node_modules/leaflet/dist/leaflet.css';
// // // maps
// @import 'leaflet/dist/leaflet';

@import './resources/mixins/rem-calc';
@import './resources/mixins/media-queries';
Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Application < Rails::Application
#{config.root}/app/presenters
#{config.root}/app/serializers
)
config.assets.paths << Rails.root.join('node_modules')
# config.assets.paths << Rails.root.join('node_modules')
config.assets.precompile += %w(base.js country.js home.js map.js protected_areas.js search.js resources.js content.js marine.js green_list.js region.js target_dashboard.js)
config.assets.precompile += %w(d3/d3.js)
config.assets.precompile += %w(d3/d3.min.js)
Expand Down
1 change: 1 addition & 0 deletions config/initializers/assets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@
#
Rails.application.config.assets.precompile += %w( pdf.css )
Rails.application.config.assets.paths << Rails.root.join('node_modules')
Rails.application.config.assets.paths << Rails.root.join('node_modules/bourbon')
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"dependencies": {
"@rails/webpacker": "^4.0.2",
"axios": "^0.19.0",
"bourbon": "^5.1.0",
"bourbon-neat": "^1.9.0",
"d3": "^5.9.2",
"es6-object-assign": "^1.1.0",
Expand Down
32 changes: 25 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1313,11 +1313,6 @@ bourbon-neat@^1.9.0:
dependencies:
node-sass "^4.1.1"

bourbon@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/bourbon/-/bourbon-5.1.0.tgz#84fa10de4c4e837602d8c2ec716d74bcb8915bad"
integrity sha512-rO4rwNAVNuzPmnL+DruxAe7DR2YFFo4nHsgDVRd9URMgDxtHmVBUnvFLXPan6teVe7jkybCyxcnR+CKClotj3g==

brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
Expand Down Expand Up @@ -4261,7 +4256,7 @@ lodash.uniq@^4.5.0:
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=

lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.5, lodash@~4.17.10:
lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.10:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
Expand Down Expand Up @@ -4733,7 +4728,30 @@ node-releases@^1.1.29:
dependencies:
semver "^6.3.0"

node-sass@^4.1.1, node-sass@^4.12.0:
node-sass@^4.1.1:
version "4.13.0"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066"
integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==
dependencies:
async-foreach "^0.1.3"
chalk "^1.1.1"
cross-spawn "^3.0.0"
gaze "^1.0.0"
get-stdin "^4.0.1"
glob "^7.0.3"
in-publish "^2.0.0"
lodash "^4.17.15"
meow "^3.7.0"
mkdirp "^0.5.1"
nan "^2.13.2"
node-gyp "^3.8.0"
npmlog "^4.0.0"
request "^2.88.0"
sass-graph "^2.2.4"
stdout-stream "^1.4.0"
"true-case-path" "^1.0.2"

node-sass@^4.12.0:
version "4.12.0"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
Expand Down

0 comments on commit 42a5714

Please sign in to comment.