Merge pull request #13542 from twbs/icon_paths

Fixes #13478, reverts #10941

Merge pull request #13542 from twbs/icon_paths
Fixes #13478, reverts #10941
2919a3dd · Mark Otto · 1e3b9380 · 34891de1 · 2919a3dd · 2919a3dd
Commit 2919a3dd authored 10 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 6 deletions
+6 -6
--- 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?#iefix') format('embedded-opentype')",
-       ~"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}.svg#@{icon-font-svg-id}') format('svg')";
+  src: url('@{icon-font-path}@{icon-font-name}.eot');
+  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}.ttf') format('truetype'),
+       url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg');
 }

 // Catchall baseclass