mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

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
parent aa43239088 427a001c47
commit c7c5ce8dcd
6 changed files with 149 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/bootstrap.less
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v1.3.0
* Bootstrap @VERSION
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
lib/scaffolding.less
+1 -1
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; }