Commit 9e910946 authored by Mark Otto's avatar Mark Otto
Browse files

biiiiiig update coming for responsiveness

parent fbe22f05
Showing with 433 additions and 481 deletions
+433 -481
...@@ -6,7 +6,7 @@ ...@@ -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 Oct 15 17:19:53 PDT 2011 * Date: Sun Oct 16 02:59:54 PDT 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).
...@@ -261,7 +261,6 @@ a:hover { ...@@ -261,7 +261,6 @@ a:hover {
} }
.row { .row {
zoom: 1; zoom: 1;
margin-left: -20px;
} }
.row:before, .row:after { .row:before, .row:after {
display: table; display: table;
...@@ -277,125 +276,77 @@ a:hover { ...@@ -277,125 +276,77 @@ a:hover {
float: left; float: left;
margin-left: 20px; margin-left: 20px;
} }
.row > [class*="span"]:first-child {
margin-left: 0;
}
.span1 { .span1 {
width: 40px; width: 60px;
} }
.span2 { .span2 {
width: 100px; width: 140px;
} }
.span3 { .span3 {
width: 160px; width: 220px;
} }
.span4 { .span4 {
width: 220px; width: 300px;
} }
.span5 { .span5 {
width: 280px; width: 380px;
} }
.span6 { .span6 {
width: 340px; width: 460px;
} }
.span7 { .span7 {
width: 400px; width: 540px;
} }
.span8 { .span8 {
width: 460px; width: 620px;
} }
.span9 { .span9 {
width: 520px; width: 700px;
} }
.span10 { .span10 {
width: 580px; width: 780px;
} }
.span11 { .span11 {
width: 640px; width: 860px;
} }
.span12 { .span12 {
width: 700px;
}
.span13 {
width: 760px;
}
.span14 {
width: 820px;
}
.span15 {
width: 880px;
}
.span16 {
width: 940px; width: 940px;
} }
.span17 {
width: 1000px;
}
.span18 {
width: 1060px;
}
.span19 {
width: 1120px;
}
.span20 {
width: 1180px;
}
.span21 {
width: 1240px;
}
.span22 {
width: 1300px;
}
.span23 {
width: 1360px;
}
.span24 {
width: 1420px;
}
.offset1 { .offset1 {
margin-left: 80px; margin-left: 100px;
} }
.offset2 { .offset2 {
margin-left: 140px; margin-left: 180px;
} }
.offset3 { .offset3 {
margin-left: 200px; margin-left: 260px;
} }
.offset4 { .offset4 {
margin-left: 260px; margin-left: 340px;
} }
.offset5 { .offset5 {
margin-left: 320px; margin-left: 420px;
} }
.offset6 { .offset6 {
margin-left: 380px; margin-left: 500px;
} }
.offset7 { .offset7 {
margin-left: 440px; margin-left: 580px;
} }
.offset8 { .offset8 {
margin-left: 500px; margin-left: 660px;
} }
.offset9 { .offset9 {
margin-left: 560px; margin-left: 740px;
} }
.offset10 { .offset10 {
margin-left: 620px; margin-left: 820px;
} }
.offset11 { .offset11 {
margin-left: 680px; margin-left: 900px;
}
.offset12 {
margin-left: 740px;
}
.span-one-third {
width: 300px;
}
.span-two-thirds {
width: 620px;
}
.offset-one-third {
margin-left: 340px;
}
.offset-two-thirds {
margin-left: 660px;
} }
/* Typography.less /* Typography.less
* Headings, body text, lists, code, and more for a versatile and durable typography system * Headings, body text, lists, code, and more for a versatile and durable typography system
...@@ -551,9 +502,6 @@ code, pre { ...@@ -551,9 +502,6 @@ code, pre {
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
code { code {
background-color: #fee9cc; background-color: #fee9cc;
...@@ -572,9 +520,6 @@ pre { ...@@ -572,9 +520,6 @@ pre {
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
white-space: pre; white-space: pre;
white-space: pre-wrap; white-space: pre-wrap;
word-wrap: break-word; word-wrap: break-word;
...@@ -626,9 +571,6 @@ select, ...@@ -626,9 +571,6 @@ select,
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
/* Mini reset for unique input types */ /* Mini reset for unique input types */
input[type=checkbox], input[type=radio] { input[type=checkbox], input[type=radio] {
...@@ -713,97 +655,97 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus { ...@@ -713,97 +655,97 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus {
input.span1, textarea.span1, select.span1 { input.span1, textarea.span1, select.span1 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 30px; width: 50px;
margin-left: 0; margin-left: 0;
} }
input.span2, textarea.span2, select.span2 { input.span2, textarea.span2, select.span2 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 90px; width: 150px;
margin-left: 0; margin-left: 0;
} }
input.span3, textarea.span3, select.span3 { input.span3, textarea.span3, select.span3 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 150px; width: 250px;
margin-left: 0; margin-left: 0;
} }
input.span4, textarea.span4, select.span4 { input.span4, textarea.span4, select.span4 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 210px; width: 350px;
margin-left: 0; margin-left: 0;
} }
input.span5, textarea.span5, select.span5 { input.span5, textarea.span5, select.span5 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 270px; width: 450px;
margin-left: 0; margin-left: 0;
} }
input.span6, textarea.span6, select.span6 { input.span6, textarea.span6, select.span6 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 330px; width: 550px;
margin-left: 0; margin-left: 0;
} }
input.span7, textarea.span7, select.span7 { input.span7, textarea.span7, select.span7 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 390px; width: 650px;
margin-left: 0; margin-left: 0;
} }
input.span8, textarea.span8, select.span8 { input.span8, textarea.span8, select.span8 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 450px; width: 750px;
margin-left: 0; margin-left: 0;
} }
input.span9, textarea.span9, select.span9 { input.span9, textarea.span9, select.span9 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 510px; width: 850px;
margin-left: 0; margin-left: 0;
} }
input.span10, textarea.span10, select.span10 { input.span10, textarea.span10, select.span10 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 570px; width: 950px;
margin-left: 0; margin-left: 0;
} }
input.span11, textarea.span11, select.span11 { input.span11, textarea.span11, select.span11 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 630px; width: 1050px;
margin-left: 0; margin-left: 0;
} }
input.span12, textarea.span12, select.span12 { input.span12, textarea.span12, select.span12 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 690px; width: 1150px;
margin-left: 0; margin-left: 0;
} }
input.span13, textarea.span13, select.span13 { input.span13, textarea.span13, select.span13 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 750px; width: 1250px;
margin-left: 0; margin-left: 0;
} }
input.span14, textarea.span14, select.span14 { input.span14, textarea.span14, select.span14 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 810px; width: 1350px;
margin-left: 0; margin-left: 0;
} }
input.span15, textarea.span15, select.span15 { input.span15, textarea.span15, select.span15 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 870px; width: 1450px;
margin-left: 0; margin-left: 0;
} }
input.span16, textarea.span16, select.span16 { input.span16, textarea.span16, select.span16 {
display: inline-block; display: inline-block;
float: none; float: none;
width: 930px; width: 1550px;
margin-left: 0; margin-left: 0;
} }
input[disabled], input[disabled],
...@@ -823,9 +765,6 @@ textarea[readonly] { ...@@ -823,9 +765,6 @@ textarea[readonly] {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.has-error > label, .has-error span.help-inline, .has-error span.help-block { .has-error > label, .has-error span.help-inline, .has-error span.help-block {
color: #9d261d; color: #9d261d;
...@@ -907,9 +846,6 @@ textarea[readonly] { ...@@ -907,9 +846,6 @@ textarea[readonly] {
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.input-prepend .add-on, .input-append .add-on { .input-prepend .add-on, .input-append .add-on {
position: relative; position: relative;
...@@ -931,9 +867,6 @@ textarea[readonly] { ...@@ -931,9 +867,6 @@ textarea[readonly] {
-webkit-border-radius: 3px 0 0 3px; -webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.input-prepend .active, .input-append .active { .input-prepend .active, .input-append .active {
background: #a9dba9; background: #a9dba9;
...@@ -949,17 +882,11 @@ textarea[readonly] { ...@@ -949,17 +882,11 @@ textarea[readonly] {
-webkit-border-radius: 3px 0 0 3px; -webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.input-append .add-on { .input-append .add-on {
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
margin-right: 0; margin-right: 0;
margin-left: -1px; margin-left: -1px;
} }
...@@ -967,9 +894,6 @@ textarea[readonly] { ...@@ -967,9 +894,6 @@ textarea[readonly] {
-webkit-border-radius: 14px; -webkit-border-radius: 14px;
-moz-border-radius: 14px; -moz-border-radius: 14px;
border-radius: 14px; border-radius: 14px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.control-group { .control-group {
margin-bottom: 18px; margin-bottom: 18px;
...@@ -1009,9 +933,6 @@ table { ...@@ -1009,9 +933,6 @@ table {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
table th, table td { table th, table td {
padding: 10px 10px 9px; padding: 10px 10px 9px;
...@@ -1037,33 +958,21 @@ table tbody tr:first-child td:first-child { ...@@ -1037,33 +958,21 @@ table tbody tr:first-child td:first-child {
-webkit-border-radius: 4px 0 0 0; -webkit-border-radius: 4px 0 0 0;
-moz-border-radius: 4px 0 0 0; -moz-border-radius: 4px 0 0 0;
border-radius: 4px 0 0 0; border-radius: 4px 0 0 0;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
table tbody tr:first-child td:last-child { table tbody tr:first-child td:last-child {
-webkit-border-radius: 0 4px 0 0; -webkit-border-radius: 0 4px 0 0;
-moz-border-radius: 0 4px 0 0; -moz-border-radius: 0 4px 0 0;
border-radius: 0 4px 0 0; border-radius: 0 4px 0 0;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
table tbody tr:last-child td:first-child { table tbody tr:last-child td:first-child {
-webkit-border-radius: 0 0 0 4px; -webkit-border-radius: 0 0 0 4px;
-moz-border-radius: 0 0 0 4px; -moz-border-radius: 0 0 0 4px;
border-radius: 0 0 0 4px; border-radius: 0 0 0 4px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
table tbody tr:last-child td:last-child { table tbody tr:last-child td:last-child {
-webkit-border-radius: 0 0 4px 0; -webkit-border-radius: 0 0 4px 0;
-moz-border-radius: 0 0 4px 0; -moz-border-radius: 0 0 4px 0;
border-radius: 0 0 4px 0; border-radius: 0 0 4px 0;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.zebra-striped tbody tr:nth-child(odd) td { .zebra-striped tbody tr:nth-child(odd) td {
background-color: #f9f9f9; background-color: #f9f9f9;
...@@ -1263,9 +1172,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1263,9 +1172,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.navbar-fixed { .navbar-fixed {
position: fixed; position: fixed;
...@@ -1397,9 +1303,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1397,9 +1303,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
-webkit-border-radius: 0 0 6px 6px; -webkit-border-radius: 0 0 6px 6px;
-moz-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
-webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
...@@ -1494,9 +1397,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1494,9 +1397,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
-webkit-border-radius: 4px 4px 0 0; -webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.tabs > li > a:hover { .tabs > li > a:hover {
text-decoration: none; text-decoration: none;
...@@ -1529,9 +1429,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1529,9 +1429,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
-webkit-border-radius: 0 0 4px 4px; -webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.tabbable.tabs-bottom .tabs > li > a:hover { .tabbable.tabs-bottom .tabs > li > a:hover {
border-bottom-color: transparent; border-bottom-color: transparent;
...@@ -1558,9 +1455,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1558,9 +1455,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
-webkit-border-radius: 0 6px 6px 6px; -webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px 6px; -moz-border-radius: 0 6px 6px 6px;
border-radius: 0 6px 6px 6px; border-radius: 0 6px 6px 6px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.tabs a.menu:after, .tabs .dropdown-toggle:after { .tabs a.menu:after, .tabs .dropdown-toggle:after {
border-top-color: #999; border-top-color: #999;
...@@ -1581,9 +1475,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1581,9 +1475,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
-webkit-border-radius: 15px; -webkit-border-radius: 15px;
-moz-border-radius: 15px; -moz-border-radius: 15px;
border-radius: 15px; border-radius: 15px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.pills a:hover { .pills a:hover {
color: #ffffff; color: #ffffff;
...@@ -1622,9 +1513,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1622,9 +1513,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
-webkit-box-shadow: inset 0 1px 0 #ffffff; -webkit-box-shadow: inset 0 1px 0 #ffffff;
-moz-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff;
box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff;
...@@ -1647,9 +1535,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1647,9 +1535,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.hero-unit h1 { .hero-unit h1 {
margin-bottom: 0; margin-bottom: 0;
...@@ -1765,9 +1650,6 @@ footer { ...@@ -1765,9 +1650,6 @@ footer {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
...@@ -1837,9 +1719,6 @@ footer { ...@@ -1837,9 +1719,6 @@ footer {
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.btn.small { .btn.small {
padding: 7px 9px 7px; padding: 7px 9px 7px;
...@@ -1887,9 +1766,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -1887,9 +1766,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.btn-group .btn:first-child { .btn-group .btn:first-child {
margin-left: 0; margin-left: 0;
...@@ -1955,9 +1831,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -1955,9 +1831,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
...@@ -2033,9 +1906,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2033,9 +1906,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
...@@ -2075,9 +1945,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2075,9 +1945,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
...@@ -2120,9 +1987,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2120,9 +1987,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
-webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
...@@ -2158,9 +2022,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2158,9 +2022,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 0 0 6px 6px; -webkit-border-radius: 0 0 6px 6px;
-moz-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
-webkit-box-shadow: inset 0 1px 0 #ffffff; -webkit-box-shadow: inset 0 1px 0 #ffffff;
-moz-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff;
box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff;
...@@ -2240,9 +2101,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2240,9 +2101,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.twipsy-arrow { .twipsy-arrow {
position: absolute; position: absolute;
...@@ -2303,9 +2161,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2303,9 +2161,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
-webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
...@@ -2317,9 +2172,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2317,9 +2172,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 3px 3px 0 0; -webkit-border-radius: 3px 3px 0 0;
-moz-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
.popover .content { .popover .content {
...@@ -2329,9 +2181,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2329,9 +2181,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-moz-border-radius: 0 0 3px 3px; -moz-border-radius: 0 0 3px 3px;
border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
-webkit-background-clip: padding-box;
-moz-background-clip: padding-box; -moz-background-clip: padding-box;
background-clip: padding-box; background-clip: padding-box;
} }
...@@ -2359,9 +2208,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2359,9 +2208,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.label.important { .label.important {
background-color: #c43c35; background-color: #c43c35;
...@@ -2400,9 +2246,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2400,9 +2246,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
...@@ -2420,5 +2263,184 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2420,5 +2263,184 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
* For phone and tablet devices * For phone and tablet devices
* ------------------------------------------------------------- */ * ------------------------------------------------------------- */
@media (max-width: 480px) { @media (max-width: 480px) {
.container {
width: auto;
padding: 0 10px;
}
[class*="span"] {
float: none;
display: block;
width: auto;
}
}
@media (min-width: 480px) and (max-width: 768px) {
.container {
width: auto;
padding: 0 10px;
}
[class*="span"] {
float: none;
display: block;
width: auto;
margin: 0;
}
}
@media (min-width: 768px) and (max-width: 940px) {
.container {
width: 748px;
}
.span1 {
width: 28px;
}
.span2 {
width: 76px;
}
.span3 {
width: 124px;
}
.span4 {
width: 172px;
}
.span5 {
width: 220px;
}
.span6 {
width: 268px;
}
.span7 {
width: 316px;
}
.span8 {
width: 364px;
}
.span9 {
width: 412px;
}
.span10 {
width: 460px;
}
.span11 {
width: 508px;
}
.span12 {
width: 556px;
}
.offset1 {
margin-left: 68px;
}
.offset2 {
margin-left: 116px;
}
.offset3 {
margin-left: 164px;
}
.offset4 {
margin-left: 212px;
}
.offset5 {
margin-left: 260px;
}
.offset6 {
margin-left: 308px;
}
.offset7 {
margin-left: 356px;
}
.offset8 {
margin-left: 404px;
}
.offset9 {
margin-left: 452px;
}
.offset10 {
margin-left: 500px;
}
.offset11 {
margin-left: 548px;
}
.offset12 {
margin-left: 596px;
}
}
@media (min-width: 1170px) {
.container {
width: 1170px;
}
[class*="span"] {
display: inline;
float: left;
margin-left: 20px;
}
.span1 {
width: 70px;
}
.span2 {
width: 170px;
}
.span3 {
width: 270px;
}
.span4 {
width: 370px;
}
.span5 {
width: 470px;
}
.span6 {
width: 570px;
}
.span7 {
width: 670px;
}
.span8 {
width: 770px;
}
.span9 {
width: 870px;
}
.span10 {
width: 970px;
}
.span11 {
width: 1070px;
}
.span12 {
width: 1170px;
}
.offset1 {
margin-left: 130px;
}
.offset2 {
margin-left: 230px;
}
.offset3 {
margin-left: 330px;
}
.offset4 {
margin-left: 430px;
}
.offset5 {
margin-left: 530px;
}
.offset6 {
margin-left: 630px;
}
.offset7 {
margin-left: 730px;
}
.offset8 {
margin-left: 830px;
}
.offset9 {
margin-left: 930px;
}
.offset10 {
margin-left: 1030px;
}
.offset11 {
margin-left: 1130px;
}
.offset12 {
margin-left: 1230px;
}
} }
This diff is collapsed.
...@@ -8,8 +8,9 @@ ...@@ -8,8 +8,9 @@
/* Body and structure /* Body and structure
-------------------------------------------------- */ -------------------------------------------------- */
body { body {
background-color: #fff;
position: relative; position: relative;
padding-top: 40px;
background-color: #fff;
} }
section { section {
padding-top: 60px; padding-top: 60px;
...@@ -21,22 +22,29 @@ section > .row { ...@@ -21,22 +22,29 @@ section > .row {
/* Jumbotrons /* Jumbotrons
-------------------------------------------------- */ -------------------------------------------------- */
.jumbotron,
.jumbotron .inner {
-webkit-border-radius: 0 0 6px 6px;
-moz-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px;
}
.jumbotron { .jumbotron {
min-width: 940px; margin-bottom: 40px;
padding-top: 40px; -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25);
-moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25);
box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), 0 1px 3px rgba(0,0,0,.25);
} }
.jumbotron .inner { .jumbotron .inner {
background: transparent url(../img/grid-18px.png) top center; background: transparent url(../img/grid-18px.png) top center;
padding: 45px 0; padding: 36px 60px;
-webkit-box-shadow: inset 0 10px 30px rgba(0,0,0,.3); -webkit-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1);
-moz-box-shadow: inset 0 10px 30px rgba(0,0,0,.3); -moz-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1);
/* box-shadow: inset 0 10px 30px rgba(0,0,0,.3); box-shadow: inset 0 -15px 30px rgba(0,0,0,.1);
*/} }
.jumbotron h1, .jumbotron h1,
.jumbotron p { .jumbotron p {
margin-bottom: 9px; margin-bottom: 9px;
color: #fff; color: #fff;
text-align: center;
text-shadow: 0 1px 1px rgba(0,0,0,.3); text-shadow: 0 1px 1px rgba(0,0,0,.3);
} }
.jumbotron h1 { .jumbotron h1 {
...@@ -46,6 +54,7 @@ section > .row { ...@@ -46,6 +54,7 @@ section > .row {
} }
.jumbotron p { .jumbotron p {
font-weight: 300; font-weight: 300;
margin-right: 25%;
} }
.jumbotron .lead { .jumbotron .lead {
font-size: 20px; font-size: 20px;
...@@ -60,14 +69,14 @@ section > .row { ...@@ -60,14 +69,14 @@ section > .row {
------------------------- */ ------------------------- */
/* main docs page */ /* main docs page */
.masthead { .masthead {
background-color: #049cd9; background-color: #004d9f;
background-repeat: no-repeat; background-repeat: no-repeat;
background-image: -webkit-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); background-image: -webkit-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f));
background-image: -webkit-linear-gradient(#004D9F, #049cd9); background-image: -webkit-linear-gradient(#048ccd, #004d9f);
background-image: -moz-linear-gradient(#004D9F, #049cd9); background-image: -moz-linear-gradient(#048ccd, #004d9f);
background-image: -o-linear-gradient(top, #004D9F, #049cd9); background-image: -o-linear-gradient(top, #048ccd, #004d9f);
background-image: -khtml-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); background-image: -khtml-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f));
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004D9F', endColorstr='#049cd9', GradientType=0); /* IE8 and down */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#048ccd', endColorstr='#004d9f', GradientType=0); /* IE8 and down */
} }
/* supporting docs pages */ /* supporting docs pages */
.subhead { .subhead {
...@@ -98,15 +107,9 @@ section > .row { ...@@ -98,15 +107,9 @@ section > .row {
/* Footer /* Footer
-------------------------------------------------- */ -------------------------------------------------- */
.footer { .footer {
background-color: #eee;
min-width: 940px;
padding: 30px 0; padding: 30px 0;
text-shadow: 0 1px 0 #fff;
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
-webkit-box-shadow: inset 0 5px 15px rgba(0,0,0,.025); }
-moz-box-shadow: inset 0 5px 15px rgba(0,0,0,.025);
/* box-shadow: inset 0 5px 15px rgba(0,0,0,.025);
*/}
.footer p { .footer p {
color: #555; color: #555;
} }
...@@ -323,3 +326,25 @@ pre.prettyprint { ...@@ -323,3 +326,25 @@ pre.prettyprint {
.well form { .well form {
margin-bottom: 0; margin-bottom: 0;
} }
/* Responsive Docs
-------------------------------------------------- */
/* Tablet to Medium Desktop
------------------------- */
@media (min-width: 768px) and (max-width: 900px) {
.footer,
.jumbotron {
min-width: 748px;
}
.jumbotron .inner h1,
.jumbotron .inner p {
margin-left: 40px;
margin-right: 40px;
}
}
...@@ -75,40 +75,40 @@ ...@@ -75,40 +75,40 @@
</div> </div>
</div> </div>
<!-- Masthead (blueprinty thing) <div class="container">
================================================== -->
<header class="jumbotron masthead" id="overview"> <div id="overview">
<div class="inner"> <!-- Masthead (blueprinty thing)
<h1>Bootstrap, from Twitter</h1> ================================================== -->
<p class="lead"> <header class="jumbotron masthead">
Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.<br> <div class="inner">
It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.<br> <h1>Bootstrap, from Twitter</h1>
</p> <a href="#" class="btn btn-large pull-right">Download on GitHub</a>
<p><strong>Nerd alert:</strong> Bootstrap is <a href="#less" title="Read about using Bootstrap with Less">built with Less</a> and was designed to work out of the gate with modern browsers in mind.</p> <p class="lead">Bootstrap is a frontend toolkit from Twitter designed to kickstart web development, complete with core HTML, CSS, and JS for grids, type, forms, navigation, and many more components.</p>
</div> <p><strong>Nerd alert:</strong> Bootstrap is <a href="#less" title="Read about using Bootstrap with Less">built with Less</a> and was designed with modern browsers in mind.</p>
</header> </div>
</header>
<!-- Quickstart options <!-- Quickstart options
================================================== --> ================================================== -->
<div class="quickstart"> <div class="quickstart" style="display: none;">
<div class="container">
<div class="row"> <div class="row">
<div class="span5"> <div class="span4">
<h6>Hotlink the CSS</h6> <h6>Hotlink the CSS</h6>
<p>For the quickest and easiest start, just copy this snippet into your webpage.</p> <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
<form> <form>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea> <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
</form> </form>
</div> </div>
<div class="span5"> <div class="span4">
<h6>Use it with Less</h6> <h6>Use it with Less</h6>
<p>A fan of using Less? No problem, just clone the repo and add these lines:</p> <p>A fan of using Less? No problem, just clone the repo and add these lines:</p>
<form> <form>
<textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt; <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
&lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea> &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
</form> </form>
</div> </div>
<div class="span5"> <div class="span4">
<h6>Fork on GitHub</h6> <h6>Fork on GitHub</h6>
<p>Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.</p> <p>Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.</p>
<p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p> <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
...@@ -116,51 +116,40 @@ ...@@ -116,51 +116,40 @@
</div> </div>
</div><!-- /row --> </div><!-- /row -->
</div> </div>
</div>
<div class="container"> <!-- About Bootstrap
================================================== -->
<div class="row">
<div class="span4">
<!-- About Bootstrap <h2>Built for and by nerds</h2>
================================================== --> <p>Engineers at Twitter have historically used almost any library they were familiar with to meet front-end requirements. Bootstrap began as an answer to the challenges that presented. With the help of many awesome folks, Bootstrap has grown significantly.</p>
<section id="about"> <p>Read more on <a href="https://dev.twitter.com/blog/bootstrap-twitter">dev.twitter.com &rsaquo;</a></p>
<div class="page-header"> </div>
<h1>About Bootstrap <small>Brief history, browser support, and more</small></h1> <div class="span4">
</div> <h2>Cross-everything</h2>
<div class="row"> <p>Bootstrap is tested and supported in major modern browsers like Chrome, Safari, Internet Explorer, and Firefox.</p>
<div class="span-one-third"> <img src="assets/img/browsers.png" alt="Tested and supported in Chrome, Safari, Internet Explorer, and Firefox">
<h3>History</h3> <ul>
<p>Engineers at Twitter have historically used almost any library they were familiar with to meet front-end requirements. Bootstrap began as an answer to the challenges that presented. With the help of many awesome folks, Bootstrap has grown significantly.</p> <li>Latest Safari</li>
<p>Read more on <a href="https://dev.twitter.com/blog/bootstrap-twitter">dev.twitter.com &rsaquo;</a></p> <li>Latest Google Chrome</li>
</div> <li>Firefox 4+</li>
<div class="span-one-third"> <li>Internet Explorer 7+</li>
<h3>Browser support</h3> <li>Opera 11</li>
<p>Bootstrap is tested and supported in major modern browsers like Chrome, Safari, Internet Explorer, and Firefox.</p> </ul>
<img src="assets/img/browsers.png" alt="Tested and supported in Chrome, Safari, Internet Explorer, and Firefox"> </div>
<ul> <div class="span4">
<li>Latest Safari</li> <h2>What's included</h2>
<li>Latest Google Chrome</li> <p>Bootstrap comes complete with compiled CSS, uncompiled, and example templates.</p>
<li>Firefox 4+</li> <ul>
<li>Internet Explorer 7+</li> <li><span class="label">New in 1.3</span> <a href="./javascript.html">Javascript plugins</a></li>
<li>Opera 11</li> <li>All original .less files</li>
</ul> <li>Fully <a href="../bootstrap.css">compiled</a> and <a href="../bootstrap.min.css">minified</a> CSS</li>
</div> <li>Complete styleguide documentation</li>
<div class="span-one-third"> <li>Three example pages with different layouts</li>
<h3>What's included</h3> </ul>
<p>Bootstrap comes complete with compiled CSS, uncompiled, and example templates.</p> </div>
<ul> </div><!-- /row -->
<li><span class="label">New in 1.3</span> <a href="./javascript.html">Javascript plugins</a></li>
<li>All original .less files</li>
<li>Fully <a href="../bootstrap.css">compiled</a> and <a href="../bootstrap.min.css">minified</a> CSS</li>
<li>Complete styleguide documentation</li>
<li>Three example pages with different layouts</li>
</ul>
</div>
</div><!-- /row -->
<div class="row">
<div class="span12">
<h3>Quick-start examples</h3> <h3>Quick-start examples</h3>
<p>Need some quick templates? Check out these basic examples we've put together:</p> <p>Need some quick templates? Check out these basic examples we've put together:</p>
<ul class="media-grid"> <ul class="media-grid">
...@@ -174,10 +163,8 @@ ...@@ -174,10 +163,8 @@
<a href="../examples/container-app.html"><img src="assets/img/example-diagram-03.png" alt="Simple hanging container for apps"></a> <a href="../examples/container-app.html"><img src="assets/img/example-diagram-03.png" alt="Simple hanging container for apps"></a>
</li> </li>
</ul> </ul>
</div>
</div><!-- /row -->
</section>
</div><!-- /#overview -->
<!-- Grid system <!-- Grid system
...@@ -187,11 +174,11 @@ ...@@ -187,11 +174,11 @@
<h1>Grid system <small>Rock the standard 940px or roll your own</small></h1> <h1>Grid system <small>Rock the standard 940px or roll your own</small></h1>
</div> </div>
<div class="row"> <div class="row">
<div class="span4"> <div class="span3">
<h2>Default grid</h2> <h2>Default grid</h2>
<p>The default grid system provided as part of Bootstrap is a 940px wide 16-column grid. It’s a flavor of the popular 960 grid system, but without the additional margin/padding on the left and right sides.</p> <p>The default grid system provided as part of Bootstrap is a 940px wide 16-column grid. It’s a flavor of the popular 960 grid system, but without the additional margin/padding on the left and right sides.</p>
</div> </div>
<div class="span12"> <div class="span9">
<h3>Example grid markup</h3> <h3>Example grid markup</h3>
<p>As shown here, a basic layout can be created with two "columns," each spanning a number of the 16 foundational columns we defined as part of our grid system. See the examples below for more variations.</p> <p>As shown here, a basic layout can be created with two "columns," each spanning a number of the 16 foundational columns we defined as part of our grid system. See the examples below for more variations.</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -206,11 +193,7 @@ ...@@ -206,11 +193,7 @@
</pre> </pre>
</div> </div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid" title="16 column layout"> <div class="row show-grid">
<div class="span1">1</div>
<div class="span1">1</div>
<div class="span1">1</div>
<div class="span1">1</div>
<div class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div> <div class="span1">1</div>
...@@ -223,56 +206,23 @@ ...@@ -223,56 +206,23 @@
<div class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div> <div class="span1">1</div>
</div><!-- /row --> </div>
<div class="row show-grid" title="8 column layout"> <div class="row show-grid">
<div class="span2">2</div>
<div class="span2">2</div>
<div class="span2">2</div>
<div class="span2">2</div>
<div class="span2">2</div>
<div class="span2">2</div>
<div class="span2">2</div>
<div class="span2">2</div>
</div><!-- /row -->
<div class="row show-grid" title="Example uncommon layout">
<div class="span3">3</div>
<div class="span3">3</div>
<div class="span3">3</div>
<div class="span3">3</div>
<div class="span3">3</div>
<div class="span1 column">1</div>
</div><!-- /row -->
<div class="row show-grid" title="Four column layout">
<div class="span4">4</div>
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4">4</div> <div class="span4">4</div>
</div><!-- /row --> </div>
<div class="row show-grid" title="Default three column layout"> <div class="row show-grid">
<div class="span-one-third">1/3</div>
<div class="span-one-third">1/3</div>
<div class="span-one-third">1/3</div>
</div><!-- /row -->
<div class="row show-grid" title="One-third and two-thirds layout">
<div class="span-one-third">1/3</div>
<div class="span-two-thirds">2/3</div>
</div><!-- /row -->
<div class="row show-grid" title="Irregular three column layout">
<div class="span4">4</div> <div class="span4">4</div>
<div class="span8">8</div>
</div>
<div class="row show-grid">
<div class="span6">6</div> <div class="span6">6</div>
<div class="span6">6</div> <div class="span6">6</div>
</div><!-- /row --> </div>
<div class="row show-grid" title="Half and half"> <div class="row show-grid">
<div class="span8">8</div> <div class="span12">12</div>
<div class="span8">8</div> </div>
</div><!-- /row -->
<div class="row show-grid" title="Example uncommon two-column layout">
<div class="span5">5</div>
<div class="span11">11</div>
</div><!-- /row -->
<div class="row show-grid" title="Unnecessary single column layout">
<div class="span16">16</div>
</div><!-- /row -->
<br> <br>
...@@ -282,18 +232,11 @@ ...@@ -282,18 +232,11 @@
<div class="span8 offset4">8 offset 4</div> <div class="span8 offset4">8 offset 4</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span-one-third offset-two-thirds">1/3 offset 2/3s</div> <div class="span3 offset3">3 offset 3</div>
<div class="span3 offset3">3 offset 3</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span4 offset4">4 offset 4</div> <div class="span8 offset4">8 offset 4</div>
<div class="span4 offset4">4 offset 4</div>
</div><!-- /row -->
<div class="row show-grid">
<div class="span5 offset3">5 offset 3</div>
<div class="span5 offset3">5 offset 3</div>
</div><!-- /row -->
<div class="row show-grid">
<div class="span10 offset6">10 offset 6</div>
</div><!-- /row --> </div><!-- /row -->
<br> <br>
...@@ -978,7 +921,7 @@ ...@@ -978,7 +921,7 @@
<fieldset class="control-group has-error"> <fieldset class="control-group has-error">
<label class="control-label" for="textareaError">Textarea with error</label> <label class="control-label" for="textareaError">Textarea with error</label>
<div class="controls"> <div class="controls">
<textarea class="input-xxlarge" rows="3"></textarea> <textarea class="input-xlarge" rows="3"></textarea>
</div> </div>
</fieldset> </fieldset>
<fieldset class="control-group"> <fieldset class="control-group">
...@@ -2009,17 +1952,17 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita ...@@ -2009,17 +1952,17 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</section> </section>
</div><!-- /container -->
<footer class="footer"> <footer class="footer">
<div class="container"> <p class="pull-right"><a href="#">Back to top</a></p>
<p class="pull-right"><a href="#">Back to top</a></p> <p>
<p> Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.<br>
Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.<br> Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.
Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>. </p>
</p>
</div>
</footer> </footer>
</div><!-- /container -->
</body> </body>
</html> </html>
...@@ -101,9 +101,6 @@ ...@@ -101,9 +101,6 @@
-webkit-border-radius: @radius; -webkit-border-radius: @radius;
-moz-border-radius: @radius; -moz-border-radius: @radius;
border-radius: @radius; border-radius: @radius;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
.border-radius-custom(@topLeft, @topRight, @bottomRight, @bottomLeft) { .border-radius-custom(@topLeft, @topRight, @bottomRight, @bottomLeft) {
-webkit-border-top-left-radius: @topLeft; -webkit-border-top-left-radius: @topLeft;
......
...@@ -84,10 +84,8 @@ a { ...@@ -84,10 +84,8 @@ a {
// GRID SYSTEM // GRID SYSTEM
// ----------- // -----------
// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there // To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
.row { .row {
.clearfix(); .clearfix();
margin-left: -1 * @gridGutterWidth;
} }
// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7) // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
...@@ -95,6 +93,10 @@ a { ...@@ -95,6 +93,10 @@ a {
[class*="span"] { [class*="span"] {
.gridColumn(); .gridColumn();
} }
// Kill the margin on the first column
.row > [class*="span"]:first-child {
margin-left: 0;
}
// Default columns // Default columns
.span1 { .columns(1); } .span1 { .columns(1); }
...@@ -109,20 +111,6 @@ a { ...@@ -109,20 +111,6 @@ a {
.span10 { .columns(10); } .span10 { .columns(10); }
.span11 { .columns(11); } .span11 { .columns(11); }
.span12 { .columns(12); } .span12 { .columns(12); }
.span13 { .columns(13); }
.span14 { .columns(14); }
.span15 { .columns(15); }
.span16 { .columns(16); }
// For optional 24-column grid
.span17 { .columns(17); }
.span18 { .columns(18); }
.span19 { .columns(19); }
.span20 { .columns(20); }
.span21 { .columns(21); }
.span22 { .columns(22); }
.span23 { .columns(23); }
.span24 { .columns(24); }
// Offset column options // Offset column options
.offset1 { .offset(1); } .offset1 { .offset(1); }
...@@ -136,10 +124,3 @@ a { ...@@ -136,10 +124,3 @@ a {
.offset9 { .offset(9); } .offset9 { .offset(9); }
.offset10 { .offset(10); } .offset10 { .offset(10); }
.offset11 { .offset(11); } .offset11 { .offset(11); }
.offset12 { .offset(12); }
// Unique column sizes for 16-column grid
.span-one-third { width: 300px; }
.span-two-thirds { width: 620px; }
.offset-one-third { margin-left: 340px; }
.offset-two-thirds { margin-left: 660px; }
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
// ---- // ----
// Modify the grid styles in mixins.less // Modify the grid styles in mixins.less
@gridColumns: 16; @gridColumns: 12;
@gridColumnWidth: 40px; @gridColumnWidth: 60px;
@gridGutterWidth: 20px; @gridGutterWidth: 20px;
@extraSpace: (@gridGutterWidth * 2); // For our grid calculations @extraSpace: (@gridGutterWidth * 2); // For our grid calculations
@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment