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

FIX: Improve SCSS handling in components (#11963)

Browse Source 
- ignores errors when including component SCSS in parent theme
- adds support for SCSS `@import`s in components' `color_definitions.scss` files
This commit is contained in:
Penar Musaraj
2021-02-04 08:51:18 -05:00
committed by GitHub
parent b580e3e657
commit 12ffba771c
4 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spec/components/stylesheet/importer_spec.rb
View File

@ -64,8 +64,8 @@ describe Stylesheet::Importer do
end
context "#import_color_definitions" do
let(:scss) { ":root { --custom-color: green}" }
let(:scss_child) { ":root { --custom-color: red}" }
let(:scss) { ":root{--custom-color: green}" }
let(:scss_child) { ":root{--custom-color: red}" }
let(:theme) do
Fabricate(:theme).tap do |t|
@ -74,7 +74,7 @@ describe Stylesheet::Importer do
end
end
let(:child) { Fabricate(:theme, component: true).tap { |t|
let(:child) { Fabricate(:theme, component: true, name: "Child Theme").tap { |t|
t.set_field(target: :common, name: "color_definitions", value: scss_child)
t.save!
}}
@ -90,6 +90,7 @@ describe Stylesheet::Importer do
styles = Stylesheet::Importer.import_color_definitions(theme.id)
expect(styles).to include(scss_child)
expect(styles).to include("Color definitions from Child Theme")
end
it "should include default theme color definitions" do