Skip to content
Browse files

Fixing up grunt, updating bootstrap to v3.

  • Loading branch information...
1 parent bd964b3 commit 5e806e32dd888c20aa06a3c94402a201059ee217 @sjlu committed
Showing with 4 additions and 7 deletions.
  1. +1 −1 .gitmodules
  2. +1 −4 assets/less/base.less
  3. +1 −1 assets/raw/twitter-bootstrap
  4. +1 −1 package.json
View
2 .gitmodules
@@ -1,6 +1,6 @@
[submodule "assets/raw/twitter-bootstrap"]
path = assets/raw/twitter-bootstrap
- url = https://github.com/twitter/bootstrap.git
+ url = https://github.com/twbs/bootstrap.git
[submodule "assets/raw/font-awesome"]
path = assets/raw/font-awesome
url = https://github.com/FortAwesome/Font-Awesome.git
View
5 assets/less/base.less
@@ -9,9 +9,6 @@
* https://github.com/twitter/bootstrap
*/
@import '../raw/twitter-bootstrap/less/bootstrap.less';
-@import '../raw/twitter-bootstrap/less/responsive.less';
-@iconSpritePath: "../raw/twitter-bootstrap/img/glyphicons-halflings.png";
-@iconWhiteSpritePath: "../raw/twitter-bootstrap/img/glyphicons-halflings-white.png";
/**
* Imports Font Awesome.
@@ -23,4 +20,4 @@
/**
* Imports your own custom CSS.
*/
-@import 'frontpage.less';
+@import 'frontpage.less';
2 assets/raw/twitter-bootstrap
@@ -1 +1 @@
-Subproject commit eb24718add4dd36fe92fdbdb79e6ff4ce5919300
+Subproject commit e8a1df5f060bf7e6631554648e0abde150aedbe4
View
2 package.json
@@ -10,7 +10,7 @@
"description": "A small bootstrapped, single-page, Javascript framework to start you up!",
"dependencies": {
"grunt": "0.3.x",
- "grunt-contrib-less": ">0.0.0",
+ "grunt-contrib-less": "0.3.x",
"grunt-recess": "~0.1.0",
"grunt-requirejs": "~0.2.9",
"grunt-shell": "~0.1.2",

0 comments on commit 5e806e3

Please sign in to comment.
Something went wrong with that request. Please try again.