diff options
| author | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
| commit | 9dcae610e97c5422652d7212fda5985de1653d4c (patch) | |
| tree | 03f5f15fb5d3a1561f69ce97a1a9f651e816330c /_includes | |
| parent | 578a14e14aa7c6ad37f307d5d78e9a2afb0e7bfb (diff) | |
| parent | 5bd2d7ed7e5a2bae56de81bf550f2e4b1451ab25 (diff) | |
| download | bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.tar.xz bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
customize.html
examples/justified-nav/justified-nav.css
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/footer.html | 1 | ||||
| -rw-r--r-- | _includes/nav-components.html | 8 | ||||
| -rw-r--r-- | _includes/nav-css.html | 3 | ||||
| -rw-r--r-- | _includes/nav-getting-started.html | 9 |
4 files changed, 18 insertions, 3 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index bd5a23b2c..ef339687c 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -13,6 +13,7 @@ <script src="{{ page.base_url }}assets/js/less.js"></script> <script src="{{ page.base_url }}assets/js/jszip.js"></script> <script src="{{ page.base_url }}assets/js/uglify.js"></script> +<script src="{{ page.base_url }}assets/js/filesaver.js"></script> <script src="{{ page.base_url }}assets/js/customizer.js"></script> {% endif %} diff --git a/_includes/nav-components.html b/_includes/nav-components.html index c5ced697d..a1105cdda 100644 --- a/_includes/nav-components.html +++ b/_includes/nav-components.html @@ -1,4 +1,12 @@ <li> + <a href="#glyphicons">Glyphicons</a> + <ul class="nav"> + <li><a href="#glyphicons-glyphs">Available glyphs</a></li> + <li><a href="#glyphicons-how-to-use">How to use</a></li> + <li><a href="#glyphicons-examples">Examples</a></li> + </ul> +</li> +<li> <a href="#dropdowns">Dropdowns</a> <ul class="nav"> <li><a href="#dropdowns-example">Example</a></li> diff --git a/_includes/nav-css.html b/_includes/nav-css.html index 4d2d58da3..31ba46403 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -10,9 +10,6 @@ </ul> </li> <li> - <a href="#glyphicons">Glyphicons</a> -</li> -<li> <a href="#grid">Grid system</a> <ul class="nav"> <li><a href="#grid-media-queries">Media queries</a></li> diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html index 1cba756c3..8285af1bb 100644 --- a/_includes/nav-getting-started.html +++ b/_includes/nav-getting-started.html @@ -19,6 +19,15 @@ <a href="#disable-responsive">Disabling responsiveness</a> </li> <li> + <a href="#migration">Migrating from 2.x to 3.0</a> + <ul class="nav"> + <li><a href="#migration-classes">Major class changes</a></li> + <li><a href="#migration-new">What's new</a></li> + <li><a href="#migration-dropped">What's removed</a></li> + <li><a href="#migration-notes">Additional notes</a></li> + </ul> +</li> +<li> <a href="#browsers">Browser support</a> </li> <li> |