From: Mark Otto Date: Fri, 19 Jun 2015 06:56:43 +0000 (-0700) Subject: Merge branch 'master' into v4 X-Git-Tag: v4.0.0-alpha~177 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=169d2a4a78776ddaa4fec774691a3c5f03aa3eda;p=thirdparty%2Fbootstrap.git Merge branch 'master' into v4 --- 169d2a4a78776ddaa4fec774691a3c5f03aa3eda diff --cc Gruntfile.js index 31540205e9,4c021cef15..70c52fe5ec --- a/Gruntfile.js +++ b/Gruntfile.js @@@ -488,11 -506,12 +488,11 @@@ module.exports = function (grunt) // Docs task. grunt.registerTask('docs-css', ['autoprefixer:docs', 'autoprefixer:examples', 'csscomb:docs', 'csscomb:examples', 'cssmin:docs']); - grunt.registerTask('lint-docs-css', ['csslint:docs', 'csslint:examples']); - grunt.registerTask('docs-js', ['uglify:docsJs', 'uglify:customize']); - grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']); - grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-glyphicons-data', 'build-customizer']); + grunt.registerTask('docs-js', ['uglify:docsJs']); + grunt.registerTask('lint-docs-js', ['jscs:assets']); + grunt.registerTask('docs', ['docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs']); - grunt.registerTask('docs-github', ['jekyll:github']); + grunt.registerTask('prep-release', ['dist', 'docs', 'jekyll:github', 'htmlmin', 'compress']); // Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json). // This task should be run and the updated file should be committed whenever Bootstrap's dependencies change. diff --cc README.md index 13785757b1,34c8b5a572..8864865c83 --- a/README.md +++ b/README.md @@@ -1,9 -1,9 +1,11 @@@ # [Bootstrap](http://getbootstrap.com) - ![Bower version](https://img.shields.io/bower/v/bootstrap.svg?style=flat) - [![npm version](https://img.shields.io/npm/v/bootstrap.svg?style=flat)](https://www.npmjs.com/package/bootstrap) - [![Gem version](https://img.shields.io/gem/v/bootstrap.svg?style=flat)](https://rubygems.org/gems/bootstrap) - [![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg?style=flat)](https://travis-ci.org/twbs/bootstrap) - [![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg?style=flat)](https://david-dm.org/twbs/bootstrap#info=devDependencies) ++ + [![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com) + ![Bower version](https://img.shields.io/bower/v/bootstrap.svg) + [![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap) ++[![Gem version](https://img.shields.io/gem/v/bootstrap.svg)](https://rubygems.org/gems/bootstrap) + [![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg)](https://travis-ci.org/twbs/bootstrap) + [![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg)](https://david-dm.org/twbs/bootstrap#info=devDependencies) [![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/orgs/twbs/people) with the massive support and involvement of the community. @@@ -43,14 -43,23 +45,13 @@@ bootstrap ├── css/ │ ├── bootstrap.css │ ├── bootstrap.css.map -│ ├── bootstrap.min.css -│ ├── bootstrap-theme.css -│ ├── bootstrap-theme.css.map -│ └── bootstrap-theme.min.css -├── js/ -│ ├── bootstrap.js -│ └── bootstrap.min.js -└── fonts/ - ├── glyphicons-halflings-regular.eot - ├── glyphicons-halflings-regular.svg - ├── glyphicons-halflings-regular.ttf - ├── glyphicons-halflings-regular.woff - └── glyphicons-halflings-regular.woff2 +│ └── bootstrap.min.css +└── js/ + ├── bootstrap.js + └── bootstrap.min.js ``` - We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/chrome-developer-tools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. -We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developer.chrome.com/devtools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme. -- ++We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developer.chrome.com/devtools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. ## Bugs and feature requests diff --cc _reset-text.scss index 0000000000,0000000000..c78db03144 new file mode 100644 --- /dev/null +++ b/_reset-text.scss @@@ -1,0 -1,0 +1,18 @@@ ++@mixin reset-text { ++ font-family: $font-family-base; ++ // We deliberately do NOT reset font-size. ++ font-style: normal; ++ font-weight: normal; ++ letter-spacing: normal; ++ line-break: auto; ++ line-height: $line-height-base; ++ text-align: left; // Fallback for where `start` is not supported ++ text-align: start; ++ text-decoration: none; ++ text-shadow: none; ++ text-transform: none; ++ white-space: normal; ++ word-break: normal; ++ word-spacing: normal; ++ word-wrap: normal; ++} diff --cc bower.json index 27606caa81,686bcf1ae2..795aa445a9 --- a/bower.json +++ b/bower.json @@@ -13,9 -12,10 +12,10 @@@ "web" ], "homepage": "http://getbootstrap.com", + "license": "MIT", + "moduleType": "globals", "main": [ - "less/bootstrap.less", + "scss/bootstrap.scss", - "dist/css/bootstrap.css", "dist/js/bootstrap.js" ], "ignore": [ diff --cc docs/_includes/footer.html index 7b4b8d2d19,ebc6018f59..f1b8db66ab --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@@ -35,12 -32,12 +35,12 @@@ - + {% if site.github %} - + {% else %} - + {% endif %} {% if site.github %} diff --cc docs/_includes/social-buttons.html index c20fcaa9e7,bb02618481..f7a3329b35 --- a/docs/_includes/social-buttons.html +++ b/docs/_includes/social-buttons.html @@@ -1,10 -1,10 +1,10 @@@ -
-