[checkmk-commits] First step of SCSS workaround for building for different editions

Module: check_mk Branch: master Commit: 1297e520b48d758f21c8ba0e9d144c3dea7dd92b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1297e520b48d75… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 11:52:14 2019 +0200 First step of SCSS workaround for building for different editions Change-Id: I25a2276be057b4edf8b2c8caeb0b2c750a943b71 --- web/htdocs/themes/classic/scss/cee | 1 + web/htdocs/themes/classic/scss/cme | 1 + web/htdocs/themes/classic/theme.scss | 17 ++++++++++------- web/htdocs/themes/facelift/theme.scss | 17 ++++++++++------- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/web/htdocs/themes/classic/scss/cee b/web/htdocs/themes/classic/scss/cee new file mode 120000 index 0000000..30aa240 --- /dev/null +++ b/web/htdocs/themes/classic/scss/cee @@ -0,0 +1 @@ +../../../../../enterprise/web/htdocs/themes/classic/scss \ No newline at end of file diff --git a/web/htdocs/themes/classic/scss/cme b/web/htdocs/themes/classic/scss/cme new file mode 120000 index 0000000..e88bc7e --- /dev/null +++ b/web/htdocs/themes/classic/scss/cme @@ -0,0 +1 @@ +../../../../../managed/web/htdocs/themes/classic/scss \ No newline at end of file diff --git a/web/htdocs/themes/classic/theme.scss b/web/htdocs/themes/classic/theme.scss index 4c00782..decdcfb 100644 --- a/web/htdocs/themes/classic/theme.scss +++ b/web/htdocs/themes/classic/theme.scss @@ -15,15 +15,18 @@ @import "scss/_sidebar.scss"; @import "scss/_snapins.scss"; -// CEE specific files -@import "../../../../enterprise/web/htdocs/themes/classic/scss/_graphs.scss"; -@import "../../../../enterprise/web/htdocs/themes/classic/scss/_reporting.scss"; +// CEE specific files. Would love to add some kind of conditional import here, +// but that is simply not possible at the moment using SCSS. Hack around this +// using symlinks in the git during development and replace the links with empty +// files during the build procedure of other editions. +@import "../classic/scss/cee/_graphs.scss"; +@import "../classic/scss/cee/_reporting.scss"; @if $ENTERPRISE = "yes" { @include graphs; @include reporting; } -//@import "../../../../managed/web/htdocs/themes/classic/scss/_managed.scss"; -//@if $MANAGED = "yes" { -// @include managed; -//} +@import "../classic/scss/cme/_managed.scss"; +@if $MANAGED = "yes" { + @include managed; +} diff --git a/web/htdocs/themes/facelift/theme.scss b/web/htdocs/themes/facelift/theme.scss index c4e609d..1cb3f39 100644 --- a/web/htdocs/themes/facelift/theme.scss +++ b/web/htdocs/themes/facelift/theme.scss @@ -17,18 +17,21 @@ @import "../classic/scss/_wato.scss"; @import "../classic/scss/_mobile.scss"; -// CEE specific files -@import "../../../../enterprise/web/htdocs/themes/classic/scss/_graphs.scss"; -@import "../../../../enterprise/web/htdocs/themes/classic/scss/_reporting.scss"; +// CEE specific files. Would love to add some kind of conditional import here, +// but that is simply not possible at the moment using SCSS. Hack around this +// using symlinks in the git during development and replace the links with empty +// files during the build procedure of other editions. +@import "../classic/scss/cee/_graphs.scss"; +@import "../classic/scss/cee/_reporting.scss"; @if $ENTERPRISE = "yes" { @include graphs; @include reporting; } -//@import "../../../../managed/web/htdocs/themes/classic/scss/_managed.scss"; -//@if $MANAGED = "yes" { -// @include managed; -//} +@import "../classic/scss/cme/_managed.scss"; +@if $MANAGED = "yes" { + @include managed; +} @import "scss/_variables.scss"; @import "scss/_main.scss";