diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
| commit | fada8d75550dc7365f7e18ee1569b9406251d660 (patch) | |
| tree | db9dc01c18693824f83fce5020f4c1f3ae7c0865 /client/src/sass/pre-customizations.scss | |
| parent | 492fd28167f770d79a430fc57451b5a9e075d8e7 (diff) | |
| parent | c2830fa8f84f61462098bf36add824f89436dfa9 (diff) | |
| download | PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.gz PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.zst PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.zip | |
Merge branch 'feature/design' into develop
Diffstat (limited to 'client/src/sass/pre-customizations.scss')
| -rw-r--r-- | client/src/sass/pre-customizations.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/src/sass/pre-customizations.scss b/client/src/sass/pre-customizations.scss index 693489828..52eef50f2 100644 --- a/client/src/sass/pre-customizations.scss +++ b/client/src/sass/pre-customizations.scss | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | @import '_variables.scss'; | 1 | @import '_variables.scss'; |
| 2 | @import '_mixins.scss'; | ||
| 2 | 3 | ||
| 3 | $bootstrap-sass-asset-helper: false !default; | 4 | $bootstrap-sass-asset-helper: false !default; |
| 4 | // | 5 | // |