diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index 64e4bc7039..8948246882 100644
--- a/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.0.css
@@ -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 Sep 10 19:00:49 PDT 2011
+ * Date: Sat Sep 10 21:06:02 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).
@@ -279,6 +279,88 @@ TODO:
* Scaffolding
* Basic and global styles for generating a grid system, structural layout, and page templates
* ------------------------------------------------------------------------------------------- */
+html, body {
+ background-color: #fff;
+}
+body {
+ margin: 0;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 13px;
+ font-weight: normal;
+ line-height: 18px;
+ color: #404040;
+}
+.container {
+ width: 940px;
+ margin-left: auto;
+ margin-right: auto;
+ zoom: 1;
+}
+.container:before, .container:after {
+ display: table;
+ content: "";
+ zoom: 1;
+ *display: inline;
+}
+.container:after {
+ clear: both;
+}
+.container-fluid {
+ position: relative;
+ padding-left: 20px;
+ padding-right: 20px;
+ zoom: 1;
+}
+.container-fluid:before, .container-fluid:after {
+ display: table;
+ content: "";
+ zoom: 1;
+ *display: inline;
+}
+.container-fluid:after {
+ clear: both;
+}
+.container-fluid > .sidebar {
+ float: left;
+ width: 220px;
+}
+.container-fluid > .content {
+ min-width: 700px;
+ max-width: 1180px;
+ margin-left: 240px;
+ zoom: 1;
+}
+.container-fluid > .content:before, .container-fluid > .content:after {
+ display: table;
+ content: "";
+ zoom: 1;
+ *display: inline;
+}
+.container-fluid > .content:after {
+ clear: both;
+}
+.hide {
+ display: none;
+}
+.show {
+ display: block;
+}
+a {
+ color: #0069d6;
+ text-decoration: none;
+ line-height: inherit;
+ font-weight: inherit;
+}
+a:hover {
+ color: #0050a3;
+ text-decoration: underline;
+}
+.pull-right {
+ float: right;
+}
+.pull-left {
+ float: left;
+}
.row {
zoom: 1;
margin-left: -20px;
@@ -417,88 +499,6 @@ TODO:
.row .offset-two-thirds {
margin-left: 660px;
}
-html, body {
- background-color: #fff;
-}
-body {
- margin: 0;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 13px;
- font-weight: normal;
- line-height: 18px;
- color: #808080;
-}
-.container {
- width: 940px;
- margin-left: auto;
- margin-right: auto;
- zoom: 1;
-}
-.container:before, .container:after {
- display: table;
- content: "";
- zoom: 1;
- *display: inline;
-}
-.container:after {
- clear: both;
-}
-.container-fluid {
- position: relative;
- padding-left: 20px;
- padding-right: 20px;
- zoom: 1;
-}
-.container-fluid:before, .container-fluid:after {
- display: table;
- content: "";
- zoom: 1;
- *display: inline;
-}
-.container-fluid:after {
- clear: both;
-}
-.container-fluid > .sidebar {
- float: left;
- width: 220px;
-}
-.container-fluid > .content {
- min-width: 700px;
- max-width: 1180px;
- margin-left: 240px;
- zoom: 1;
-}
-.container-fluid > .content:before, .container-fluid > .content:after {
- display: table;
- content: "";
- zoom: 1;
- *display: inline;
-}
-.container-fluid > .content:after {
- clear: both;
-}
-.hide {
- display: none;
-}
-.show {
- display: block;
-}
-a {
- color: #0069d6;
- text-decoration: none;
- line-height: inherit;
- font-weight: inherit;
-}
-a:hover {
- color: #0050a3;
- text-decoration: underline;
-}
-.pull-right {
- float: right;
-}
-.pull-left {
- float: left;
-}
/* Typography.less
* Headings, body text, lists, code, and more for a versatile and durable typography system
* ---------------------------------------------------------------------------------------- */
@@ -606,7 +606,7 @@ dl dd {
margin-left: 9px;
}
hr {
- margin: 0 0 19px;
+ margin: 20px 0 19px;
border: 0;
border-bottom: 1px solid #eee;
}
@@ -997,7 +997,7 @@ textarea[readonly] {
padding: 0;
width: 100%;
}
-.inputs-list li label {
+.inputs-list label {
display: block;
float: none;
width: auto;
@@ -1006,20 +1006,23 @@ textarea[readonly] {
text-align: left;
white-space: normal;
}
-.inputs-list li label strong {
+.inputs-list label strong {
color: #808080;
}
-.inputs-list li label small {
+.inputs-list label small {
font-size: 11px;
font-weight: normal;
}
-.inputs-list li ul.inputs-list {
+.inputs-list .inputs-list {
margin-left: 25px;
margin-bottom: 10px;
padding-top: 0;
}
-.inputs-list li:first-child {
- padding-top: 5px;
+.inputs-list:first-child {
+ padding-top: 6px;
+}
+.inputs-list li + li {
+ padding-top: 2px;
}
.inputs-list input[type=radio], .inputs-list input[type=checkbox] {
margin-bottom: 0;
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index 7ae5a08dbb..01b5fc78a2 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -26,6 +26,20 @@ textarea{overflow:auto;vertical-align:top;}
.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
.btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
.btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
+html,body{background-color:#fff;}
+body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#404040;}
+.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";zoom:1;*display:inline;}
+.container:after{clear:both;}
+.container-fluid{position:relative;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;*display:inline;}
+.container-fluid:after{clear:both;}
+.container-fluid>.sidebar{float:left;width:220px;}
+.container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;zoom:1;}.container-fluid>.content:before,.container-fluid>.content:after{display:table;content:"";zoom:1;*display:inline;}
+.container-fluid>.content:after{clear:both;}
+.hide{display:none;}
+.show{display:block;}
+a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
+.pull-right{float:right;}
+.pull-left{float:left;}
.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";zoom:1;*display:inline;}
.row:after{clear:both;}
.row [class*="span"]{display:inline;float:left;margin-left:20px;}
@@ -69,20 +83,6 @@ textarea{overflow:auto;vertical-align:top;}
.row .span-two-thirds{width:620px;}
.row .offset-one-third{margin-left:340px;}
.row .offset-two-thirds{margin-left:660px;}
-html,body{background-color:#fff;}
-body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;}
-.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";zoom:1;*display:inline;}
-.container:after{clear:both;}
-.container-fluid{position:relative;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;*display:inline;}
-.container-fluid:after{clear:both;}
-.container-fluid>.sidebar{float:left;width:220px;}
-.container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;zoom:1;}.container-fluid>.content:before,.container-fluid>.content:after{display:table;content:"";zoom:1;*display:inline;}
-.container-fluid>.content:after{clear:both;}
-.hide{display:none;}
-.show{display:block;}
-a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
-.pull-right{float:right;}
-.pull-left{float:left;}
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{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
@@ -101,7 +101,7 @@ ul.unstyled{list-style:none;margin-left:0;}
dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;}
dl dt{font-weight:bold;}
dl dd{margin-left:9px;}
-hr{margin:0 0 19px;border:0;border-bottom:1px solid #eee;}
+hr{margin:20px 0 19px;border:0;border-bottom:1px solid #eee;}
strong{font-style:inherit;font-weight:bold;}
em{font-style:italic;font-weight:inherit;line-height:inherit;}
.muted{color:#bfbfbf;}
@@ -155,10 +155,12 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
.input-prepend .add-on{*margin-top:1px;}
.input-append input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;}
-.inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;}.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list li label strong{color:#808080;}
-.inputs-list li label small{font-size:11px;font-weight:normal;}
-.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;}
-.inputs-list li:first-child{padding-top:5px;}
+.inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;}
+.inputs-list label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list label strong{color:#808080;}
+.inputs-list label small{font-size:11px;font-weight:normal;}
+.inputs-list .inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;}
+.inputs-list:first-child{padding-top:6px;}
+.inputs-list li+li{padding-top:2px;}
.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;}
.form-stacked{padding-left:20px;}.form-stacked fieldset{padding-top:9px;}
.form-stacked legend{padding-left:0;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 187fc7984c..29fdcf3f0c 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -4,6 +4,7 @@
Bootstrap's documentation styles
Special styles for presenting Bootstrap's documentation and examples
*/
+
/* Body and structure
-------------------------------------------------- */
body {
@@ -16,7 +17,48 @@ section {
section > .row {
margin-bottom: 10px;
}
-#masthead, #footer {
+
+
+/* Jumbotrons
+-------------------------------------------------- */
+.jumbotron {
+ padding-top: 40px;
+}
+.jumbotron .inner {
+ background: transparent url(../img/grid-18px.png) top center;
+ padding: 45px 0;
+ -webkit-box-shadow: inset 0 10px 30px rgba(0,0,0,.3);
+ -moz-box-shadow: inset 0 10px 30px rgba(0,0,0,.3);
+ box-shadow: inset 0 10px 30px rgba(0,0,0,.3);
+}
+.jumbotron h1,
+.jumbotron p {
+ margin-bottom: 9px;
+ color: #fff;
+ text-align: center;
+ text-shadow: 0 1px 1px rgba(0,0,0,.3);
+}
+.jumbotron h1 {
+ font-size: 54px;
+ line-height: 1;
+ text-shadow: 0 1px 2px rgba(0,0,0,.5);
+}
+.jumbotron p {
+ font-weight: 300;
+}
+.jumbotron .lead {
+ font-size: 20px;
+ line-height: 27px;
+}
+.jumbotron p a {
+ color: #fff;
+ font-weight: bold;
+}
+
+/* Specific jumbotrons
+------------------------- */
+/* main docs page */
+.masthead {
background-color: #049cd9;
background-repeat: no-repeat;
background-image: -webkit-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9));
@@ -26,46 +68,50 @@ section > .row {
background-image: -khtml-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9));
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004D9F', endColorstr='#049cd9', GradientType=0); /* IE8 and down */
}
-#masthead div.inner, #footer div.inner {
- background: transparent url(../img/grid-18px.png) top center;
- padding: 45px 0;
- -webkit-box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.3);
- -moz-box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.3);
- box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.3);
+/* supporting docs pages */
+.subhead {
+ background-color: #767d80;
+ background-repeat: no-repeat;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#565d60), to(#767d80));
+ background-image: -webkit-linear-gradient(#565d60, #767d80);
+ background-image: -moz-linear-gradient(#565d60, #767d80);
+ background-image: -o-linear-gradient(top, #565d60, #767d80);
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#565d60), to(#767d80));
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#565d60', endColorstr='#767d80', GradientType=0); /* IE8 and down */
}
-#masthead h1,
-#footer h1,
-#masthead p,
-#footer p {
- color: #fff;
- text-shadow: 0 1px 1px rgba(0,0,0,.3);
+.subhead .inner {
+ padding: 36px 0 27px;
}
-#masthead p a,
-#footer p a {
- color: #fff;
- font-weight: bold;
+.subhead h1,
+.subhead p {
+ text-align: left;
}
-#masthead {
- padding-top: 40px;
+.subhead h1 {
+ font-size: 40px;
}
-#masthead h1,
-#masthead p {
- text-align: center;
- margin-bottom: 9px;
-}
-#masthead h1 {
- font-size: 54px;
- line-height: 1;
- text-shadow: 0 1px 2px rgba(0,0,0,.5);
-}
-#masthead p {
- font-weight: 300;
-}
-#masthead p.lead {
- font-size: 20px;
- line-height: 27px;
+.subhead p a {
+ font-weight: normal;
}
+
+/* Footer
+-------------------------------------------------- */
+.footer {
+ background-color: #eee;
+ padding: 30px 0;
+ text-shadow: 0 1px 0 #fff;
+ 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 {
+ color: #555;
+}
+
+
+/* Quickstart section for getting le code
+-------------------------------------------------- */
.quickstart {
background-color: #f5f5f5;
background-repeat: repeat-x;
@@ -127,16 +173,7 @@ section > .row {
white-space: nowrap;
overflow: hidden;
}
-#footer {
- margin-top: 80px;
-}
-#footer p {
- margin-bottom: 0;
- color: rgba(255,255,255,.8)
-}
-#footer p.right {
- float: right;
-}
+
/* Special grid styles
-------------------------------------------------- */
@@ -162,6 +199,8 @@ section > .row {
margin-top: 0;
margin-bottom: 0;
}
+
+
/* Render mini layout previews
-------------------------------------------------- */
.diagram,
@@ -208,18 +247,20 @@ section > .row {
width: 300px;
margin-left: 10px;
}
+
+
/* Topbar special styles
-------------------------------------------------- */
-div.topbar-wrapper {
+.topbar-wrapper {
position: relative;
height: 40px;
margin: 5px 0 15px;
}
-div.topbar-wrapper div.topbar {
+.topbar-wrapper .topbar {
position: absolute;
margin: 0 -20px;
}
-div.topbar-wrapper div.topbar .topbar-inner {
+.topbar-wrapper .topbar .topbar-inner {
padding-left: 20px;
padding-right: 20px;
-webkit-border-radius: 4px;
@@ -227,61 +268,53 @@ div.topbar-wrapper div.topbar .topbar-inner {
border-radius: 4px;
}
-/* Topbar special styles for js
--------------------------------------------------- */
-#bootstrap-js div.topbar-wrapper {
- position: relative;
- height: 40px;
- margin: 5px 0 15px;
+/* Topbar in js docs
+------------------------- */
+#bootstrap-js .topbar-wrapper {
z-index: 1;
}
-
-#bootstrap-js div.topbar-wrapper div.topbar {
+#bootstrap-js .topbar-wrapper .topbar {
position: absolute;
margin: 0 -20px;
}
-
-#bootstrap-js div.topbar-wrapper div.topbar .fill {
+#bootstrap-js .topbar-wrapper .topbar .topbar-inner {
padding-left: 20px;
padding-right: 20px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
-
-#bootstrap-js div.topbar-wrapper .container {
+#bootstrap-js .topbar-wrapper .container {
width: auto;
}
+
/* Popover docs
-------------------------------------------------- */
-div.popover-well {
+.popover-well {
min-height: 160px;
}
-
-div.popover-well div.popover {
+.popover-well .popover {
display: block;
}
-
-div.popover-well div.popover-wrapper {
+.popover-well .popover-wrapper {
width: 50%;
height: 160px;
float: left;
margin-left: 55px;
position: relative;
}
-
-div.popover-well div.popover-menu-wrapper {
+.popover-well .popover-menu-wrapper {
height: 80px;
}
-
img.large-bird {
margin: 5px 0 0 310px;
opacity: .1;
}
+
/* Pretty Print
-------------------------------------------------- */
-PRE.prettyprint {
+pre.prettyprint {
overflow: hidden;
}
\ No newline at end of file
diff --git a/docs/index.html b/docs/index.html
index f914b31b24..6f8ad30a2d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -61,7 +61,7 @@
-
+
@@ -1516,13 +1516,14 @@ Lorem ipsum dolar sit amet illo error ipsum verita
+
Getting started
Integrating javascript with the Bootstrap library is super easy. Below we go over the basics and provide you with some awesome plugins to get you started!
+
+
Skip to Bootstrap plugins »
-
Getting started
-
We've set out to make your interactive work with Bootstrap even more simple, offering several lightweight plugins for things like modals, tooltips, and other dynamic components. These plugins have been coded up to work with either jQuery or Ender, but we encourage you to extend and modify them to fit your development needs!
-
Do I need javascript?
-
The short answer is no... of course not! However, for those who need it, we've provided the plugins below to help you understand how to integrate bootstrap with javascript and to give you a quick lightweight option for dropping something in and getting the basic functionality right away! For more information on these plugins and to see demos of them in action, please refer to our plugin documentation page.
+
What's included
+
Bring some of Bootstrap's primary components to life with new custom plugins that work with jQuery and Ender. We encourage you to extend and modify them to fit your specific development needs.
@@ -1543,6 +1544,10 @@ Lorem ipsum dolar sit amet illo error ipsum verita
| bootstrap-dropdown.js |
This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations. |
+
+ | bootstrap-scrollspy.js |
+ The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap topbar. |
+
| bootstrap-tabs.js |
This plugin adds quick, dynamic tab and pill functionality for cycling through local content. |
@@ -1557,6 +1562,10 @@ Lorem ipsum dolar sit amet illo error ipsum verita
+
Is javascript necessary?
+
Nope! Bootstrap is designed first and foremost to be a CSS library. This javascript provides a basic interactive layer on top of the included styles.
+
However, for those who do need javascript, we've provided the plugins above to help you understand how to integrate Bootstrap with javascript and to give you a quick, lightweight option for the basic functionality right away.
+
For more information and to see some live demos, please refer to our plugin documentation page.
@@ -1634,34 +1643,13 @@ Lorem ipsum dolar sit amet illo error ipsum verita
font-weight: @weight;
line-height: @lineHeight;
}
- .serif(@weight: normal, @size: 14px, @lineHeight: 20px) {
- font-family: "Georgia", Times New Roman, Times, sans-serif;
- font-size: @size;
- font-weight: @weight;
- line-height: @lineHeight;
- }
- .monospace(@weight: normal, @size: 12px, @lineHeight: 20px) {
- font-family: "Monaco", Courier New, monospace;
- font-size: @size;
- font-weight: @weight;
- line-height: @lineHeight;
- }
+ ...
}
Gradients
#gradient {
- .horizontal (@startColor: #555, @endColor: #333) {
- background-color: @endColor;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, right top, from(@startColor), to(@endColor)); // Konqueror
- background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+
- background-image: -ms-linear-gradient(left, @startColor, @endColor); // IE10
- background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
- background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
- background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
- background-image: linear-gradient(left, @startColor, @endColor); // Le standard
- }
+ ...
.vertical (@startColor: #555, @endColor: #333) {
background-color: @endColor;
background-repeat: repeat-x;
@@ -1673,16 +1661,11 @@ Lorem ipsum dolar sit amet illo error ipsum verita
background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10
background-image: linear-gradient(@startColor, @endColor); // The standard
}
- .directional (@startColor: #555, @endColor: #333, @deg: 45deg) {
- ...
- }
- .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
- ...
- }
+ ...
}
-Operations and grid system
+Operations
Get fancy and perform some math to generate flexible and powerful mixins like the one below.
// Griditude
@@ -1691,37 +1674,73 @@ Lorem ipsum dolar sit amet illo error ipsum verita
@gridGutterWidth: 20px;
@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-// Grid System
-.container {
- width: @siteWidth;
- margin: 0 auto;
- .clearfix();
-}
+// Make some columns
.columns(@columnSpan: 1) {
width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
}
-.offset(@columnOffset: 1) {
- margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace;
-}
+
+ Compiling Less
+ After modifying the .less files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.
+ Ways to compile
+
+
+
+ | Method |
+ Steps |
+
+
+
+
+
+ | Node with makefile |
+
+
+ |
+
+ Javascript |
+
+ Download the latest Less.js and include the path to it (and your Bootstrap code) in the head.
+
+<link rel="stylesheet/less" href="/path/to/bootstrap.less">
+<script src="/path/to/less.js"></script>
+
+ To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.
+ |
+
+
+ | Command line |
+
+
+ |
+
+
+ | Less Mac app |
+
+ The unofficial Mac app watches directories of .less files and compiles the code to local files after every save of a watched .less file.
+ If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.
+ |
+
+
+
+
+
-