Revert accidental change from bootstrap to bootstrap-sass in the package.json, and update laravel-elixir to 5.x

This commit is contained in:
Kevin MacMartin 2016-03-06 22:28:01 -05:00
parent aebdc5ddc9
commit e970fecf8e
2 changed files with 4 additions and 4 deletions

View file

@ -7,13 +7,13 @@
"description": "The Hypothetical website template", "description": "The Hypothetical website template",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"bootstrap": "^3.3.6",
"font-awesome": "~4.5.0", "font-awesome": "~4.5.0",
"awesome-bootstrap-checkbox": "~0.3.5", "awesome-bootstrap-checkbox": "~0.3.5",
"Sortable": "~1.4.2", "Sortable": "~1.4.2",
"simplemde": "~1.9.0", "simplemde": "~1.9.0",
"datetimepicker": "~2.4.5", "datetimepicker": "~2.4.5",
"SpinKit": "~1.2.5", "SpinKit": "~1.2.5",
"jQuery.stickyFooter": "https://github.com/miWebb/jQuery.stickyFooter.git#~1.2.3", "jQuery.stickyFooter": "https://github.com/miWebb/jQuery.stickyFooter.git#~1.2.3"
"bootstrap-sass": "^3.3.6"
} }
} }

View file

@ -1,11 +1,11 @@
{ {
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"laravel-elixir-livereload": "^1.1.0" "laravel-elixir-livereload": "^1.1.5-beta1"
}, },
"dependencies": { "dependencies": {
"gulp": "^3.9.1", "gulp": "^3.9.1",
"laravel-elixir": "^3.4.0", "laravel-elixir": "^5.0.0",
"less-plugin-glob": "^1.1.1" "less-plugin-glob": "^1.1.1"
} }
} }