summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap/_includes
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2013-08-16 16:26:07 -0700
committerThomas Park <thomas@thomaspark.me>2013-08-16 16:26:07 -0700
commit4fe37339653c909368ba772ea9214c0b2a511fee (patch)
tree7573a3ef5486c1397e3f267f856de0fb3a031177 /bower_components/bootstrap/_includes
parentf9b56d31da29a641fcfdc33825ac84422eea2b84 (diff)
update bootstrap to 3.0.0-rc2
Diffstat (limited to 'bower_components/bootstrap/_includes')
-rwxr-xr-x[-rw-r--r--]bower_components/bootstrap/_includes/ads.html2
-rwxr-xr-x[-rw-r--r--]bower_components/bootstrap/_includes/footer.html11
-rwxr-xr-x[-rw-r--r--]bower_components/bootstrap/_includes/header.html8
-rwxr-xr-x[-rw-r--r--]bower_components/bootstrap/_includes/nav-components.html71
-rwxr-xr-x[-rw-r--r--]bower_components/bootstrap/_includes/nav-css.html34
-rwxr-xr-x[-rw-r--r--]bower_components/bootstrap/_includes/nav-customize.html0
-rwxr-xr-x[-rw-r--r--]bower_components/bootstrap/_includes/nav-getting-started.html17
-rwxr-xr-x[-rw-r--r--]bower_components/bootstrap/_includes/nav-javascript.html2
-rwxr-xr-x[-rw-r--r--]bower_components/bootstrap/_includes/nav-main.html23
-rwxr-xr-x[-rw-r--r--]bower_components/bootstrap/_includes/old-bs-docs.html0
-rwxr-xr-x[-rw-r--r--]bower_components/bootstrap/_includes/social-buttons.html6
11 files changed, 108 insertions, 66 deletions
diff --git a/bower_components/bootstrap/_includes/ads.html b/bower_components/bootstrap/_includes/ads.html
index 495e7ba4..ba4775f5 100644..100755
--- a/bower_components/bootstrap/_includes/ads.html
+++ b/bower_components/bootstrap/_includes/ads.html
@@ -1 +1 @@
-<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div> \ No newline at end of file
+<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script>var z = document.createElement("script"); z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
diff --git a/bower_components/bootstrap/_includes/footer.html b/bower_components/bootstrap/_includes/footer.html
index 47a671b2..8898c02e 100644..100755
--- a/bower_components/bootstrap/_includes/footer.html
+++ b/bower_components/bootstrap/_includes/footer.html
@@ -4,18 +4,25 @@
<script src="{{ page.base_url }}assets/js/jquery.js"></script>
<script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
-<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+<script src="http://platform.twitter.com/widgets.js"></script>
<script src="{{ page.base_url }}assets/js/holder.js"></script>
<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>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
- t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
diff --git a/bower_components/bootstrap/_includes/header.html b/bower_components/bootstrap/_includes/header.html
index 0a418d48..827b1c2c 100644..100755
--- a/bower_components/bootstrap/_includes/header.html
+++ b/bower_components/bootstrap/_includes/header.html
@@ -20,8 +20,8 @@
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
- <script src="/assets/js/html5shiv.js"></script>
- <script src="/assets/js/respond.min.js"></script>
+ <script src="{{ page.base_url }}assets/js/html5shiv.js"></script>
+ <script src="{{ page.base_url }}assets/js/respond.min.js"></script>
<![endif]-->
<!-- Favicons -->
@@ -31,12 +31,12 @@
<link rel="apple-touch-icon-precomposed" href="{{ page.base_url }}assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
-<script type="text/javascript">
+<script>
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-146052-10']);
_gaq.push(['_trackPageview']);
(function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ var ga = document.createElement('script'); ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
diff --git a/bower_components/bootstrap/_includes/nav-components.html b/bower_components/bootstrap/_includes/nav-components.html
index 514dcfed..c5ced697 100644..100755
--- a/bower_components/bootstrap/_includes/nav-components.html
+++ b/bower_components/bootstrap/_includes/nav-components.html
@@ -10,26 +10,39 @@
<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 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>
+ <li><a href="#input-groups-buttons-segmented">Segmented buttons</a></li>
+ </ul>
+</li>
+<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>
@@ -39,17 +52,15 @@
<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-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>
<li><a href="#breadcrumbs">Breadcrumbs</a></li>
@@ -62,48 +73,54 @@
</li>
<li><a href="#labels">Labels</a></li>
<li><a href="#badges">Badges</a></li>
+<li><a href="#jumbotron">Jumbotron</a></li>
+<li><a href="#page-header">Page header</a></li>
<li>
- <a href="#type-components">Typography</a>
+ <a href="#thumbnails">Thumbnails</a>
<ul class="nav">
- <li><a href="#type-components-jumbotron">Jumbotron</a></li>
- <li><a href="#type-components-page-header">Page header</a></li>
+ <li><a href="#thumbnails-default">Default example</a></li>
+ <li><a href="#thumbnails-custom-content">Custom content</a></li>
</ul>
</li>
-<li><a href="#thumbnails">Thumbnails</a></li>
<li>
<a href="#alerts">Alerts</a>
<ul class="nav">
<li><a href="#alerts-default">Default alert</a></li>
- <li><a href="#alerts-block">Block alerts</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>
<li><a href="#progress-stacked">Stacked</a></li>
</ul>
</li>
-<li><a href="#media">Media object</a></li>
+<li>
+ <a href="#media">Media object</a>
+ <ul class="nav">
+ <li><a href="#media-default">Default media</a></li>
+ <li><a href="#media-list">Media list</a></li>
+ </ul>
+</li>
<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/bower_components/bootstrap/_includes/nav-css.html b/bower_components/bootstrap/_includes/nav-css.html
index fb00465c..4d2d58da 100644..100755
--- a/bower_components/bootstrap/_includes/nav-css.html
+++ b/bower_components/bootstrap/_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,22 +44,22 @@
<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 control</a></li>
<li><a href="#forms-control-states">Control states</a></li>
- <li><a href="#forms-input-groups">Input groups</a></li>
<li><a href="#forms-control-sizes">Control sizing</a></li>
<li><a href="#forms-help-text">Help text</a></li>
</ul>
@@ -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/bower_components/bootstrap/_includes/nav-customize.html b/bower_components/bootstrap/_includes/nav-customize.html
index 661a2607..661a2607 100644..100755
--- a/bower_components/bootstrap/_includes/nav-customize.html
+++ b/bower_components/bootstrap/_includes/nav-customize.html
diff --git a/bower_components/bootstrap/_includes/nav-getting-started.html b/bower_components/bootstrap/_includes/nav-getting-started.html
index 022d335c..1cba756c 100644..100755
--- a/bower_components/bootstrap/_includes/nav-getting-started.html
+++ b/bower_components/bootstrap/_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,11 +13,23 @@
<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>
<a href="#customizing">Customizing Bootstrap</a>
-</li> \ No newline at end of file
+</li>
diff --git a/bower_components/bootstrap/_includes/nav-javascript.html b/bower_components/bootstrap/_includes/nav-javascript.html
index 365fe1a1..e9702709 100644..100755
--- a/bower_components/bootstrap/_includes/nav-javascript.html
+++ b/bower_components/bootstrap/_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/bower_components/bootstrap/_includes/nav-main.html b/bower_components/bootstrap/_includes/nav-main.html
index d7f5a0ee..197bad2d 100644..100755
--- a/bower_components/bootstrap/_includes/nav-main.html
+++ b/bower_components/bootstrap/_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">
- <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC1</a>
- <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>
- <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/bower_components/bootstrap/_includes/old-bs-docs.html b/bower_components/bootstrap/_includes/old-bs-docs.html
index 53635043..53635043 100644..100755
--- a/bower_components/bootstrap/_includes/old-bs-docs.html
+++ b/bower_components/bootstrap/_includes/old-bs-docs.html
diff --git a/bower_components/bootstrap/_includes/social-buttons.html b/bower_components/bootstrap/_includes/social-buttons.html
index 3700ecd1..43f5a096 100644..100755
--- a/bower_components/bootstrap/_includes/social-buttons.html
+++ b/bower_components/bootstrap/_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&amp;repo=bootstrap&amp;type=watch&amp;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&amp;repo=bootstrap&amp;type=fork&amp;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>