diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-24 08:33:16 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-24 08:33:16 +0000 |
| commit | 7444e8a1342e0b3e361b6973754eb3da20130e49 (patch) | |
| tree | 3f623fd2a5a4bb0a0505900b57008911eac6d176 /app/assets/stylesheets/framework.scss | |
| parent | a811704c115118fff76046c9307224d41901185a (diff) | |
| parent | 58af2647dc6a5bd7805e703a32fe45190d62c7d3 (diff) | |
| download | gitlab-ce-7444e8a1342e0b3e361b6973754eb3da20130e49.tar.gz | |
Merge branch 'remove-new-sidebar-stuff' into 'master'
Clean up `new-sidebar`
See merge request gitlab-org/gitlab-ce!14978
Diffstat (limited to 'app/assets/stylesheets/framework.scss')
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index a0bb9e61436..7b1ef003bb2 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -37,7 +37,7 @@ @import "framework/secondary-navigation-elements"; @import "framework/selects"; @import "framework/sidebar"; -@import "framework/new-sidebar"; +@import "framework/contextual-sidebar"; @import "framework/tables"; @import "framework/notes"; @import "framework/tabs"; |