Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
8ae9c6ab
Commit
8ae9c6ab
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Fixes
#7688
: move font-weight for glyphicons to before pseudo element
parent
57ba4944
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+2
-3
docs/assets/css/bootstrap.css
less/glyphicons.less
+2
-3
less/glyphicons.less
with
4 additions
and
6 deletions
+4
-6
docs/assets/css/bootstrap.css
+
2
-
3
View file @
8ae9c6ab
...
...
@@ -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
;
}
...
...
This diff is collapsed.
Click to expand it.
less/glyphicons.less
+
2
-
3
View file @
8ae9c6ab
...
...
@@ -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;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment