Hopiu/bootstrap
1
0
Fork 0
mirror of https://github.com/Hopiu/bootstrap.git synced 2026-03-21 06:50:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13542 from twbs/icon_paths

Browse source 
Fixes #13478, reverts #10941
This commit is contained in:
Mark Otto 2014-06-08 11:23:20 -07:00
commit 2919a3dd80
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
dist/css/bootstrap.css.map vendored
View file

Binary file not shown.

2
docs/assets/js/customize.min.js vendored
View file

File diff suppressed because one or more lines are too long

BIN
docs/dist/css/bootstrap.css.map vendored
View file

Binary file not shown.

10
less/glyphicons.less
View file

@ -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