diff options
| author | Mark Otto <[email protected]> | 2013-08-18 20:11:04 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 20:11:04 -0700 |
| commit | a1db2d7a5ee452ee272f0d040aceec6f947a8b75 (patch) | |
| tree | 124eb3d18c886b08b725a2b6e0c41c44c3abcff0 /examples | |
| parent | 0615142834343af8c40cd7ad47c498431745f080 (diff) | |
| parent | 2e9184366129139bb9b64b679a0e75a3c556465e (diff) | |
| download | bootstrap-a1db2d7a5ee452ee272f0d040aceec6f947a8b75.tar.xz bootstrap-a1db2d7a5ee452ee272f0d040aceec6f947a8b75.zip | |
Merge branch '3.0.0-wip' into bs3_panel_base_class
Conflicts:
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/theme/index.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/theme/index.html b/examples/theme/index.html index 868e829f3..2f726d822 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -219,15 +219,15 @@ <div class="page-header"> <h1>Alerts</h1> </div> - <div class="alert"> - <strong>Warning!</strong> Best check yo self, you're not looking too good. - </div> <div class="alert alert-success"> <strong>Well done!</strong> You successfully read this important alert message. </div> <div class="alert alert-info"> <strong>Heads up!</strong> This alert needs your attention, but it's not super important. </div> + <div class="alert alert-warning"> + <strong>Warning!</strong> Best check yo self, you're not looking too good. + </div> <div class="alert alert-danger"> <strong>Oh snap!</strong> Change a few things up and try submitting again. </div> |