mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch 'master' into boulox-responsive-embed

Browse Source 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2014-03-06 22:40:25 -08:00
parent f4dd6221d4 7e299c6a49
commit 12c619f5b9
210 changed files with 22656 additions and 14558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap-rtl.css
Vendored
+7256
View File
File diff suppressed because it is too large Load Diff
dist/css/bootstrap-rtl.min.css
Vendored
+7
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap-theme.css
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v3.0.3 (http://getbootstrap.com)
* Bootstrap v3.1.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
dist/css/bootstrap-theme.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap-theme.min.css
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v3.0.3 (http://getbootstrap.com)
* Bootstrap v3.1.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
dist/css/bootstrap.css
Vendored
+2422 -2341
View File
File diff suppressed because it is too large Load Diff
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long