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 '3.0.0-wip' into bs3-normalize

Browse Source 
Conflicts:
	less/bootstrap.less
This commit is contained in:
Mark Otto
2012-12-20 14:02:54 -08:00
parent 28c928f010 8eb1549842
commit be74ad7e0d
55 changed files with 1005 additions and 3013 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/bootstrap.less
Vendored
+2 -2
View File
@@ -52,11 +52,11 @@
// Components: Misc
@import "thumbnails.less";
@import "media.less";
@import "labels-badges.less";
@import "badges.less";
@import "progress-bars.less";
@import "accordion.less";
@import "carousel.less";
@import "hero-unit.less";
@import "jumbotron.less";
// Utility classes
@import "utilities.less"; // Has to be last to override when necessary