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:
commit
bc76be5dcf
1
dist/css/bootstrap.css
vendored
1
dist/css/bootstrap.css
vendored
@ -232,7 +232,6 @@ table {
|
||||
abbr[title]:after {
|
||||
content: " (" attr(title) ")";
|
||||
}
|
||||
.ir a:after,
|
||||
a[href^="javascript:"]:after,
|
||||
a[href^="#"]:after {
|
||||
content: "";
|
||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -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: "";
|
||||
|
Loading…
Reference in New Issue
Block a user