github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 05:22:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Do not include theme variables in plugin SCSS, and fix register_css

Browse Source
This commit is contained in:
David Taylor
2019-09-16 17:06:34 +01:00
parent 4a11e7ee56
commit 081c36a459
6 changed files with 112 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/stylesheet/compiler.rb
View File

@ -12,7 +12,9 @@ module Stylesheet
if Importer.special_imports[asset.to_s]
filename = "theme_#{options[:theme_id]}.scss"
file = "@import \"common/foundation/variables\"; @import \"common/foundation/mixins\"; @import \"theme_variables\"; @import \"#{asset}\";"
file = "@import \"common/foundation/variables\"; @import \"common/foundation/mixins\";"
file += " @import \"theme_variables\";" if Importer::THEME_TARGETS.include?(asset.to_s)
file += " @import \"#{asset}\";"
else
filename = "#{asset}.scss"
path = "#{ASSET_ROOT}/#{filename}"