rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00
Code Issues Actions Packages Releases Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 /* 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). * 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 { .span-two-thirds {
width: 620px; width: 620px;
} }
.offset-one-third { .row > .offset-one-third {
margin-left: 340px; margin-left: 340px;
} }
.offset-two-thirds { .row > .offset-two-thirds {
margin-left: 660px; margin-left: 660px;
} }
/* Typography.less /* Typography.less

4
bootstrap.min.css vendored
View File

@ -73,8 +73,8 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:
.row>.offset12{margin-left:740px;} .row>.offset12{margin-left:740px;}
.span-one-third{width:300px;} .span-one-third{width:300px;}
.span-two-thirds{width:620px;} .span-two-thirds{width:620px;}
.offset-one-third{margin-left:340px;} .row>.offset-one-third{margin-left:340px;}
.offset-two-thirds{margin-left:660px;} .row>.offset-two-thirds{margin-left:660px;}
p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}

2
docs/index.html
View File

@ -1237,7 +1237,7 @@
<li> <li>
<label> <label>
<input type="radio" name="optionsRadios" value="option2" /> <input type="radio" name="optionsRadios" value="option2" />
<span>Option two can is something else and selecting it will deselect options 1</span> <span>Option two is something else and selecting it will deselect option 1</span>
</label> </label>
</li> </li>
</ul> </ul>

2
lib/patterns.less
View File

@ -581,7 +581,7 @@ footer {
// Active and Disabled states // Active and Disabled states
&.active, &.active,
:active { &:active {
@shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05); @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow); .box-shadow(@shadow);
} }

6
lib/scaffolding.less
View File

@ -133,5 +133,7 @@ a {
// Unique column sizes for 16-column grid // Unique column sizes for 16-column grid
.span-one-third { width: 300px; } .span-one-third { width: 300px; }
.span-two-thirds { width: 620px; } .span-two-thirds { width: 620px; }
.offset-one-third { margin-left: 340px; } .row {
.offset-two-thirds { margin-left: 660px; } > .offset-one-third { margin-left: 340px; }
> .offset-two-thirds { margin-left: 660px; }
}