0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

Merge branch 'master' into carousel_indicators_ie

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-10-20 17:45:07 -07:00
commit bc76be5dcf
3 changed files with 1 additions and 3 deletions

View File

@ -232,7 +232,6 @@ table {
abbr[title]:after {
content: " (" attr(title) ")";
}
.ir a:after,
a[href^="javascript:"]:after,
a[href^="#"]:after {
content: "";

File diff suppressed because one or more lines are too long

View File

@ -26,7 +26,6 @@
}
// Don't show links for images, or javascript/internal links
.ir a:after,
a[href^="javascript:"]:after,
a[href^="#"]:after {
content: "";