From 6e03725f44d9dd761805c3fe76ba101e63121ac1 Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Tue, 5 Jan 2016 14:37:17 -0600 Subject: [PATCH] bs docs sync --- docs/_includes/nav-docs.html | 3 - docs/_includes/nav-home.html | 49 +++++--- docs/assets/scss/_ads.scss | 6 +- docs/assets/scss/_anchor.scss | 4 +- docs/assets/scss/_buttons.scss | 2 +- docs/assets/scss/_component-examples.scss | 20 +--- docs/assets/scss/_content.scss | 4 +- docs/assets/scss/_footer.scss | 2 +- docs/assets/scss/_masthead.scss | 6 +- docs/assets/scss/_sidebar.scss | 2 +- docs/assets/scss/_skiplink.scss | 2 + docs/assets/scss/_syntax.scss | 110 +++++++++--------- docs/assets/scss/_team.scss | 2 +- docs/components/breadcrumb.md | 23 ++-- docs/components/buttons.md | 12 +- docs/components/card.md | 4 +- docs/components/forms.md | 32 +++-- docs/components/modal.md | 2 +- docs/components/navbar.md | 16 +-- docs/components/pagination.md | 15 ++- docs/components/tooltips.md | 6 + docs/content/code.md | 12 +- docs/content/typography.md | 4 +- docs/examples/album/index.html | 1 + docs/examples/blog/index.html | 1 + docs/examples/carousel/index.html | 1 + docs/examples/cover/index.html | 1 + docs/examples/dashboard/index.html | 1 + docs/examples/jumbotron/index.html | 3 +- docs/examples/navbar-top-fixed/index.html | 1 + docs/examples/navbar-top/index.html | 1 + docs/examples/navbar/index.html | 1 + docs/examples/offcanvas/index.html | 1 + docs/examples/starter-template/index.html | 1 + docs/examples/sticky-footer-navbar/index.html | 1 + docs/examples/tooltip-viewport/index.html | 1 + docs/getting-started/browsers-devices.md | 52 +++++---- scss/_bootstrap.scss | 6 - 38 files changed, 231 insertions(+), 180 deletions(-) diff --git a/docs/_includes/nav-docs.html b/docs/_includes/nav-docs.html index 31d8f6dc..448a96e1 100644 --- a/docs/_includes/nav-docs.html +++ b/docs/_includes/nav-docs.html @@ -1,5 +1,3 @@ -
-
@@ -64,4 +62,3 @@ {% endif %} {% endfor %} -
diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html index 4fe43fb1..6a2eb111 100644 --- a/docs/_includes/nav-home.html +++ b/docs/_includes/nav-home.html @@ -24,19 +24,38 @@ {% endcomment %} -
- - - Material Design for Bootstrap - -
- + diff --git a/docs/assets/scss/_ads.scss b/docs/assets/scss/_ads.scss index 4d275b63..2fd68432 100644 --- a/docs/assets/scss/_ads.scss +++ b/docs/assets/scss/_ads.scss @@ -10,8 +10,8 @@ padding: 1.25rem !important; margin: 2rem ($grid-gutter-width * -1) -2rem !important; overflow: hidden; // clearfix - font-size: .8rem !important; font-family: inherit !important; + font-size: .8rem !important; line-height: 1rem !important; color: $bd-purple-light !important; text-align: left; @@ -51,10 +51,6 @@ } } -.carbonad #azcarbon > img { - display: none; // hide what I assume are tracking images -} - @include media-breakpoint-up(sm) { .carbonad { width: 330px !important; diff --git a/docs/assets/scss/_anchor.scss b/docs/assets/scss/_anchor.scss index 257fbc00..edb1884a 100644 --- a/docs/assets/scss/_anchor.scss +++ b/docs/assets/scss/_anchor.scss @@ -12,9 +12,7 @@ *:hover > .anchorjs-link { opacity: .75; - -webkit-transition: color .16s linear; - -o-transition: color .16s linear; - transition: color .16s linear; + transition: color .16s linear; } *:hover > .anchorjs-link:hover, diff --git a/docs/assets/scss/_buttons.scss b/docs/assets/scss/_buttons.scss index 49249c99..4ff0c9db 100644 --- a/docs/assets/scss/_buttons.scss +++ b/docs/assets/scss/_buttons.scss @@ -13,7 +13,7 @@ &:focus, &:active { color: #fff; - background-color:$bd-purple-bright; + background-color: $bd-purple-bright; border-color: $bd-purple-bright; } } diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss index c962eb6e..1a799119 100644 --- a/docs/assets/scss/_component-examples.scss +++ b/docs/assets/scss/_component-examples.scss @@ -25,8 +25,8 @@ .bd-example-container { min-width: 16rem; max-width: 25rem; - margin-left: auto; margin-right: auto; + margin-left: auto; } .bd-example-container-header { @@ -69,10 +69,10 @@ @include clearfix(); @include media-breakpoint-up(sm) { - margin-left: 0; + padding: 1.5rem; margin-right: 0; margin-bottom: 0; - padding: 1.5rem; + margin-left: 0; border-width: .2rem; } @@ -179,7 +179,7 @@ } // Navbars -.bd-example { +.bd-example { .navbar-fixed-top { position: static; margin: -1rem -1rem 1rem; @@ -336,15 +336,3 @@ font-size: inherit; color: $gray-dark; // Effectively the base text color } - - -// Pseudo focus -// -// Custom `:focus` state for showing how it looks in the docs. - -#focusedInput { - border-color: $input-border-focus; - outline: 0; - outline: thin dotted \9; // IE9 - box-shadow: 0 0 .5rem $input-box-shadow-focus; -} diff --git a/docs/assets/scss/_content.scss b/docs/assets/scss/_content.scss index 73897830..f4f15ac0 100644 --- a/docs/assets/scss/_content.scss +++ b/docs/assets/scss/_content.scss @@ -1,5 +1,7 @@ // DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs +// scss-lint:disable IdSelector + // // Automatically style Markdown-based tables like a Bootstrap `.table`. // @@ -9,8 +11,8 @@ display: block; width: 100%; max-width: 100%; - overflow-y: auto; margin-bottom: $spacer; + overflow-y: auto; // Cells > thead, diff --git a/docs/assets/scss/_footer.scss b/docs/assets/scss/_footer.scss index 80550836..cbd4e5a3 100644 --- a/docs/assets/scss/_footer.scss +++ b/docs/assets/scss/_footer.scss @@ -8,8 +8,8 @@ padding: 4rem 0; margin-top: 4rem; font-size: 85%; - background-color: #f7f7f7; text-align: center; + background-color: #f7f7f7; a { font-weight: 500; diff --git a/docs/assets/scss/_masthead.scss b/docs/assets/scss/_masthead.scss index e77256fb..9556dcc8 100644 --- a/docs/assets/scss/_masthead.scss +++ b/docs/assets/scss/_masthead.scss @@ -5,9 +5,7 @@ padding: 3rem ($grid-gutter-width / 2) 2rem; color: $bd-purple-light; text-align: center; - background-image: -webkit-linear-gradient(135deg, darken($bd-purple, 20%), $bd-purple, lighten(saturate($bd-purple, 5%), 15%)); - background-image: linear-gradient(135deg, darken($bd-purple, 20%), $bd-purple, lighten(saturate($bd-purple, 5%), 15%)); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str(darken($bd-purple, 20%))}', endColorstr='#{ie-hex-str(lighten(saturate($bd-purple, 5%), 15%))}', gradientType='1'); /* For IE9 */ + background-image: linear-gradient(135deg, darken($bd-purple, 20%), $bd-purple, lighten(saturate($bd-purple, 5%), 15%)); .bd-booticon { margin: 0 auto 2rem; @@ -21,9 +19,9 @@ } .lead { - margin-left: auto; margin-right: auto; margin-bottom: 2rem; + margin-left: auto; font-size: 1.25rem; color: #fff; } diff --git a/docs/assets/scss/_sidebar.scss b/docs/assets/scss/_sidebar.scss index 35d34cf8..7073a757 100644 --- a/docs/assets/scss/_sidebar.scss +++ b/docs/assets/scss/_sidebar.scss @@ -38,8 +38,8 @@ } .dropdown-item { - padding-left: .75rem; padding-right: .75rem; + padding-left: .75rem; &:first-child { margin-top: .25rem; } &:last-child { margin-bottom: .25rem; } diff --git a/docs/assets/scss/_skiplink.scss b/docs/assets/scss/_skiplink.scss index fb82797c..d71aa872 100644 --- a/docs/assets/scss/_skiplink.scss +++ b/docs/assets/scss/_skiplink.scss @@ -1,5 +1,7 @@ // DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs +// scss-lint:disable IdSelector + #skippy { display: block; padding: 1em; diff --git a/docs/assets/scss/_syntax.scss b/docs/assets/scss/_syntax.scss index a98e1032..170a7d23 100644 --- a/docs/assets/scss/_syntax.scss +++ b/docs/assets/scss/_syntax.scss @@ -1,65 +1,65 @@ // DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs -.hll { background-color: #ffffcc } +.hll { background-color: #ffc; } .c { color: #999; } -.err { color: #AA0000; background-color: #FFAAAA } -.k { color: #006699; } -.o { color: #555555 } +.err { color: #a00; background-color: #faa; } +.k { color: #069; } +.o { color: #555; } .cm { color: #999; } -.cp { color: #009999 } +.cp { color: #099; } .c1 { color: #999; } .cs { color: #999; } -.gd { background-color: #FFCCCC; border: 1px solid #CC0000 } -.ge { font-style: italic } -.gr { color: #FF0000 } -.gh { color: #003300; } -.gi { background-color: #CCFFCC; border: 1px solid #00CC00 } -.go { color: #AAAAAA } -.gp { color: #000099; } -.gu { color: #003300; } -.gt { color: #99CC66 } -.kc { color: #006699; } -.kd { color: #006699; } -.kn { color: #006699; } -.kp { color: #006699 } -.kr { color: #006699; } -.kt { color: #007788; } -.m { color: #FF6600 } -.s { color: #d44950 } -.na { color: #4f9fcf } -.nb { color: #336666 } -.nc { color: #00AA88; } -.no { color: #336600 } -.nd { color: #9999FF } -.ni { color: #999999; } -.ne { color: #CC0000; } -.nf { color: #CC00FF } -.nl { color: #9999FF } -.nn { color: #00CCFF; } +.gd { background-color: #fcc; border: 1px solid #c00; } +.ge { font-style: italic; } +.gr { color: #f00; } +.gh { color: #030; } +.gi { background-color: #cfc; border: 1px solid #0c0; } +.go { color: #aaa; } +.gp { color: #009; } +.gu { color: #030; } +.gt { color: #9c6; } +.kc { color: #069; } +.kd { color: #069; } +.kn { color: #069; } +.kp { color: #069; } +.kr { color: #069; } +.kt { color: #078; } +.m { color: #f60; } +.s { color: #d44950; } +.na { color: #4f9fcf; } +.nb { color: #366; } +.nc { color: #0a8; } +.no { color: #360; } +.nd { color: #99f; } +.ni { color: #999; } +.ne { color: #c00; } +.nf { color: #c0f; } +.nl { color: #99f; } +.nn { color: #0cf; } .nt { color: #2f6f9f; } -.nv { color: #003333 } -.ow { color: #000000; } -.w { color: #bbbbbb } -.mf { color: #FF6600 } -.mh { color: #FF6600 } -.mi { color: #FF6600 } -.mo { color: #FF6600 } -.sb { color: #CC3300 } -.sc { color: #CC3300 } -.sd { color: #CC3300; font-style: italic } -.s2 { color: #CC3300 } -.se { color: #CC3300; } -.sh { color: #CC3300 } -.si { color: #AA0000 } -.sx { color: #CC3300 } -.sr { color: #33AAAA } -.s1 { color: #CC3300 } -.ss { color: #FFCC33 } -.bp { color: #336666 } -.vc { color: #003333 } -.vg { color: #003333 } -.vi { color: #003333 } -.il { color: #FF6600 } +.nv { color: #033; } +.ow { color: #000; } +.w { color: #bbb; } +.mf { color: #f60; } +.mh { color: #f60; } +.mi { color: #f60; } +.mo { color: #f60; } +.sb { color: #c30; } +.sc { color: #c30; } +.sd { font-style: italic; color: #c30; } +.s2 { color: #c30; } +.se { color: #c30; } +.sh { color: #c30; } +.si { color: #a00; } +.sx { color: #c30; } +.sr { color: #3aa; } +.s1 { color: #c30; } +.ss { color: #fc3; } +.bp { color: #366; } +.vc { color: #033; } +.vg { color: #033; } +.vi { color: #033; } +.il { color: #f60; } .css .o, .css .o + .nt, diff --git a/docs/assets/scss/_team.scss b/docs/assets/scss/_team.scss index 54bdea84..932926ef 100644 --- a/docs/assets/scss/_team.scss +++ b/docs/assets/scss/_team.scss @@ -14,11 +14,11 @@ } .github-btn { - border: none; float: right; width: 180px; height: 1.25rem; margin-top: .25rem; + border: 0; } img { diff --git a/docs/components/breadcrumb.md b/docs/components/breadcrumb.md index 60461592..897e8ca3 100644 --- a/docs/components/breadcrumb.md +++ b/docs/components/breadcrumb.md @@ -19,17 +19,26 @@ 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. + {% example html %}
    -
  1. Home
    2. +
  2. Home
    -
  1. Home
    2. -
  2. Library
    3. +
  3. Home
    4. +
  4. Library
-
    -
  1. Home
    2. -
  2. Library
    3. -
  3. Data
    4. +
      +
    1. Home
      2. +
    2. Library
      3. +
    3. Data
    + +
    + Home + Library + Data + Bootstrap +
    {% endexample %} diff --git a/docs/components/buttons.md b/docs/components/buttons.md index 531f7005..41d875a2 100644 --- a/docs/components/buttons.md +++ b/docs/components/buttons.md @@ -109,8 +109,8 @@ Create block level buttons—those that span the full width of a parent—by add Buttons will appear pressed (with a darker background, darker border, and inset shadow) when active. **There's no need to add a class to ` {% endexample %} -As `` elements don't support the `disabled` attribute, you must add the `.disabled` class to fake it. +As `` elements don't support the `disabled` attribute, you must add the `.disabled` class to fake it. In addition, include the `aria-disabled="true"` attribute, to indicate the state of the element to assistive technologies. {% example html %} -Primary link -Link +Primary link +Link {% endexample %} {% callout warning %} #### Link functionality caveat -This class uses `pointer-events: none` to try to disable the link functionality of ``s, but that CSS property is not yet standardized and isn't fully supported in Opera 18 and below, or in Internet Explorer 11\. In addition, even in browsers that do support `pointer-events: none`, keyboard navigation remains unaffected, meaning that sighted keyboard users and users of assistive technologies will still be able to activate these links. So to be safe, use custom JavaScript to disable such links. +The `.disabled` class uses `pointer-events: none` to try to disable the link functionality of ``s, but that CSS property is not yet standardized. In addition, even in browsers that do support `pointer-events: none`, keyboard navigation remains unaffected, meaning that sighted keyboard users and users of assistive technologies will still be able to activate these links. So to be safe, add a `tabindex="-1"` attribute on these links (to prevent them from receiving keyboard focus) and use custom JavaScript to disable their functionality. {% endcallout %} ## Button plugin diff --git a/docs/components/card.md b/docs/components/card.md index 43e8a235..8ef9e69f 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -34,7 +34,7 @@ Cards require a small amount of markup and classes to provide you with as much c

    Card title

    Some quick example text to build on the card title and make up the bulk of the card's content.

    -     Button + Go somewhere
    {% endexample %} @@ -271,7 +271,7 @@ You can also use `.card-inverse` with the [contextual backgrounds variants](#bac

    Special title treatment

    With supporting text below as a natural lead-in to additional content.

    - Button + Go somewhere
    {% endexample %} diff --git a/docs/components/forms.md b/docs/components/forms.md index f7d70eab..2132645d 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -32,8 +32,8 @@ Remember, since Bootstrap utilizes the HTML5 doctype, **all inputs must have a `
    - - We'll never share your email with anyone else. + + We'll never share your email with anyone else.
    @@ -65,8 +65,8 @@ Remember, since Bootstrap utilizes the HTML5 doctype, **all inputs must have a `
    - - This is some placeholder block-level help text for the above input. It's a bit lighter and easily wraps to a new line. + + This is some placeholder block-level help text for the above input. It's a bit lighter and easily wraps to a new line.