From 44eedd553e21a0cead45ddbd6c257fcef5a92baf Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Thu, 10 Dec 2015 09:02:44 -0600 Subject: [PATCH] sync with BSv4 --- Gemfile | 1 + Gemfile.lock | 3 + Gruntfile.js | 51 +++++--- _config.yml | 11 ++ docs/_includes/footer.html | 2 +- docs/_includes/header.html | 2 + docs/assets/js/vendor/anchor.min.js | 4 +- docs/assets/js/vendor/clipboard.min.js | 6 +- docs/assets/js/vendor/jekyll-search.js | 1 - docs/assets/js/vendor/jekyll-search.min.js | 1 + docs/assets/scss/_clipboard-js.scss | 12 +- docs/assets/scss/_component-examples.scss | 4 + docs/assets/scss/_sidebar.scss | 1 + docs/components/card.md | 10 ++ docs/components/forms.md | 2 +- docs/components/input-group.md | 2 +- docs/components/jumbotron.md | 2 +- docs/components/navbar.md | 67 +++++++++-- docs/components/pagination.md | 72 ++++++------ docs/components/utilities.md | 111 ++++++++---------- docs/content/code.md | 11 -- docs/content/figures.md | 11 -- docs/content/images.md | 15 +-- docs/content/reboot.md | 11 -- docs/content/tables.md | 11 -- docs/content/typography.md | 37 ++---- docs/examples/album/index.html | 4 +- docs/examples/carousel/carousel.css | 13 +- docs/examples/carousel/index.html | 6 +- docs/examples/cover/cover.css | 5 + docs/examples/dashboard/index.html | 4 +- docs/examples/index.md | 13 +- docs/examples/narrow-jumbotron/index.html | 2 +- docs/examples/navbar-top-fixed/index.html | 4 +- docs/examples/navbar-top/index.html | 4 +- docs/examples/navbar/index.html | 2 +- docs/examples/offcanvas/index.html | 2 +- docs/examples/offcanvas/offcanvas.css | 13 +- docs/examples/screenshots/album.jpg | Bin 64394 -> 116578 bytes docs/examples/screenshots/blog.jpg | Bin 122280 -> 222272 bytes docs/examples/screenshots/carousel.jpg | Bin 82270 -> 149498 bytes docs/examples/screenshots/cover.jpg | Bin 36580 -> 64724 bytes docs/examples/screenshots/dashboard.jpg | Bin 105325 -> 191405 bytes .../screenshots/equal-height-columns.jpg | Bin 129265 -> 237369 bytes docs/examples/screenshots/grid.jpg | Bin 99951 -> 181547 bytes .../examples/screenshots/jumbotron-narrow.jpg | Bin 68573 -> 124017 bytes docs/examples/screenshots/jumbotron.jpg | Bin 101076 -> 186694 bytes docs/examples/screenshots/justified-nav.jpg | Bin 79037 -> 143589 bytes docs/examples/screenshots/navbar-fixed.jpg | Bin 37932 -> 67538 bytes docs/examples/screenshots/navbar-static.jpg | Bin 39654 -> 70752 bytes docs/examples/screenshots/navbar.jpg | Bin 40956 -> 73108 bytes docs/examples/screenshots/non-responsive.jpg | Bin 61060 -> 111180 bytes docs/examples/screenshots/offcanvas.jpg | Bin 112527 -> 205513 bytes docs/examples/screenshots/sign-in.jpg | Bin 13596 -> 22234 bytes .../examples/screenshots/starter-template.jpg | Bin 22571 -> 38899 bytes .../screenshots/sticky-footer-navbar.jpg | Bin 39249 -> 69879 bytes docs/examples/screenshots/sticky-footer.jpg | Bin 25002 -> 44246 bytes docs/examples/screenshots/theme.jpg | Bin 85405 -> 154869 bytes docs/examples/sticky-footer-navbar/index.html | 64 +++++----- .../sticky-footer-navbar.css | 17 ++- docs/examples/sticky-footer/index.html | 4 +- docs/examples/sticky-footer/sticky-footer.css | 17 ++- docs/examples/tooltip-viewport/index.html | 4 +- docs/getting-started/options.md | 80 +++++++++++++ docs/layout/grid.md | 2 +- scss/.scss-lint.yml | 3 + scss/_buttons.scss | 5 - scss/_forms.scss | 8 +- scss/_navbar.scss | 9 -- scss/mixins/_variations.scss | 3 +- scss/variables/_forms.scss | 2 +- scss/variables/_type.scss | 8 ++ 72 files changed, 457 insertions(+), 302 deletions(-) delete mode 100644 docs/assets/js/vendor/jekyll-search.js create mode 100644 docs/assets/js/vendor/jekyll-search.min.js diff --git a/Gemfile b/Gemfile index 311d3e80..26b269ac 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,7 @@ source 'https://rubygems.org' group :development, :test do gem 'jekyll', '~> 3.0.1' gem 'jekyll-redirect-from', '~> 0.9.0' + gem 'jekyll-seo-tag', '~> 0.1.3' gem 'jekyll-sitemap', '~> 0.9.0' gem 'sass', '~> 3.4.19' gem 'scss_lint', '~> 0.43' diff --git a/Gemfile.lock b/Gemfile.lock index 9c4cc6a9..e625fd1b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,6 +16,8 @@ GEM jekyll (>= 2.0) jekyll-sass-converter (1.3.0) sass (~> 3.2) + jekyll-seo-tag (0.1.3) + jekyll (>= 2.0) jekyll-sitemap (0.9.0) jekyll-watch (1.3.0) listen (~> 3.0) @@ -42,6 +44,7 @@ PLATFORMS DEPENDENCIES jekyll (~> 3.0.1) jekyll-redirect-from (~> 0.9.0) + jekyll-seo-tag (~> 0.1.3) jekyll-sitemap (~> 0.9.0) sass (~> 3.4.19) scss_lint (~> 0.43) diff --git a/Gruntfile.js b/Gruntfile.js index 9310e7a5..6abb1161 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -47,8 +47,8 @@ module.exports = function (grunt) { 'Edge >= 12', 'Explorer >= 9', // Out of leniency, we prefix these 1 version further back than the official policy. - 'iOS >= 7', - 'Safari >= 7.1', + 'iOS >= 8', + 'Safari >= 8', // The following remain NOT officially supported, but we're lenient and include their prefixes to avoid severely breaking in them. 'Android 2.3', 'Android >= 4', @@ -327,7 +327,7 @@ module.exports = function (grunt) { compatibility: 'ie9', keepSpecialComments: '*', sourceMap: true, - noAdvanced: true + advanced: false }, core: { files: [ @@ -421,22 +421,36 @@ module.exports = function (grunt) { dest: 'docs/components/' }, 'bs-docs-content': { - options: { - // //https://regex101.com/r/cZ7aO8/2 - process: function (content, srcpath) { - return content - // insert docs reference - .replace(/(---[\s\S]+?---)([\s\S]+)/mg, referenceDocNotice) - // remove sample text 'display' as this is a particular style and is confusing - .replace(/Fancy display heading/, 'Fancy heading'); - } - }, + //options: { + // // https://regex101.com/r/cZ7aO8/2 + // process: function (content, srcpath) { + // return content + // // insert docs reference + // .replace(/(---[\s\S]+?---)([\s\S]+)/mg, referenceDocNotice) + // // remove sample text 'display' as this is a particular style and is confusing + // .replace(/Fancy display heading/, 'Fancy heading'); + // } + //}, expand: true, cwd: '../bootstrap/docs/content', src: [ '**/*' ], dest: 'docs/content/' + }, + 'bs-docs-examples': { + options: { + // //https://regex101.com/r/cZ7aO8/2 + process: function (content, srcpath) { + return content.replace(/(---[\s\S]+?---)([\s\S]+)/mg, referenceDocNotice); + } + }, + expand: true, + cwd: '../bootstrap/docs/examples', + src: [ + '**/*' + ], + dest: 'docs/examples/' } }, @@ -654,11 +668,18 @@ module.exports = function (grunt) { grunt.registerTask('docs-css', ['sass:docs', 'postcss:docs', 'postcss:examples', 'csscomb:docs', 'csscomb:examples', 'cssmin:docs']); grunt.registerTask('docs-js', ['babel:docs', 'uglify:docsJs']); grunt.registerTask('lint-docs-js', ['jscs:assets']); - grunt.registerTask('docs-copy-bootstrap-docs', ['copy:bs-docs-js-vendor', 'copy:bs-docs-scss', 'copy:bs-docs-components', 'copy:bs-docs-content']); + grunt.registerTask('docs-copy-bootstrap-docs', [ + 'copy:bs-docs-js-vendor', + 'copy:bs-docs-scss', + 'copy:bs-docs-components', + 'copy:bs-docs-content', + 'copy:bs-docs-examples' + ]); grunt.registerTask('docs', ['clean:docs', 'docs-copy-bootstrap-docs', 'docs-css', 'docs-js', 'lint-docs-js', 'copy:docs']); + grunt.registerTask('docs-github', ['jekyll:github']); - grunt.registerTask('prep-release', ['dist', 'docs', 'jekyll:github', 'htmlmin', 'compress']); + grunt.registerTask('prep-release', ['dist', 'docs', 'docs-github', 'compress']); // Publish to GitHub grunt.registerTask('publish', ['buildcontrol:pages']); diff --git a/_config.yml b/_config.yml index 2b7484fd..472c0274 100644 --- a/_config.yml +++ b/_config.yml @@ -27,6 +27,7 @@ exclude: [assets/scss/] gems: - jekyll-redirect-from + - jekyll-seo-tag - jekyll-sitemap # Custom vars @@ -54,3 +55,13 @@ cdn: # VERSION is substituted in variables.rb and these are made available as site.data.cdn.* jquery: https://ajax.googleapis.com/ajax/libs/jquery/VERSION/jquery.min.js bootstrap: https://cdn.rawgit.com/twbs/bootstrap/VERSION/dist/js/bootstrap.js + + + +#twitter: +# username: getbootstrap +# +#social: +# type: organization +# name: twbs +# links: ["https://www.facebook.com/getbootstrap/", "https://twitter.com/getbootstrap"] diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 1289accb..466a5338 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -42,7 +42,7 @@ {% if page.layout == "docs" %} - +