diff options
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/customizer-variables.html | 83 | ||||
| -rw-r--r-- | docs/_includes/footer.html | 39 | ||||
| -rw-r--r-- | docs/_includes/header.html | 12 | ||||
| -rw-r--r-- | docs/_includes/nav-about.html | 5 | ||||
| -rw-r--r-- | docs/_includes/nav-components.html | 1 | ||||
| -rw-r--r-- | docs/_includes/nav-css.html | 17 | ||||
| -rw-r--r-- | docs/_includes/nav-customize.html | 80 | ||||
| -rw-r--r-- | docs/_includes/nav-getting-started.html | 26 | ||||
| -rw-r--r-- | docs/_includes/nav-main.html | 19 | ||||
| -rw-r--r-- | docs/_includes/nav-migration.html | 12 | ||||
| -rw-r--r-- | docs/_includes/old-bs-docs.html | 8 | ||||
| -rw-r--r-- | docs/_includes/social-buttons.html | 2 |
12 files changed, 179 insertions, 125 deletions
diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index 0b4429d72..4ffc3ab38 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -1,5 +1,5 @@ -<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-vars-form` Grunt task using the customizer-variables.jade template.--> +<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.--> <h2 id="colors">Colors</h2> <p>Gray and brand colors for use across Bootstrap.</p> <div class="row"> @@ -131,7 +131,7 @@ <div class="bs-customizer-input"> <label for="input-@line-height-computed">@line-height-computed</label> <input id="input-@line-height-computed" type="text" value="floor((@font-size-base * @line-height-base))" data-var="@line-height-computed" class="form-control"/> - <p class="help-block">Computed "line-height" (<code>font-size</code> &times; <code>line-height</code>) for use with <code>margin</code>, <code>padding</code>, etc.</p> + <p class="help-block">Computed "line-height" (<code>font-size</code> * <code>line-height</code>) for use with <code>margin</code>, <code>padding</code>, etc.</p> </div> <div class="bs-customizer-input"> <label for="input-@headings-font-family">@headings-font-family</label> @@ -572,6 +572,37 @@ <p class="help-block">Point at which the navbar begins collapsing.</p> </div> </div> +<h2 id="container-sizes">Container sizes</h2> +<p>Define the maximum width of <code>.container</code> for different screen sizes.</p> +<div class="row"> + <div class="bs-customizer-input"> + <label for="input-@container-tablet">@container-tablet</label> + <input id="input-@container-tablet" type="text" value="((720px + @grid-gutter-width))" data-var="@container-tablet" class="form-control"/> + </div> + <div class="bs-customizer-input"> + <label for="input-@container-sm">@container-sm</label> + <input id="input-@container-sm" type="text" value="@container-tablet" data-var="@container-sm" class="form-control"/> + <p class="help-block">For <code>@screen-sm-min</code> and up.</p> + </div> + <div class="bs-customizer-input"> + <label for="input-@container-desktop">@container-desktop</label> + <input id="input-@container-desktop" type="text" value="((940px + @grid-gutter-width))" data-var="@container-desktop" class="form-control"/> + </div> + <div class="bs-customizer-input"> + <label for="input-@container-md">@container-md</label> + <input id="input-@container-md" type="text" value="@container-desktop" data-var="@container-md" class="form-control"/> + <p class="help-block">For <code>@screen-md-min</code> and up.</p> + </div> + <div class="bs-customizer-input"> + <label for="input-@container-large-desktop">@container-large-desktop</label> + <input id="input-@container-large-desktop" type="text" value="((1140px + @grid-gutter-width))" data-var="@container-large-desktop" class="form-control"/> + </div> + <div class="bs-customizer-input"> + <label for="input-@container-lg">@container-lg</label> + <input id="input-@container-lg" type="text" value="@container-large-desktop" data-var="@container-lg" class="form-control"/> + <p class="help-block">For <code>@screen-lg-min</code> and up.</p> + </div> +</div> <h2 id="navbar">Navbar</h2> <p></p> <div class="row"> @@ -596,6 +627,10 @@ <input id="input-@navbar-padding-vertical" type="text" value="((@navbar-height - @line-height-computed) / 2)" data-var="@navbar-padding-vertical" class="form-control"/> </div> <div class="bs-customizer-input"> + <label for="input-@navbar-collapse-max-height">@navbar-collapse-max-height</label> + <input id="input-@navbar-collapse-max-height" type="text" value="340px" data-var="@navbar-collapse-max-height" class="form-control"/> + </div> + <div class="bs-customizer-input"> <label for="input-@navbar-default-color">@navbar-default-color</label> <input id="input-@navbar-default-color" type="text" value="#777" data-var="@navbar-default-color" class="form-control"/> </div> @@ -1117,7 +1152,7 @@ <div class="bs-customizer-input"> <label for="input-@modal-content-fallback-border-color">@modal-content-fallback-border-color</label> <input id="input-@modal-content-fallback-border-color" type="text" value="#999" data-var="@modal-content-fallback-border-color" class="form-control"/> - <p class="help-block">Modal content border color <strong>for IE8</strong></p> + <p class="help-block">Modal content border color <strong>for IE8</strong></p> </div> <div class="bs-customizer-input"> <label for="input-@modal-backdrop-bg">@modal-backdrop-bg</label> @@ -1144,6 +1179,10 @@ <input id="input-@modal-lg" type="text" value="900px" data-var="@modal-lg" class="form-control"/> </div> <div class="bs-customizer-input"> + <label for="input-@modal-md">@modal-md</label> + <input id="input-@modal-md" type="text" value="600px" data-var="@modal-md" class="form-control"/> + </div> + <div class="bs-customizer-input"> <label for="input-@modal-sm">@modal-sm</label> <input id="input-@modal-sm" type="text" value="300px" data-var="@modal-sm" class="form-control"/> </div> @@ -1624,6 +1663,11 @@ <p class="help-block">Blockquote small color</p> </div> <div class="bs-customizer-input"> + <label for="input-@blockquote-font-size">@blockquote-font-size</label> + <input id="input-@blockquote-font-size" type="text" value="(@font-size-base * 1.25)" data-var="@blockquote-font-size" class="form-control"/> + <p class="help-block">Blockquote font size</p> + </div> + <div class="bs-customizer-input"> <label for="input-@blockquote-border-color">@blockquote-border-color</label> <input id="input-@blockquote-border-color" type="text" value="@gray-lighter" data-var="@blockquote-border-color" class="form-control"/> <p class="help-block">Blockquote border color</p> @@ -1648,35 +1692,4 @@ <p class="help-block">Horizontal offset for forms and lists.</p> </div> </div> -<h2 id="container-sizes">Container sizes</h2> -<p>Define the maximum width of <code>.container</code> for different screen sizes.</p> -<div class="row"> - <div class="bs-customizer-input"> - <label for="input-@container-tablet">@container-tablet</label> - <input id="input-@container-tablet" type="text" value="((720px + @grid-gutter-width))" data-var="@container-tablet" class="form-control"/> - </div> - <div class="bs-customizer-input"> - <label for="input-@container-sm">@container-sm</label> - <input id="input-@container-sm" type="text" value="@container-tablet" data-var="@container-sm" class="form-control"/> - <p class="help-block">For <code>@screen-sm-min</code> and up.</p> - </div> - <div class="bs-customizer-input"> - <label for="input-@container-desktop">@container-desktop</label> - <input id="input-@container-desktop" type="text" value="((940px + @grid-gutter-width))" data-var="@container-desktop" class="form-control"/> - </div> - <div class="bs-customizer-input"> - <label for="input-@container-md">@container-md</label> - <input id="input-@container-md" type="text" value="@container-desktop" data-var="@container-md" class="form-control"/> - <p class="help-block">For <code>@screen-md-min</code> and up.</p> - </div> - <div class="bs-customizer-input"> - <label for="input-@container-large-desktop">@container-large-desktop</label> - <input id="input-@container-large-desktop" type="text" value="((1140px + @grid-gutter-width))" data-var="@container-large-desktop" class="form-control"/> - </div> - <div class="bs-customizer-input"> - <label for="input-@container-lg">@container-lg</label> - <input id="input-@container-lg" type="text" value="@container-large-desktop" data-var="@container-lg" class="form-control"/> - <p class="help-block">For <code>@screen-lg-min</code> and up.</p> - </div> -</div> -<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-vars-form` Grunt task using the customizer-variables.jade template.-->
\ No newline at end of file +<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
\ No newline at end of file diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index a9cff817e..c5edb3e65 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -1,11 +1,42 @@ +<!-- Footer +================================================== --> +<footer class="bs-footer" role="contentinfo"> + <div class="container"> + {% include social-buttons.html %} + + <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> + <p>Maintained by the <a href="https://github.com/twbs?tab=members">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p> + <p>Code licensed under <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> + <ul class="footer-links muted"> + <li>Currently v{{ site.current_version }}</li> + <li>·</li> + <li><a href="{{ site.repo }}">GitHub</a></li> + <li>·</li> + <li><a href="../getting-started/#examples">Examples</a></li> + <li>·</li> + <li><a href="../2.3.2/">v2.3.2 docs</a></li> + <li>·</li> + <li><a href="../about/">About</a></li> + <li>·</li> + <li><a href="{{ site.expo }}">Expo</a></li> + <li>·</li> + <li><a href="{{ site.blog }}">Blog</a></li> + <li>·</li> + <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li> + <li>·</li> + <li><a href="{{ site.repo }}/releases">Releases</a></li> + </ul> + </div> +</footer> + <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> -<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> -<script src="{{ site.baseurl }}dist/js/bootstrap.min.js"></script> -<script src="{{ site.baseurl }}assets/js/docs.min.js"></script> +<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> +<script src="../dist/js/bootstrap.min.js"></script> +<script src="../assets/js/docs.min.js"></script> {% if page.slug == "customize" %} -<script src="{{ site.baseurl }}assets/js/customize.min.js"></script> +<script src="../assets/js/customize.min.js"></script> {% endif %} {% comment %} diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 9b1b5fddd..defb549ae 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -1,6 +1,6 @@ <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> -<meta name="viewport" content="width=device-width, initial-scale=1.0"> +<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content="Bootstrap, a sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development."> <meta name="keywords" content="HTML, CSS, JS, JavaScript, framework, bootstrap, front-end, frontend, web development"> <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors"> @@ -14,11 +14,11 @@ </title> <!-- Bootstrap core CSS --> -<link href="{{ site.baseurl }}dist/css/bootstrap.min.css" rel="stylesheet"> +<link href="../dist/css/bootstrap.min.css" rel="stylesheet"> <!-- Documentation extras --> -<link href="{{ site.baseurl }}assets/css/pack.min.css" rel="stylesheet"> -<!--[if lt IE 9]><script src="{{ site.baseurl }}assets/js/ie8-responsive-file-warning.js"></script><![endif]--> +<link href="../assets/css/docs.min.css" rel="stylesheet"> +<!--[if lt IE 9]><script src="../assets/js/ie8-responsive-file-warning.js"></script><![endif]--> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> @@ -27,8 +27,8 @@ <![endif]--> <!-- Favicons --> -<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}assets/ico/apple-touch-icon-144-precomposed.png"> - <link rel="shortcut icon" href="{{ site.baseurl }}assets/ico/favicon.ico"> +<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> + <link rel="shortcut icon" href="../assets/ico/favicon.ico"> <script> var _gaq = _gaq || []; diff --git a/docs/_includes/nav-about.html b/docs/_includes/nav-about.html index f0f4a5b8a..bf6b684e9 100644 --- a/docs/_includes/nav-about.html +++ b/docs/_includes/nav-about.html @@ -5,8 +5,5 @@ <a href="#team">Team</a> </li> <li> - <a href="#community">Community</a> -</li> -<li> - <a href="#translations">Translations</a> + <a href="#brand">Brand guidelines</a> </li> diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html index 131114883..a7ec8a240 100644 --- a/docs/_includes/nav-components.html +++ b/docs/_includes/nav-components.html @@ -102,6 +102,7 @@ <a href="#progress">Progress bars</a> <ul class="nav"> <li><a href="#progress-basic">Basic example</a></li> + <li><a href="#progress-label">With label</a></li> <li><a href="#progress-alternatives">Contextual alternatives</a></li> <li><a href="#progress-striped">Striped</a></li> <li><a href="#progress-animated">Animated</a></li> diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html index a7ca471bd..15025da0c 100644 --- a/docs/_includes/nav-css.html +++ b/docs/_includes/nav-css.html @@ -3,9 +3,8 @@ <ul class="nav"> <li><a href="#overview-doctype">HTML5 doctype</a></li> <li><a href="#overview-mobile">Mobile first</a></li> - <li><a href="#overview-responsive-images">Responsive images</a></li> <li><a href="#overview-type-links">Typography and links</a></li> - <li><a href="#overview-normalize">Normalize</a></li> + <li><a href="#overview-normalize">Normalize.css</a></li> <li><a href="#overview-container">Containers</a></li> </ul> </li> @@ -15,7 +14,7 @@ <li><a href="#grid-intro">Introduction</a></li> <li><a href="#grid-media-queries">Media queries</a></li> <li><a href="#grid-options">Grid options</a></li> - <li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li> + <li><a href="#grid-example-basic">Ex: Stacked-to-horizontal</a></li> <li><a href="#grid-example-fluid">Ex: Fluid container</a></li> <li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li> <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li> @@ -23,7 +22,7 @@ <li><a href="#grid-offsetting">Offsetting columns</a></li> <li><a href="#grid-nesting">Nesting columns</a></li> <li><a href="#grid-column-ordering">Column ordering</a></li> - <li><a href="#grid-less">LESS mixins and variables</a></li> + <li><a href="#grid-less">Less mixins and variables</a></li> </ul> </li> <li> @@ -85,6 +84,10 @@ </li> <li> <a href="#images">Images</a> + <ul class="nav"> + <li><a href="#images-responsive">Responsive images</a></li> + <li><a href="#images-shapes">Image shapes</a></li> + </ul> </li> <li> <a href="#helper-classes">Helper classes</a> @@ -112,6 +115,7 @@ <li> <a href="#less">Using Less</a> <ul class="nav"> + <li><a href="#less-bootstrap">Compiling Bootstrap</a></li> <li><a href="#less-variables">Variables</a></li> <li><a href="#less-mixins-vendor">Vendor mixins</a></li> <li><a href="#less-mixins-utility">Utility mixins</a></li> @@ -121,9 +125,6 @@ <a href="#sass">Using Sass</a> <ul class="nav"> <li><a href="#sass-contents">What's included</a></li> - <li><a href="#sass-installation-rails">Rails install</a></li> - <li><a href="#sass-installation-compass">Compass install</a></li> - <li><a href="#sass-installation-sass-only">Sass install</a></li> - <li><a href="#sass-usage">Usage</a></li> + <li><a href="#sass-installation">Rails install</a></li> </ul> </li> diff --git a/docs/_includes/nav-customize.html b/docs/_includes/nav-customize.html index 661a2607e..8fe3e81d1 100644 --- a/docs/_includes/nav-customize.html +++ b/docs/_includes/nav-customize.html @@ -1,40 +1,46 @@ -<li> - <a href="#less">LESS components</a> -</li> -<li> - <a href="#plugins">jQuery plugins</a> -</li> -<li> - <a href="#less-variables">LESS variables</a> + +<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.--> +<li><a href="#less">Less components</a></li> +<li><a href="#plugins">jQuery plugins</a></li> +<li><a href="#less-variables">Less variables</a> <ul class="nav"> - <li><a href="#variables-basics">Basics</a></li> - <li><a href="#variables-buttons">Buttons</a></li> - <li><a href="#variables-form-states">Form states</a></li> - <li><a href="#variables-alerts">Alerts</a></li> - <li><a href="#variables-navbar">Navbar</a></li> - <li><a href="#variables-nav">Nav</a></li> - <li><a href="#variables-tables">Tables</a></li> - <li><a href="#variables-forms">Forms</a></li> - <li><a href="#variables-dropdowns">Dropdowns</a></li> - <li><a href="#variables-panels-wells">Panels and wells</a></li> - <li><a href="#variables-accordion">Accordion</a></li> - <li><a href="#variables-badges">Badges</a></li> - <li><a href="#variables-breadcrumbs">Breadcrumbs</a></li> - <li><a href="#variables-jumbotron">Jumbotron</a></li> - <li><a href="#variables-modals">Modals</a></li> - <li><a href="#variables-carousel">Carousel</a></li> - <li><a href="#variables-list-group">List group</a></li> - <li><a href="#variables-thumbnails">Thumbnails</a></li> - <li><a href="#variables-progress">Progress bars</a></li> - <li><a href="#variables-pagination">Pagination</a></li> - <li><a href="#variables-pager">Pager</a></li> - <li><a href="#variables-labels">Labels</a></li> - <li><a href="#variables-tooltips-popovers">Tooltips and popovers</a></li> - <li><a href="#variables-close">Close button</a></li> - <li><a href="#variables-type">Type</a></li> - <li><a href="#variables-other">Other</a></li> + <li><a href="#colors">Colors</a></li> + <li><a href="#scaffolding">Scaffolding</a></li> + <li><a href="#typography">Typography</a></li> + <li><a href="#components">Components</a></li> + <li><a href="#tables">Tables</a></li> + <li><a href="#buttons">Buttons</a></li> + <li><a href="#forms">Forms</a></li> + <li><a href="#dropdowns">Dropdowns</a></li> + <li><a href="#media-queries-breakpoints">Media queries breakpoints</a></li> + <li><a href="#grid-system">Grid system</a></li> + <li><a href="#container-sizes">Container sizes</a></li> + <li><a href="#navbar">Navbar</a></li> + <li><a href="#navs">Navs</a></li> + <li><a href="#tabs">Tabs</a></li> + <li><a href="#pills">Pills</a></li> + <li><a href="#pagination">Pagination</a></li> + <li><a href="#pager">Pager</a></li> + <li><a href="#jumbotron">Jumbotron</a></li> + <li><a href="#form-states-and-alerts">Form states and alerts</a></li> + <li><a href="#tooltips">Tooltips</a></li> + <li><a href="#popovers">Popovers</a></li> + <li><a href="#labels">Labels</a></li> + <li><a href="#modals">Modals</a></li> + <li><a href="#alerts">Alerts</a></li> + <li><a href="#progress-bars">Progress bars</a></li> + <li><a href="#list-group">List group</a></li> + <li><a href="#panels">Panels</a></li> + <li><a href="#thumbnails">Thumbnails</a></li> + <li><a href="#wells">Wells</a></li> + <li><a href="#badges">Badges</a></li> + <li><a href="#breadcrumbs">Breadcrumbs</a></li> + <li><a href="#carousel">Carousel</a></li> + <li><a href="#close">Close</a></li> + <li><a href="#code">Code</a></li> + <li><a href="#type">Type</a></li> + <li><a href="#miscellaneous">Miscellaneous</a></li> </ul> </li> -<li> - <a href="#download">Download</a> -</li> +<li><a href="#download">Download</a></li> +<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.-->
\ No newline at end of file diff --git a/docs/_includes/nav-getting-started.html b/docs/_includes/nav-getting-started.html index 96e175dd2..54e24839d 100644 --- a/docs/_includes/nav-getting-started.html +++ b/docs/_includes/nav-getting-started.html @@ -1,10 +1,5 @@ <li> - <a href="#download">Download Bootstrap</a> - <ul class="nav"> - <li><a href="#download-compiled">Compiled CSS, JS, and fonts</a></li> - <li><a href="#download-additional">Additional downloads</a></li> - <li><a href="#download-cdn">Bootstrap CDN</a></li> - </ul> + <a href="#download">Download</a> </li> <li> <a href="#whats-included">What's included</a> @@ -18,18 +13,21 @@ </li> <li> <a href="#examples">Examples</a> + <ul class="nav"> + <li><a href="#examples-framework">Using the framework</a></li> + <li><a href="#examples-navbars">Navbars in action</a></li> + <li><a href="#examples-custom">Custom components</a></li> + <li><a href="#examples-experiments">Experiments</a></li> + </ul> +</li> +<li> + <a href="#community">Community</a> </li> <li> <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="#support">Browser and device support</a> @@ -43,6 +41,7 @@ <li><a href="#support-safari-percentages">Safari percent rounding</a></li> <li><a href="#support-fixed-position-keyboards">Modals, navbars, and virtual keyboards</a></li> <li><a href="#support-browser-zooming">Browser zooming</a></li> + <li><a href="#support-printing">Printer viewports</a></li> <li><a href="#support-android-stock-browser">Android stock browser</a></li> </ul> </li> @@ -58,3 +57,6 @@ <li> <a href="#customizing">Customizing Bootstrap</a> </li> +<li> + <a href="#translations">Translations</a> +</li> diff --git a/docs/_includes/nav-main.html b/docs/_includes/nav-main.html index b39e6edfa..9f449f258 100644 --- a/docs/_includes/nav-main.html +++ b/docs/_includes/nav-main.html @@ -1,4 +1,4 @@ -<header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner"> +<header class="navbar navbar-static-top bs-docs-nav" id="top" role="banner"> <div class="container"> <div class="navbar-header"> <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse"> @@ -7,30 +7,29 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a href="{{ site.baseurl }}" class="navbar-brand">Bootstrap</a> + <a href="../" class="navbar-brand">Bootstrap</a> </div> <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation"> <ul class="nav navbar-nav"> <li{% if page.slug == "getting-started" %} class="active"{% endif %}> - <a href="{{ site.baseurl }}getting-started">Getting started</a> + <a href="../getting-started">Getting started</a> </li> <li{% if page.slug == "css" %} class="active"{% endif %}> - <a href="{{ site.baseurl }}css">CSS</a> + <a href="../css">CSS</a> </li> <li{% if page.slug == "components" %} class="active"{% endif %}> - <a href="{{ site.baseurl }}components">Components</a> + <a href="../components">Components</a> </li> <li{% if page.slug == "js" %} class="active"{% endif %}> - <a href="{{ site.baseurl }}javascript">JavaScript</a> + <a href="../javascript">JavaScript</a> </li> <li{% if page.slug == "customize" %} class="active"{% endif %}> - <a href="{{ site.baseurl }}customize">Customize</a> + <a href="../customize">Customize</a> </li> </ul> <ul class="nav navbar-nav navbar-right"> - <li{% if page.slug == "about" %} class="active"{% endif %}> - <a href="{{ site.baseurl }}about">About</a> - </li> + <li><a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Navbar', 'Community links', 'Expo']);">Expo</a></li> + <li><a href="{{ site.blog }}" onclick="_gaq.push(['_trackEvent', 'Navbar', 'Community links', 'Blog']);">Blog</a></li> </ul> </nav> </div> diff --git a/docs/_includes/nav-migration.html b/docs/_includes/nav-migration.html new file mode 100644 index 000000000..10128a87e --- /dev/null +++ b/docs/_includes/nav-migration.html @@ -0,0 +1,12 @@ +<li> + <a href="#classes">Major class changes</a> +</li> +<li> + <a href="#new">What's new</a> +</li> +<li> + <a href="#dropped">What's removed</a> +</li> +<li> + <a href="#notes">Additional notes</a> +</li> diff --git a/docs/_includes/old-bs-docs.html b/docs/_includes/old-bs-docs.html deleted file mode 100644 index 81f367d81..000000000 --- a/docs/_includes/old-bs-docs.html +++ /dev/null @@ -1,8 +0,0 @@ -<div class="bs-old-docs"> - <div class="container"> - <strong> - <a href="{{ site.baseurl }}2.3.2/">Looking for Bootstrap 2.3.2 docs?</a> - </strong> - We've moved it to a new home while we push forward with Bootstrap 3. <a href="http://blog.getbootstrap.com/">Read the blog</a> for details. - </div> -</div> diff --git a/docs/_includes/social-buttons.html b/docs/_includes/social-buttons.html index 43f5a096a..2019875e3 100644 --- a/docs/_includes/social-buttons.html +++ b/docs/_includes/social-buttons.html @@ -10,7 +10,7 @@ <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a> </li> <li class="tweet-btn"> - <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://getbootstrap.com/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a> + <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://getbootstrap.com/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Bootstrap">Tweet</a> </li> </ul> </div> |