diff options
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/footer.html | 8 | ||||
| -rw-r--r-- | _includes/nav-components.html | 57 | ||||
| -rw-r--r-- | _includes/nav-css.html | 34 | ||||
| -rw-r--r-- | _includes/nav-getting-started.html | 12 | ||||
| -rw-r--r-- | _includes/nav-javascript.html | 2 | ||||
| -rw-r--r-- | _includes/nav-main.html | 23 | ||||
| -rw-r--r-- | _includes/social-buttons.html | 6 |
7 files changed, 79 insertions, 63 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index 83ff87e26..8898c02e8 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -9,6 +9,14 @@ <script src="{{ page.base_url }}assets/js/application.js"></script> +{% if page.slug == "customize" %} +<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/jquery.bbq.min.js"></script> +<script src="{{ page.base_url }}assets/js/customizer.js"></script> +{% endif %} + <!-- Analytics ================================================== --> <script> diff --git a/_includes/nav-components.html b/_includes/nav-components.html index 6e3228ae5..c5ced697d 100644 --- a/_includes/nav-components.html +++ b/_includes/nav-components.html @@ -10,26 +10,28 @@ <li> <a href="#btn-groups">Button groups</a> <ul class="nav"> - <li><a href="#btn-groups-single">Basic button group</a></li> + <li><a href="#btn-groups-single">Basic example</a></li> <li><a href="#btn-groups-toolbar">Button toolbar</a></li> + <li><a href="#btn-groups-sizing">Sizing</a></li> + <li><a href="#btn-groups-nested">Nesting</a></li> <li><a href="#btn-groups-vertical">Vertical variation</a></li> - <li><a href="#btn-groups-justified">Justified link buttons</a></li> + <li><a href="#btn-groups-justified">Justified link variation</a></li> </ul> </li> <li> <a href="#btn-dropdowns">Button dropdowns</a> <ul class="nav"> - <li><a href="#btn-dropdowns-single">Single button dropdown</a></li> - <li><a href="#btn-dropdowns-split">Split button dropdown</a></li> - <li><a href="#btn-dropdowns-sizes">Button sizes</a></li> + <li><a href="#btn-dropdowns-single">Single button dropdowns</a></li> + <li><a href="#btn-dropdowns-split">Split button dropdowns</a></li> + <li><a href="#btn-dropdowns-sizing">Sizing</a></li> <li><a href="#btn-dropdowns-dropup">Dropup variation</a></li> </ul> </li> <li> <a href="#input-groups">Input groups</a> <ul class="nav"> - <li><a href="#input-groups-basic">Basic input group</a></li> - <li><a href="#input-groups-sizes">Sizing options</a></li> + <li><a href="#input-groups-basic">Basic example</a></li> + <li><a href="#input-groups-sizing">Sizing</a></li> <li><a href="#input-groups-checkboxes-radios">Checkbox and radios addons</a></li> <li><a href="#input-groups-buttons">Button addons</a></li> <li><a href="#input-groups-buttons-dropdowns">Buttons with dropdowns</a></li> @@ -39,8 +41,8 @@ <li> <a href="#nav">Navs</a> <ul class="nav"> - <li><a href="#nav-tabs">Tabs nav</a></li> - <li><a href="#nav-pills">Pills nav</a></li> + <li><a href="#nav-tabs">Tabs</a></li> + <li><a href="#nav-pills">Pills</a></li> <li><a href="#nav-justified">Justified nav</a></li> <li><a href="#nav-disabled-links">Disabled links</a></li> <li><a href="#nav-alignment">Alignment options</a></li> @@ -50,18 +52,14 @@ <li> <a href="#navbar">Navbar</a> <ul class="nav"> - <li><a href="#navbar-basic">Basic navbar</a></li> - <li><a href="#navbar-nav">Nav links</a></li> - <li><a href="#navbar-forms">Forms in navbars</a></li> - <li><a href="#navbar-buttons">Buttons in navbars</a></li> - <li><a href="#navbar-text">Text in navbars</a></li> - <li><a href="#navbar-links">Links in navbars</a></li> + <li><a href="#navbar-default">Default navbar</a></li> + <li><a href="#navbar-buttons">Buttons</a></li> + <li><a href="#navbar-text">Text</a></li> + <li><a href="#navbar-links">Non-nav links</a></li> <li><a href="#navbar-component-alignment">Component alignment</a></li> - <li><a href="#navbar-fixed-top">Fixed top navbar</a></li> - <li><a href="#navbar-fixed-bottom">Fixed bottom navbar</a></li> - <li><a href="#navbar-static-top">Static top navbar</a></li> - <li><a href="#navbar-responsive">Responsive navbar</a></li> - <li><a href="#navbar-scrollable">Scrollable responsive navbar</a></li> + <li><a href="#navbar-fixed-top">Fixed to top</a></li> + <li><a href="#navbar-fixed-bottom">Fixed to bottom</a></li> + <li><a href="#navbar-static-top">Static top</a></li> <li><a href="#navbar-inverted">Inverted navbar</a></li> </ul> </li> @@ -75,17 +73,12 @@ </li> <li><a href="#labels">Labels</a></li> <li><a href="#badges">Badges</a></li> -<li> - <a href="#type-components">Typography</a> - <ul class="nav"> - <li><a href="#type-components-jumbotron">Jumbotron</a></li> - <li><a href="#type-components-page-header">Page header</a></li> - </ul> -</li> +<li><a href="#jumbotron">Jumbotron</a></li> +<li><a href="#page-header">Page header</a></li> <li> <a href="#thumbnails">Thumbnails</a> <ul class="nav"> - <li><a href="#thumbnails-default">Default thumbnails</a></li> + <li><a href="#thumbnails-default">Default example</a></li> <li><a href="#thumbnails-custom-content">Custom content</a></li> </ul> </li> @@ -94,13 +87,14 @@ <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-dismissable">Dismissable alerts</a></li> <li><a href="#alerts-links">Links in alerts</a></li> </ul> </li> <li> <a href="#progress">Progress bars</a> <ul class="nav"> - <li><a href="#progress-basic">Basic progress bar</a></li> + <li><a href="#progress-basic">Basic example</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> @@ -117,17 +111,16 @@ <li> <a href="#list-group">List group</a> <ul class="nav"> - <li><a href="#list-group-basic">Basic list group</a></li> + <li><a href="#list-group-basic">Basic example</a></li> <li><a href="#list-group-badges">Badges</a></li> <li><a href="#list-group-linked">Linked items</a></li> <li><a href="#list-group-custom-content">Custom content</a></li> - <!-- <li><a href="#list-group-pic">Leading picture</a></li> --> </ul> </li> <li> <a href="#panels">Panels</a> <ul class="nav"> - <li><a href="#panels-basic">Basic panel</a></li> + <li><a href="#panels-basic">Basic example</a></li> <li><a href="#panels-heading">Panel with heading</a></li> <li><a href="#panels-alternatives">Contextual alternatives</a></li> <li><a href="#panels-list-group">With list groups</a> diff --git a/_includes/nav-css.html b/_includes/nav-css.html index 921dfe0b2..4d2d58da3 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -4,9 +4,9 @@ <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">Type and links</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-container">Container</a></li> + <li><a href="#overview-container">Containers</a></li> </ul> </li> <li> @@ -15,12 +15,14 @@ <li> <a href="#grid">Grid system</a> <ul class="nav"> - <li><a href="#grid-options">Available options</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-mixed">Ex: Mobile-desktop</a></li> - <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktop</a></li> - <li><a href="#grid-offsetting">Offset columns</a></li> - <li><a href="#grid-nesting">Nested columns</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> + <li><a href="#grid-responsive-resets">Responsive column resets</a></li> + <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> </ul> @@ -42,21 +44,21 @@ <a href="#tables">Tables</a> <ul class="nav"> <li><a href="#tables-example">Basic example</a></li> - <li><a href="#tables-striped">Zebra striping</a></li> - <li><a href="#tables-bordered">Bordered tables</a></li> + <li><a href="#tables-striped">Striped rows</a></li> + <li><a href="#tables-bordered">Bordered table</a></li> <li><a href="#tables-hover-rows">Hover rows</a></li> - <li><a href="#tables-condensed">Condensed tables</a></li> - <li><a href="#tables-row-classes">Contextual row classes</a></li> + <li><a href="#tables-condensed">Condensed table</a></li> + <li><a href="#tables-contextual-classes">Contextual classes</a></li> </ul> </li> <li> <a href="#forms">Forms</a> <ul class="nav"> <li><a href="#forms-example">Basic example</a></li> - <li><a href="#forms-inline">Inline variation</a></li> - <li><a href="#forms-horizontal">Horizontal variation</a></li> + <li><a href="#forms-inline">Inline form</a></li> + <li><a href="#forms-horizontal">Horizontal form</a></li> <li><a href="#forms-controls">Supported controls</a></li> - <li><a href="#forms-controls-static">Static form control</a></li> + <li><a href="#forms-controls-static">Static control</a></li> <li><a href="#forms-control-states">Control states</a></li> <li><a href="#forms-control-sizes">Control sizing</a></li> <li><a href="#forms-help-text">Help text</a></li> @@ -65,9 +67,9 @@ <li> <a href="#buttons">Buttons</a> <ul class="nav"> - <li><a href="#buttons-options">Button options</a></li> + <li><a href="#buttons-options">Options</a></li> <li><a href="#buttons-sizes">Sizes</a></li> - <li><a href="#buttons-disabled">Disabled</a></li> + <li><a href="#buttons-disabled">Disabled state</a></li> <li><a href="#buttons-tags">Button tags</a></li> </ul> </li> diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html index 9788facdd..1cba756c3 100644 --- a/_includes/nav-getting-started.html +++ b/_includes/nav-getting-started.html @@ -1,7 +1,8 @@ <li> <a href="#download">Download Bootstrap</a> <ul class="nav"> - <li><a href="#download-options">Download options</a></li> + <li><a href="#download-source">Download source</a></li> + <li><a href="#download-additional">Additional downloads</a></li> <li><a href="#download-cdn">Bootstrap CDN</a></li> </ul> </li> @@ -12,12 +13,21 @@ <a href="#template">Basic template</a> </li> <li> + <a href="#examples">Examples</a> +</li> +<li> + <a href="#disable-responsive">Disabling responsiveness</a> +</li> +<li> <a href="#browsers">Browser support</a> </li> <li> <a href="#third-parties">Third party support</a> </li> <li> + <a href="#accessibility">Accessibility</a> +</li> +<li> <a href="#license-faqs">License FAQs</a> </li> <li> diff --git a/_includes/nav-javascript.html b/_includes/nav-javascript.html index 365fe1a10..e97027096 100644 --- a/_includes/nav-javascript.html +++ b/_includes/nav-javascript.html @@ -4,7 +4,7 @@ <li><a href="#js-individual-compiled">Individual or compiled</a></li> <li><a href="#js-data-attrs">Data attributes</a></li> <li><a href="#js-programmatic-api">Programmatic API</a></li> - <li><a href="#js-noconflict">No Conflict</a></li> + <li><a href="#js-noconflict">No conflict</a></li> <li><a href="#js-events">Events</a></li> </ul> </li> diff --git a/_includes/nav-main.html b/_includes/nav-main.html index a9604f588..197bad2d8 100644 --- a/_includes/nav-main.html +++ b/_includes/nav-main.html @@ -1,12 +1,15 @@ -<div class="navbar navbar-inverse navbar-fixed-top bs-docs-nav"> +<header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner"> <div class="container"> - <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC1</a> - <div class="nav-collapse collapse bs-navbar-collapse"> + <div class="navbar-header"> + <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC2</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="{{ page.base_url }}getting-started">Getting started</a> @@ -24,6 +27,6 @@ <a href="{{ page.base_url }}customize">Customize</a> </li> </ul> - </div> + </nav> </div> -</div> +</header> diff --git a/_includes/social-buttons.html b/_includes/social-buttons.html index 3700ecd14..43f5a096a 100644 --- a/_includes/social-buttons.html +++ b/_includes/social-buttons.html @@ -1,16 +1,16 @@ <div class="bs-social"> <ul class="bs-social-buttons"> <li> - <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe> + <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=watch&count=true" width="100" height="20" title="Star on GitHub"></iframe> </li> <li> - <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></iframe> + <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=fork&count=true" width="102" height="20" title="Fork on GitHub"></iframe> </li> <li class="follow-btn"> <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://twbs.github.com/bootstrap/" 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 Twitter Bootstrap">Tweet</a> </li> </ul> </div> |