Commit 556d6cef authored by Mark Otto's avatar Mark Otto

Fixes #10941: Fix Glyphicons path for those importing bootstrap.less from another directory

parent 8dfe93d0
...@@ -2680,7 +2680,7 @@ input[type="button"].btn-block { ...@@ -2680,7 +2680,7 @@ input[type="button"].btn-block {
@font-face { @font-face {
font-family: 'Glyphicons Halflings'; font-family: 'Glyphicons Halflings';
src: url('../fonts/glyphicons-halflings-regular.eot'); src: url('../fonts/glyphicons-halflings-regular.eot');
src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
} }
.glyphicon { .glyphicon {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
// Import the fonts // Import the fonts
@font-face { @font-face {
font-family: 'Glyphicons Halflings'; 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#glyphicons_halflingsregular') format('svg'); ~"url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg')";
} }
// Catchall baseclass // Catchall baseclass
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment