diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index d2efe1fa06a95df6d3967c9f4be1f1d77deabfff..f53e0e50bab2cb1343291e489a2dc82d3ca1f99d 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -8,15 +8,15 @@ $baseLineHeight: 18px !default; @import "bootstrap/responsive-1200px-min"; @import "font-awesome"; -@import "variables.scss"; -@import "fonts.scss"; -@import "mixins.scss"; /** * GitLab bootstrap. * Overrides some styles of twitter bootstrap. * Also give some common classes for GitLab app */ +@import "gitlab_bootstrap/variables.scss"; +@import "gitlab_bootstrap/fonts.scss"; +@import "gitlab_bootstrap/mixins.scss"; @import "gitlab_bootstrap/common.scss"; @import "gitlab_bootstrap/typography.scss"; @import "gitlab_bootstrap/buttons.scss"; diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/gitlab_bootstrap/fonts.scss similarity index 100% rename from app/assets/stylesheets/fonts.scss rename to app/assets/stylesheets/gitlab_bootstrap/fonts.scss diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss similarity index 100% rename from app/assets/stylesheets/mixins.scss rename to app/assets/stylesheets/gitlab_bootstrap/mixins.scss diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/gitlab_bootstrap/variables.scss similarity index 100% rename from app/assets/stylesheets/variables.scss rename to app/assets/stylesheets/gitlab_bootstrap/variables.scss