diff options
| author | Mark Otto <[email protected]> | 2013-01-11 20:27:00 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-11 20:27:00 -0800 |
| commit | 7b3f74311eab0ccc53dbfde4122f29e9634f66bf (patch) | |
| tree | 6701701e1ab82a1c0113281a632e7154de439bd1 | |
| parent | 7626cc629ff165f84601ad7c35b64e0b30f491f1 (diff) | |
| parent | 0f34666f07f4ade3ba52fbfa78dbb9bd995bc47f (diff) | |
| download | bootstrap-7b3f74311eab0ccc53dbfde4122f29e9634f66bf.tar.xz bootstrap-7b3f74311eab0ccc53dbfde4122f29e9634f66bf.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -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 // ------------------------- |