mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-16 15:20:13 +01:00
Merge pull request #2462 from TracksApp/dependabot/bundler/sassc-rails-2.1.2
Bump sassc-rails from 2.0.0 to 2.1.2
This commit is contained in:
commit
b3161a03dd
12 changed files with 14 additions and 17 deletions
2
Gemfile
2
Gemfile
|
|
@ -1,7 +1,7 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '~> 5.2.4'
|
||||
gem 'sassc-rails', '~> 2.0.0'
|
||||
gem 'sassc-rails', '~> 2.1.2'
|
||||
gem 'coffee-rails', '~> 5.0.0'
|
||||
|
||||
#gem 'json'
|
||||
|
|
|
|||
17
Gemfile.lock
17
Gemfile.lock
|
|
@ -87,7 +87,7 @@ GEM
|
|||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.12.2)
|
||||
concurrent-ruby (1.1.6)
|
||||
concurrent-ruby (1.1.7)
|
||||
crass (1.0.6)
|
||||
database_cleaner (1.8.5)
|
||||
diff-lcs (1.3)
|
||||
|
|
@ -100,13 +100,13 @@ GEM
|
|||
factory_bot_rails (6.1.0)
|
||||
factory_bot (~> 6.1.0)
|
||||
railties (>= 5.0.0)
|
||||
ffi (1.9.25)
|
||||
ffi (1.13.1)
|
||||
font-awesome-sass (5.13.0)
|
||||
sassc (>= 1.11)
|
||||
globalid (0.4.2)
|
||||
activesupport (>= 4.2.0)
|
||||
htmlentities (4.3.4)
|
||||
i18n (1.8.4)
|
||||
i18n (1.8.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jaro_winkler (1.5.4)
|
||||
jquery-rails (4.4.0)
|
||||
|
|
@ -221,10 +221,9 @@ GEM
|
|||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.8.0)
|
||||
nokogumbo (~> 2.0)
|
||||
sassc (2.0.0)
|
||||
ffi (~> 1.9.6)
|
||||
rake
|
||||
sassc-rails (2.0.0)
|
||||
sassc (2.4.0)
|
||||
ffi (~> 1.9)
|
||||
sassc-rails (2.1.2)
|
||||
railties (>= 4.0.0)
|
||||
sassc (>= 2.0)
|
||||
sprockets (> 3.0)
|
||||
|
|
@ -252,7 +251,7 @@ GEM
|
|||
tilt (~> 2.0)
|
||||
yard (~> 0.9, >= 0.9.24)
|
||||
spring (2.1.0)
|
||||
sprockets (3.7.2)
|
||||
sprockets (4.0.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (3.2.1)
|
||||
|
|
@ -320,7 +319,7 @@ DEPENDENCIES
|
|||
rspec-expectations
|
||||
rubocop (~> 0.89)
|
||||
sanitize (~> 5.2)
|
||||
sassc-rails (~> 2.0.0)
|
||||
sassc-rails (~> 2.1.2)
|
||||
selenium-webdriver (~> 3.142)
|
||||
simplecov
|
||||
solargraph
|
||||
|
|
|
|||
3
app/assets/config/manifest.js
Normal file
3
app/assets/config/manifest.js
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
//= link_tree ../images
|
||||
//= link_directory ../javascripts .js
|
||||
//= link_directory ../stylesheets .css
|
||||
|
|
@ -9,4 +9,4 @@ $link-bgcolor: $link-color;
|
|||
$box-tablink-color: unset;
|
||||
|
||||
// Import all components
|
||||
@import 'manifest';
|
||||
@import 'include/manifest';
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@ $link-bgcolor: unset;
|
|||
$box-tablink-color: lighten(#000, 85%);
|
||||
|
||||
// Import all components
|
||||
@import 'manifest';
|
||||
@import 'include/manifest';
|
||||
|
|
|
|||
|
|
@ -7,8 +7,3 @@ Rails.application.config.assets.version = '1.0'
|
|||
# Rails.application.config.assets.paths << Emoji.images_path
|
||||
# Add Yarn node_modules folder to the asset load path.
|
||||
Rails.application.config.assets.paths << Rails.root.join('node_modules')
|
||||
|
||||
# Precompile additional assets.
|
||||
# application.js, application.css, and all non-JS/CSS in the app/assets
|
||||
# folder are already added.
|
||||
Rails.application.config.assets.precompile += %w( light_blue.css black.css print.css mobile.css jquery-ui/datepicker-*.js )
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue