diff options
| author | Lukas Eipert <leipert@gitlab.com> | 2019-06-28 12:04:08 +0300 |
|---|---|---|
| committer | Lukas Eipert <leipert@gitlab.com> | 2019-06-28 19:47:00 +0300 |
| commit | 7d00eea6971dc128fdc8b43833304b54fa770bf2 (patch) | |
| tree | 228c156f46ac4efc6705984653c8ce85b7eb0c0d /app/assets/stylesheets/errors.scss | |
| parent | 423c4c43cb73c72e8b27d7c091f392e3a09be354 (diff) | |
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/errors.scss')
| -rw-r--r-- | app/assets/stylesheets/errors.scss | 12 |
1 files changed, 6 insertions, 6 deletions
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; |