Skip to content

B
bootstrap
Commit 2919a3dd authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge pull request #13542 from twbs/icon_paths 

Fixes #13478, reverts #10941
parents 1e3b9380 34891de1
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dist/css/bootstrap.css.map
View file @ 2919a3dd
This diff was suppressed by a .gitattributes entry.
docs/assets/js/customize.min.js
View file @ 2919a3dd
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/dist/css/bootstrap.css.map
View file @ 2919a3dd
This diff was suppressed by a .gitattributes entry.
less/glyphicons.less
View file @ 2919a3dd
......@@ -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
......
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