diff options
| author | Mark Otto <[email protected]> | 2014-07-12 17:56:30 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-12 17:56:30 -0700 |
| commit | 4e55a867a02550030609dbf675aa1e00aeb92e9f (patch) | |
| tree | 84472f76afce83188f287c7993167e93e16ab1ea | |
| parent | 5cfde0d3a5819374e5f750b4fcfedfccc5c19889 (diff) | |
| parent | bb1286a0ab073bce1d18f704d7ac0545ea76c6ef (diff) | |
| download | bootstrap-4e55a867a02550030609dbf675aa1e00aeb92e9f.tar.xz bootstrap-4e55a867a02550030609dbf675aa1e00aeb92e9f.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_includes/components/alerts.html
docs/_includes/getting-started/browser-device-support.html
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | docs/javascript/alerts.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c0c9820f6..885124fc1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,7 +44,7 @@ Guidelines for bug reports: 3. **Isolate the problem** — ideally create a [reduced test case](http://css-tricks.com/6263-reduced-test-cases/) and a live example. - [This JS Bin](http://jsbin.com/EBAwOkOK/1) is a helpful template. + [This JS Bin](http://jsbin.com/lefey/1/edit?html,output) is a helpful template. A good bug report shouldn't leave others needing to chase you up for more diff --git a/docs/javascript/alerts.md b/docs/javascript/alerts.md index 448e96795..43ef5a20b 100644 --- a/docs/javascript/alerts.md +++ b/docs/javascript/alerts.md @@ -9,14 +9,14 @@ title: Alerts <h2 id="alerts-examples">Example alerts</h2> <p>Add dismiss functionality to all alert messages with this plugin.</p> <div class="bs-example"> - <div class="alert alert-warning fade in" role="alert"> + <div class="alert alert-warning alert-dismissible fade in" role="alert"> <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> <strong>Holy guacamole!</strong> Best check yo self, you're not looking too good. </div> </div><!-- /example --> <div class="bs-example"> - <div class="alert alert-danger fade in" role="alert"> + <div class="alert alert-danger alert-dismissible fade in" role="alert"> <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> <h4>Oh snap! You got an error!</h4> <p>Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p> |