root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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

This commit is contained in:
Mark Otto 2013-12-01 00:20:47 -08:00
parent 8dfe93d0b9
commit 556d6cef3e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/css/bootstrap.css vendored
View File

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

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs-assets/js/raw-files.js
View File

File diff suppressed because one or more lines are too long

10
less/glyphicons.less
View File

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