diff options
author | Mark Otto <otto@github.com> | 2014-03-07 09:32:52 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2014-03-07 09:32:52 +0400 |
commit | c8614c0f15f0ce78426c6403e57aff22c3ce2beb (patch) | |
tree | 673d1a347374a8bf53a127c050dbc57762af3782 /docs/_includes | |
parent | d1a7271ea1272e0f9775d49e6a84ee49819e0094 (diff) | |
parent | fab10b643eb1a2038fb31305f0b038b7a9a8554d (diff) |
Merge branch 'master' into pr/12490
Conflicts:
less/list-group.less
Diffstat (limited to 'docs/_includes')
-rw-r--r-- | docs/_includes/customizer-variables.html | 100 | ||||
-rw-r--r-- | docs/_includes/footer.html | 4 | ||||
-rw-r--r-- | docs/_includes/nav-components.html | 2 | ||||
-rw-r--r-- | docs/_includes/nav-css.html | 13 | ||||
-rw-r--r-- | docs/_includes/nav-customize.html | 2 | ||||
-rw-r--r-- | docs/_includes/nav-javascript.html | 1 | ||||
-rw-r--r-- | docs/_includes/nav-main.html | 2 | ||||
-rw-r--r-- | docs/_includes/social-buttons.html | 4 |
8 files changed, 87 insertions, 41 deletions
diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index c68c652abb..8312019dcf 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -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"> @@ -1037,12 +1068,12 @@ </div> <div class="bs-customizer-input"> <label for="input-@popover-arrow-outer-color">@popover-arrow-outer-color</label> - <input id="input-@popover-arrow-outer-color" type="text" value="rgba(0,0,0,.25)" data-var="@popover-arrow-outer-color" class="form-control"/> + <input id="input-@popover-arrow-outer-color" type="text" value="fadein(@popover-border-color, 5%)" data-var="@popover-arrow-outer-color" class="form-control"/> <p class="help-block">Popover outer arrow color</p> </div> <div class="bs-customizer-input"> <label for="input-@popover-arrow-outer-fallback-color">@popover-arrow-outer-fallback-color</label> - <input id="input-@popover-arrow-outer-fallback-color" type="text" value="#999" data-var="@popover-arrow-outer-fallback-color" class="form-control"/> + <input id="input-@popover-arrow-outer-fallback-color" type="text" value="darken(@popover-fallback-border-color, 20%)" data-var="@popover-arrow-outer-fallback-color" class="form-control"/> <p class="help-block">Popover outer arrow fallback color</p> </div> </div> @@ -1095,7 +1126,7 @@ <div class="row"> <div class="bs-customizer-input"> <label for="input-@modal-inner-padding">@modal-inner-padding</label> - <input id="input-@modal-inner-padding" type="text" value="20px" data-var="@modal-inner-padding" class="form-control"/> + <input id="input-@modal-inner-padding" type="text" value="15px" data-var="@modal-inner-padding" class="form-control"/> <p class="help-block">Padding applied to the modal body</p> </div> <div class="bs-customizer-input"> @@ -1302,6 +1333,25 @@ <input id="input-@list-group-active-text-color" type="text" value="lighten(@list-group-active-bg, 40%)" data-var="@list-group-active-text-color" class="form-control"/> </div> <div class="bs-customizer-input"> + <label for="input-@list-group-disabled-color">@list-group-disabled-color</label> + <input id="input-@list-group-disabled-color" type="text" value="@gray-light" data-var="@list-group-disabled-color" class="form-control"/> + <p class="help-block">Text color of disabled list elements</p> + </div> + <div class="bs-customizer-input"> + <label for="input-@list-group-disabled-bg">@list-group-disabled-bg</label> + <input id="input-@list-group-disabled-bg" type="text" value="@gray-lighter" data-var="@list-group-disabled-bg" class="form-control"/> + <p class="help-block">Background color of disabled list elements</p> + </div> + <div class="bs-customizer-input"> + <label for="input-@list-group-disabled-border">@list-group-disabled-border</label> + <input id="input-@list-group-disabled-border" type="text" value="#eee" data-var="@list-group-disabled-border" class="form-control"/> + <p class="help-block">Border color of disabled list elements</p> + </div> + <div class="bs-customizer-input"> + <label for="input-@list-group-disabled-text-color">@list-group-disabled-text-color</label> + <input id="input-@list-group-disabled-text-color" type="text" value="lighten(@list-group-disabled-bg, 40%)" data-var="@list-group-disabled-text-color" class="form-control"/> + </div> + <div class="bs-customizer-input"> <label for="input-@list-group-link-color">@list-group-link-color</label> <input id="input-@list-group-link-color" type="text" value="#555" data-var="@list-group-link-color" class="form-control"/> </div> @@ -1322,6 +1372,14 @@ <input id="input-@panel-body-padding" type="text" value="15px" data-var="@panel-body-padding" class="form-control"/> </div> <div class="bs-customizer-input"> + <label for="input-@panel-heading-padding">@panel-heading-padding</label> + <input id="input-@panel-heading-padding" type="text" value="10px 15px" data-var="@panel-heading-padding" class="form-control"/> + </div> + <div class="bs-customizer-input"> + <label for="input-@panel-footer-padding">@panel-footer-padding</label> + <input id="input-@panel-footer-padding" type="text" value="@panel-heading-padding" data-var="@panel-footer-padding" class="form-control"/> + </div> + <div class="bs-customizer-input"> <label for="input-@panel-border-radius">@panel-border-radius</label> <input id="input-@panel-border-radius" type="text" value="@border-radius-base" data-var="@panel-border-radius" class="form-control"/> </div> @@ -1632,6 +1690,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> @@ -1656,35 +1719,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-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 c5edb3e653..6d626a198f 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -1,13 +1,13 @@ <!-- Footer ================================================== --> -<footer class="bs-footer" role="contentinfo"> +<footer class="bs-docs-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"> + <ul class="bs-docs-footer-links muted"> <li>Currently v{{ site.current_version }}</li> <li>·</li> <li><a href="{{ site.repo }}">GitHub</a></li> diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html index 131114883b..39280938b4 100644 --- a/docs/_includes/nav-components.html +++ b/docs/_includes/nav-components.html @@ -102,6 +102,8 @@ <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-low-percentages">Low percentages</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 e67ef8dc4b..1ff3fe804d 100644 --- a/docs/_includes/nav-css.html +++ b/docs/_includes/nav-css.html @@ -3,7 +3,6 @@ <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.css</a></li> <li><a href="#overview-container">Containers</a></li> @@ -68,6 +67,7 @@ <li><a href="#forms-controls-static">Static control</a></li> <li><a href="#forms-control-focus">Focus state</a></li> <li><a href="#forms-control-disabled">Disabled state</a></li> + <li><a href="#forms-control-readonly">Readonly state</a></li> <li><a href="#forms-control-validation">Validation states</a></li> <li><a href="#forms-control-sizes">Control sizing</a></li> <li><a href="#forms-help-text">Help text</a></li> @@ -85,6 +85,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> @@ -125,3 +129,10 @@ <li><a href="#sass-installation">Rails install</a></li> </ul> </li> +<li> + <a href="#rtl">RTL version</a> + <ul class="nav"> + <li><a href="#rtl-how-to">How to use</a></li> + <li><a href="#rtl-css-flip">CSS Flip</a></li> + </ul> +</li> diff --git a/docs/_includes/nav-customize.html b/docs/_includes/nav-customize.html index af8558fa1f..8fe3e81d14 100644 --- a/docs/_includes/nav-customize.html +++ b/docs/_includes/nav-customize.html @@ -14,6 +14,7 @@ <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> @@ -39,7 +40,6 @@ <li><a href="#code">Code</a></li> <li><a href="#type">Type</a></li> <li><a href="#miscellaneous">Miscellaneous</a></li> - <li><a href="#container-sizes">Container sizes</a></li> </ul> </li> <li><a href="#download">Download</a></li> diff --git a/docs/_includes/nav-javascript.html b/docs/_includes/nav-javascript.html index aeeafe2641..741b9cf810 100644 --- a/docs/_includes/nav-javascript.html +++ b/docs/_includes/nav-javascript.html @@ -14,6 +14,7 @@ <ul class="nav"> <li><a href="#modals-examples">Examples</a></li> <li><a href="#modals-sizes">Sizes</a></li> + <li><a href="#modals-remove-animation">Remove animation</a></li> <li><a href="#modals-usage">Usage</a></li> </ul> </li> diff --git a/docs/_includes/nav-main.html b/docs/_includes/nav-main.html index 6c5567e918..9f449f258a 100644 --- a/docs/_includes/nav-main.html +++ b/docs/_includes/nav-main.html @@ -1,4 +1,4 @@ -<header class="navbar navbar-static-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"> diff --git a/docs/_includes/social-buttons.html b/docs/_includes/social-buttons.html index 2019875e30..9e0a1505e4 100644 --- a/docs/_includes/social-buttons.html +++ b/docs/_includes/social-buttons.html @@ -1,5 +1,5 @@ -<div class="bs-social"> - <ul class="bs-social-buttons"> +<div class="bs-docs-social"> + <ul class="bs-docs-social-buttons"> <li> <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> |