diff options
| author | Mark Otto <[email protected]> | 2013-08-18 20:15:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 20:15:45 -0700 |
| commit | a9378a92670f4bf5ccb753191af795c45bb64998 (patch) | |
| tree | 9690c9a1c123c3103a1f345015f93aac8b43e983 /examples | |
| parent | cf09e6a6b5e314f4f7433f21bd32287885c95451 (diff) | |
| parent | f584500211af84038bcff9b363343eb02cda6ccd (diff) | |
| download | bootstrap-a9378a92670f4bf5ccb753191af795c45bb64998.tar.xz bootstrap-a9378a92670f4bf5ccb753191af795c45bb64998.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
customize.html
dist/css/bootstrap.min.css
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/theme/index.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/theme/index.html b/examples/theme/index.html index a44a8220a..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> @@ -309,7 +309,7 @@ </div> <div class="row"> <div class="col-sm-4"> - <div class="panel"> + <div class="panel panel-default"> <div class="panel-heading"> <h3 class="panel-title">Panel title</h3> </div> |