]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Fixes #7688: move font-weight for glyphicons to before pseudo element
authorMark Otto <otto@github.com>
Sat, 27 Apr 2013 06:13:04 +0000 (23:13 -0700)
committerMark Otto <otto@github.com>
Sat, 27 Apr 2013 06:14:06 +0000 (23:14 -0700)
docs/assets/css/bootstrap.css
less/glyphicons.less

index f8db46767a7241b25268cb53206bb5e9e99d0725..70b610e52bf6641618ab464885e737a0c5e3bda9 100644 (file)
@@ -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;
 }
 
index 6bdae2047202387e80f5d1ee9008f38bf6df9de1..47bdc69ca6b4bb5cf48337ada265bcf1a666a762 100644 (file)
        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;
 }