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

Merge branch 'master' of https://github.com/twitter/bootstrap

Browse source 
Conflicts:
	bootstrap.css
This commit is contained in:
Jacob Thornton 2011-11-16 00:28:20 -08:00
commit 90f8eb6c14
5 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
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: Sat Nov 12 20:22:29 PST 2011
* Date: Wed Nov 16 00:28:10 PST 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@ -380,10 +380,10 @@ a:hover {
.span-two-thirds {
width: 620px;
}
.offset-one-third {
.row > .offset-one-third {
margin-left: 340px;
}
.offset-two-thirds {
.row > .offset-two-thirds {
margin-left: 660px;
}
/* Typography.less
@ -1925,7 +1925,7 @@ footer {
border-color: #0064cd #0064cd #003f81;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
.btn.active, .btn :active {
.btn.active, .btn:active {
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);