From f235da05fd32e03dabb1dabc4cb436c58537217f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 4 Sep 2016 22:04:58 -0700 Subject: [PATCH 001/136] flip the columns, tweak some of the styles --- docs/_layouts/docs.html | 4 ++-- docs/assets/scss/_anchor.scss | 4 ++++ docs/assets/scss/_content.scss | 15 ++++++++++++++- docs/assets/scss/_sidebar.scss | 10 ++++------ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/docs/_layouts/docs.html b/docs/_layouts/docs.html index 6e8cddf212..fb571d22a2 100644 --- a/docs/_layouts/docs.html +++ b/docs/_layouts/docs.html @@ -21,10 +21,10 @@
-
+
{% include nav-docs.html %}
-
+

{{ page.title }}

{{ content }}
diff --git a/docs/assets/scss/_anchor.scss b/docs/assets/scss/_anchor.scss index 399da9b7b1..5b4edf04d8 100644 --- a/docs/assets/scss/_anchor.scss +++ b/docs/assets/scss/_anchor.scss @@ -1,4 +1,8 @@ +// scss-lint:disable ImportantRule + .anchorjs-link { + padding-right: .25em !important; + margin-left: -.75em !important; color: inherit; } diff --git a/docs/assets/scss/_content.scss b/docs/assets/scss/_content.scss index 28f4cd4422..901e9843ed 100644 --- a/docs/assets/scss/_content.scss +++ b/docs/assets/scss/_content.scss @@ -54,14 +54,27 @@ > ol li { margin-bottom: .25rem; } + + @include media-breakpoint-up(sm) { + > ul, + > ol, + > p { + max-width: 80%; + } + } } .bd-title { + margin-bottom: 2rem; + font-weight: 300; + @include media-breakpoint-up(sm) { font-size: 3rem; + p { - font-size: 1.25rem; + max-width: 80%; + margin-bottom: 2rem; + font-size: 1.5rem; font-weight: 300; } } diff --git a/docs/assets/scss/_sidebar.scss b/docs/assets/scss/_sidebar.scss index 7b9edefea9..ba7d344391 100644 --- a/docs/assets/scss/_sidebar.scss +++ b/docs/assets/scss/_sidebar.scss @@ -2,12 +2,6 @@ // Side navigation // -.bd-sidebar { - @include media-breakpoint-up(md) { - padding-left: 1rem; - } -} - .bd-search { position: relative; margin-bottom: 1.5rem; @@ -22,6 +16,10 @@ background-color: #fff; } } + + @include media-breakpoint-up(md) { + padding-right: 1rem; + } } .bd-search-results { From 22afc82a91e35b45849e60235f3d648fab9ac784 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Sep 2016 16:12:29 -0700 Subject: [PATCH 002/136] hide page header for now, border top nav, sticky sidebar --- docs/_layouts/docs.html | 4 ++-- docs/assets/scss/_content.scss | 1 + docs/assets/scss/_nav.scss | 2 ++ docs/assets/scss/_sidebar.scss | 7 +++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/_layouts/docs.html b/docs/_layouts/docs.html index fb571d22a2..7a4b710c56 100644 --- a/docs/_layouts/docs.html +++ b/docs/_layouts/docs.html @@ -12,12 +12,12 @@ {% include nav-home.html %} -
+
diff --git a/docs/assets/scss/_content.scss b/docs/assets/scss/_content.scss index 901e9843ed..41f429b009 100644 --- a/docs/assets/scss/_content.scss +++ b/docs/assets/scss/_content.scss @@ -65,6 +65,7 @@ } .bd-title { + margin-top: 2rem; margin-bottom: 2rem; font-weight: 300; diff --git a/docs/assets/scss/_nav.scss b/docs/assets/scss/_nav.scss index 141811d415..e1589e13ef 100644 --- a/docs/assets/scss/_nav.scss +++ b/docs/assets/scss/_nav.scss @@ -5,6 +5,8 @@ .bd-navbar { padding-right: 0; padding-left: 0; + margin-bottom: 2rem; + border-bottom: 1px solid rgba(0,0,0,.1); .navbar-nav { .nav-link { diff --git a/docs/assets/scss/_sidebar.scss b/docs/assets/scss/_sidebar.scss index ba7d344391..302c04c974 100644 --- a/docs/assets/scss/_sidebar.scss +++ b/docs/assets/scss/_sidebar.scss @@ -2,6 +2,13 @@ // Side navigation // +.bd-sidebar { + @include media-breakpoint-up(md) { + position: sticky; + top: 2rem; + } +} + .bd-search { position: relative; margin-bottom: 1.5rem; From 6eabb799bfad44def56b681e9f8586b9cfbfdf6e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Sep 2016 22:40:03 -0700 Subject: [PATCH 003/136] migration copy --- docs/migration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/migration.md b/docs/migration.md index 1fd28016a3..cf02fea51b 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -4,7 +4,7 @@ title: Migrating to v4 group: migration --- -Bootstrap 4 is a major rewrite of almost the entire project. The most notable changes are summarized immediately below, followed by more specific class and behavioral changes to relevant components. +Bootstrap 4 is a major rewrite of the entire project. The most notable changes are summarized below, followed by more specific changes to relevant components. {% callout info %} **Heads up!** This will be in flux as work on the v4 alphas progresses. Until then consider it incomplete, and we'd love pull requests to help keep it up to date. From 2494a29df8d2722ccd80ccca8c8951fca1852f28 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Sep 2016 22:40:17 -0700 Subject: [PATCH 004/136] try out docs inline --- docs/getting-started/introduction.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/getting-started/introduction.md b/docs/getting-started/introduction.md index 8cec71fd6c..745416cc30 100644 --- a/docs/getting-started/introduction.md +++ b/docs/getting-started/introduction.md @@ -9,6 +9,8 @@ Bootstrap is the world's most popular framework for building responsive, mobile- Here's how to quickly get started with the Bootstrap CDN and a template starter page. +{% include ads.html %} + ## Contents * Will be replaced with the ToC, excluding the "Contents" header From 0af35cc6e7d8e05a168a998fc5ec289f124753d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Sep 2016 22:40:44 -0700 Subject: [PATCH 005/136] nav changes --- docs/_includes/nav-docs.html | 5 ----- docs/_includes/nav-home.html | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/_includes/nav-docs.html b/docs/_includes/nav-docs.html index b4f4d1f9ec..6f4d1c0fdb 100644 --- a/docs/_includes/nav-docs.html +++ b/docs/_includes/nav-docs.html @@ -1,8 +1,3 @@ -
- - -
-
From 11d52ba9498990483d822a5a42d371393a110080 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Sep 2016 22:41:10 -0700 Subject: [PATCH 006/136] ads in content, sidebar changes, etc --- docs/assets/scss/_ads.scss | 19 +++++++++++++++++++ docs/assets/scss/_content.scss | 4 ++-- docs/assets/scss/_nav.scss | 1 + docs/assets/scss/_sidebar.scss | 17 +++++++++++------ 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/docs/assets/scss/_ads.scss b/docs/assets/scss/_ads.scss index 237b1e70b7..efb91e5652 100644 --- a/docs/assets/scss/_ads.scss +++ b/docs/assets/scss/_ads.scss @@ -48,3 +48,22 @@ display: block; color: #cdbfe3 !important; } + +.bd-content { + #carbonads { + position: static; + max-width: 400px; + margin: 2rem 0; + line-height: 1.4; + background-color: #f5f5f5; + border: 0; + + a { + color: #333; + } + + .carbon-poweredby { + color: #777 !important; + } + } +} diff --git a/docs/assets/scss/_content.scss b/docs/assets/scss/_content.scss index 41f429b009..b08477b7f1 100644 --- a/docs/assets/scss/_content.scss +++ b/docs/assets/scss/_content.scss @@ -65,8 +65,8 @@ } .bd-title { - margin-top: 2rem; - margin-bottom: 2rem; + margin-top: 1rem; + margin-bottom: 1rem; font-weight: 300; @include media-breakpoint-up(sm) { diff --git a/docs/assets/scss/_nav.scss b/docs/assets/scss/_nav.scss index e1589e13ef..51758485cb 100644 --- a/docs/assets/scss/_nav.scss +++ b/docs/assets/scss/_nav.scss @@ -7,6 +7,7 @@ padding-left: 0; margin-bottom: 2rem; border-bottom: 1px solid rgba(0,0,0,.1); + box-shadow: 0 6px 12px rgba(0,0,0,.05); .navbar-nav { .nav-link { diff --git a/docs/assets/scss/_sidebar.scss b/docs/assets/scss/_sidebar.scss index 302c04c974..3986bc65eb 100644 --- a/docs/assets/scss/_sidebar.scss +++ b/docs/assets/scss/_sidebar.scss @@ -6,17 +6,18 @@ @include media-breakpoint-up(md) { position: sticky; top: 2rem; + max-height: calc(100vh - 4rem); + overflow-y: auto; } } .bd-search { position: relative; - margin-bottom: 1.5rem; .form-control { - height: 2.45rem; - padding-top: .4rem; - padding-bottom: .4rem; + // height: 2.45rem; + // padding-top: .4rem; + // padding-bottom: .4rem; background-color: #fafafa; &:focus { @@ -63,7 +64,9 @@ .bd-toc-link { display: block; - padding: .25rem .75rem; + padding-top: .25rem; + padding-bottom: .25rem; + // padding: .25rem .75rem; color: $gray; } .bd-toc-link:hover, @@ -93,7 +96,9 @@ // All levels of nav .bd-sidebar .nav > li > a { display: block; - padding: .25rem .75rem; + padding-top: .25rem; + padding-bottom: .25rem; + // padding: .25rem .75rem; font-size: 90%; color: #99979c; } From 2c80f4d7cdc3ed23daaafe8e0b008e29e583f42d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 24 Oct 2016 16:05:14 -0700 Subject: [PATCH 007/136] make search work on homepage --- docs/_includes/footer.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index bfd657efe8..a31501480e 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -34,7 +34,6 @@ -{% if page.layout == "docs" %} -{% endif %} - - +{% if page.layout == "docs" %} + +{% endif %} {% if page.layout == "docs" %} - - + {% endif %} From 5c704d77ca917c318fe500b4b6513089fe22fa53 Mon Sep 17 00:00:00 2001 From: Maxime Locqueville Date: Mon, 29 May 2017 08:34:03 +0200 Subject: [PATCH 093/136] Better handling of redirects --- _includes/footer.html | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 4b639ea21a..a2f74e0707 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -42,15 +42,13 @@ apiKey: '48cb48b22351bc71ea5f12f4d1ede198', indexName: 'bootstrap-v4', inputSelector: '#search-input', - debug: true // Set debug to true if you want to inspect the dropdown - }); - - docsearch.autocomplete.on('autocomplete:selected', function(event, suggestion) { - location.href = suggestion.url.replace("https://v4-alpha.getbootstrap.com", ""); - }).on('keypress', function(event) { - if (event.keyCode === 13) { - location.href = suggestion.url.replace("https://v4-alpha.getbootstrap.com", "") - } + transformData: function (hits) { + return hits.map(function (hit) { + hit.url = hit.url.replace('https://v4-alpha.getbootstrap.com', ''); + return hit; + }); + }, + debug: false // Set debug to true if you want to inspect the dropdown }); {% endif %} From 6ee35ced8650d65fbdbb5bbbe4575f53ae8fc801 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 May 2017 10:52:13 -0700 Subject: [PATCH 094/136] move scripts to separate include so we can include them across layouts even if the footer isn't there --- _includes/footer.html | 51 ------------------------------------------ _includes/scripts.html | 50 +++++++++++++++++++++++++++++++++++++++++ _layouts/default.html | 1 + _layouts/docs.html | 2 ++ _layouts/home.html | 1 + 5 files changed, 54 insertions(+), 51 deletions(-) create mode 100644 _includes/scripts.html diff --git a/_includes/footer.html b/_includes/footer.html index a2f74e0707..19b05996f2 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -10,54 +10,3 @@

Currently v{{ site.current_version }}. Code licensed MIT, docs CC BY 3.0.

- - - - - - -{% if site.github %} - -{% else %} - -{% endif %} - -{% if site.github %} - -{% else %} - - - - -{% endif %} - - - - - -{% if page.layout == "docs" %} - - -{% endif %} - - diff --git a/_includes/scripts.html b/_includes/scripts.html new file mode 100644 index 0000000000..a713f81d0f --- /dev/null +++ b/_includes/scripts.html @@ -0,0 +1,50 @@ + + + + + +{% if site.github %} + +{% else %} + +{% endif %} + +{% if site.github %} + +{% else %} + + + + +{% endif %} + + + + + +{% if page.layout == "docs" %} + + +{% endif %} + + diff --git a/_layouts/default.html b/_layouts/default.html index e3642ac6d1..d5e6b10b43 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -17,5 +17,6 @@ {% include footer.html %} + {% include scripts.html %} diff --git a/_layouts/docs.html b/_layouts/docs.html index 7bbb06b87d..26ba91aae7 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -31,5 +31,7 @@ {% endif %}
+ + {% include scripts.html %} diff --git a/_layouts/home.html b/_layouts/home.html index 788ecf1dd5..64eabadb11 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -15,5 +15,6 @@ {{ content }} {% include footer.html %} + {% include scripts.html %} From d326df63f22a2192e29685b607c65704eab3acbf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 May 2017 10:57:50 -0700 Subject: [PATCH 095/136] revamp some files --- bower.json | 13 ++- docs/CNAME | 1 - docs/LICENSE | 319 --------------------------------------------------- 3 files changed, 7 insertions(+), 326 deletions(-) delete mode 100644 docs/CNAME delete mode 100644 docs/LICENSE diff --git a/bower.json b/bower.json index 50e6671525..befdde18fe 100644 --- a/bower.json +++ b/bower.json @@ -20,14 +20,15 @@ ], "ignore": [ "/.*", - "_config.yml", + "/_*", + "about", + "assets", + "docs", + "js/tests", + "nuget", "CNAME", "composer.json", - "CONTRIBUTING.md", - "docs", - "Gruntfile.js", - "js/tests", - "test-infra" + "Gruntfile.js" ], "dependencies": { "jquery": ">=1.9.1", diff --git a/docs/CNAME b/docs/CNAME deleted file mode 100644 index 039362df61..0000000000 --- a/docs/CNAME +++ /dev/null @@ -1 +0,0 @@ -v4-alpha.getbootstrap.com diff --git a/docs/LICENSE b/docs/LICENSE deleted file mode 100644 index 1d658d6d37..0000000000 --- a/docs/LICENSE +++ /dev/null @@ -1,319 +0,0 @@ -Creative Commons Legal Code - -Attribution 3.0 Unported - - CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE - LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN - ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS - INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES - REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR - DAMAGES RESULTING FROM ITS USE. - -License - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE -COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY -COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS -AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE -TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY -BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS -CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND -CONDITIONS. - -1. Definitions - - a. "Adaptation" means a work based upon the Work, or upon the Work and - other pre-existing works, such as a translation, adaptation, - derivative work, arrangement of music or other alterations of a - literary or artistic work, or phonogram or performance and includes - cinematographic adaptations or any other form in which the Work may be - recast, transformed, or adapted including in any form recognizably - derived from the original, except that a work that constitutes a - Collection will not be considered an Adaptation for the purpose of - this License. For the avoidance of doubt, where the Work is a musical - work, performance or phonogram, the synchronization of the Work in - timed-relation with a moving image ("synching") will be considered an - Adaptation for the purpose of this License. - b. "Collection" means a collection of literary or artistic works, such as - encyclopedias and anthologies, or performances, phonograms or - broadcasts, or other works or subject matter other than works listed - in Section 1(f) below, which, by reason of the selection and - arrangement of their contents, constitute intellectual creations, in - which the Work is included in its entirety in unmodified form along - with one or more other contributions, each constituting separate and - independent works in themselves, which together are assembled into a - collective whole. A work that constitutes a Collection will not be - considered an Adaptation (as defined above) for the purposes of this - License. - c. "Distribute" means to make available to the public the original and - copies of the Work or Adaptation, as appropriate, through sale or - other transfer of ownership. - d. "Licensor" means the individual, individuals, entity or entities that - offer(s) the Work under the terms of this License. - e. "Original Author" means, in the case of a literary or artistic work, - the individual, individuals, entity or entities who created the Work - or if no individual or entity can be identified, the publisher; and in - addition (i) in the case of a performance the actors, singers, - musicians, dancers, and other persons who act, sing, deliver, declaim, - play in, interpret or otherwise perform literary or artistic works or - expressions of folklore; (ii) in the case of a phonogram the producer - being the person or legal entity who first fixes the sounds of a - performance or other sounds; and, (iii) in the case of broadcasts, the - organization that transmits the broadcast. - f. "Work" means the literary and/or artistic work offered under the terms - of this License including without limitation any production in the - literary, scientific and artistic domain, whatever may be the mode or - form of its expression including digital form, such as a book, - pamphlet and other writing; a lecture, address, sermon or other work - of the same nature; a dramatic or dramatico-musical work; a - choreographic work or entertainment in dumb show; a musical - composition with or without words; a cinematographic work to which are - assimilated works expressed by a process analogous to cinematography; - a work of drawing, painting, architecture, sculpture, engraving or - lithography; a photographic work to which are assimilated works - expressed by a process analogous to photography; a work of applied - art; an illustration, map, plan, sketch or three-dimensional work - relative to geography, topography, architecture or science; a - performance; a broadcast; a phonogram; a compilation of data to the - extent it is protected as a copyrightable work; or a work performed by - a variety or circus performer to the extent it is not otherwise - considered a literary or artistic work. - g. "You" means an individual or entity exercising rights under this - License who has not previously violated the terms of this License with - respect to the Work, or who has received express permission from the - Licensor to exercise rights under this License despite a previous - violation. - h. "Publicly Perform" means to perform public recitations of the Work and - to communicate to the public those public recitations, by any means or - process, including by wire or wireless means or public digital - performances; to make available to the public Works in such a way that - members of the public may access these Works from a place and at a - place individually chosen by them; to perform the Work to the public - by any means or process and the communication to the public of the - performances of the Work, including by public digital performance; to - broadcast and rebroadcast the Work by any means including signs, - sounds or images. - i. "Reproduce" means to make copies of the Work by any means including - without limitation by sound or visual recordings and the right of - fixation and reproducing fixations of the Work, including storage of a - protected performance or phonogram in digital form or other electronic - medium. - -2. Fair Dealing Rights. Nothing in this License is intended to reduce, -limit, or restrict any uses free from copyright or rights arising from -limitations or exceptions that are provided for in connection with the -copyright protection under copyright law or other applicable laws. - -3. License Grant. Subject to the terms and conditions of this License, -Licensor hereby grants You a worldwide, royalty-free, non-exclusive, -perpetual (for the duration of the applicable copyright) license to -exercise the rights in the Work as stated below: - - a. to Reproduce the Work, to incorporate the Work into one or more - Collections, and to Reproduce the Work as incorporated in the - Collections; - b. to create and Reproduce Adaptations provided that any such Adaptation, - including any translation in any medium, takes reasonable steps to - clearly label, demarcate or otherwise identify that changes were made - to the original Work. For example, a translation could be marked "The - original work was translated from English to Spanish," or a - modification could indicate "The original work has been modified."; - c. to Distribute and Publicly Perform the Work including as incorporated - in Collections; and, - d. to Distribute and Publicly Perform Adaptations. - e. For the avoidance of doubt: - - i. Non-waivable Compulsory License Schemes. In those jurisdictions in - which the right to collect royalties through any statutory or - compulsory licensing scheme cannot be waived, the Licensor - reserves the exclusive right to collect such royalties for any - exercise by You of the rights granted under this License; - ii. Waivable Compulsory License Schemes. In those jurisdictions in - which the right to collect royalties through any statutory or - compulsory licensing scheme can be waived, the Licensor waives the - exclusive right to collect such royalties for any exercise by You - of the rights granted under this License; and, - iii. Voluntary License Schemes. The Licensor waives the right to - collect royalties, whether individually or, in the event that the - Licensor is a member of a collecting society that administers - voluntary licensing schemes, via that society, from any exercise - by You of the rights granted under this License. - -The above rights may be exercised in all media and formats whether now -known or hereafter devised. The above rights include the right to make -such modifications as are technically necessary to exercise the rights in -other media and formats. Subject to Section 8(f), all rights not expressly -granted by Licensor are hereby reserved. - -4. Restrictions. The license granted in Section 3 above is expressly made -subject to and limited by the following restrictions: - - a. You may Distribute or Publicly Perform the Work only under the terms - of this License. You must include a copy of, or the Uniform Resource - Identifier (URI) for, this License with every copy of the Work You - Distribute or Publicly Perform. You may not offer or impose any terms - on the Work that restrict the terms of this License or the ability of - the recipient of the Work to exercise the rights granted to that - recipient under the terms of the License. You may not sublicense the - Work. You must keep intact all notices that refer to this License and - to the disclaimer of warranties with every copy of the Work You - Distribute or Publicly Perform. When You Distribute or Publicly - Perform the Work, You may not impose any effective technological - measures on the Work that restrict the ability of a recipient of the - Work from You to exercise the rights granted to that recipient under - the terms of the License. This Section 4(a) applies to the Work as - incorporated in a Collection, but this does not require the Collection - apart from the Work itself to be made subject to the terms of this - License. If You create a Collection, upon notice from any Licensor You - must, to the extent practicable, remove from the Collection any credit - as required by Section 4(b), as requested. If You create an - Adaptation, upon notice from any Licensor You must, to the extent - practicable, remove from the Adaptation any credit as required by - Section 4(b), as requested. - b. If You Distribute, or Publicly Perform the Work or any Adaptations or - Collections, You must, unless a request has been made pursuant to - Section 4(a), keep intact all copyright notices for the Work and - provide, reasonable to the medium or means You are utilizing: (i) the - name of the Original Author (or pseudonym, if applicable) if supplied, - and/or if the Original Author and/or Licensor designate another party - or parties (e.g., a sponsor institute, publishing entity, journal) for - attribution ("Attribution Parties") in Licensor's copyright notice, - terms of service or by other reasonable means, the name of such party - or parties; (ii) the title of the Work if supplied; (iii) to the - extent reasonably practicable, the URI, if any, that Licensor - specifies to be associated with the Work, unless such URI does not - refer to the copyright notice or licensing information for the Work; - and (iv) , consistent with Section 3(b), in the case of an Adaptation, - a credit identifying the use of the Work in the Adaptation (e.g., - "French translation of the Work by Original Author," or "Screenplay - based on original Work by Original Author"). The credit required by - this Section 4 (b) may be implemented in any reasonable manner; - provided, however, that in the case of a Adaptation or Collection, at - a minimum such credit will appear, if a credit for all contributing - authors of the Adaptation or Collection appears, then as part of these - credits and in a manner at least as prominent as the credits for the - other contributing authors. For the avoidance of doubt, You may only - use the credit required by this Section for the purpose of attribution - in the manner set out above and, by exercising Your rights under this - License, You may not implicitly or explicitly assert or imply any - connection with, sponsorship or endorsement by the Original Author, - Licensor and/or Attribution Parties, as appropriate, of You or Your - use of the Work, without the separate, express prior written - permission of the Original Author, Licensor and/or Attribution - Parties. - c. Except as otherwise agreed in writing by the Licensor or as may be - otherwise permitted by applicable law, if You Reproduce, Distribute or - Publicly Perform the Work either by itself or as part of any - Adaptations or Collections, You must not distort, mutilate, modify or - take other derogatory action in relation to the Work which would be - prejudicial to the Original Author's honor or reputation. Licensor - agrees that in those jurisdictions (e.g. Japan), in which any exercise - of the right granted in Section 3(b) of this License (the right to - make Adaptations) would be deemed to be a distortion, mutilation, - modification or other derogatory action prejudicial to the Original - Author's honor and reputation, the Licensor will waive or not assert, - as appropriate, this Section, to the fullest extent permitted by the - applicable national law, to enable You to reasonably exercise Your - right under Section 3(b) of this License (right to make Adaptations) - but not otherwise. - -5. Representations, Warranties and Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR -OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY -KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, -INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, -FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF -LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, -WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION -OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. - -6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE -LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR -ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES -ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS -BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. Termination - - a. This License and the rights granted hereunder will terminate - automatically upon any breach by You of the terms of this License. - Individuals or entities who have received Adaptations or Collections - from You under this License, however, will not have their licenses - terminated provided such individuals or entities remain in full - compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will - survive any termination of this License. - b. Subject to the above terms and conditions, the license granted here is - perpetual (for the duration of the applicable copyright in the Work). - Notwithstanding the above, Licensor reserves the right to release the - Work under different license terms or to stop distributing the Work at - any time; provided, however that any such election will not serve to - withdraw this License (or any other license that has been, or is - required to be, granted under the terms of this License), and this - License will continue in full force and effect unless terminated as - stated above. - -8. Miscellaneous - - a. Each time You Distribute or Publicly Perform the Work or a Collection, - the Licensor offers to the recipient a license to the Work on the same - terms and conditions as the license granted to You under this License. - b. Each time You Distribute or Publicly Perform an Adaptation, Licensor - offers to the recipient a license to the original Work on the same - terms and conditions as the license granted to You under this License. - c. If any provision of this License is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this License, and without further action - by the parties to this agreement, such provision shall be reformed to - the minimum extent necessary to make such provision valid and - enforceable. - d. No term or provision of this License shall be deemed waived and no - breach consented to unless such waiver or consent shall be in writing - and signed by the party to be charged with such waiver or consent. - e. This License constitutes the entire agreement between the parties with - respect to the Work licensed here. There are no understandings, - agreements or representations with respect to the Work not specified - here. Licensor shall not be bound by any additional provisions that - may appear in any communication from You. This License may not be - modified without the mutual written agreement of the Licensor and You. - f. The rights granted under, and the subject matter referenced, in this - License were drafted utilizing the terminology of the Berne Convention - for the Protection of Literary and Artistic Works (as amended on - September 28, 1979), the Rome Convention of 1961, the WIPO Copyright - Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 - and the Universal Copyright Convention (as revised on July 24, 1971). - These rights and subject matter take effect in the relevant - jurisdiction in which the License terms are sought to be enforced - according to the corresponding provisions of the implementation of - those treaty provisions in the applicable national law. If the - standard suite of rights granted under applicable copyright law - includes additional rights not granted under this License, such - additional rights are deemed to be included in the License; this - License is not intended to restrict the license of any rights under - applicable law. - - -Creative Commons Notice - - Creative Commons is not a party to this License, and makes no warranty - whatsoever in connection with the Work. Creative Commons will not be - liable to You or any party on any legal theory for any damages - whatsoever, including without limitation any general, special, - incidental or consequential damages arising in connection to this - license. Notwithstanding the foregoing two (2) sentences, if Creative - Commons has expressly identified itself as the Licensor hereunder, it - shall have all rights and obligations of Licensor. - - Except for the limited purpose of indicating to the public that the - Work is licensed under the CCPL, Creative Commons does not authorize - the use by either party of the trademark "Creative Commons" or any - related trademark or logo of Creative Commons without the prior - written consent of Creative Commons. Any permitted use will be in - compliance with Creative Commons' then-current trademark usage - guidelines, as may be published on its website or otherwise made - available upon request from time to time. For the avoidance of doubt, - this trademark restriction does not form part of this License. - - Creative Commons may be contacted at http://creativecommons.org/. From 4d2570d0383da92b22cc136987f041412c4d20a3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 May 2017 11:15:43 -0700 Subject: [PATCH 096/136] drop htmlhint given htmllint gives us most of the coverage we need here --- CHANGELOG.md | 5 ----- build/.htmlhintrc | 17 ----------------- package.json | 3 +-- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 CHANGELOG.md delete mode 100644 build/.htmlhintrc diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 7b60d7c9a6..0000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,5 +0,0 @@ -Bootstrap uses [GitHub's Releases feature](https://github.com/blog/1547-release-your-software) for its changelogs. - -See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap. - -Release announcement posts on [the official Bootstrap blog](https://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release. diff --git a/build/.htmlhintrc b/build/.htmlhintrc deleted file mode 100644 index dff2e8088c..0000000000 --- a/build/.htmlhintrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "alt-require": true, - "attr-lowercase": true, - "attr-no-duplication": true, - "attr-unsafe-chars": true, - "attr-value-double-quotes": true, - "doctype-first": true, - "doctype-html5": true, - "id-class-value": true, - "id-unique": true, - "space-tab-mixed-disabled": true, - "spec-char-escape": true, - "src-not-empty": true, - "tag-pair": true, - "tagname-lowercase": true, - "title-require": true -} diff --git a/package.json b/package.json index ff331185f4..8816c1bd11 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "js-launch-cloud": "ruby -r webrick -e \"s = WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd, :Logger => WEBrick::Log.new('/dev/null'), :AccessLog => []); trap('INT') { s.shutdown }; s.start\" & grunt saucelabs-qunit", "js-test-cloud": "npm-run-all js-test-dep js-launch-cloud", "docs": "npm-run-all docs-compile docs-lint", - "docs-lint": "htmlhint --config build/.htmlhintrc _gh_pages/ js/tests/visual/ && htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", + "docs-lint": "htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", "docs-compile": "bundle exec jekyll build", "docs-serve": "bundle exec jekyll serve", "docs-github": "shx echo 'github: true' > $npm_config_tmp/twbsconfig.yml && npm run docs-compile -- --config _config.yml,$npm_config_tmp/twbsconfig.yml && shx rm $npm_config_tmp/twbsconfig.yml", @@ -80,7 +80,6 @@ "babel-preset-es2015": "^7.0.0-alpha.7", "clean-css-cli": "^4.0.12", "eslint": "^3.19.0", - "htmlhint": "^0.9.13", "htmllint-cli": "^0.0.6", "node-sass": "^4.5.2", "nodemon": "^1.11.0", From 73a550c7f8eece4df12a3cc75fb3362dc03030d7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 May 2017 11:18:45 -0700 Subject: [PATCH 097/136] update paths --- js/tests/index.html | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/js/tests/index.html b/js/tests/index.html index d17608e4a9..6e2b974f91 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -6,8 +6,8 @@ Bootstrap Plugin Test Suite - - + + @@ -96,17 +96,17 @@ - - - - - - - - - - - + + + + + + + + + + + From b2c1e89c6aad91651984b80e510c4708a83ac651 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 May 2017 11:38:06 -0700 Subject: [PATCH 098/136] update urls --- docs/4.0/browser-bugs.md | 2 +- docs/4.0/components/button-group.md | 2 +- docs/4.0/components/card.md | 6 +++--- docs/4.0/components/carousel.md | 2 +- docs/4.0/components/collapse.md | 2 +- docs/4.0/components/forms.md | 12 ++++++------ docs/4.0/components/list-group.md | 4 ++-- docs/4.0/components/modal.md | 4 ++-- docs/4.0/components/navs.md | 6 +++--- docs/4.0/components/pagination.md | 2 +- docs/4.0/components/popovers.md | 2 +- docs/4.0/components/progress.md | 2 +- docs/4.0/components/scrollspy.md | 2 +- docs/4.0/content/figures.md | 2 +- docs/4.0/content/images.md | 4 ++-- docs/4.0/content/reboot.md | 8 ++++---- docs/4.0/content/tables.md | 2 +- docs/4.0/content/typography.md | 6 +++--- docs/4.0/getting-started/browsers-devices.md | 2 +- docs/4.0/getting-started/download.md | 2 +- docs/4.0/getting-started/introduction.md | 6 +++--- docs/4.0/layout/grid.md | 10 +++++----- docs/4.0/layout/media-object.md | 4 ++-- docs/4.0/migration.md | 4 ++-- docs/4.0/utilities/screenreaders.md | 2 +- 25 files changed, 50 insertions(+), 50 deletions(-) diff --git a/docs/4.0/browser-bugs.md b/docs/4.0/browser-bugs.md index f02cb9a37e..1d8acc18b1 100644 --- a/docs/4.0/browser-bugs.md +++ b/docs/4.0/browser-bugs.md @@ -6,7 +6,7 @@ group: browser-bugs Bootstrap currently works around several outstanding browser bugs in major browsers to deliver the best cross-browser experience possible. Some bugs, like those listed below, cannot be solved by us. -We publicly list browser bugs that are impacting us here, in the hopes of expediting the process of fixing them. For information on Bootstrap's browser compatibility, [see our browser compatibility docs]({{ site.baseurl }}/getting-started/browsers-devices/#supported-browsers). +We publicly list browser bugs that are impacting us here, in the hopes of expediting the process of fixing them. For information on Bootstrap's browser compatibility, [see our browser compatibility docs]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/browsers-devices/#supported-browsers). See also: diff --git a/docs/4.0/components/button-group.md b/docs/4.0/components/button-group.md index f328b94227..e702bb76e9 100644 --- a/docs/4.0/components/button-group.md +++ b/docs/4.0/components/button-group.md @@ -8,7 +8,7 @@ toc: true ## Basic example -Wrap a series of buttons with `.btn` in `.btn-group`. Add on optional JavaScript radio and checkbox style behavior with [our buttons plugin]({{ site.baseurl }}/components/buttons/#button-plugin). +Wrap a series of buttons with `.btn` in `.btn-group`. Add on optional JavaScript radio and checkbox style behavior with [our buttons plugin]({{ site.baseurl }}/docs/{{ site.docs_version }}/components/buttons/#button-plugin). {% example html %}
diff --git a/docs/4.0/components/card.md b/docs/4.0/components/card.md index ff3096ec2b..861378560d 100644 --- a/docs/4.0/components/card.md +++ b/docs/4.0/components/card.md @@ -206,7 +206,7 @@ Using the grid, wrap cards in columns and rows as needed. ### Using utilities -Use our handful of [available sizing utilities]({{ site.baseurl }}/utilities/sizing/) to quickly set a card's width. +Use our handful of [available sizing utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/sizing/) to quickly set a card's width. {% example html %}
@@ -242,7 +242,7 @@ Use custom CSS in your stylesheets or as inline styles to set a width. ## Text alignment -You can quickly change the text alignment of any card—in its entirety or specific parts—with our [text align classes]({{ site.baseurl }}/utilities/typography/#text-alignment). +You can quickly change the text alignment of any card—in its entirety or specific parts—with our [text align classes]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/typography/#text-alignment). {% example html %}
@@ -272,7 +272,7 @@ You can quickly change the text alignment of any card—in its entirety or speci ## Navigation -Add some navigation to a card's header (or block) with Bootstrap's [nav components]({{ site.baseurl }}/components/navs/). +Add some navigation to a card's header (or block) with Bootstrap's [nav components]({{ site.baseurl }}/docs/{{ site.docs_version }}/components/navs/). {% example html %}
diff --git a/docs/4.0/components/carousel.md b/docs/4.0/components/carousel.md index ae82eb08f5..0846a68be1 100644 --- a/docs/4.0/components/carousel.md +++ b/docs/4.0/components/carousel.md @@ -109,7 +109,7 @@ The `.active` class needs to be added to one of the slides. Otherwise, the carou ### With captions -Add captions to your slides easily with the `.carousel-caption` element within any `.carousel-item`. They can be easily hidden on smaller viewports, as shown below, with optional [display utilities]({{ site.baseurl }}/utilities/display-property/). We hide them initially with `.d-none` and bring them back on medium-sized devices with `.d-md-block`. +Add captions to your slides easily with the `.carousel-caption` element within any `.carousel-item`. They can be easily hidden on smaller viewports, as shown below, with optional [display utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/display-property/). We hide them initially with `.d-none` and bring them back on medium-sized devices with `.d-md-block`.