From 809b7f8b3dcba4b146012c7e3491462990f477e0 Mon Sep 17 00:00:00 2001 From: Lukas Eipert Date: Mon, 22 Jul 2019 15:00:08 +0200 Subject: Resolve difference in app/assets/stylesheets/application.scss --- app/assets/stylesheets/_ee/application_ee.scss | 5 +++++ app/assets/stylesheets/application.scss | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 app/assets/stylesheets/_ee/application_ee.scss (limited to 'app') diff --git a/app/assets/stylesheets/_ee/application_ee.scss b/app/assets/stylesheets/_ee/application_ee.scss new file mode 100644 index 00000000000..0fb2c9b68a9 --- /dev/null +++ b/app/assets/stylesheets/_ee/application_ee.scss @@ -0,0 +1,5 @@ +/* + This is a noop-file. In EE: + ee/app/assets/stylesheets/_ee/application_ee.scss + will take precedence over it and import more styles + */ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d5ef66af31a..fbf16aa324a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -34,4 +34,8 @@ // Styles for JS behaviors. @import "behaviors"; +// EE-only stylesheets +@import "application_ee"; + +// CSS util classes @import "utilities"; -- cgit v1.2.1