Skip to content

B
bootstrap
Commit bc76be5d authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch 'master' into carousel_indicators_ie 

Conflicts:
	dist/css/bootstrap.min.css
parents 5e70642d f45c05a9
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
dist/css/bootstrap.css
View file @ bc76be5d
......@@ -232,7 +232,6 @@ table {
abbr[title]:after {
content: " (" attr(title) ")";
}
.ir a:after,
a[href^="javascript:"]:after,
a[href^="#"]:after {
content: "";
......
dist/css/bootstrap.min.css
View file @ bc76be5d
This source diff could not be displayed because it is too large. You can view the blob instead.
less/print.less
View file @ bc76be5d
......@@ -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: "";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment