mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

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
parent 1e3b93804f 34891de173
commit 2919a3dd80
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/customize.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/glyphicons.less
+5 -5
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#@{icon-font-svg-id}') format('svg')"; url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg');
} }
// Catchall baseclass // Catchall baseclass