Skip to content
GitLab
Commit 59673bf9 authored by Mark Otto's avatar Mark Otto
Browse files

Merge pull request #1003 from cgunther/docs-fixes 

Fix links in docs top bar and section ids
parents 07530073 ec7f8917
15 merge requests!14752.0 wip,!1403warningText and warningBackground docs fix,!13512.0 wip - relative font sizes,!1315[2.0-wip] Fix mustache glob when building,!1268[wip-2.0] IE 7/8 Typehead JS fix,!12362.0 wip - Fix for issue #1202,!1219Removed dotted outline on navbar dropdown menu,!1210Missing icon class from examples,!1195Fixed display of secondary container,!1090Fixed typo,!1084Default `.border-radius-custom` values,!1064Typo Fix in tables.less,!10572.0 wip,!1052Missing data attribute to close modal,!10212.0 wip
Hide whitespace changes
Inline Side-by-side
Showing
with 26 additions and 19 deletions
+26 -19
docs/base-css.html
+ 4
- 3
View file @ 59673bf9
......@@ -40,7 +40,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./scaffolding.html#grid">Grid system</a></li>
<li><a href="./scaffolding.html#grid-system">Grid system</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
......@@ -51,7 +51,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./base-css.html#type">Type</a></li>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
......@@ -72,6 +72,7 @@
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul>
</li>
<li class="dropdown">
......@@ -928,7 +929,7 @@
<p>States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.</p>
</div>
</div>
<h2>Four types of forms</h2>
<p>Bootstrap provides simple markup and styles for four styles of common web forms.</p>
<table class="bordered-table striped-table">
......
docs/components.html
+ 7
- 6
View file @ 59673bf9
......@@ -40,7 +40,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./scaffolding.html#grid">Grid system</a></li>
<li><a href="./scaffolding.html#grid-system">Grid system</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
......@@ -51,7 +51,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./base-css.html#type">Type</a></li>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
......@@ -72,6 +72,7 @@
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul>
</li>
<li class="dropdown">
......@@ -844,7 +845,7 @@
<!-- Pagination
================================================== -->
<section id="carousel">
<section id="pagination">
<div class="page-header">
<h1>Pagination <small></small></h1>
</div>
......@@ -907,9 +908,9 @@
<!-- Media
<!-- Thumbnails
================================================== -->
<section id="media">
<section id="thumbnails">
<div class="page-header">
<h1>Thumbnails <small>Grids of images, videos, text, and more</small></h1>
</div>
......@@ -1159,7 +1160,7 @@
<!-- Progress bars
================================================== -->
<section id="progresss">
<section id="progress">
<div class="page-header">
<h1>Progress bars <small>For loading, redirecting, or action status</small></h1>
</div>
......
docs/index.html
+ 3
- 2
View file @ 59673bf9
......@@ -41,7 +41,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./scaffolding.html#grid">Grid system</a></li>
<li><a href="./scaffolding.html#grid-system">Grid system</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
......@@ -52,7 +52,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./base-css.html#type">Type</a></li>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
......@@ -73,6 +73,7 @@
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul>
</li>
<li class="dropdown">
......
docs/javascript.html
+ 3
- 2
View file @ 59673bf9
......@@ -41,7 +41,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./scaffolding.html#grid">Grid system</a></li>
<li><a href="./scaffolding.html#grid-system">Grid system</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
......@@ -52,7 +52,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./base-css.html#type">Type</a></li>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
......@@ -73,6 +73,7 @@
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul>
</li>
<li class="dropdown active">
......
docs/less.html
+ 3
- 2
View file @ 59673bf9
......@@ -40,7 +40,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./scaffolding.html#grid">Grid system</a></li>
<li><a href="./scaffolding.html#grid-system">Grid system</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
......@@ -51,7 +51,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./base-css.html#type">Type</a></li>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
......@@ -72,6 +72,7 @@
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul>
</li>
<li class="dropdown">
......
docs/scaffolding.html
+ 3
- 2
View file @ 59673bf9
......@@ -40,7 +40,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./scaffolding.html#grid">Grid system</a></li>
<li><a href="./scaffolding.html#grid-system">Grid system</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
......@@ -51,7 +51,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./base-css.html#type">Type</a></li>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
......@@ -72,6 +72,7 @@
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul>
</li>
<li class="dropdown">
......
docs/upgrading.html
+ 3
- 2
View file @ 59673bf9
......@@ -40,7 +40,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./scaffolding.html#grid">Grid system</a></li>
<li><a href="./scaffolding.html#grid-system">Grid system</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
......@@ -51,7 +51,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./base-css.html#type">Type</a></li>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
......@@ -72,6 +72,7 @@
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul>
</li>
<li class="dropdown">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment