deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move mixins and variables under gitlab bootstrap

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-19 19:02:12 +02:00
parent 52fbcd45a4
commit 965102b3f6
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/gitlab_bootstrap.scss
View file

@ -8,15 +8,15 @@ $baseLineHeight: 18px !default;
@import "bootstrap/responsive-1200px-min"; @import "bootstrap/responsive-1200px-min";
@import "font-awesome"; @import "font-awesome";
@import "variables.scss";
@import "fonts.scss";
@import "mixins.scss";
/** /**
* GitLab bootstrap. * GitLab bootstrap.
* Overrides some styles of twitter bootstrap. * Overrides some styles of twitter bootstrap.
* Also give some common classes for GitLab app * 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/common.scss";
@import "gitlab_bootstrap/typography.scss"; @import "gitlab_bootstrap/typography.scss";
@import "gitlab_bootstrap/buttons.scss"; @import "gitlab_bootstrap/buttons.scss";

0
app/assets/stylesheets/fonts.scss → app/assets/stylesheets/gitlab_bootstrap/fonts.scss
View file

0
app/assets/stylesheets/mixins.scss → app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View file

0
app/assets/stylesheets/variables.scss → app/assets/stylesheets/gitlab_bootstrap/variables.scss
View file