diff options
author | Lukas Eipert <leipert@gitlab.com> | 2019-06-28 11:04:08 +0200 |
---|---|---|
committer | Lukas Eipert <leipert@gitlab.com> | 2019-06-28 18:47:00 +0200 |
commit | 7d00eea6971dc128fdc8b43833304b54fa770bf2 (patch) | |
tree | 228c156f46ac4efc6705984653c8ce85b7eb0c0d /app/assets/stylesheets | |
parent | 423c4c43cb73c72e8b27d7c091f392e3a09be354 (diff) | |
download | gitlab-ce-7d00eea6971dc128fdc8b43833304b54fa770bf2.tar.gz |
Use absolute paths for SCSS imports
A recent update in [GitLab UI] and setting the [config.assets.paths] to
include `node_modules` for the resolution of SCSS imports, allows us to
have much nicer imports which don't rely on brittle relative paths.
This change also forwards @gitlab/ui to the newest version
[GitLab UI]: https://gitlab.com/gitlab-org/gitlab-ui/merge_requests/602
[config.assets.paths]: https://gitlab.com/gitlab-org/gitlab-ce/blob/d9026d0ffa0/config/application.rb#L169
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/application.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/csslab.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/errors.scss | 12 | ||||
-rw-r--r-- | app/assets/stylesheets/framework.scss | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a2f518cd24e..d5ef66af31a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -11,10 +11,10 @@ // like a table or typography then make changes in the framework/ directory. // If you need to add unique style that should affect only one page - use pages/ // directory. -@import "../../../node_modules/at.js/dist/css/jquery.atwho"; -@import "../../../node_modules/pikaday/scss/pikaday"; -@import "../../../node_modules/dropzone/dist/basic"; -@import "../../../node_modules/select2/select2"; +@import "at.js/dist/css/jquery.atwho"; +@import "pikaday/scss/pikaday"; +@import "dropzone/dist/basic"; +@import "select2/select2"; // GitLab UI framework @import "framework"; diff --git a/app/assets/stylesheets/csslab.scss b/app/assets/stylesheets/csslab.scss index acaa41e2677..87c59cd42c0 100644 --- a/app/assets/stylesheets/csslab.scss +++ b/app/assets/stylesheets/csslab.scss @@ -1 +1 @@ -@import "../../../node_modules/@gitlab/csslab/dist/css/csslab-slim"; +@import "@gitlab/csslab/dist/css/csslab-slim"; diff --git a/app/assets/stylesheets/errors.scss b/app/assets/stylesheets/errors.scss index 8c32b6c8985..d287215096e 100644 --- a/app/assets/stylesheets/errors.scss +++ b/app/assets/stylesheets/errors.scss @@ -2,12 +2,12 @@ * This is a minimal stylesheet, meant to be used for error pages. */ @import 'framework/variables'; -@import '../../../node_modules/bootstrap/scss/functions'; -@import '../../../node_modules/bootstrap/scss/variables'; -@import '../../../node_modules/bootstrap/scss/mixins'; -@import '../../../node_modules/bootstrap/scss/reboot'; -@import '../../../node_modules/bootstrap/scss/buttons'; -@import '../../../node_modules/bootstrap/scss/forms'; +@import 'bootstrap/scss/functions'; +@import 'bootstrap/scss/variables'; +@import 'bootstrap/scss/mixins'; +@import 'bootstrap/scss/reboot'; +@import 'bootstrap/scss/buttons'; +@import 'bootstrap/scss/forms'; $body-color: #666; $header-color: #456; diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 14f4652e847..9b1d9d51f9c 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -2,7 +2,7 @@ @import 'framework/variables_overrides'; @import 'framework/mixins'; -@import '../../../node_modules/@gitlab/ui/scss/gitlab_ui'; +@import '@gitlab/ui/scss/gitlab_ui'; @import 'bootstrap_migration'; @import 'framework/layout'; |