Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Theme Inheritance] Add to SASS load paths from all parent themes #114

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
source "https://rubygems.org"
gemspec

gem "jekyll", ENV["JEKYLL_VERSION"] ? "~> #{ENV["JEKYLL_VERSION"]}" : ">= 4.0"
# TODO: This is a temporary change to ensure that CI tests for #114 pass.
# Revert changes to this file before merging.
gem "jekyll", :github => "jekyll/jekyll", :ref => "refs/pull/7554/head"
# gem "jekyll", ENV["JEKYLL_VERSION"] ? "~> #{ENV["JEKYLL_VERSION"]}" : ">= 4.0"
gem "minima"
4 changes: 3 additions & 1 deletion lib/jekyll/converters/scss.rb
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@ def sass_load_paths
end

paths.uniq!
paths << site.theme.sass_path if site.theme&.sass_path
site.theme_list.each do |theme|
paths << theme.sass_path if theme&.sass_path
end
paths.select { |path| File.directory?(path) }
end
# rubocop:enable Metrics/AbcSize
Expand Down