rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip

Browse source 
Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less
This commit is contained in:
Jacob Thornton 2011-09-16 11:24:07 -07:00
commit c7c5ce8dcd
6 changed files with 149 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/bootstrap.less vendored
View file

@ -1,5 +1,5 @@
/*!
* Bootstrap v1.3.0
* Bootstrap @VERSION
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0

2
lib/scaffolding.less
View file

@ -134,4 +134,4 @@ a {
.span-one-third { width: 300px; }
.span-two-thirds { width: 620px; }
.offset-one-third { margin-left: 340px; }
.offset-two-thirds { margin-left: 660px; }
.offset-two-thirds { margin-left: 660px; }