mirror of
https://github.com/twbs/bootstrap.git
synced 2024-11-29 11:24:18 +01:00
Merge pull request #6550 from Boulox/font-variable-fix
Add glyphicons font path variable
This commit is contained in:
commit
0f34666f07
@ -21,11 +21,11 @@
|
||||
// Import the fonts
|
||||
@font-face {
|
||||
font-family: 'Glyphicons Halflings';
|
||||
src: url('../fonts/glyphiconshalflings-regular.eot');
|
||||
src: url('../fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'),
|
||||
url('../fonts/glyphiconshalflings-regular.woff') format('woff'),
|
||||
url('../fonts/glyphiconshalflings-regular.ttf') format('truetype'),
|
||||
url('../fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg');
|
||||
src: url('@{glyphicons-font-path}/glyphiconshalflings-regular.eot');
|
||||
src: url('@{glyphicons-font-path}/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'),
|
||||
url('@{glyphicons-font-path}/glyphiconshalflings-regular.woff') format('woff'),
|
||||
url('@{glyphicons-font-path}/glyphiconshalflings-regular.ttf') format('truetype'),
|
||||
url('@{glyphicons-font-path}/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg');
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
@ -142,6 +142,11 @@
|
||||
@zindex-modal: 1050;
|
||||
|
||||
|
||||
// Glyphicons font path
|
||||
// -------------------------
|
||||
@glyphicons-font-path: "../fonts";
|
||||
|
||||
|
||||
// Navbar
|
||||
// -------------------------
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user