mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-26 23:04:32 +02:00
last minute addition of a simple fluid grid for our fluid examples; it needs work, so we're not documenting it now
This commit is contained in:
101
docs/assets/css/bootstrap-responsive.css
vendored
101
docs/assets/css/bootstrap-responsive.css
vendored
@@ -77,6 +77,9 @@
|
||||
width: auto;
|
||||
padding: 0 20px;
|
||||
}
|
||||
.row-fluid {
|
||||
width: 100%;
|
||||
}
|
||||
.row {
|
||||
margin-left: 0;
|
||||
}
|
||||
@@ -162,6 +165,50 @@
|
||||
.offset11 {
|
||||
margin-left: 702px;
|
||||
}
|
||||
.row-fluid {
|
||||
width: 102.76243093919337%;
|
||||
margin-left: -2.762430939%;
|
||||
}
|
||||
.row-fluid [class*="span"] {
|
||||
float: left;
|
||||
margin-left: 2.762430939%;
|
||||
}
|
||||
.row-fluid .span1 {
|
||||
width: 5.6451612899588115%;
|
||||
}
|
||||
.row-fluid .span2 {
|
||||
width: 13.978494622708812%;
|
||||
}
|
||||
.row-fluid .span3 {
|
||||
width: 22.31182795545881%;
|
||||
}
|
||||
.row-fluid .span4 {
|
||||
width: 30.64516128820881%;
|
||||
}
|
||||
.row-fluid .span5 {
|
||||
width: 38.97849462095881%;
|
||||
}
|
||||
.row-fluid .span6 {
|
||||
width: 47.311827953708814%;
|
||||
}
|
||||
.row-fluid .span7 {
|
||||
width: 55.645161286458816%;
|
||||
}
|
||||
.row-fluid .span8 {
|
||||
width: 63.97849461920882%;
|
||||
}
|
||||
.row-fluid .span9 {
|
||||
width: 72.31182795195882%;
|
||||
}
|
||||
.row-fluid .span10 {
|
||||
width: 80.64516128470882%;
|
||||
}
|
||||
.row-fluid .span11 {
|
||||
width: 88.97849461745884%;
|
||||
}
|
||||
.row-fluid .span12 {
|
||||
width: 97.31182795020881%;
|
||||
}
|
||||
}
|
||||
@media (max-width: 940px) {
|
||||
body {
|
||||
@@ -169,7 +216,7 @@
|
||||
}
|
||||
.navbar-fixed-top {
|
||||
position: static;
|
||||
margin-bottom: 36px;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
.navbar-inner {
|
||||
padding: 5px;
|
||||
@@ -264,6 +311,12 @@
|
||||
}
|
||||
}
|
||||
@media (min-width: 1200px) {
|
||||
.thumbnails {
|
||||
margin-left: -30px;
|
||||
}
|
||||
.thumbnails > li {
|
||||
margin-left: 30px;
|
||||
}
|
||||
.container {
|
||||
width: 1170px;
|
||||
}
|
||||
@@ -342,10 +395,48 @@
|
||||
.offset11 {
|
||||
margin-left: 1130px;
|
||||
}
|
||||
.thumbnails {
|
||||
margin-left: -30px;
|
||||
.row-fluid {
|
||||
width: 102.56143440326584%;
|
||||
margin-left: -2.56%;
|
||||
}
|
||||
.thumbnails > li {
|
||||
margin-left: 30px;
|
||||
.row-fluid [class*="span"] {
|
||||
float: left;
|
||||
margin-left: 2.56%;
|
||||
}
|
||||
.row-fluid .span1 {
|
||||
width: 5.832601732615312%;
|
||||
}
|
||||
.row-fluid .span2 {
|
||||
width: 14.16126839928198%;
|
||||
}
|
||||
.row-fluid .span3 {
|
||||
width: 22.489935065948643%;
|
||||
}
|
||||
.row-fluid .span4 {
|
||||
width: 30.818601732615313%;
|
||||
}
|
||||
.row-fluid .span5 {
|
||||
width: 39.14726839928198%;
|
||||
}
|
||||
.row-fluid .span6 {
|
||||
width: 47.47593506594863%;
|
||||
}
|
||||
.row-fluid .span7 {
|
||||
width: 55.8046017326153%;
|
||||
}
|
||||
.row-fluid .span8 {
|
||||
width: 64.13326839928197%;
|
||||
}
|
||||
.row-fluid .span9 {
|
||||
width: 72.46193506594864%;
|
||||
}
|
||||
.row-fluid .span10 {
|
||||
width: 80.7906017326153%;
|
||||
}
|
||||
.row-fluid .span11 {
|
||||
width: 89.11926839928198%;
|
||||
}
|
||||
.row-fluid .span12 {
|
||||
width: 97.44793506594864%;
|
||||
}
|
||||
}
|
||||
|
76
docs/assets/css/bootstrap.css
vendored
76
docs/assets/css/bootstrap.css
vendored
@@ -126,7 +126,7 @@ a:hover {
|
||||
margin-left: 20px;
|
||||
}
|
||||
.span1 {
|
||||
width: 60px;
|
||||
width: 59.99999999999999px;
|
||||
}
|
||||
.span2 {
|
||||
width: 140px;
|
||||
@@ -194,6 +194,50 @@ a:hover {
|
||||
.offset11 {
|
||||
margin-left: 900px;
|
||||
}
|
||||
.row-fluid {
|
||||
width: 102.12765957421277%;
|
||||
margin-left: -2.127659574%;
|
||||
}
|
||||
.row-fluid [class*="span"] {
|
||||
float: left;
|
||||
margin-left: 2.127659574%;
|
||||
}
|
||||
.row-fluid .span1 {
|
||||
width: 6.249999999619791%;
|
||||
}
|
||||
.row-fluid .span2 {
|
||||
width: 14.58333333211979%;
|
||||
}
|
||||
.row-fluid .span3 {
|
||||
width: 22.91666666461979%;
|
||||
}
|
||||
.row-fluid .span4 {
|
||||
width: 31.24999999711979%;
|
||||
}
|
||||
.row-fluid .span5 {
|
||||
width: 39.58333332961979%;
|
||||
}
|
||||
.row-fluid .span6 {
|
||||
width: 47.91666666211979%;
|
||||
}
|
||||
.row-fluid .span7 {
|
||||
width: 56.24999999461979%;
|
||||
}
|
||||
.row-fluid .span8 {
|
||||
width: 64.58333332711977%;
|
||||
}
|
||||
.row-fluid .span9 {
|
||||
width: 72.91666665961978%;
|
||||
}
|
||||
.row-fluid .span10 {
|
||||
width: 81.24999999211977%;
|
||||
}
|
||||
.row-fluid .span11 {
|
||||
width: 89.58333332461977%;
|
||||
}
|
||||
.row-fluid .span12 {
|
||||
width: 97.91666665711978%;
|
||||
}
|
||||
.container {
|
||||
width: 940px;
|
||||
margin-left: auto;
|
||||
@@ -207,42 +251,18 @@ a:hover {
|
||||
.container:after {
|
||||
clear: both;
|
||||
}
|
||||
.fluid-container {
|
||||
position: relative;
|
||||
min-width: 940px;
|
||||
.container-fluid {
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
*zoom: 1;
|
||||
}
|
||||
.fluid-container:before, .fluid-container:after {
|
||||
.container-fluid:before, .container-fluid:after {
|
||||
display: table;
|
||||
content: "";
|
||||
}
|
||||
.fluid-container:after {
|
||||
.container-fluid:after {
|
||||
clear: both;
|
||||
}
|
||||
.fluid-sidebar {
|
||||
width: 220px;
|
||||
margin: 0 20px 18px;
|
||||
}
|
||||
.sidebar-left {
|
||||
padding-left: 260px;
|
||||
}
|
||||
.sidebar-right {
|
||||
padding-right: 260px;
|
||||
}
|
||||
.sidebar-left .fluid-sidebar {
|
||||
float: left;
|
||||
margin-left: -240px;
|
||||
}
|
||||
.sidebar-right .fluid-sidebar {
|
||||
float: right;
|
||||
margin-right: -240px;
|
||||
}
|
||||
.fluid-content {
|
||||
float: left;
|
||||
width: 100%;
|
||||
}
|
||||
p {
|
||||
margin: 0 0 9px;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
|
@@ -124,7 +124,6 @@
|
||||
<div class="row show-grid">
|
||||
<div class="span12">12</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<p>The default grid system provided as part of Bootstrap is a <strong>940px-wide, 12-column grid</strong>.</p>
|
||||
|
1
docs/templates/pages/scaffolding.mustache
vendored
1
docs/templates/pages/scaffolding.mustache
vendored
@@ -52,7 +52,6 @@
|
||||
<div class="row show-grid">
|
||||
<div class="span12">12</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<p>{{_i}}The default grid system provided as part of Bootstrap is a <strong>940px-wide, 12-column grid</strong>.{{/i}}</p>
|
||||
|
Reference in New Issue
Block a user