From 8ae9c6ab34128ea863343abaeff39ca7c6f4618c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 26 Apr 2013 23:13:04 -0700 Subject: [PATCH] Fixes #7688: move font-weight for glyphicons to before pseudo element --- docs/assets/css/bootstrap.css | 5 ++--- less/glyphicons.less | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f8db46767a..70b610e52b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2147,15 +2147,14 @@ fieldset[disabled] .btn-link:focus { @font-face { font-family: 'Glyphicons Halflings'; - font-style: normal; - font-weight: normal; 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'); } -.glyphicon:before { +.glyphicon::before { font-family: 'Glyphicons Halflings'; font-style: normal; + font-weight: normal; line-height: 1; } diff --git a/less/glyphicons.less b/less/glyphicons.less index 6bdae20472..47bdc69ca6 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -26,14 +26,13 @@ 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; } // Catchall baseclass -.glyphicon:before { +.glyphicon::before { font-family: 'Glyphicons Halflings'; font-style: normal; + font-weight: normal; line-height: 1; }