2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize

Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/type.less
This commit is contained in:
Mark Otto
2012-01-23 11:25:16 -08:00
7 changed files with 132 additions and 176 deletions
-2
View File
@@ -60,8 +60,6 @@ body {
// Links
a {
font-weight: inherit;
line-height: inherit;
color: @linkColor;
text-decoration: none;
&:hover {