From 8ee26b715804fed9e1cb94dc3a20b37edf8ee9c4 Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Thu, 14 Jan 2016 13:26:22 -0600 Subject: [PATCH] bs4 docs sync --- docs/assets/scss/_component-examples.scss | 23 +++--- docs/components/breadcrumb.md | 16 ++--- docs/components/buttons.md | 1 + docs/components/forms.md | 87 ++++++++++++++++++++++- docs/components/list-group.md | 3 +- docs/components/navs.md | 39 ++++++---- docs/components/pagination.md | 2 +- docs/content/typography.md | 8 +++ grunt/jekyll-debug.rb | 18 +++++ 9 files changed, 158 insertions(+), 39 deletions(-) create mode 100644 grunt/jekyll-debug.rb diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss index 5e745756..96f5701b 100644 --- a/docs/assets/scss/_component-examples.scss +++ b/docs/assets/scss/_component-examples.scss @@ -205,11 +205,6 @@ margin-bottom: .5rem; } -// Pager -.bd-example > .pager { - margin-top: 0; -} - // Example modals .bd-example-modal { background-color: #f5f5f5; @@ -230,15 +225,15 @@ } // Example dropdowns -//.bd-example > .dropdown > .dropdown-toggle { -// float: left; -//} -//.bd-example > .dropdown > .dropdown-menu { -// position: static; -// display: block; -// margin-bottom: .25rem; -// clear: left; -//} +.bd-example > .dropdown > .dropdown-toggle { + float: left; +} +.bd-example > .dropdown > .dropdown-menu { + position: static; + display: block; + margin-bottom: .25rem; + clear: left; +} // Example tabbable tabs .bd-example-tabs .nav-tabs { diff --git a/docs/components/breadcrumb.md b/docs/components/breadcrumb.md index 897e8ca3..b3759c0d 100644 --- a/docs/components/breadcrumb.md +++ b/docs/components/breadcrumb.md @@ -15,11 +15,7 @@ See the Material Design section for more -Indicate the current page's location within a navigational hierarchy. - -Separators are automatically added in CSS through [`::before`](https://developer.mozilla.org/en-US/docs/Web/CSS/::before) and [`content`](https://developer.mozilla.org/en-US/docs/Web/CSS/content). - -Works fine with or without the usage of list markup. +Indicate the current page's location within a navigational hierarchy. Separators are automatically added in CSS through [`::before`](https://developer.mozilla.org/en-US/docs/Web/CSS/::before) and [`content`](https://developer.mozilla.org/en-US/docs/Web/CSS/content). {% example html %}
    @@ -34,11 +30,15 @@ Works fine with or without the usage of list markup.
  1. Library
  2. Data
- -
+{% endexample %} + +Similar to our navigation components, breadcrumbs work fine with or without the usage of list markup. + +{% example html %} +
+ {% endexample %} diff --git a/docs/components/buttons.md b/docs/components/buttons.md index 754f9ebc..d66ec9e1 100644 --- a/docs/components/buttons.md +++ b/docs/components/buttons.md @@ -67,6 +67,7 @@ When using button classes on `` elements that are used to trigger in-page fun + {% endexample %} ## Outline buttons diff --git a/docs/components/forms.md b/docs/components/forms.md index 936d6c17..354d83cd 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -95,7 +95,7 @@ Remember, since Bootstrap utilizes the HTML5 doctype, **all inputs must have a ` {% endexample %} -Below is a complete list of the specific from controls supported by Bootstrap and the classes that customize them. Additional documentation is available for each group. +Below is a complete list of the specific form controls supported by Bootstrap and the classes that customize them. Additional documentation is available for each group. @@ -174,6 +174,91 @@ Below is a complete list of the specific from controls supported by Bootstrap an
+### Textual inputs + +Here are examples of `.form-control` applied to each textual HTML5 `` `type`. + +{% example html %} +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+{% endexample %} + ## Form layouts Since Bootstrap applies `display: block` and `width: 100%` to almost all our form controls, forms will by default stack vertically. Additional classes can be used to vary this layout on a per-form basis. diff --git a/docs/components/list-group.md b/docs/components/list-group.md index 1b906f9d..5e349005 100644 --- a/docs/components/list-group.md +++ b/docs/components/list-group.md @@ -23,7 +23,7 @@ List groups are a flexible and powerful component for displaying not only simple {:toc} ## Basic example -

The most basic list group is simply an unordered list with list items, and the proper classes. Build upon it with the options that follow, or your own CSS as needed.

+The most basic list group is simply an unordered list with list items, and the proper classes. Build upon it with the options that follow, or your own CSS as needed. {% example html %} +
Dapibus ac facilisis in Cras sit amet nibh libero diff --git a/docs/components/navs.md b/docs/components/navs.md index 5e7d8869..2ffd55af 100644 --- a/docs/components/navs.md +++ b/docs/components/navs.md @@ -33,13 +33,13 @@ Roll your own navigation style by extending the base `.nav` component. All Boots {% example html %}
  • - Another link + Link
  • Disabled @@ -201,7 +212,7 @@ Add dropdown menus with a little extra HTML and the [dropdowns JavaScript plugin
  • - Another link + Link
  • Disabled diff --git a/docs/components/pagination.md b/docs/components/pagination.md index 86349635..e94751bb 100644 --- a/docs/components/pagination.md +++ b/docs/components/pagination.md @@ -15,7 +15,7 @@ See the Material Design section for more -Provide pagination links for your site or app with the multi-page pagination component, or the simpler [pager alternative](#pager). +Provide pagination links for your site or app with the multi-page pagination component. ## Contents diff --git a/docs/content/typography.md b/docs/content/typography.md index 2affd933..5180f443 100644 --- a/docs/content/typography.md +++ b/docs/content/typography.md @@ -244,6 +244,14 @@ Align terms and descriptions horizontally by using our grid system's predefined
    Truncated term is truncated
    Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
    + +
    Nesting
    +
    +
    +
    Nested definition list
    +
    Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc.
    +
    +
    {% endexample %} diff --git a/grunt/jekyll-debug.rb b/grunt/jekyll-debug.rb new file mode 100644 index 00000000..0ced37f9 --- /dev/null +++ b/grunt/jekyll-debug.rb @@ -0,0 +1,18 @@ +#!/usr/bin/env ruby +# + +require 'rubygems' + +version = ">= 0" + +if ARGV.first + str = ARGV.first + str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding + if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then + version = $1 + ARGV.shift + end +end + +gem 'jekyll', version +load Gem.bin_path('jekyll', 'jekyll', version)