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 /_includes | |
| 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 '_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> |