Merge pull request #1312 from kalenjohnson/patch-1

Fixing bootstrap-sass overrides
This commit is contained in:
Austin Pray
2015-02-09 13:55:02 -06:00

View File

@@ -39,22 +39,22 @@
"bootstrap-sass-official": {
"main": [
"./assets/stylesheets/_bootstrap.scss",
"./assets/javascripts/transition.js",
"./assets/javascripts/alert.js",
"./assets/javascripts/button.js",
"./assets/javascripts/carousel.js",
"./assets/javascripts/collapse.js",
"./assets/javascripts/dropdown.js",
"./assets/javascripts/modal.js",
"./assets/javascripts/tooltip.js",
"./assets/javascripts/popover.js",
"./assets/javascripts/scrollspy.js",
"./assets/javascripts/tab.js",
"./assets/javascripts/affix.js",
"./assets/fonts/glyphicons-halflings-regular.eot",
"./assets/fonts/glyphicons-halflings-regular.svg",
"./assets/fonts/glyphicons-halflings-regular.ttf",
"./assets/fonts/glyphicons-halflings-regular.woff"
"./assets/javascripts/bootstrap/transition.js",
"./assets/javascripts/bootstrap/alert.js",
"./assets/javascripts/bootstrap/button.js",
"./assets/javascripts/bootstrap/carousel.js",
"./assets/javascripts/bootstrap/collapse.js",
"./assets/javascripts/bootstrap/dropdown.js",
"./assets/javascripts/bootstrap/modal.js",
"./assets/javascripts/bootstrap/tooltip.js",
"./assets/javascripts/bootstrap/popover.js",
"./assets/javascripts/bootstrap/scrollspy.js",
"./assets/javascripts/bootstrap/tab.js",
"./assets/javascripts/bootstrap/affix.js",
"./assets/fonts/bootstrap/glyphicons-halflings-regular.eot",
"./assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
"./assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
"./assets/fonts/bootstrap/glyphicons-halflings-regular.woff"
]
}
}