From c503f7b66ff3b6abeef90d5b29a2a373574b01f6 Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Sun, 15 Jun 2014 16:26:32 +0400 Subject: [PATCH 01/61] README.md: Refactoring bages. --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3f41637011..0992482310 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # [Bootstrap](http://getbootstrap.com) -[![Bower version](https://badge.fury.io/bo/bootstrap.svg)](http://badge.fury.io/bo/bootstrap) [![NPM version](https://badge.fury.io/js/bootstrap.svg)](http://badge.fury.io/js/bootstrap) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.svg?branch=master)](http://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.svg?theme=.io)](https://david-dm.org/twbs/bootstrap#info=devDependencies) +[![Bower version](https://badge.fury.io/bo/bootstrap.svg)](http://badge.fury.io/bo/bootstrap) +[![NPM version](https://badge.fury.io/js/bootstrap.svg)](http://badge.fury.io/js/bootstrap) +[![Build Status](https://secure.travis-ci.org/twbs/bootstrap.svg?branch=master)](http://travis-ci.org/twbs/bootstrap) +[![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.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](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat), and maintained by the [core team](https://github.com/twbs?tab=members) with the massive support and involvement of the community. From fdc33ced179680645b7b631c6e8c5760bb6fda5e Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Sun, 15 Jun 2014 16:41:24 +0200 Subject: [PATCH 02/61] Always use preserveComment: 'some' --- Gruntfile.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index ca9d43eec4..4c796f725b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -109,17 +109,14 @@ module.exports = function (grunt) { }, uglify: { + options: { + preserveComments: 'some' + }, bootstrap: { - options: { - banner: '<%= banner %>' - }, src: '<%= concat.bootstrap.dest %>', dest: 'dist/js/<%= pkg.name %>.min.js' }, customize: { - options: { - preserveComments: 'some' - }, src: [ 'docs/assets/js/_vendor/less.min.js', 'docs/assets/js/_vendor/jszip.min.js', @@ -132,9 +129,6 @@ module.exports = function (grunt) { dest: 'docs/assets/js/customize.min.js' }, docsJs: { - options: { - preserveComments: 'some' - }, src: [ 'docs/assets/js/_vendor/holder.js', 'docs/assets/js/_vendor/ZeroClipboard.min.js', From 3f68c40ac1011059ad0e3a7098bc1c75e4cd92bc Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Wed, 11 Jun 2014 19:09:35 +0200 Subject: [PATCH 03/61] Make autoprefixer browsers fixed Closes #13795 by merging it. --- Gruntfile.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index ca9d43eec4..3301329ecb 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -180,7 +180,16 @@ module.exports = function (grunt) { autoprefixer: { options: { - browsers: ['last 2 versions', 'ie 8', 'ie 9', 'android 2.3', 'android 4', 'opera 12'] + browsers: [ + 'Android 2.3', + 'Android >= 4', + 'Chrome >= 20', + 'Firefox >= 24', // Firefox 24 is the latest ESR + 'Explorer >= 8', + 'iOS >= 6', + 'Opera >= 12', + 'Safari >= 6' + ] }, core: { options: { From 5b9e2bf1265eb50c0d4105b2eb3da12280c37430 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 17 Jun 2014 12:57:54 -0700 Subject: [PATCH 04/61] popovers.html: fix typo: "Dimissmisable" --- docs/_includes/js/popovers.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index 2ee6707415..53320fc4a5 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -111,10 +111,10 @@ sagittis lacus vel augue laoreet rutrum faucibus.">

Dismiss on next click

Use the focus trigger to dismiss popovers on their next click.

- +
{% highlight html %} - + {% endhighlight %} {% highlight js %} $('.popover-dismiss').popover({ From 128e52ff29be0f275bb92693c9db3ba34d5c003d Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Tue, 17 Jun 2014 23:35:35 +0200 Subject: [PATCH 05/61] Fix dismissible spelling --- docs/_includes/components/alerts.html | 8 ++++---- docs/_includes/js/popovers.html | 4 ++-- docs/_includes/nav/components.html | 2 +- less/alerts.less | 5 +++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/_includes/components/alerts.html b/docs/_includes/components/alerts.html index f0895b0ed9..749ecc2b47 100644 --- a/docs/_includes/components/alerts.html +++ b/docs/_includes/components/alerts.html @@ -32,16 +32,16 @@ {% endhighlight %} -

Dismissable alerts

-

Build on any alert by adding an optional .alert-dismissable and close button.

+

Dismissible alerts

+

Build on any alert by adding an optional .alert-dismissible and close button.

- {% highlight html %} -