github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
This commit is contained in:
Jacob Thornton
2012-01-27 13:37:14 -08:00
parent 6fd1e9f4c0 d7b8a9c930
commit 3c7e3eb7d3
4 changed files with 77 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/assets/css/bootstrap.css vendored
View File

@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Jan 27 13:34:19 PST 2012
* Date: Fri Jan 27 13:37:10 PST 2012
*/
article,
aside,
@@ -2461,6 +2461,7 @@ table .span12 {
font-size: 13px;
line-height: 18px;
color: #333333;
text-align: center;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
background-color: #fafafa;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));