mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-22 05:03:16 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into pr/11536

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-11-30 23:35:56 -08:00
parent ba4c5dae9b 57070dcf45
commit 53047fa587
47 changed files with 799 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,7 @@
/*!
* Bootstrap v3.0.2 by @fat and @mdo
* Bootstrap v3.0.2 (http://getbootstrap.com)
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
.btn-default,

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

File diff suppressed because one or more lines are too long

617
dist/css/bootstrap.css vendored
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because one or more lines are too long