diff options
| author | Mark Otto <[email protected]> | 2013-01-11 11:11:32 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-11 11:11:32 -0800 |
| commit | 0f34666f07f4ade3ba52fbfa78dbb9bd995bc47f (patch) | |
| tree | 0aee04f1c3a4dbd2c21985d54d16a6f7f13778ae /less | |
| parent | 91dd77939b4183fa86973056778ad87950674410 (diff) | |
| parent | c91bf424b0c69da931b674a021f48fe471b1d053 (diff) | |
| download | bootstrap-0f34666f07f4ade3ba52fbfa78dbb9bd995bc47f.tar.xz bootstrap-0f34666f07f4ade3ba52fbfa78dbb9bd995bc47f.zip | |
Merge pull request #6550 from Boulox/font-variable-fix
Add glyphicons font path variable
Diffstat (limited to 'less')
| -rw-r--r-- | less/glyphicons.less | 10 | ||||
| -rw-r--r-- | less/variables.less | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/less/glyphicons.less b/less/glyphicons.less index ad22b4579..bfe481734 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -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; } diff --git a/less/variables.less b/less/variables.less index 71de02c06..1bcc1808d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -142,6 +142,11 @@ @zindex-modal: 1050; +// Glyphicons font path +// ------------------------- +@glyphicons-font-path: "../fonts"; + + // Navbar // ------------------------- |