mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge branch 'master' of github.com:twbs/bootstrap
This commit is contained in:
commit
88068e93fa
2
dist/css/bootstrap.css.map
vendored
2
dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/assets/js/customize.min.js
vendored
2
docs/assets/js/customize.min.js
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.css.map
vendored
2
docs/dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user