Fix dismissible spelling #13845
Merged
Fix dismissible spelling #13845
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
|
Getting a merge conflict—perhaps drop the compiled CSS? |
|
Btw, I think you can't see that there is a merge conflict here—I'm working on that at GitHub, too. Expect a change for that in the near future (and apologies for the shitty experience the last few months on that). <3 |
|
I dropped the compiled CSS as requested. Hope that fixes the conflict. |
|
Nope, still conflicts :/ |
|
What file(s) are having the conflict? |
|
I don't know either, the interface doesn't show... Anyway, just fetch the upstream master and rebase; it should be ok then. |
|
...but my guess would be it's because of 5b9e2bf so popovers.html. |
RobJacobs
added a commit
to angular-ui/bootstrap
that referenced
this pull request
Jun 4, 2015
The use of alert-dismissable is now deprecated in correspondence with twbs/bootstrap#13845
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Based on #10404.
In the code we use
dismissable, while it should bedismissible. (Dictionary entry)I changed all references in the docs, but kept a copy of the old class name in the
alerts.lessfile, marked as deprecated, for backwards compatibility.