From 71f4abc2015164de45eb83c9b63ac739efd15a4d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 24 Apr 2015 13:20:56 -0700 Subject: Add slack badge, link to join, and update copy --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index a340f48f7..ee9e75327 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # [Bootstrap](http://getbootstrap.com) +![Slack](http://bootstrap-slack.herokuapp.com/badge.svg) ![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) [![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg?style=flat)](https://travis-ci.org/twbs/bootstrap) @@ -100,10 +101,11 @@ Editor preferences are available in the [editor config](https://github.com/twbs/ ## Community -Keep track of development and community news. +Get updates on Bootstrap's development and chat with the project maintainers and community members. - Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap). - Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). +- [Join the official Slack room.](http://bootstrap-slack.herokuapp.com) - Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel. - Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3)). - Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability. -- cgit v1.2.3 From 95a8a06f10ca65a8b36c57a5f166428f37edb7a7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 25 Apr 2015 00:00:39 -0700 Subject: Link slack badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index ee9e75327..cf2caaee2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # [Bootstrap](http://getbootstrap.com) -![Slack](http://bootstrap-slack.herokuapp.com/badge.svg) +[![Slack](http://bootstrap-slack.herokuapp.com/badge.svg)](http://bootstrap-slack.herokuapp.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) [![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg?style=flat)](https://travis-ci.org/twbs/bootstrap) -- cgit v1.2.3 From aed83c4b9625f2b377732fe073dd842b609c2b27 Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Sat, 25 Apr 2015 21:05:49 +0300 Subject: Use https on herokuapp.com --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index cf2caaee2..b617e04dc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # [Bootstrap](http://getbootstrap.com) -[![Slack](http://bootstrap-slack.herokuapp.com/badge.svg)](http://bootstrap-slack.herokuapp.com) +[![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.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) [![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg?style=flat)](https://travis-ci.org/twbs/bootstrap) @@ -105,7 +105,7 @@ Get updates on Bootstrap's development and chat with the project maintainers and - Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap). - Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). -- [Join the official Slack room.](http://bootstrap-slack.herokuapp.com) +- Join [the official Slack room](https://bootstrap-slack.herokuapp.com). - Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel. - Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3)). - Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability. -- cgit v1.2.3 From ad6933cfe6f6203d7255b53f7e68e779bc002d64 Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Wed, 13 May 2015 23:55:15 +0300 Subject: Remove unnecessary style=flat from bages [skip validator] [skip sauce] --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index b617e04dc..9b0cb5ba5 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # [Bootstrap](http://getbootstrap.com) [![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.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) -[![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) +![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) +[![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. -- cgit v1.2.3 From 315907c97cf9e039c83cf71e3c0a049ea0e24798 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 17 May 2015 12:43:04 +0300 Subject: Use `https` when possible. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 9b0cb5ba5..d66555017 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ Get updates on Bootstrap's development and chat with the project maintainers and - Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). - Join [the official Slack room](https://bootstrap-slack.herokuapp.com). - Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel. -- Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3)). +- Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](https://stackoverflow.com/questions/tagged/twitter-bootstrap-3)). - Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability. -- cgit v1.2.3 From 665d2d25c03c14dfa376a5546d85ffad7dbb1b5f Mon Sep 17 00:00:00 2001 From: Morton Fox Date: Mon, 25 May 2015 13:11:42 -0400 Subject: Update source maps link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index d66555017..f941d582e 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ bootstrap/ └── glyphicons-halflings-regular.woff2 ``` -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. 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. Fonts from Glyphicons are included, as is the optional Bootstrap theme. -- cgit v1.2.3 From 83bfff7f0765503b990b96c303eef67009e48d77 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 16 Jun 2015 09:10:22 -0700 Subject: bump version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index f941d582e..34c8b5a57 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ To get started, check out ! Several quick start options are available: -- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.4.zip). +- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.5.zip). - Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. - Install with [Bower](http://bower.io): `bower install bootstrap`. - Install with [npm](https://www.npmjs.com): `npm install bootstrap`. -- cgit v1.2.3