Merge branch 'master' of github.com:twbs/bootstrap

88068e93 · Mark Otto · d1cf27bd · 2919a3dd · 88068e93 · 88068e93
Commit 88068e93 authored Jun 08, 2014 by Mark Otto
4 changed files
--- a/dist/css/bootstrap.css.map
+++ b/dist/css/bootstrap.css.map
--- a/docs/assets/js/customize.min.js
+++ b/docs/assets/js/customize.min.js
--- a/docs/dist/css/bootstrap.css.map
+++ b/docs/dist/css/bootstrap.css.map
--- a/less/glyphicons.less
+++ b/less/glyphicons.less
@@ -10,11 +10,11 @@
 // Import the fonts
 @font-face {
  font-family: 'Glyphicons Halflings';
-  src: ~"url('@{icon-font-path}@{icon-font-name}.eot')";
+  src: url('@{icon-font-path}@{icon-font-name}.eot');
-  src: ~"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')",
+  src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'),
-       ~"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')",
+       url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),
-       ~"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')",
+       url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),
-       ~"url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg')";
+       url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg');
 }
 // Catchall baseclass