diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-23 08:18:02 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-23 08:18:02 +0000 |
| commit | 865b24dabe543732837f916d554330c13b9a7850 (patch) | |
| tree | fc31dd340bb768888cbe25a8372f53978bd9fde3 /app/assets | |
| parent | e2b1af2064514a34081f1aac9e247667a0dc2442 (diff) | |
| parent | 809b7f8b3dcba4b146012c7e3491462990f477e0 (diff) | |
| download | gitlab-ce-865b24dabe543732837f916d554330c13b9a7850.tar.gz | |
Merge branch '6544-remove-scss-diff-ce' into 'master'
Resolve difference in app/assets/stylesheets/application.scss
See merge request gitlab-org/gitlab-ce!31007
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/_ee/application_ee.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 4 |
2 files changed, 9 insertions, 0 deletions
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"; |