mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-02-17 08:50:58 -05:00
Merge branch 'rubenvereecken-master'
This commit is contained in:
commit
ef30f6f477
2 changed files with 1 additions and 2 deletions
1
app/styles/bootstrap.scss
vendored
1
app/styles/bootstrap.scss
vendored
|
@ -1 +0,0 @@
|
|||
@import "bootstrap/bootstrap";
|
|
@ -64,7 +64,7 @@ exports.config =
|
|||
'stylesheets/app.css': /^(app|vendor|bower_components)/
|
||||
order:
|
||||
before: [
|
||||
'app/styles/bootstrap.scss'
|
||||
'app/styles/bootstrap/*'
|
||||
'vendor/styles/nanoscroller.scss'
|
||||
]
|
||||
templates:
|
||||
|
|
Loading…
Reference in a new issue