diff options
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/fonts.scss (renamed from app/assets/stylesheets/fonts.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/mixins.scss (renamed from app/assets/stylesheets/mixins.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/variables.scss (renamed from app/assets/stylesheets/variables.scss) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index d2efe1fa06a..f53e0e50bab 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 index 88c966d18f7..88c966d18f7 100644 --- a/app/assets/stylesheets/fonts.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/fonts.scss diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss index 81830368c4c..81830368c4c 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/gitlab_bootstrap/variables.scss index 869eb168c0d..869eb168c0d 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/variables.scss |