rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

merge in master after merging a pull request, add comment

Browse Source
This commit is contained in:
Mark Otto 2011-09-02 09:52:33 -07:00
commit a4dc2c8955
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap-1.2.0.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 Sep 2 09:48:25 PDT 2011
* Date: Fri Sep 2 09:52:17 PDT 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).
@ -404,11 +404,11 @@ body {
.container-fluid:after {
clear: both;
}
.container-fluid .sidebar {
.container-fluid > .sidebar {
float: left;
width: 220px;
}
.container-fluid .content {
.container-fluid > .content {
min-width: 700px;
max-width: 1180px;
margin-left: 240px;

4
bootstrap-1.2.0.min.css vendored
View File

@ -68,8 +68,8 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
.container{width:940px;margin:0 auto;}
.container-fluid{padding:0 20px;zoom:1;margin-bottom:18px;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
.container-fluid:after{clear:both;}
.container-fluid .sidebar{float:left;width:220px;}
.container-fluid .content{min-width:700px;max-width:1180px;margin-left:240px;}
.container-fluid>.sidebar{float:left;width:220px;}
.container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;}
a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
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;}

7
lib/scaffolding.less
View File

@ -81,11 +81,12 @@ body {
.container-fluid {
padding: 0 20px;
.clearfix();
.sidebar {
> .sidebar {
float: left;
width: 220px;
}
.content {
// TODO in v2: rename this and .popover .content to be more specific
> .content {
min-width: 700px;
max-width: 1180px;
margin-left: 240px;
@ -106,4 +107,4 @@ a {
color: @linkColorHover;
text-decoration: underline;
}
}
}