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 /_includes | |
| 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 '_includes')
| -rw-r--r-- | _includes/nav-components.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/_includes/nav-components.html b/_includes/nav-components.html index a1105cdda..8a40b1f35 100644 --- a/_includes/nav-components.html +++ b/_includes/nav-components.html @@ -93,8 +93,7 @@ <li> <a href="#alerts">Alerts</a> <ul class="nav"> - <li><a href="#alerts-default">Default alert</a></li> - <li><a href="#alerts-alternatives">Contextual alternatives</a></li> + <li><a href="#alerts-examples">Examples</a></li> <li><a href="#alerts-dismissable">Dismissable alerts</a></li> <li><a href="#alerts-links">Links in alerts</a></li> </ul> |