diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/assets/stylesheets/application.scss | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/assets/stylesheets/application.scss')
-rw-r--r-- | app/assets/stylesheets/application.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f5393ef47d6..8acd338fff8 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -13,7 +13,7 @@ // directory. @import '@gitlab/at.js/dist/css/jquery.atwho'; @import 'dropzone/dist/basic'; -@import 'select2/select2'; +@import 'select2'; // GitLab UI framework @import 'framework'; @@ -22,7 +22,7 @@ @import 'fontawesome_custom'; // Page specific styles (issues, projects etc): -@import 'pages/**/*'; +@import 'page_specific_files'; // Component specific styles, will be moved to gitlab-ui @import 'components/**/*'; |