Fixes #13478, reverts #10941 #13542
Merged
Fixes #13478, reverts #10941 #13542
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
A corresponding update to the callouts in the Glyphicons component docs will be required. |
|
Slightly tangential, but folks reading this should be aware that:
can break our font URLs, and there's not much we can do about that on our end. |
Conflicts: dist/css/bootstrap-rtl.css dist/css/bootstrap.css.map dist/js/bootstrap.min.js docs/dist/css/bootstrap.css.map docs/dist/js/bootstrap.min.js
Conflicts: dist/css/bootstrap.css.map docs/dist/css/bootstrap.css.map
Conflicts: dist/css/bootstrap.css.map docs/dist/css/bootstrap.css.map
|
@mdo Is this blocked by something on your side, or is this just waiting on my docs update? |
|
@cvrebert Tests were failing for some reason. I'm not going to hold up anymore, so I'll merge this and we can fix any docs stuff later. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In v3.0.3, we hardcoded some URL escaping around our icon paths as a way to fix broken assets when Bootstrap was included via Bower. This undoes that and instead puts it within the power of folks implementing Bootstrap via Bower to use the relative URLs feature of Less.
Fixes #13478.
/cc @cvrebert