Skip to content

Commit 0b65a82

Browse files
authored
fix(chore): also use 3 layer logic for colors.less
The colors.less file was not respecting the 3 layer logic (default->theme->site).
1 parent 3f3fee4 commit 0b65a82

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

src/theme.less

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
@import "@{themesFolder}/default/globals/site.variables";
1717

1818
/* Packaged site.variables */
19-
@import (optional) "@{themesFolder}/@{site}/globals/site.variables";
19+
& when not (@site = "default") {
20+
@import (optional) "@{themesFolder}/@{site}/globals/site.variables";
21+
}
2022

2123
/* Component's site.variables */
2224
& when not (@theme = "default") {
@@ -46,8 +48,18 @@
4648
/* Default */
4749
@import "@{themesFolder}/default/globals/colors.less";
4850

51+
/* Packaged colors.less */
52+
& when not (@site = "default") {
53+
@import (optional) "@{themesFolder}/@{site}/globals/colors.less";
54+
}
55+
56+
/* Packaged Theme */
57+
& when not (@theme = "default") {
58+
@import (optional) "@{themesFolder}/@{theme}/globals/colors.less";
59+
}
60+
4961
/* Site Theme */
50-
@import (optional) "@{themesFolder}/@{site}/globals/colors.less";
62+
@import (optional) "@{siteFolder}/globals/colors.less";
5163

5264
/*******************************
5365
Mix-ins

0 commit comments

Comments
 (0)