Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

less/glyphicons.less

@@ -21,11 +21,11 @@
 // Import the fonts
 @font-face {
   font-family: 'Glyphicons Halflings';
-  src: url('../fonts/glyphiconshalflings-regular.eot');
-  src: url('../fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'),
-       url('../fonts/glyphiconshalflings-regular.woff') format('woff'),
-       url('../fonts/glyphiconshalflings-regular.ttf') format('truetype'),
-       url('../fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg');
+  src: url('@{glyphicons-font-path}/glyphiconshalflings-regular.eot');
+  src: url('@{glyphicons-font-path}/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'),
+       url('@{glyphicons-font-path}/glyphiconshalflings-regular.woff') format('woff'),
+       url('@{glyphicons-font-path}/glyphiconshalflings-regular.ttf') format('truetype'),
+       url('@{glyphicons-font-path}/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg');
   font-style: normal;
   font-weight: normal;
 }

less/variables.less

@@ -142,6 +142,11 @@
 @zindex-modal:             1050;
 
 
+// Glyphicons font path
+// -------------------------
+@glyphicons-font-path:          "../fonts";
+
+
 // Navbar
 // -------------------------