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

Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
This commit is contained in:
Mark Otto
2013-02-05 19:53:44 -08:00
parent e4a74607b0 c97d304c0c
commit 43da258bd9
16 changed files with 61 additions and 4724 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/mixins.less
+1
View File
@@ -394,6 +394,7 @@
border-bottom: 1px solid @bottom;
}
<<<<<<< HEAD
// Button psuedo states
// -------------------------
// Easily pump out default styles, as well as :hover, :focus, :active,