rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-10 03:46:13 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' into gh-pages

Browse Source
This commit is contained in:
Mark Otto 2013-10-30 10:04:08 -07:00
commit 7e5fd6d59c
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_config.yml
View File

@ -11,15 +11,15 @@ exclude: [".editorconfig", ".gitignore", "bower.json", "composer.json",
port: 9001 port: 9001
# Custom vars # Custom vars
current_version: 3.0.0 current_version: 3.0.1
repo: https://github.com/twbs/bootstrap repo: https://github.com/twbs/bootstrap
download_source: https://github.com/twbs/bootstrap/archive/v3.0.0.zip download_source: https://github.com/twbs/bootstrap/archive/v3.0.1.zip
download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.1/bootstrap-3.0.1-dist.zip
blog: http://blog.getbootstrap.com blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com expo: http://expo.getbootstrap.com
cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.1/css/bootstrap.min.css
cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.0.1/css/bootstrap-theme.min.css
cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js

2
bower.json
View File

@ -1,6 +1,6 @@
{ {
"name": "bootstrap", "name": "bootstrap",
"version": "3.0.0", "version": "3.0.1",
"main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css", "./dist/fonts/*"], "main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css", "./dist/fonts/*"],
"ignore": [ "ignore": [
"**/.*" "**/.*"

2
dist/css/bootstrap-theme.css vendored
View File

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.0.0 by @fat and @mdo * Bootstrap v3.0.1 by @fat and @mdo
* Copyright 2013 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0 * Licensed under http://www.apache.org/licenses/LICENSE-2.0
* *

2
dist/css/bootstrap-theme.min.css vendored
View File

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.0.0 by @fat and @mdo * Bootstrap v3.0.1 by @fat and @mdo
* Copyright 2013 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0 * Licensed under http://www.apache.org/licenses/LICENSE-2.0
* *

2
dist/css/bootstrap.css vendored
View File

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.0.0 by @fat and @mdo * Bootstrap v3.0.1 by @fat and @mdo
* Copyright 2013 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0 * Licensed under http://www.apache.org/licenses/LICENSE-2.0
* *

2
dist/css/bootstrap.min.css vendored
View File

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.0.0 by @fat and @mdo * Bootstrap v3.0.1 by @fat and @mdo
* Copyright 2013 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0 * Licensed under http://www.apache.org/licenses/LICENSE-2.0
* *

2
dist/js/bootstrap.js vendored
View File

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.0.0 by @fat and @mdo * Bootstrap v3.0.1 by @fat and @mdo
* Copyright 2013 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0 * Licensed under http://www.apache.org/licenses/LICENSE-2.0
* *

2
dist/js/bootstrap.min.js vendored
View File

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.0.0 by @fat and @mdo * Bootstrap v3.0.1 by @fat and @mdo
* Copyright 2013 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0 * Licensed under http://www.apache.org/licenses/LICENSE-2.0
* *

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "bootstrap" "name": "bootstrap"
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
, "version": "3.0.0" , "version": "3.0.1"
, "keywords": ["bootstrap", "css"] , "keywords": ["bootstrap", "css"]
, "homepage": "http://getbootstrap.com" , "homepage": "http://getbootstrap.com"
, "author": "Twitter, Inc." , "author": "Twitter, Inc."