From ec8619a9808b9b6e721334af8e6b5248ccbea8b5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Sep 2011 17:21:43 -0700 Subject: update docs to remove old stuff, update to all new classes; no more backwards compatibility --- bootstrap.css | 90 +++++------------- bootstrap.min.css | 47 +++++----- docs/index.html | 236 +++++++++++++++++++++++++---------------------- docs/javascript.html | 8 +- js/bootstrap-dropdown.js | 4 +- lib/patterns.less | 46 +-------- 6 files changed, 180 insertions(+), 251 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 8b6fe3eb4..6d3c15390 100644 --- a/bootstrap.css +++ b/bootstrap.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: Fri Sep 16 14:07:03 PDT 2011 + * Date: Sat Sep 17 17:21:25 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). @@ -1238,16 +1238,13 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #bfbfbf; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.topbar h3 a:hover, .topbar .brand a:hover, .topbar ul .active > a { +.topbar .brand a:hover, .topbar ul .active > a { background-color: #333; background-color: rgba(255, 255, 255, 0.05); color: #ffffff; text-decoration: none; } -.topbar h3 { - position: relative; -} -.topbar h3 a, .topbar .brand { +.topbar .brand { float: left; display: block; padding: 8px 20px 12px; @@ -1322,7 +1319,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); } -.topbar-inner, .topbar .fill { +.topbar-inner { background-color: #222; background-color: #222222; background-repeat: repeat-x; @@ -1338,92 +1335,59 @@ table .headerSortUp.purple, table .headerSortDown.purple { -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); } -.topbar div > ul, .nav { +.nav { display: block; float: left; margin: 0 10px 0 0; position: relative; left: 0; } -.topbar div > ul > li, .nav > li { +.nav > li { display: block; float: left; } -.topbar div > ul a, .nav a { +.nav a { display: block; float: none; padding: 10px 10px 11px; line-height: 19px; text-decoration: none; } -.topbar div > ul a:hover, .nav a:hover { +.nav a:hover { color: #ffffff; text-decoration: none; } -.topbar div > ul .active > a, .nav .active > a { +.nav .active > a { background-color: #222; background-color: rgba(0, 0, 0, 0.5); } -.topbar div > ul.secondary-nav, .nav.secondary-nav { +.nav.secondary-nav { float: right; margin-left: 10px; margin-right: 0; } -.topbar div > ul.secondary-nav .menu-dropdown, -.nav.secondary-nav .menu-dropdown, -.topbar div > ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu { right: 0; border: 0; } -.topbar div > ul a.menu:hover, -.nav a.menu:hover, -.topbar div > ul li.open .menu, -.nav li.open .menu, -.topbar div > ul .dropdown-toggle:hover, -.nav .dropdown-toggle:hover, -.topbar div > ul .dropdown.open .dropdown-toggle, -.nav .dropdown.open .dropdown-toggle { +.nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle { background: #444; background: rgba(255, 255, 255, 0.05); } -.topbar div > ul .menu-dropdown, -.nav .menu-dropdown, -.topbar div > ul .dropdown-menu, .nav .dropdown-menu { background-color: #333; } -.topbar div > ul .menu-dropdown a.menu, -.nav .menu-dropdown a.menu, -.topbar div > ul .dropdown-menu a.menu, -.nav .dropdown-menu a.menu, -.topbar div > ul .menu-dropdown .dropdown-toggle, -.nav .menu-dropdown .dropdown-toggle, -.topbar div > ul .dropdown-menu .dropdown-toggle, .nav .dropdown-menu .dropdown-toggle { color: #ffffff; } -.topbar div > ul .menu-dropdown a.menu.open, -.nav .menu-dropdown a.menu.open, -.topbar div > ul .dropdown-menu a.menu.open, -.nav .dropdown-menu a.menu.open, -.topbar div > ul .menu-dropdown .dropdown-toggle.open, -.nav .menu-dropdown .dropdown-toggle.open, -.topbar div > ul .dropdown-menu .dropdown-toggle.open, .nav .dropdown-menu .dropdown-toggle.open { background: #444; background: rgba(255, 255, 255, 0.05); } -.topbar div > ul .menu-dropdown li a, -.nav .menu-dropdown li a, -.topbar div > ul .dropdown-menu li a, .nav .dropdown-menu li a { color: #999; text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); } -.topbar div > ul .menu-dropdown li a:hover, -.nav .menu-dropdown li a:hover, -.topbar div > ul .dropdown-menu li a:hover, .nav .dropdown-menu li a:hover { background-color: #191919; background-repeat: repeat-x; @@ -1437,26 +1401,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0); color: #ffffff; } -.topbar div > ul .menu-dropdown .active a, -.nav .menu-dropdown .active a, -.topbar div > ul .dropdown-menu .active a, .nav .dropdown-menu .active a { color: #ffffff; } -.topbar div > ul .menu-dropdown .divider, -.nav .menu-dropdown .divider, -.topbar div > ul .dropdown-menu .divider, .nav .dropdown-menu .divider { background-color: #222; border-color: #444; } -.topbar ul .menu-dropdown li a, .topbar ul .dropdown-menu li a { +.topbar ul .dropdown-menu li a { padding: 4px 15px; } -li.menu, .dropdown { +.dropdown { position: relative; } -a.menu:after, .dropdown-toggle:after { +.dropdown-toggle:after { width: 0; height: 0; display: inline-block; @@ -1473,7 +1431,7 @@ a.menu:after, .dropdown-toggle:after { -moz-opacity: 0.5; opacity: 0.5; } -.menu-dropdown, .dropdown-menu { +.dropdown-menu { background-color: #ffffff; float: left; display: none; @@ -1501,12 +1459,12 @@ a.menu:after, .dropdown-toggle:after { -moz-background-clip: padding-box; background-clip: padding-box; } -.menu-dropdown li, .dropdown-menu li { +.dropdown-menu li { float: none; display: block; background-color: none; } -.menu-dropdown .divider, .dropdown-menu .divider { +.dropdown-menu .divider { height: 1px; margin: 5px 0; overflow: hidden; @@ -1539,17 +1497,11 @@ a.menu:after, .dropdown-toggle:after { -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); } -.open .menu, -.dropdown.open .menu, -.open .dropdown-toggle, .dropdown.open .dropdown-toggle { color: #ffffff; background: #ccc; background: rgba(0, 0, 0, 0.3); } -.open .menu-dropdown, -.dropdown.open .menu-dropdown, -.open .dropdown-menu, .dropdown.open .dropdown-menu { display: block; } @@ -1606,22 +1558,22 @@ a.menu:after, .dropdown-toggle:after { border: 1px solid #ddd; border-bottom-color: transparent; } -.tabs .menu-dropdown, .tabs .dropdown-menu { +.tabs .dropdown-menu { top: 35px; border-width: 1px; -webkit-border-radius: 0 6px 6px 6px; -moz-border-radius: 0 6px 6px 6px; border-radius: 0 6px 6px 6px; } -.tabs a.menu:after, .tabs .dropdown-toggle:after { +.tabs .dropdown-toggle:after { border-top-color: #999; margin-top: 15px; margin-left: 5px; } -.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle { +.tabs .open.dropdown .dropdown-toggle { border-color: #999; } -.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { +.tabs .dropdown.open .dropdown-toggle:after { border-top-color: #555; } .tab-content { diff --git a/bootstrap.min.css b/bootstrap.min.css index aabdf2428..4a3b6485b 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -209,9 +209,8 @@ table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc table .purple{color:#7a43b6;border-bottom-color:#7a43b6;} table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;} .topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} -.topbar h3 a:hover,.topbar .brand a:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} -.topbar h3{position:relative;} -.topbar h3 a,.topbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} +.topbar .brand a:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} +.topbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} .topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;color:#ffffff;} .topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} .topbar form.pull-right{float:right;} @@ -219,33 +218,33 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .topbar input::-webkit-input-placeholder{color:#e6e6e6;} .topbar input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} .topbar input:focus,.topbar input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} -.topbar-inner,.topbar .fill{background-color:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} -.topbar div>ul,.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.topbar div>ul>li,.nav>li{display:block;float:left;} -.topbar div>ul a,.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar div>ul a:hover,.nav a:hover{color:#ffffff;text-decoration:none;} -.topbar div>ul .active>a,.nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} -.topbar div>ul.secondary-nav,.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.topbar div>ul.secondary-nav .menu-dropdown,.nav.secondary-nav .menu-dropdown,.topbar div>ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;border:0;} -.topbar div>ul a.menu:hover,.nav a.menu:hover,.topbar div>ul li.open .menu,.nav li.open .menu,.topbar div>ul .dropdown-toggle:hover,.nav .dropdown-toggle:hover,.topbar div>ul .dropdown.open .dropdown-toggle,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);} -.topbar div>ul .menu-dropdown,.nav .menu-dropdown,.topbar div>ul .dropdown-menu,.nav .dropdown-menu{background-color:#333;}.topbar div>ul .menu-dropdown a.menu,.nav .menu-dropdown a.menu,.topbar div>ul .dropdown-menu a.menu,.nav .dropdown-menu a.menu,.topbar div>ul .menu-dropdown .dropdown-toggle,.nav .menu-dropdown .dropdown-toggle,.topbar div>ul .dropdown-menu .dropdown-toggle,.nav .dropdown-menu .dropdown-toggle{color:#ffffff;}.topbar div>ul .menu-dropdown a.menu.open,.nav .menu-dropdown a.menu.open,.topbar div>ul .dropdown-menu a.menu.open,.nav .dropdown-menu a.menu.open,.topbar div>ul .menu-dropdown .dropdown-toggle.open,.nav .menu-dropdown .dropdown-toggle.open,.topbar div>ul .dropdown-menu .dropdown-toggle.open,.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);} -.topbar div>ul .menu-dropdown li a,.nav .menu-dropdown li a,.topbar div>ul .dropdown-menu li a,.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.topbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.topbar div>ul .dropdown-menu li a:hover,.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);color:#ffffff;} -.topbar div>ul .menu-dropdown .active a,.nav .menu-dropdown .active a,.topbar div>ul .dropdown-menu .active a,.nav .dropdown-menu .active a{color:#ffffff;} -.topbar div>ul .menu-dropdown .divider,.nav .menu-dropdown .divider,.topbar div>ul .dropdown-menu .divider,.nav .dropdown-menu .divider{background-color:#222;border-color:#444;} -.topbar ul .menu-dropdown li a,.topbar ul .dropdown-menu li a{padding:4px 15px;} -li.menu,.dropdown{position:relative;} -a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} -.menu-dropdown,.dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.menu-dropdown li,.dropdown-menu li{float:none;display:block;background-color:none;} -.menu-dropdown .divider,.dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} +.topbar-inner{background-color:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} +.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav>li{display:block;float:left;} +.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;} +.nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} +.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;border:0;} +.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);} +.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#ffffff;}.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);} +.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);color:#ffffff;} +.nav .dropdown-menu .active a{color:#ffffff;} +.nav .dropdown-menu .divider{background-color:#222;border-color:#444;} +.topbar ul .dropdown-menu li a{padding:4px 15px;} +.dropdown{position:relative;} +.dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} +.dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} +.dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} .topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} -.open .menu,.dropdown.open .menu,.open .dropdown-toggle,.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} -.open .menu-dropdown,.dropdown.open .menu-dropdown,.open .dropdown-menu,.dropdown.open .dropdown-menu{display:block;} +.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} +.dropdown.open .dropdown-menu{display:block;} .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;*display:inline;} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} .tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} .tabs>li.active>a{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;} -.tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} -.tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} -.tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} -.tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} +.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} +.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} +.tabs .open.dropdown .dropdown-toggle{border-color:#999;} +.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} .tab-content{clear:both;} .pills a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #ffffff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{background:#00438a;color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} .pills .active a{background:#0069d6;color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} diff --git a/docs/index.html b/docs/index.html index f99b756fe..5c5162471 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - + @@ -37,22 +37,42 @@ -
+
Bootstrap @@ -718,102 +738,6 @@ - -
-
-

Media Displaying images and videos

-
- -
-
-

Media grid

-

Display thumbnails of varying sizes on pages with a low HTML footprint and minimal styles.

-
-
-

Example thumbnails

-

Thumbnails in the .media-grid can be any size, but they work best when mapped directly to the built-in Bootstrap grid system. Image widths like 90, 210, and 330 combine with a few pixels of padding to equal the .span2, .span4, and .span6 column sizes.

-

Large

- -

Medium

- -

Small

- -

Coding them

-

Media grids are easy to use and rather simple on the markup side. Their dimensions are purely based on the size of the images included.

-
-<ul class="media-grid">
-  <li>
-    <a href="#">
-      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
-    </a>
-  </li>
-  <li>
-    <a href="#">
-      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
-    </a>
-  </li>
-</ul>
-
-
-
-
- - -
@@ -1295,6 +1219,102 @@ + +
+
+

Media Displaying images and videos

+
+ +
+
+

Media grid

+

Display thumbnails of varying sizes on pages with a low HTML footprint and minimal styles.

+
+
+

Example thumbnails

+

Thumbnails in the .media-grid can be any size, but they work best when mapped directly to the built-in Bootstrap grid system. Image widths like 90, 210, and 330 combine with a few pixels of padding to equal the .span2, .span4, and .span6 column sizes.

+

Large

+ +

Medium

+ +

Small

+ +

Coding them

+

Media grids are easy to use and rather simple on the markup side. Their dimensions are purely based on the size of the images included.

+
+<ul class="media-grid">
+  <li>
+    <a href="#">
+      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
+    </a>
+  </li>
+  <li>
+    <a href="#">
+      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
+    </a>
+  </li>
+</ul>
+
+
+
+
+ + + @@ -1378,6 +1245,7 @@

Tabs and pills

Create simple secondary navigation with a <ul>. Swap between tabs or pills by adding the appropriate class.

Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.

+

Get the javascript »

    @@ -1929,6 +1797,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita +
diff --git a/lib/forms.less b/lib/forms.less index 91aca77fe..fd46fc71e 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -6,29 +6,20 @@ // GENERAL STYLES // -------------- +// Make all forms have space below them form { margin-bottom: @baseline; } // Groups of fields with labels on top (legends) -fieldset { - margin-bottom: @baseline; - padding-top: @baseline; - legend { - display: block; - padding-left: 150px; - font-size: @basefont * 1.5; - line-height: 1; - color: @grayDark; - *padding: 0 0 5px 145px; /* IE6-7 */ - *line-height: 1.5; /* IE6-7 */ - } -} - -// Parent element that clears floats and wraps labels and fields together -form .clearfix { - margin-bottom: @baseline; - .clearfix() +legend { + display: block; + width: 100%; + margin-bottom: @baseline * 1.5; + font-size: @basefont * 1.5; + line-height: @baseline * 2; + color: @grayDark; + border-bottom: 1px solid #eee; } // Set font for forms @@ -36,25 +27,16 @@ label, input, select, textarea { - #font > .sans-serif(normal,13px,normal); + #font > .sans-serif(normal,@basefont,@baseline); } -// Float labels left +// Identify controls by their labels label { - padding-top: 6px; - font-size: @basefont; - line-height: @baseline; - float: left; - width: 130px; - text-align: right; + display: block; + margin-bottom: 5px; color: @grayDark; } -// Shift over the inside div to align all label's relevant content -form .input { - margin-left: 150px; -} - // Checkboxs and radio buttons input[type=checkbox], input[type=radio] { @@ -77,7 +59,7 @@ select, .border-radius(3px); } -/* mini reset for non-html5 file types */ +/* Mini reset for unique input types */ input[type=checkbox], input[type=radio] { width: auto; @@ -89,6 +71,7 @@ input[type=radio] { border: none; } +// Reset the file input to browser defaults input[type=file] { background-color: @white; padding: initial; @@ -97,6 +80,7 @@ input[type=file] { .box-shadow(none); } +// Help out input buttons input[type=button], input[type=reset], input[type=submit] { @@ -120,24 +104,11 @@ textarea { height: auto; } -// For text that needs to appear as an input but should not be an input -.uneditable-input { - background-color: @white; - display: block; - border-color: #eee; - .box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); - cursor: not-allowed; -} -// Placeholder text gets special styles; can't be bundled together though for some reason -:-moz-placeholder { - color: @grayLight; -} -::-webkit-input-placeholder { - color: @grayLight; -} -// Focus states +// FOCUS STATE +// ----------- + input, textarea { @transition: border linear .2s, box-shadow linear .2s; @@ -158,36 +129,6 @@ select:focus { outline: 1px dotted #666; // Selet elements don't get box-shadow styles, so instead we do outline } -// Error styles -form div.clearfix.error { - background: lighten(@red, 57%); - padding: 10px 0; - margin: -10px 0 10px; - .border-radius(4px); - @error-text: desaturate(lighten(@red, 25%), 25%); - > label, - span.help-inline, - span.help-block { - color: @red; - } - input, - textarea { - border-color: @error-text; - .box-shadow(0 0 3px rgba(171,41,32,.25)); - &:focus { - border-color: darken(@error-text, 10%); - .box-shadow(0 0 6px rgba(171,41,32,.5)); - } - } - .input-prepend, - .input-append { - span.add-on { - background: lighten(@red, 50%); - border-color: @error-text; - color: darken(@error-text, 10%); - } - } -} // INPUT SIZES @@ -232,8 +173,9 @@ select { } -// INPUT STATES -// ------------ + +// DISABLED STATE +// -------------- // Disabled and read-only inputs input[disabled], @@ -247,36 +189,89 @@ textarea[readonly] { cursor: not-allowed; } -// Actions (the buttons) -.actions { - background: #f5f5f5; + + +// ERROR STATE +// ----------- + +// Set color of error text +@error-text: desaturate(lighten(@red, 25%), 25%); + +// Style the background of control-groups with errors +.has-error { + background: lighten(@red, 55%); + padding: (@baseline / 2) 0; + margin: -10px 0 10px; + .border-radius(4px); + > label, + span.help-inline, + span.help-block { + color: @red; + } + input, + textarea, + select { + border-color: @error-text; + .box-shadow(0 0 3px rgba(171,41,32,.25)); + &:focus { + border-color: darken(@error-text, 10%); + .box-shadow(0 0 6px rgba(171,41,32,.5)); + } + } + .input-prepend, + .input-append { + span.add-on { + background: lighten(@red, 50%); + border-color: @error-text; + color: darken(@error-text, 10%); + } + } +} + + + +// FORM ACTIONS +// ------------ + +.form-actions { + padding: (@baseline - 1) 20px @baseline; margin-top: @baseline; margin-bottom: @baseline; - padding: (@baseline - 1) 20px @baseline 150px; + background-color: #f5f5f5; border-top: 1px solid #ddd; - .border-radius(0 0 3px 3px); - .secondary-action { - float: right; - a { - line-height: 30px; - &:hover { - text-decoration: underline; - } - } - } } +// For text that needs to appear as an input but should not be an input +.uneditable-input { + background-color: @white; + display: block; + border-color: #eee; + .box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); + cursor: not-allowed; +} + +// Placeholder text gets special styles; can't be bundled together though for some reason +:-moz-placeholder { + color: @grayLight; +} +::-webkit-input-placeholder { + color: @grayLight; +} + + + // HELP TEXT // --------- -.help-inline, -.help-block { - font-size: @basefont - 2; - line-height: @baseline; +.help-text { + margin-top: 5px; + margin-bottom: 0; color: @grayLight; } + .help-inline { + display: inline; padding-left: 5px; *position: relative; /* IE6-7 */ *top: -5px; /* IE6-7 */ @@ -290,7 +285,7 @@ textarea[readonly] { // INLINE FIELDS -// --------- +// ------------- .inline-inputs { color: @gray; @@ -309,8 +304,8 @@ textarea[readonly] { } -// INPUTS GROUPS -// ------------- +// INPUT GROUPS +// ------------ // Allow us to put symbols and text within the input field for a cleaner look .input-prepend, @@ -360,97 +355,49 @@ textarea[readonly] { } -// LISTS OF CONTROLS + + +// HORIZONTAL & VERTICAL FORMS +// --------------------------- + + +// Common properties // ----------------- -// Stacked options for forms (radio buttons or checkboxes) -.inputs-list { - margin: 0 0 5px; - width: 100%; - li { - display: block; - padding: 0; - width: 100%; - } - label { - display: block; - float: none; - width: auto; - padding: 0; - line-height: @baseline; - text-align: left; - white-space: normal; - strong { - color: @gray; - } - small { - font-size: @basefont - 2; - font-weight: normal; - } - } - .inputs-list { - margin-left: 25px; - margin-bottom: 10px; - padding-top: 0; - } - &:first-child { - padding-top: 6px; - } - li + li { - padding-top: 2px; - } - input[type=radio], - input[type=checkbox] { - margin-bottom: 0; - } +// Margin to space out fieldsets +.control-group { + margin-bottom: @baseline; } +// Bold the labels so they stand out +.control-group > label { + font-weight: bold; +} -// STACKED FORMS -// ------------- +// Lists of controls (checkboxes and radios) +.control-list { +} -.form-stacked { - padding-left: 20px; - fieldset { - padding-top: @baseline / 2; - } - legend { - padding-left: 0; - } - label { - display: block; - float: none; - width: auto; - font-weight: bold; - text-align: left; - line-height: 20px; - padding-top: 0; - } - .clearfix { - margin-bottom: @baseline / 2; - div.input { - margin-left: 0; - } - } - .inputs-list { - margin-bottom: 0; - li { - padding-top: 0; - label { - font-weight: normal; - padding-top: 0; - } - } - } - div.clearfix.error { - padding-top: 10px; - padding-bottom: 10px; - padding-left: 10px; - margin-top: 0; - margin-left: -10px; - } - .actions { - margin-left: -20px; - padding-left: 20px; - } -} \ No newline at end of file + +// Horizontal-specific styles +// -------------------------- + +// Float the labels left +.form-horizontal .control-group > label { + float: left; + width: 130px; + padding-top: 5px; + text-align: right; +} +// Move over all input controls and content +.form-horizontal .controls { + margin-left: 150px; +} +// Move the options list down to align with labels +.form-horizontal .control-list { + padding-top: 6px; // has to be padding because margin collaspes +} +// Move over buttons in .form-actions to align with .controls +.form-horizontal .form-actions { + padding-left: 150px; +} diff --git a/lib/mixins.less b/lib/mixins.less index 929618a40..b0ecf03d3 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -6,32 +6,32 @@ // Clearfix for clearing floats like a boss h5bp.com/q .clearfix() { zoom: 1; - &:before, + &:before, &:after { display: table; content: ""; zoom: 1; *display: inline; - } - &:after { + } + &:after { clear: both; - } + } } // Center-align a block level element .center-block() { - display: block; + display: block; margin-left: auto; margin-right: auto; } // Sizing shortcuts .size(@height: 5px, @width: 5px) { - height: @height; - width: @width; + height: @height; + width: @width; } .square(@size: 5px) { - .size(@size, @size); + .size(@size, @size); } // Input placeholder text @@ -112,27 +112,40 @@ // Transitions .transition(@transition) { - -webkit-transition: @transition; - -moz-transition: @transition; - -ms-transition: @transition; - -o-transition: @transition; - transition: @transition; + -webkit-transition: @transition; + -moz-transition: @transition; + -ms-transition: @transition; + -o-transition: @transition; + transition: @transition; +} + +// Transform for scale and rotate +// translate, rotate, scale -- need to finalize +.rotation(@degrees: 5deg) { + -webkit-transform: rotate(@degrees); + -moz-transform: rotate(@degrees); + transform: rotate(@degrees); +} +.scale(@value: 1.5) { + -webkit-transform: scale(@value); + -moz-transform: scale(@value); + transform: scale(@value); } // Background clipping .background-clip(@clip) { - -webkit-background-clip: @clip; - -moz-background-clip: @clip; - background-clip: @clip; + -webkit-background-clip: @clip; + -moz-background-clip: @clip; + background-clip: @clip; } // CSS3 Content Columns .content-columns(@columnCount, @columnGap: 20px) { - -webkit-column-count: @columnCount; - -moz-column-count: @columnCount; + -webkit-column-count: @columnCount; + -moz-column-count: @columnCount; column-count: @columnCount; -webkit-column-gap: @columnGap; - -moz-column-gap: @columnGap; + -moz-column-gap: @columnGap; column-gap: @columnGap; } @@ -140,11 +153,11 @@ #translucent { .background(@color: @white, @alpha: 1) { background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); - } - .border(@color: @white, @alpha: 1) { - border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); - background-clip: padding-box; - } + } + .border(@color: @white, @alpha: 1) { + border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); + background-clip: padding-box; + } } // Gradient Bar Colors for buttons and allerts @@ -157,9 +170,8 @@ // Gradients #gradient { - .horizontal (@startColor: #555, @endColor: #333) { + .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 @@ -167,11 +179,11 @@ 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 + background-repeat: repeat-x; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE9 and down } - .vertical (@startColor: #555, @endColor: #333) { + .vertical(@startColor: #555, @endColor: #333) { background-color: @endColor; - background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10 @@ -179,9 +191,10 @@ background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 background-image: linear-gradient(top, @startColor, @endColor); // The standard - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down + background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down } - .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { + .directional(@startColor: #555, @endColor: #333, @deg: 45deg) { background-color: @endColor; background-repeat: repeat-x; background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ @@ -192,15 +205,24 @@ } .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { background-color: @endColor; - background-repeat: no-repeat; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor); background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor); background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-repeat: no-repeat; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback } + .radial(@centerColor: #555, @outsideColor: #333) { + background-color: @outsideColor; + background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@centerColor), to(@outsideColor)); + background-image: -webkit-radial-gradient(circle, @centerColor, @outsideColor); + background-image: -moz-radial-gradient(circle, @centerColor, @outsideColor); + background-image: -ms-radial-gradient(circle, @centerColor, @outsideColor); + background-repeat: no-repeat; + // Opera cannot do radial gradients yet + } } // Reset filters for IE @@ -210,8 +232,8 @@ // Opacity .opacity(@opacity: 100) { - filter: e(%("alpha(opacity=%d)", @opacity)); - -khtml-opacity: @opacity / 100; - -moz-opacity: @opacity / 100; - opacity: @opacity / 100; + filter: e(%("alpha(opacity=%d)", @opacity)); + -khtml-opacity: @opacity / 100; + -moz-opacity: @opacity / 100; + opacity: @opacity / 100; } \ No newline at end of file diff --git a/lib/reset.less b/lib/reset.less index 6be76fdba..983f14f3d 100644 --- a/lib/reset.less +++ b/lib/reset.less @@ -1,5 +1,5 @@ /* 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). * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ diff --git a/lib/type.less b/lib/type.less index 077ae9d8f..88b320459 100644 --- a/lib/type.less +++ b/lib/type.less @@ -41,15 +41,16 @@ h2 { font-size: 14px; } } -h3, h4, h5, h6 { - line-height: @baseline * 2; -} h3 { + line-height: @baseline * 2; font-size: 18px; small { font-size: 14px; } } +h4, h5, h6 { + line-height: @baseline; +} h4 { font-size: 16px; small { diff --git a/lib/variables.less b/lib/variables.less index 34000d066..dcb0a8ebf 100644 --- a/lib/variables.less +++ b/lib/variables.less @@ -9,10 +9,10 @@ // Grays @black: #000; -@grayDark: lighten(@black, 25%); -@gray: lighten(@black, 50%); -@grayLight: lighten(@black, 75%); -@grayLighter: lighten(@black, 90%); +@grayDark: #333; +@gray: #555; +@grayLight: #777; +@grayLighter: #ccc; @white: #fff; // Accent Colors -- cgit v1.2.3 From ecdba931ec4a6eced099026c1aeab503567a4e0a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:41:03 -0700 Subject: remove that test gradient --- docs/index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/index.html b/docs/index.html index 75a18ea40..d24bb1afd 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1796,9 +1796,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita - -
-
-- cgit v1.2.3 From 4e9849966d0f7b18cd4b8a22f6ef98c6900a2099 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:43:14 -0700 Subject: update topbar dropdown arrow to match link and hover colors --- bootstrap.css | 28 ++++++++++++---------------- bootstrap.min.css | 4 ++-- lib/patterns.less | 7 +++++-- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index d3bb942cd..33cc011f9 100644 --- a/bootstrap.css +++ b/bootstrap.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: Thu Sep 29 01:39:48 PDT 2011 + * Date: Thu Sep 29 01:42:34 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). @@ -951,16 +951,6 @@ textarea[readonly] { .form-horizontal .form-actions { padding-left: 150px; } -.radial-test { - background-color: #009900; - background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(#990000), to(#009900)); - background-image: -webkit-radial-gradient(circle, #990000, #009900); - background-image: -moz-radial-gradient(circle, #990000, #009900); - background-image: -ms-radial-gradient(circle, #990000, #009900); - background-repeat: no-repeat; - width: 100%; - height: 940px; -} /* * Tables.less * Tables for, you guessed it, tabular data @@ -1307,14 +1297,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { text-indent: -99999px; vertical-align: top; margin-top: 8px; - margin-left: 4px; + margin-left: 6px; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid #ffffff; - filter: alpha(opacity=50); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; - opacity: 0.5; + filter: alpha(opacity=30); + -khtml-opacity: 0.3; + -moz-opacity: 0.3; + opacity: 0.3; +} +.dropdown:hover .dropdown-toggle:after { + filter: alpha(opacity=100); + -khtml-opacity: 1; + -moz-opacity: 1; + opacity: 1; } .dropdown-menu { background-color: #ffffff; diff --git a/bootstrap.min.css b/bootstrap.min.css index bb31375dd..ef0f69f1f 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -168,7 +168,6 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .form-horizontal .controls{margin-left:150px;} .form-horizontal .control-list{padding-top:6px;} .form-horizontal .form-actions{padding-left:150px;} -.radial-test{background-color:#009900;background-image:-webkit-gradient(radial, center center, 0, center center, 460, from(#990000), to(#009900));background-image:-webkit-radial-gradient(circle, #990000, #009900);background-image:-moz-radial-gradient(circle, #990000, #009900);background-image:-ms-radial-gradient(circle, #990000, #009900);background-repeat:no-repeat;width:100%;height:940px;} table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;*border-collapse:collapse;font-size:13px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} table th{padding-top:9px;font-weight:bold;vertical-align:middle;border-bottom:1px solid #ddd;} table td{vertical-align:top;} @@ -219,7 +218,8 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .nav .dropdown-menu .divider{background-color:#222;border-color:#444;} .topbar ul .dropdown-menu li a{padding:4px 15px;} .dropdown{position:relative;} -.dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} +.dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:6px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=30);-khtml-opacity:0.3;-moz-opacity:0.3;opacity:0.3;} +.dropdown:hover .dropdown-toggle:after{filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} .dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} .dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} .topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#333333;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} diff --git a/lib/patterns.less b/lib/patterns.less index eae09a596..ec40641d3 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -205,11 +205,14 @@ text-indent: -99999px; vertical-align: top; margin-top: 8px; - margin-left: 4px; + margin-left: 6px; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid @white; - .opacity(50); + .opacity(30); +} +.dropdown:hover .dropdown-toggle:after { + .opacity(100); } // The dropdown menu (ul) .dropdown-menu { -- cgit v1.2.3 From 00204a80cf1c45cb9d7d80986756401d304a3944 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:44:51 -0700 Subject: change h4 back to lineheight * 2 --- bootstrap.css | 8 ++++---- bootstrap.min.css | 7 +++---- lib/type.less | 6 +++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 33cc011f9..acc05c717 100644 --- a/bootstrap.css +++ b/bootstrap.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: Thu Sep 29 01:42:34 PDT 2011 + * Date: Thu Sep 29 01:44:42 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). @@ -441,20 +441,20 @@ h3 { h3 small { font-size: 14px; } -h4, h5, h6 { - line-height: 18px; -} h4 { font-size: 16px; + line-height: 36px; } h4 small { font-size: 12px; } h5 { font-size: 14px; + line-height: 18px; } h6 { font-size: 13px; + line-height: 18px; color: #777777; text-transform: uppercase; } diff --git a/bootstrap.min.css b/bootstrap.min.css index ef0f69f1f..5be71dd4a 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -81,10 +81,9 @@ h1,h2,h3,h4,h5,h6{font-weight:bold;color:#333333;}h1 small,h2 small,h3 small,h4 h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;} h3{line-height:36px;font-size:18px;}h3 small{font-size:14px;} -h4,h5,h6{line-height:18px;} -h4{font-size:16px;}h4 small{font-size:12px;} -h5{font-size:14px;} -h6{font-size:13px;color:#777777;text-transform:uppercase;} +h4{font-size:16px;line-height:36px;}h4 small{font-size:12px;} +h5{font-size:14px;line-height:18px;} +h6{font-size:13px;line-height:18px;color:#777777;text-transform:uppercase;} ul,ol{margin:0 0 18px 25px;} ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} ul{list-style:disc;} diff --git a/lib/type.less b/lib/type.less index 88b320459..ea1f289e7 100644 --- a/lib/type.less +++ b/lib/type.less @@ -48,20 +48,20 @@ h3 { font-size: 14px; } } -h4, h5, h6 { - line-height: @baseline; -} h4 { font-size: 16px; + line-height: @baseline * 2; small { font-size: 12px; } } h5 { font-size: 14px; + line-height: @baseline; } h6 { font-size: 13px; + line-height: @baseline; color: @grayLight; text-transform: uppercase; } -- cgit v1.2.3 From f54568fa31396556a0df7bf8e2b180885e2b1c3f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:47:55 -0700 Subject: round the corners on the search form inputs like a boss --- bootstrap.css | 7 ++++++- bootstrap.min.css | 1 + lib/forms.less | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index acc05c717..6758ea7eb 100644 --- a/bootstrap.css +++ b/bootstrap.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: Thu Sep 29 01:44:42 PDT 2011 + * Date: Thu Sep 29 01:47:26 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). @@ -930,6 +930,11 @@ textarea[readonly] { margin-right: 0; margin-left: -1px; } +.form-search .search-query { + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; +} .control-group { margin-bottom: 18px; } diff --git a/bootstrap.min.css b/bootstrap.min.css index 5be71dd4a..cf290c8e1 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -161,6 +161,7 @@ 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;margin-right:0;margin-left:-1px;} +.form-search .search-query{-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} .control-group{margin-bottom:18px;} .control-group>label{font-weight:bold;} .form-horizontal .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;} diff --git a/lib/forms.less b/lib/forms.less index fd46fc71e..56325daa9 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -357,6 +357,15 @@ textarea[readonly] { +// SEARCH FORM +// ----------- + +.form-search .search-query { + .border-radius(14px); +} + + + // HORIZONTAL & VERTICAL FORMS // --------------------------- -- cgit v1.2.3 From 0a6d8c30db0600ab8d33e14ead0ff120cd03ac9d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 02:21:02 -0700 Subject: adding button groups and toolbars like a boss --- bootstrap.css | 58 ++++++++++++++++++++++++++++++++++++- bootstrap.min.css | 8 ++++++ docs/index.html | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++---- lib/mixins.less | 17 +++++++++++ lib/patterns.less | 48 +++++++++++++++++++++++++++++++ 5 files changed, 210 insertions(+), 6 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 6758ea7eb..92da336f6 100644 --- a/bootstrap.css +++ b/bootstrap.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: Thu Sep 29 01:47:26 PDT 2011 + * Date: Thu Sep 29 02:20:34 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). @@ -1726,6 +1726,62 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; border: 0; } +.btn-toolbar { + zoom: 1; +} +.btn-toolbar:before, .btn-toolbar:after { + display: table; + content: ""; + zoom: 1; + *display: inline; +} +.btn-toolbar:after { + clear: both; +} +.btn-toolbar .btn-group { + float: left; + margin-right: 10px; +} +.btn-group { + zoom: 1; +} +.btn-group:before, .btn-group:after { + display: table; + content: ""; + zoom: 1; + *display: inline; +} +.btn-group:after { + clear: both; +} +.btn-group .btn { + position: relative; + float: left; + margin-left: -1px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group .btn:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; +} +.btn-group .btn:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; +} +.btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active { + z-index: 2; +} .close { float: right; color: #000000; diff --git a/bootstrap.min.css b/bootstrap.min.css index cf290c8e1..a6052c766 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -260,6 +260,14 @@ footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .btn.small{padding:7px 9px 7px;font-size:11px;} :root .alert-message,:root .btn{border-radius:0 \0;} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} +.btn-toolbar{zoom:1;}.btn-toolbar:before,.btn-toolbar:after{display:table;content:"";zoom:1;*display:inline;} +.btn-toolbar:after{clear:both;} +.btn-toolbar .btn-group{float:left;margin-right:10px;} +.btn-group{zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";zoom:1;*display:inline;} +.btn-group:after{clear:both;} +.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} +.btn-group .btn:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} +.btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;} .close{float:right;color:#000000;font-size:20px;font-weight:bold;line-height:13.5px;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} .alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#333333;background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;} .alert-message h5{line-height:18px;} diff --git a/docs/index.html b/docs/index.html index d24bb1afd..137144991 100644 --- a/docs/index.html +++ b/docs/index.html @@ -898,7 +898,7 @@

-
+

Search form

@@ -911,7 +911,7 @@
- +

Inline form

@@ -928,7 +928,7 @@
- +

Horizontal form

@@ -1032,7 +1032,7 @@
-
+

Vertical form

@@ -1075,7 +1075,82 @@
-
+ + +
+
+

Buttons

+

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

+

All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class.

+
+
+

Example buttons

+

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

+
+      +
+

Alternate sizes

+

Fancy larger or smaller buttons? Have at it!

+
+ Primary action + Action +
+
+ Primary action + Action +
+

Disabled state

+

For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

+

Links

+
+ Primary action + Action +
+

Buttons

+
+   +
+
+
+ +
+
+

Button groups

+
+
+

Example

+
+
+ Left + Middle + Right +
+
+
+
+
+ 1 + 2 + 3 + 4 + 5 +
+
+ 6 + 7 + 8 +
+
+ 9 +
+
+ 10 +
+
+
+
+
+ diff --git a/lib/mixins.less b/lib/mixins.less index b0ecf03d3..131d14278 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -102,6 +102,23 @@ -moz-border-radius: @radius; border-radius: @radius; } +.border-radius-custom(@topLeft, @topRight, @bottomRight, @bottomLeft) { + -webkit-border-top-left-radius: @topLeft; + -moz-border-radius-topleft: @topLeft; + border-top-left-radius: @topLeft; + -webkit-border-top-right-radius: @topRight; + -moz-border-radius-topright: @topRight; + border-top-right-radius: @topRight; + -webkit-border-bottom-right-radius: @bottomRight; + -moz-border-radius-bottomright: @bottomRight; + border-bottom-right-radius: @bottomRight; + -webkit-border-bottom-left-radius: @bottomLeft; + -moz-border-radius-bottomleft: @bottomLeft; + border-bottom-left-radius: @bottomLeft; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; +} // Drop shadows .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) { diff --git a/lib/patterns.less b/lib/patterns.less index ec40641d3..8add82c16 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -565,6 +565,54 @@ input[type=submit].btn { } } +// Button groups +// ------------- + +// Group multiple button groups together for a toolbar +.btn-toolbar { + .clearfix(); + .btn-group { + float: left; + margin-right: 10px; + } +} + +// Clear the float +.btn-group { + .clearfix(); +} +// Float them, remove border radius, then re-add to first and last elements +.btn-group .btn { + position: relative; + float: left; + margin-left: -1px; + .border-radius(0); + &:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; + } + &:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + } +} +// On hover/focus/active, bring the proper btn to front +.btn-group .btn:hover, +.btn-group .btn:focus, +.btn-group .btn:active { + z-index: 2; +} + + // CLOSE ICONS // ----------- -- cgit v1.2.3 From 96dd7a2903aa5213ddb364b385660e26396dc670 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 00:20:38 -0700 Subject: update variables to inlude @baseFontSize, @baseFontFamily, @baseLineHeight for easier customization; added placeholder for @primaryButtonColor, but didn't implement --- bootstrap.css | 69 ++++++++++++++++++++++++++-------------------------- bootstrap.min.css | 60 ++++++++++++++++++++++----------------------- lib/forms.less | 30 +++++++++++------------ lib/mixins.less | 10 ++++---- lib/patterns.less | 34 +++++++++++++------------- lib/scaffolding.less | 4 ++- lib/tables.less | 6 ++--- lib/type.less | 50 +++++++++++++++++++------------------ lib/variables.less | 49 +++++++++++++++++++++++-------------- 9 files changed, 164 insertions(+), 148 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 92da336f6..75928c749 100644 --- a/bootstrap.css +++ b/bootstrap.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: Thu Sep 29 02:20:34 PDT 2011 + * Date: Tue Oct 4 00:16:55 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). @@ -187,9 +187,8 @@ body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; - font-weight: normal; line-height: 18px; - color: #333333; + color: #404040; } .container { width: 940px; @@ -393,14 +392,14 @@ a:hover { * Headings, body text, lists, code, and more for a versatile and durable typography system * ---------------------------------------------------------------------------------------- */ p { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; - font-weight: normal; line-height: 18px; margin-bottom: 9px; } p small { font-size: 11px; - color: #777777; + color: #bfbfbf; } h1, h2, @@ -409,7 +408,7 @@ h4, h5, h6 { font-weight: bold; - color: #333333; + color: #404040; } h1 small, h2 small, @@ -417,7 +416,7 @@ h3 small, h4 small, h5 small, h6 small { - color: #777777; + color: #bfbfbf; } h1 { margin-bottom: 18px; @@ -455,7 +454,7 @@ h5 { h6 { font-size: 13px; line-height: 18px; - color: #777777; + color: #bfbfbf; text-transform: uppercase; } ul, ol { @@ -475,7 +474,7 @@ ol { } li { line-height: 18px; - color: #555555; + color: #808080; } ul.unstyled { list-style: none; @@ -508,7 +507,7 @@ em { line-height: inherit; } .muted { - color: #777777; + color: #bfbfbf; } blockquote { margin-bottom: 18px; @@ -526,7 +525,7 @@ blockquote small { font-size: 12px; font-weight: 300; line-height: 18px; - color: #777777; + color: #bfbfbf; } blockquote small:before { content: '\2014 \00A0'; @@ -538,7 +537,7 @@ address { } code, pre { padding: 0 3px 2px; - font-family: Monaco, Andale Mono, Courier New, monospace; + font-family: Menlo, Monaco, Andale Mono, Courier New, monospace; font-size: 12px; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -577,7 +576,7 @@ legend { margin-bottom: 27px; font-size: 19.5px; line-height: 36px; - color: #333333; + color: #404040; border-bottom: 1px solid #eee; } label, @@ -592,7 +591,7 @@ textarea { label { display: block; margin-bottom: 5px; - color: #333333; + color: #404040; } input[type=checkbox], input[type=radio] { cursor: pointer; @@ -607,7 +606,7 @@ select, padding: 4px; font-size: 13px; line-height: 18px; - color: #555555; + color: #808080; border: 1px solid #ccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -843,15 +842,15 @@ textarea[readonly] { cursor: not-allowed; } :-moz-placeholder { - color: #777777; + color: #bfbfbf; } ::-webkit-input-placeholder { - color: #777777; + color: #bfbfbf; } .help-text { margin-top: 5px; margin-bottom: 0; - color: #777777; + color: #bfbfbf; } .help-inline { display: inline; @@ -868,7 +867,7 @@ textarea[readonly] { max-width: 600px; } .inline-inputs { - color: #555555; + color: #808080; } .inline-inputs span, .inline-inputs input { display: inline-block; @@ -901,7 +900,7 @@ textarea[readonly] { margin-right: -1px; font-weight: normal; line-height: 18px; - color: #777777; + color: #bfbfbf; text-align: center; text-shadow: 0 1px 0 #ffffff; -webkit-border-radius: 3px 0 0 3px; @@ -1115,7 +1114,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { overflow: visible; } .topbar a { - color: #777777; + color: #bfbfbf; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .topbar .brand a:hover, .topbar ul .active > a { @@ -1178,20 +1177,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { transition: none; } .topbar input:-moz-placeholder { - color: #cccccc; + color: #e6e6e6; } .topbar input::-webkit-input-placeholder { - color: #cccccc; + color: #e6e6e6; } .topbar input:hover { - background-color: #777777; + background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); color: #ffffff; } .topbar input:focus, .topbar input.focused { outline: 0; background-color: #ffffff; - color: #333333; + color: #404040; text-shadow: 0 1px 0 #ffffff; border: 0; padding: 5px 10px; @@ -1363,7 +1362,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { clear: both; font-weight: normal; line-height: 18px; - color: #555555; + color: #808080; text-shadow: 0 1px 0 #ffffff; } .topbar .dropdown-menu a:hover, .dropdown-menu a:hover { @@ -1377,7 +1376,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-image: linear-gradient(top, #eeeeee, #dddddd); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - color: #333333; + color: #404040; text-decoration: none; -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); @@ -1439,7 +1438,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { border-color: #eee #eee #ddd; } .tabs > li.active > a { - color: #555555; + color: #808080; background-color: #ffffff; border: 1px solid #ddd; border-bottom-color: transparent; @@ -1518,10 +1517,10 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .breadcrumb .divider { padding: 0 5px; - color: #777777; + color: #bfbfbf; } .breadcrumb .active a { - color: #333333; + color: #404040; } .hero-unit { background-color: #f5f5f5; @@ -1806,7 +1805,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { position: relative; padding: 7px 15px; margin-bottom: 18px; - color: #333333; + color: #404040; background-color: #eedc94; background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); background-image: -moz-linear-gradient(top, #fceec1, #eedc94); @@ -1868,13 +1867,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-bottom: 0; } .alert-message.block-message li { - color: #333333; + color: #404040; } .alert-message.block-message .alert-actions { margin-top: 5px; } .alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info { - color: #333333; + color: #404040; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } .alert-message.block-message.error { @@ -1925,7 +1924,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .pagination .disabled a, .pagination .disabled a:hover { background-color: transparent; - color: #777777; + color: #bfbfbf; } .pagination .next a { border: 0; @@ -2195,7 +2194,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .label { padding: 1px 3px 2px; - background-color: #777777; + background-color: #bfbfbf; font-size: 9.75px; font-weight: bold; color: #ffffff; diff --git a/bootstrap.min.css b/bootstrap.min.css index a6052c766..4ba50158e 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -21,7 +21,7 @@ input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;} textarea{overflow:auto;vertical-align:top;} html,body{background-color:#ffffff;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#333333;} +body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;*display:inline;} @@ -76,19 +76,19 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a: .span-two-thirds{width:620px;} .offset-one-third{margin-left:340px;} .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:#777777;} -h1,h2,h3,h4,h5,h6{font-weight:bold;color:#333333;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#777777;} +p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;} h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;} h3{line-height:36px;font-size:18px;}h3 small{font-size:14px;} h4{font-size:16px;line-height:36px;}h4 small{font-size:12px;} h5{font-size:14px;line-height:18px;} -h6{font-size:13px;line-height:18px;color:#777777;text-transform:uppercase;} +h6{font-size:13px;line-height:18px;color:#bfbfbf;text-transform:uppercase;} ul,ol{margin:0 0 18px 25px;} ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} ul{list-style:disc;} ol{list-style:decimal;} -li{line-height:18px;color:#555555;} +li{line-height:18px;color:#808080;} ul.unstyled{list-style:none;margin-left:0;} dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;} dl dt{font-weight:bold;} @@ -96,19 +96,19 @@ dl dd{margin-left:9px;} 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:#777777;} +.muted{color:#bfbfbf;} blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;} -blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#777777;}blockquote small:before{content:'\2014 \00A0';} +blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} address{display:block;line-height:18px;margin-bottom:18px;} -code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;} form{margin-bottom:18px;} -legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border-bottom:1px solid #eee;} +legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#404040;border-bottom:1px solid #eee;} label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;} -label{display:block;margin-bottom:5px;color:#333333;} +label{display:block;margin-bottom:5px;color:#404040;} input[type=checkbox],input[type=radio]{cursor:pointer;} -input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;} input[type=file]{background-color:#ffffff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} @@ -146,17 +146,17 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .has-error .input-prepend span.add-on,.has-error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;} .uneditable-input{background-color:#ffffff;display:block;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} -:-moz-placeholder{color:#777777;} -::-webkit-input-placeholder{color:#777777;} -.help-text{margin-top:5px;margin-bottom:0;color:#777777;} +:-moz-placeholder{color:#bfbfbf;} +::-webkit-input-placeholder{color:#bfbfbf;} +.help-text{margin-top:5px;margin-bottom:0;color:#bfbfbf;} .help-inline{display:inline;padding-left:5px;*position:relative;*top:-5px;} .help-block{display:block;max-width:600px;} -.inline-inputs{color:#555555;}.inline-inputs span,.inline-inputs input{display:inline-block;} +.inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input{display:inline-block;} .inline-inputs input.mini{width:60px;} .inline-inputs input.small{width:90px;} .inline-inputs span{padding:0 2px 0 1px;} .input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.input-prepend .add-on,.input-append .add-on{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#777777;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend .add-on,.input-append .add-on{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;} .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;} @@ -196,16 +196,16 @@ table .orange{color:#f89406;border-bottom-color:#f89406;} table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;} table .purple{color:#7a43b6;border-bottom-color:#7a43b6;} table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;} -.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#777777;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} .topbar .brand a:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} .topbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} .topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;color:#ffffff;} .topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} .topbar form.pull-right{float:right;} -.topbar input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#cccccc;} -.topbar input::-webkit-input-placeholder{color:#cccccc;} -.topbar input:hover{background-color:#777777;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} -.topbar input:focus,.topbar input.focused{outline:0;background-color:#ffffff;color:#333333;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} +.topbar input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#e6e6e6;} +.topbar input::-webkit-input-placeholder{color:#e6e6e6;} +.topbar input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} +.topbar input:focus,.topbar input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} .topbar-inner{background-color:#222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} .nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav>li{display:block;float:left;} .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;} @@ -222,14 +222,14 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .dropdown:hover .dropdown-toggle:after{filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} .dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} .dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} -.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#333333;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} +.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} .dropdown.open .dropdown-menu{display:block;} .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;*display:inline;} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} .tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} -.tabs>li.active>a{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;} +.tabs>li.active>a{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;} .tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} .tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} .tabs .open.dropdown .dropdown-toggle{border-color:#999;} @@ -240,8 +240,8 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .tab-content>*,.pill-content>*{display:none;} .tab-content>.active,.pill-content>.active{display:block;} .breadcrumb{margin:0 0 18px;padding:7px 14px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} -.breadcrumb .divider{padding:0 5px;color:#777777;} -.breadcrumb .active a{color:#333333;} +.breadcrumb .divider{padding:0 5px;color:#bfbfbf;} +.breadcrumb .active a{color:#404040;} .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} @@ -269,16 +269,16 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .btn-group .btn:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;} .close{float:right;color:#000000;font-size:20px;font-weight:bold;line-height:13.5px;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} -.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#333333;background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;} +.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;} .alert-message h5{line-height:18px;} .alert-message p{margin-bottom:0;} .alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;} .alert-message .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);} .alert-message.block-message{background-image:none;background-color:#fdf5d9;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-message.block-message ul,.alert-message.block-message p{margin-right:30px;} .alert-message.block-message ul{margin-bottom:0;} -.alert-message.block-message li{color:#333333;} +.alert-message.block-message li{color:#404040;} .alert-message.block-message .alert-actions{margin-top:5px;} -.alert-message.block-message.error,.alert-message.block-message.success,.alert-message.block-message.info{color:#333333;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} +.alert-message.block-message.error,.alert-message.block-message.success,.alert-message.block-message.info{color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} .alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;} .alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;} .alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;} @@ -286,7 +286,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .pagination li{display:inline;} .pagination a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;} .pagination a:hover,.pagination .active a{background-color:#c7eefe;} -.pagination .disabled a,.pagination .disabled a:hover{background-color:transparent;color:#777777;} +.pagination .disabled a,.pagination .disabled a:hover{background-color:transparent;color:#bfbfbf;} .pagination .next a{border:0;} .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} .modal-backdrop{background-color:#000000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;}.modal-backdrop.fade{opacity:0;} @@ -315,7 +315,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} .popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} -.label{padding:1px 3px 2px;background-color:#777777;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} +.label{padding:1px 3px 2px;background-color:#bfbfbf;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} .label.warning{background-color:#f89406;} .label.success{background-color:#46a546;} .label.notice{background-color:#62cffc;} diff --git a/lib/forms.less b/lib/forms.less index 56325daa9..b657e53d6 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -8,16 +8,16 @@ // Make all forms have space below them form { - margin-bottom: @baseline; + margin-bottom: @baseLineHeight; } // Groups of fields with labels on top (legends) legend { display: block; width: 100%; - margin-bottom: @baseline * 1.5; - font-size: @basefont * 1.5; - line-height: @baseline * 2; + margin-bottom: @baseLineHeight * 1.5; + font-size: @baseFontSize * 1.5; + line-height: @baseLineHeight * 2; color: @grayDark; border-bottom: 1px solid #eee; } @@ -27,7 +27,7 @@ label, input, select, textarea { - #font > .sans-serif(normal,@basefont,@baseline); + #font > .sans-serif(normal,@baseFontSize,@baseLineHeight); } // Identify controls by their labels @@ -50,10 +50,10 @@ select, .uneditable-input { display: inline-block; width: 210px; - height: @baseline; + height: @baseLineHeight; padding: 4px; - font-size: @basefont; - line-height: @baseline; + font-size: @baseFontSize; + line-height: @baseLineHeight; color: @gray; border: 1px solid #ccc; .border-radius(3px); @@ -90,8 +90,8 @@ input[type=submit] { select, input[type=file] { - height: @baseline * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size - line-height: @baseline * 1.5; + height: @baseLineHeight * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size + line-height: @baseLineHeight * 1.5; *margin-top: 4px; /* For IE7, add top margin to align select with labels */ } @@ -200,7 +200,7 @@ textarea[readonly] { // Style the background of control-groups with errors .has-error { background: lighten(@red, 55%); - padding: (@baseline / 2) 0; + padding: (@baseLineHeight / 2) 0; margin: -10px 0 10px; .border-radius(4px); > label, @@ -234,9 +234,9 @@ textarea[readonly] { // ------------ .form-actions { - padding: (@baseline - 1) 20px @baseline; - margin-top: @baseline; - margin-bottom: @baseline; + padding: (@baseLineHeight - 1) 20px @baseLineHeight; + margin-top: @baseLineHeight; + margin-bottom: @baseLineHeight; background-color: #f5f5f5; border-top: 1px solid #ddd; } @@ -375,7 +375,7 @@ textarea[readonly] { // Margin to space out fieldsets .control-group { - margin-bottom: @baseline; + margin-bottom: @baseLineHeight; } // Bold the labels so they stand out diff --git a/lib/mixins.less b/lib/mixins.less index 131d14278..c43f16632 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -46,25 +46,25 @@ // Font Stacks #font { - .shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) { + .shorthand(@weight: normal, @size: @baseFontSize, @lineHeight: @baseLineHeight) { font-size: @size; font-weight: @weight; line-height: @lineHeight; } - .sans-serif(@weight: normal, @size: 14px, @lineHeight: 20px) { + .sans-serif(@weight: normal, @size: @baseFontSize, @lineHeight: @baseLineHeight) { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: @size; font-weight: @weight; line-height: @lineHeight; } - .serif(@weight: normal, @size: 14px, @lineHeight: 20px) { + .serif(@weight: normal, @size: @baseFontSize, @lineHeight: @baseLineHeight) { font-family: "Georgia", Times New Roman, Times, serif; font-size: @size; font-weight: @weight; line-height: @lineHeight; } - .monospace(@weight: normal, @size: 12px, @lineHeight: 20px) { - font-family: "Monaco", Courier New, monospace; + .monospace(@weight: normal, @size: @baseFontSize, @lineHeight: @baseLineHeight) { + font-family: Menlo, Monaco, Andale Mono, Courier New, monospace; font-size: @size; font-weight: @weight; line-height: @lineHeight; diff --git a/lib/patterns.less b/lib/patterns.less index 8add82c16..1b27b7184 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -313,7 +313,7 @@ > a { padding: 0 15px; margin-right: 2px; - line-height: @baseline * 2; + line-height: @baseLineHeight * 2; border: 1px solid transparent; .border-radius(4px 4px 0 0); &:hover { @@ -387,7 +387,7 @@ // ----------- .breadcrumb { - margin: 0 0 @baseline; + margin: 0 0 @baseLineHeight; padding: 7px 14px; #gradient > .vertical(#ffffff, #f5f5f5); border: 1px solid #ddd; @@ -424,12 +424,12 @@ p { font-size: 18px; font-weight: 200; - line-height: @baseline * 1.5; + line-height: @baseLineHeight * 1.5; } } footer { - margin-top: @baseline - 1; - padding-top: @baseline - 1; + margin-top: @baseLineHeight - 1; + padding-top: @baseLineHeight - 1; border-top: 1px solid #eee; } @@ -438,11 +438,11 @@ footer { // ------------ .page-header { - margin-bottom: @baseline - 1; + margin-bottom: @baseLineHeight - 1; border-bottom: 1px solid #ddd; .box-shadow(0 1px 0 rgba(255,255,255,.5)); h1 { - margin-bottom: (@baseline / 2) - 1px; + margin-bottom: (@baseLineHeight / 2) - 1px; } } @@ -488,7 +488,7 @@ footer { padding: 5px 14px 6px; text-shadow: 0 1px 1px rgba(255,255,255,.75); color: #333; - font-size: @basefont; + font-size: @baseFontSize; line-height: normal; border: 1px solid #ccc; border-bottom-color: #bbb; @@ -540,14 +540,14 @@ footer { // Button Sizes &.large { - font-size: @basefont + 2px; + font-size: @baseFontSize + 2px; line-height: normal; padding: 9px 14px 9px; .border-radius(6px); } &.small { padding: 7px 9px 7px; - font-size: @basefont - 2px; + font-size: @baseFontSize - 2px; } } // Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons @@ -621,7 +621,7 @@ input[type=submit].btn { color: @black; font-size: 20px; font-weight: bold; - line-height: @baseline * .75; + line-height: @baseLineHeight * .75; text-shadow: 0 1px 0 rgba(255,255,255,1); .opacity(20); &:hover { @@ -639,7 +639,7 @@ input[type=submit].btn { .alert-message { position: relative; padding: 7px 15px; - margin-bottom: @baseline; + margin-bottom: @baseLineHeight; color: @grayDark; .gradientBar(#fceec1, #eedc94); // warning by default text-shadow: 0 1px 0 rgba(255,255,255,.5); @@ -655,7 +655,7 @@ input[type=submit].btn { // Remove extra margin from content h5 { - line-height: @baseline; + line-height: @baseLineHeight; } p { margin-bottom: 0; @@ -715,8 +715,8 @@ input[type=submit].btn { // ---------- .pagination { - height: @baseline * 2; - margin: @baseline 0; + height: @baseLineHeight * 2; + margin: @baseLineHeight 0; ul { float: left; margin: 0; @@ -731,7 +731,7 @@ input[type=submit].btn { a { float: left; padding: 0 14px; - line-height: (@baseline * 2) - 2; + line-height: (@baseLineHeight * 2) - 2; border-right: 1px solid; border-right-color: #ddd; border-right-color: rgba(0,0,0,.15); @@ -972,7 +972,7 @@ input[type=submit].btn { .label { padding: 1px 3px 2px; background-color: @grayLight; - font-size: @basefont * .75; + font-size: @baseFontSize * .75; font-weight: bold; color: @white; text-transform: uppercase; diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 26bb0cc05..b6852535c 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -12,7 +12,9 @@ html, body { } body { margin: 0; - #font > .sans-serif(normal,@basefont,@baseline); + font-family: @baseFontFamily; + font-size: @baseFontSize; + line-height: @baseLineHeight; color: @grayDark; } diff --git a/lib/tables.less b/lib/tables.less index 988483f0e..8a786ffd2 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -9,16 +9,16 @@ table { width: 100%; - margin-bottom: @baseline; + margin-bottom: @baseLineHeight; padding: 0; border-collapse: separate; // Done so we can round those corners! *border-collapse: collapse; /* IE7, collapse table to remove spacing */ - font-size: @basefont; + font-size: @baseFontSize; border: 1px solid #ddd; .border-radius(4px); th, td { padding: 10px 10px 9px; - line-height: @baseline; + line-height: @baseLineHeight; text-align: left; } th { diff --git a/lib/type.less b/lib/type.less index ea1f289e7..4232a24df 100644 --- a/lib/type.less +++ b/lib/type.less @@ -7,10 +7,12 @@ // --------- p { - #font > .shorthand(normal,@basefont,@baseline); - margin-bottom: @baseline / 2; + font-family: @baseFontFamily; + font-size: @baseFontSize; + line-height: @baseLineHeight; + margin-bottom: @baseLineHeight / 2; small { - font-size: @basefont - 2; + font-size: @baseFontSize - 2; color: @grayLight; } } @@ -27,22 +29,22 @@ h1, h2, h3, h4, h5, h6 { } } h1 { - margin-bottom: @baseline; + margin-bottom: @baseLineHeight; font-size: 30px; - line-height: @baseline * 2; + line-height: @baseLineHeight * 2; small { font-size: 18px; } } h2 { font-size: 24px; - line-height: @baseline * 2; + line-height: @baseLineHeight * 2; small { font-size: 14px; } } h3 { - line-height: @baseline * 2; + line-height: @baseLineHeight * 2; font-size: 18px; small { font-size: 14px; @@ -50,18 +52,18 @@ h3 { } h4 { font-size: 16px; - line-height: @baseline * 2; + line-height: @baseLineHeight * 2; small { font-size: 12px; } } h5 { font-size: 14px; - line-height: @baseline; + line-height: @baseLineHeight; } h6 { font-size: 13px; - line-height: @baseline; + line-height: @baseLineHeight; color: @grayLight; text-transform: uppercase; } @@ -72,7 +74,7 @@ h6 { // Unordered and Ordered lists ul, ol { - margin: 0 0 @baseline 25px; + margin: 0 0 @baseLineHeight 25px; } ul ul, ul ol, @@ -87,7 +89,7 @@ ol { list-style: decimal; } li { - line-height: @baseline; + line-height: @baseLineHeight; color: @gray; } ul.unstyled { @@ -97,15 +99,15 @@ ul.unstyled { // Description Lists dl { - margin-bottom: @baseline; + margin-bottom: @baseLineHeight; dt, dd { - line-height: @baseline; + line-height: @baseLineHeight; } dt { font-weight: bold; } dd { - margin-left: @baseline / 2; + margin-left: @baseLineHeight / 2; } } @@ -135,16 +137,16 @@ em { // Blockquotes blockquote { - margin-bottom: @baseline; + margin-bottom: @baseLineHeight; border-left: 5px solid #eee; padding-left: 15px; p { - #font > .shorthand(300,14px,@baseline); + #font > .shorthand(300,14px,@baseLineHeight); margin-bottom: 0; } small { display: block; - #font > .shorthand(300,12px,@baseline); + #font > .shorthand(300,12px,@baseLineHeight); color: @grayLight; &:before { content: '\2014 \00A0'; @@ -155,14 +157,14 @@ blockquote { // Addresses address { display: block; - line-height: @baseline; - margin-bottom: @baseline; + line-height: @baseLineHeight; + margin-bottom: @baseLineHeight; } // Inline and block code styles code, pre { padding: 0 3px 2px; - font-family: Monaco, Andale Mono, Courier New, monospace; + font-family: Menlo, Monaco, Andale Mono, Courier New, monospace; font-size: 12px; .border-radius(3px); } @@ -174,9 +176,9 @@ code { pre { background-color: #f5f5f5; display: block; - padding: (@baseline - 1) / 2; - margin: 0 0 @baseline; - line-height: @baseline; + padding: (@baseLineHeight - 1) / 2; + margin: 0 0 @baseLineHeight; + line-height: @baseLineHeight; font-size: 12px; border: 1px solid #ccc; border: 1px solid rgba(0,0,0,.15); diff --git a/lib/variables.less b/lib/variables.less index dcb0a8ebf..864dbe8c0 100644 --- a/lib/variables.less +++ b/lib/variables.less @@ -3,19 +3,27 @@ * ----------------------------------------------------- */ -// Links +// LINK COLORS +// ----------- + @linkColor: #0069d6; @linkColorHover: darken(@linkColor, 15); -// Grays + +// GRAYS +// ----- + @black: #000; -@grayDark: #333; -@gray: #555; -@grayLight: #777; -@grayLighter: #ccc; +@grayDark: lighten(@black, 25%); +@gray: lighten(@black, 50%); +@grayLight: lighten(@black, 75%); +@grayLighter: lighten(@black, 90%); @white: #fff; -// Accent Colors + +// ACCENT COLORS +// ------------- + @blue: #049CDB; @blueDark: #0064CD; @green: #46a546; @@ -25,11 +33,10 @@ @pink: #c3325f; @purple: #7a43b6; -// Baseline grid -@basefont: 13px; -@baseline: 18px; -// Griditude +// GRID +// ---- + // Modify the grid styles in mixins.less @gridColumns: 16; @gridColumnWidth: 40px; @@ -37,7 +44,10 @@ @extraSpace: (@gridGutterWidth * 2); // For our grid calculations @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); -// Color Scheme + +// COLOR SCHEME +// ------------ + // Use this to roll your own color schemes if you like (unused by Bootstrap by default) @baseColor: @blue; // Set a base color @complement: spin(@baseColor, 180); // Determine a complementary color @@ -51,10 +61,13 @@ @analog2: spin(@baseColor, -22); +// THEME VARIABLES +// --------------- + +// Typography +@baseFontSize: 13px; +@baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; +@baseLineHeight: 18px; -// More variables coming soon: -// - @basefont to @baseFontSize -// - @baseline to @baseLineHeight -// - @baseFontFamily -// - @primaryButtonColor -// - anything else? File an issue on GitHub \ No newline at end of file +// Visuals +@primaryButtonColor: @blue; -- cgit v1.2.3 From cde17c94919ef26093145e5412c6d425d3199d9f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 00:48:31 -0700 Subject: adding placeholder font-face mixin which doesn't work yet --- bootstrap.css | 2 +- lib/mixins.less | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index 75928c749..2b0e88c86 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Oct 4 00:16:55 PDT 2011 + * Date: Tue Oct 4 00:48:20 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). diff --git a/lib/mixins.less b/lib/mixins.less index c43f16632..47eb1a1c3 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -71,6 +71,20 @@ } } +// Font face generator +.font-face(@fontFamily, @fileName, @style, @weight) { + @font-face { + font-family: @fontFamily; + font-style: @style; + font-weight: @weight; + src: url('@{fileName}.eot'); + src: url('@{fileName}.eot?#iefix') format('embedded-opentype'), + url('@{fileName}.woff') format('woff'), + url('@{fileName}.ttf') format('truetype'), + url('@{fileName}.svg#@{fontFamily}') format('svg'); + } +} + // Grid System .fixed-container() { width: @siteWidth; -- cgit v1.2.3 From bdbc35206630645e6cc6655ec9e50aa70081a2fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 00:55:35 -0700 Subject: adding new mixins --- lib/mixins.less | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/mixins.less b/lib/mixins.less index 47eb1a1c3..9c27346c2 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -155,13 +155,24 @@ .rotation(@degrees: 5deg) { -webkit-transform: rotate(@degrees); -moz-transform: rotate(@degrees); + -ms-transform: rotate(@degrees); + -o-transform: rotate(@degrees); transform: rotate(@degrees); } .scale(@value: 1.5) { -webkit-transform: scale(@value); -moz-transform: scale(@value); + -ms-transform: scale(@value); + -o-transform: scale(@value); transform: scale(@value); } +.translate(@x: 0, @y: 0) { + -webkit-transform: translate(@x, @y); + -moz-transform: translate(@x, @y); + -ms-transform: translate(@x, @y); + -o-transform: translate(@x, @y); + transform: translate(@x, @y); +} // Background clipping .background-clip(@clip) { -- cgit v1.2.3 From 913338f930736a1b186178469c6eafb55c1dbea8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 01:15:31 -0700 Subject: fixing multi select on chromium ubuntu by setting background color explicitly --- bootstrap.css | 3 ++- bootstrap.min.css | 2 +- lib/forms.less | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 2b0e88c86..ab96f6c7c 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Oct 4 00:48:20 PDT 2011 + * Date: Tue Oct 4 01:15:08 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). @@ -645,6 +645,7 @@ select, input[type=file] { } select[multiple] { + background-color: #ffffff; height: inherit; } textarea { diff --git a/bootstrap.min.css b/bootstrap.min.css index 4ba50158e..9a241d80d 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -113,7 +113,7 @@ input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3 input[type=file]{background-color:#ffffff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} select,input[type=file]{height:27px;line-height:27px;*margin-top:4px;} -select[multiple]{height:inherit;} +select[multiple]{background-color:#ffffff;height:inherit;} textarea{height:auto;} input,textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);} input:focus,textarea:focus{outline:0;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);} diff --git a/lib/forms.less b/lib/forms.less index b657e53d6..4bdddc3a2 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -97,6 +97,7 @@ input[type=file] { // Make multiple select elements height not fixed select[multiple] { + background-color: @white; // Fixes Chromium bug? height: inherit; } -- cgit v1.2.3 From a91a407bd60a266f928b5fea70d3c4332394b3c8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 4 Oct 2011 21:48:53 -0700 Subject: start updating to data- driven js --- js/bootstrap-alerts.js | 6 ++-- js/bootstrap-dropdown.js | 27 ++++++++++-------- js/bootstrap-modal.js | 71 ++++++++++++++++++++++++++++++------------------ js/bootstrap-popover.js | 6 ++-- js/bootstrap-tabs.js | 18 ++++++++---- js/bootstrap-twipsy.js | 4 +-- 6 files changed, 80 insertions(+), 52 deletions(-) diff --git a/js/bootstrap-alerts.js b/js/bootstrap-alerts.js index 82bcac524..4498270cb 100644 --- a/js/bootstrap-alerts.js +++ b/js/bootstrap-alerts.js @@ -53,7 +53,7 @@ var Alert = function ( content, selector ) { this.$element = $(content) - .delegate(selector || '.close', 'click', this.close) + .delegate('[data-alert-dismiss]', 'click', this.close) } Alert.prototype = { @@ -62,6 +62,8 @@ var $element = $(this).parent('.alert-message') e && e.preventDefault() + e && e.stopPropagation() + $element.removeClass('in') function removeElement () { @@ -98,7 +100,7 @@ } $(document).ready(function () { - new Alert($('body'), '.alert-message[data-alert] .close') + new Alert($('body')) }) })( window.jQuery || window.ender ) \ No newline at end of file diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 75320c0f8..6379653c5 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -20,23 +20,14 @@ (function( $ ){ - var d = '.dropdown-toggle' - - function clearMenus() { - $(d).parent('li').removeClass('open') - } - - $(function () { - $('html').bind("click", clearMenus) - $('body').dropdown( '[data-dropdown] .dropdown-toggle' ) - }) + var d = '[data-dropdown]' /* DROPDOWN PLUGIN DEFINITION * ========================== */ - $.fn.dropdown = function ( selector ) { + $.fn.dropdown = function () { return this.each(function () { - $(this).delegate(selector || d, 'click', function (e) { + $(this).delegate(d, 'click', function (e) { var li = $(this).parent('li') , isActive = li.hasClass('open') @@ -47,4 +38,16 @@ }) } + /* APPLY TO STANDARD DROPDOWN ELEMENTS + * =================================== */ + + function clearMenus() { + $(d).parent('li').removeClass('open') + } + + $(function () { + $('html').bind("click", clearMenus) + $('body').dropdown() + }) + })( window.jQuery || window.ender ) \ No newline at end of file diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 5c38a7477..c8d41a50b 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -18,7 +18,7 @@ * ========================================================= */ -(function( $ ){ +!function( $ ){ /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) * ======================================================= */ @@ -53,16 +53,12 @@ * ============================= */ var Modal = function ( content, options ) { - this.settings = $.extend({}, $.fn.modal.defaults) + this.settings = $.extend({}, $.fn.modal.defaults, options) this.$element = $(content) - .delegate('.js-dismiss', 'click.modal', $.proxy(this.hide, this)) + .delegate('[data-modal-dismiss]', $.proxy(this.hide, this)) - if ( options ) { - $.extend( this.settings, options ) - - if ( options.show ) { - this.show() - } + if ( this.settings.show ) { + this.show() } return this @@ -81,15 +77,23 @@ escape.call(this) backdrop.call(this, function () { + var transition = $.support.transition && that.$element.hasClass('fade') + that.$element .appendTo(document.body) .show() - setTimeout(function () { - that.$element - .addClass('in') - .trigger('shown') - }, 1) + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element + .addClass('in') + + transition ? + that.$element.one(transitionEnd, function () { that.$element.trigger('shown') }) : + that.$element.trigger('shown') + }) return this @@ -98,6 +102,10 @@ , hide: function (e) { e && e.preventDefault() + if ( !this.isShown ) { + return this + } + var that = this this.isShown = false @@ -132,16 +140,25 @@ var that = this , animate = this.$element.hasClass('fade') ? 'fade' : '' if ( this.isShown && this.settings.backdrop ) { + var doAnimate = $.support.transition && animate + this.$backdrop = $('
') - .click($.proxy(this.hide, this)) .appendTo(document.body) - setTimeout(function () { - that.$backdrop && that.$backdrop.addClass('in') - $.support.transition && that.$backdrop.hasClass('fade') ? - that.$backdrop.one(transitionEnd, callback) : - callback() - }) + if ( this.settings.backdrop != 'static' ) { + this.$backdrop.click($.proxy(this.hide, this)) + } + + if ( doAnimate ) { + this.$backdrop[0].offsetWidth // force reflow + } + + this.$backdrop.addClass('in') + + doAnimate ? + this.$backdrop.one(transitionEnd, callback) : + callback() + } else if ( !this.isShown && this.$backdrop ) { this.$backdrop.removeClass('in') @@ -161,13 +178,13 @@ function escape() { var that = this if ( this.isShown && this.settings.keyboard ) { - $('body').bind('keyup.modal', function ( e ) { + $(document).bind('keyup.modal', function ( e ) { if ( e.which == 27 ) { that.hide() } }) } else if ( !this.isShown ) { - $('body').unbind('keyup.modal') + $(document).unbind('keyup.modal') } } @@ -209,12 +226,12 @@ $.fn.modal.defaults = { backdrop: false , keyboard: false - , show: true + , show: false } - /* MODAL DATA- IMPLEMENTATION - * ========================== */ + /* MODAL DATA-IMPLEMENTATION + * ========================= */ $(document).ready(function () { $('body').delegate('[data-controls-modal]', 'click', function (e) { @@ -224,4 +241,4 @@ }) }) -})( window.jQuery || window.ender ) \ No newline at end of file +}( window.jQuery || window.ender ); \ No newline at end of file diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index e41090a3b..1cf4b8917 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -18,7 +18,7 @@ * =========================================================== */ -(function( $ ) { +!function( $ ) { var Popover = function ( element, options ) { this.$element = $(element) @@ -40,7 +40,7 @@ } , getContent: function () { - var contentvar + var content , $e = this.$element , o = this.options @@ -74,4 +74,4 @@ $.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, { content: 'data-content', placement: 'right'}) -})( window.jQuery || window.ender ) \ No newline at end of file +}( window.jQuery || window.ender ); \ No newline at end of file diff --git a/js/bootstrap-tabs.js b/js/bootstrap-tabs.js index 807b366a3..b94adfc25 100644 --- a/js/bootstrap-tabs.js +++ b/js/bootstrap-tabs.js @@ -18,30 +18,36 @@ * ======================================================== */ -(function( $ ){ +!function( $ ){ function activate ( element, container ) { - container.find('.active').removeClass('active') + container.find('> .active').removeClass('active') element.addClass('active') } function tab( e ) { var $this = $(this) + , $ul = $this.closest('ul') , href = $this.attr('href') - , $ul = $(e.liveFired) - , $controlled + , previous if (/^#\w+/.test(href)) { e.preventDefault() - if ($this.hasClass('active')) { + if ($this.parent('li').hasClass('active')) { return } + previous = $ul.find('.active a')[0] $href = $(href) activate($this.parent('li'), $ul) activate($href, $href.parent()) + + $this.trigger({ + type: 'change' + , relatedTarget: previous + }) } } @@ -59,4 +65,4 @@ $('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a') }) -})( window.jQuery || window.ender ) \ No newline at end of file +}( window.jQuery || window.ender ); \ No newline at end of file diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index bc92f97fe..0144c4815 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -19,7 +19,7 @@ * ========================================================== */ -(function( $ ) { +!function( $ ) { /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) * ======================================================= */ @@ -304,4 +304,4 @@ return $.metadata ? $.extend({}, options, $(ele).metadata()) : options } -})( window.jQuery || window.ender ) \ No newline at end of file +}( window.jQuery || window.ender ); \ No newline at end of file -- cgit v1.2.3 From c9669be1ec2862b88ffdb296191e82fed79f56a4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 5 Oct 2011 00:14:55 -0700 Subject: get modal working with new data-attrs --- docs/javascript.html | 21 +++++++++------------ js/bootstrap-modal.js | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/docs/javascript.html b/docs/javascript.html index d5eb98739..9f2b13876 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -12,7 +12,7 @@ - + @@ -182,7 +182,7 @@ $('#my-modal').bind('hidden', function () { - -
@@ -221,7 +219,7 @@ $('#my-modal').bind('hidden', function () { 
 <ul class="tabs">
   <li class="active"><a href="#">Home</a></li>
-  <li class="dropdown" data-dropdown="dropdown" >
+  <li class="dropdown" data-dropdown="true" >
     <a href="#" class="dropdown-toggle">Dropdown</a>
     <ul class="dropdown-menu">
       <li><a href="#">Secondary link</a></li>
@@ -231,7 +229,6 @@ $('#my-modal').bind('hidden', function () {
     </ul>
   </li>
 </ul>
-

Notice If your ui has several dropdowns, consider adding the data-dropdown attribute to a more significant container element like .tabs or .topbar.

Methods

$().dropdown()

@@ -239,7 +236,7 @@ $('#my-modal').bind('hidden', function () {

Demo

-
+
Project Name @@ -252,7 +249,7 @@ $('#my-modal').bind('hidden', function () {
  • - Dropdown 1 + Dropdown 1
  • - Dropdown 2 + Dropdown 2
    • Secondary link
    • Something else here
      • @@ -645,11 +642,11 @@ $('#my-modal').bind('hidden', function () { 
      $(".alert-message").alert('close')

      Demo

      - × + ×

      Holy guacamole! Best check yo self, you’re not looking too good.

      - × + ×

      Oh snap! You got an error! Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.

      Take this action Or do this diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index c8d41a50b..60b83d58f 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -55,7 +55,7 @@ var Modal = function ( content, options ) { this.settings = $.extend({}, $.fn.modal.defaults, options) this.$element = $(content) - .delegate('[data-modal-dismiss]', $.proxy(this.hide, this)) + .delegate('[data-modal-dismiss]', 'click', $.proxy(this.hide, this)) if ( this.settings.show ) { this.show() -- cgit v1.2.3 From f61fe3c4746ec09ff64756797fe6314be5f53b30 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2011 21:13:26 -0700 Subject: refactor fluid layout to be more specific to not interfere with modal content while adding right sidebar option --- bootstrap.css | 49 +++++++++-------- bootstrap.min.css | 22 ++++---- docs/index.html | 2 +- examples/fluid-reverse.html | 126 ++++++++++++++++++++++++++++++++++++++++++++ examples/fluid.html | 8 +-- lib/patterns.less | 85 +++++++++++++++--------------- lib/scaffolding.less | 26 +++++---- 7 files changed, 229 insertions(+), 89 deletions(-) create mode 100644 examples/fluid-reverse.html diff --git a/bootstrap.css b/bootstrap.css index ab96f6c7c..8022cf2a0 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Oct 4 01:15:08 PDT 2011 + * Date: Sun Oct 9 21:12:03 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). @@ -205,29 +205,38 @@ body { .container:after { clear: both; } -.container-fluid { +.fluid-container { position: relative; min-width: 940px; padding-left: 20px; padding-right: 20px; zoom: 1; } -.container-fluid:before, .container-fluid:after { +.fluid-container:before, .fluid-container:after { display: table; content: ""; zoom: 1; *display: inline; } -.container-fluid:after { +.fluid-container:after { clear: both; } -.container-fluid > .sidebar { - float: left; +.fluid-sidebar-left, .fluid-sidebar-right { width: 220px; } -.container-fluid > .content { +.fluid-sidebar-left { + float: left; +} +.fluid-sidebar-right { + float: right; +} +.fluid-content { margin-left: 240px; } +.fluid-container.reverse .fluid-content { + margin-left: 0; + margin-right: 240px; +} a { color: #0069d6; text-decoration: none; @@ -1142,19 +1151,12 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-color: transparent; color: #ffffff; } -.topbar form { - float: left; - margin: 5px 0 0 0; +.topbar .form-search { position: relative; - filter: alpha(opacity=100); - -khtml-opacity: 1; - -moz-opacity: 1; - opacity: 1; -} -.topbar form.pull-right { - float: right; + margin-top: 5px; + margin-bottom: 0; } -.topbar input { +.topbar .form-search input { background-color: #444; background-color: rgba(255, 255, 255, 0.3); font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -1177,18 +1179,18 @@ table .headerSortUp.purple, table .headerSortDown.purple { -o-transition: none; transition: none; } -.topbar input:-moz-placeholder { +.topbar .form-search input:-moz-placeholder { color: #e6e6e6; } -.topbar input::-webkit-input-placeholder { +.topbar .form-search input::-webkit-input-placeholder { color: #e6e6e6; } -.topbar input:hover { +.topbar .form-search input:hover { background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); color: #ffffff; } -.topbar input:focus, .topbar input.focused { +.topbar .form-search input:focus, .topbar .form-search input.focused { outline: 0; background-color: #ffffff; color: #404040; @@ -1199,6 +1201,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); } +.topbar .pull-right { + float: right; +} .topbar-inner { background-color: #222; background-color: #222222; diff --git a/bootstrap.min.css b/bootstrap.min.css index 9a241d80d..325c50e92 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -24,10 +24,13 @@ html,body{background-color:#ffffff;} body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;min-width:940px;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{margin-left:240px;} +.fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.fluid-container:before,.fluid-container:after{display:table;content:"";zoom:1;*display:inline;} +.fluid-container:after{clear:both;} +.fluid-sidebar-left,.fluid-sidebar-right{width:220px;} +.fluid-sidebar-left{float:left;} +.fluid-sidebar-right{float:right;} +.fluid-content{margin-left:240px;} +.fluid-container.reverse .fluid-content{margin-left:0;margin-right:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;} .pull-right{float:right;} .pull-left{float:left;} @@ -200,12 +203,11 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .topbar .brand a:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} .topbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} .topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;color:#ffffff;} -.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} -.topbar form.pull-right{float:right;} -.topbar input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#e6e6e6;} -.topbar input::-webkit-input-placeholder{color:#e6e6e6;} -.topbar input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} -.topbar input:focus,.topbar input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} +.topbar .form-search{position:relative;margin-top:5px;margin-bottom:0;}.topbar .form-search input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar .form-search input:-moz-placeholder{color:#e6e6e6;} +.topbar .form-search input::-webkit-input-placeholder{color:#e6e6e6;} +.topbar .form-search input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} +.topbar .form-search input:focus,.topbar .form-search input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} +.topbar .pull-right{float:right;} .topbar-inner{background-color:#222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} .nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav>li{display:block;float:left;} .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;} diff --git a/docs/index.html b/docs/index.html index 137144991..194111b78 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1278,7 +1278,7 @@
-
+
    diff --git a/examples/fluid-reverse.html b/examples/fluid-reverse.html new file mode 100644 index 000000000..7c13a4453 --- /dev/null +++ b/examples/fluid-reverse.html @@ -0,0 +1,126 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + +
    +
    +
    + Project name + +

    Logged in as username

    +
    +
    +
    + +
    +
    +
    +
    Sidebar
    + +
    Sidebar
    + +
    Sidebar
    + +
    +
    +
    + +
    +

    Hello, world!

    +

    Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

    +

    Learn more »

    +
    + + +
    +
    +

    Heading

    +

    Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

    +

    View details »

    +
    +
    +

    Heading

    +

    Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

    +

    View details »

    +
    +
    +

    Heading

    +

    Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

    +

    View details »

    +
    +
    + +
    + + +
    +
    +

    Heading

    +

    Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

    +

    View details »

    +
    +
    +

    Heading

    +

    Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

    +

    View details »

    +
    +
    +

    Heading

    +

    Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

    +

    View details »

    +
    +
    + +
    +

    © Company 2011

    +
    +
    +
    + + + \ No newline at end of file diff --git a/examples/fluid.html b/examples/fluid.html index eacb5c3d2..c6387846b 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -30,7 +30,7 @@
    -
    +
    Project name
    • Home
      • @@ -42,8 +42,8 @@
    -
    -
    +
    +
    Sidebar
      @@ -68,7 +68,7 @@
    -
    +

    Hello, world!

    diff --git a/lib/patterns.less b/lib/patterns.less index 1b27b7184..8ceffaa99 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -54,54 +54,53 @@ } // Search Form - form { - float: left; - margin: 5px 0 0 0; + .form-search { position: relative; - .opacity(100); + margin-top: 5px; + margin-bottom: 0; + input { + background-color: #444; + background-color: rgba(255,255,255,.3); + #font > .sans-serif(13px, normal, 1); + padding: 4px 9px; + color: @white; + color: rgba(255,255,255,.75); + border: 1px solid #111; + .border-radius(4px); + @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25); + .box-shadow(@shadow); + .transition(none); + + // Placeholder text gets special styles; can't be bundled together though for some reason + &:-moz-placeholder { + color: @grayLighter; + } + &::-webkit-input-placeholder { + color: @grayLighter; + } + // Hover states + &:hover { + background-color: @grayLight; + background-color: rgba(255,255,255,.5); + color: @white; + } + // Focus states (we use .focused since IE8 and down doesn't support :focus) + &:focus, + &.focused { + outline: 0; + background-color: @white; + color: @grayDark; + text-shadow: 0 1px 0 @white; + border: 0; + padding: 5px 10px; + .box-shadow(0 0 3px rgba(0,0,0,.15)); + } + } } // Todo: remove from v2.0 when ready, added for legacy - form.pull-right { + .pull-right { float: right; } - input { - background-color: #444; - background-color: rgba(255,255,255,.3); - #font > .sans-serif(13px, normal, 1); - padding: 4px 9px; - color: @white; - color: rgba(255,255,255,.75); - border: 1px solid #111; - .border-radius(4px); - @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25); - .box-shadow(@shadow); - .transition(none); - - // Placeholder text gets special styles; can't be bundled together though for some reason - &:-moz-placeholder { - color: @grayLighter; - } - &::-webkit-input-placeholder { - color: @grayLighter; - } - // Hover states - &:hover { - background-color: @grayLight; - background-color: rgba(255,255,255,.5); - color: @white; - } - // Focus states (we use .focused since IE8 and down doesn't support :focus) - &:focus, - &.focused { - outline: 0; - background-color: @white; - color: @grayDark; - text-shadow: 0 1px 0 @white; - border: 0; - padding: 5px 10px; - .box-shadow(0 0 3px rgba(0,0,0,.15)); - } - } } // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present diff --git a/lib/scaffolding.less b/lib/scaffolding.less index b6852535c..00a8ee3b3 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -24,20 +24,28 @@ body { } // Fluid layouts (left aligned, with sidebar, min- & max-width content) -.container-fluid { +.fluid-container { position: relative; min-width: 940px; padding-left: 20px; padding-right: 20px; .clearfix(); - > .sidebar { - float: left; - width: 220px; - } - // TODO in v2: rename this and .popover .content to be more specific - > .content { - margin-left: 240px; - } +} +// Sidebars (left and right options) +.fluid-sidebar-left, +.fluid-sidebar-right { + width: 220px; +} +.fluid-sidebar-left { float: left; } +.fluid-sidebar-right { float: right; } +// The main content area +.fluid-content { + margin-left: 240px; +} +// Reverse layout for sidebar on right +.fluid-container.reverse .fluid-content { + margin-left: 0; + margin-right: 240px; } -- cgit v1.2.3 From dd1efdf0d5ec2469978a65c845cc5dfd16b74899 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2011 21:25:28 -0700 Subject: update input prepend and append to use baseline variable --- bootstrap.css | 2 +- lib/forms.less | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 8022cf2a0..cd7409198 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sun Oct 9 21:12:03 PDT 2011 + * Date: Sun Oct 9 21:24:37 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). diff --git a/lib/forms.less b/lib/forms.less index 4bdddc3a2..4b2bb8016 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -323,11 +323,11 @@ textarea[readonly] { display: block; width: auto; min-width: 16px; - height: 18px; + height: @baseLineHeight; padding: 4px 4px 4px 5px; margin-right: -1px; font-weight: normal; - line-height: 18px; + line-height: @baseLineHeight; color: @grayLight; text-align: center; text-shadow: 0 1px 0 @white; -- cgit v1.2.3 From 8ba005d38dd7a79ea3e90efb6efc7ac9ebcadc26 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 11 Oct 2011 09:44:51 -0700 Subject: new navbar introduced to replace topbar --- bootstrap.css | 84 ++++++++++++++++------------ bootstrap.min.css | 23 ++++---- docs/index.html | 90 +++++++++++++++--------------- docs/javascript.html | 68 +++++++++++------------ lib/patterns.less | 154 ++++++++++++++++++++++++++++----------------------- 5 files changed, 224 insertions(+), 195 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index cd7409198..728590ba2 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sun Oct 9 21:24:37 PDT 2011 + * Date: Tue Oct 11 09:43:00 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). @@ -1114,26 +1114,37 @@ table .headerSortUp.purple, table .headerSortDown.purple { /* Patterns.less * Repeatable UI elements outside the base styles provided from the scaffolding * ---------------------------------------------------------------------------- */ -.topbar { +.navbar { height: 40px; - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 10000; overflow: visible; } -.topbar a { +.navbar-inner { + background-color: #222222; + background-color: #222222; + background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); + background-image: -moz-linear-gradient(top, #333333, #222222); + background-image: -ms-linear-gradient(top, #333333, #222222); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); + background-image: -webkit-linear-gradient(top, #333333, #222222); + background-image: -o-linear-gradient(top, #333333, #222222); + background-image: linear-gradient(top, #333333, #222222); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); +} +.navbar a { color: #bfbfbf; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.topbar .brand a:hover, .topbar ul .active > a { - background-color: #333; +.navbar .brand a:hover, .navbar ul .active > a { + background-color: #333333; background-color: rgba(255, 255, 255, 0.05); color: #ffffff; text-decoration: none; } -.topbar .brand { +.navbar .brand { float: left; display: block; padding: 8px 20px 12px; @@ -1143,20 +1154,21 @@ table .headerSortUp.purple, table .headerSortDown.purple { font-weight: 200; line-height: 1; } -.topbar p { +.navbar p { margin: 0; line-height: 40px; } -.topbar p a:hover { +.navbar p a:hover { background-color: transparent; color: #ffffff; } -.topbar .form-search { +.navbar-search { position: relative; margin-top: 5px; margin-bottom: 0; + float: left; } -.topbar .form-search input { +.navbar-search input { background-color: #444; background-color: rgba(255, 255, 255, 0.3); font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -1179,18 +1191,18 @@ table .headerSortUp.purple, table .headerSortDown.purple { -o-transition: none; transition: none; } -.topbar .form-search input:-moz-placeholder { +.navbar-search input:-moz-placeholder { color: #e6e6e6; } -.topbar .form-search input::-webkit-input-placeholder { +.navbar-search input::-webkit-input-placeholder { color: #e6e6e6; } -.topbar .form-search input:hover { +.navbar-search input:hover { background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); color: #ffffff; } -.topbar .form-search input:focus, .topbar .form-search input.focused { +.navbar-search input:focus, .navbar-search input.focused { outline: 0; background-color: #ffffff; color: #404040; @@ -1201,24 +1213,24 @@ table .headerSortUp.purple, table .headerSortDown.purple { -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); } -.topbar .pull-right { - float: right; +.navbar-static { + margin-bottom: 18px; } -.topbar-inner { - background-color: #222; - background-color: #222222; - background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); +.navbar-static .navbar-inner { + margin-left: -20px; + margin-right: -20px; + padding-left: 20px; + padding-right: 20px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.navbar-fixed { + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 10000; } .nav { display: block; diff --git a/bootstrap.min.css b/bootstrap.min.css index 325c50e92..0e949c603 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -199,16 +199,19 @@ table .orange{color:#f89406;border-bottom-color:#f89406;} table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;} table .purple{color:#7a43b6;border-bottom-color:#7a43b6;} table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;} -.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} -.topbar .brand a:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} -.topbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} -.topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;color:#ffffff;} -.topbar .form-search{position:relative;margin-top:5px;margin-bottom:0;}.topbar .form-search input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar .form-search input:-moz-placeholder{color:#e6e6e6;} -.topbar .form-search input::-webkit-input-placeholder{color:#e6e6e6;} -.topbar .form-search input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} -.topbar .form-search input:focus,.topbar .form-search input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} -.topbar .pull-right{float:right;} -.topbar-inner{background-color:#222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} +.navbar{height:40px;overflow:visible;} +.navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} +.navbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.navbar .brand a:hover,.navbar ul .active>a{background-color:#333333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} +.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} +.navbar p{margin:0;line-height:40px;}.navbar p a:hover{background-color:transparent;color:#ffffff;} +.navbar-search{position:relative;margin-top:5px;margin-bottom:0;float:left;}.navbar-search input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search input:-moz-placeholder{color:#e6e6e6;} +.navbar-search input::-webkit-input-placeholder{color:#e6e6e6;} +.navbar-search input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} +.navbar-search input:focus,.navbar-search input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} +.navbar-static{margin-bottom:18px;} +.navbar-static .navbar-inner{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.navbar-fixed{position:fixed;top:0;left:0;right:0;z-index:10000;} .nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav>li{display:block;float:left;} .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;} .nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} diff --git a/docs/index.html b/docs/index.html index 194111b78..7e9d6c1d0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -37,24 +37,24 @@ -
    -
    +
    +
    Bootstrap

    Fixed topbar

    -
    -
    -
    -
    - Project Name - -
    - -
    - -
    -
    -
    -
    +
    +
    +
    + Project Name + +
    + +
    + +
    +
    +
    diff --git a/docs/javascript.html b/docs/javascript.html index 9f2b13876..dd4c2d03a 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -39,8 +39,8 @@ -
    -
    +
    +
    Bootstrap JS
      @@ -235,39 +235,37 @@ $('#my-modal').bind('hidden', function () { A programatic api for activating menus for a given topbar or tabbed navigation.

      Demo

      -
      -
      -
      -
      - Project Name - -
      - -
      - -
      + diff --git a/lib/patterns.less b/lib/patterns.less index 8ceffaa99..a82e2856d 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -3,34 +3,41 @@ * ---------------------------------------------------------------------------- */ -// TOPBAR -// ------ +// NAVBAR (FIXED AND STATIC) +// ------------------------- -// Topbar for Branding and Nav -.topbar { - height: 40px; - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 10000; - overflow: visible; +// Navbar variables +@navBarHeight: 40px; +@navBarBgStart: #333; +@navBarBgEnd: #222; - // Links get text shadow +// Common styles +.navbar { + height: @navBarHeight; + overflow: visible; +} +// gradient is applied to it's own element because overflow visible is not honored by ie when filter is present +.navbar-inner { + background-color: @navBarBgEnd; + #gradient > .vertical(@navBarBgStart, @navBarBgEnd); + @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); + .box-shadow(@shadow); +} +// Text and links +.navbar { + // Links get text-shadow a { color: @grayLight; text-shadow: 0 -1px 0 rgba(0,0,0,.25); } - // Hover and active states .brand a:hover, ul .active > a { - background-color: #333; + background-color: @navBarBgStart; background-color: rgba(255,255,255,.05); color: @white; text-decoration: none; } - // Website or project name .brand { float: left; @@ -42,7 +49,6 @@ font-weight: 200; line-height: 1; } - // Plain text in topbar p { margin: 0; @@ -52,70 +58,82 @@ color: @white; } } +} - // Search Form - .form-search { - position: relative; - margin-top: 5px; - margin-bottom: 0; - input { - background-color: #444; - background-color: rgba(255,255,255,.3); - #font > .sans-serif(13px, normal, 1); - padding: 4px 9px; - color: @white; - color: rgba(255,255,255,.75); - border: 1px solid #111; - .border-radius(4px); - @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25); - .box-shadow(@shadow); - .transition(none); +// Navbar search +.navbar-search { + position: relative; + margin-top: 5px; + margin-bottom: 0; + float: left; + input { + background-color: #444; + background-color: rgba(255,255,255,.3); + #font > .sans-serif(13px, normal, 1); + padding: 4px 9px; + color: @white; + color: rgba(255,255,255,.75); + border: 1px solid #111; + .border-radius(4px); + @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25); + .box-shadow(@shadow); + .transition(none); - // Placeholder text gets special styles; can't be bundled together though for some reason - &:-moz-placeholder { - color: @grayLighter; - } - &::-webkit-input-placeholder { - color: @grayLighter; - } - // Hover states - &:hover { - background-color: @grayLight; - background-color: rgba(255,255,255,.5); - color: @white; - } - // Focus states (we use .focused since IE8 and down doesn't support :focus) - &:focus, - &.focused { - outline: 0; - background-color: @white; - color: @grayDark; - text-shadow: 0 1px 0 @white; - border: 0; - padding: 5px 10px; - .box-shadow(0 0 3px rgba(0,0,0,.15)); - } + // Placeholder text gets special styles; can't be bundled together though for some reason + &:-moz-placeholder { + color: @grayLighter; + } + &::-webkit-input-placeholder { + color: @grayLighter; + } + // Hover states + &:hover { + background-color: @grayLight; + background-color: rgba(255,255,255,.5); + color: @white; + } + // Focus states (we use .focused since IE8 and down doesn't support :focus) + &:focus, + &.focused { + outline: 0; + background-color: @white; + color: @grayDark; + text-shadow: 0 1px 0 @white; + border: 0; + padding: 5px 10px; + .box-shadow(0 0 3px rgba(0,0,0,.15)); } - } - // Todo: remove from v2.0 when ready, added for legacy - .pull-right { - float: right; } } -// gradient is applied to it's own element because overflow visible is not honored by ie when filter is present -.topbar-inner { - background-color: #222; - #gradient > .vertical(#333, #222); - @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - .box-shadow(@shadow); + +// Static navbar +.navbar-static { + margin-bottom: @baseLineHeight; +} +.navbar-static .navbar-inner { + margin-left: -20px; + margin-right: -20px; + padding-left: 20px; + padding-right: 20px; + .border-radius(4px); +} + +// Fixed navbar +.navbar-fixed { + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 10000; } + // NAVIGATION // ---------- -// Topbar Nav +// Nav for navbar and topbar // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity .nav { display: block; -- cgit v1.2.3 From 8c2bb99085816617704b5d537b9c901e26e03569 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 11 Oct 2011 09:46:02 -0700 Subject: share new navbar in examples --- examples/container-app.html | 6 +++--- examples/fluid-reverse.html | 4 ++-- examples/fluid.html | 4 ++-- examples/hero.html | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/container-app.html b/examples/container-app.html index 75328e645..28807bb05 100644 --- a/examples/container-app.html +++ b/examples/container-app.html @@ -75,8 +75,8 @@ -
      -
      +
      +
      Project name -
      + diff --git a/examples/fluid-reverse.html b/examples/fluid-reverse.html index 7c13a4453..a32291d46 100644 --- a/examples/fluid-reverse.html +++ b/examples/fluid-reverse.html @@ -28,8 +28,8 @@ -
      -
      +
      +
      Project name
        diff --git a/examples/fluid.html b/examples/fluid.html index c6387846b..3b8bb46a8 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -28,8 +28,8 @@ -
        -
        +
        +
        Project name
          diff --git a/examples/hero.html b/examples/hero.html index 6ded6e1e9..d84eb8843 100644 --- a/examples/hero.html +++ b/examples/hero.html @@ -28,8 +28,8 @@ -
          -
          +
          +
          Project name
            -- cgit v1.2.3 From b6443905411dcdcec54d7eaad2f998a582271728 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 11 Oct 2011 09:52:50 -0700 Subject: update navbar search form --- bootstrap.css | 23 ++++++++++------------- bootstrap.min.css | 8 ++++---- docs/index.html | 7 +------ docs/javascript.html | 4 ++-- lib/patterns.less | 7 +++---- 5 files changed, 20 insertions(+), 29 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 728590ba2..0da6a96ec 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Oct 11 09:43:00 PDT 2011 + * Date: Tue Oct 11 09:52:07 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). @@ -1164,11 +1164,11 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .navbar-search { position: relative; - margin-top: 5px; + margin-top: 6px; margin-bottom: 0; float: left; } -.navbar-search input { +.navbar-search .search-query { background-color: #444; background-color: rgba(255, 255, 255, 0.3); font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -1179,30 +1179,27 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #ffffff; color: rgba(255, 255, 255, 0.75); border: 1px solid #111; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); -webkit-transition: none; -moz-transition: none; -ms-transition: none; -o-transition: none; transition: none; } -.navbar-search input:-moz-placeholder { +.navbar-search .search-query:-moz-placeholder { color: #e6e6e6; } -.navbar-search input::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #e6e6e6; } -.navbar-search input:hover { +.navbar-search .search-query:hover { background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); color: #ffffff; } -.navbar-search input:focus, .navbar-search input.focused { +.navbar-search .search-query:focus, .navbar-search .search-query.focused { outline: 0; background-color: #ffffff; color: #404040; diff --git a/bootstrap.min.css b/bootstrap.min.css index 0e949c603..45277ae40 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -205,10 +205,10 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .navbar .brand a:hover,.navbar ul .active>a{background-color:#333333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} .navbar p{margin:0;line-height:40px;}.navbar p a:hover{background-color:transparent;color:#ffffff;} -.navbar-search{position:relative;margin-top:5px;margin-bottom:0;float:left;}.navbar-search input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search input:-moz-placeholder{color:#e6e6e6;} -.navbar-search input::-webkit-input-placeholder{color:#e6e6e6;} -.navbar-search input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} -.navbar-search input:focus,.navbar-search input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} +.navbar-search{position:relative;margin-top:6px;margin-bottom:0;float:left;}.navbar-search .search-query{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#e6e6e6;} +.navbar-search .search-query::-webkit-input-placeholder{color:#e6e6e6;} +.navbar-search .search-query:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} +.navbar-search .search-query:focus,.navbar-search .search-query.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} .navbar-static{margin-bottom:18px;} .navbar-static .navbar-inner{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .navbar-fixed{position:fixed;top:0;left:0;right:0;z-index:10000;} diff --git a/docs/index.html b/docs/index.html index 7e9d6c1d0..ced0c658f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -44,7 +44,6 @@ @@ -1278,7 +1273,7 @@
          - +
          • diff --git a/docs/javascript.html b/docs/javascript.html index dd4c2d03a..66caad10b 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -243,8 +243,8 @@ $('#my-modal').bind('hidden', function () {
          • Link
          • Link
          -
          - + +
          • diff --git a/lib/patterns.less b/lib/patterns.less index a82e2856d..f2a0b7f0e 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -63,10 +63,10 @@ // Navbar search .navbar-search { position: relative; - margin-top: 5px; + margin-top: 6px; margin-bottom: 0; float: left; - input { + .search-query { background-color: #444; background-color: rgba(255,255,255,.3); #font > .sans-serif(13px, normal, 1); @@ -74,8 +74,7 @@ color: @white; color: rgba(255,255,255,.75); border: 1px solid #111; - .border-radius(4px); - @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25); + @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); .box-shadow(@shadow); .transition(none); -- cgit v1.2.3 From fa8b1dc12dcfe993f1e4185f95ebe0981fbeb0f0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 11 Oct 2011 19:31:25 -0700 Subject: remove color scheme variables, remove font-face mixin --- bootstrap.css | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++- bootstrap.min.css | 70 +++++++++++++++++------------------ lib/mixins.less | 17 ++------- lib/variables.less | 16 -------- 4 files changed, 144 insertions(+), 66 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 0da6a96ec..d40c50c84 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Oct 11 09:52:07 PDT 2011 + * Date: Tue Oct 11 19:31:11 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). @@ -551,6 +551,9 @@ code, pre { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } code { background-color: #fee9cc; @@ -569,6 +572,9 @@ pre { -webkit-border-radius: 3px; -moz-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-wrap; word-wrap: break-word; @@ -620,6 +626,9 @@ select, -webkit-border-radius: 3px; -moz-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 */ input[type=checkbox], input[type=radio] { @@ -814,6 +823,9 @@ textarea[readonly] { -webkit-border-radius: 4px; -moz-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 { color: #9d261d; @@ -895,6 +907,9 @@ textarea[readonly] { -webkit-border-radius: 0 3px 3px 0; -moz-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 { position: relative; @@ -916,6 +931,9 @@ textarea[readonly] { -webkit-border-radius: 3px 0 0 3px; -moz-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 { background: #a9dba9; @@ -931,11 +949,17 @@ textarea[readonly] { -webkit-border-radius: 3px 0 0 3px; -moz-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 { -webkit-border-radius: 0 3px 3px 0; -moz-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-left: -1px; } @@ -943,6 +967,9 @@ textarea[readonly] { -webkit-border-radius: 14px; -moz-border-radius: 14px; border-radius: 14px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .control-group { margin-bottom: 18px; @@ -982,6 +1009,9 @@ table { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } table th, table td { padding: 10px 10px 9px; @@ -1007,21 +1037,33 @@ table tbody tr:first-child td:first-child { -webkit-border-radius: 4px 0 0 0; -moz-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 { -webkit-border-radius: 0 4px 0 0; -moz-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 { -webkit-border-radius: 0 0 0 4px; -moz-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 { -webkit-border-radius: 0 0 4px 0; -moz-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 { background-color: #f9f9f9; @@ -1221,6 +1263,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .navbar-fixed { position: fixed; @@ -1352,6 +1397,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 0 0 6px 6px; -moz-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); -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); @@ -1446,6 +1494,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 4px 4px 0 0; -moz-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 { text-decoration: none; @@ -1464,6 +1515,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 0 6px 6px 6px; -moz-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 .dropdown-toggle:after { border-top-color: #999; @@ -1487,6 +1541,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 15px; -moz-border-radius: 15px; border-radius: 15px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .pills a:hover { background: #00438a; @@ -1522,6 +1579,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 3px; -moz-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; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; @@ -1544,6 +1604,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .hero-unit h1 { margin-bottom: 0; @@ -1659,6 +1722,9 @@ footer { -webkit-border-radius: 4px; -moz-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); -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); @@ -1728,6 +1794,9 @@ footer { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .btn.small { padding: 7px 9px 7px; @@ -1775,6 +1844,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .btn-group .btn:first-child { margin-left: 0; @@ -1840,6 +1912,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-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); -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); @@ -1915,6 +1990,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 3px; -moz-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); -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); @@ -1954,6 +2032,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-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); -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); @@ -1996,6 +2077,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 6px; -moz-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); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); @@ -2031,6 +2115,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 0 0 6px 6px; -moz-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; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; @@ -2110,6 +2197,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .twipsy-arrow { position: absolute; @@ -2170,6 +2260,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 6px; -moz-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); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); @@ -2181,6 +2274,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 3px 3px 0 0; -moz-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; } .popover .content { @@ -2190,6 +2286,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; } @@ -2217,6 +2316,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .label.important { background-color: #c43c35; @@ -2255,6 +2357,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-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); -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); diff --git a/bootstrap.min.css b/bootstrap.min.css index 45277ae40..d0662829a 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -103,15 +103,15 @@ em{font-style:italic;font-weight:inherit;line-height:inherit;} blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;} blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} address{display:block;line-height:18px;margin-bottom:18px;} -code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} -pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;} +pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-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-wrap;word-wrap:break-word;} form{margin-bottom:18px;} legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#404040;border-bottom:1px solid #eee;} label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;} label{display:block;margin-bottom:5px;color:#404040;} input[type=checkbox],input[type=radio]{cursor:pointer;} -input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;} input[type=file]{background-color:#ffffff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} @@ -144,7 +144,7 @@ input.span14,textarea.span14,select.span14{display:inline-block;float:none;width input.span15,textarea.span15,select.span15{display:inline-block;float:none;width:870px;margin-left:0;} input.span16,textarea.span16,select.span16{display:inline-block;float:none;width:930px;margin-left:0;} input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} -.has-error{background:#f8dcda;padding:9px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.has-error>label,.has-error span.help-inline,.has-error span.help-block{color:#9d261d;} +.has-error{background:#f8dcda;padding:9px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-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{color:#9d261d;} .has-error input,.has-error textarea,.has-error select{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}.has-error input:focus,.has-error textarea:focus,.has-error select:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} .has-error .input-prepend span.add-on,.has-error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;} @@ -158,28 +158,28 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .inline-inputs input.mini{width:60px;} .inline-inputs input.small{width:90px;} .inline-inputs span{padding:0 2px 0 1px;} -.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.input-prepend .add-on,.input-append .add-on{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-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{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-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{background:#a9dba9;border-color:#46a546;} .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;margin-right:0;margin-left:-1px;} -.form-search .search-query{-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} +.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;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} +.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-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-left:-1px;} +.form-search .search-query{-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} .control-group{margin-bottom:18px;} .control-group>label{font-weight:bold;} .form-horizontal .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;} .form-horizontal .controls{margin-left:150px;} .form-horizontal .control-list{padding-top:6px;} .form-horizontal .form-actions{padding-left:150px;} -table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;*border-collapse:collapse;font-size:13px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} +table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;*border-collapse:collapse;font-size:13px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} table th{padding-top:9px;font-weight:bold;vertical-align:middle;border-bottom:1px solid #ddd;} table td{vertical-align:top;} table th+th,table td+td{border-left:1px solid #ddd;} table tr+tr td{border-top:1px solid #ddd;} -table tbody tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} -table tbody tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} -table tbody tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} -table tbody tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} +table tbody tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-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{-webkit-border-radius:0 4px 0 0;-moz-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{-webkit-border-radius:0 0 0 4px;-moz-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{-webkit-border-radius:0 0 4px 0;-moz-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{background-color:#f9f9f9;} .zebra-striped tbody tr:hover td{background-color:#f5f5f5;} .zebra-striped .header{cursor:pointer;}.zebra-striped .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} @@ -210,7 +210,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .navbar-search .search-query:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} .navbar-search .search-query:focus,.navbar-search .search-query.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} .navbar-static{margin-bottom:18px;} -.navbar-static .navbar-inner{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.navbar-static .navbar-inner{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} .navbar-fixed{position:fixed;top:0;left:0;right:0;z-index:10000;} .nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav>li{display:block;float:left;} .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;} @@ -225,7 +225,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .dropdown{position:relative;} .dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:6px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=30);-khtml-opacity:0.3;-moz-opacity:0.3;opacity:0.3;} .dropdown:hover .dropdown-toggle:after{filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} -.dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} +.dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-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);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} .dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} .topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} @@ -233,21 +233,21 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;*display:inline;} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} -.tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} +.tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-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{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} .tabs>li.active>a{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;} -.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} +.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-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 .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} .tabs .open.dropdown .dropdown-toggle{border-color:#999;} .tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} .tab-content{clear:both;} -.pills a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #ffffff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{background:#00438a;color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} +.pills a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #ffffff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.pills a:hover{background:#00438a;color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} .pills .active a{background:#0069d6;color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} .tab-content>*,.pill-content>*{display:none;} .tab-content>.active,.pill-content>.active{display:block;} -.breadcrumb{margin:0 0 18px;padding:7px 14px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} +.breadcrumb{margin:0 0 18px;padding:7px 14px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-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;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#bfbfbf;} .breadcrumb .active a{color:#404040;} -.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} +.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} @@ -255,13 +255,13 @@ footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;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);background-repeat:repeat-x;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-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);background-repeat:repeat-x;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-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);background-repeat:repeat-x;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);} -.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} +.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-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);-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);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} .btn:focus{outline:1px dotted #666;} .btn.primary{color:#ffffff;background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .btn:active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);} .btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn.large{font-size:15px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.btn.large{font-size:15px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} .btn.small{padding:7px 9px 7px;font-size:11px;} :root .alert-message,:root .btn{border-radius:0 \0;} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} @@ -270,11 +270,11 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .btn-toolbar .btn-group{float:left;margin-right:10px;} .btn-group{zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";zoom:1;*display:inline;} .btn-group:after{clear:both;} -.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} +.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} .btn-group .btn:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;} .close{float:right;color:#000000;font-size:20px;font-weight:bold;line-height:13.5px;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} -.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;} +.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-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);-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);}.alert-message .close{*margin-top:3px;} .alert-message h5{line-height:18px;} .alert-message p{margin-bottom:0;} .alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;} @@ -287,21 +287,21 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;} .alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;} .alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;} -.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);} +.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-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);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} .pagination li{display:inline;} .pagination a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;} .pagination a:hover,.pagination .active a{background-color:#c7eefe;} .pagination .disabled a,.pagination .disabled a:hover{background-color:transparent;color:#bfbfbf;} .pagination .next a{border:0;} -.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} +.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-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);-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);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} .modal-backdrop{background-color:#000000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;}.modal-backdrop.fade{opacity:0;} .modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} -.modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} +.modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-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);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} .modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} .modal.fade.in{top:50%;} .modal-header{border-bottom:1px solid #eee;padding:5px 15px;} .modal-body{padding:15px;} -.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;} +.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-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;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;} .modal-footer:after{clear:both;} .modal-footer .btn{float:right;margin-left:5px;} .twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} @@ -309,23 +309,23 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.twipsy-inner{padding:3px 8px;background-color:#000000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.twipsy-inner{padding:3px 8px;background-color:#000000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} .twipsy-arrow{position:absolute;width:0;height:0;} .popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} -.popover .inner{background-color:#000000;background-color:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);} -.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} -.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} +.popover .inner{background-color:#000000;background-color:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-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);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} +.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-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;} +.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} -.label{padding:1px 3px 2px;background-color:#bfbfbf;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} +.label{padding:1px 3px 2px;background-color:#bfbfbf;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.label.important{background-color:#c43c35;} .label.warning{background-color:#f89406;} .label.success{background-color:#46a546;} .label.notice{background-color:#62cffc;} .media-grid{margin-left:-20px;margin-bottom:0;zoom:1;}.media-grid:before,.media-grid:after{display:table;content:"";zoom:1;*display:inline;} .media-grid:after{clear:both;} .media-grid li{display:inline;} -.media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}.media-grid a img{display:block;} +.media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-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);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid a img{display:block;} .media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} diff --git a/lib/mixins.less b/lib/mixins.less index 9c27346c2..22a30a1c8 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -71,20 +71,6 @@ } } -// Font face generator -.font-face(@fontFamily, @fileName, @style, @weight) { - @font-face { - font-family: @fontFamily; - font-style: @style; - font-weight: @weight; - src: url('@{fileName}.eot'); - src: url('@{fileName}.eot?#iefix') format('embedded-opentype'), - url('@{fileName}.woff') format('woff'), - url('@{fileName}.ttf') format('truetype'), - url('@{fileName}.svg#@{fontFamily}') format('svg'); - } -} - // Grid System .fixed-container() { width: @siteWidth; @@ -115,6 +101,9 @@ -webkit-border-radius: @radius; -moz-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) { -webkit-border-top-left-radius: @topLeft; diff --git a/lib/variables.less b/lib/variables.less index 864dbe8c0..f85e0ec85 100644 --- a/lib/variables.less +++ b/lib/variables.less @@ -45,22 +45,6 @@ @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); -// COLOR SCHEME -// ------------ - -// Use this to roll your own color schemes if you like (unused by Bootstrap by default) -@baseColor: @blue; // Set a base color -@complement: spin(@baseColor, 180); // Determine a complementary color -@split1: spin(@baseColor, 158); // Split complements -@split2: spin(@baseColor, -158); -@triad1: spin(@baseColor, 135); // Triads colors -@triad2: spin(@baseColor, -135); -@tetra1: spin(@baseColor, 90); // Tetra colors -@tetra2: spin(@baseColor, -90); -@analog1: spin(@baseColor, 22); // Analogs colors -@analog2: spin(@baseColor, -22); - - // THEME VARIABLES // --------------- -- cgit v1.2.3 From f4fc56b1b3827254dd771536dcb2b711919f3867 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 12 Oct 2011 08:31:16 -0700 Subject: first pass at moving over the new tabs stuff to 2.0 --- bootstrap.css | 77 +++++++++++++++++++++------ bootstrap.min.css | 29 ++++++---- docs/index.html | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++- docs/javascript.html | 38 ++++++------- lib/patterns.less | 106 ++++++++++++++++++++++++++++++------- 5 files changed, 332 insertions(+), 65 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index d40c50c84..abf43ed3d 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Oct 11 19:31:11 PDT 2011 + * Date: Tue Oct 11 23:51:38 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). @@ -1478,13 +1478,13 @@ table .headerSortUp.purple, table .headerSortDown.purple { display: block; } .tabs { - float: left; - width: 100%; - border-bottom: 1px solid #ddd; + border-color: #ddd; + border-style: solid; + border-width: 0 0 1px; } .tabs > li { position: relative; - top: 1px; + margin-bottom: -1px; } .tabs > li > a { padding: 0 15px; @@ -1503,13 +1503,56 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-color: #eee; border-color: #eee #eee #ddd; } -.tabs > li.active > a { +.tabs .active > a, .tabs .active > a:hover { color: #808080; background-color: #ffffff; border: 1px solid #ddd; border-bottom-color: transparent; + cursor: default; +} +.tabbable { + margin-bottom: 18px; +} +.tabbable .tabs { + margin-bottom: 0; + border-bottom: 0; +} +.tabbable .tab-content { + padding: 19px; + border: 1px solid #ddd; +} +.tabbable.tabs-bottom .tabs > li { + margin-top: -1px; + margin-bottom: 0; +} +.tabbable.tabs-bottom .tabs > li > a { + -webkit-border-radius: 0 0 4px 4px; + -moz-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 { + border-bottom-color: transparent; + border-top-color: #ddd; +} +.tabbable.tabs-bottom .tabs > .active > a, .tabbable.tabs-bottom .tabs > .active > a:hover { + border-color: transparent #ddd #ddd #ddd; +} +.tabbable.tabs-left .tabs { + float: left; +} +.tabbable.tabs-left .tabs > li { + float: none; +} +.tabbable.tabs-right .tabs { + float: right; +} +.tabbable.tabs-right .tabs > li { + float: none; } -.tabs .dropdown-menu { +.tabs .menu-dropdown, .tabs .dropdown-menu { top: 35px; border-width: 1px; -webkit-border-radius: 0 6px 6px 6px; @@ -1519,25 +1562,22 @@ table .headerSortUp.purple, table .headerSortDown.purple { -moz-background-clip: padding; background-clip: padding-box; } -.tabs .dropdown-toggle:after { +.tabs a.menu:after, .tabs .dropdown-toggle:after { border-top-color: #999; margin-top: 15px; margin-left: 5px; } -.tabs .open.dropdown .dropdown-toggle { +.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle { border-color: #999; } -.tabs .dropdown.open .dropdown-toggle:after { +.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { border-top-color: #555; } -.tab-content { - clear: both; -} .pills a { margin: 5px 3px 5px 0; padding: 0 15px; - text-shadow: 0 1px 1px #ffffff; line-height: 30px; + text-shadow: 0 1px 1px #ffffff; -webkit-border-radius: 15px; -moz-border-radius: 15px; border-radius: 15px; @@ -1546,17 +1586,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-clip: padding-box; } .pills a:hover { - background: #00438a; color: #ffffff; text-decoration: none; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); + background-color: #00438a; } .pills .active a { - background: #0069d6; color: #ffffff; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); + background-color: #0069d6; +} +.pills-vertical > li { + float: none; } -.tab-content > *, .pill-content > * { +.tab-content > .tab-pane, .pill-content > .pill-pane { display: none; } .tab-content > .active, .pill-content > .active { diff --git a/bootstrap.min.css b/bootstrap.min.css index d0662829a..62be2279a 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -233,16 +233,25 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;*display:inline;} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} -.tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-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{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} -.tabs>li.active>a{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;} -.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-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 .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} -.tabs .open.dropdown .dropdown-toggle{border-color:#999;} -.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} -.tab-content{clear:both;} -.pills a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #ffffff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.pills a:hover{background:#00438a;color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -.pills .active a{background:#0069d6;color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -.tab-content>*,.pill-content>*{display:none;} +.tabs{border-color:#ddd;border-style:solid;border-width:0 0 1px;}.tabs>li{position:relative;margin-bottom:-1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-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{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} +.tabs .active>a,.tabs .active>a:hover{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} +.tabbable{margin-bottom:18px;}.tabbable .tabs{margin-bottom:0;border-bottom:0;} +.tabbable .tab-content{padding:19px;border:1px solid #ddd;} +.tabbable.tabs-bottom .tabs>li{margin-top:-1px;margin-bottom:0;} +.tabbable.tabs-bottom .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-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{border-bottom-color:transparent;border-top-color:#ddd;} +.tabbable.tabs-bottom .tabs>.active>a,.tabbable.tabs-bottom .tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd;} +.tabbable.tabs-left .tabs{float:left;} +.tabbable.tabs-left .tabs>li{float:none;} +.tabbable.tabs-right .tabs{float:right;} +.tabbable.tabs-right .tabs>li{float:none;} +.tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-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{border-top-color:#999;margin-top:15px;margin-left:5px;} +.tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} +.tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} +.pills a{margin:5px 3px 5px 0;padding:0 15px;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} +.pills .active a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} +.pills-vertical>li{float:none;} +.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} .tab-content>.active,.pill-content>.active{display:block;} .breadcrumb{margin:0 0 18px;padding:7px 14px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-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;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#bfbfbf;} diff --git a/docs/index.html b/docs/index.html index ced0c658f..0d46084c1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1313,9 +1313,10 @@

            Tabs and pills

            Create simple secondary navigation with a <ul>. Swap between tabs or pills by adding the appropriate class.

            Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.

            -

            Get the javascript »

          +

          Basic tabs example

          +

          Tabs can be used as regular navigation (loading external pages in the same tab) or as tabbable content areas for swapping out panes of content. We have a tabs plugin that can be used to integrate the latter.

          • Home
          • Profile
            • @@ -1341,6 +1342,141 @@ <li><a href="#">Contact</a></li> </ul> +

            Alternate tabs

            +

            You can also use tabs that are stacked on either side of an element, or on the bottom.

            +
            +
            +
            + +
            +
            +
            +
            + +
            +
            +
            +
            + +
            +
            +
            +

            Tabbable tabs

            +

            As mentioned above, you can bring your tabs to life with a simple plugin. Here we have integrated all four variations of the tabs—default (top), right, bottom, left—with example tab areas.

            + +
            + +
            +
            +

            Oh hai #1!

            +
            +
            +

            Oh hai #2!

            +
            +
            +

            Oh hai #3!

            +
            +
            +

            Oh hai #4!

            +
            +
            +
            + +
            +
            +
            + +
            +
            +

            Section 1

            +

            Oh hai!

            +
            +
            +

            Section 2

            +

            Oh hai!

            +
            +
            +

            Section 3

            +

            Oh hai!

            +
            +
            +
            +
            +
            +
            + +
            +
            +

            Section 1

            +

            Oh hai!

            +
            +
            +

            Section 2

            +

            Oh hai!

            +
            +
            +

            Section 3

            +

            Oh hai!

            +
            +
            +
            +
            +
            + +
            +
            +
            +

            Oh hai #1!

            +
            +
            +

            Oh hai #2!

            +
            +
            +

            Oh hai #3!

            +
            +
            +

            Oh hai #4!

            +
            +
            + +
            + + +

            In addition to tabs, we have pills! Though a bit more limited in functionality, they share much of the same markup.

            +
            +

            Basic pills example

            • Home
            • Profile
              • @@ -1357,6 +1493,15 @@ <li><a href="#">Contact</a></li> </ul> +

              Vertical pill nav

              +

              With a pill-style nav, you can also stack the list items to have a simple sidebar. We don't offer left or right aligned versions here because that's easy enough to customize based on your own needs

              +
          diff --git a/docs/javascript.html b/docs/javascript.html index 66caad10b..b130511c3 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -353,24 +353,26 @@ $('#my-modal').bind('hidden', function () { </script>

          Demo

          - -
          -
          -

          Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

          -
          -
          -

          Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.

          -
          -
          -

          Banksy do proident, brooklyn photo booth delectus sunt artisan sed organic exercitation eiusmod four loko. Quis tattooed iphone esse aliqua. Master cleanse vero fixie mcsweeney's. Ethical portland aute, irony food truck pitchfork lomo eu anim. Aesthetic blog DIY, ethical beard leggings tofu consequat whatever cardigan nostrud. Helvetica you probably haven't heard of them carles, marfa veniam occaecat lomo before they sold out in shoreditch scenester sustainable thundercats. Consectetur tofu craft beer, mollit brunch fap echo park pitchfork mustache dolor.

          -
          -
          -

          Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seitan squid ad wolf bicycle rights blog. Et aute readymade farm-to-table carles 8-bit, nesciunt nulla etsy adipisicing organic ea. Master cleanse mollit high life, next level Austin nesciunt american apparel twee mustache adipisicing reprehenderit hoodie portland irony. Aliqua tofu quinoa +1 commodo eiusmod. High life williamsburg cupidatat twee homo leggings. Four loko vinyl DIY consectetur nisi, marfa retro keffiyeh vegan. Fanny pack viral retro consectetur gentrify fap.

          +
          + +
          +
          +

          Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

          +
          +
          +

          Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.

          +
          +
          +

          Banksy do proident, brooklyn photo booth delectus sunt artisan sed organic exercitation eiusmod four loko. Quis tattooed iphone esse aliqua. Master cleanse vero fixie mcsweeney's. Ethical portland aute, irony food truck pitchfork lomo eu anim. Aesthetic blog DIY, ethical beard leggings tofu consequat whatever cardigan nostrud. Helvetica you probably haven't heard of them carles, marfa veniam occaecat lomo before they sold out in shoreditch scenester sustainable thundercats. Consectetur tofu craft beer, mollit brunch fap echo park pitchfork mustache dolor.

          +
          +
          +

          Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seitan squid ad wolf bicycle rights blog. Et aute readymade farm-to-table carles 8-bit, nesciunt nulla etsy adipisicing organic ea. Master cleanse mollit high life, next level Austin nesciunt american apparel twee mustache adipisicing reprehenderit hoodie portland irony. Aliqua tofu quinoa +1 commodo eiusmod. High life williamsburg cupidatat twee homo leggings. Four loko vinyl DIY consectetur nisi, marfa retro keffiyeh vegan. Fanny pack viral retro consectetur gentrify fap.

          +
          diff --git a/lib/patterns.less b/lib/patterns.less index f2a0b7f0e..af898a561 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -318,14 +318,14 @@ } } -// Basic Tabs +// Tabs .tabs { - float: left; - width: 100%; - border-bottom: 1px solid #ddd; + border-color: #ddd; + border-style: solid; + border-width: 0 0 1px; > li { position: relative; // For the dropdowns mostly - top: 1px; + margin-bottom: -1px; > a { padding: 0 15px; margin-right: 2px; @@ -338,61 +338,129 @@ border-color: #eee #eee #ddd; } } - &.active > a { - color: @gray; - background-color: @white; - border: 1px solid #ddd; + } + // Active state, and it's :hover to override normal :hover + .active > a, + .active > a:hover { + color: @gray; + background-color: @white; + border: 1px solid #ddd; + border-bottom-color: transparent; + cursor: default; + } +} + +.tabbable { + margin-bottom: @baseLineHeight; + + // Tabs on top + .tabs { + margin-bottom: 0; + border-bottom: 0; + } + .tab-content { + padding: 19px; + border: 1px solid #ddd; + } + + // Tabs on bottom + &.tabs-bottom .tabs > li { + margin-top: -1px; + margin-bottom: 0; + } + &.tabs-bottom .tabs > li > a { + .border-radius(0 0 4px 4px); + &:hover { border-bottom-color: transparent; + border-top-color: #ddd; } } + &.tabs-bottom .tabs > .active > a, + &.tabs-bottom .tabs > .active > a:hover { + border-color: transparent #ddd #ddd #ddd; + } + + // Tabs on left + &.tabs-left .tabs { + float: left; + } + &.tabs-left .tabs > li { + float: none; + } + + // Tabs on right + &.tabs-right .tabs { + float: right; + } + &.tabs-right .tabs > li { + float: none; + } +} + + +// Dropdowns in tabs +.tabs { + // first one for backwards compatibility + .menu-dropdown, .dropdown-menu { top: 35px; border-width: 1px; .border-radius(0 6px 6px 6px); } + // first one for backwards compatibility + a.menu:after, .dropdown-toggle:after { border-top-color: #999; margin-top: 15px; margin-left: 5px; } + // first one for backwards compatibility + li.open.menu .menu, .open.dropdown .dropdown-toggle { border-color: #999; } + // first one for backwards compatibility + li.open a.menu:after, .dropdown.open .dropdown-toggle:after { border-top-color: #555; } } -.tab-content { - clear: both; -} -// Basic pill nav +// Pills .pills { a { margin: 5px 3px 5px 0; padding: 0 15px; - text-shadow: 0 1px 1px @white; line-height: 30px; + text-shadow: 0 1px 1px @white; .border-radius(15px); &:hover { - background: @linkColorHover; color: @white; text-decoration: none; text-shadow: 0 1px 1px rgba(0,0,0,.25); + background-color: @linkColorHover; } } .active a { - background: @linkColor; color: @white; text-shadow: 0 1px 1px rgba(0,0,0,.25); + background-color: @linkColor; } } -.tab-content > *, -.pill-content > * { - display: none; +// Stacked pills +.pills-vertical > li { + float: none; } +// Tabbable areas +.tab-content, +.pill-content { +} +.tab-content > .tab-pane, +.pill-content > .pill-pane { + display: none; +} .tab-content > .active, .pill-content > .active { display: block; -- cgit v1.2.3 From fbe22f05800a3ce4ae3a880914d8e03cb1e01d1b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 15 Oct 2011 17:21:39 -0700 Subject: updated index of docs to use html5 self closing tags, add responsive shell to bootstrap file --- bootstrap.css | 8 +++++++- bootstrap.min.css | 1 + docs/index.html | 22 +++++++++++----------- lib/bootstrap.less | 5 ++++- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index abf43ed3d..60cc8213f 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Oct 11 23:51:38 PDT 2011 + * Date: Sat Oct 15 17:19:53 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). @@ -2416,3 +2416,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } +/* Responsive.less + * For phone and tablet devices + * ------------------------------------------------------------- */ +@media (max-width: 480px) { + +} diff --git a/bootstrap.min.css b/bootstrap.min.css index 62be2279a..770bd1dc6 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -338,3 +338,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .media-grid li{display:inline;} .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-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);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid a img{display:block;} .media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} +@media (max-width: 480px){} diff --git a/docs/index.html b/docs/index.html index 0d46084c1..4dd45f5f9 100644 --- a/docs/index.html +++ b/docs/index.html @@ -81,8 +81,8 @@

          Bootstrap, from Twitter

          - Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
          - It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
          + Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
          + It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.

          Nerd alert: Bootstrap is built with Less and was designed to work out of the gate with modern browsers in mind.

          @@ -491,15 +491,15 @@
          - Twitter, Inc.
          - 795 Folsom Ave, Suite 600
          - San Francisco, CA 94107
          + Twitter, Inc.
          + 795 Folsom Ave, Suite 600
          + San Francisco, CA 94107
          P: (123) 456-7890
          - Full Name
          + Full Name
          first.last@gmail.com
          @@ -966,7 +966,7 @@
          - +
          @@ -1010,11 +1010,11 @@
          @@ -1306,7 +1306,7 @@

          Note: When using the topbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your body.

          -
          +
          @@ -2015,7 +2015,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita

          Back to top

          - 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.
          Code licensed under the Apache License v2.0. Documentation licensed under CC BY 3.0.

          diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 62f2ce916..9665306fd 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -23,4 +23,7 @@ @import "type.less"; @import "forms.less"; @import "tables.less"; -@import "patterns.less"; \ No newline at end of file +@import "patterns.less"; + +// Responsive +@import "responsive.less"; \ No newline at end of file -- cgit v1.2.3 From 9e9109469e5c86c4232cc744639b286bcd9ef0ba Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 03:00:58 -0700 Subject: biiiiiig update coming for responsiveness --- bootstrap.css | 422 +++++++++++++++++++++++++---------------------- bootstrap.min.css | 172 +++++++++---------- docs/assets/css/docs.css | 71 +++++--- docs/index.html | 215 +++++++++--------------- lib/mixins.less | 3 - lib/scaffolding.less | 27 +-- lib/variables.less | 4 +- 7 files changed, 433 insertions(+), 481 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 60cc8213f..482d2878c 100644 --- a/bootstrap.css +++ b/bootstrap.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 Oct 15 17:19:53 PDT 2011 + * Date: Sun Oct 16 02:59:54 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). @@ -261,7 +261,6 @@ a:hover { } .row { zoom: 1; - margin-left: -20px; } .row:before, .row:after { display: table; @@ -277,125 +276,77 @@ a:hover { float: left; margin-left: 20px; } +.row > [class*="span"]:first-child { + margin-left: 0; +} .span1 { - width: 40px; + width: 60px; } .span2 { - width: 100px; + width: 140px; } .span3 { - width: 160px; + width: 220px; } .span4 { - width: 220px; + width: 300px; } .span5 { - width: 280px; + width: 380px; } .span6 { - width: 340px; + width: 460px; } .span7 { - width: 400px; + width: 540px; } .span8 { - width: 460px; + width: 620px; } .span9 { - width: 520px; + width: 700px; } .span10 { - width: 580px; + width: 780px; } .span11 { - width: 640px; + width: 860px; } .span12 { - width: 700px; -} -.span13 { - width: 760px; -} -.span14 { - width: 820px; -} -.span15 { - width: 880px; -} -.span16 { 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 { - margin-left: 80px; + margin-left: 100px; } .offset2 { - margin-left: 140px; + margin-left: 180px; } .offset3 { - margin-left: 200px; + margin-left: 260px; } .offset4 { - margin-left: 260px; + margin-left: 340px; } .offset5 { - margin-left: 320px; + margin-left: 420px; } .offset6 { - margin-left: 380px; + margin-left: 500px; } .offset7 { - margin-left: 440px; + margin-left: 580px; } .offset8 { - margin-left: 500px; + margin-left: 660px; } .offset9 { - margin-left: 560px; + margin-left: 740px; } .offset10 { - margin-left: 620px; + margin-left: 820px; } .offset11 { - margin-left: 680px; -} -.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; + margin-left: 900px; } /* Typography.less * Headings, body text, lists, code, and more for a versatile and durable typography system @@ -551,9 +502,6 @@ code, pre { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } code { background-color: #fee9cc; @@ -572,9 +520,6 @@ pre { -webkit-border-radius: 3px; -moz-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-wrap; word-wrap: break-word; @@ -626,9 +571,6 @@ select, -webkit-border-radius: 3px; -moz-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 */ input[type=checkbox], input[type=radio] { @@ -713,97 +655,97 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus { input.span1, textarea.span1, select.span1 { display: inline-block; float: none; - width: 30px; + width: 50px; margin-left: 0; } input.span2, textarea.span2, select.span2 { display: inline-block; float: none; - width: 90px; + width: 150px; margin-left: 0; } input.span3, textarea.span3, select.span3 { display: inline-block; float: none; - width: 150px; + width: 250px; margin-left: 0; } input.span4, textarea.span4, select.span4 { display: inline-block; float: none; - width: 210px; + width: 350px; margin-left: 0; } input.span5, textarea.span5, select.span5 { display: inline-block; float: none; - width: 270px; + width: 450px; margin-left: 0; } input.span6, textarea.span6, select.span6 { display: inline-block; float: none; - width: 330px; + width: 550px; margin-left: 0; } input.span7, textarea.span7, select.span7 { display: inline-block; float: none; - width: 390px; + width: 650px; margin-left: 0; } input.span8, textarea.span8, select.span8 { display: inline-block; float: none; - width: 450px; + width: 750px; margin-left: 0; } input.span9, textarea.span9, select.span9 { display: inline-block; float: none; - width: 510px; + width: 850px; margin-left: 0; } input.span10, textarea.span10, select.span10 { display: inline-block; float: none; - width: 570px; + width: 950px; margin-left: 0; } input.span11, textarea.span11, select.span11 { display: inline-block; float: none; - width: 630px; + width: 1050px; margin-left: 0; } input.span12, textarea.span12, select.span12 { display: inline-block; float: none; - width: 690px; + width: 1150px; margin-left: 0; } input.span13, textarea.span13, select.span13 { display: inline-block; float: none; - width: 750px; + width: 1250px; margin-left: 0; } input.span14, textarea.span14, select.span14 { display: inline-block; float: none; - width: 810px; + width: 1350px; margin-left: 0; } input.span15, textarea.span15, select.span15 { display: inline-block; float: none; - width: 870px; + width: 1450px; margin-left: 0; } input.span16, textarea.span16, select.span16 { display: inline-block; float: none; - width: 930px; + width: 1550px; margin-left: 0; } input[disabled], @@ -823,9 +765,6 @@ textarea[readonly] { -webkit-border-radius: 4px; -moz-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 { color: #9d261d; @@ -907,9 +846,6 @@ textarea[readonly] { -webkit-border-radius: 0 3px 3px 0; -moz-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 { position: relative; @@ -931,9 +867,6 @@ textarea[readonly] { -webkit-border-radius: 3px 0 0 3px; -moz-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 { background: #a9dba9; @@ -949,17 +882,11 @@ textarea[readonly] { -webkit-border-radius: 3px 0 0 3px; -moz-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 { -webkit-border-radius: 0 3px 3px 0; -moz-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-left: -1px; } @@ -967,9 +894,6 @@ textarea[readonly] { -webkit-border-radius: 14px; -moz-border-radius: 14px; border-radius: 14px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .control-group { margin-bottom: 18px; @@ -1009,9 +933,6 @@ table { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } table th, table td { padding: 10px 10px 9px; @@ -1037,33 +958,21 @@ table tbody tr:first-child td:first-child { -webkit-border-radius: 4px 0 0 0; -moz-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 { -webkit-border-radius: 0 4px 0 0; -moz-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 { -webkit-border-radius: 0 0 0 4px; -moz-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 { -webkit-border-radius: 0 0 4px 0; -moz-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 { background-color: #f9f9f9; @@ -1263,9 +1172,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .navbar-fixed { position: fixed; @@ -1397,9 +1303,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 0 0 6px 6px; -moz-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); -moz-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 { -webkit-border-radius: 4px 4px 0 0; -moz-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 { text-decoration: none; @@ -1529,9 +1429,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 0 0 4px 4px; -moz-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 { border-bottom-color: transparent; @@ -1558,9 +1455,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 0 6px 6px 6px; -moz-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 { border-top-color: #999; @@ -1581,9 +1475,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 15px; -moz-border-radius: 15px; border-radius: 15px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .pills a:hover { color: #ffffff; @@ -1622,9 +1513,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 3px; -moz-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; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; @@ -1647,9 +1535,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .hero-unit h1 { margin-bottom: 0; @@ -1765,9 +1650,6 @@ footer { -webkit-border-radius: 4px; -moz-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); -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); @@ -1837,9 +1719,6 @@ footer { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .btn.small { padding: 7px 9px 7px; @@ -1887,9 +1766,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .btn-group .btn:first-child { margin-left: 0; @@ -1955,9 +1831,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-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); -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); @@ -2033,9 +1906,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 3px; -moz-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); -moz-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 { -webkit-border-radius: 4px; -moz-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); -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); @@ -2120,9 +1987,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 6px; -moz-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); -moz-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 { -webkit-border-radius: 0 0 6px 6px; -moz-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; -moz-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 { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .twipsy-arrow { position: absolute; @@ -2303,9 +2161,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 6px; -moz-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); -moz-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 { -webkit-border-radius: 3px 3px 0 0; -moz-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; } .popover .content { @@ -2329,9 +2181,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; } @@ -2359,9 +2208,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; } .label.important { background-color: #c43c35; @@ -2400,9 +2246,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -webkit-border-radius: 4px; -moz-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); -moz-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 { * For phone and tablet devices * ------------------------------------------------------------- */ @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; + } } diff --git a/bootstrap.min.css b/bootstrap.min.css index 770bd1dc6..04a992e32 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -36,49 +36,33 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a: .pull-left{float:left;} .hide{display:none;} .show{display:block;} -.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";zoom:1;*display:inline;} +.row{zoom:1;}.row:before,.row:after{display:table;content:"";zoom:1;*display:inline;} .row:after{clear:both;} [class*="span"]{display:inline;float:left;margin-left:20px;} -.span1{width:40px;} -.span2{width:100px;} -.span3{width:160px;} -.span4{width:220px;} -.span5{width:280px;} -.span6{width:340px;} -.span7{width:400px;} -.span8{width:460px;} -.span9{width:520px;} -.span10{width:580px;} -.span11{width:640px;} -.span12{width:700px;} -.span13{width:760px;} -.span14{width:820px;} -.span15{width:880px;} -.span16{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{margin-left:80px;} -.offset2{margin-left:140px;} -.offset3{margin-left:200px;} -.offset4{margin-left:260px;} -.offset5{margin-left:320px;} -.offset6{margin-left:380px;} -.offset7{margin-left:440px;} -.offset8{margin-left:500px;} -.offset9{margin-left:560px;} -.offset10{margin-left:620px;} -.offset11{margin-left:680px;} -.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;} +.row>[class*="span"]:first-child{margin-left:0;} +.span1{width:60px;} +.span2{width:140px;} +.span3{width:220px;} +.span4{width:300px;} +.span5{width:380px;} +.span6{width:460px;} +.span7{width:540px;} +.span8{width:620px;} +.span9{width:700px;} +.span10{width:780px;} +.span11{width:860px;} +.span12{width:940px;} +.offset1{margin-left:100px;} +.offset2{margin-left:180px;} +.offset3{margin-left:260px;} +.offset4{margin-left:340px;} +.offset5{margin-left:420px;} +.offset6{margin-left:500px;} +.offset7{margin-left:580px;} +.offset8{margin-left:660px;} +.offset9{margin-left:740px;} +.offset10{margin-left:820px;} +.offset11{margin-left:900px;} p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;} @@ -103,15 +87,15 @@ em{font-style:italic;font-weight:inherit;line-height:inherit;} blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;} blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} address{display:block;line-height:18px;margin-bottom:18px;} -code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} +code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} -pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-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-wrap;word-wrap:break-word;} +pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;} form{margin-bottom:18px;} legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#404040;border-bottom:1px solid #eee;} label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;} label{display:block;margin-bottom:5px;color:#404040;} input[type=checkbox],input[type=radio]{cursor:pointer;} -input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} +input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;} input[type=file]{background-color:#ffffff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} @@ -127,24 +111,24 @@ input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shado .input-large{width:210px;} .input-xlarge{width:270px;} .input-xxlarge{width:530px;} -input.span1,textarea.span1,select.span1{display:inline-block;float:none;width:30px;margin-left:0;} -input.span2,textarea.span2,select.span2{display:inline-block;float:none;width:90px;margin-left:0;} -input.span3,textarea.span3,select.span3{display:inline-block;float:none;width:150px;margin-left:0;} -input.span4,textarea.span4,select.span4{display:inline-block;float:none;width:210px;margin-left:0;} -input.span5,textarea.span5,select.span5{display:inline-block;float:none;width:270px;margin-left:0;} -input.span6,textarea.span6,select.span6{display:inline-block;float:none;width:330px;margin-left:0;} -input.span7,textarea.span7,select.span7{display:inline-block;float:none;width:390px;margin-left:0;} -input.span8,textarea.span8,select.span8{display:inline-block;float:none;width:450px;margin-left:0;} -input.span9,textarea.span9,select.span9{display:inline-block;float:none;width:510px;margin-left:0;} -input.span10,textarea.span10,select.span10{display:inline-block;float:none;width:570px;margin-left:0;} -input.span11,textarea.span11,select.span11{display:inline-block;float:none;width:630px;margin-left:0;} -input.span12,textarea.span12,select.span12{display:inline-block;float:none;width:690px;margin-left:0;} -input.span13,textarea.span13,select.span13{display:inline-block;float:none;width:750px;margin-left:0;} -input.span14,textarea.span14,select.span14{display:inline-block;float:none;width:810px;margin-left:0;} -input.span15,textarea.span15,select.span15{display:inline-block;float:none;width:870px;margin-left:0;} -input.span16,textarea.span16,select.span16{display:inline-block;float:none;width:930px;margin-left:0;} +input.span1,textarea.span1,select.span1{display:inline-block;float:none;width:50px;margin-left:0;} +input.span2,textarea.span2,select.span2{display:inline-block;float:none;width:150px;margin-left:0;} +input.span3,textarea.span3,select.span3{display:inline-block;float:none;width:250px;margin-left:0;} +input.span4,textarea.span4,select.span4{display:inline-block;float:none;width:350px;margin-left:0;} +input.span5,textarea.span5,select.span5{display:inline-block;float:none;width:450px;margin-left:0;} +input.span6,textarea.span6,select.span6{display:inline-block;float:none;width:550px;margin-left:0;} +input.span7,textarea.span7,select.span7{display:inline-block;float:none;width:650px;margin-left:0;} +input.span8,textarea.span8,select.span8{display:inline-block;float:none;width:750px;margin-left:0;} +input.span9,textarea.span9,select.span9{display:inline-block;float:none;width:850px;margin-left:0;} +input.span10,textarea.span10,select.span10{display:inline-block;float:none;width:950px;margin-left:0;} +input.span11,textarea.span11,select.span11{display:inline-block;float:none;width:1050px;margin-left:0;} +input.span12,textarea.span12,select.span12{display:inline-block;float:none;width:1150px;margin-left:0;} +input.span13,textarea.span13,select.span13{display:inline-block;float:none;width:1250px;margin-left:0;} +input.span14,textarea.span14,select.span14{display:inline-block;float:none;width:1350px;margin-left:0;} +input.span15,textarea.span15,select.span15{display:inline-block;float:none;width:1450px;margin-left:0;} +input.span16,textarea.span16,select.span16{display:inline-block;float:none;width:1550px;margin-left:0;} input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} -.has-error{background:#f8dcda;padding:9px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-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{color:#9d261d;} +.has-error{background:#f8dcda;padding:9px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.has-error>label,.has-error span.help-inline,.has-error span.help-block{color:#9d261d;} .has-error input,.has-error textarea,.has-error select{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}.has-error input:focus,.has-error textarea:focus,.has-error select:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} .has-error .input-prepend span.add-on,.has-error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;} @@ -158,28 +142,28 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .inline-inputs input.mini{width:60px;} .inline-inputs input.small{width:90px;} .inline-inputs span{padding:0 2px 0 1px;} -.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-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{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-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 input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.input-prepend .add-on,.input-append .add-on{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;} .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;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} -.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-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-left:-1px;} -.form-search .search-query{-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} +.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;margin-right:0;margin-left:-1px;} +.form-search .search-query{-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} .control-group{margin-bottom:18px;} .control-group>label{font-weight:bold;} .form-horizontal .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;} .form-horizontal .controls{margin-left:150px;} .form-horizontal .control-list{padding-top:6px;} .form-horizontal .form-actions{padding-left:150px;} -table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;*border-collapse:collapse;font-size:13px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} +table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;*border-collapse:collapse;font-size:13px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} table th{padding-top:9px;font-weight:bold;vertical-align:middle;border-bottom:1px solid #ddd;} table td{vertical-align:top;} table th+th,table td+td{border-left:1px solid #ddd;} table tr+tr td{border-top:1px solid #ddd;} -table tbody tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-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{-webkit-border-radius:0 4px 0 0;-moz-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{-webkit-border-radius:0 0 0 4px;-moz-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{-webkit-border-radius:0 0 4px 0;-moz-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;} +table tbody tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} +table tbody tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} +table tbody tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} +table tbody tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} .zebra-striped tbody tr:hover td{background-color:#f5f5f5;} .zebra-striped .header{cursor:pointer;}.zebra-striped .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} @@ -210,7 +194,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .navbar-search .search-query:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} .navbar-search .search-query:focus,.navbar-search .search-query.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} .navbar-static{margin-bottom:18px;} -.navbar-static .navbar-inner{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} +.navbar-static .navbar-inner{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .navbar-fixed{position:fixed;top:0;left:0;right:0;z-index:10000;} .nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav>li{display:block;float:left;} .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;} @@ -225,7 +209,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .dropdown{position:relative;} .dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:6px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=30);-khtml-opacity:0.3;-moz-opacity:0.3;opacity:0.3;} .dropdown:hover .dropdown-toggle:after{filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} -.dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-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);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} +.dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} .dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} .topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} @@ -233,30 +217,30 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;*display:inline;} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} -.tabs{border-color:#ddd;border-style:solid;border-width:0 0 1px;}.tabs>li{position:relative;margin-bottom:-1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-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{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} +.tabs{border-color:#ddd;border-style:solid;border-width:0 0 1px;}.tabs>li{position:relative;margin-bottom:-1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} .tabs .active>a,.tabs .active>a:hover{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} .tabbable{margin-bottom:18px;}.tabbable .tabs{margin-bottom:0;border-bottom:0;} .tabbable .tab-content{padding:19px;border:1px solid #ddd;} .tabbable.tabs-bottom .tabs>li{margin-top:-1px;margin-bottom:0;} -.tabbable.tabs-bottom .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-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{border-bottom-color:transparent;border-top-color:#ddd;} +.tabbable.tabs-bottom .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabbable.tabs-bottom .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} .tabbable.tabs-bottom .tabs>.active>a,.tabbable.tabs-bottom .tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd;} .tabbable.tabs-left .tabs{float:left;} .tabbable.tabs-left .tabs>li{float:none;} .tabbable.tabs-right .tabs{float:right;} .tabbable.tabs-right .tabs>li{float:none;} -.tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-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 .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} .tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} .tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} .tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} -.pills a{margin:5px 3px 5px 0;padding:0 15px;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} +.pills a{margin:5px 3px 5px 0;padding:0 15px;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} .pills .active a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} .pills-vertical>li{float:none;} .tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} .tab-content>.active,.pill-content>.active{display:block;} -.breadcrumb{margin:0 0 18px;padding:7px 14px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-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;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} +.breadcrumb{margin:0 0 18px;padding:7px 14px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#bfbfbf;} .breadcrumb .active a{color:#404040;} -.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} +.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} @@ -264,13 +248,13 @@ footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;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);background-repeat:repeat-x;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-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);background-repeat:repeat-x;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-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);background-repeat:repeat-x;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);} -.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-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);-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);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} +.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} .btn:focus{outline:1px dotted #666;} .btn.primary{color:#ffffff;background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .btn:active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);} .btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn.large{font-size:15px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} +.btn.large{font-size:15px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding:7px 9px 7px;font-size:11px;} :root .alert-message,:root .btn{border-radius:0 \0;} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} @@ -279,11 +263,11 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .btn-toolbar .btn-group{float:left;margin-right:10px;} .btn-group{zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";zoom:1;*display:inline;} .btn-group:after{clear:both;} -.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} +.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} .btn-group .btn:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;} .close{float:right;color:#000000;font-size:20px;font-weight:bold;line-height:13.5px;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} -.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-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);-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);}.alert-message .close{*margin-top:3px;} +.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;} .alert-message h5{line-height:18px;} .alert-message p{margin-bottom:0;} .alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;} @@ -296,21 +280,21 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;} .alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;} .alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;} -.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-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);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} +.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);} .pagination li{display:inline;} .pagination a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;} .pagination a:hover,.pagination .active a{background-color:#c7eefe;} .pagination .disabled a,.pagination .disabled a:hover{background-color:transparent;color:#bfbfbf;} .pagination .next a{border:0;} -.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-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);-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);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} +.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} .modal-backdrop{background-color:#000000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;}.modal-backdrop.fade{opacity:0;} .modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} -.modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-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);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} +.modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} .modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} .modal.fade.in{top:50%;} .modal-header{border-bottom:1px solid #eee;padding:5px 15px;} .modal-body{padding:15px;} -.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-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;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;} +.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;} .modal-footer:after{clear:both;} .modal-footer .btn{float:right;margin-left:5px;} .twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} @@ -318,24 +302,24 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.twipsy-inner{padding:3px 8px;background-color:#000000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;} +.twipsy-inner{padding:3px 8px;background-color:#000000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .twipsy-arrow{position:absolute;width:0;height:0;} .popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} -.popover .inner{background-color:#000000;background-color:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-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);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} -.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-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;} -.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} +.popover .inner{background-color:#000000;background-color:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);} +.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} +.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} -.label{padding:1px 3px 2px;background-color:#bfbfbf;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.label.important{background-color:#c43c35;} +.label{padding:1px 3px 2px;background-color:#bfbfbf;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} .label.warning{background-color:#f89406;} .label.success{background-color:#46a546;} .label.notice{background-color:#62cffc;} .media-grid{margin-left:-20px;margin-bottom:0;zoom:1;}.media-grid:before,.media-grid:after{display:table;content:"";zoom:1;*display:inline;} .media-grid:after{clear:both;} .media-grid li{display:inline;} -.media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-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);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid a img{display:block;} +.media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}.media-grid a img{display:block;} .media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} -@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;}} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a17fd5692..52714d199 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -8,8 +8,9 @@ /* Body and structure -------------------------------------------------- */ body { - background-color: #fff; position: relative; + padding-top: 40px; + background-color: #fff; } section { padding-top: 60px; @@ -21,22 +22,29 @@ section > .row { /* 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 { - min-width: 940px; - padding-top: 40px; + margin-bottom: 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 { 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); -*/} + padding: 36px 60px; + -webkit-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); + -moz-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); + box-shadow: inset 0 -15px 30px rgba(0,0,0,.1); +} .jumbotron h1, .jumbotron p { margin-bottom: 9px; color: #fff; - text-align: center; text-shadow: 0 1px 1px rgba(0,0,0,.3); } .jumbotron h1 { @@ -46,6 +54,7 @@ section > .row { } .jumbotron p { font-weight: 300; + margin-right: 25%; } .jumbotron .lead { font-size: 20px; @@ -60,14 +69,14 @@ section > .row { ------------------------- */ /* main docs page */ .masthead { - background-color: #049cd9; + background-color: #004d9f; background-repeat: no-repeat; - background-image: -webkit-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); - background-image: -webkit-linear-gradient(#004D9F, #049cd9); - background-image: -moz-linear-gradient(#004D9F, #049cd9); - background-image: -o-linear-gradient(top, #004D9F, #049cd9); - 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 */ + background-image: -webkit-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f)); + background-image: -webkit-linear-gradient(#048ccd, #004d9f); + background-image: -moz-linear-gradient(#048ccd, #004d9f); + background-image: -o-linear-gradient(top, #048ccd, #004d9f); + background-image: -khtml-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f)); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#048ccd', endColorstr='#004d9f', GradientType=0); /* IE8 and down */ } /* supporting docs pages */ .subhead { @@ -98,15 +107,9 @@ section > .row { /* Footer -------------------------------------------------- */ .footer { - background-color: #eee; - min-width: 940px; 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; } @@ -323,3 +326,25 @@ pre.prettyprint { .well form { 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; + } + +} + diff --git a/docs/index.html b/docs/index.html index 4dd45f5f9..2db9719d1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -75,40 +75,40 @@
          - -
          -
          -

          Bootstrap, from Twitter

          -

          - Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
          - It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
          -

          -

          Nerd alert: Bootstrap is built with Less and was designed to work out of the gate with modern browsers in mind.

          -
          -
          +
          + +
          + +
          +
          +

          Bootstrap, from Twitter

          + Download on GitHub +

          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.

          +

          Nerd alert: Bootstrap is built with Less and was designed with modern browsers in mind.

          +
          +
          - -
          -
          + + +
          + + diff --git a/lib/mixins.less b/lib/mixins.less index 22a30a1c8..16ea91ba4 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -101,9 +101,6 @@ -webkit-border-radius: @radius; -moz-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) { -webkit-border-top-left-radius: @topLeft; diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 00a8ee3b3..01fcd9e77 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -84,10 +84,8 @@ a { // GRID SYSTEM // ----------- // To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there - .row { .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) @@ -95,6 +93,10 @@ a { [class*="span"] { .gridColumn(); } +// Kill the margin on the first column +.row > [class*="span"]:first-child { + margin-left: 0; +} // Default columns .span1 { .columns(1); } @@ -109,20 +111,6 @@ a { .span10 { .columns(10); } .span11 { .columns(11); } .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 .offset1 { .offset(1); } @@ -136,10 +124,3 @@ a { .offset9 { .offset(9); } .offset10 { .offset(10); } .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; } diff --git a/lib/variables.less b/lib/variables.less index f85e0ec85..24eb8b45a 100644 --- a/lib/variables.less +++ b/lib/variables.less @@ -38,8 +38,8 @@ // ---- // Modify the grid styles in mixins.less -@gridColumns: 16; -@gridColumnWidth: 40px; +@gridColumns: 12; +@gridColumnWidth: 60px; @gridGutterWidth: 20px; @extraSpace: (@gridGutterWidth * 2); // For our grid calculations @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); -- cgit v1.2.3 From be926a04bc7d1fec228b9cbd4c6d0bb0c75c30cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 03:08:14 -0700 Subject: fix uber size in responsive; remove @extraspace variable by changing grid to use :first-child over negative margin --- bootstrap.css | 52 +++++++++++++++++++++++++--------------------------- bootstrap.min.css | 24 ++++++++++++------------ lib/mixins.less | 2 +- lib/variables.less | 1 - 4 files changed, 38 insertions(+), 41 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 482d2878c..887dbdd01 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sun Oct 16 02:59:54 PDT 2011 + * Date: Sun Oct 16 03:07:49 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). @@ -316,37 +316,37 @@ a:hover { width: 940px; } .offset1 { - margin-left: 100px; + margin-left: 80px; } .offset2 { - margin-left: 180px; + margin-left: 160px; } .offset3 { - margin-left: 260px; + margin-left: 240px; } .offset4 { - margin-left: 340px; + margin-left: 320px; } .offset5 { - margin-left: 420px; + margin-left: 400px; } .offset6 { - margin-left: 500px; + margin-left: 480px; } .offset7 { - margin-left: 580px; + margin-left: 560px; } .offset8 { - margin-left: 660px; + margin-left: 640px; } .offset9 { - margin-left: 740px; + margin-left: 720px; } .offset10 { - margin-left: 820px; + margin-left: 800px; } .offset11 { - margin-left: 900px; + margin-left: 880px; } /* Typography.less * Headings, body text, lists, code, and more for a versatile and durable typography system @@ -2367,9 +2367,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { width: 1170px; } [class*="span"] { - display: inline; - float: left; - margin-left: 20px; + margin-left: 30px; } .span1 { width: 70px; @@ -2408,39 +2406,39 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { width: 1170px; } .offset1 { - margin-left: 130px; + margin-left: 100px; } .offset2 { - margin-left: 230px; + margin-left: 200px; } .offset3 { - margin-left: 330px; + margin-left: 300px; } .offset4 { - margin-left: 430px; + margin-left: 400px; } .offset5 { - margin-left: 530px; + margin-left: 500px; } .offset6 { - margin-left: 630px; + margin-left: 600px; } .offset7 { - margin-left: 730px; + margin-left: 700px; } .offset8 { - margin-left: 830px; + margin-left: 800px; } .offset9 { - margin-left: 930px; + margin-left: 900px; } .offset10 { - margin-left: 1030px; + margin-left: 1000px; } .offset11 { - margin-left: 1130px; + margin-left: 1100px; } .offset12 { - margin-left: 1230px; + margin-left: 1200px; } } diff --git a/bootstrap.min.css b/bootstrap.min.css index 04a992e32..9c5968799 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -52,17 +52,17 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a: .span10{width:780px;} .span11{width:860px;} .span12{width:940px;} -.offset1{margin-left:100px;} -.offset2{margin-left:180px;} -.offset3{margin-left:260px;} -.offset4{margin-left:340px;} -.offset5{margin-left:420px;} -.offset6{margin-left:500px;} -.offset7{margin-left:580px;} -.offset8{margin-left:660px;} -.offset9{margin-left:740px;} -.offset10{margin-left:820px;} -.offset11{margin-left:900px;} +.offset1{margin-left:80px;} +.offset2{margin-left:160px;} +.offset3{margin-left:240px;} +.offset4{margin-left:320px;} +.offset5{margin-left:400px;} +.offset6{margin-left:480px;} +.offset7{margin-left:560px;} +.offset8{margin-left:640px;} +.offset9{margin-left:720px;} +.offset10{margin-left:800px;} +.offset11{margin-left:880px;} p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;} @@ -322,4 +322,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .media-grid li{display:inline;} .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}.media-grid a img{display:block;} .media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} -@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;}} +@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"]{margin-left:30px;} .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:100px;} .offset2{margin-left:200px;} .offset3{margin-left:300px;} .offset4{margin-left:400px;} .offset5{margin-left:500px;} .offset6{margin-left:600px;} .offset7{margin-left:700px;} .offset8{margin-left:800px;} .offset9{margin-left:900px;} .offset10{margin-left:1000px;} .offset11{margin-left:1100px;} .offset12{margin-left:1200px;}} diff --git a/lib/mixins.less b/lib/mixins.less index 16ea91ba4..47857f1fa 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -82,7 +82,7 @@ width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); } .offset(@columnOffset: 1) { - margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace; + margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth; } // Necessary grid styles for every column to make them appear next to each other horizontally .gridColumn() { diff --git a/lib/variables.less b/lib/variables.less index 24eb8b45a..92d09de70 100644 --- a/lib/variables.less +++ b/lib/variables.less @@ -41,7 +41,6 @@ @gridColumns: 12; @gridColumnWidth: 60px; @gridGutterWidth: 20px; -@extraSpace: (@gridGutterWidth * 2); // For our grid calculations @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); -- cgit v1.2.3 From 3a4760637f3acca9cbd8af2819d163848852a23a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 03:15:17 -0700 Subject: tweak navbar styles for static version to not cause problems on responsive layouts --- bootstrap.css | 4 +- bootstrap.min.css | 2 +- docs/index.html | 136 +++++++++++++++++++++++++++--------------------------- lib/patterns.less | 2 - 4 files changed, 70 insertions(+), 74 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 887dbdd01..8b487fb7e 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sun Oct 16 03:07:49 PDT 2011 + * Date: Sun Oct 16 03:14:23 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). @@ -1165,8 +1165,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { margin-bottom: 18px; } .navbar-static .navbar-inner { - margin-left: -20px; - margin-right: -20px; padding-left: 20px; padding-right: 20px; -webkit-border-radius: 4px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 9c5968799..cfec72ec1 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -194,7 +194,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .navbar-search .search-query:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} .navbar-search .search-query:focus,.navbar-search .search-query.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} .navbar-static{margin-bottom:18px;} -.navbar-static .navbar-inner{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .navbar-fixed{position:fixed;top:0;left:0;right:0;z-index:10000;} .nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav>li{display:block;float:left;} .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;} diff --git a/docs/index.html b/docs/index.html index 2db9719d1..0e49e9cbd 100644 --- a/docs/index.html +++ b/docs/index.html @@ -242,20 +242,20 @@
          -
          +

          Nesting columns

          Nest your content if you must by creating a .row within an existing column.

          -
          +

          Example of nested columns

          -
          +
          Level 1 of column
          -
          +
          Level 2
          -
          +
          Level 2
          @@ -282,11 +282,11 @@
          -
          +

          Roll your own grid

          Built into Bootstrap are a handful of variables for customizing the default 940px grid system. With a bit of customization, you can modify the size of columns, their gutters, and the container they reside in.

          -
          +

          Inside the grid

          The variables needed to modify the grid system currently all reside in preboot.less.

          @@ -341,7 +341,7 @@
          -
          +

          Fixed layout

          The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div.container>.

          @@ -355,7 +355,7 @@ </body>
          -
          +

          Fluid layout

          An alternative, flexible fluid page structure with min- and max-widths and a left-hand sidebar. Great for apps and docs.

          @@ -403,7 +403,7 @@
          h5. Heading 5
          h6. Heading 6
          -
          +

          Example paragraph

          Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.

          Example heading Has sub-heading…

          @@ -412,7 +412,7 @@
          -
          +

          Misc. elements

          Using emphasis, addresses, & abbreviations

          @@ -422,7 +422,7 @@ <abbr>

          -
          +

          When to use

          Emphasis tags (<strong> and <em>) should be used to indicate additional importance or emphasis of a word or phrase relative to its surrounding copy. Use <strong> for importance and <em> for stress emphasis.

          Emphasis in a paragraph

          @@ -456,7 +456,7 @@
          -
          +

          Blockquotes

          <blockquote> @@ -464,7 +464,7 @@ <small>

          -
          +

          How to quote

          To include a blockquote, wrap <blockquote> around <p> and <small> tags. Use the <small> element to cite your source and you'll get an em dash &mdash; before it.

          @@ -482,7 +482,7 @@

          Lists

          -
          +

          Unordered <ul>

          • Lorem ipsum dolor sit amet
            • @@ -502,7 +502,7 @@
          • Eget porttitor lorem
          -
          +

          Unstyled <ul.unstyled>

          • Lorem ipsum dolor sit amet
            • @@ -522,7 +522,7 @@
          • Eget porttitor lorem
          -
          +

          Ordered <ol>

          1. Lorem ipsum dolor sit amet
            2. @@ -535,7 +535,7 @@
          2. Eget porttitor lorem
          -
          +

          Description dl

          Description lists
          @@ -552,7 +552,7 @@
          -
          +

          Code

          <code> @@ -560,7 +560,7 @@

          Pimp your code in style with two simple tags. For even more awesomeness through javascript, drop in Google's code prettify library and you're set.

          -
          +

          Presenting code

          Code, blocks of or just snippets inline, can be displayed with style just by wrapping in the right tag. For blocks of code spanning multiple lines, use the <pre> element. For inline code, use the <code> element.

          @@ -603,14 +603,14 @@
          -
          +

          Inline labels

          <span class="label">

          Call attention to or flag any phrase in your body text.

          -
          +

          Label anything

          Ever needed one of those fancy New! or Important flags when writing code? Well, now you have them. Here's what's included by default:

          @@ -678,7 +678,7 @@
          -
          +

          Building tables

          <table> @@ -694,7 +694,7 @@

          Always wrap your column headers in a <thead> such that hierarchy is <thead> > <tr> > <th>.

          Similar to the column headers, all your table’s body content should be wrapped in a <tbody> so your hierarchy is <tbody> > <tr> > <td>.

          -
          +

          Example: Default table styles

          All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.

          @@ -823,7 +823,7 @@

          Forms

          -
          +

          Four types of forms

          With 2.0, we now have four types of forms to choose from:

            @@ -833,15 +833,15 @@
          • Vertical form for stacked labels and inputs
          -
          +

          -
          +

          Search form

          -
          +
          @@ -851,10 +851,10 @@
          -
          +

          Inline form

          -
          +

          Some directional text

          @@ -868,10 +868,10 @@
          -
          +

          Horizontal form

          -
          +
          Example form
          @@ -972,10 +972,10 @@
          -
          +

          Vertical form

          -
          +
          Example form
          @@ -1016,12 +1016,12 @@
          -
          +

          Buttons

          As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

          All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class.

          -
          +

          Example buttons

          Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

          @@ -1052,10 +1052,10 @@
          -
          +

          Button groups

          -
          +

          Example

          @@ -1101,11 +1101,11 @@
          -
          +

          Media grid

          Display thumbnails of varying sizes on pages with a low HTML footprint and minimal styles.

          -
          +

          Example thumbnails

          Thumbnails in the .media-grid can be any size, but they work best when mapped directly to the built-in Bootstrap grid system. Image widths like 90, 210, and 330 combine with a few pixels of padding to equal the .span2, .span4, and .span6 column sizes.

          Large

          @@ -1234,15 +1234,15 @@
          -
          +

          What is it

          Our topbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.

          -
          +

          Customizable

          All elements within, and the entire topbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav—or any combination of that.

          -
          +

          Dropdowns included

          As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns li tags also support .active for showing current page selection.

          @@ -1252,12 +1252,12 @@
          -
          +

          Tabs and pills

          Create simple secondary navigation with a <ul>. Swap between tabs or pills by adding the appropriate class.

          Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.

          -
          +

          Basic tabs example

          Tabs can be used as regular navigation (loading external pages in the same tab) or as tabbable content areas for swapping out panes of content. We have a tabs plugin that can be used to integrate the latter.

            @@ -1288,7 +1288,7 @@

            Alternate tabs

            You can also use tabs that are stacked on either side of an element, or on the bottom.

            -
            +
            -
            +
            -
            +
            -
            +
            -
            +
            • Section 1
              • @@ -1450,11 +1450,11 @@
              -
              +

              Breadcrumbs

              Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation.

              -
              +
              • Home
              @@ -1486,11 +1486,11 @@
              -
              +

              Pagination

              Ultra simplistic and minimally styled pagination inspired by Rdio. The large block is hard to miss, easily scalable, and provides large click areas.

              -
              +
              -
              +

              Basic alerts

              .alert-message

              One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.

              Get the javascript »

              -
              +
              ×

              Holy guacamole! Best check yo self, you’re not looking too good.

              @@ -1595,13 +1595,13 @@
              -
              +

              Block messages

              .alert-message.block-message

              For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.

              Get the javascript »

              -
              +
              ×

              Holy guacamole! This is a warning! Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

              @@ -1658,12 +1658,12 @@

              Popovers Components for displaying content in modals, tooltips, and popovers

              -
              +

              Modals

              Modals—dialogs or lightboxes—are great for contextual actions in situations where it’s important that the background context be maintained.

              Get the javascript »

              -
              +
              @@ -1685,12 +1685,12 @@
              -
              +

              Tooltips

              Twipsies are super useful for aiding a confused user and pointing them in the right direction.

              Get the javascript »

              -
              +

              @@ -1703,12 +1703,12 @@ Lorem ipsum dolar sit amet illo error ipsum verita

              -
              +

              Popovers

              Use popovers to provide subtextual information to a page without affecting layout.

              Get the javascript »

              -
              +
              @@ -1736,12 +1736,12 @@ Lorem ipsum dolar sit amet illo error ipsum verita

              Using javascript with Bootstrap An index of plugins to get you started

              -
              +

              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!

              View javascript docs »

              -
              +

              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.

          @@ -1797,11 +1797,11 @@ Lorem ipsum dolar sit amet illo error ipsum verita

          Using Bootstrap with Less Supercharge your CSS with variables, mixins, and functions

          -
          +

          Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.

          Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.

          -
          +

          How to use it

          Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.

          diff --git a/lib/patterns.less b/lib/patterns.less
index af898a561..950ac2feb 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -111,8 +111,6 @@
   margin-bottom: @baseLineHeight;
 }
 .navbar-static .navbar-inner {
-  margin-left:  -20px;
-  margin-right: -20px;
   padding-left:  20px;
   padding-right: 20px;
   .border-radius(4px);
-- 
cgit v1.2.3


From d1d38079589f2cda2b28cc9f5a3da86cbfabbf25 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 16 Oct 2011 03:15:36 -0700
Subject: add responsive.less file

---
 lib/responsive.less | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 lib/responsive.less

diff --git a/lib/responsive.less b/lib/responsive.less
new file mode 100644
index 000000000..ee974d3e1
--- /dev/null
+++ b/lib/responsive.less
@@ -0,0 +1,147 @@
+/* Responsive.less
+ * For phone and tablet devices
+ * ------------------------------------------------------------- */
+
+
+@media (max-width: 480px) {
+  // Remove width from containers
+  .container {
+    width: auto;
+    padding: 0 10px;
+  }
+  // Make all columns even
+  [class*="span"] {
+    float: none;
+    display: block;
+    width: auto;
+  }
+}
+
+
+@media (min-width: 480px) and (max-width: 768px) {
+  // Remove width from containers
+  .container {
+    width: auto;
+    padding: 0 10px;
+  }
+  // Make all columns even
+  [class*="span"] {
+    float: none;
+    display: block;
+    width: auto;
+    margin: 0;
+  }
+}
+
+
+// TABLET TO MEDIUM DESKTOP
+// ------------------------
+
+@media (min-width: 768px) and (max-width: 940px) {
+
+  // Reset grid variables
+  @gridColumns:       16;
+  @gridColumnWidth:   28px;
+  @gridGutterWidth:   20px;
+  @siteWidth:         748px;
+  @extraSpace:        (@gridGutterWidth * 2);
+
+  // Bring grid mixins to recalculate widths
+  .columns(@columnSpan: 1) {
+    width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
+  }
+  .offset(@columnOffset: 1) {
+    margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace;
+  }
+
+  // 16cols at 30px wide with 16px gutters
+  .container {
+    width: @siteWidth;
+  }
+
+  // Default columns
+  .span1     { .columns(1); }
+  .span2     { .columns(2); }
+  .span3     { .columns(3); }
+  .span4     { .columns(4); }
+  .span5     { .columns(5); }
+  .span6     { .columns(6); }
+  .span7     { .columns(7); }
+  .span8     { .columns(8); }
+  .span9     { .columns(9); }
+  .span10    { .columns(10); }
+  .span11    { .columns(11); }
+  .span12    { .columns(12); }
+
+  // Offset column options
+  .offset1   { .offset(1); }
+  .offset2   { .offset(2); }
+  .offset3   { .offset(3); }
+  .offset4   { .offset(4); }
+  .offset5   { .offset(5); }
+  .offset6   { .offset(6); }
+  .offset7   { .offset(7); }
+  .offset8   { .offset(8); }
+  .offset9   { .offset(9); }
+  .offset10  { .offset(10); }
+  .offset11  { .offset(11); }
+  .offset12  { .offset(12); }
+
+}
+
+
+// LARGE DESKTOP
+// -------------
+
+@media (min-width: 1170px) {
+
+  // Reset grid variables
+  @gridColumns:       12;
+  @gridColumnWidth:   70px;
+  @gridGutterWidth:   30px;
+  @siteWidth:         1170px;
+
+  // Bring grid mixins to recalculate widths
+  .columns(@columnSpan: 1) {
+    width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
+  }
+  .offset(@columnOffset: 1) {
+    margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth;
+  }
+
+  .container {
+    width: @siteWidth;
+  }
+  [class*="span"] {
+    margin-left: @gridGutterWidth;
+  }
+
+  // Default columns
+  .span1     { .columns(1); }
+  .span2     { .columns(2); }
+  .span3     { .columns(3); }
+  .span4     { .columns(4); }
+  .span5     { .columns(5); }
+  .span6     { .columns(6); }
+  .span7     { .columns(7); }
+  .span8     { .columns(8); }
+  .span9     { .columns(9); }
+  .span10    { .columns(10); }
+  .span11    { .columns(11); }
+  .span12    { .columns(12); }
+
+  // Offset column options
+  .offset1   { .offset(1); }
+  .offset2   { .offset(2); }
+  .offset3   { .offset(3); }
+  .offset4   { .offset(4); }
+  .offset5   { .offset(5); }
+  .offset6   { .offset(6); }
+  .offset7   { .offset(7); }
+  .offset8   { .offset(8); }
+  .offset9   { .offset(9); }
+  .offset10  { .offset(10); }
+  .offset11  { .offset(11); }
+  .offset12  { .offset(12); }
+
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 6f44a90edbfc897082dd69630983391bf6e57ba7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 16 Oct 2011 11:35:24 -0700
Subject: tweak line-height of h2 and h3 to not be gihugeous, updated
 responsive to improve tablet grid and phone styles

---
 bootstrap.css            | 74 ++++++++++++++++++++++++++++++------------------
 bootstrap.min.css        |  6 ++--
 docs/assets/css/docs.css | 25 ++++++++--------
 docs/index.html          |  2 +-
 lib/responsive.less      | 46 +++++++++++++++++++++++++-----
 lib/type.less            |  4 +--
 6 files changed, 104 insertions(+), 53 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 8b487fb7e..dffa6a824 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Sun Oct 16 03:14:23 PDT 2011
+ * Date: Sun Oct 16 11:34:52 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).
@@ -388,13 +388,13 @@ h1 small {
 }
 h2 {
   font-size: 24px;
-  line-height: 36px;
+  line-height: 27px;
 }
 h2 small {
   font-size: 14px;
 }
 h3 {
-  line-height: 36px;
+  line-height: 27px;
   font-size: 18px;
 }
 h3 small {
@@ -2269,6 +2269,26 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
     float: none;
     display: block;
     width: auto;
+    margin: 0;
+  }
+  .modal {
+    width: auto;
+    margin: 0;
+  }
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-left: 0;
   }
 }
 @media (min-width: 480px) and (max-width: 768px) {
@@ -2288,76 +2308,76 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
     width: 748px;
   }
   .span1 {
-    width: 28px;
+    width: 44px;
   }
   .span2 {
-    width: 76px;
+    width: 108px;
   }
   .span3 {
-    width: 124px;
+    width: 172px;
   }
   .span4 {
-    width: 172px;
+    width: 236px;
   }
   .span5 {
-    width: 220px;
+    width: 300px;
   }
   .span6 {
-    width: 268px;
+    width: 364px;
   }
   .span7 {
-    width: 316px;
+    width: 428px;
   }
   .span8 {
-    width: 364px;
+    width: 492px;
   }
   .span9 {
-    width: 412px;
+    width: 556px;
   }
   .span10 {
-    width: 460px;
+    width: 620px;
   }
   .span11 {
-    width: 508px;
+    width: 684px;
   }
   .span12 {
-    width: 556px;
+    width: 748px;
   }
   .offset1 {
-    margin-left: 68px;
+    margin-left: 64px;
   }
   .offset2 {
-    margin-left: 116px;
+    margin-left: 128px;
   }
   .offset3 {
-    margin-left: 164px;
+    margin-left: 192px;
   }
   .offset4 {
-    margin-left: 212px;
+    margin-left: 256px;
   }
   .offset5 {
-    margin-left: 260px;
+    margin-left: 320px;
   }
   .offset6 {
-    margin-left: 308px;
+    margin-left: 384px;
   }
   .offset7 {
-    margin-left: 356px;
+    margin-left: 448px;
   }
   .offset8 {
-    margin-left: 404px;
+    margin-left: 512px;
   }
   .offset9 {
-    margin-left: 452px;
+    margin-left: 576px;
   }
   .offset10 {
-    margin-left: 500px;
+    margin-left: 640px;
   }
   .offset11 {
-    margin-left: 548px;
+    margin-left: 704px;
   }
   .offset12 {
-    margin-left: 596px;
+    margin-left: 768px;
   }
 }
 @media (min-width: 1170px) {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index cfec72ec1..a6ef9baf5 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -66,8 +66,8 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:
 p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;}
-h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;}
-h3{line-height:36px;font-size:18px;}h3 small{font-size:14px;}
+h2{font-size:24px;line-height:27px;}h2 small{font-size:14px;}
+h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
 h4{font-size:16px;line-height:36px;}h4 small{font-size:12px;}
 h5{font-size:14px;line-height:18px;}
 h6{font-size:13px;line-height:18px;color:#bfbfbf;text-transform:uppercase;}
@@ -322,4 +322,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .media-grid li{display:inline;}
 .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}.media-grid a img{display:block;}
 .media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
-@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"]{margin-left:30px;} .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:100px;} .offset2{margin-left:200px;} .offset3{margin-left:300px;} .offset4{margin-left:400px;} .offset5{margin-left:500px;} .offset6{margin-left:600px;} .offset7{margin-left:700px;} .offset8{margin-left:800px;} .offset9{margin-left:900px;} .offset10{margin-left:1000px;} .offset11{margin-left:1100px;} .offset12{margin-left:1200px;}}
+@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@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:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}@media (min-width: 1170px){.container{width:1170px;} [class*="span"]{margin-left:30px;} .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:100px;} .offset2{margin-left:200px;} .offset3{margin-left:300px;} .offset4{margin-left:400px;} .offset5{margin-left:500px;} .offset6{margin-left:600px;} .offset7{margin-left:700px;} .offset8{margin-left:800px;} .offset9{margin-left:900px;} .offset10{margin-left:1000px;} .offset11{margin-left:1100px;} .offset12{margin-left:1200px;}}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 52714d199..fb7482edc 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -231,7 +231,7 @@ section > .row {
 .mini-layout .mini-layout-body {
   background-color: #dceaf4;
   margin: 0 auto;
-  width: 240px;
+  width: 70%;
   height: 240px;
 }
 .mini-layout.fluid .mini-layout-sidebar,
@@ -241,11 +241,11 @@ section > .row {
 }
 .mini-layout.fluid .mini-layout-sidebar {
   background-color: #bbd8e9;
-  width: 90px;
+  width: 20%;
   height: 240px;
 }
 .mini-layout.fluid .mini-layout-body {
-  width: 300px;
+  width: 60%;
   margin-left: 10px;
 }
 
@@ -328,23 +328,22 @@ pre.prettyprint {
 }
 
 
+.browser-support {
+  max-width: 100%;
+}
+
 /* Responsive Docs
 -------------------------------------------------- */
-
-/* Tablet to Medium Desktop
-------------------------- */
+@media (max-width: 480px) {
+  .large-bird {
+    display: none;
+  }
+}
 
 @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;
-  }
-
 }
 
diff --git a/docs/index.html b/docs/index.html
index 0e49e9cbd..b9004e6bf 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -128,7 +128,7 @@
         
          
           
          Cross-everything
          
           
          Bootstrap is tested and supported in major modern browsers like Chrome, Safari, Internet Explorer, and Firefox.
          
-          Tested and supported in Chrome, Safari, Internet Explorer, and Firefox
+          Tested and supported in Chrome, Safari, Internet Explorer, and Firefox
           
            
             
          • Latest Safari
            • 
             
          • Latest Google Chrome
            • 
diff --git a/lib/responsive.less b/lib/responsive.less
index ee974d3e1..5c8e0539e 100644
--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -3,6 +3,9 @@
  * ------------------------------------------------------------- */
 
 
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
 @media (max-width: 480px) {
   // Remove width from containers
   .container {
@@ -14,10 +17,40 @@
     float: none;
     display: block;
     width: auto;
+    margin: 0;
+  }
+  // Resize modals
+  .modal {
+    width: auto;
+    margin: 0;
   }
+
+  // Remove the horizontal form styles
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  // Move over all input controls and content
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  // Move the options list down to align with labels
+  .form-horizontal .control-list {
+    padding-top: 0; // has to be padding because margin collaspes
+  }
+  // Move over buttons in .form-actions to align with .controls
+  .form-horizontal .form-actions {
+    padding-left: 0;
+  }
+
 }
 
 
+// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
+// --------------------------------------------------
+
 @media (min-width: 480px) and (max-width: 768px) {
   // Remove width from containers
   .container {
@@ -34,24 +67,23 @@
 }
 
 
-// TABLET TO MEDIUM DESKTOP
-// ------------------------
+// PORTRAIT TABLET TO DEFAULT DESKTOP
+// ----------------------------------
 
 @media (min-width: 768px) and (max-width: 940px) {
 
   // Reset grid variables
   @gridColumns:       16;
-  @gridColumnWidth:   28px;
+  @gridColumnWidth:   44px;
   @gridGutterWidth:   20px;
   @siteWidth:         748px;
-  @extraSpace:        (@gridGutterWidth * 2);
 
   // Bring grid mixins to recalculate widths
   .columns(@columnSpan: 1) {
     width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
   }
   .offset(@columnOffset: 1) {
-    margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace;
+    margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth;
   }
 
   // 16cols at 30px wide with 16px gutters
@@ -90,8 +122,8 @@
 }
 
 
-// LARGE DESKTOP
-// -------------
+// LARGE DESKTOP & UP
+// ------------------
 
 @media (min-width: 1170px) {
 
diff --git a/lib/type.less b/lib/type.less
index 4232a24df..7cf9e6ccd 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -38,13 +38,13 @@ h1 {
 }
 h2 {
   font-size: 24px;
-  line-height: @baseLineHeight * 2;
+  line-height: @baseLineHeight * 1.5;
   small {
     font-size: 14px;
   }
 }
 h3 {
-  line-height: @baseLineHeight * 2;
+  line-height: @baseLineHeight * 1.5;
   font-size: 18px;
   small {
     font-size: 14px;
-- 
cgit v1.2.3


From 756e7c8739266ec8594d545e7eec2a50ea06ce08 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 16 Oct 2011 12:11:48 -0700
Subject: more tweaks to responsive

---
 bootstrap.css       | 127 +++++++++++++++++++++-------------------------------
 bootstrap.min.css   |   2 +-
 lib/responsive.less |   5 ++-
 3 files changed, 56 insertions(+), 78 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index dffa6a824..3c344e98b 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Sun Oct 16 11:34:52 PDT 2011
+ * Date: Sun Oct 16 12:11:34 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).
@@ -2380,83 +2380,60 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
     margin-left: 768px;
   }
 }
+/*
+// LARGE DESKTOP & UP
+// ------------------
+
 @media (min-width: 1170px) {
-  .container {
-    width: 1170px;
-  }
-  [class*="span"] {
-    margin-left: 30px;
-  }
-  .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: 100px;
-  }
-  .offset2 {
-    margin-left: 200px;
-  }
-  .offset3 {
-    margin-left: 300px;
-  }
-  .offset4 {
-    margin-left: 400px;
-  }
-  .offset5 {
-    margin-left: 500px;
-  }
-  .offset6 {
-    margin-left: 600px;
-  }
-  .offset7 {
-    margin-left: 700px;
-  }
-  .offset8 {
-    margin-left: 800px;
-  }
-  .offset9 {
-    margin-left: 900px;
+
+  // Reset grid variables
+  @gridColumns:       12;
+  @gridColumnWidth:   70px;
+  @gridGutterWidth:   30px;
+  @siteWidth:         1170px;
+
+  // Bring grid mixins to recalculate widths
+  .columns(@columnSpan: 1) {
+    width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
   }
-  .offset10 {
-    margin-left: 1000px;
+  .offset(@columnOffset: 1) {
+    margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth;
   }
-  .offset11 {
-    margin-left: 1100px;
+
+  .container {
+    width: @siteWidth;
   }
-  .offset12 {
-    margin-left: 1200px;
+  [class*="span"] {
+    margin-left: @gridGutterWidth;
   }
+
+  // Default columns
+  .span1     { .columns(1); }
+  .span2     { .columns(2); }
+  .span3     { .columns(3); }
+  .span4     { .columns(4); }
+  .span5     { .columns(5); }
+  .span6     { .columns(6); }
+  .span7     { .columns(7); }
+  .span8     { .columns(8); }
+  .span9     { .columns(9); }
+  .span10    { .columns(10); }
+  .span11    { .columns(11); }
+  .span12    { .columns(12); }
+
+  // Offset column options
+  .offset1   { .offset(1); }
+  .offset2   { .offset(2); }
+  .offset3   { .offset(3); }
+  .offset4   { .offset(4); }
+  .offset5   { .offset(5); }
+  .offset6   { .offset(6); }
+  .offset7   { .offset(7); }
+  .offset8   { .offset(8); }
+  .offset9   { .offset(9); }
+  .offset10  { .offset(10); }
+  .offset11  { .offset(11); }
+  .offset12  { .offset(12); }
+
 }
+*/
\ No newline at end of file
diff --git a/bootstrap.min.css b/bootstrap.min.css
index a6ef9baf5..e4dccdef9 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -322,4 +322,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .media-grid li{display:inline;}
 .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}.media-grid a img{display:block;}
 .media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
-@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@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:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}@media (min-width: 1170px){.container{width:1170px;} [class*="span"]{margin-left:30px;} .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:100px;} .offset2{margin-left:200px;} .offset3{margin-left:300px;} .offset4{margin-left:400px;} .offset5{margin-left:500px;} .offset6{margin-left:600px;} .offset7{margin-left:700px;} .offset8{margin-left:800px;} .offset9{margin-left:900px;} .offset10{margin-left:1000px;} .offset11{margin-left:1100px;} .offset12{margin-left:1200px;}}
+@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@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:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/lib/responsive.less b/lib/responsive.less
index 5c8e0539e..afd30f279 100644
--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -121,7 +121,7 @@
 
 }
 
-
+/*
 // LARGE DESKTOP & UP
 // ------------------
 
@@ -176,4 +176,5 @@
   .offset11  { .offset(11); }
   .offset12  { .offset(12); }
 
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
-- 
cgit v1.2.3


From 2a82b38cff142ec86a6e1dc4f9366205260d262d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 16 Oct 2011 18:01:05 -0700
Subject: tweak the h2s again for better spacing, adjust docs, remove white bg
 if possible on file input, few other tweaks

---
 bootstrap.css            | 11 +++---
 bootstrap.min.css        |  9 ++---
 docs/assets/css/docs.css | 99 +++++++++++++++++++++++++++++-------------------
 docs/index.html          | 57 +++++++++++++++++++++-------
 lib/forms.less           |  8 +---
 lib/type.less            |  4 +-
 6 files changed, 117 insertions(+), 71 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 3c344e98b..3af3c1be7 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Sun Oct 16 12:11:34 PDT 2011
+ * Date: Sun Oct 16 18:00:58 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).
@@ -388,7 +388,7 @@ h1 small {
 }
 h2 {
   font-size: 24px;
-  line-height: 27px;
+  line-height: 36px;
 }
 h2 small {
   font-size: 14px;
@@ -434,7 +434,7 @@ ol {
 }
 li {
   line-height: 18px;
-  color: #808080;
+  color: #404040;
 }
 ul.unstyled {
   list-style: none;
@@ -553,9 +553,6 @@ label {
   margin-bottom: 5px;
   color: #404040;
 }
-input[type=checkbox], input[type=radio] {
-  cursor: pointer;
-}
 input,
 textarea,
 select,
@@ -583,9 +580,11 @@ input[type=checkbox], input[type=radio] {
 
   line-height: normal;
   border: none;
+  cursor: pointer;
 }
 input[type=file] {
   background-color: #ffffff;
+  background-color: initial;
   padding: initial;
   border: initial;
   line-height: initial;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index e4dccdef9..39bb7b819 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -66,7 +66,7 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:
 p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;}
-h2{font-size:24px;line-height:27px;}h2 small{font-size:14px;}
+h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;}
 h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
 h4{font-size:16px;line-height:36px;}h4 small{font-size:12px;}
 h5{font-size:14px;line-height:18px;}
@@ -75,7 +75,7 @@ ul,ol{margin:0 0 18px 25px;}
 ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
 ul{list-style:disc;}
 ol{list-style:decimal;}
-li{line-height:18px;color:#808080;}
+li{line-height:18px;color:#404040;}
 ul.unstyled{list-style:none;margin-left:0;}
 dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;}
 dl dt{font-weight:bold;}
@@ -94,10 +94,9 @@ form{margin-bottom:18px;}
 legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#404040;border-bottom:1px solid #eee;}
 label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#404040;}
-input[type=checkbox],input[type=radio]{cursor:pointer;}
 input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;}
-input[type=file]{background-color:#ffffff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
+input[type=file]{background-color:#ffffff;background-color:initial;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
 select,input[type=file]{height:27px;line-height:27px;*margin-top:4px;}
 select[multiple]{background-color:#ffffff;height:inherit;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index fb7482edc..01b6f3cd7 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -9,7 +9,7 @@
 -------------------------------------------------- */
 body {
   position: relative;
-  padding-top: 40px;
+  padding-top: 100px;
   background-color: #fff;
 }
 section {
@@ -19,65 +19,88 @@ section > .row {
   margin-bottom: 10px;
 }
 
+/* Tweak topbar brand link to be super sleek
+-------------------------------------------------- */
+.navbar .brand {
+  float: right;
+  font-weight: bold;
+  color: #000;
+  text-shadow: 0 1px 0 rgba(255,255,255,.1);
+}
+.navbar .brand:hover {
+  text-decoration: none;
+}
 
 /* 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 {
-  margin-bottom: 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 {
-  background: transparent url(../img/grid-18px.png) top center;
-  padding: 36px 60px;
-  -webkit-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1);
-     -moz-box-shadow: inset 0 -15px 30px rgba(0,0,0,.1);
-          box-shadow: inset 0 -15px 30px rgba(0,0,0,.1);
+  position: relative;
+  padding-bottom: 58px;
+  margin-bottom: 50px;
+  border-bottom: 2px solid #eee;
 }
 .jumbotron h1,
 .jumbotron p {
-  margin-bottom: 9px;
-  color: #fff;
-  text-shadow: 0 1px 1px rgba(0,0,0,.3);
+  margin-bottom: 10px;
+  text-shadow: 0 1px 0 #fff;
 }
 .jumbotron h1 {
-  font-size: 54px;
+  font-size: 90px;
   line-height: 1;
-  text-shadow: 0 1px 2px rgba(0,0,0,.5);
+  margin-right: 40%;
+  letter-spacing: -1px;
 }
 .jumbotron p {
   font-weight: 300;
-  margin-right: 25%;
+  margin-right: 32%;
 }
 .jumbotron .lead {
-  font-size: 20px;
-  line-height: 27px;
+  margin-bottom: 20px;
+  font-size: 25px;
+  line-height: 35px;
 }
 .jumbotron p a {
-  color: #fff;
   font-weight: bold;
 }
+.jumbotron .btn {
+  font-size: 20px;
+  padding: 12px 24px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+.benefits {
+  width: 250px;
+  position: absolute;
+  right: 0;
+  bottom: 60px;
+}
+.benefits ul {
+  list-style: none;
+  margin: 0;
+}
+.benefits li {
+  font-size: 16px;
+  font-weight: 300;
+  line-height: 40px;
+  color: #555;
+}
+.benefits li + li {
+  border-top: 1px solid #f5f5f5;
+}
+.benefits h4 {
+  color: #555;
+}
+.benefits span {
+  position: relative;
+  top: -2px;
+  padding-right: 5px;
+  color: #999;
+}
+
 
 /* Specific jumbotrons
 ------------------------- */
-/* main docs page */
-.masthead {
-  background-color: #004d9f;
-  background-repeat: no-repeat;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f));
-  background-image: -webkit-linear-gradient(#048ccd, #004d9f);
-  background-image: -moz-linear-gradient(#048ccd, #004d9f);
-  background-image: -o-linear-gradient(top, #048ccd, #004d9f);
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#048ccd), to(#004d9f));
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#048ccd', endColorstr='#004d9f', GradientType=0); /* IE8 and down */
-}
 /* supporting docs pages */
 .subhead {
   background-color: #767d80;
diff --git a/docs/index.html b/docs/index.html
index b9004e6bf..f7818d7f5 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,16 +16,6 @@
     
     
 
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
     
     
     
@@ -49,6 +39,7 @@
               
             
             
          • 
@@ -62,14 +53,17 @@
             
          • 
               Patterns
               
             
            • 
             
          • Javascript
            • 
-            
          • Less
            • 
+            
          • Using Less
            •
          @@ -82,10 +76,21 @@ ================================================== -->
          +
          +

          Feature highlights

          +
            +
          • × Built on LESS
            • +
          • × Complete styleguide
            • +
          • × Fully responsive design
            • +
          • × Small footprint (7kb gzipped)
            • +
          • × Support for IE7 and up
            • +
          • × Custom jQuery plugins
            • +
          • × Dozens of components
            • +
          +

          Bootstrap, from Twitter

          - Download on GitHub

          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.

          -

          Nerd alert: Bootstrap is built with Less and was designed with modern browsers in mind.

          + Download on GitHub
          @@ -164,6 +169,19 @@ + +
          @@ -1964,5 +1982,16 @@ Lorem ipsum dolar sit amet illo error ipsum verita
          + + + + + + + + + + + diff --git a/lib/forms.less b/lib/forms.less index 4b2bb8016..6edf29e53 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -37,12 +37,6 @@ label { color: @grayDark; } -// Checkboxs and radio buttons -input[type=checkbox], -input[type=radio] { - cursor: pointer; -} - // Inputs, Textareas, Selects input, textarea, @@ -69,11 +63,13 @@ input[type=radio] { *margin-top: 0; /* IE6-7 */ line-height: normal; border: none; + cursor: pointer; } // Reset the file input to browser defaults input[type=file] { background-color: @white; + background-color: initial; padding: initial; border: initial; line-height: initial; diff --git a/lib/type.less b/lib/type.less index 7cf9e6ccd..c746a58af 100644 --- a/lib/type.less +++ b/lib/type.less @@ -38,7 +38,7 @@ h1 { } h2 { font-size: 24px; - line-height: @baseLineHeight * 1.5; + line-height: @baseLineHeight * 2; small { font-size: 14px; } @@ -90,7 +90,7 @@ ol { } li { line-height: @baseLineHeight; - color: @gray; + color: @grayDark; } ul.unstyled { list-style: none; -- cgit v1.2.3 From 1888511d676ced8f30743cc5b540f02257314bde Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 18:45:11 -0700 Subject: updated docs to include quick links and twitter buttons, added updated blueprint pattern to background --- docs/assets/css/docs.css | 51 +++++++++++++++++++++++++-------- docs/assets/img/grid-18px-masked.png | Bin 0 -> 1621 bytes docs/index.html | 53 ++++++++++++++++++++--------------- 3 files changed, 71 insertions(+), 33 deletions(-) create mode 100644 docs/assets/img/grid-18px-masked.png diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 01b6f3cd7..ee0b9c8a3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -9,8 +9,10 @@ -------------------------------------------------- */ body { position: relative; - padding-top: 100px; + padding-top: 90px; background-color: #fff; + background-image: url(../img/grid-18px-masked.png); + background-repeat: repeat-x; } section { padding-top: 60px; @@ -35,9 +37,6 @@ section > .row { -------------------------------------------------- */ .jumbotron { position: relative; - padding-bottom: 58px; - margin-bottom: 50px; - border-bottom: 2px solid #eee; } .jumbotron h1, .jumbotron p { @@ -57,23 +56,22 @@ section > .row { .jumbotron .lead { margin-bottom: 20px; font-size: 25px; - line-height: 35px; -} -.jumbotron p a { - font-weight: bold; + line-height: 36px; } .jumbotron .btn { font-size: 20px; - padding: 12px 24px; + padding: 14px 24px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; } + +/* Benefits list in masthead */ .benefits { width: 250px; position: absolute; right: 0; - bottom: 60px; + bottom: 0; } .benefits ul { list-style: none; @@ -82,7 +80,7 @@ section > .row { .benefits li { font-size: 16px; font-weight: 300; - line-height: 40px; + line-height: 35px; color: #555; } .benefits li + li { @@ -127,6 +125,37 @@ section > .row { } +/* Quick links +-------------------------------------------------- */ +.quick-links { + padding: 5px 20px; + margin: 60px 0; + list-style: none; + text-align: center; + background-color: #eee; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.quick-links li { + display: inline; + margin: 0 5px; + line-height: 30px; +} +.quick-links .divider { + color: #999; +} +.quick-links strong { + font-weight: normal; + color: #999; +} +.quick-links .tweet-btn, +.quick-links .follow-btn { + position: relative; + top: 5px; +} + + /* Footer -------------------------------------------------- */ .footer { diff --git a/docs/assets/img/grid-18px-masked.png b/docs/assets/img/grid-18px-masked.png new file mode 100644 index 000000000..e531d5bc4 Binary files /dev/null and b/docs/assets/img/grid-18px-masked.png differ diff --git a/docs/index.html b/docs/index.html index f7818d7f5..5002d9d46 100644 --- a/docs/index.html +++ b/docs/index.html @@ -90,10 +90,33 @@

          Bootstrap, from Twitter

          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.

          - Download on GitHub +

          + Download on GitHub + Currently v2.0.0 +

          + + + @@ -1971,18 +1981,17 @@ Lorem ipsum dolar sit amet illo error ipsum verita - + - -- cgit v1.2.3 From c62a0239bd30a12e9f0d8c1e45f5818460e9df90 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 19:12:33 -0700 Subject: update to responsive to fix new masthead --- bootstrap.css | 129 ++++++++++++++++++++++++++++------------------- bootstrap.min.css | 2 +- docs/assets/css/docs.css | 109 ++++++++++++--------------------------- docs/index.html | 14 ++--- lib/responsive.less | 4 +- 5 files changed, 117 insertions(+), 141 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 3af3c1be7..32ffc6120 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sun Oct 16 18:00:58 PDT 2011 + * Date: Sun Oct 16 19:08:43 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). @@ -2379,60 +2379,83 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 768px; } } -/* -// LARGE DESKTOP & UP -// ------------------ - -@media (min-width: 1170px) { - - // Reset grid variables - @gridColumns: 12; - @gridColumnWidth: 70px; - @gridGutterWidth: 30px; - @siteWidth: 1170px; - - // Bring grid mixins to recalculate widths - .columns(@columnSpan: 1) { - width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); - } - .offset(@columnOffset: 1) { - margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth; - } - +@media (min-width: 1210px) { .container { - width: @siteWidth; + width: 1170px; } [class*="span"] { - margin-left: @gridGutterWidth; + margin-left: 30px; + } + .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: 100px; + } + .offset2 { + margin-left: 200px; + } + .offset3 { + margin-left: 300px; + } + .offset4 { + margin-left: 400px; + } + .offset5 { + margin-left: 500px; + } + .offset6 { + margin-left: 600px; + } + .offset7 { + margin-left: 700px; + } + .offset8 { + margin-left: 800px; + } + .offset9 { + margin-left: 900px; + } + .offset10 { + margin-left: 1000px; + } + .offset11 { + margin-left: 1100px; + } + .offset12 { + margin-left: 1200px; } - - // Default columns - .span1 { .columns(1); } - .span2 { .columns(2); } - .span3 { .columns(3); } - .span4 { .columns(4); } - .span5 { .columns(5); } - .span6 { .columns(6); } - .span7 { .columns(7); } - .span8 { .columns(8); } - .span9 { .columns(9); } - .span10 { .columns(10); } - .span11 { .columns(11); } - .span12 { .columns(12); } - - // Offset column options - .offset1 { .offset(1); } - .offset2 { .offset(2); } - .offset3 { .offset(3); } - .offset4 { .offset(4); } - .offset5 { .offset(5); } - .offset6 { .offset(6); } - .offset7 { .offset(7); } - .offset8 { .offset(8); } - .offset9 { .offset(9); } - .offset10 { .offset(10); } - .offset11 { .offset(11); } - .offset12 { .offset(12); } - } -*/ \ No newline at end of file diff --git a/bootstrap.min.css b/bootstrap.min.css index 39bb7b819..6851a6cc2 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -321,4 +321,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .media-grid li{display:inline;} .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}.media-grid a img{display:block;} .media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} -@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@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:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} +@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@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:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}@media (min-width: 1210px){.container{width:1170px;} [class*="span"]{margin-left:30px;} .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:100px;} .offset2{margin-left:200px;} .offset3{margin-left:300px;} .offset4{margin-left:400px;} .offset5{margin-left:500px;} .offset6{margin-left:600px;} .offset7{margin-left:700px;} .offset8{margin-left:800px;} .offset9{margin-left:900px;} .offset10{margin-left:1000px;} .offset11{margin-left:1100px;} .offset12{margin-left:1200px;}} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ee0b9c8a3..7d36946db 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -37,34 +37,34 @@ section > .row { -------------------------------------------------- */ .jumbotron { position: relative; -} -.jumbotron h1, -.jumbotron p { - margin-bottom: 10px; text-shadow: 0 1px 0 #fff; } .jumbotron h1 { - font-size: 90px; - line-height: 1; margin-right: 40%; + margin-bottom: 10px; + font-size: 90px; letter-spacing: -1px; + line-height: 1; } .jumbotron p { - font-weight: 300; margin-right: 32%; -} -.jumbotron .lead { margin-bottom: 20px; font-size: 25px; + font-weight: 300; line-height: 36px; } .jumbotron .btn { font-size: 20px; padding: 14px 24px; + margin-right: 5px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; } +.jumbotron .download-info { + font-size: 16px; + color: #999; +} /* Benefits list in masthead */ .benefits { @@ -133,9 +133,9 @@ section > .row { list-style: none; text-align: center; background-color: #eee; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .quick-links li { display: inline; @@ -167,71 +167,6 @@ section > .row { } -/* Quickstart section for getting le code --------------------------------------------------- */ -.quickstart { - background-color: #f5f5f5; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5)); - background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5)); - background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5); - background-image: -o-linear-gradient(#f9f9f9, #f5f5f5); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0); - background-image: linear-gradient(#f9f9f9, #f5f5f5); - border-top: 1px solid #fff; - border-bottom: 1px solid #eee; -} -.quickstart .container { - margin-bottom: 0; -} -.quickstart .row { - margin: 0 -20px; - -webkit-box-shadow: 1px 0 0 #f9f9f9; - -moz-box-shadow: 1px 0 0 #f9f9f9; - box-shadow: 1px 0 0 #f9f9f9; -} -.quickstart [class*="span"] { - width: 285px; - height: 117px; - margin-left: 0; - padding: 17px 20px 26px; - border-left: 1px solid #eee; - -webkit-box-shadow: inset 1px 0 0 #f9f9f9; - -moz-box-shadow: inset 1px 0 0 #f9f9f9; - box-shadow: inset 1px 0 0 #f9f9f9; -} -.quickstart [class*="span"]:last-child { - border-right: 1px solid #eee; - width: 286px; -} -.quickstart h6, -.quickstart p { - line-height: 18px; - text-align: center; - margin-bottom: 9px; - color: #333; -} -.quickstart .current-version, -.quickstart .current-version a { - color: #999; -} -.quickstart h6 { - color: #999; -} -.quickstart textarea { - display: block; - width: 275px; - height: auto; - margin: 0 0 9px; - line-height: 21px; - white-space: nowrap; - overflow: hidden; -} - - /* Special grid styles -------------------------------------------------- */ .show-grid { @@ -387,9 +322,29 @@ pre.prettyprint { /* Responsive Docs -------------------------------------------------- */ @media (max-width: 480px) { + + body > .navbar-fixed .nav { + display: none; + } + .large-bird { display: none; } + + .jumbotron h1 { + font-size: 36px; + margin-right: 0; + } + .jumbotron p { + margin-right: 0; + font-size: 18px; + line-height: 24px; + } + .jumbotron .benefits { + position: relative; + width: auto; + margin: 36px 0; + } } @media (min-width: 768px) and (max-width: 900px) { diff --git a/docs/index.html b/docs/index.html index 5002d9d46..3bc72751e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -76,7 +76,13 @@ ================================================== -->
          -
          +

          Bootstrap,
          from Twitter

          +

          Bootstrap is a responsive 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.

          +

          + Download on GitHub + Currently v2.0.0 +

          +

          Feature highlights

          • × Built on LESS
            • @@ -88,12 +94,6 @@
          • × Dozens of components
          -

          Bootstrap, from Twitter

          -

          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.

          -

          - Download on GitHub - Currently v2.0.0 -

          diff --git a/lib/responsive.less b/lib/responsive.less index afd30f279..900df4c75 100644 --- a/lib/responsive.less +++ b/lib/responsive.less @@ -121,11 +121,10 @@ } -/* // LARGE DESKTOP & UP // ------------------ -@media (min-width: 1170px) { +@media (min-width: 1210px) { // Reset grid variables @gridColumns: 12; @@ -177,4 +176,3 @@ .offset12 { .offset(12); } } -*/ \ No newline at end of file -- cgit v1.2.3 From e7d2218b2043742f21c368d074d97a4bde275730 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 23:04:31 -0700 Subject: few tweaks to responsive stuff, updated docs for grid system (still needs copy editing) --- bootstrap.css | 159 +++++++++++++++++++-------------------------- bootstrap.min.css | 29 ++++----- docs/assets/css/docs.css | 14 ++-- docs/index.html | 165 ++++++++++++++++++++++------------------------- lib/mixins.less | 9 +-- lib/patterns.less | 6 +- lib/responsive.less | 2 + lib/scaffolding.less | 5 +- 8 files changed, 177 insertions(+), 212 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 32ffc6120..89d55199e 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sun Oct 16 19:08:43 PDT 2011 + * Date: Sun Oct 16 23:04:03 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). @@ -260,6 +260,7 @@ a:hover { display: block; } .row { + margin-left: -20px; zoom: 1; } .row:before, .row:after { @@ -276,9 +277,6 @@ a:hover { float: left; margin-left: 20px; } -.row > [class*="span"]:first-child { - margin-left: 0; -} .span1 { width: 60px; } @@ -316,37 +314,37 @@ a:hover { width: 940px; } .offset1 { - margin-left: 80px; + margin-left: 100px; } .offset2 { - margin-left: 160px; + margin-left: 180px; } .offset3 { - margin-left: 240px; + margin-left: 260px; } .offset4 { - margin-left: 320px; + margin-left: 340px; } .offset5 { - margin-left: 400px; + margin-left: 420px; } .offset6 { - margin-left: 480px; + margin-left: 500px; } .offset7 { - margin-left: 560px; + margin-left: 580px; } .offset8 { - margin-left: 640px; + margin-left: 660px; } .offset9 { - margin-left: 720px; + margin-left: 740px; } .offset10 { - margin-left: 800px; + margin-left: 820px; } .offset11 { - margin-left: 880px; + margin-left: 900px; } /* Typography.less * Headings, body text, lists, code, and more for a versatile and durable typography system @@ -1550,14 +1548,14 @@ footer { border-top: 1px solid #eee; } .page-header { - margin-bottom: 17px; - border-bottom: 1px solid #ddd; + margin-bottom: 27px; + border-bottom: 1px solid #eee; -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } .page-header h1 { - margin-bottom: 8px; + margin-bottom: 13.5px; } .btn.danger, .alert-message.danger, @@ -2379,83 +2377,60 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 768px; } } +/* +// LARGE DESKTOP & UP +// ------------------ + @media (min-width: 1210px) { - .container { - width: 1170px; - } - [class*="span"] { - margin-left: 30px; - } - .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: 100px; - } - .offset2 { - margin-left: 200px; - } - .offset3 { - margin-left: 300px; - } - .offset4 { - margin-left: 400px; - } - .offset5 { - margin-left: 500px; - } - .offset6 { - margin-left: 600px; - } - .offset7 { - margin-left: 700px; - } - .offset8 { - margin-left: 800px; - } - .offset9 { - margin-left: 900px; + + // Reset grid variables + @gridColumns: 12; + @gridColumnWidth: 70px; + @gridGutterWidth: 30px; + @siteWidth: 1170px; + + // Bring grid mixins to recalculate widths + .columns(@columnSpan: 1) { + width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); } - .offset10 { - margin-left: 1000px; + .offset(@columnOffset: 1) { + margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth; } - .offset11 { - margin-left: 1100px; + + .container { + width: @siteWidth; } - .offset12 { - margin-left: 1200px; + [class*="span"] { + margin-left: @gridGutterWidth; } + + // Default columns + .span1 { .columns(1); } + .span2 { .columns(2); } + .span3 { .columns(3); } + .span4 { .columns(4); } + .span5 { .columns(5); } + .span6 { .columns(6); } + .span7 { .columns(7); } + .span8 { .columns(8); } + .span9 { .columns(9); } + .span10 { .columns(10); } + .span11 { .columns(11); } + .span12 { .columns(12); } + + // Offset column options + .offset1 { .offset(1); } + .offset2 { .offset(2); } + .offset3 { .offset(3); } + .offset4 { .offset(4); } + .offset5 { .offset(5); } + .offset6 { .offset(6); } + .offset7 { .offset(7); } + .offset8 { .offset(8); } + .offset9 { .offset(9); } + .offset10 { .offset(10); } + .offset11 { .offset(11); } + .offset12 { .offset(12); } + } +*/ \ No newline at end of file diff --git a/bootstrap.min.css b/bootstrap.min.css index 6851a6cc2..31d1699be 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -36,10 +36,9 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a: .pull-left{float:left;} .hide{display:none;} .show{display:block;} -.row{zoom:1;}.row:before,.row:after{display:table;content:"";zoom:1;*display:inline;} +.row{margin-left:-20px;zoom:1;}.row:before,.row:after{display:table;content:"";zoom:1;*display:inline;} .row:after{clear:both;} [class*="span"]{display:inline;float:left;margin-left:20px;} -.row>[class*="span"]:first-child{margin-left:0;} .span1{width:60px;} .span2{width:140px;} .span3{width:220px;} @@ -52,17 +51,17 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a: .span10{width:780px;} .span11{width:860px;} .span12{width:940px;} -.offset1{margin-left:80px;} -.offset2{margin-left:160px;} -.offset3{margin-left:240px;} -.offset4{margin-left:320px;} -.offset5{margin-left:400px;} -.offset6{margin-left:480px;} -.offset7{margin-left:560px;} -.offset8{margin-left:640px;} -.offset9{margin-left:720px;} -.offset10{margin-left:800px;} -.offset11{margin-left:880px;} +.offset1{margin-left:100px;} +.offset2{margin-left:180px;} +.offset3{margin-left:260px;} +.offset4{margin-left:340px;} +.offset5{margin-left:420px;} +.offset6{margin-left:500px;} +.offset7{margin-left:580px;} +.offset8{margin-left:660px;} +.offset9{margin-left:740px;} +.offset10{margin-left:820px;} +.offset11{margin-left:900px;} p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;} @@ -242,7 +241,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} -.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} +.page-header{margin-bottom:27px;border-bottom:1px solid #eee;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:13.5px;} .btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;} .btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;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);background-repeat:repeat-x;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-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);background-repeat:repeat-x;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);} @@ -321,4 +320,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .media-grid li{display:inline;} .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}.media-grid a img{display:block;} .media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} -@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@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:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}@media (min-width: 1210px){.container{width:1170px;} [class*="span"]{margin-left:30px;} .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:100px;} .offset2{margin-left:200px;} .offset3{margin-left:300px;} .offset4{margin-left:400px;} .offset5{margin-left:500px;} .offset6{margin-left:600px;} .offset7{margin-left:700px;} .offset8{margin-left:800px;} .offset9{margin-left:900px;} .offset10{margin-left:1000px;} .offset11{margin-left:1100px;} .offset12{margin-left:1200px;}} +@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@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:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7d36946db..300eb38f5 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -17,19 +17,16 @@ body { section { padding-top: 60px; } -section > .row { - margin-bottom: 10px; -} /* Tweak topbar brand link to be super sleek -------------------------------------------------- */ -.navbar .brand { +body > .navbar-fixed .brand { float: right; font-weight: bold; color: #000; text-shadow: 0 1px 0 rgba(255,255,255,.1); } -.navbar .brand:hover { +body > .navbar-fixed .brand:hover { text-decoration: none; } @@ -136,6 +133,9 @@ section > .row { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); + -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); + box-shadow: inset 0 1px 0 rgba(0,0,0,.03); } .quick-links li { display: inline; @@ -171,10 +171,10 @@ section > .row { -------------------------------------------------- */ .show-grid { margin-top: 10px; - margin-bottom: 10px; + margin-bottom: 20px; } .show-grid [class*="span"] { - background: #eee; + background-color: #eee; text-align: center; -webkit-border-radius: 3px; -moz-border-radius: 3px; diff --git a/docs/index.html b/docs/index.html index 3bc72751e..eeb0f4f0d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -86,7 +86,7 @@

          Feature highlights

          • × Built on LESS
            • -
          • × Complete styleguide
            • +
          • × Complete styleguide docs
          • × Fully responsive design
          • × Small footprint (7kb gzipped)
          • × Support for IE7 and up
            • @@ -199,28 +199,10 @@ ================================================== -->
            -

            Grid system Rock the standard 940px or roll your own

            +

            Grid system 12 columns with a responsive twist

            -
            -
            -

            Default grid

            -

            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.

            -
            -
            -

            Example grid markup

            -

            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.

            -
            -<div class="row">
-  <div class="span6">
-    ...
-  </div>
-  <div class="span10">
-    ...
-  </div>
-</div>
-
            -
            -
            + +

            Default 940px grid

            1
            1
            @@ -252,12 +234,28 @@
            12
            -
            +
            +
            +

            The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.

            +

            It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.

            +
            +
            +
            +<div class="row">
+  <div class="span4">...</div>
+  <div class="span8">...</div>
+</div>
+
            +
            +
            +

            As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.

            +
            +

            Offsetting columns

            4
            -
            8 offset 4
            +
            4 offset 4
            3 offset 3
            @@ -269,37 +267,33 @@
            +

            Nesting columns

            -
            -

            Nesting columns

            -

            Nest your content if you must by creating a .row within an existing column.

            -
            -
            -

            Example of nested columns

            +
            +

            With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.

            +

            Example

            -
            +
            Level 1 of column
            -
            +
            Level 2
            -
            +
            Level 2
            +
            + 
             <div class="row">
   <div class="span12">
     Level 1 of column
     <div class="row">
-      <div class="span6">
-        Level 2
-      </div>
-      <div class="span6">
-        Level 2
-      </div>
+      <div class="span6">Level 2</div>
+      <div class="span6">Level 2</div>
     </div>
   </div>
 </div>
@@ -307,56 +301,53 @@
            -
            - +

            Grid customization

            +
          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          VariableDefault valueDescription
          @gridColumns16The number of columns within the grid
          @gridColumnWidth40pxThe width of each column within the grid
          @gridGutterWidth20pxThe negative space between each column
          @siteWidthComputed sum of all columns and guttersWe use some basic match to count the number of columns and gutters and set the width of the .fixed-container() mixin.
          -
          -

          Roll your own grid

          -

          Built into Bootstrap are a handful of variables for customizing the default 940px grid system. With a bit of customization, you can modify the size of columns, their gutters, and the container they reside in.

          +
          +

          Variables in LESS

          +

          Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in mixins.less.

          -
          -

          Inside the grid

          -

          The variables needed to modify the grid system currently all reside in preboot.less.

          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          VariableDefault valueDescription
          @gridColumns16The number of columns within the grid
          @gridColumnWidth40pxThe width of each column within the grid
          @gridGutterWidth20pxThe negative space between each column
          @siteWidthComputed sum of all columns and guttersWe use some basic match to count the number of columns and gutters and set the width of the .fixed-container() mixin.
          -

          Now to customize

          -

          Modifying the grid means changing the three @grid-* variables and recompiling the Less files.

          -

          Bootstrap comes equipped to handle a grid system with up to 24 columns; the default is just 16. Here's how your grid variables would look customized to a 24-column grid.

          - 
          @gridColumns:       24;
-@gridColumnWidth:   20px;
-@gridGutterWidth:   20px;
          -

          Once recompiled, you'll be set!

          +
          +

          How to customize

          +

          Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.

          -
          +
          +

          Staying responsive

          +

          Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.

          +
          +
          + @@ -1928,7 +1919,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita } -

          Compiling Less

          +

          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

          diff --git a/lib/mixins.less b/lib/mixins.less index 47857f1fa..5b05654d5 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -78,12 +78,13 @@ margin-right: auto; .clearfix(); } -.columns(@columnSpan: 1) { - width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); +.columns(@columns: 1) { + width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); } -.offset(@columnOffset: 1) { - margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth; +.offset(@columns: 1) { + margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); } + // Necessary grid styles for every column to make them appear next to each other horizontally .gridColumn() { display: inline; diff --git a/lib/patterns.less b/lib/patterns.less index 950ac2feb..f1badc46d 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -520,11 +520,11 @@ footer { // ------------ .page-header { - margin-bottom: @baseLineHeight - 1; - border-bottom: 1px solid #ddd; + margin-bottom: @baseLineHeight * 1.5; + border-bottom: 1px solid #eee; .box-shadow(0 1px 0 rgba(255,255,255,.5)); h1 { - margin-bottom: (@baseLineHeight / 2) - 1px; + margin-bottom: @baseLineHeight * .75; } } diff --git a/lib/responsive.less b/lib/responsive.less index 900df4c75..a1a33164f 100644 --- a/lib/responsive.less +++ b/lib/responsive.less @@ -121,6 +121,7 @@ } +/* // LARGE DESKTOP & UP // ------------------ @@ -176,3 +177,4 @@ .offset12 { .offset(12); } } +*/ \ No newline at end of file diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 01fcd9e77..f15f6853c 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -85,6 +85,7 @@ a { // ----------- // To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there .row { + margin-left: -@gridGutterWidth; .clearfix(); } @@ -93,10 +94,6 @@ a { [class*="span"] { .gridColumn(); } -// Kill the margin on the first column -.row > [class*="span"]:first-child { - margin-left: 0; -} // Default columns .span1 { .columns(1); } -- cgit v1.2.3 From 6d2e39950d98dafbb82e94f00b3c99b82d0ba1c1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 00:03:52 -0700 Subject: updated js docs page to new 12 column layout, fix subhead jumbotron styles to match new front page --- bootstrap.css | 2 +- docs/assets/css/docs.css | 18 ++--------- docs/index.html | 4 +-- docs/javascript.html | 80 ++++++++++++++++++++++-------------------------- 4 files changed, 42 insertions(+), 62 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 89d55199e..ac242d3b8 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sun Oct 16 23:04:03 PDT 2011 + * Date: Mon Oct 17 00:03:30 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). diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 300eb38f5..2af7764e6 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -98,28 +98,16 @@ body > .navbar-fixed .brand:hover { ------------------------- */ /* 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 */ -} -.subhead .inner { - padding: 36px 0 27px; + padding-bottom: 18px; + border-bottom: 3px solid #eee; } .subhead h1, .subhead p { - text-align: left; + margin-right: 0; } .subhead h1 { font-size: 40px; } -.subhead p a { - font-weight: normal; -} /* Quick links diff --git a/docs/index.html b/docs/index.html index eeb0f4f0d..f3ef34463 100644 --- a/docs/index.html +++ b/docs/index.html @@ -30,7 +30,7 @@
          - Bootstrap + Bootstrap - +
          • diff --git a/docs/javascript.html b/docs/javascript.html index b130511c3..da623c2f8 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -11,18 +11,6 @@ - - - - - - - - - - - - @@ -42,7 +30,7 @@
            - Bootstrap JS + Bootstrap
            +
            -
            -
            -

            Javascript for Bootstrap

            -

            - Bring Bootstrap's components to life with new, custom plugins that work with jQuery and Ender. -

            -

            ← Back to Bootstrap home

            -
            -
            +

            Javascript for Bootstrap

            +

            Bring Bootstrap's components to life with custom plugins for jQuery and Ender.

            -
            @@ -81,11 +62,11 @@

            Modals bootstrap-modal.js

            -
            +

            Our Modal plugin is a super slim take on the traditional modal js plugin, taking special care to include only the bare functionality that we require here at twitter.

            Download
            -
            +

            Using bootstrap-modal

            $('#my-modal').modal(options)

            Options

            @@ -207,11 +188,11 @@ $('#my-modal').bind('hidden', function () {

            Dropdown bootstrap-dropdown.js

            -
            +

            This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations.

            Download
            -
            +

            Using boostrap-dropdown.js

            $('#topbar').dropdown()

            Markup

            @@ -244,7 +225,7 @@ $('#my-modal').bind('hidden', function () {
          • Link
          - +
          • @@ -281,11 +262,11 @@ $('#my-modal').bind('hidden', function () {

            ScrollSpy bootstrap-scrollspy.js

          -
          +

          This plugin is for adding the scrollspy (auto updating nav) interaction to the bootstrap topbar.

          Download
          -
          +

          Using boostrap-scrollspy.js

          $('#topbar').dropdown()

          Markup

          @@ -316,11 +297,11 @@ $('#my-modal').bind('hidden', function () {

          Tabs bootstrap-tabs.js

          -
          +

          This plugin adds quick, dynamic tab and pill functionality.

          Download
          -
          +

          Using boostrap-tabs.js

          $('.tabs').tabs()

          Markup

          @@ -387,11 +368,11 @@ $('#my-modal').bind('hidden', function () {

          Twipsy bootstrap-twipsy.js

          -
          +

          Based on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for title storage!

          Download
          -
          +

          Using bootstrap-twipsy.js

          $('#example').twipsy(options)

          Options

          @@ -504,11 +485,11 @@ $('#my-modal').bind('hidden', function () {

          Popovers bootstrap-popover.js

          -
          +

          The popover plugin provides a simple interface for adding popovers to your application. It extends the boostrap-twipsy.js plugin, so be sure to grab that file as well when including popovers in your project!

          Download
          -
          +

          Using boostrap-popover.js

          $('#example').popover(options)

          Options

          @@ -625,11 +606,11 @@ $('#my-modal').bind('hidden', function () {

          Alerts bootstrap-alerts.js

          -
          +

          The alert plugin is a super tiny class for adding close functionality to alerts.

          Download
          -
          +

          Using bootstrap-alerts.js

          $(".alert-message").alert()

          Markup

          @@ -657,17 +638,28 @@ $('#my-modal').bind('hidden', function () { -
          - - + + +
          + + + + + + + + + + + + + -- cgit v1.2.3 From f48baceeda7dc18e1fdf78f89c55b3de40a3357e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 12:45:09 -0700 Subject: remove bottom margin from h1 --- bootstrap.css | 3 +-- bootstrap.min.css | 2 +- lib/type.less | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index ac242d3b8..3731eaf0b 100644 --- a/bootstrap.css +++ b/bootstrap.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: Mon Oct 17 00:03:30 PDT 2011 + * Date: Mon Oct 17 12:44:52 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). @@ -377,7 +377,6 @@ h6 small { color: #bfbfbf; } h1 { - margin-bottom: 18px; font-size: 30px; line-height: 36px; } diff --git a/bootstrap.min.css b/bootstrap.min.css index 31d1699be..4fca75703 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -64,7 +64,7 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a: .offset11{margin-left:900px;} p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;} +h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;} h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;} h4{font-size:16px;line-height:36px;}h4 small{font-size:12px;} diff --git a/lib/type.less b/lib/type.less index c746a58af..28d893fb9 100644 --- a/lib/type.less +++ b/lib/type.less @@ -29,7 +29,6 @@ h1, h2, h3, h4, h5, h6 { } } h1 { - margin-bottom: @baseLineHeight; font-size: 30px; line-height: @baseLineHeight * 2; small { -- cgit v1.2.3 From d035fa731ab6b846c98b2f2b6f5e82c1b11c6791 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 12:59:03 -0700 Subject: update all code elements in docs --- docs/index.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/index.html b/docs/index.html index f3ef34463..ab33ea23c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -411,7 +411,7 @@

          Headings & copy

          A standard typographic hierarchy for structuring your webpages.

          -

          The entire typographic grid is based on two Less variables in our preboot.less file: @basefont and @baseline. The first is the base font-size used throughout and the second is the base line-height.

          +

          The entire typographic grid is based on two Less variables in our preboot.less file: @baseFontSize and @baseLineHeight. The first is the base font-size used throughout and the second is the base line-height.

          We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.

          @@ -467,7 +467,7 @@
          -

          Note: Each line in an <address> must end with a line-break (<br />) or be wrapped in a block-level tag (e.g., <p>) to properly structure the content.

          +

          Note: Each line in an <address> must end with a line-break (<br>) or be wrapped in a block-level tag (e.g., <p>) to properly structure the content.

          Abbreviations

          For abbreviations and acronyms, use the <abbr> tag (<acronym> is deprecated in HTML5). Put the shorthand form within the tag and set a title for the complete name.

          @@ -522,7 +522,7 @@
          -

          Unstyled <ul.unstyled>

          +

          Unstyled <.unstyled>

          • Lorem ipsum dolor sit amet
          • Consectetur adipiscing elit
            • @@ -555,7 +555,7 @@
          -

          Description dl

          +

          Description <dl>

          Description lists
          A description list is perfect for defining terms.
          @@ -592,7 +592,7 @@
          - + @@ -1263,10 +1263,10 @@

          Dropdowns included

          -

          As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns li tags also support .active for showing current page selection.

          +

          As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns <li> tags also support .active for showing current page selection.

          -

          Note: When using the topbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your body.

          +

          Note: When using the topbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your <body>.


          -- cgit v1.2.3 From 27cbe7f63a13fad987dc2547ef5b6f526ceb268c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 14:17:29 -0700 Subject: add abbr styles, overhaul type docs section to remove lots of verbose text and put emphasis on tables and more scannable content --- bootstrap.css | 11 +- bootstrap.min.css | 5 +- docs/assets/css/docs.css | 5 + docs/index.html | 349 +++++++++++++++++++++++++---------------------- lib/type.less | 11 +- 5 files changed, 210 insertions(+), 171 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 3731eaf0b..f3ff894d1 100644 --- a/bootstrap.css +++ b/bootstrap.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: Mon Oct 17 12:44:52 PDT 2011 + * Date: Mon Oct 17 14:16:58 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). @@ -367,6 +367,7 @@ h5, h6 { font-weight: bold; color: #404040; + text-rendering: optimizelegibility; } h1 small, h2 small, @@ -388,7 +389,7 @@ h2 { line-height: 36px; } h2 small { - font-size: 14px; + font-size: 18px; } h3 { line-height: 27px; @@ -466,6 +467,12 @@ em { .muted { color: #bfbfbf; } +abbr { + font-size: 90%; + text-transform: uppercase; + border-bottom: 1px dotted #ddd; + cursor: help; +} blockquote { margin-bottom: 18px; border-left: 5px solid #eee; diff --git a/bootstrap.min.css b/bootstrap.min.css index 4fca75703..86b68e44a 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -63,9 +63,9 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a: .offset10{margin-left:820px;} .offset11{margin-left:900px;} p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} -h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;} +h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;} h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;} h4{font-size:16px;line-height:36px;}h4 small{font-size:12px;} h5{font-size:14px;line-height:18px;} @@ -83,6 +83,7 @@ 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;} +abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;} blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;} blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} address{display:block;line-height:18px;margin-bottom:18px;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2af7764e6..bbf71ab77 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -307,6 +307,11 @@ pre.prettyprint { max-width: 100%; } +/* Make tables spaced out a bit more */ +h2 + table { + margin-top: 10px; +} + /* Responsive Docs -------------------------------------------------- */ @media (max-width: 480px) { diff --git a/docs/index.html b/docs/index.html index ab33ea23c..2e0036bb0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -406,90 +406,130 @@

          Typography Headings, paragraphs, lists, and other inline type elements

          +

          Headings & body copy

          +
          -

          Headings & copy

          -

          A standard typographic hierarchy for structuring your webpages.

          +

          Typographic scale

          The entire typographic grid is based on two Less variables in our preboot.less file: @baseFontSize and @baseLineHeight. The first is the base font-size used throughout and the second is the base line-height.

          We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.

          -

          h1. Heading 1

          -

          h2. Heading 2

          -

          h3. Heading 3

          -

          h4. Heading 4

          -
          h5. Heading 5
          -
          h6. Heading 6
          +

          Example body text

          +

          Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.

          +

          Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.

          -

          Example paragraph

          -

          Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.

          -

          Example heading Has sub-heading…

          +
          +

          h1. Heading 1

          +

          h2. Heading 2

          +

          h3. Heading 3

          +

          h4. Heading 4

          +
          h5. Heading 5
          +
          h6. Heading 6
          +
          +

          Emphasis, address, and abbreviation

          +
          <code>In a line of text like this, your wrapped code will look like this >html< element.In a line of text like this, your wrapped code will look like this <html> element.
          <pre>
          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          ElementDescriptionUsage
          + <strong> + + For emphasizing a snippet of text with important + + None +
          + <em> + + For emphasizing a snippet of text with stress + + None +
          + <abbr> + + Wraps abbreviations and acronyms to show the expanded version on hover + + Include optional title for expanded text +
          + <address> + + For contact information for its nearest ancestor or the entire body of work + + Preserve formatting by ending all lines with <br> +
          +
          -
          -

          Misc. elements

          -

          Using emphasis, addresses, & abbreviations

          -

          - <strong> - <em> - <address> - <abbr> -

          -
          -
          -

          When to use

          -

          Emphasis tags (<strong> and <em>) should be used to indicate additional importance or emphasis of a word or phrase relative to its surrounding copy. Use <strong> for importance and <em> for stress emphasis.

          -

          Emphasis in a paragraph

          +
          +

          Using emphasis

          Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.

          -

          Note: It's still okay to use <b> and <i> tags in HTML5 and they don't have to be styled bold and italic, respectively (although if there is a more semantic element, use it). <b> is meant to highlight words or phrases without conveying additional importance, while <i> is mostly for voice, technical terms, etc.

          -

          Addresses

          -

          The <address> element is used for contact information for its nearest ancestor, or the entire body of work. Here are two examples of how it could be used:

          - -
          -
          -
          - Twitter, Inc.
          - 795 Folsom Ave, Suite 600
          - San Francisco, CA 94107
          - P: (123) 456-7890 -
          -
          -
          -
          - Full Name
          - first.last@gmail.com -
          -
          -
          - -

          Note: Each line in an <address> must end with a line-break (<br>) or be wrapped in a block-level tag (e.g., <p>) to properly structure the content.

          -

          Abbreviations

          -

          For abbreviations and acronyms, use the <abbr> tag (<acronym> is deprecated in HTML5). Put the shorthand form within the tag and set a title for the complete name.

          +

          Note: Feel free to use <b> and <i> in HTML5, but their usage has changed a bit. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.

          -
          +
          +

          Example addresses

          +

          Here are two examples of how the <address> tag can be used:

          +
          + Twitter, Inc.
          + 795 Folsom Ave, Suite 600
          + San Francisco, CA 94107
          + P: (123) 456-7890 +
          +
          + Full Name
          + first.last@gmail.com +
          +
          +
          +

          Example abbreviations

          +

          Abbreviations are styled with uppercase text and a light dotted bottom border. They also have a help cursor on hover so users have extra indication something will be shown on hover.

          +

          HTML is the best thing since sliced bread.

          +

          An abbreviation of the word attribute is attr.

          +
          +
          + +

          Blockquotes

          -
          -

          Blockquotes

          -

          - <blockquote> - <p> - <small> -

          -
          -
          -

          How to quote

          +

          To include a blockquote, wrap <blockquote> around <p> and <small> tags. Use the <small> element to cite your source and you'll get an em dash &mdash; before it.

          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.

          Dr. Julius Hibbert
          +
          + 
           <blockquote>
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p>
@@ -497,8 +537,9 @@
 </blockquote>
          -
          +
          +

          Lists

          @@ -522,7 +563,7 @@
        -

        Unstyled <.unstyled>

        +

        Unstyled <ul.unstyled>

        • Lorem ipsum dolor sit amet
        • Consectetur adipiscing elit
          • @@ -570,120 +611,96 @@ -
          -
          -

          Code

          -

          - <code> - <pre> -

          -

          Pimp your code in style with two simple tags. For even more awesomeness through javascript, drop in Google's code prettify library and you're set.

          -
          -
          -

          Presenting code

          -

          Code, blocks of or just snippets inline, can be displayed with style just by wrapping in the right tag. For blocks of code spanning multiple lines, use the <pre> element. For inline code, use the <code> element.

          - - - - - - - - - - - - - - - + + +
          ElementResult
          <code>In a line of text like this, your wrapped code will look like this <html> element.
          <pre> + +

          Code Inline and block

          + + + + + + + + + + + + + + + - - - - + + + + - - -
          ElementResult
          <code>In a line of text like this, your wrapped code will look like this <html> element.
          <pre> 
          <div>
   <h1>Heading</h1>
   <p>Something right here...</p>
 </div>
          -

          Note: Be sure to keep code within pre tags as close to the left as possible; it will render all tabs.

          -
          <pre class="prettyprint"> -

          Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting.

          +

          Note: Be sure to keep code within pre tags as close to the left as possible; it will render all tabs.

          +
          <pre class="prettyprint"> +

          Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting.

          <div>
   <h1>Heading</h1>
   <p>Something right here...</p>
 </div>
          -

          Download google-code-prettify and view the readme for how to use.

          -
          - - +

          Download google-code-prettify and view the readme for how to use.

          +
          -
          -
          -

          Inline labels

          -

          - <span class="label"> -

          -

          Call attention to or flag any phrase in your body text.

          -
          -
          -

          Label anything

          -

          Ever needed one of those fancy New! or Important flags when writing code? Well, now you have them. Here's what's included by default:

          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          LabelResult
          - <span class="label">Default</span> - - Default -
          - <span class="label success">New</span> - - New -
          - <span class="label warning">Warning</span> - - Warning -
          - <span class="label important">Important</span> - - Important -
          - <span class="label notice">Notice</span> - - Notice -
          -
          -
          +

          Inline labels for special attention

          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          LabelsMarkup
          + Default + + <span class="label">Default</span> +
          + New + + <span class="label success">New</span> +
          + Warning + + <span class="label warning">Warning</span> +
          + Important + + <span class="label important">Important</span> +
          + Notice + + <span class="label notice">Notice</span> +
          diff --git a/lib/type.less b/lib/type.less index 28d893fb9..4978dd786 100644 --- a/lib/type.less +++ b/lib/type.less @@ -24,6 +24,7 @@ p { h1, h2, h3, h4, h5, h6 { font-weight: bold; color: @grayDark; + text-rendering: optimizelegibility; small { color: @grayLight; } @@ -39,7 +40,7 @@ h2 { font-size: 24px; line-height: @baseLineHeight * 2; small { - font-size: 14px; + font-size: 18px; } } h3 { @@ -134,6 +135,14 @@ em { color: @grayLight; } +// Abbreviations and acronyms +abbr { + font-size: 90%; + text-transform: uppercase; + border-bottom: 1px dotted #ddd; + cursor: help; +} + // Blockquotes blockquote { margin-bottom: @baseLineHeight; -- cgit v1.2.3 From b91d210a3cdb29d022f20646ed61e663ceea18dd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 14:43:43 -0700 Subject: overhauled tables section of docs to minize copy and emphasize code --- docs/index.html | 279 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 178 insertions(+), 101 deletions(-) diff --git a/docs/index.html b/docs/index.html index 2e0036bb0..68cdd4a2c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -638,10 +638,14 @@ <pre class="prettyprint"> -

          Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting.

          +

          Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.

          <div>
   <h1>Heading</h1>
   <p>Something right here...</p>
+</div>
          +
          <div>
+  <h1>Heading</h1>
+  <p>Something right here...</p>
 </div>

          Download google-code-prettify and view the readme for how to use.

          @@ -712,130 +716,204 @@

          Tables For, you guessed it, tabular data

          - + +

          Table markup

          -
          -

          Building tables

          -

          - <table> - <thead> - <tbody> - <tr> - <th> - <td> - <colspan> - <caption> -

          -

          Tables are great—for a lot of things. Great tables, however, need a bit of markup love to be useful, scalable, and readable (at the code level). Here are a few tips to help.

          -

          Always wrap your column headers in a <thead> such that hierarchy is <thead> > <tr> > <th>.

          -

          Similar to the column headers, all your table’s body content should be wrapped in a <tbody> so your hierarchy is <tbody> > <tr> > <td>.

          -
          -
          -

          Example: Default table styles

          -

          All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.

          - +
          +
          - - - - + + - - - - + + - - - - + + - - - - + + - -
          #First NameLast NameLanguageTagDescription
          1SomeOneEnglish + <table> + + Wrapping element for displaying data in a tabular format +
          2JoeSixpackEnglish + <thead> + + Container element for table header rows (<tr>) to label table columns +
          3StuDentCode + <tbody> + + Container element for table rows (<tr>) in the body of the table +
          -
          -<table>
-  ...
-</table>
          -

          Example: Zebra-striped

          -

          Get a little fancy with your tables by adding zebra-striping—just add the .zebra-striped class.

          - - - - - - + + - - - - - - + + - - - - + + - - - - + +
          #First NameLast NameLanguage + <tr> + + Container element for a set of table cells (<td> or <th>) that appears on a single row +
          1SomeOneEnglish + <td> + + Default table cell +
          2JoeSixpackEnglish + <th> + + Special table cell for column (or row, depending on scope and placement) labels
          + Must be used within a <thead> +
          3StuDentCode + <caption> + + Description or summary of what the table holds, especially useful for screen readers +
          -

          Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

          +
          +
          +
          +<table>
+  <thead>
+    <tr>
+      <th>...</th>
+      <th>...</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>...</td>
+      <td>...</td>
+    </tr>
+  </tbody>
+</table>
+
          +
          +
          + +

          Example tables

          +

          1. Default table styles

          +

          All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.

          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          #First NameLast NameLanguage
          1SomeOneEnglish
          2JoeSixpackEnglish
          3StuDentCode
          +
          +<table>
+  ...
+</table>
          +

          2. Zebra-striped

          +

          Get a little fancy with your tables by adding zebra-striping—just add the .zebra-striped class.

          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          #First NameLast NameLanguage
          1SomeOneEnglish
          2JoeSixpackEnglish
          3StuDentCode
          +

          Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

           <table class="zebra-striped">
 ...
 </table>
          -

          Example: Zebra-striped w/ TableSorter.js

          -

          Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          #First NameLast NameLanguage
          1YourOneEnglish
          2JoeSixpackEnglish
          3StuDentCode
          +

          3. Zebra-striped w/ TableSorter.js

          +

          Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          #First NameLast NameLanguage
          1YourOneEnglish
          2JoeSixpackEnglish
          3StuDentCode
           <script src="js/jquery/jquery.tablesorter.min.js"></script>
 <script >
@@ -846,8 +924,7 @@
 <table class="zebra-striped">
   ...
 </table>
          -
          -
          + -- cgit v1.2.3 From ae5c5e10635049c65d73454ca9486539bdf324d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 20:44:52 -0700 Subject: update docs to change topbar to navbar --- docs/index.html | 18 +++++++++--------- docs/javascript.html | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/index.html b/docs/index.html index 68cdd4a2c..7fe5ce1ca 100644 --- a/docs/index.html +++ b/docs/index.html @@ -25,7 +25,7 @@ -
          @@ -1308,7 +1308,7 @@

          Navigation

          -

          Fixed topbar

          +

          Fixed navbar

          @@ -1343,24 +1343,24 @@
        -
        -
        +
        +

        What is it

        -

        Our topbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.

        +

        Our navbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.

        Customizable

        -

        All elements within, and the entire topbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav—or any combination of that.

        +

        All elements within, and the entire navbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav—or any combination of that.

        Dropdowns included

        As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns <li> tags also support .active for showing current page selection.

        -

        Note: When using the topbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your <body>.

        +

        Note: When using the navbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your <body>.


        @@ -1875,11 +1875,11 @@ 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. + This plugin is for adding dropdown interaction to the bootstrap navbar or tabbed navigations. bootstrap-scrollspy.js - The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap topbar. + The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap navbar. bootstrap-tabs.js diff --git a/docs/javascript.html b/docs/javascript.html index da623c2f8..68a3d0cd4 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -25,7 +25,7 @@ -
        @@ -189,12 +189,12 @@ $('#my-modal').bind('hidden', function () {
        -

        This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations.

        +

        This plugin is for adding dropdown interaction to the Bootstrap navbar or tabbed navigations.

        Download

        Using boostrap-dropdown.js

        - 
        $('#topbar').dropdown()
        + 
        $('#navbar').dropdown()

        Markup

        To quickly add dropdown functionality to any nav element, use the data-dropdown attribute. Any valid bootstrap dropdown will automatically be activated.

        @@ -213,10 +213,10 @@ $('#my-modal').bind('hidden', function () {
           
        Methods
        
           
        $().dropdown()
        
           
        
-          A programatic api for activating menus for a given topbar or tabbed navigation.
+          A programatic api for activating menus for a given navbar or tabbed navigation.
           
        
           
        Demo
        
-          
      diff --git a/lib/type.less b/lib/type.less
index d092b203d..7f8044cd8 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -149,12 +149,12 @@ blockquote {
   border-left: 5px solid #eee;
   padding-left: 15px;
   p {
-    #font > .shorthand(300,14px,@baseLineHeight);
+    #font > .shorthand(300,16px,@baseLineHeight * 1.25);
     margin-bottom: 0;
   }
   small {
     display: block;
-    #font > .shorthand(300,12px,@baseLineHeight);
+    line-height: @baseLineHeight;
     color: @grayLight;
     &:before {
       content: '\2014 \00A0';
-- 
cgit v1.2.3


From 648c4689273647c321dd6e3979d910282e9a9339 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 26 Oct 2011 23:11:56 -0700
Subject: breaking down the main page into subpages for easier, more
 comprehensive documentation

---
 docs/assets/css/docs.css |   11 +-
 docs/base-css.html       |  885 +++++++++++++++++++
 docs/components.html     |  705 +++++++++++++++
 docs/index.html          | 2181 +++-------------------------------------------
 docs/javascript.html     |  120 ++-
 docs/less.html           |  242 +++++
 docs/scaffolding.html    |  383 ++++++++
 lib/mixins.less          |    7 +
 8 files changed, 2426 insertions(+), 2108 deletions(-)
 create mode 100644 docs/base-css.html
 create mode 100644 docs/components.html
 create mode 100644 docs/less.html
 create mode 100644 docs/scaffolding.html

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 59c64e4a7..8ed81e713 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -14,9 +14,6 @@ body {
   background-image: url(../img/grid-18px-masked.png);
   background-repeat: repeat-x;
 }
-section {
-  padding-top: 60px;
-}
 
 /* Tweak topbar brand link to be super sleek
 -------------------------------------------------- */
@@ -40,7 +37,7 @@ body > .navbar-fixed .brand:hover {
 }
 .jumbotron h1 {
   margin-right: 40%;
-  margin-bottom: 10px;
+  margin-bottom: 9px;
   font-size: 90px;
   letter-spacing: -1px;
   line-height: 1;
@@ -100,15 +97,15 @@ body > .navbar-fixed .brand:hover {
 ------------------------- */
 /* supporting docs pages */
 .subhead {
-  padding-bottom: 18px;
-  border-bottom: 3px solid #eee;
+  padding-bottom: 14px;
+  border-bottom: 3px solid #e5e5e5;
 }
 .subhead h1,
 .subhead p {
   margin-right: 0;
 }
 .subhead h1 {
-  font-size: 40px;
+  font-size: 45px;
 }
 
 
diff --git a/docs/base-css.html b/docs/base-css.html
new file mode 100644
index 000000000..e3b3782c0
--- /dev/null
+++ b/docs/base-css.html
@@ -0,0 +1,885 @@
+
+
+  
+    
+    Bootstrap, from Twitter
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+  
+
+  
+
+    
+    
      
+      
      
+        
      
+          Bootstrap
+          
+        
      
+      
      
+    
      
+
+    
      
+
+      
+      
      
+        
      Base CSS
      
+        
      The core typography, form, and table styles of Bootstrap
      
+      
      
+
+
+
+
      
+  
      
+    
      Typography Headings, paragraphs, lists, and other inline type elements
      
+  
      
+
+  
      Headings & body copy
      
+
+  
+  
      
+    
      
+      
      Typographic scale
      
+      
      The entire typographic grid is based on two Less variables in our preboot.less file: @baseFontSize and @baseLineHeight. The first is the base font-size used throughout and the second is the base line-height.
      
+      
      We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.
      
+    
      
+    
      
+      
      Example body text
      
+      
      Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.
      
+      
      Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.
      
+    
      
+    
      
+      
      
+        
      h1. Heading 1
      
+        
      h2. Heading 2
      
+        
      h3. Heading 3
      
+        
      h4. Heading 4
      
+        
      h5. Heading 5
      
+        
      h6. Heading 6
      
+      
      
+    
      
+  
      
+
+  
+  
      Emphasis, address, and abbreviation
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      ElementDescriptionUsage
      
+          <strong>
+        
+          For emphasizing a snippet of text with important
+        
+          None
+        
      
+          <em>
+        
+          For emphasizing a snippet of text with stress
+        
+          None
+        
      
+          <abbr>
+        
+          Wraps abbreviations and acronyms to show the expanded version on hover
+        
+          Include optional title for expanded text
+        
      
+          <address>
+        
+          For contact information for its nearest ancestor or the entire body of work
+        
+          Preserve formatting by ending all lines with <br>
+        
      
+
+  
      
+    
      
+      
      Using emphasis
      
+      
      Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.
      
+      
      Note: Feel free to use <b> and <i> in HTML5, but their usage has changed a bit. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.
      
+    
      
+    
      
+      
      Example addresses
      
+      
      Here are two examples of how the <address> tag can be used:
      
+      
      
+        Twitter, Inc.
      
+        795 Folsom Ave, Suite 600
      
+        San Francisco, CA 94107
      
+        P: (123) 456-7890
+      
      
+      
      
+        Full Name
      
+        first.last@gmail.com
+      
      
+    
      
+    
      
+      
      Example abbreviations
      
+      
      Abbreviations are styled with uppercase text and a light dotted bottom border. They also have a help cursor on hover so users have extra indication something will be shown on hover.
      
+      
      HTML is the best thing since sliced bread.
      
+      
      An abbreviation of the word attribute is attr.
      
+    
      
+  
      
+
+
+  
+  
      Blockquotes
      
+  
      
+    
      
+      
      To include a blockquote, wrap <blockquote> around <p> and <small> tags. Use the <small> element to cite your source and you'll get an em dash &mdash; before it.
      
+      
      
+        
      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.
      
+        Someone famous
+      
      
+    
      
+    
      
+
      +<blockquote>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p>
+  <small>Dr. Julius Hibbert</small>
+</blockquote>
+
      
+    
      
+  
      
+
+  
+  
      Lists
      
+  
      
+    
      
+      
      Unordered <ul>
      
+      
        
+        
      • Lorem ipsum dolor sit amet
        • 
+        
      • Consectetur adipiscing elit
        • 
+        
      • Integer molestie lorem at massa
        • 
+        
      • Facilisis in pretium nisl aliquet
        • 
+        
      • Nulla volutpat aliquam velit
+          
          
+            
        • Phasellus iaculis neque
          • 
+            
        • Purus sodales ultricies
          • 
+            
        • Vestibulum laoreet porttitor sem
          • 
+            
        • Ac tristique libero volutpat at
          • 
+          
        
+        
        • 
+        
      • Faucibus porta lacus fringilla vel
        • 
+        
      • Aenean sit amet erat nunc
        • 
+        
      • Eget porttitor lorem
        • 
+      
      
+    
      
+    
      
+      
      Unstyled <ul.unstyled>
      
+      
        
+        
      • Lorem ipsum dolor sit amet
        • 
+        
      • Consectetur adipiscing elit
        • 
+        
      • Integer molestie lorem at massa
        • 
+        
      • Facilisis in pretium nisl aliquet
        • 
+        
      • Nulla volutpat aliquam velit
+          
          
+            
        • Phasellus iaculis neque
          • 
+            
        • Purus sodales ultricies
          • 
+            
        • Vestibulum laoreet porttitor sem
          • 
+            
        • Ac tristique libero volutpat at
          • 
+          
        
+        
        • 
+        
      • Faucibus porta lacus fringilla vel
        • 
+        
      • Aenean sit amet erat nunc
        • 
+        
      • Eget porttitor lorem
        • 
+      
      
+    
      
+    
      
+      
      Ordered <ol>
      
+      
        
+        
      1. Lorem ipsum dolor sit amet
        2. 
+        
      2. Consectetur adipiscing elit
        3. 
+        
      3. Integer molestie lorem at massa
        4. 
+        
      4. Facilisis in pretium nisl aliquet
        5. 
+        
      5. Nulla volutpat aliquam velit
        6. 
+        
      6. Faucibus porta lacus fringilla vel
        7. 
+        
      7. Aenean sit amet erat nunc
        8. 
+        
      8. Eget porttitor lorem
        9. 
+      
      
+    
      
+    
      
+      
      Description <dl>
      
+      
      
+        
      Description lists
      
+        
      A description list is perfect for defining terms.
      
+        
      Euismod
      
+        
      Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
      
+        
      Donec id elit non mi porta gravida at eget metus.
      
+        
      Malesuada porta
      
+        
      Etiam porta sem malesuada magna mollis euismod.
      
+      
      
+    
      
+  
      
+
+
+  
+
+  
      Code Inline and block
      
+  
+    
+      
+        
+        
+      
+    
+    
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+    
+  
      ElementResult
      <code>In a line of text like this, your wrapped code will look like this <html> element.
      <pre>
+
      <div>
+  <h1>Heading</h1>
+  <p>Something right here...</p>
+</div>
      
+          
      Note: Be sure to keep code within pre tags as close to the left as possible; it will render all tabs.
      
+        
      <pre class="prettyprint">
+          
      Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
+
      <div>
+  <h1>Heading</h1>
+  <p>Something right here...</p>
+</div>
      
+
      <div>
+  <h1>Heading</h1>
+  <p>Something right here...</p>
+</div>
      
+          
      Download google-code-prettify and view the readme for how to use.
      
+        
      
+
+  
+  
      Inline labels for special attention
      
+  
+    
+      
+        
+        
+      
+    
+    
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+    
+  
      LabelsMarkup
      
+          Default
+        
+          <span class="label">Default</span>
+        
      
+          New
+        
+          <span class="label success">New</span>
+        
      
+          Warning
+        
+          <span class="label warning">Warning</span>
+        
      
+          Important
+        
+          <span class="label important">Important</span>
+        
      
+          Notice
+        
+          <span class="label notice">Notice</span>
+        
      
+
+
      
+
+
+
+
+
      
+  
      
+    
      Tables For, you guessed it, tabular data
      
+  
      
+
+  
      Table markup
      
+  
      
+    
      
+      
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      TagDescription
      
+              <table>
+            
+              Wrapping element for displaying data in a tabular format
+            
      
+              <thead>
+            
+              Container element for table header rows (<tr>) to label table columns
+            
      
+              <tbody>
+            
+              Container element for table rows (<tr>) in the body of the table
+            
      
+              <tr>
+            
+              Container element for a set of table cells (<td> or <th>) that appears on a single row
+            
      
+              <td>
+            
+              Default table cell
+            
      
+              <th>
+            
+              Special table cell for column (or row, depending on scope and placement) labels
      
+              Must be used within a <thead>
+            
      
+              <caption>
+            
+              Description or summary of what the table holds, especially useful for screen readers
+            
      
+    
      
+    
      
+
      +<table>
+  <thead>
+    <tr>
+      <th>...</th>
+      <th>...</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>...</td>
+      <td>...</td>
+    </tr>
+  </tbody>
+</table>
+
      
+    
      
+  
      
+
+  
      Example tables
      
+  
      1. Default table styles
      
+  
      All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.
      
+  
+    
+      
+        
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+        
+      
+      
+        
+        
+        
+        
+      
+      
+        
+        
+        
+        
+      
+    
+  
      #First NameLast NameLanguage
      1SomeOneEnglish
      2JoeSixpackEnglish
      3StuDentCode
      
+
      +<table>
+  ...
+</table>
      
+  
      2. Zebra-striped
      
+  
      Get a little fancy with your tables by adding zebra-striping—just add the .zebra-striped class.
      
+  
+    
+      
+        
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+        
+      
+      
+        
+        
+        
+        
+      
+      
+        
+        
+        
+        
+      
+    
+  
      #First NameLast NameLanguage
      1SomeOneEnglish
      2JoeSixpackEnglish
      3StuDentCode
      
+  
      Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.
      
+
      +<table class="zebra-striped">
+...
+</table>
      
+  
      3. Zebra-striped w/ TableSorter.js
      
+  
      Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.
      
+  
+    
+      
+        
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+        
+      
+      
+        
+        
+        
+        
+      
+      
+        
+        
+        
+        
+      
+    
+  
      #First NameLast NameLanguage
      1YourOneEnglish
      2JoeSixpackEnglish
      3StuDentCode
      
+
      +<script src="js/jquery/jquery.tablesorter.min.js"></script>
+<script >
+  $(function() {
+    $("table#sortTableExample").tablesorter({ sortList: [[1,0]] });
+  });
+</script>
+<table class="zebra-striped">
+  ...
+</table>
      
+
+
      
+
+
+
+
+
      
+  
      
+    
      Forms
      
+  
      
+  
      
+    
      
+      
      Four types of forms
      
+      
      With 2.0, we now have four types of forms to choose from:
      
+      
        
+        
      • Search form for a super-rounded input and optional button
        • 
+        
      • Inline form for a series of elements on one line
        • 
+        
      • Horizontal form for left-aligned labels
        • 
+        
      • Vertical form for stacked labels and inputs
        • 
+      
      
+    
      
+    
      
+      
      
+    
      
+  
      
+  
      
+    
      
+      
      Search form
      
+    
      
+    
      
+      
      
+        
      
+          
+          
+        
      
+      
      
+    
      
+  
      
+  
      
+    
      
+      
      Inline form
      
+    
      
+    
      
+      
      
+        
      
+          
      Some directional text
      
+          
      And maybe some kind of optional supporting text right here.
      
+          
+          
+          
+          
+        
      
+      
      
+    
      
+  
      
+  
      
+    
      
+      
      Horizontal form
      
+    
      
+    
      
+      
      
+        Example form
+        
      
+          
+          
      
+            
+            
      Help text here. Be sure to fill this out like so, or else!
      
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        Example form
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
      
+              
+              
+              
+              
+            
      
+            
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
+          
      
+        
      
+        
      
+          
+          
      
+            
      
+              
+              
+            
      
+            
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
+          
      
+        
      
+        
      
+          
+          
+        
      
+      
      
+    
      
+  
      
+  
      
+    
      
+      
      Vertical form
      
+    
      
+    
      
+      
      
+        Example form
+        
      
+          
+          
      
+            
+            
      Be sure to fill this out like so, or else!
      
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
      
+              
+              
+              
+            
      
+          
      
+        
      
+        
      
+          
+          
+        
      
+      
      
+    
      
+  
      
+
+  
      
+    
      
+      
      Buttons
      
+      
      As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.
      
+      
      All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class.
      
+    
      
+    
      
+      
      Example buttons
      
+      
      Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:
      
+      
      
+            
+      
      
+      
      Alternate sizes
      
+      
      Fancy larger or smaller buttons? Have at it!
      
+      
      
+        Primary action
+        Action
+      
      
+      
      
+        Primary action
+        Action
+      
      
+      
      Disabled state
      
+      
      For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.
      
+      
      Links
      
+      
      
+        Primary action
+        Action
+      
      
+      
      Buttons
      
+      
      
+         
+      
      
+    
      
+  
      
+
+  
      
+    
      
+      
      Button groups
      
+    
      
+    
      
+      
      Example
      
+      
      
+        
      
+          Left
+          Middle
+          Right
+        
      
+      
      
+      
      
+        
      
+          
      
+            1
+            2
+            3
+            4
+            5
+          
      
+          
      
+            6
+            7
+            8
+          
      
+          
      
+            9
+          
      
+          
      
+            10
+          
      
+        
      
+      
      
+    
      
+  
      
+
+
      
+
+
+      
+      
+    
      
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
diff --git a/docs/components.html b/docs/components.html
new file mode 100644
index 000000000..0e3f0a223
--- /dev/null
+++ b/docs/components.html
@@ -0,0 +1,705 @@
+
+
+  
+    
+    Bootstrap, from Twitter
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+  
+
+  
+
+    
+    
      
+      
      
+        
      
+          Bootstrap
+          
+        
      
+      
      
+    
      
+
+    
      
+
+      
+      
      
+        
      Components
      
+        
      Reusable patterns for navigation, alerts, popovers, and much more
      
+      
      
+
+
+
+
      
+  
      
+    
      Media Displaying images and videos
      
+  
      
+  
+  
      
+    
      
+      
      Media grid
      
+      
      Display thumbnails of varying sizes on pages with a low HTML footprint and minimal styles.
      
+    
      
+    
      
+      
      Example thumbnails
      
+      
      Thumbnails in the .media-grid can be any size, but they work best when mapped directly to the built-in Bootstrap grid system. Image widths like 90, 210, and 330 combine with a few pixels of padding to equal the .span2, .span4, and .span6 column sizes.
      
+      
      Large
      
+      
+      
      Medium
      
+      
+      
      Small
      
+      
+      
      Coding them
      
+      
      Media grids are easy to use and rather simple on the markup side. Their dimensions are purely based on the size of the images included.
      
+
      +<ul class="media-grid">
+  <li>
+    <a href="#">
+      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
+    </a>
+  </li>
+  <li>
+    <a href="#">
+      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
+    </a>
+  </li>
+</ul>
+
      
+    
      
+  
      
+
      
+
+
+
+
+
+
+
+
+
+
      
+  
      
+    
      Alerts & Errors Styles for success, warning, and error messages or alerts
      
+  
      
+  
+  
      
+    
      
+      
      Basic alerts
      
+      
      .alert-message
      
+      
      One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.
      
+      
      Get the javascript »
      
+    
      
+    
      
+      
      
+        ×
+        
      Holy guacamole! Best check yo self, you’re not looking too good.
      
+      
      
+      
      
+        ×
+        
      Oh snap! Change this and that and try again.
      
+      
      
+      
      
+        ×
+        
      Well done! You successfully read this alert message.
      
+      
      
+      
      
+        ×
+        
      Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.
      
+      
      
+
+      
      Example code
      
+
      +<div class="alert-message warning">
+  <a class="close" href="#">×</a>
+  <p><strong>Holy guacamole!</strong> Best check yo self, you’re not looking too good.</p>
+</div>
+
      
+    
      
+  
      
+  
+  
      
+    
      
+      
      Block messages
      
+      
      .alert-message.block-message
      
+      
      For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.
      
+      
      Get the javascript »
      
+    
      
+    
      
+      
      
+        ×
+        
      Holy guacamole! This is a warning! Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
      
+        
      
+          Take this action Or do this
+        
      
+      
      
+      
      
+        ×
+        
      Oh snap! You got an error! Change this and that and try again.
      
+        
        
+          
      • Duis mollis est non commodo luctus
        • 
+          
      • Nisi erat porttitor ligula
        • 
+          
      • Eget lacinia odio sem nec elit
        • 
+        
      
+        
      
+          Take this action Or do this
+        
      
+      
      
+      
      
+        ×
+        
      Well done! You successfully read this alert message. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Maecenas faucibus mollis interdum.
      
+        
      
+          Take this action Or do this
+        
      
+      
      
+      
      
+        ×
+        
      Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.
      
+        
      
+          Take this action Or do this
+        
      
+      
      
+
+      
      Example code
      
+
      +<div class="alert-message block-message warning">
+  <a class="close" href="#">×</a>
+  <p><strong>Holy guacamole! This is a warning!</strong> Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
+  <div class="alert-actions">
+    <a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a>
+  </div>
+</div>
+
      
+    
      
+  
      
+
      
+
+
+
+
      
+  
      
+    
      Popovers Components for displaying content in modals, tooltips, and popovers
      
+  
      
+  
      
+    
      
+      
      Modals
      
+      
      Modals—dialogs or lightboxes—are great for contextual actions in situations where it’s important that the background context be maintained.
      
+      
      Get the javascript »
      
+    
      
+    
      
+      
      
+        
+        
      
+          
      
+            ×
+            
      Modal Heading
      
+          
      
+          
      
+            
      One fine body…
      
+          
      
+          
      
+            Primary
+            Secondary
+          
      
+        
      
+      
      
+    
      
+  
      
+
+  
+  
      
+    
      
+      
      Tooltips
      
+      
      Twipsies are super useful for aiding a confused user and pointing them in the right direction.
      
+      
      Get the javascript »
      
+    
      
+    
      
+      
      
+        
      
+          
      
+Lorem ipsum dolar sit amet illo error ipsum veritatis aut iste perspiciatis iste voluptas natus illo quasi odit aut natus consequuntur consequuntur, aut natus illo voluptatem odit perspiciatis laudantium rem doloremque totam voluptas. Voluptasdicta eaque beatae aperiam ut enim voluptatem explicabo explicabo, voluptas quia odit fugit accusantium totam totam architecto explicabo sit quasi fugit fugit, totam doloremque unde sunt sed dicta quae accusantium fugit voluptas nemo voluptas voluptatem rem quae aut veritatis quasi quae.
+          
      
+        
      
+      
      
+    
      
+  
      
+
+  
+  
      
+    
      
+      
      Popovers
      
+      
      Use popovers to provide subtextual information to a page without affecting layout.
      
+      
      Get the javascript »
      
+    
      
+    
      
+      
      
+         
      
+          
      
+            
      
+            
      
+              
      Popover Title
      
+              
      
+                
      Etiam porta sem malesuada magna mollis euismod. Maecenas faucibus mollis interdum. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.
      
+              
      
+            
      
+          
      
+          
+        
      
+      
      
+    
      
+  
      
+
      
+
+
+      
+      
+    
      
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
diff --git a/docs/index.html b/docs/index.html
index cf3b8b805..64947dc15 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -32,6 +32,14 @@
         
      
           Bootstrap
      -
      - -
      - -
      -
      -

      Bootstrap,
      from Twitter

      -

      Bootstrap is a responsive 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.

      -

      - Download on GitHub - Currently v2.0.0 -

      -
      -

      Feature highlights

      -
        -
      • × Built on LESS
        • -
      • × Complete styleguide docs
        • -
      • × Fully responsive design
        • -
      • × Small footprint (7kb gzipped)
        • -
      • × Support for IE7 and up
        • -
      • × Custom jQuery plugins
        • -
      • × Dozens of components
        • -
      -
      -
      -
      - - - - - - - - -
      -
      -
      -

      Built for and by nerds

      -

      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.

      -

      Read more on dev.twitter.com ›

      -
      -
      -

      Cross-everything

      -

      Bootstrap is tested and supported in major modern browsers like Chrome, Safari, Internet Explorer, and Firefox.

      - Tested and supported in Chrome, Safari, Internet Explorer, and Firefox -
        -
      • Latest Safari
        • -
      • Latest Google Chrome
        • -
      • Firefox 4+
        • -
      • Internet Explorer 7+
        • -
      • Opera 11
        • -
      -
      -
      -

      What's included

      -

      Bootstrap comes complete with compiled CSS, uncompiled, and example templates.

      -
        -
      • New in 1.3 Javascript plugins
        • -
      • All original .less files
        • -
      • Fully compiled and minified CSS
        • -
      • Complete styleguide documentation
        • -
      • Three example pages with different layouts
        • -
      -
      -
      -
      - -

      Quick-start examples

      -

      Need some quick templates? Check out these basic examples we've put together:

      -
        -
      • - Simple three-column layout with hero unit -
        • -
      • - Fluid layout with static sidebar -
        • -
      • - Simple hanging container for apps -
        • -
      - -
      - - - -
      -
      -

      Grid system 12 columns with a responsive twist

      -
      - -

      Default 940px grid

      -
      -
      1
      -
      1
      -
      1
      -
      1
      -
      1
      -
      1
      -
      1
      -
      1
      -
      1
      -
      1
      -
      1
      -
      1
      -
      -
      -
      4
      -
      4
      -
      4
      -
      -
      -
      4
      -
      8
      -
      -
      -
      6
      -
      6
      -
      -
      -
      12
      -
      - -
      -
      -

      The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.

      -

      It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.

      -
      -
      -
      -<div class="row">
-  <div class="span4">...</div>
-  <div class="span8">...</div>
-</div>
-
      -
      -
      -

      As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.

      -
      -
      - -

      Offsetting columns

      -
      -
      4
      -
      4 offset 4
      -
      -
      -
      3 offset 3
      -
      3 offset 3
      -
      -
      -
      8 offset 4
      -
      - -
      - -

      Nesting columns

      -
      -
      -

      With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.

      -

      Example

      -
      -
      - Level 1 of column -
      -
      - Level 2 -
      -
      - Level 2 -
      -
      -
      -
      -
      -
      -
      -<div class="row">
-  <div class="span12">
-    Level 1 of column
-    <div class="row">
-      <div class="span6">Level 2</div>
-      <div class="span6">Level 2</div>
-    </div>
-  </div>
-</div>
-
      -
      -
      - -

      Grid customization

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      VariableDefault valueDescription
      @gridColumns16The number of columns within the grid
      @gridColumnWidth40pxThe width of each column within the grid
      @gridGutterWidth20pxThe negative space between each column
      @siteWidthComputed sum of all columns and guttersWe use some basic match to count the number of columns and gutters and set the width of the .fixed-container() mixin.
      -
      -
      -

      Variables in LESS

      -

      Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in mixins.less.

      -
      -
      -

      How to customize

      -

      Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.

      -
      -
      -

      Staying responsive

      -

      Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.

      -
      -
      - -
      - - - - -
      -
      -

      Layouts Basic templates to create webpages

      -
      - -
      -
      -

      Fixed layout

      -

      The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div.container>.

      -
      -
      -
      -
      -<body>
-  <div class="container">
-    ...
-  </div>
-</body>
-
      -
      -
      -

      Fluid layout

      -

      An alternative, flexible fluid page structure with min- and max-widths and a left-hand sidebar. Great for apps and docs.

      -
      -
      -
      -
      -
      -<body>
-  <div class="container-fluid">
-    <div class="sidebar">
-      ...
-    </div>
-    <div class="content">
-      ...
-    </div>
-  </div>
-</body>
-
      -
      -
      -
      - - - - - -
      -
      -

      Responsive design Media queries for various devices and resolutions

      -
      - -
      -
      - Responsive devices -
      -
      -

      Supported devices

      -

      Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      LabelLayout widthColumn widthGutter width
      Smartphones480px and belowFluid columns, no fixed widths
      Portrait tablets480px to 768pxFluid columns, no fixed widths
      Landscape tablets768px to 940px44px20px
      Default940px and up60px20px
      Large display1210px and up70px30px
      - -

      What they do

      -

      Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.

      -
        -
      • Modify the width of column in our grid
        • -
      • Stack elements instead of float wherever necessary
        • -
      • Resize headings and text to be more appropriate for devices
        • -
      -
      -
      - -
      - - -

      Using the media queries

      -
      -
      -

      Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:

      -
        -
      1. Use the compiled responsive version, bootstrap.reponsive.css
        2. -
      2. Add @import "responsive.less" and recompile Bootstrap
        3. -
      3. Compile responsive.less as a separate file and include that
        4. -
      -

      Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.

      -
      -
      -
      -  // Landscape phones and down
-  @media (max-width: 480px) { ... }
-
-  // Landscape phone to portrait tablet
-  @media (min-width: 480px) and (max-width: 768px) { ... }
-
-  // Portrait tablet to landscape and desktop
-  @media (min-width: 768px) and (max-width: 940px) { ... }
-
-  // Large desktop
-  @media (min-width: 1210px) { .. }
-
      -
      -
      - -
      - - - - - -
      -
      -

      Typography Headings, paragraphs, lists, and other inline type elements

      -
      - -

      Headings & body copy

      - - -
      -
      -

      Typographic scale

      -

      The entire typographic grid is based on two Less variables in our preboot.less file: @baseFontSize and @baseLineHeight. The first is the base font-size used throughout and the second is the base line-height.

      -

      We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.

      -
      -
      -

      Example body text

      -

      Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.

      -

      Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.

      -
      -
      -
      -

      h1. Heading 1

      -

      h2. Heading 2

      -

      h3. Heading 3

      -

      h4. Heading 4

      -
      h5. Heading 5
      -
      h6. Heading 6
      -
      -
      -
      - - -

      Emphasis, address, and abbreviation

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      ElementDescriptionUsage
      - <strong> - - For emphasizing a snippet of text with important - - None -
      - <em> - - For emphasizing a snippet of text with stress - - None -
      - <abbr> - - Wraps abbreviations and acronyms to show the expanded version on hover - - Include optional title for expanded text -
      - <address> - - For contact information for its nearest ancestor or the entire body of work - - Preserve formatting by ending all lines with <br> -
      - -
      -
      -

      Using emphasis

      -

      Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.

      -

      Note: Feel free to use <b> and <i> in HTML5, but their usage has changed a bit. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.

      -
      -
      -

      Example addresses

      -

      Here are two examples of how the <address> tag can be used:

      -
      - Twitter, Inc.
      - 795 Folsom Ave, Suite 600
      - San Francisco, CA 94107
      - P: (123) 456-7890 -
      -
      - Full Name
      - first.last@gmail.com -
      -
      -
      -

      Example abbreviations

      -

      Abbreviations are styled with uppercase text and a light dotted bottom border. They also have a help cursor on hover so users have extra indication something will be shown on hover.

      -

      HTML is the best thing since sliced bread.

      -

      An abbreviation of the word attribute is attr.

      -
      -
      - - - -

      Blockquotes

      -
      -
      -

      To include a blockquote, wrap <blockquote> around <p> and <small> tags. Use the <small> element to cite your source and you'll get an em dash &mdash; before it.

      -
      -

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.

      - Someone famous -
      -
      -
      -
      -<blockquote>
-  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p>
-  <small>Dr. Julius Hibbert</small>
-</blockquote>
-
      -
      -
      - - -

      Lists

      -
      -
      -

      Unordered <ul>

      -
        -
      • Lorem ipsum dolor sit amet
        • -
      • Consectetur adipiscing elit
        • -
      • Integer molestie lorem at massa
        • -
      • Facilisis in pretium nisl aliquet
        • -
      • Nulla volutpat aliquam velit -
          -
        • Phasellus iaculis neque
          • -
        • Purus sodales ultricies
          • -
        • Vestibulum laoreet porttitor sem
          • -
        • Ac tristique libero volutpat at
          • -
        -
        • -
      • Faucibus porta lacus fringilla vel
        • -
      • Aenean sit amet erat nunc
        • -
      • Eget porttitor lorem
        • -
      -
      -
      -

      Unstyled <ul.unstyled>

      -
        -
      • Lorem ipsum dolor sit amet
        • -
      • Consectetur adipiscing elit
        • -
      • Integer molestie lorem at massa
        • -
      • Facilisis in pretium nisl aliquet
        • -
      • Nulla volutpat aliquam velit -
          -
        • Phasellus iaculis neque
          • -
        • Purus sodales ultricies
          • -
        • Vestibulum laoreet porttitor sem
          • -
        • Ac tristique libero volutpat at
          • -
        -
        • -
      • Faucibus porta lacus fringilla vel
        • -
      • Aenean sit amet erat nunc
        • -
      • Eget porttitor lorem
        • -
      -
      -
      -

      Ordered <ol>

      -
        -
      1. Lorem ipsum dolor sit amet
        2. -
      2. Consectetur adipiscing elit
        3. -
      3. Integer molestie lorem at massa
        4. -
      4. Facilisis in pretium nisl aliquet
        5. -
      5. Nulla volutpat aliquam velit
        6. -
      6. Faucibus porta lacus fringilla vel
        7. -
      7. Aenean sit amet erat nunc
        8. -
      8. Eget porttitor lorem
        9. -
      -
      -
      -

      Description <dl>

      -
      -
      Description lists
      -
      A description list is perfect for defining terms.
      -
      Euismod
      -
      Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
      -
      Donec id elit non mi porta gravida at eget metus.
      -
      Malesuada porta
      -
      Etiam porta sem malesuada magna mollis euismod.
      -
      -
      -
      - - - - -

      Code Inline and block

      - - - - - - - - - - - - - - - - - - - - - -
      ElementResult
      <code>In a line of text like this, your wrapped code will look like this <html> element.
      <pre> -
      <div>
-  <h1>Heading</h1>
-  <p>Something right here...</p>
-</div>
      -

      Note: Be sure to keep code within pre tags as close to the left as possible; it will render all tabs.

      -
      <pre class="prettyprint"> -

      Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.

      -
      <div>
-  <h1>Heading</h1>
-  <p>Something right here...</p>
-</div>
      -
      <div>
-  <h1>Heading</h1>
-  <p>Something right here...</p>
-</div>
      -

      Download google-code-prettify and view the readme for how to use.

      -
      - - -

      Inline labels for special attention

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      LabelsMarkup
      - Default - - <span class="label">Default</span> -
      - New - - <span class="label success">New</span> -
      - Warning - - <span class="label warning">Warning</span> -
      - Important - - <span class="label important">Important</span> -
      - Notice - - <span class="label notice">Notice</span> -
      - -
      - - - - -
      -
      -

      Tables For, you guessed it, tabular data

      -
      - -

      Table markup

      -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      TagDescription
      - <table> - - Wrapping element for displaying data in a tabular format -
      - <thead> - - Container element for table header rows (<tr>) to label table columns -
      - <tbody> - - Container element for table rows (<tr>) in the body of the table -
      - <tr> - - Container element for a set of table cells (<td> or <th>) that appears on a single row -
      - <td> - - Default table cell -
      - <th> - - Special table cell for column (or row, depending on scope and placement) labels
      - Must be used within a <thead> -
      - <caption> - - Description or summary of what the table holds, especially useful for screen readers -
      -
      -
      -
      -<table>
-  <thead>
-    <tr>
-      <th>...</th>
-      <th>...</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>...</td>
-      <td>...</td>
-    </tr>
-  </tbody>
-</table>
-
      -
      -
      - -

      Example tables

      -

      1. Default table styles

      -

      All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      #First NameLast NameLanguage
      1SomeOneEnglish
      2JoeSixpackEnglish
      3StuDentCode
      -
      -<table>
-  ...
-</table>
      -

      2. Zebra-striped

      -

      Get a little fancy with your tables by adding zebra-striping—just add the .zebra-striped class.

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      #First NameLast NameLanguage
      1SomeOneEnglish
      2JoeSixpackEnglish
      3StuDentCode
      -

      Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

      -
      -<table class="zebra-striped">
-...
-</table>
      -

      3. Zebra-striped w/ TableSorter.js

      -

      Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      #First NameLast NameLanguage
      1YourOneEnglish
      2JoeSixpackEnglish
      3StuDentCode
      -
      -<script src="js/jquery/jquery.tablesorter.min.js"></script>
-<script >
-  $(function() {
-    $("table#sortTableExample").tablesorter({ sortList: [[1,0]] });
-  });
-</script>
-<table class="zebra-striped">
-  ...
-</table>
      - -
      - - - - -
      -
      -

      Forms

      -
      -
      -
      -

      Four types of forms

      -

      With 2.0, we now have four types of forms to choose from:

      -
        -
      • Search form for a super-rounded input and optional button
        • -
      • Inline form for a series of elements on one line
        • -
      • Horizontal form for left-aligned labels
        • -
      • Vertical form for stacked labels and inputs
        • -
      -
      -
      -

      -
      -
      -
      -
      -

      Search form

      -
      -
      -
      -
      - - -
      -
      -
      -
      -
      -
      -

      Inline form

      -
      -
      -
      -
      -

      Some directional text

      -

      And maybe some kind of optional supporting text right here.

      - - - - -
      -
      -
      -
      -
      -
      -

      Horizontal form

      -
      -
      -
      - Example form -
      - -
      - -

      Help text here. Be sure to fill this out like so, or else!

      -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      - Example form -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      -
      - - - - -
      -

      Note: Labels surround all the options for much larger click areas and a more usable form.

      -
      -
      -
      - -
      -
      - - -
      -

      Note: Labels surround all the options for much larger click areas and a more usable form.

      -
      -
      -
      - - -
      -
      -
      -
      -
      -
      -

      Vertical form

      -
      -
      -
      - Example form -
      - -
      - -

      Be sure to fill this out like so, or else!

      -
      -
      -
      - -
      - -
      -
      -
      - -
      -
      - - - +
      + +
      + + +
      +
      +

      Bootstrap,
      from Twitter

      +

      Bootstrap is a responsive 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.

      +

      + Download on GitHub + Currently v2.0.0 +

      +
      +

      Feature highlights

      +
        +
      • × Built on LESS
        • +
      • × Complete styleguide docs
        • +
      • × Fully responsive design
        • +
      • × Small footprint (7kb gzipped)
        • +
      • × Support for IE7 and up
        • +
      • × Custom jQuery plugins
        • +
      • × Dozens of components
        • +
      -
      -
      - - -
      -
      -
      -
      - -
      -
      -

      Buttons

      -

      As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

      -

      All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class.

      -
      -
      -

      Example buttons

      -

      Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

      -
      -      -
      -

      Alternate sizes

      -

      Fancy larger or smaller buttons? Have at it!

      -
      - Primary action - Action -
      -
      - Primary action - Action -
      -

      Disabled state

      -

      For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

      -

      Links

      -
      - Primary action - Action -
      -

      Buttons

      -
      -   -
      -
      -
      - -
      -
      -

      Button groups

      -
      -
      -

      Example

      -
      -
      - Left - Middle - Right -
      -
      -
      -
      -
      - 1 - 2 - 3 - 4 - 5 -
      -
      - 6 - 7 - 8 -
      -
      - 9 -
      -
      - 10 -
      -
      -
      -
      -
      - -
      - - - - -
      -
      -

      Media Displaying images and videos

      -
      - -
      -
      -

      Media grid

      -

      Display thumbnails of varying sizes on pages with a low HTML footprint and minimal styles.

      -
      -
      -

      Example thumbnails

      -

      Thumbnails in the .media-grid can be any size, but they work best when mapped directly to the built-in Bootstrap grid system. Image widths like 90, 210, and 330 combine with a few pixels of padding to equal the .span2, .span4, and .span6 column sizes.

      -

      Large

      - -

      Medium

      - -

      Small

      - -

      Coding them

      -

      Media grids are easy to use and rather simple on the markup side. Their dimensions are purely based on the size of the images included.

      -
      -<ul class="media-grid">
-  <li>
-    <a href="#">
-      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
-    </a>
-  </li>
-  <li>
-    <a href="#">
-      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
-    </a>
-  </li>
-</ul>
-
      -
      -
      -
      - - - - - - - - - -
      -
      -

      Alerts & Errors Styles for success, warning, and error messages or alerts

      -
      - -
      -
      -

      Basic alerts

      -

      .alert-message

      -

      One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.

      -

      Get the javascript »

      -
      -
      -
      - × -

      Holy guacamole! Best check yo self, you’re not looking too good.

      -
      -
      - × -

      Oh snap! Change this and that and try again.

      -
      -
      - × -

      Well done! You successfully read this alert message.

      -
      -
      - × -

      Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.

      -
      - -

      Example code

      -
      -<div class="alert-message warning">
-  <a class="close" href="#">×</a>
-  <p><strong>Holy guacamole!</strong> Best check yo self, you’re not looking too good.</p>
-</div>
-
      -
      -
      - -
      -
      -

      Block messages

      -

      .alert-message.block-message

      -

      For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.

      -

      Get the javascript »

      -
      -
      -
      - × -

      Holy guacamole! This is a warning! Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

      -
      - Take this action Or do this -
      -
      -
      - × -

      Oh snap! You got an error! Change this and that and try again.

      -
        -
      • Duis mollis est non commodo luctus
        • -
      • Nisi erat porttitor ligula
        • -
      • Eget lacinia odio sem nec elit
        • -
      -
      - Take this action Or do this -
      -
      -
      - × -

      Well done! You successfully read this alert message. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Maecenas faucibus mollis interdum.

      -
      - Take this action Or do this -
      -
      -
      - × -

      Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.

      -
      - Take this action Or do this -
      -
      - -

      Example code

      -
      -<div class="alert-message block-message warning">
-  <a class="close" href="#">×</a>
-  <p><strong>Holy guacamole! This is a warning!</strong> Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
-  <div class="alert-actions">
-    <a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a>
-  </div>
-</div>
-
      -
      -
      -
      - - - -
      -
      -

      Popovers Components for displaying content in modals, tooltips, and popovers

      -
      -
      -
      -

      Modals

      -

      Modals—dialogs or lightboxes—are great for contextual actions in situations where it’s important that the background context be maintained.

      -

      Get the javascript »

      -
      -
      -
      - -
      -
      - × -

      Modal Heading

      -
      -
      -

      One fine body…

      -
      -
      - Primary - Secondary -
      -
      -
      -
      -
      - - -
      -
      -

      Tooltips

      -

      Twipsies are super useful for aiding a confused user and pointing them in the right direction.

      -

      Get the javascript »

      -
      -
      -
      -
      -

      -Lorem ipsum dolar sit amet illo error ipsum veritatis aut iste perspiciatis iste voluptas natus illo quasi odit aut natus consequuntur consequuntur, aut natus illo voluptatem odit perspiciatis laudantium rem doloremque totam voluptas. Voluptasdicta eaque beatae aperiam ut enim voluptatem explicabo explicabo, voluptas quia odit fugit accusantium totam totam architecto explicabo sit quasi fugit fugit, totam doloremque unde sunt sed dicta quae accusantium fugit voluptas nemo voluptas voluptatem rem quae aut veritatis quasi quae. -

      -
      -
      -
      -
      - - -
      -
      -

      Popovers

      -

      Use popovers to provide subtextual information to a page without affecting layout.

      -

      Get the javascript »

      -
      -
      -
      -
      -
      -
      -
      -

      Popover Title

      -
      -

      Etiam porta sem malesuada magna mollis euismod. Maecenas faucibus mollis interdum. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.

      -
      +
      +

      What's included

      +

      Bootstrap comes complete with compiled CSS, uncompiled, and example templates.

      +
        +
      • New in 1.3 Javascript plugins
        • +
      • All original .less files
        • +
      • Fully compiled and minified CSS
        • +
      • Complete styleguide documentation
        • +
      • Three example pages with different layouts
        • +
      -
      - -
      -
      -
      -
      -
      - - - - -
      -
      -

      Using javascript with Bootstrap An index of plugins to get you started

      -
      -
      -
      -

      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!

      -

      View javascript docs »

      -
      -
      -

      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.

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      FileDescription
      bootstrap-modal.jsOur Modal plugin is a super slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require at twitter.
      bootstrap-alerts.jsThe alert plugin is a super tiny class for adding close functionality to alerts.
      bootstrap-dropdown.jsThis plugin is for adding dropdown interaction to the bootstrap navbar or tabbed navigations.
      bootstrap-scrollspy.jsThe ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap navbar.
      bootstrap-tabs.jsThis plugin adds quick, dynamic tab and pill functionality for cycling through local content.
      bootstrap-twipsy.jsBased on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for local title storage!
      bootstrap-popover.jsThe popover plugin provides a simple interface for adding popovers to your application. It extends the boostrap-twipsy.js plugin, so be sure to grab that file as well when including popovers in your project!
      -

      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.

      -
      -
      - - - -
      -
      -

      Using Bootstrap with Less Supercharge your CSS with variables, mixins, and functions

      -
      -
      -
      -

      Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.

      -

      Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.

      -
      -
      -

      How to use it

      -

      Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.

      -
      -<link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
-<script src="js/less-1.1.3.min.js"></script>
      -

      Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.

      - -

      What’s included

      -

      Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.

      -

      Variables

      -

      Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.

      -
      -// Links
-@linkColor:         #8b59c2;
-@linkColorHover:    darken(@linkColor, 10);
-
-// Grays
-@black:             #000;
-@grayDark:          lighten(@black, 25%);
-@gray:              lighten(@black, 50%);
-@grayLight:         lighten(@black, 70%);
-@grayLighter:       lighten(@black, 90%);
-@white:             #fff;
-
-// Accent Colors
-@blue:              #08b5fb;
-@green:             #46a546;
-@red:               #9d261d;
-@yellow:            #ffc40d;
-@orange:            #f89406;
-@pink:              #c3325f;
-@purple:            #7a43b6;
-
-// Baseline grid
-@basefont:          13px;
-@baseline:          18px;
-
      - -

      Commenting

      -

      Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.

      -
      -// This is a comment
-/* This is also a comment */
-
      - -

      Mixins up the wazoo

      -

      Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.

      -

      Font stacks

      -
      -#font {
-  .shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) {
-    font-size: @size;
-    font-weight: @weight;
-    line-height: @lineHeight;
-  }
-  .sans-serif(@weight: normal, @size: 14px, @lineHeight: 20px) {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-size: @size;
-    font-weight: @weight;
-    line-height: @lineHeight;
-  }
-  ...
-}
-
      -

      Gradients

      -
      -#gradient {
-  ...
-  .vertical (@startColor: #555, @endColor: #333) {
-    background-color: @endColor;
-    background-repeat: repeat-x;
-    background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror
-    background-image: -moz-linear-gradient(@startColor, @endColor); // FF 3.6+
-    background-image: -ms-linear-gradient(@startColor, @endColor); // IE10
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(@startColor, @endColor); // The standard
-  }
-  ...
-}
-
      - -

      Operations

      -

      Get fancy and perform some math to generate flexible and powerful mixins like the one below.

      -
      -// Griditude
-@gridColumns:       16;
-@gridColumnWidth:   40px;
-@gridGutterWidth:   20px;
-@siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-
-// Make some columns
-.columns(@columnSpan: 1) {
-  width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
-}
-
      - -

      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

      - - - - - - - - - - - - - - - - - - - - - - - - -
      MethodSteps
      Node with makefile -

      Install the less command line compiler with npm by running the following command:

      - 
      $ npm install lessc
      -

      Once installed just run make from the root of your bootstrap directory and you're all set.

      -

      Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).

      -
      Javascript -

      Download the latest Less.js and include the path to it (and Bootstrap) 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 -

      If you already have the less command line tool installed, simply run the following command:

      - 
      $ lessc ./lib/bootstrap.less > bootstrap.css
      -

      Be sure to include --compress in that command if you're trying to save some bytes!

      -
      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.

      -
      -
      -
      +
      + + +

      Quick-start examples

      +

      Need some quick templates? Check out these basic examples we've put together:

      +
        +
      • + Simple three-column layout with hero unit +
        • +
      • + Fluid layout with static sidebar +
        • +
      • + Simple hanging container for apps +
        • +
      - +
      + -
      - + @@ -2182,6 +202,5 @@ Lorem ipsum dolar sit amet illo error ipsum verita - diff --git a/docs/javascript.html b/docs/javascript.html index 68a3d0cd4..c9ac7e21d 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -27,7 +27,24 @@ -
      +
      +
      +
      + Bootstrap + +
      +
      +
      + + -
      -

      Javascript for Bootstrap

      -

      Bring Bootstrap's components to life with custom plugins for jQuery and Ender.

      -
      + --> + +
      + +
      +

      Javascript for Bootstrap

      +

      Bring Bootstrap's components to life with custom plugins for jQuery and Ender

      +
      + + + + +
      +
      +

      Using javascript with Bootstrap An index of plugins to get you started

      +
      +
      +
      +

      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!

      +

      View javascript docs »

      +
      +
      +

      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.

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      FileDescription
      bootstrap-modal.jsOur Modal plugin is a super slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require at twitter.
      bootstrap-alerts.jsThe alert plugin is a super tiny class for adding close functionality to alerts.
      bootstrap-dropdown.jsThis plugin is for adding dropdown interaction to the bootstrap navbar or tabbed navigations.
      bootstrap-scrollspy.jsThe ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap navbar.
      bootstrap-tabs.jsThis plugin adds quick, dynamic tab and pill functionality for cycling through local content.
      bootstrap-twipsy.jsBased on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for local title storage!
      bootstrap-popover.jsThe popover plugin provides a simple interface for adding popovers to your application. It extends the boostrap-twipsy.js plugin, so be sure to grab that file as well when including popovers in your project!
      +

      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.

      +
      +
      +
      -
      - - + + + - - - - + + - - + diff --git a/docs/less.html b/docs/less.html new file mode 100644 index 000000000..806c2eede --- /dev/null +++ b/docs/less.html @@ -0,0 +1,242 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + + + +
      +
      +
      + Bootstrap + +
      +
      +
      + +
      + + +
      +

      Using LESS

      +

      Be a boss and use Bootstrap's built-in variables, mixins, and more via LESS

      +
      + + + +
      +
      +

      Using Bootstrap with Less Supercharge your CSS with variables, mixins, and functions

      +
      +
      +
      +

      Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.

      +

      Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.

      +
      +
      +

      How to use it

      +

      Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.

      +
      +<link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
+<script src="js/less-1.1.3.min.js"></script>
      +

      Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.

      + +

      What’s included

      +

      Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.

      +

      Variables

      +

      Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.

      +
      +// Links
+@linkColor:         #8b59c2;
+@linkColorHover:    darken(@linkColor, 10);
+
+// Grays
+@black:             #000;
+@grayDark:          lighten(@black, 25%);
+@gray:              lighten(@black, 50%);
+@grayLight:         lighten(@black, 70%);
+@grayLighter:       lighten(@black, 90%);
+@white:             #fff;
+
+// Accent Colors
+@blue:              #08b5fb;
+@green:             #46a546;
+@red:               #9d261d;
+@yellow:            #ffc40d;
+@orange:            #f89406;
+@pink:              #c3325f;
+@purple:            #7a43b6;
+
+// Baseline grid
+@basefont:          13px;
+@baseline:          18px;
+
      + +

      Commenting

      +

      Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.

      +
      +// This is a comment
+/* This is also a comment */
+
      + +

      Mixins up the wazoo

      +

      Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.

      +

      Font stacks

      +
      +#font {
+  .shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) {
+    font-size: @size;
+    font-weight: @weight;
+    line-height: @lineHeight;
+  }
+  .sans-serif(@weight: normal, @size: 14px, @lineHeight: 20px) {
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: @size;
+    font-weight: @weight;
+    line-height: @lineHeight;
+  }
+  ...
+}
+
      +

      Gradients

      +
      +#gradient {
+  ...
+  .vertical (@startColor: #555, @endColor: #333) {
+    background-color: @endColor;
+    background-repeat: repeat-x;
+    background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror
+    background-image: -moz-linear-gradient(@startColor, @endColor); // FF 3.6+
+    background-image: -ms-linear-gradient(@startColor, @endColor); // IE10
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(@startColor, @endColor); // The standard
+  }
+  ...
+}
+
      + +

      Operations

      +

      Get fancy and perform some math to generate flexible and powerful mixins like the one below.

      +
      +// Griditude
+@gridColumns:       16;
+@gridColumnWidth:   40px;
+@gridGutterWidth:   20px;
+@siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+// Make some columns
+.columns(@columnSpan: 1) {
+  width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
+}
+
      + +

      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

      + + + + + + + + + + + + + + + + + + + + + + + + +
      MethodSteps
      Node with makefile +

      Install the less command line compiler with npm by running the following command:

      + 
      $ npm install lessc
      +

      Once installed just run make from the root of your bootstrap directory and you're all set.

      +

      Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).

      +
      Javascript +

      Download the latest Less.js and include the path to it (and Bootstrap) 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 +

      If you already have the less command line tool installed, simply run the following command:

      + 
      $ lessc ./lib/bootstrap.less > bootstrap.css
      +

      Be sure to include --compress in that command if you're trying to save some bytes!

      +
      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.

      +
      +
      +
      + +
      + + + + +
      + + + + + + + + + + + + + + diff --git a/docs/scaffolding.html b/docs/scaffolding.html new file mode 100644 index 000000000..9334e830c --- /dev/null +++ b/docs/scaffolding.html @@ -0,0 +1,383 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + + + +
      +
      +
      + Bootstrap + +
      +
      +
      + +
      + + +
      +

      Scaffolding

      +

      Responsive 12-column grid and fixed- and fluid-width layouts

      +
      + + + +
      +
      +

      Grid system 12 columns with a responsive twist

      +
      + +

      Default 940px grid

      +
      +
      1
      +
      1
      +
      1
      +
      1
      +
      1
      +
      1
      +
      1
      +
      1
      +
      1
      +
      1
      +
      1
      +
      1
      +
      +
      +
      4
      +
      4
      +
      4
      +
      +
      +
      4
      +
      8
      +
      +
      +
      6
      +
      6
      +
      +
      +
      12
      +
      + +
      +
      +

      The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.

      +

      It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.

      +
      +
      +
      +<div class="row">
+  <div class="span4">...</div>
+  <div class="span8">...</div>
+</div>
+
      +
      +
      +

      As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.

      +
      +
      + +

      Offsetting columns

      +
      +
      4
      +
      4 offset 4
      +
      +
      +
      3 offset 3
      +
      3 offset 3
      +
      +
      +
      8 offset 4
      +
      + +
      + +

      Nesting columns

      +
      +
      +

      With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.

      +

      Example

      +
      +
      + Level 1 of column +
      +
      + Level 2 +
      +
      + Level 2 +
      +
      +
      +
      +
      +
      +
      +<div class="row">
+  <div class="span12">
+    Level 1 of column
+    <div class="row">
+      <div class="span6">Level 2</div>
+      <div class="span6">Level 2</div>
+    </div>
+  </div>
+</div>
+
      +
      +
      + +

      Grid customization

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      VariableDefault valueDescription
      @gridColumns16The number of columns within the grid
      @gridColumnWidth40pxThe width of each column within the grid
      @gridGutterWidth20pxThe negative space between each column
      @siteWidthComputed sum of all columns and guttersWe use some basic match to count the number of columns and gutters and set the width of the .fixed-container() mixin.
      +
      +
      +

      Variables in LESS

      +

      Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in mixins.less.

      +
      +
      +

      How to customize

      +

      Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.

      +
      +
      +

      Staying responsive

      +

      Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.

      +
      +
      + +
      + + + + +
      +
      +

      Layouts Basic templates to create webpages

      +
      + +
      +
      +

      Fixed layout

      +

      The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div.container>.

      +
      +
      +
      +
      +<body>
+  <div class="container">
+    ...
+  </div>
+</body>
+
      +
      +
      +

      Fluid layout

      +

      An alternative, flexible fluid page structure with min- and max-widths and a left-hand sidebar. Great for apps and docs.

      +
      +
      +
      +
      +
      +<body>
+  <div class="container-fluid">
+    <div class="sidebar">
+      ...
+    </div>
+    <div class="content">
+      ...
+    </div>
+  </div>
+</body>
+
      +
      +
      +
      + + + + + +
      +
      +

      Responsive design Media queries for various devices and resolutions

      +
      + +
      +
      + Responsive devices +
      +
      +

      Supported devices

      +

      Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      LabelLayout widthColumn widthGutter width
      Smartphones480px and belowFluid columns, no fixed widths
      Portrait tablets480px to 768pxFluid columns, no fixed widths
      Landscape tablets768px to 940px44px20px
      Default940px and up60px20px
      Large display1210px and up70px30px
      + +

      What they do

      +

      Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.

      +
        +
      • Modify the width of column in our grid
        • +
      • Stack elements instead of float wherever necessary
        • +
      • Resize headings and text to be more appropriate for devices
        • +
      +
      +
      + +
      + + +

      Using the media queries

      +
      +
      +

      Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:

      +
        +
      1. Use the compiled responsive version, bootstrap.reponsive.css
        2. +
      2. Add @import "responsive.less" and recompile Bootstrap
        3. +
      3. Compile responsive.less as a separate file and include that
        4. +
      +

      Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.

      +
      +
      +
      +  // Landscape phones and down
+  @media (max-width: 480px) { ... }
+
+  // Landscape phone to portrait tablet
+  @media (min-width: 480px) and (max-width: 768px) { ... }
+
+  // Portrait tablet to landscape and desktop
+  @media (min-width: 768px) and (max-width: 940px) { ... }
+
+  // Large desktop
+  @media (min-width: 1210px) { .. }
+
      +
      +
      +
      + + + + + +
      + + + + + + + + + + + + + + diff --git a/lib/mixins.less b/lib/mixins.less index 5b05654d5..6d034cbcc 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -162,12 +162,19 @@ } // Background clipping +// Heads up: FF 3.6 and under need padding instead of padding-box .background-clip(@clip) { -webkit-background-clip: @clip; -moz-background-clip: @clip; background-clip: @clip; } +// Resize anything +.resizable(@direction: both) { + resize: @direction; // Options: horizontal, vertical, both + overflow: auto; // Safari fix +} + // CSS3 Content Columns .content-columns(@columnCount, @columnGap: 20px) { -webkit-column-count: @columnCount; -- cgit v1.2.3 From b4c894961c0b75361ead496f1686eb3cf41c5c97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 23:24:22 -0700 Subject: address issue #414 and fix up a number of docs loose ends --- docs/assets/css/docs.css | 58 ++++++++++-------------------------------------- docs/base-css.html | 14 +++++++----- docs/components.html | 2 +- docs/less.html | 2 +- docs/scaffolding.html | 2 +- 5 files changed, 24 insertions(+), 54 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8ed81e713..3a4dcff1c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -15,7 +15,7 @@ body { background-repeat: repeat-x; } -/* Tweak topbar brand link to be super sleek +/* Tweak navbar brand link to be super sleek -------------------------------------------------- */ body > .navbar-fixed .brand { padding-right: 0; @@ -29,6 +29,12 @@ body > .navbar-fixed .brand:hover { text-decoration: none; } +/* Space out sub-sections more +-------------------------------------------------- */ +.page-header { + margin-top: 36px; +} + /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -92,12 +98,12 @@ body > .navbar-fixed .brand:hover { color: #999; } - /* Specific jumbotrons ------------------------- */ /* supporting docs pages */ .subhead { padding-bottom: 14px; + margin-bottom: 45px; border-bottom: 3px solid #e5e5e5; } .subhead h1, @@ -224,46 +230,6 @@ body > .navbar-fixed .brand:hover { } -/* Topbar special styles --------------------------------------------------- */ -.topbar-wrapper { - position: relative; - height: 40px; - margin: 5px 0 15px; -} -.topbar-wrapper .topbar { - position: absolute; - margin: 0 -20px; -} -.topbar-wrapper .topbar .topbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -/* Topbar in js docs -------------------------- */ -#bootstrap-js .topbar-wrapper { - z-index: 1; -} -#bootstrap-js .topbar-wrapper .topbar { - position: absolute; - margin: 0 -20px; -} -#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 .topbar-wrapper .container { - width: auto; -} - - /* Popover docs -------------------------------------------------- */ .popover-well { @@ -288,15 +254,13 @@ img.large-bird { } -/* Pretty Print +/* Misc -------------------------------------------------- */ + pre.prettyprint { overflow: hidden; } - -/* Wells --------------------------------------------------- */ .well form { margin-bottom: 0; } @@ -311,6 +275,7 @@ h2 + table { margin-top: 5px; } + /* Responsive Docs -------------------------------------------------- */ @media (max-width: 480px) { @@ -385,6 +350,7 @@ h2 + table { } + @media (min-width: 768px) and (max-width: 940px) { /* Scale down the jumbotron content */ diff --git a/docs/base-css.html b/docs/base-css.html index e3b3782c0..47dff40e7 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -197,7 +197,8 @@

      Lists

      -

      Unordered <ul>

      +

      Unordered

      +

      <ul>

      • Lorem ipsum dolor sit amet
      • Consectetur adipiscing elit
        • @@ -217,7 +218,8 @@
      -

      Unstyled <ul.unstyled>

      +

      Unstyled

      +

      <ul class="unstyled">

      • Lorem ipsum dolor sit amet
      • Consectetur adipiscing elit
        • @@ -237,7 +239,8 @@
      -

      Ordered <ol>

      +

      Ordered

      +

      <ol>

      1. Lorem ipsum dolor sit amet
      2. Consectetur adipiscing elit
        3. @@ -250,7 +253,8 @@
      -

      Description <dl>

      +

      Description

      +

      <dl>

      Description lists
      A description list is perfect for defining terms.
      @@ -286,7 +290,7 @@ <h1>Heading</h1> <p>Something right here...</p> </div> -

      Note: Be sure to keep code within pre tags as close to the left as possible; it will render all tabs.

      +

      Note: Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.

      diff --git a/docs/components.html b/docs/components.html index 0e3f0a223..59273ac19 100644 --- a/docs/components.html +++ b/docs/components.html @@ -548,7 +548,7 @@

      Block messages

      -

      .alert-message.block-message

      +

      <div class="alert-message block-message">

      For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.

      Get the javascript »

      diff --git a/docs/less.html b/docs/less.html index 806c2eede..d5a467bfa 100644 --- a/docs/less.html +++ b/docs/less.html @@ -185,7 +185,7 @@ Javascript -

      Download the latest Less.js and include the path to it (and Bootstrap) in the head.

      +

      Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.

       <link rel="stylesheet/less" href="/path/to/bootstrap.less">
 <script src="/path/to/less.js"></script>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 9334e830c..2a5ae8bc6 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -234,7 +234,7 @@

      Fluid layout

      -

      An alternative, flexible fluid page structure with min- and max-widths and a left-hand sidebar. Great for apps and docs.

      +

      <div class="fluid-container"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.

      -- cgit v1.2.3 From 19feb1b1ff56db21bc36106e3b57943ca490a912 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 23:25:57 -0700 Subject: fix new navbar in components --- docs/components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components.html b/docs/components.html index 59273ac19..c18d8c113 100644 --- a/docs/components.html +++ b/docs/components.html @@ -158,7 +158,7 @@

      Fixed navbar

      -
      +
      Project Name
      • Home
        • -- cgit v1.2.3 From 20b9390a9e3a94dae86af388821aa8f458ba057f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Oct 2011 09:35:58 -0700 Subject: update docs for responsive --- docs/assets/css/docs.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 3a4dcff1c..7238badb3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -351,6 +351,21 @@ h2 + table { } +@media (min-width: 480px) and (max-width: 768px) { + + /* Scale down the jumbotron content */ + .jumbotron h1 { + font-size: 54px; + } + + .jumbotron h1, + .jumbotron p { + margin-right: 40%; + } + +} + + @media (min-width: 768px) and (max-width: 940px) { /* Scale down the jumbotron content */ -- cgit v1.2.3 From cb13f010e2dd1eb8f37048b5664ff455b60eba05 Mon Sep 17 00:00:00 2001 From: Bulat Shakirzyanov Date: Thu, 27 Oct 2011 18:51:49 -0700 Subject: implement left and right tabs styles --- lib/patterns.less | 72 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 10 deletions(-) diff --git a/lib/patterns.less b/lib/patterns.less index f1badc46d..1db315831 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -379,19 +379,71 @@ } // Tabs on left - &.tabs-left .tabs { - float: left; - } - &.tabs-left .tabs > li { - float: none; + &.tabs-left { + .clearfix(); + + .tab-content { + float: left; + } + .tabs { + float: left; + + > li { + float: none; + margin-bottom: -1px; + margin-right: -1px; + > a { + margin-right: 0; + margin-bottom: 2px; + .border-radius(4px 0 0 4px); + + &:hover { + border-color: transparent; + border-right-color: #ddd; + } + } + } + + > .active > a, + > .active > a:hover { + border-color: #ddd; + border-right-color: transparent; + } + } } // Tabs on right - &.tabs-right .tabs { - float: right; - } - &.tabs-right .tabs > li { - float: none; + &.tabs-right { + .clearfix(); + + .tab-content { + float: right; + } + .tabs { + float: right; + + > li { + float: none; + margin-bottom: -1px; + margin-left: -1px; + > a { + margin-left: 0; + margin-bottom: 2px; + .border-radius(4px 0 0 4px); + + &:hover { + border-color: transparent; + border-left-color: #ddd; + } + } + } + + > .active > a, + > .active > a:hover { + border-color: #ddd; + border-left-color: transparent; + } + } } } -- cgit v1.2.3 From f3128d0fa1f1f14104b7c4ffab54f083b99a108e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Oct 2011 23:00:09 -0700 Subject: overhauled the front page to feel a bit more marketing-like, added the awesome glyphicons to bring some life to the docs --- bootstrap.css | 2 +- docs/assets/css/docs.css | 35 ++++++++- .../assets/img/glyphicons/glyphicons_009_magic.png | Bin 0 -> 1426 bytes .../assets/img/glyphicons/glyphicons_042_group.png | Bin 0 -> 1386 bytes .../img/glyphicons/glyphicons_079_podium.png | Bin 0 -> 1328 bytes .../img/glyphicons/glyphicons_082_roundabout.png | Bin 0 -> 1516 bytes .../glyphicons/glyphicons_155_show_thumbnails.png | Bin 0 -> 1179 bytes .../img/glyphicons/glyphicons_163_iphone.png | Bin 0 -> 1235 bytes .../img/glyphicons/glyphicons_214_resize_small.png | Bin 0 -> 1406 bytes .../img/glyphicons/glyphicons_266_book_open.png | Bin 0 -> 1405 bytes docs/index.html | 85 +++++++++++++++++++-- 11 files changed, 112 insertions(+), 10 deletions(-) create mode 100644 docs/assets/img/glyphicons/glyphicons_009_magic.png create mode 100644 docs/assets/img/glyphicons/glyphicons_042_group.png create mode 100644 docs/assets/img/glyphicons/glyphicons_079_podium.png create mode 100644 docs/assets/img/glyphicons/glyphicons_082_roundabout.png create mode 100644 docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png create mode 100644 docs/assets/img/glyphicons/glyphicons_163_iphone.png create mode 100644 docs/assets/img/glyphicons/glyphicons_214_resize_small.png create mode 100644 docs/assets/img/glyphicons/glyphicons_266_book_open.png diff --git a/bootstrap.css b/bootstrap.css index 0baa88d11..ed0556b3d 100644 --- a/bootstrap.css +++ b/bootstrap.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: Wed Oct 26 21:03:54 PDT 2011 + * Date: Thu Oct 27 12:48:41 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). diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7238badb3..66e87fdf9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -5,6 +5,7 @@ Special styles for presenting Bootstrap's documentation and examples */ + /* Body and structure -------------------------------------------------- */ body { @@ -15,6 +16,7 @@ body { background-repeat: repeat-x; } + /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ body > .navbar-fixed .brand { @@ -29,12 +31,14 @@ body > .navbar-fixed .brand:hover { text-decoration: none; } + /* Space out sub-sections more -------------------------------------------------- */ .page-header { margin-top: 36px; } + /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -119,7 +123,7 @@ body > .navbar-fixed .brand:hover { -------------------------------------------------- */ .quick-links { padding: 5px 20px; - margin: 60px 0; + margin: 45px 0; list-style: none; text-align: center; background-color: #eee; @@ -149,13 +153,40 @@ body > .navbar-fixed .brand:hover { } +/* Marketing section of Overview +-------------------------------------------------- */ +.marketing .row { + margin-bottom: 18px; +} +.marketing h1 { + margin-bottom: 18px; +} +.marketing h2, +.marketing h3 { + font-weight: 300; + color: #000; +} +.marketing h2 { + margin-bottom: 9px; +} +.marketing p { + margin-right: 10px; +} +.marketing img { + float: left; + margin: 7px 10px 0 0; +} + + /* Footer -------------------------------------------------- */ .footer { - padding: 30px 0; + margin-top: 45px; + padding: 35px 0 36px; border-top: 1px solid #e5e5e5; } .footer p { + margin-bottom: 0; color: #555; } diff --git a/docs/assets/img/glyphicons/glyphicons_009_magic.png b/docs/assets/img/glyphicons/glyphicons_009_magic.png new file mode 100644 index 000000000..ef048aaaa Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_009_magic.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_042_group.png b/docs/assets/img/glyphicons/glyphicons_042_group.png new file mode 100644 index 000000000..29393dda1 Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_042_group.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_079_podium.png b/docs/assets/img/glyphicons/glyphicons_079_podium.png new file mode 100644 index 000000000..f55445451 Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_079_podium.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_082_roundabout.png b/docs/assets/img/glyphicons/glyphicons_082_roundabout.png new file mode 100644 index 000000000..bbda0935c Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_082_roundabout.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png b/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png new file mode 100644 index 000000000..1062f4844 Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_163_iphone.png b/docs/assets/img/glyphicons/glyphicons_163_iphone.png new file mode 100644 index 000000000..bbb71dceb Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_163_iphone.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_214_resize_small.png b/docs/assets/img/glyphicons/glyphicons_214_resize_small.png new file mode 100644 index 000000000..5ecaa72b2 Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_214_resize_small.png differ diff --git a/docs/assets/img/glyphicons/glyphicons_266_book_open.png b/docs/assets/img/glyphicons/glyphicons_266_book_open.png new file mode 100644 index 000000000..de084d472 Binary files /dev/null and b/docs/assets/img/glyphicons/glyphicons_266_book_open.png differ diff --git a/docs/index.html b/docs/index.html index 64947dc15..4524b7950 100644 --- a/docs/index.html +++ b/docs/index.html @@ -127,10 +127,82 @@
      +
      +
      +
      + +

      Built for and by nerds

      +

      Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.

      +
      +
      + +

      For all skill levels

      +

      Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.

      +
      +
      + +

      Cross-everything

      +

      Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.

      +
      +
      +
      +
      + +

      12-column grid

      +

      Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.

      +
      +
      + +

      Responsive design

      +

      With Bootstrap 2, we've gone fully responsive. Our components are flexible enough to scale according to whatever resolution or device you're using to provide a consistent experience, no matter what.

      +
      +
      + +

      Styleguide docs

      +

      Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.

      +
      +
      +
      +
      + +

      Growing library

      +

      Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.

      +
      +
      + +

      Custom jQuery plugins

      +

      What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.

      +
      +
      + +

      Built on LESS

      +

      Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.

      +
      +
      +
      +
      +

      HTML5

      +

      Built to support new HTML5 elements and syntax.

      +
      +
      +

      CSS3

      +

      Progressively enhanced components for ultimate style.

      +
      +
      +

      Open-source

      +

      Built for and maintained by the community via GitHub.

      +
      +
      +

      Made at Twitter

      +

      Brought to you by experienced engineers and designers.

      +
      +
      +
      + -
      + -

      Quick-start examples

      +
      @@ -184,10 +256,9 @@ ================================================== -->
      -- cgit v1.2.3 From 9fd4e459fe829454c811118c64aa32eafd6e8b97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Oct 2011 23:34:48 -0700 Subject: adding more icons for the homepage for open source, twitter, and html5/css3 --- docs/assets/css/docs.css | 6 +++++- docs/assets/img/icon-css3.png | Bin 0 -> 1145 bytes docs/assets/img/icon-github.png | Bin 0 -> 1191 bytes docs/assets/img/icon-html5.png | Bin 0 -> 1230 bytes docs/assets/img/icon-twitter.png | Bin 0 -> 1096 bytes docs/index.html | 22 +++++++++++++--------- 6 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 docs/assets/img/icon-css3.png create mode 100644 docs/assets/img/icon-github.png create mode 100644 docs/assets/img/icon-html5.png create mode 100644 docs/assets/img/icon-twitter.png diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 66e87fdf9..79c904774 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -172,10 +172,14 @@ body > .navbar-fixed .brand:hover { .marketing p { margin-right: 10px; } -.marketing img { +.marketing .icon { float: left; margin: 7px 10px 0 0; } +.marketing .small-icon { + float: left; + margin: 4px 5px 0 0; +} /* Footer diff --git a/docs/assets/img/icon-css3.png b/docs/assets/img/icon-css3.png new file mode 100644 index 000000000..eb3651bac Binary files /dev/null and b/docs/assets/img/icon-css3.png differ diff --git a/docs/assets/img/icon-github.png b/docs/assets/img/icon-github.png new file mode 100644 index 000000000..8afcce9cb Binary files /dev/null and b/docs/assets/img/icon-github.png differ diff --git a/docs/assets/img/icon-html5.png b/docs/assets/img/icon-html5.png new file mode 100644 index 000000000..e9066c672 Binary files /dev/null and b/docs/assets/img/icon-html5.png differ diff --git a/docs/assets/img/icon-twitter.png b/docs/assets/img/icon-twitter.png new file mode 100644 index 000000000..98241d098 Binary files /dev/null and b/docs/assets/img/icon-twitter.png differ diff --git a/docs/index.html b/docs/index.html index 4524b7950..e712f6ed0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -130,69 +130,73 @@
      - +

      Built for and by nerds

      Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.

      - +

      For all skill levels

      Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.

      - +

      Cross-everything

      Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.

      - +

      12-column grid

      Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.

      - +

      Responsive design

      With Bootstrap 2, we've gone fully responsive. Our components are flexible enough to scale according to whatever resolution or device you're using to provide a consistent experience, no matter what.

      - +

      Styleguide docs

      Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.

      - +

      Growing library

      Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.

      - +

      Custom jQuery plugins

      What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.

      - +

      Built on LESS

      Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.

      +

      HTML5

      Built to support new HTML5 elements and syntax.

      +

      CSS3

      Progressively enhanced components for ultimate style.

      +

      Open-source

      Built for and maintained by the community via GitHub.

      +

      Made at Twitter

      Brought to you by experienced engineers and designers.

      -- cgit v1.2.3 From 2764cfda6dbda56b4a50561fb8cd2a8be86dc096 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 28 Oct 2011 18:38:06 -0700 Subject: remove html from body background --- bootstrap.css | 6 ++---- bootstrap.min.css | 3 +-- docs/scaffolding.html | 1 + lib/scaffolding.less | 4 +--- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index ed0556b3d..ec9217a21 100644 --- a/bootstrap.css +++ b/bootstrap.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: Thu Oct 27 12:48:41 PDT 2011 + * Date: Fri Oct 28 18:37:59 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). @@ -180,10 +180,8 @@ textarea { * Scaffolding * Basic and global styles for generating a grid system, structural layout, and page templates * ------------------------------------------------------------------------------------------- */ -html, body { - background-color: #ffffff; -} body { + background-color: #ffffff; margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; diff --git a/bootstrap.min.css b/bootstrap.min.css index b443f02e3..7eb8efe2f 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -20,8 +20,7 @@ button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:poin input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;} textarea{overflow:auto;vertical-align:top;} -html,body{background-color:#ffffff;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#404040;} +body{background-color:#ffffff;margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;} .fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.fluid-container:before,.fluid-container:after{display:table;content:"";zoom:1;*display:inline;} diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 2a5ae8bc6..de612a074 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -53,6 +53,7 @@ +
      diff --git a/lib/scaffolding.less b/lib/scaffolding.less index f15f6853c..7b8aa369a 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -7,10 +7,8 @@ // STRUCTURAL LAYOUT // ----------------- -html, body { - background-color: @white; -} body { + background-color: @white; margin: 0; font-family: @baseFontFamily; font-size: @baseFontSize; -- cgit v1.2.3 From 0218d079ad83ce5f8fd08e9f68b6f661855a27a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 29 Oct 2011 18:11:17 -0700 Subject: fix some of the docs styles at 480 to 768 --- docs/assets/css/docs.css | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 79c904774..52738d808 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -348,11 +348,6 @@ h2 + table { font-size: 18px; line-height: 24px; } - .jumbotron .benefits { - position: relative; - width: auto; - margin: 36px 0; - } .jumbotron .btn { display: block; font-size: 18px; @@ -365,6 +360,23 @@ h2 + table { margin: 40px 0 0; } +} + + +@media (max-width: 768px) { + + /* Hide the nav for now */ + body > .navbar-fixed .nav { + display: none; + } + + /* Adjust the jumbotron */ + .jumbotron .benefits { + position: relative; + width: auto; + margin: 36px 0; + } + /* Popovers */ .large-bird { display: none; @@ -395,7 +407,7 @@ h2 + table { .jumbotron h1, .jumbotron p { - margin-right: 40%; + margin-right: 0; } } -- cgit v1.2.3 From 3f512adf953da3a3fbbfca18b138fb6659f2b77f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Oct 2011 20:14:27 -0700 Subject: updated docs and type styles for blockquotes and a few fixes for type --- bootstrap.css | 8 +++++- bootstrap.min.css | 1 + docs/assets/css/docs.css | 3 +-- docs/base-css.html | 68 +++++++++++++++++++++++++++++++++++++++------- docs/index.html | 70 +----------------------------------------------- docs/scaffolding.html | 2 +- lib/type.less | 9 +++++++ 7 files changed, 78 insertions(+), 83 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index ec9217a21..ca2bfe0b1 100644 --- a/bootstrap.css +++ b/bootstrap.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: Fri Oct 28 18:37:59 PDT 2011 + * Date: Sun Oct 30 20:12:53 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). @@ -490,6 +490,12 @@ blockquote small { blockquote small:before { content: '\2014 \00A0'; } +blockquote.pull-right { + float: right; +} +blockquote.pull-right p, blockquote.pull-right small { + text-align: right; +} address { display: block; line-height: 18px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 7eb8efe2f..776cb6e7b 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -85,6 +85,7 @@ em{font-style:italic;font-weight:inherit;line-height:inherit;} abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;} blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:16px;font-weight:300;line-height:22.5px;margin-bottom:0;} blockquote small{display:block;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} +blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} address{display:block;line-height:18px;margin-bottom:18px;} code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 52738d808..185f381e9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -164,7 +164,6 @@ body > .navbar-fixed .brand:hover { .marketing h2, .marketing h3 { font-weight: 300; - color: #000; } .marketing h2 { margin-bottom: 9px; @@ -175,6 +174,7 @@ body > .navbar-fixed .brand:hover { .marketing .icon { float: left; margin: 7px 10px 0 0; + opacity: .8; } .marketing .small-icon { float: left; @@ -300,7 +300,6 @@ pre.prettyprint { margin-bottom: 0; } - .browser-support { max-width: 100%; } diff --git a/docs/base-css.html b/docs/base-css.html index 47dff40e7..750bbd2b3 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -92,8 +92,8 @@ Element - Description Usage + Optional @@ -175,24 +175,72 @@

      Blockquotes

      + + + + + + + + + + + + + + + + + + + + +
      ElementUsageOptional
      + <blockquote> + + Block-level element for quoting content from another source + +

      Add cite attribute for source URL

      + Use .pull-left and .pull-right classes for floated options +
      + <small> + + Optional element for adding a user-facing citation, typically an author with title of work + + Place the <cite> around the title or name of source +
      -
      -

      To include a blockquote, wrap <blockquote> around <p> and <small> tags. Use the <small> element to cite your source and you'll get an em dash &mdash; before it.

      -
      -

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.

      - Someone famous -
      +
      +

      To include a blockquote, wrap <blockquote> around any HTML as the quote. For straight quotes we recommend a <p>.

      +

      Include an optional <small> element to cite your source and you'll get an em dash &mdash; before it for styling purposes.

      -
      + 
       <blockquote>
-  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p>
-  <small>Dr. Julius Hibbert</small>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
+  <small>Someone famous</small>
 </blockquote>
      +
      + +

      Example blockquotes

      +
      +
      +
      +

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.

      + Someone famous +
      +
      +
      +
      +

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.

      + Someone famous +
      +
      +

      Lists

      diff --git a/docs/index.html b/docs/index.html index e712f6ed0..7b9131502 100644 --- a/docs/index.html +++ b/docs/index.html @@ -38,41 +38,6 @@
    • Components
    • Javascript plugins
    • Using LESS
      • - -
    @@ -204,40 +169,7 @@
    - - +

    Emphasis, address, and abbreviation

    - +
    @@ -175,7 +175,7 @@

    Blockquotes

    -
    Element
    +
    @@ -321,7 +321,7 @@

    Code Inline and block

    -
    Element
    +
    @@ -363,7 +363,7 @@

    Inline labels for special attention

    -
    Element
    +
    @@ -428,7 +428,7 @@

    Table markup

    -
    Labels
    +
    @@ -517,7 +517,7 @@

    Table options

    -
    Tag
    +
    @@ -592,9 +592,9 @@ <table> ... </table> -

    2. Zebra-striped

    -

    Get a little fancy with your tables by adding zebra-striping—just add the .zebra-striped class.

    -
    Name
    +

    2. Striped table

    +

    Get a little fancy with your tables by adding zebra-striping—just add the .striped-table class.

    +
    @@ -626,12 +626,12 @@
    #

    Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

    -<table class="zebra-striped">
+<table class="striped-table">
 ...
 </table>
    -

    3. Zebra-striped w/ TableSorter.js

    +

    3. Striped table w/ TableSorter.js

    Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

    - +
    @@ -668,7 +668,7 @@ $("table#sortTableExample").tablesorter({ sortList: [[1,0]] }); }); </script> -<table class="zebra-striped"> +<table class="striped-table"> ... </table> @@ -682,19 +682,49 @@

    Forms

    + +

    Four types of forms

    +
    #
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NameClassDescription
    Vertical (default).vertical-form (not required)Stacked, left-aligned labels over controls
    Horiztonal.horizontal-formFloat left, right-aligned labels on same line as controls
    Inline.inline-formLeft-aligned label and inline-block controls for compact style
    Search.search-formExtra-rounded text input for a typical search aesthetic
    + +
    -

    Four types of forms

    -

    With 2.0, we now have four types of forms to choose from:

    -
      -
    • Search form for a super-rounded input and optional button
      • -
    • Inline form for a series of elements on one line
      • -
    • Horizontal form for left-aligned labels
      • -
    • Vertical form for stacked labels and inputs
      • -
    +

    Why four types

    +

    With Bootstrap 2, we completely recoded our forms to allow for simple base styles and improved namespacing on labels and controls. To address the many uses of forms, we've included some base styles to help get you started.

    -

    +

    Vertical or horizontal

    +

    Our default form styles are now vertical, not horizontal. This makes it easier to customize bare-bones forms, as well as forms in tricker situations like sign-up, modals, etc. They share the same exact markup; just swap the class.

    @@ -875,79 +905,123 @@
    + + +

    Buttons

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NamePreviewClassDescription
    DefaultButton.btnStandard gray button with gradient
    PrimaryButton.primaryMakes button blue for more visual weight to indicate the primary action in a set of buttons
    InfoButton.infoUsed as an alternate to the default styles
    SuccessButton.successUsed to indicate a successful or positive action will be taken
    DangerButton.dangerUsed to indicate a dangerous or potentially negative action will be taken
    +
    -
    -

    Buttons

    -

    As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

    -

    All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class.

    +
    +

    Buttons for actions

    +

    As a convention, buttons should only be used for actions while hyperlinks are to be used for objects. For instance, "Download" should be a button while "recent activity" should be a link.

    -
    -

    Example buttons

    -

    Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

    -
    -      -
    -

    Alternate sizes

    +
    +

    For anchors and forms

    +

    Button styles can be applied to anything with the .btn applied. However, typically you’ll want to apply these to only <a> and <button> elements.

    +
    +
    +

    Note: All buttons must include the .btn class. Button styles should be applied to <button> and <a> elements for consistency.

    +
    +
    + +
    +
    +

    Multiple sizes

    Fancy larger or smaller buttons? Have at it!

    -
    +

    Primary action Action -

    -
    +

    +

    Primary action Action -

    +

    +
    +

    Disabled state

    For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

    -

    Links

    -
    +

    Primary action Action -

    -

    Buttons

    -
    +

    +

      -

    +

    -
    +
    -
    -
    -

    Button groups

    +

    Button groups

    + +
    +
    + Left + Middle + Right
    -
    -

    Example

    -
    -
    - Left - Middle - Right -
    +
    +
    +
    +
    + 1 + 2 + 3 + 4 + 5
    -
    -
    -
    - 1 - 2 - 3 - 4 - 5 -
    -
    - 6 - 7 - 8 -
    -
    - 9 -
    -
    - 10 -
    -
    +
    + 6 + 7 + 8 +
    +
    + 9 +
    +
    + 10
    -
    +
    diff --git a/docs/javascript.html b/docs/javascript.html index c9ac7e21d..3175d261e 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -88,7 +88,7 @@

    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.

    - +
    @@ -151,7 +151,7 @@

    Using bootstrap-modal

    $('#my-modal').modal(options)

    Options

    -
    File
    +
    @@ -209,7 +209,7 @@ $('#my-modal').modal({

    Notice Alternatively, this can be retrieved with $().data('modal').

    Events

    Bootstrap's modal class exposes a few events for hooking into modal functionality.

    -
    Name
    +
    @@ -457,7 +457,7 @@ $('#my-modal').bind('hidden', function () {

    Using bootstrap-twipsy.js

    $('#example').twipsy(options)

    Options

    -
    Event
    +
    @@ -574,7 +574,7 @@ $('#my-modal').bind('hidden', function () {

    Using boostrap-popover.js

    $('#example').popover(options)

    Options

    -
    Name
    +
    diff --git a/docs/less.html b/docs/less.html index d5a467bfa..4fa0f0bdd 100644 --- a/docs/less.html +++ b/docs/less.html @@ -166,7 +166,7 @@

    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

    -
    Name
    +
    diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 4a5aa9a0b..de50caf8d 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -161,7 +161,7 @@

    Grid customization

    -
    Method
    +
    @@ -273,7 +273,7 @@

    Supported devices

    Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

    -
    Variable
    +
    diff --git a/lib/tables.less b/lib/tables.less index 8a786ffd2..b02087fbd 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -9,14 +9,12 @@ table { width: 100%; - margin-bottom: @baseLineHeight; padding: 0; - border-collapse: separate; // Done so we can round those corners! - *border-collapse: collapse; /* IE7, collapse table to remove spacing */ + margin-bottom: @baseLineHeight; font-size: @baseFontSize; - border: 1px solid #ddd; - .border-radius(4px); - th, td { + border-collapse: collapse; + th, + td { padding: 10px 10px 9px; line-height: @baseLineHeight; text-align: left; @@ -25,22 +23,49 @@ table { padding-top: 9px; font-weight: bold; vertical-align: middle; - border-bottom: 1px solid #ddd; } td { vertical-align: top; + border-top: 1px solid #ddd; + } + // When scoped to row, fix th in tbody + tbody th { + border-top: 1px solid #ddd; + vertical-align: top; + } +} + + +// CONDENSED VERSION +// ----------------- + +.condensed-table { + th, + td { + padding: 5px 5px 4px; } +} + + +// BORDERED VERSION +// ---------------- + +.bordered-table { + border: 1px solid #ddd; + border-collapse: separate; // Done so we can round those corners! + *border-collapse: collapse; /* IE7, collapse table to remove spacing */ + .border-radius(4px); th + th, - td + td { + td + td, + th + td { border-left: 1px solid #ddd; } - tr + tr td { - border-top: 1px solid #ddd; - } - tbody tr:first-child td:first-child { + thead:first-child tr:first-child th:first-child, + tbody:first-child tr:first-child td:first-child { .border-radius(4px 0 0 0); } - tbody tr:first-child td:last-child { + thead:first-child tr:first-child th:last-child, + tbody:first-child tr:first-child td:last-child { .border-radius(0 4px 0 0); } tbody tr:last-child td:first-child { @@ -52,20 +77,55 @@ table { } +// ---------------- + +// This is a duplication of the main grid .columns() mixin, but subtracts 20px to account for input padding and border +.tableColumns(@columnSpan: 1) { + width: ((@gridColumnWidth - 20) * @columnSpan) + ((@gridColumnWidth - 20) * (@columnSpan - 1)); +} +table { + // Default columns + .span1 { .tableColumns(1); } + .span2 { .tableColumns(2); } + .span3 { .tableColumns(3); } + .span4 { .tableColumns(4); } + .span5 { .tableColumns(5); } + .span6 { .tableColumns(6); } + .span7 { .tableColumns(7); } + .span8 { .tableColumns(8); } + .span9 { .tableColumns(9); } + .span10 { .tableColumns(10); } + .span11 { .tableColumns(11); } + .span12 { .tableColumns(12); } + .span13 { .tableColumns(13); } + .span14 { .tableColumns(14); } + .span15 { .tableColumns(15); } + .span16 { .tableColumns(16); } +} + + // ZEBRA-STRIPING // -------------- // Default zebra-stripe styles (alternating gray and transparent backgrounds) -.zebra-striped { +.striped-table { tbody { - tr:nth-child(odd) td { + tr:nth-child(odd) td, + tr:nth-child(odd) th { background-color: #f9f9f9; } - tr:hover td { + tr:hover td, + tr:hover th { background-color: #f5f5f5; } } +} + +// TABLESORTER +// ----------- + +table { // Tablesorting styles w/ jQuery plugin .header { cursor: pointer; @@ -111,9 +171,6 @@ table { .opacity(60); } } -} - -table { // Blue Table Headings .blue { color: @blue; -- cgit v1.2.3 From 27b8e5e4fce71ccc5ebd56230dedd9c2403239eb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 31 Oct 2011 21:24:57 -0700 Subject: small docs tweak --- docs/base-css.html | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/base-css.html b/docs/base-css.html index 6d3d92a17..f6030ace1 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -992,7 +992,6 @@

    Button groups

    -
    Left -- cgit v1.2.3 From 31ea00304626ea68b758def41769606d4c049671 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 31 Oct 2011 21:45:46 -0700 Subject: remove alt tab styles for now, too complicated to accomplish both static and tabble; fix up CSS a bit --- bootstrap.css | 66 +++++++++++++++++++++++++++++++++++++++++++++++++--- bootstrap.min.css | 13 +++++++---- docs/components.html | 47 ++++++------------------------------- lib/patterns.less | 53 +++++++++++++++++++++++------------------ 4 files changed, 109 insertions(+), 70 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 2795e4251..163ee6bcd 100644 --- a/bootstrap.css +++ b/bootstrap.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: Mon Oct 31 19:36:50 PDT 2011 + * Date: Mon Oct 31 21:45:06 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). @@ -1495,17 +1495,77 @@ table .headerSortUp.purple, table .headerSortDown.purple { .tabbable.tabs-bottom .tabs > .active > a, .tabbable.tabs-bottom .tabs > .active > a:hover { border-color: transparent #ddd #ddd #ddd; } +.tabbable.tabs-left, .tabbable.tabs-right { + zoom: 1; +} +.tabbable.tabs-left:before, +.tabbable.tabs-right:before, +.tabbable.tabs-left:after, +.tabbable.tabs-right:after { + display: table; + content: ""; + zoom: 1; + *display: inline; +} +.tabbable.tabs-left:after, .tabbable.tabs-right:after { + clear: both; +} +.tabbable.tabs-left .tabs, .tabbable.tabs-right .tabs { + width: 100px; +} +.tabbable.tabs-left .tabs > li, .tabbable.tabs-right .tabs > li { + float: none; + margin-bottom: -1px; +} +.tabbable.tabs-left .tabs > li > a, .tabbable.tabs-right .tabs > li > a { + margin-bottom: 2px; +} +.tabbable.tabs-left .tabs > li > a:hover, .tabbable.tabs-right .tabs > li > a:hover { + border-color: transparent; +} +.tabbable.tabs-left .tab-content { + margin-left: 100px; +} .tabbable.tabs-left .tabs { float: left; } .tabbable.tabs-left .tabs > li { - float: none; + margin-right: -1px; +} +.tabbable.tabs-left .tabs > li > a { + margin-right: 0; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} +.tabbable.tabs-left .tabs > li > a:hover { + border-right-color: #ddd; +} +.tabbable.tabs-left .tabs .active > a, .tabbable.tabs-left .tabs .active > a:hover { + border-color: #ddd; + border-right-color: transparent; +} +.tabbable.tabs-right .tab-content { + margin-right: 100px; } .tabbable.tabs-right .tabs { float: right; } .tabbable.tabs-right .tabs > li { - float: none; + margin-left: -1px; +} +.tabbable.tabs-right .tabs > li > a { + margin-left: 0; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} +.tabbable.tabs-right .tabs > li > a:hover { + border-left-color: #ddd; +} +.tabbable.tabs-right .tabs .active > a, .tabbable.tabs-right .tabs .active > a:hover { + border-color: #ddd; + border-left-color: transparent; } .tabs .menu-dropdown, .tabs .dropdown-menu { top: 35px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 35f8a9bcd..9e4565905 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -240,10 +240,15 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .tabbable.tabs-bottom .tabs>li{margin-top:-1px;margin-bottom:0;} .tabbable.tabs-bottom .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabbable.tabs-bottom .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} .tabbable.tabs-bottom .tabs>.active>a,.tabbable.tabs-bottom .tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd;} -.tabbable.tabs-left .tabs{float:left;} -.tabbable.tabs-left .tabs>li{float:none;} -.tabbable.tabs-right .tabs{float:right;} -.tabbable.tabs-right .tabs>li{float:none;} +.tabbable.tabs-left,.tabbable.tabs-right{zoom:1;}.tabbable.tabs-left:before,.tabbable.tabs-right:before,.tabbable.tabs-left:after,.tabbable.tabs-right:after{display:table;content:"";zoom:1;*display:inline;} +.tabbable.tabs-left:after,.tabbable.tabs-right:after{clear:both;} +.tabbable.tabs-left .tabs,.tabbable.tabs-right .tabs{width:100px;}.tabbable.tabs-left .tabs>li,.tabbable.tabs-right .tabs>li{float:none;margin-bottom:-1px;}.tabbable.tabs-left .tabs>li>a,.tabbable.tabs-right .tabs>li>a{margin-bottom:2px;}.tabbable.tabs-left .tabs>li>a:hover,.tabbable.tabs-right .tabs>li>a:hover{border-color:transparent;} +.tabbable.tabs-left .tab-content{margin-left:100px;} +.tabbable.tabs-left .tabs{float:left;}.tabbable.tabs-left .tabs>li{margin-right:-1px;}.tabbable.tabs-left .tabs>li>a{margin-right:0;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}.tabbable.tabs-left .tabs>li>a:hover{border-right-color:#ddd;} +.tabbable.tabs-left .tabs .active>a,.tabbable.tabs-left .tabs .active>a:hover{border-color:#ddd;border-right-color:transparent;} +.tabbable.tabs-right .tab-content{margin-right:100px;} +.tabbable.tabs-right .tabs{float:right;}.tabbable.tabs-right .tabs>li{margin-left:-1px;}.tabbable.tabs-right .tabs>li>a{margin-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}.tabbable.tabs-right .tabs>li>a:hover{border-left-color:#ddd;} +.tabbable.tabs-right .tabs .active>a,.tabbable.tabs-right .tabs .active>a:hover{border-color:#ddd;border-left-color:transparent;} .tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} .tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} .tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} diff --git a/docs/components.html b/docs/components.html index c18d8c113..73a049298 100644 --- a/docs/components.html +++ b/docs/components.html @@ -245,39 +245,6 @@ <li><a href="#">Contact</a></li> </ul> -

    Alternate tabs

    -

    You can also use tabs that are stacked on either side of an element, or on the bottom.

    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -

    Tabbable tabs

    As mentioned above, you can bring your tabs to life with a simple plugin. Here we have integrated all four variations of the tabs—default (top), right, bottom, left—with example tab areas.

    @@ -315,20 +282,20 @@

    Section 1

    -

    Oh hai!

    +

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    Section 2

    -

    Oh hai!

    +

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    Section 3

    -

    Oh hai!

    +

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    -
    +
    • Section 1
      • @@ -338,15 +305,15 @@

      Section 1

      -

      Oh hai!

      +

      Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

      Section 2

      -

      Oh hai!

      +

      Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

      Section 3

      -

      Oh hai!

      +

      Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    diff --git a/lib/patterns.less b/lib/patterns.less index 1db315831..367347e27 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -378,34 +378,48 @@ border-color: transparent #ddd #ddd #ddd; } - // Tabs on left - &.tabs-left { + // Tabs on left and right + &.tabs-left, + &.tabs-right { .clearfix(); + .tabs { + // Give a fixed width to avoid floating .tab-con + width: 100px; + // Unfloat them so they stack + > li { + float: none; + margin-bottom: -1px; + > a { + margin-bottom: 2px; + &:hover { + border-color: transparent; + } + } + } + } + } + // Tabs on left + &.tabs-left { .tab-content { - float: left; + margin-left: 100px; } .tabs { float: left; - > li { - float: none; - margin-bottom: -1px; margin-right: -1px; > a { margin-right: 0; - margin-bottom: 2px; .border-radius(4px 0 0 4px); &:hover { - border-color: transparent; border-right-color: #ddd; } } } - - > .active > a, - > .active > a:hover { + // Active state + .active > a, + .active > a:hover { border-color: #ddd; border-right-color: transparent; } @@ -414,32 +428,25 @@ // Tabs on right &.tabs-right { - .clearfix(); - .tab-content { - float: right; + margin-right: 100px; } .tabs { float: right; - > li { - float: none; - margin-bottom: -1px; margin-left: -1px; > a { margin-left: 0; - margin-bottom: 2px; - .border-radius(4px 0 0 4px); + .border-radius(0 4px 4px 0); &:hover { - border-color: transparent; border-left-color: #ddd; } } } - - > .active > a, - > .active > a:hover { + // Active state + .active > a, + .active > a:hover { border-color: #ddd; border-left-color: transparent; } -- cgit v1.2.3 From f459f826af827735f8bfea2e850dba1151b19efc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 31 Oct 2011 21:46:45 -0700 Subject: recompiling and pushing just to be sure --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index 163ee6bcd..2c35362d0 100644 --- a/bootstrap.css +++ b/bootstrap.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: Mon Oct 31 21:45:06 PDT 2011 + * Date: Mon Oct 31 21:46:38 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). -- cgit v1.2.3 From 2534fee7538526e2b4e263258fe62953cf08f159 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 1 Nov 2011 13:56:00 -0700 Subject: adding unofficial github buttons --- docs/assets/css/docs.css | 41 ++++++++++++++++++++++++++++++++++- docs/assets/img/github-16px.png | Bin 0 -> 398 bytes docs/index.html | 46 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 docs/assets/img/github-16px.png diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 185f381e9..2dde6a452 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -39,6 +39,44 @@ body > .navbar-fixed .brand:hover { } +/* Github buttons +-------------------------------------------------- */ +.github-btn + .github-btn { + margin-left: 10px; +} +.github-btn { + display: inline-block; + height: 20px; + overflow: hidden; +} +.github-btn .btn, +.github-btn .count { + float: left; + padding: 1px 5px 1px 4px; + font-size: 11px; + font-weight: normal; + line-height: 16px; + color: #555; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.github-btn .btn { + box-shadow: none; +} +.github-btn .github-ico { + float: left; + margin-right: 4px; + opacity: .75; +} +.github-btn .count { + display: inline-block; + margin-left: 2px; + background-color: #fff; + border: 1px solid #ddd; +} + + /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -59,7 +97,7 @@ body > .navbar-fixed .brand:hover { font-weight: 300; line-height: 36px; } -.jumbotron .btn { +.jumbotron .btn-large { font-size: 20px; padding: 14px 24px; margin-right: 5px; @@ -146,6 +184,7 @@ body > .navbar-fixed .brand:hover { font-weight: normal; color: #999; } +.quick-links .github-btn, .quick-links .tweet-btn, .quick-links .follow-btn { position: relative; diff --git a/docs/assets/img/github-16px.png b/docs/assets/img/github-16px.png new file mode 100644 index 000000000..c99ab237a Binary files /dev/null and b/docs/assets/img/github-16px.png differ diff --git a/docs/index.html b/docs/index.html index 7b9131502..ffc81596e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -57,6 +57,7 @@ Download on GitHub Currently v2.0.0

    +

    Feature highlights

      @@ -79,9 +80,29 @@
    • Roadmap
    • Changelog
    • ·
      • +
    • + + + + Watch + + + + + + + Fork + + + +
      • + + +
    • ·
    - -
    @@ -105,7 +119,7 @@
    - + @@ -164,35 +178,35 @@ - + - + - +
    LabelThe alert plugin is a super tiny class for adding close functionality to alerts.
    bootstrap-dropdown.jsbootstrap-dropdown.js This plugin is for adding dropdown interaction to the bootstrap navbar or tabbed navigations.
    backdrop booleanfalsetrue Includes a modal-backdrop element
    keyboard booleanfalsetrue Closes the modal when escape key is pressed
    show booleanfalsetrue Opens modal on class initialization

    Markup

    -

    You can activate modals on your page easily without having to write a single line of javascript. Just give an element a data-controls-modal attribute which corresponds to a modal element id, and when clicked, it will launch your modal. To add modal options, just include them as data attributes as well.

    +

    You can activate modals on your page easily without having to write a single line of javascript. Just give an element a data-controls-modal attribute which corresponds to a modal element id, and when clicked, it will launch your modal. To add modal options, just include them as data attributes.

     <a class="btn" data-controls-modal="my-modal" data-backdrop="true" >Launch Modal</a>
    -

    Notice If you want your modal to animate in and out, just add a .fade class to your .modal element (refer to the demo to see this in action).

    +

    Notice If you want your modal to animate in and out, just add a .fade class to the .modal element (refer to the demo to see this in action).

    Methods

    .modal(options)

    Activates your content as a modal. Accepts an optional options object. 

     $('#my-modal').modal({
-  closeOnEscape: true
+  keyboard: false
 })

    .modal('toggle')

    Manually toggles a modal.

    @@ -203,10 +217,6 @@ $('#my-modal').modal({

    .modal('hide')

    Manually hides a modal.

    $('#my-modal').modal('hide')
    -

    .modal(true)

    -

    Returns an elements modal class instance.

    - 
    $('#my-modal').modal(true)
    -

    Notice Alternatively, this can be retrieved with $().data('modal').

    Events

    Bootstrap's modal class exposes a few events for hooking into modal functionality.

    @@ -255,7 +265,7 @@ $('#my-modal').bind('hidden', function () { Close - + @@ -275,14 +285,14 @@ $('#my-modal').bind('hidden', function () {

    Using boostrap-dropdown.js

    - 
    $('#navbar').dropdown()
    + 
    $('.dropdown-toggle').dropdown()

    Markup

    -

    To quickly add dropdown functionality to any nav element, use the data-dropdown attribute. Any valid bootstrap dropdown will automatically be activated.

    +

    To quickly add dropdown functionality to any element just add data-toggle="dropdown". Any valid bootstrap dropdown will automatically be activated.

     <ul class="tabs">
   <li class="active"><a href="#">Home</a></li>
-  <li class="dropdown" data-dropdown="true" >
-    <a href="#" class="dropdown-toggle">Dropdown</a>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>
     <ul class="dropdown-menu">
       <li><a href="#">Secondary link</a></li>
       <li><a href="#">Something else here</a></li>
@@ -310,7 +320,7 @@ $('#my-modal').bind('hidden', function () {
                 
                 
      
                   
    • 
-                    Dropdown 1
+                    Dropdown 1
                     
                   
      • 
                   
    • 
-                    Dropdown 2
+                    Dropdown 2
                     
        
                       
      • Secondary link
        • 
                       
      • Something else here
        • 
@@ -351,21 +361,60 @@ $('#my-modal').bind('hidden', function () {
           
        Using boostrap-scrollspy.js
        
           
        $('#navbar').dropdown()
        
           
        Markup
        
-          
        To easily add scrollspy behavior to your nav, just add the data-scrollspy attribute to the .navbar.
-          
        <div class="navbar" data-scrollspy="scrollspy" >...</div>
        
-          
        Methods
        
-          
        $().scrollspy()
        
-          
        
-          Auto activates navigation buttons by users scroll position.
-          
        
-          
        $('body > .navbar').scrollSpy()
        
+          
        To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body).
+          
        <body data-spy="scroll" >...</body>
        
            
        Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
-          
        
-          
        .scrollspy('refresh')
        
-          
        The scrollspy caches nav buttons and section coordinates for performance. If you need to update this cache (likely if you have dynamic content) just call this refresh method. If you used the data attribute to define your scrollspy, just call refresh on the body.
        
-          
        $('body').scrollspy('refresh')
        
           
        Demo
        
-          
        Checkout the the navbar navigation on this page.
        
+          
        
+            Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!
        
+          
        
+
+          
        
+
+          
        
+            
        @fat
        
+            
        
+            Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
+            
        
+            
        @mdo
        
+            
        
+            Veniam marfa mustache skateboard, adipisicing fugiat velit pitchfork beard. Freegan beard aliqua cupidatat mcsweeney's vero. Cupidatat four loko nisi, ea helvetica nulla carles. Tattooed cosby sweater food truck, mcsweeney's quis non freegan vinyl. Lo-fi wes anderson +1 sartorial. Carles non aesthetic exercitation quis gentrify. Brooklyn adipisicing craft beer vice keytar deserunt.
+            
        
+            
        one
        
+            
        
+            Occaecat commodo aliqua delectus. Fap craft beer deserunt skateboard ea. Lomo bicycle rights adipisicing banh mi, velit ea sunt next level locavore single-origin coffee in magna veniam. High life id vinyl, echo park consequat quis aliquip banh mi pitchfork. Vero VHS est adipisicing. Consectetur nisi DIY minim messenger bag. Cred ex in, sustainable delectus consectetur fanny pack iphone.
+            
        
+            
        two
        
+            
        
+            In incididunt echo park, officia deserunt mcsweeney's proident master cleanse thundercats sapiente veniam. Excepteur VHS elit, proident shoreditch +1 biodiesel laborum craft beer. Single-origin coffee wayfarers irure four loko, cupidatat terry richardson master cleanse. Assumenda you probably haven't heard of them art party fanny pack, tattooed nulla cardigan tempor ad. Proident wolf nesciunt sartorial keffiyeh eu banh mi sustainable. Elit wolf voluptate, lo-fi ea portland before they sold out four loko. Locavore enim nostrud mlkshk brooklyn nesciunt.
+            
        
+            
        three
        
+            
        
+            Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
+            
        
+            
        Keytar twee blog, culpa messenger bag marfa whatever delectus food truck. Sapiente synth id assumenda. Locavore sed helvetica cliche irony, thundercats you probably haven't heard of them consequat hoodie gluten-free lo-fi fap aliquip. Labore elit placeat before they sold out, terry richardson proident brunch nesciunt quis cosby sweater pariatur keffiyeh ut helvetica artisan. Cardigan craft beer seitan readymade velit. VHS chambray laboris tempor veniam. Anim mollit minim commodo ullamco thundercats.
+            
        
+          
        
+
    @@ -414,27 +463,59 @@ $('#my-modal').bind('hidden', function () { }) </script>

    +

    Events

    +
    + + + + + + + + + + + + +
    EventDescription
    changeThis event fires on tab change. Use event.target and event.relatedTarget to target the active tab and the previous active tab respectively.
    + + 
    +$('.tabs a').bind('change', function (e) {
+  e.target // activated tab
+  e.relatedTarget // previous tab
+})

    Demo

    -
    - -
    -
    -

    Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

    -
    -
    -

    Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.

    -
    -
    -

    Banksy do proident, brooklyn photo booth delectus sunt artisan sed organic exercitation eiusmod four loko. Quis tattooed iphone esse aliqua. Master cleanse vero fixie mcsweeney's. Ethical portland aute, irony food truck pitchfork lomo eu anim. Aesthetic blog DIY, ethical beard leggings tofu consequat whatever cardigan nostrud. Helvetica you probably haven't heard of them carles, marfa veniam occaecat lomo before they sold out in shoreditch scenester sustainable thundercats. Consectetur tofu craft beer, mollit brunch fap echo park pitchfork mustache dolor.

    -
    -
    -

    Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seitan squid ad wolf bicycle rights blog. Et aute readymade farm-to-table carles 8-bit, nesciunt nulla etsy adipisicing organic ea. Master cleanse mollit high life, next level Austin nesciunt american apparel twee mustache adipisicing reprehenderit hoodie portland irony. Aliqua tofu quinoa +1 commodo eiusmod. High life williamsburg cupidatat twee homo leggings. Four loko vinyl DIY consectetur nisi, marfa retro keffiyeh vegan. Fanny pack viral retro consectetur gentrify fap.

    -
    + +
    +
    +

    Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

    +
    +
    +

    Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.

    +
    +
    +

    Banksy do proident, brooklyn photo booth delectus sunt artisan sed organic exercitation eiusmod four loko. Quis tattooed iphone esse aliqua. Master cleanse vero fixie mcsweeney's. Ethical portland aute, irony food truck pitchfork lomo eu anim. Aesthetic blog DIY, ethical beard leggings tofu consequat whatever cardigan nostrud. Helvetica you probably haven't heard of them carles, marfa veniam occaecat lomo before they sold out in shoreditch scenester sustainable thundercats. Consectetur tofu craft beer, mollit brunch fap echo park pitchfork mustache dolor.

    +
    +
    +

    Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seitan squid ad wolf bicycle rights blog. Et aute readymade farm-to-table carles 8-bit, nesciunt nulla etsy adipisicing organic ea. Master cleanse mollit high life, next level Austin nesciunt american apparel twee mustache adipisicing reprehenderit hoodie portland irony. Aliqua tofu quinoa +1 commodo eiusmod. High life williamsburg cupidatat twee homo leggings. Four loko vinyl DIY consectetur nisi, marfa retro keffiyeh vegan. Fanny pack viral retro consectetur gentrify fap.

    +
    + +
    @@ -473,36 +554,12 @@ $('#my-modal').bind('hidden', function () { true apply a css fade transition to the tooltip - - delayIn - number - 0 - delay before showing tooltip (ms) - - - delayOut - number - 0 - delay before hiding tooltip (ms) - - - fallback - string - '' - text to use when no tooltip title is present - placement string 'above' how to position the tooltip - above | below | left | right - - html - boolean - false - allows html content within tooltip - live boolean @@ -515,20 +572,28 @@ $('#my-modal').bind('hidden', function () { 0 pixel offset of tooltip from target element - - title - string | function - 'title' - attribute or method for retrieving title text - trigger string 'hover' how tooltip is triggered - hover | focus | manual + + delay + number | object + 0 + +

    delay showing/hiding the tooltip (ms)

    +

    If a number is supplied, delay is applied to both hide/show

    +

    Object structure is: delay: { show: 500, hide: 100 }

    + + +

    Notice Individual twipsy instance options can alternatively be specified through the use of data attributes.

    +

    Markup

    +

    Twipsy's should contain a title tag which will be use to fill the tip content.

    + 

    <a href="#" rel='twipsy' title='twipsy text'>@fat</a>

    Methods

    $().twipsy(options)

    Attaches a twipsy handler to an element collection.

    @@ -538,22 +603,11 @@ $('#my-modal').bind('hidden', function () {

    .twipsy('hide')

    Hides an elements twipsy.

    $('#element').twipsy('hide')
    -

    .twipsy(true)

    -

    Returns an elements twipsy class instance.

    - 
    $('#element').twipsy(true)
    -

    Notice Alternatively, this can be retrieved with $().data('twipsy').

    Demo

    Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.

    -
    @@ -591,34 +645,16 @@ $('#my-modal').bind('hidden', function () { apply a css fade transition to the tooltip - delayIn - number - 0 - delay before showing tooltip (ms) - - - delayOut - number + delay + number | object 0 - delay before hiding tooltip (ms) - - - fallback - string - '' - text to use when no tooltip title is present + delay before showing/hiding the tooltip (ms) placement string 'right' - how to position the tooltip - above | below | left | right - - - html - boolean - false - allows html content within tooltip + how to position the popover - above | below | left | right live @@ -632,18 +668,6 @@ $('#my-modal').bind('hidden', function () { 0 pixel offset of tooltip from target element - - title - string | function - 'title' - attribute or method for retrieving title text - - - content - string | function - 'data-content' - attribute or method for retrieving content text - trigger string @@ -652,6 +676,12 @@ $('#my-modal').bind('hidden', function () { +

    Notice Individual popover instance options can alternatively be specified through the use of data attributes.

    +

    Markup

    +

    Popover's should contain a title tag and a data-content attribute.

    +

    <a href="#" class="btn" rel="popover" title="A Title" data-content="Some content">
+  hover for popover
+</a>

    Methods

    $().popover(options)

    Initializes popovers for an element collection.

    @@ -663,17 +693,6 @@ $('#my-modal').bind('hidden', function () { 
    $('#element').popover('hide')

    Demo

    hover for popover -
    @@ -695,7 +714,8 @@ $('#my-modal').bind('hidden', function () {

    Using bootstrap-alerts.js

    $(".alert-message").alert()

    Markup

    -

    Just add a data-alert attribute to your alert messages to automatically give them close functionality.

    +

    Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.

    + 
    <a class="close" data-dismiss="alert" href="#">&times;</a>

    Methods

    $().alert()

    Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.

    @@ -703,12 +723,12 @@ $('#my-modal').bind('hidden', function () {

    Closes an alert.

    $(".alert-message").alert('close')

    Demo

    -
    - × +
    + ×

    Holy guacamole! Best check yo self, you’re not looking too good.

    -
    - × +
    + ×

    Oh snap! You got an error! Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.

    Take this action Or do this @@ -729,17 +749,5 @@ $('#my-modal').bind('hidden', function () {

    - - - - - - - - - - - - diff --git a/js/bootstrap-alerts.js b/js/bootstrap-alerts.js index 3ef1672bc..600440e40 100644 --- a/js/bootstrap-alerts.js +++ b/js/bootstrap-alerts.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-alerts.js v1.4.0 + * bootstrap-alerts.js v2.0.0 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2011 Twitter, Inc. @@ -22,34 +22,6 @@ "use strict" - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - var transitionEnd - - $(document).ready(function () { - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - return support - })() - - // set CSS transition event type - if ( $.support.transition ) { - transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - } - - }) - /* ALERT CLASS DEFINITION * ====================== */ @@ -76,7 +48,7 @@ } $.support.transition && $element.hasClass('fade') ? - $element.bind(transitionEnd, removeElement) : + $element.bind($.support.transition.end, removeElement) : removeElement() } @@ -88,10 +60,6 @@ $.fn.alert = function ( options ) { - if ( options === true ) { - return this.data('alert') - } - return this.each(function () { var $this = $(this) , data @@ -112,13 +80,11 @@ } $.fn.alert.defaults = { - selector: '.close' + selector: '[data-dismiss="alert"]' } - $(document).ready(function () { - new Alert($('body'), { - selector: '.alert-message[data-alert] .close' - }) + $(function () { + new Alert( $('body') ) }) }( window.jQuery || window.ender ); \ No newline at end of file diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index cab0ec27e..bb7d11b1f 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-dropdown.js v1.4.0 + * bootstrap-dropdown.js v2.0.0 * http://twitter.github.com/bootstrap/javascript.html#dropdown * ============================================================ * Copyright 2011 Twitter, Inc. @@ -22,34 +22,45 @@ "use strict" + /* SIMPLE DROPDOWN LOGIC + * ===================== */ + + var s = '[data-toggle="dropdown"]' + + function clearMenus() { + $(s).parent('li').removeClass('open') + } + + function toggle(e) { + var li = $(this).parent('li') + , isActive = li.hasClass('open') + + clearMenus() + !isActive && li.toggleClass('open') + + return false + } + + /* DROPDOWN PLUGIN DEFINITION * ========================== */ $.fn.dropdown = function ( selector ) { return this.each(function () { - $(this).delegate(selector || d, 'click', function (e) { - var li = $(this).parent('li') - , isActive = li.hasClass('open') - - clearMenus() - !isActive && li.toggleClass('open') - return false - }) + var args = ['click', toggle] + , $this = $(this) + selector && args.unshift(selector) + $this[selector ? 'delegate' : 'bind'].apply($this, args) }) } + /* APPLY TO STANDARD DROPDOWN ELEMENTS * =================================== */ - var d = 'a.menu, .dropdown-toggle' - - function clearMenus() { - $(d).parent('li').removeClass('open') - } - $(function () { $('html').bind("click", clearMenus) - $('body').dropdown( '[data-dropdown] a.menu, [data-dropdown] .dropdown-toggle' ) + $('body').dropdown(s) }) }( window.jQuery || window.ender ); \ No newline at end of file diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index be2315afb..ccc7b133b 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -22,35 +22,6 @@ "use strict" - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - var transitionEnd - - $(document).ready(function () { - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - return support - })() - - // set CSS transition event type - if ( $.support.transition ) { - transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - } - - }) - - /* MODAL PUBLIC CLASS DEFINITION * ============================= */ @@ -92,7 +63,7 @@ that.$element.addClass('in') transition ? - that.$element.one(transitionEnd, function () { that.$element.trigger('shown') }) : + that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : that.$element.trigger('shown') }) @@ -130,14 +101,13 @@ * ===================== */ function hideWithTransition() { - // firefox drops transitionEnd events :{o var that = this , timeout = setTimeout(function () { - that.$element.unbind(transitionEnd) + that.$element.unbind($.support.transition.end) hideModal.call(that) }, 500) - this.$element.one(transitionEnd, function () { + this.$element.one($.support.transition.end, function () { clearTimeout(timeout) hideModal.call(that) }) @@ -171,14 +141,14 @@ this.$backdrop.addClass('in') doAnimate ? - this.$backdrop.one(transitionEnd, callback) : + this.$backdrop.one($.support.transition.end, callback) : callback() } else if ( !this.isShown && this.$backdrop ) { this.$backdrop.removeClass('in') $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one(transitionEnd, $.proxy(removeBackdrop, this)) : + this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : removeBackdrop.call(this) } else if ( callback ) { @@ -240,9 +210,9 @@ $.fn.modal.Modal = Modal $.fn.modal.defaults = { - backdrop: false - , keyboard: false - , show: false + backdrop: true + , keyboard: true + , show: true } @@ -252,7 +222,7 @@ $(document).ready(function () { $('body').delegate('[data-controls-modal]', 'click', function (e) { e.preventDefault() - var $this = $(this).data('show', true) + var $this = $(this) $('#' + $this.attr('data-controls-modal')).modal( $this.data() ) }) }) diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index c23741735..d0bd83131 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-popover.js v1.4.0 + * bootstrap-popover.js v2.0.0 * http://twitter.github.com/bootstrap/javascript.html#popover * =========================================================== * Copyright 2011 Twitter, Inc. @@ -36,8 +36,8 @@ setContent: function () { var $tip = this.tip() - $tip.find('.title')[this.options.html ? 'html' : 'text'](this.getTitle()) - $tip.find('.content > *')[this.options.html ? 'html' : 'text'](this.getContent()) + $tip.find('.title')['html'](this.getTitle()) + $tip.find('.content > *')['html'](this.getContent()) $tip[0].className = 'popover' } diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 1269d91ec..91c2dcb1e 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -20,33 +20,34 @@ !function ( $ ) { - var $window = $(window) - function ScrollSpy() { var process = $.proxy(this.process, this) - this.$topbar = $('body') - this.selector = '[data-scrollspy] li > a' + this.selector = '.nav li > a' + + this.$body = $('body').delegate(this.selector, 'click', process) + this.$scrollElement = $('[data-spy="scroll"]').bind('scroll', process) + this.refresh() - this.$topbar.delegate(this.selector, 'click', process) - $window.scroll(process) this.process() } ScrollSpy.prototype = { refresh: function () { - this.targets = this.$topbar.find(this.selector).map(function () { - var href = $(this).attr('href') - return /^#\w/.test(href) && $(href).length ? href : null - }) + this.targets = this.$body + .find(this.selector) + .map(function () { + var href = $(this).attr('href') + return /^#\w/.test(href) && $(href).length ? href : null + }) this.offsets = $.map(this.targets, function (id) { - return $(id).offset().top + return $(id).position().top }) } , process: function () { - var scrollTop = $window.scrollTop() + 10 + var scrollTop = this.$scrollElement.scrollTop() + 10 , offsets = this.offsets , targets = this.targets , activeTarget = this.activeTarget @@ -65,11 +66,11 @@ this.activeTarget = target - this.$topbar + this.$body .find(this.selector).parent('.active') .removeClass('active') - active = this.$topbar + active = this.$body .find(this.selector + '[href="' + target + '"]') .parent('li') .addClass('active') @@ -82,8 +83,6 @@ } - $(function () { - new ScrollSpy() - }) + $(function () { new ScrollSpy() }) }( window.jQuery || window.ender ) \ No newline at end of file diff --git a/js/bootstrap-tabs.js b/js/bootstrap-tabs.js index 790180ca2..35418fd44 100644 --- a/js/bootstrap-tabs.js +++ b/js/bootstrap-tabs.js @@ -1,5 +1,5 @@ /* ======================================================== - * bootstrap-tabs.js v1.4.0 + * bootstrap-tabs.js v2.0.0 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2011 Twitter, Inc. diff --git a/js/bootstrap-transitions.js b/js/bootstrap-transitions.js index 49b5338a8..25f8b111f 100644 --- a/js/bootstrap-transitions.js +++ b/js/bootstrap-transitions.js @@ -38,7 +38,7 @@ $(function () { transitionEnd = "oTransitionEnd" } return transitionEnd - })() + }()) } })() diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index fc22d0218..19e43a723 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-twipsy.js v1.4.0 + * bootstrap-twipsy.js v2.0.0 * http://twitter.github.com/bootstrap/javascript.html#twipsy * Adapted from the original jQuery.tipsy by Jason Frame * ========================================================== @@ -18,40 +18,10 @@ * limitations under the License. * ========================================================== */ - !function( $ ) { "use strict" - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - var transitionEnd - - $(document).ready(function () { - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - return support - })() - - // set CSS transition event type - if ( $.support.transition ) { - transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - } - - }) - - /* TWIPSY PUBLIC CLASS DEFINITION * ============================== */ @@ -119,7 +89,7 @@ , setContent: function () { var $tip = this.tip() - $tip.find('.twipsy-inner')[this.options.html ? 'html' : 'text'](this.getTitle()) + $tip.find('.twipsy-inner').html(this.getTitle()) $tip[0].className = 'twipsy' } @@ -134,7 +104,7 @@ } $.support.transition && this.$tip.hasClass('fade') ? - $tip.bind(transitionEnd, removeElement) : + $tip.bind( $.support.transition.end, removeElement) : removeElement() } @@ -164,7 +134,7 @@ title = ('' + title).replace(/(^\s*|\s*$)/, "") - return title || o.fallback + return title } , tip: function() { @@ -219,18 +189,21 @@ , eventIn , eventOut - if (options === true) { - return this.data(name) - } else if (typeof options == 'string') { + if (typeof options == 'string') { twipsy = this.data(name) - if (twipsy) { - twipsy[options]() - } + if (twipsy) twipsy[options]() return this } options = $.extend({}, $.fn[name].defaults, options) + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay + , hide: options.delay + } + } + function get(ele) { var twipsy = $.data(ele, name) @@ -246,7 +219,7 @@ var twipsy = get(this) twipsy.hoverState = 'in' - if (options.delayIn == 0) { + if (!options.delay || !options.delay.show) { twipsy.show() } else { twipsy.fixTitle() @@ -254,21 +227,21 @@ if (twipsy.hoverState == 'in') { twipsy.show() } - }, options.delayIn) + }, options.delay.show) } } function leave() { var twipsy = get(this) twipsy.hoverState = 'out' - if (options.delayOut == 0) { + if (!options.delay || !options.delay.hide) { twipsy.hide() } else { setTimeout(function() { if (twipsy.hoverState == 'out') { twipsy.hide() } - }, options.delayOut) + }, options.delay.hide) } } @@ -292,15 +265,12 @@ $.fn.twipsy.defaults = { animate: true - , delayIn: 0 - , delayOut: 0 - , fallback: '' + , delay: 0 , placement: 'above' - , html: false , live: false , offset: 0 - , title: 'title' , trigger: 'hover' + , title: 'title' , template: '
    ' } diff --git a/lib/twipsy.less b/lib/twipsy.less index 4193eda5f..3fa21fa01 100644 --- a/lib/twipsy.less +++ b/lib/twipsy.less @@ -8,8 +8,8 @@ visibility: visible; padding: 5px; font-size: 11px; - .opacity(80); - &.fade.in { + .opacity(0); + &.in { .opacity(80); } &.above .twipsy-arrow { #popoverArrow > .above(); } -- cgit v1.2.3 From 8a891f2a7b9720845932c0be8853fc25c6e49eed Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 20 Nov 2011 21:06:32 -0800 Subject: act on all twipsy instances --- js/bootstrap-twipsy.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 19e43a723..3cb9841c5 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -190,9 +190,10 @@ , eventOut if (typeof options == 'string') { - twipsy = this.data(name) - if (twipsy) twipsy[options]() - return this + return this.each(function (){ + twipsy = $.data(this, name) + if (twipsy) twipsy[options]() + }) } options = $.extend({}, $.fn[name].defaults, options) -- cgit v1.2.3 From 47c7f655ac455cf76a4865f129a523a91486d3ad Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 20 Nov 2011 21:13:28 -0800 Subject: update comment numbers --- js/bootstrap-buttons.js | 2 +- js/bootstrap-modal.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/bootstrap-buttons.js b/js/bootstrap-buttons.js index 16fa161cb..2fe1a7352 100644 --- a/js/bootstrap-buttons.js +++ b/js/bootstrap-buttons.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-buttons.js v1.4.0 + * bootstrap-buttons.js v2.0.0 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2011 Twitter, Inc. diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index ccc7b133b..e15b1237c 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -1,5 +1,5 @@ /* ========================================================= - * bootstrap-modal.js v1.4.0 + * bootstrap-modal.js v2.0.0 * http://twitter.github.com/bootstrap/javascript.html#modal * ========================================================= * Copyright 2011 Twitter, Inc. -- cgit v1.2.3 From 36a7eb3851855b608266f301a63b561ac316bca9 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 20 Nov 2011 21:36:26 -0800 Subject: add build script for minified files and allow elements to be returned to getContent and title in popovers --- .gitignore | 3 ++- Makefile | 19 +++++++++++++++++++ js/bootstrap-popover.js | 8 ++++++-- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 496ee2ca6..38ad09099 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.DS_Store \ No newline at end of file +.DS_Store +js/min \ No newline at end of file diff --git a/Makefile b/Makefile index 294f0ed72..e5c083ae6 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ BOOTSTRAP = ./bootstrap.css BOOTSTRAP_MIN = ./bootstrap.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less LESS_COMPESSOR ?= `which lessc` +UGLIFY_JS ?= `which uglifyjs` WATCHR ?= `which watchr` build: @@ -18,6 +19,24 @@ build: echo "You can install it by running: npm install less -g"; \ fi +uglify: + @@if test ! -z ${UGLIFY_JS}; then \ + mkdir -p js/min; \ + uglifyjs -o js/min/bootstrap-accordion.js js/bootstrap-accordion.js;\ + uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alerts.js;\ + uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-buttons.js;\ + uglifyjs -o js/min/bootstrap-dropdown.js js/bootstrap-dropdown.js;\ + uglifyjs -o js/min/bootstrap-modal.js js/bootstrap-modal.js;\ + uglifyjs -o js/min/bootstrap-popover.js js/bootstrap-popover.js;\ + uglifyjs -o js/min/bootstrap-scrollspy.js js/bootstrap-scrollspy.js;\ + uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tabs.js;\ + uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transitions.js;\ + uglifyjs -o js/min/bootstrap-twipsy.js js/bootstrap-twipsy.js;\ + else \ + echo "You must have the UGLIFYJS minifier installed in order to minify Bootstrap's js."; \ + echo "You can install it by running: npm install uglify-js -g"; \ + fi + watch: @@if test ! -z ${WATCHR}; then \ echo "Watching less files..."; \ diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index d0bd83131..934ab0545 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -36,8 +36,12 @@ setContent: function () { var $tip = this.tip() - $tip.find('.title')['html'](this.getTitle()) - $tip.find('.content > *')['html'](this.getContent()) + , title = this.getTitle() + , content = this.getContent() + + $tip.find('.title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) + $tip.find('.content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) + $tip[0].className = 'popover' } -- cgit v1.2.3 From b2650859d6c6dcb0665311b6e983d230fee1111f Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 24 Nov 2011 14:43:26 -0800 Subject: update buttons js for button groups --- bootstrap.css | 4 +- bootstrap.min.css | 2 +- docs/javascript.html | 112 +++++++++++++++++++++++++++++++++++++++++++++++- js/bootstrap-buttons.js | 32 +++++++++----- lib/patterns.less | 1 + 5 files changed, 136 insertions(+), 15 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index d6cc76b6d..895f1c861 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sun Nov 20 20:05:48 PST 2011 + * Date: Thu Nov 24 13:45:21 PST 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). @@ -1643,7 +1643,7 @@ footer { border-color: #0064cd #0064cd #003f81; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn:active { +.btn.active, .btn:active { -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); diff --git a/bootstrap.min.css b/bootstrap.min.css index 69441b76e..333e4db18 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -247,7 +247,7 @@ footer{padding-top:17px;margin-top:17px;border-top:1px solid #eee;} .btn{display:inline-block;padding:5px 14px 6px;font-size:13px;line-height:normal;color:#333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333;text-decoration:none;background-position:0 -15px;} .btn:focus{outline:1px dotted #666;} .btn.primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn:active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);} +.btn.active,.btn:active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);} .btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} diff --git a/docs/javascript.html b/docs/javascript.html index c9709d35f..28f5e3035 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -26,7 +26,6 @@ - @@ -37,6 +36,7 @@ + + + + + Single Toggle + + + + + + Checkbox + +
    + + + +
    + + + + Radio + +
    + + + +
    + + + + +
    +
    + + +
    diff --git a/js/bootstrap-buttons.js b/js/bootstrap-buttons.js index 2fe1a7352..759a65f84 100644 --- a/js/bootstrap-buttons.js +++ b/js/bootstrap-buttons.js @@ -25,26 +25,36 @@ var d = 'disabled' , $el = $(el) , data = $el.data() + , val = $el.is('input') ? 'val' : 'html' state = state + 'Text' - data.resetText || $el.data('resetText', $el.html()) + data.resetText || $el.data('resetText', $el[val]()) - $el.html( data[state] || $.fn.button.defaults[state] ) + $el[val]( data[state] || $.fn.button.defaults[state] ) - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d) + }, 0) } function toggle(el) { - $(el).toggleClass('active') + var $el = $(el) + , $parent = $el.parent('[data-toggle="buttons-radio"]') + + if ($parent) { + $parent + .find('.active') + .removeClass('active') + } + + $el.toggleClass('active') } $.fn.button = function(options) { return this.each(function () { - if (options == 'toggle') { - return toggle(this) - } + if (options == 'toggle') return toggle(this) options && setState(this, options) }) } @@ -54,8 +64,8 @@ } $(function () { - $('body').delegate('.btn[data-toggle]', 'click', function () { - $(this).button('toggle') + $('body').delegate('[data-toggle^=button]', 'click', function (e) { + $(e.srcElement).button('toggle') }) }) diff --git a/lib/patterns.less b/lib/patterns.less index 2fcc4f2b3..01b32cd90 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -415,6 +415,7 @@ footer { .transition(.1s linear all); // Active and Disabled states + &.active, &:active { @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); -- cgit v1.2.3 From 71654cbf69333c3cf6f0bb373121640c6f061d68 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 24 Nov 2011 18:55:44 -0800 Subject: refactor alerts + add new readme which idefientifies goals for 2.0 js --- docs/javascript.html | 42 +++++++++++++++++++-- js/README.md | 89 +++++++++++++++++++++++++++++++++++++++++++++ js/bootstrap-alerts.js | 45 ++++++++--------------- js/bootstrap-buttons.js | 25 ++++++++++--- js/bootstrap-collapsible.js | 37 +++++++++++++++++++ js/bootstrap-dropdown.js | 2 +- js/bootstrap-modal.js | 6 +-- 7 files changed, 201 insertions(+), 45 deletions(-) create mode 100644 js/README.md create mode 100644 js/bootstrap-collapsible.js diff --git a/docs/javascript.html b/docs/javascript.html index 28f5e3035..f5f0520c3 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -39,7 +39,6 @@ + - - - -- cgit v1.2.3 From 3925ea9986e70f5a87883563c47c8ecd3d631c02 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 27 Nov 2011 16:01:26 -0800 Subject: remove trailing semicolons - we'll be hosting minified files with semicolons - no reason to make the dev source ugly --- js/bootstrap-alerts.js | 2 +- js/bootstrap-buttons.js | 2 +- js/bootstrap-dropdown.js | 2 +- js/bootstrap-modal.js | 2 +- js/bootstrap-popover.js | 2 +- js/bootstrap-tabs.js | 2 +- js/bootstrap-twipsy.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/js/bootstrap-alerts.js b/js/bootstrap-alerts.js index fabafa4f9..5f600ba1f 100644 --- a/js/bootstrap-alerts.js +++ b/js/bootstrap-alerts.js @@ -73,4 +73,4 @@ $('body').delegate(dismiss, 'click.alert.data-api', Alert.prototype.close) }) -}( window.jQuery || window.ender ); \ No newline at end of file +}( window.jQuery || window.ender ) \ No newline at end of file diff --git a/js/bootstrap-buttons.js b/js/bootstrap-buttons.js index 82d80df2d..1cafe4d68 100644 --- a/js/bootstrap-buttons.js +++ b/js/bootstrap-buttons.js @@ -93,4 +93,4 @@ }) }) -}( window.jQuery || window.ender ); \ No newline at end of file +}( window.jQuery || window.ender ) \ No newline at end of file diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 4526a9203..7259284bf 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -70,4 +70,4 @@ $('body').delegate(toggle, 'click.dropdown.data-api', Dropdown.prototype.toggle) }) -}( window.jQuery || window.ender ); \ No newline at end of file +}( window.jQuery || window.ender ) \ No newline at end of file diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 2860c8a51..dab67d1b2 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -199,4 +199,4 @@ }) }) -}( window.jQuery || window.ender ); \ No newline at end of file +}( window.jQuery || window.ender ) \ No newline at end of file diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 934ab0545..3c67b18fc 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -91,4 +91,4 @@ $.fn.twipsy.rejectAttrOptions.push( 'content' ) -}( window.jQuery || window.ender ); \ No newline at end of file +}( window.jQuery || window.ender ) \ No newline at end of file diff --git a/js/bootstrap-tabs.js b/js/bootstrap-tabs.js index 35418fd44..bd49e130f 100644 --- a/js/bootstrap-tabs.js +++ b/js/bootstrap-tabs.js @@ -77,4 +77,4 @@ $('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a') }) -}( window.jQuery || window.ender ); \ No newline at end of file +}( window.jQuery || window.ender ) \ No newline at end of file diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 3cb9841c5..fe4469a23 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -289,4 +289,4 @@ return $.extend({}, options, data) } -}( window.jQuery || window.ender ); \ No newline at end of file +}( window.jQuery || window.ender ) \ No newline at end of file -- cgit v1.2.3 From 46fe38386afce7149810b1feb534726735ce28b2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 27 Nov 2011 17:04:55 -0800 Subject: rename tabs to tab - clean up lots of api stuff make href acceptable target val --- docs/javascript.html | 89 +++++++++++++++++++++----------------- js/README.md | 4 +- js/bootstrap-collapse.js | 4 +- js/bootstrap-modal.js | 2 +- js/bootstrap-scrollspy.js | 4 +- js/bootstrap-tab.js | 102 ++++++++++++++++++++++++++++++++++++++++++++ js/bootstrap-tabs.js | 80 ---------------------------------- js/bootstrap-transition.js | 45 +++++++++++++++++++ js/bootstrap-transitions.js | 45 ------------------- 9 files changed, 206 insertions(+), 169 deletions(-) create mode 100644 js/bootstrap-tab.js delete mode 100644 js/bootstrap-tabs.js create mode 100644 js/bootstrap-transition.js delete mode 100644 js/bootstrap-transitions.js diff --git a/docs/javascript.html b/docs/javascript.html index e57e45223..833e6ec02 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -28,12 +28,12 @@ - + - + @@ -127,7 +127,7 @@ The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap navbar. - bootstrap-tabs.js + bootstrap-tab.js This plugin adds quick, dynamic tab and pill functionality for cycling through local content. @@ -204,9 +204,9 @@

    Markup

    -

    You can activate modals on your page easily without having to write a single line of javascript. Just set data-toggle="modal" on a controller element with a data-target="#foo" which corresponds to a modal element id, and when clicked, it will launch your modal. To add modal options, just include them as additoinal data attributes.

    +

    You can activate modals on your page easily without having to write a single line of javascript. Just set data-toggle="modal" on a controller element with a data-target="#foo" or href="#foo" which corresponds to a modal element id, and when clicked, it will launch your modal. To add modal options, just include them as additoinal data attributes.

    -<a class="btn" data-toggle="modal" data-target="#myModal" >Launch Modal</a>
+<a class="btn" data-toggle="modal" href="#myModal" >Launch Modal</a>

    Notice If you want your modal to animate in and out, just add a .fade class to the .modal element (refer to the demo to see this in action).

    Methods

    @@ -274,9 +274,9 @@ $('#myModal').bind('hidden', function () {
    - +
    @@ -435,23 +435,28 @@ $('#myModal').bind('hidden', function () {
    -

    Tabs bootstrap-tabs.js

    +

    Tabs bootstrap-tab.js

    This plugin adds quick, dynamic tab and pill functionality.

    - Download + Download
    -

    Using boostrap-tabs.js

    - 
    $('.tabs').tabs()
    +

    Using boostrap-tab.js

    + 
    $('#myTab').tab('show')

    Markup

    -

    You can activate a tab or pill navigation without writing any javascript by simply giving them a data-tabs or data-pills attribute.

    - 
     <ul class="tabs" data-tabs="tabs" >...</ul>
    +

    You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.

    +
    +<ul class="tabs">
+  <li><a href="#home" data-toggle="tab">Home</a></li>
+  <li><a href="#profile" data-toggle="tab">Profile</a></li>
+  <li><a href="http://twitter.com/fat">twitter</a></li>
+</ul>

    Methods

    -

    $().tabs or $().pills

    +

    $().tab

    - Activates tab and pill functionality for a given container. Tab links should reference id's in the document. + Activates tab functionality for a given element controller. Tab should have either a `data-target` or an `href` referencing a node in the dom. 

     <ul class="tabs">
@@ -470,7 +475,7 @@ $('#myModal').bind('hidden', function () {
 
 <script>
   $(function () {
-    $('.tabs').tabs()
+    $('.tabs a:last').tab('show')
   })
 </script>

    @@ -484,28 +489,32 @@ $('#myModal').bind('hidden', function () { - change - This event fires on tab change. Use event.target and event.relatedTarget to target the active tab and the previous active tab respectively. + show + This event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively. + + + show + This event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively. 
    -$('.tabs a').bind('change', function (e) {
+$('a[data-toggle="tab"]').bind('shown', function (e) {
   e.target // activated tab
   e.relatedTarget // previous tab
 })

    Demo

    -
      -
    • Home
      • -
    • Profile
      • -
    • Messages
      • -
    • Settings
      • + @@ -603,8 +612,7 @@ $('.tabs a').bind('change', function (e) {

      Notice Individual twipsy instance options can alternatively be specified through the use of data attributes.

      Markup

      -

      Twipsy's should contain a title tag which will be use to fill the tip content.

      - 

      <a href="#" rel='twipsy' title='twipsy text'>@fat</a>
      + For performance reasons, the Twipsy and Popover data-apis are opt in. If you would like to use them just set the live flag to true, however we recommend you know what you are doing if you do that. :)

      Methods

      $().twipsy(options)

      Attaches a twipsy handler to an element collection.

      @@ -689,10 +697,9 @@ $('.tabs a').bind('change', function (e) {

      Notice Individual popover instance options can alternatively be specified through the use of data attributes.

      Markup

      -

      Popover's should contain a title tag and a data-content attribute.

      -

      <a href="#" class="btn" rel="popover" title="A Title" data-content="Some content">
-  hover for popover
-</a>
      +

      + For performance reasons, the Twipsy and Popover data-apis are opt in. If you would like to use them just set the live flag to true, however we recommend you know what you are doing if you do that. :) +

      Methods

      $().popover(options)

      Initializes popovers for an element collection.

      @@ -967,24 +974,30 @@ $('#myCollapsible').bind('hidden', function () {
      -
      - Collapsible Group Item #1 +
      + + Collapsible Group Item #1 +

      Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.

      -
      - Collapsible Group Item #2 +
      + + Collapsible Group Item #2 +

      Blog +1 eiusmod, williamsburg chambray craft beer brooklyn. Trust fund squid whatever, sunt hoodie skateboard mustache 3 wolf moon art party wes anderson ad leggings officia. Skateboard keytar incididunt gluten-free retro sartorial, single-origin coffee et viral. Art party blog sunt, readymade fugiat 8-bit aesthetic ex echo park fanny pack keytar. Thundercats sustainable labore, mustache adipisicing tattooed dolore aute occaecat velit 8-bit raw denim letterpress. In occaecat freegan, next level single-origin coffee chambray excepteur nihil duis exercitation adipisicing ex sartorial twee squid. You probably haven't heard of them fugiat ea retro eiusmod quis cosby sweater, +1 fap sapiente biodiesel banksy.

      -
      - Collapsible Group Item #3 +
      + + Collapsible Group Item #3 +

      diff --git a/js/README.md b/js/README.md index 98be75421..5224d65b7 100644 --- a/js/README.md +++ b/js/README.md @@ -67,14 +67,14 @@ All events should have an infinitive and past participle form. The infinitive is Data attributes should take the following form: data-*(verb)* - defines main interaction -data-target - defined on controller element (if element interacts with an element other than self) +data-target || href^=# - defined on controller element (if element interacts with an element other than self) data-*(noun)* - defines options for element invocation examples: // control other targets data-toggle="modal" data-target="#foo" - data-toggle="view" data-target="#foo" + data-toggle="collapse" data-target="#foo" data-parent="#foo" // defined on element they control data-spy="scroll" diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 6de3d971a..629d9b589 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -117,9 +117,9 @@ $(function () { $('body').delegate('[data-toggle=collapse]', 'click.collapse.data-api', function ( e ) { var $this = $(this) - , target = $this.attr('data-target') + , target = $this.attr('data-target') || $this.attr('href') , option = $(target).data('collapse') ? 'toggle' : $this.data() - e.preventDefault() + e.preventDefault() $(target).collapse(option) }) }) diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index dab67d1b2..5f543c553 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -192,7 +192,7 @@ $(document).ready(function () { $('body').delegate('[data-toggle="modal"]', 'click.modal.data-api', function ( e ) { var $this = $(this) - , target = $this.attr('data-target') + , target = $this.attr('data-target') || $this.attr('href') , option = $(target).data('modal') ? 'toggle' : $this.data() e.preventDefault() $(target).modal(option) diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index e4bfea483..fe34019ff 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -28,7 +28,9 @@ var process = $.proxy(this.process, this) this.$scrollElement = $(element).bind('scroll.scroll.data-api', process) - this.selector = (this.$scrollElement.attr('data-target') || '') + ' .nav li > a' + this.selector = (this.$scrollElement.attr('data-target') + || this.$scrollElement.attr('href') + || '') + ' .nav li > a' this.$body = $('body').delegate(this.selector, 'click.scroll.data-api', process) this.refresh() diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js new file mode 100644 index 000000000..ba956cbe8 --- /dev/null +++ b/js/bootstrap-tab.js @@ -0,0 +1,102 @@ +/* ======================================================== + * bootstrap-tabs.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#tabs + * ======================================================== + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================== */ + + +!function( $ ){ + + "use strict" + + /* TAB CLASS DEFINITION + * ==================== */ + + var Tab = function ( element ) { + this.element = $(element) + } + + Tab.prototype = { + + show: function () { + var $this = this.element + , $ul = $this.closest('ul:not(.dropdown-menu)') + , href = $this.attr('data-target') || $this.attr('href') + , previous + , $href + + if ( $this.parent('li').hasClass('active') ) return + + previous = $ul.find('.active a').last()[0] + + $this.trigger({ + type: 'show' + , relatedTarget: previous + }) + + $href = $(href) + + this.activate($this.parent('li'), $ul) + this.activate($href, $href.parent()) + + $this.trigger({ + type: 'shown' + , relatedTarget: previous + }) + } + + , activate: function ( element, container ) { + container + .find('> .active') + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') + + element.addClass('active') + + if ( element.parent('.dropdown-menu') ) { + element.closest('li.dropdown').addClass('active') + } + } + } + + + /* TAB PLUGIN DEFINITION + * ===================== */ + + $.fn.tab = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('tab') + if (!data) $this.data('tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tab.Tab = Tab + + + /* TAB DATA-API + * ============ */ + + $(document).ready(function () { + $('body').delegate('[data-toggle="tab"], [data-toggle="pill"]', 'click.tab.data-api', function (e) { + e.preventDefault() + $(this).tab('show') + }) + }) + +}( window.jQuery || window.ender ) \ No newline at end of file diff --git a/js/bootstrap-tabs.js b/js/bootstrap-tabs.js deleted file mode 100644 index bd49e130f..000000000 --- a/js/bootstrap-tabs.js +++ /dev/null @@ -1,80 +0,0 @@ -/* ======================================================== - * bootstrap-tabs.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2011 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function( $ ){ - - "use strict" - - function activate ( element, container ) { - container - .find('> .active') - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - } - - function tab( e ) { - var $this = $(this) - , $ul = $this.closest('ul:not(.dropdown-menu)') - , href = $this.attr('href') - , previous - , $href - - if ( /^#\w+/.test(href) ) { - e.preventDefault() - - if ( $this.parent('li').hasClass('active') ) { - return - } - - previous = $ul.find('.active a').last()[0] - $href = $(href) - - activate($this.parent('li'), $ul) - activate($href, $href.parent()) - - $this.trigger({ - type: 'change' - , relatedTarget: previous - }) - } - } - - - /* TABS/PILLS PLUGIN DEFINITION - * ============================ */ - - $.fn.tabs = $.fn.pills = function ( selector ) { - return this.each(function () { - $(this).delegate(selector || '.tabs li > a, .pills > li > a', 'click', tab) - }) - } - - $(document).ready(function () { - $('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a') - }) - -}( window.jQuery || window.ender ) \ No newline at end of file diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js new file mode 100644 index 000000000..25f8b111f --- /dev/null +++ b/js/bootstrap-transition.js @@ -0,0 +1,45 @@ +/* =================================================== + * bootstrap-transitions.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html + * =================================================== + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +$(function () { + + /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + * ======================================================= */ + + $.support.transition = (function () { + var thisBody = document.body || document.documentElement + , thisStyle = thisBody.style + , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined + + return support && { + end: (function () { + var transitionEnd = "TransitionEnd" + if ( $.browser.webkit ) { + transitionEnd = "webkitTransitionEnd" + } else if ( $.browser.mozilla ) { + transitionEnd = "transitionend" + } else if ( $.browser.opera ) { + transitionEnd = "oTransitionEnd" + } + return transitionEnd + }()) + } + })() + +}) \ No newline at end of file diff --git a/js/bootstrap-transitions.js b/js/bootstrap-transitions.js deleted file mode 100644 index 25f8b111f..000000000 --- a/js/bootstrap-transitions.js +++ /dev/null @@ -1,45 +0,0 @@ -/* =================================================== - * bootstrap-transitions.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html - * =================================================== - * Copyright 2011 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -$(function () { - - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - - return support && { - end: (function () { - var transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - return transitionEnd - }()) - } - })() - -}) \ No newline at end of file -- cgit v1.2.3 From 7f74f11262d9e6430f84a1c0861084b9d33a4053 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 27 Nov 2011 17:09:31 -0800 Subject: fix heading for js readme... --- js/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/README.md b/js/README.md index 5224d65b7..362ad4a78 100644 --- a/js/README.md +++ b/js/README.md @@ -1,4 +1,4 @@ -2.0 BOOTSTRAP JS PHILSOPHY +## 2.0 BOOTSTRAP JS PHILSOPHY These are the highlevel design rules which guide the developement of Bootstrap's js plugins. --- -- cgit v1.2.3 From 76f95f4ea2e4e0651e3fc6e3bf0e6872f1cd1b38 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 27 Nov 2011 17:11:31 -0800 Subject: change even was removed, in favor of show shown --- js/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/js/README.md b/js/README.md index 362ad4a78..e1f5107c2 100644 --- a/js/README.md +++ b/js/README.md @@ -57,7 +57,6 @@ All events should have an infinitive and past participle form. The infinitive is show | shown hide | hidden - change | changed --- -- cgit v1.2.3 From f77d0c21df60e2e9c1c4b4d6a1b79e54f18914aa Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 27 Nov 2011 17:12:17 -0800 Subject: turn attribute rules to list --- js/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/README.md b/js/README.md index e1f5107c2..ba52b5956 100644 --- a/js/README.md +++ b/js/README.md @@ -65,9 +65,9 @@ All events should have an infinitive and past participle form. The infinitive is Data attributes should take the following form: -data-*(verb)* - defines main interaction -data-target || href^=# - defined on controller element (if element interacts with an element other than self) -data-*(noun)* - defines options for element invocation +-data-*(verb)* - defines main interaction +-data-target || href^=# - defined on controller element (if element interacts with an element other than self) +-data-*(noun)* - defines options for element invocation examples: -- cgit v1.2.3 From 7522517b47521da731bf7a598d5e5a71721c4c44 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 27 Nov 2011 17:12:58 -0800 Subject: derp --- js/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/README.md b/js/README.md index ba52b5956..2655af68e 100644 --- a/js/README.md +++ b/js/README.md @@ -65,9 +65,9 @@ All events should have an infinitive and past participle form. The infinitive is Data attributes should take the following form: --data-*(verb)* - defines main interaction --data-target || href^=# - defined on controller element (if element interacts with an element other than self) --data-*(noun)* - defines options for element invocation +- data-*(verb)* - defines main interaction +- data-target || href^=# - defined on controller element (if element interacts with an element other than self) +- data-*(noun)* - defines options for element invocation examples: -- cgit v1.2.3 From 7eb340ec589acd56ad960a020969822636c2bc54 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 27 Nov 2011 17:31:12 -0800 Subject: add code to reset data for collapsed element so that item can be intitialized with correct options --- docs/javascript.html | 24 ++++++------ js/bootstrap-alert.js | 76 ++++++++++++++++++++++++++++++++++++++ js/bootstrap-alerts.js | 76 -------------------------------------- js/bootstrap-button.js | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ js/bootstrap-buttons.js | 96 ------------------------------------------------ js/bootstrap-collapse.js | 10 ++++- 6 files changed, 192 insertions(+), 186 deletions(-) create mode 100644 js/bootstrap-alert.js delete mode 100644 js/bootstrap-alerts.js create mode 100644 js/bootstrap-button.js delete mode 100644 js/bootstrap-buttons.js diff --git a/docs/javascript.html b/docs/javascript.html index 833e6ec02..2db37a9fe 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -29,14 +29,14 @@ - + - + ``` -Or if you prefer, the standard css way: +Or if you prefer, the standard CSS way: ``` html @@ -72,7 +72,7 @@ http://groups.google.com/group/twitter-bootstrap Developers ---------- -We have included a makefile with convenience methods for working with the bootstrap library. +We have included a makefile with convenience methods for working with the Bootstrap library. + **build** - `make build` This will run the less compiler on the bootstrap lib and generate a bootstrap.css and bootstrap.min.css file. diff --git a/js/README.md b/js/README.md index 2655af68e..2eef9e735 100644 --- a/js/README.md +++ b/js/README.md @@ -1,13 +1,13 @@ -## 2.0 BOOTSTRAP JS PHILSOPHY -These are the highlevel design rules which guide the developement of Bootstrap's js plugins. +## 2.0 BOOTSTRAP JS PHILOSOPHY +These are the high-level design rules which guide the development of Bootstrap's JS plugins. --- ### DATA-ATTRIBUTE API -We believe you should be able to use all plugins provided by bootstrap purely through the markup api without writing a single line of javascript. +We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of javascript. -We acknoledge that this isn't always the most performant and sometimes it may be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute api by unbinding all events on the body namespaced with `'data-api'`. This looks like this: +We acknowledge that this isn't always the most performant and sometimes it may be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this: $('body').unbind('.data-api') @@ -19,13 +19,13 @@ To target a specific plugin, just include the plugins name as a namespace along ### PROGRAMATIC API -We also believe you should be able to use all plugins provided by bootstrap purely through the JS api. +We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API. -All pubilc APIs should be a single, chainable method, and return the collection acted upon. +All public APIs should be a single, chainable method, and return the collection acted upon. $(".btn.danger").button("toggle").addClass("fat") -All methods should accept an optional options object, a string which targets a particular method, or null which innitiates the default behavior: +All methods should accept an optional options object, a string which targets a particular method, or null which initiates the default behavior: $("#myModal").modal() // initialized with defaults @@ -39,7 +39,7 @@ All plugins should have a default object which can be modified to effect all ins $.fn.modal.defaults = { … } -An options definiton should take the following form: +An options definition should take the following form: *noun*: *adjective* - describes or modifies a quality of an instance -- cgit v1.2.3 From d48027d49567c2d38211c357d6fb8d6a5a9e8a7b Mon Sep 17 00:00:00 2001 From: Jeff Adams Date: Tue, 29 Nov 2011 11:12:32 -0600 Subject: add input width calculation fix from #408 to the 2.0 branch --- bootstrap.css | 32 ++++++++++++++++---------------- bootstrap.min.css | 30 +++++++++++++++--------------- lib/forms.less | 2 +- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 4c4d85aa9..271c35afc 100644 --- a/bootstrap.css +++ b/bootstrap.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: Fri Nov 25 21:33:58 PST 2011 + * Date: Tue Nov 29 11:11:41 CST 2011 */ html, body { margin: 0; @@ -657,7 +657,7 @@ select.span2, .uneditable-input.span2 { display: inline-block; float: none; - width: 150px; + width: 130px; margin-left: 0; } input.span3, @@ -666,7 +666,7 @@ select.span3, .uneditable-input.span3 { display: inline-block; float: none; - width: 250px; + width: 210px; margin-left: 0; } input.span4, @@ -675,7 +675,7 @@ select.span4, .uneditable-input.span4 { display: inline-block; float: none; - width: 350px; + width: 290px; margin-left: 0; } input.span5, @@ -684,7 +684,7 @@ select.span5, .uneditable-input.span5 { display: inline-block; float: none; - width: 450px; + width: 370px; margin-left: 0; } input.span6, @@ -693,7 +693,7 @@ select.span6, .uneditable-input.span6 { display: inline-block; float: none; - width: 550px; + width: 450px; margin-left: 0; } input.span7, @@ -702,7 +702,7 @@ select.span7, .uneditable-input.span7 { display: inline-block; float: none; - width: 650px; + width: 530px; margin-left: 0; } input.span8, @@ -711,7 +711,7 @@ select.span8, .uneditable-input.span8 { display: inline-block; float: none; - width: 750px; + width: 610px; margin-left: 0; } input.span9, @@ -720,7 +720,7 @@ select.span9, .uneditable-input.span9 { display: inline-block; float: none; - width: 850px; + width: 690px; margin-left: 0; } input.span10, @@ -729,7 +729,7 @@ select.span10, .uneditable-input.span10 { display: inline-block; float: none; - width: 950px; + width: 770px; margin-left: 0; } input.span11, @@ -738,7 +738,7 @@ select.span11, .uneditable-input.span11 { display: inline-block; float: none; - width: 1050px; + width: 850px; margin-left: 0; } input.span12, @@ -747,7 +747,7 @@ select.span12, .uneditable-input.span12 { display: inline-block; float: none; - width: 1150px; + width: 930px; margin-left: 0; } input.span13, @@ -756,7 +756,7 @@ select.span13, .uneditable-input.span13 { display: inline-block; float: none; - width: 1250px; + width: 1010px; margin-left: 0; } input.span14, @@ -765,7 +765,7 @@ select.span14, .uneditable-input.span14 { display: inline-block; float: none; - width: 1350px; + width: 1090px; margin-left: 0; } input.span15, @@ -774,7 +774,7 @@ select.span15, .uneditable-input.span15 { display: inline-block; float: none; - width: 1450px; + width: 1170px; margin-left: 0; } input.span16, @@ -783,7 +783,7 @@ select.span16, .uneditable-input.span16 { display: inline-block; float: none; - width: 1550px; + width: 1250px; margin-left: 0; } input[disabled], diff --git a/bootstrap.min.css b/bootstrap.min.css index 2a802744c..482404110 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -111,21 +111,21 @@ input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shado .input-xlarge{width:270px;} .input-xxlarge{width:530px;} input.span1,textarea.span1,select.span1,.uneditable-input.span1{display:inline-block;float:none;width:50px;margin-left:0;} -input.span2,textarea.span2,select.span2,.uneditable-input.span2{display:inline-block;float:none;width:150px;margin-left:0;} -input.span3,textarea.span3,select.span3,.uneditable-input.span3{display:inline-block;float:none;width:250px;margin-left:0;} -input.span4,textarea.span4,select.span4,.uneditable-input.span4{display:inline-block;float:none;width:350px;margin-left:0;} -input.span5,textarea.span5,select.span5,.uneditable-input.span5{display:inline-block;float:none;width:450px;margin-left:0;} -input.span6,textarea.span6,select.span6,.uneditable-input.span6{display:inline-block;float:none;width:550px;margin-left:0;} -input.span7,textarea.span7,select.span7,.uneditable-input.span7{display:inline-block;float:none;width:650px;margin-left:0;} -input.span8,textarea.span8,select.span8,.uneditable-input.span8{display:inline-block;float:none;width:750px;margin-left:0;} -input.span9,textarea.span9,select.span9,.uneditable-input.span9{display:inline-block;float:none;width:850px;margin-left:0;} -input.span10,textarea.span10,select.span10,.uneditable-input.span10{display:inline-block;float:none;width:950px;margin-left:0;} -input.span11,textarea.span11,select.span11,.uneditable-input.span11{display:inline-block;float:none;width:1050px;margin-left:0;} -input.span12,textarea.span12,select.span12,.uneditable-input.span12{display:inline-block;float:none;width:1150px;margin-left:0;} -input.span13,textarea.span13,select.span13,.uneditable-input.span13{display:inline-block;float:none;width:1250px;margin-left:0;} -input.span14,textarea.span14,select.span14,.uneditable-input.span14{display:inline-block;float:none;width:1350px;margin-left:0;} -input.span15,textarea.span15,select.span15,.uneditable-input.span15{display:inline-block;float:none;width:1450px;margin-left:0;} -input.span16,textarea.span16,select.span16,.uneditable-input.span16{display:inline-block;float:none;width:1550px;margin-left:0;} +input.span2,textarea.span2,select.span2,.uneditable-input.span2{display:inline-block;float:none;width:130px;margin-left:0;} +input.span3,textarea.span3,select.span3,.uneditable-input.span3{display:inline-block;float:none;width:210px;margin-left:0;} +input.span4,textarea.span4,select.span4,.uneditable-input.span4{display:inline-block;float:none;width:290px;margin-left:0;} +input.span5,textarea.span5,select.span5,.uneditable-input.span5{display:inline-block;float:none;width:370px;margin-left:0;} +input.span6,textarea.span6,select.span6,.uneditable-input.span6{display:inline-block;float:none;width:450px;margin-left:0;} +input.span7,textarea.span7,select.span7,.uneditable-input.span7{display:inline-block;float:none;width:530px;margin-left:0;} +input.span8,textarea.span8,select.span8,.uneditable-input.span8{display:inline-block;float:none;width:610px;margin-left:0;} +input.span9,textarea.span9,select.span9,.uneditable-input.span9{display:inline-block;float:none;width:690px;margin-left:0;} +input.span10,textarea.span10,select.span10,.uneditable-input.span10{display:inline-block;float:none;width:770px;margin-left:0;} +input.span11,textarea.span11,select.span11,.uneditable-input.span11{display:inline-block;float:none;width:850px;margin-left:0;} +input.span12,textarea.span12,select.span12,.uneditable-input.span12{display:inline-block;float:none;width:930px;margin-left:0;} +input.span13,textarea.span13,select.span13,.uneditable-input.span13{display:inline-block;float:none;width:1010px;margin-left:0;} +input.span14,textarea.span14,select.span14,.uneditable-input.span14{display:inline-block;float:none;width:1090px;margin-left:0;} +input.span15,textarea.span15,select.span15,.uneditable-input.span15{display:inline-block;float:none;width:1170px;margin-left:0;} +input.span16,textarea.span16,select.span16,.uneditable-input.span16{display:inline-block;float:none;width:1250px;margin-left:0;} input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} form .clearfix.error>label,form .clearfix.error .help-block,form .clearfix.error .help-inline{color:#b94a48;} form .clearfix.error input,form .clearfix.error textarea{color:#b94a48;border-color:#ee5f5b;}form .clearfix.error input:focus,form .clearfix.error textarea:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} diff --git a/lib/forms.less b/lib/forms.less index 39c293799..5de55e727 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -145,7 +145,7 @@ select:focus { .formColumns(@columnSpan: 1) { display: inline-block; float: none; - width: ((@gridColumnWidth - 10) * @columnSpan) + ((@gridColumnWidth - 10) * (@columnSpan - 1)); + width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10; margin-left: 0; } input, -- cgit v1.2.3 From 1da19bf65f9affec06ba6e1f6e5f545a8e2ea457 Mon Sep 17 00:00:00 2001 From: Jeff Adams Date: Tue, 29 Nov 2011 14:06:31 -0600 Subject: scope form feedback states to .control-group instead of unused .clearfix --- bootstrap.css | 26 +++++++++++++------------- bootstrap.min.css | 18 +++++++++--------- lib/forms.less | 6 +++--- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 4c4d85aa9..1fa314cd4 100644 --- a/bootstrap.css +++ b/bootstrap.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: Fri Nov 25 21:33:58 PST 2011 + * Date: Tue Nov 29 14:05:43 CST 2011 */ html, body { margin: 0; @@ -796,56 +796,56 @@ textarea[readonly] { border-color: #ddd; cursor: not-allowed; } -form .clearfix.error > label, form .clearfix.error .help-block, form .clearfix.error .help-inline { +.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { color: #b94a48; } -form .clearfix.error input, form .clearfix.error textarea { +.control-group.error input, .control-group.error textarea { color: #b94a48; border-color: #ee5f5b; } -form .clearfix.error input:focus, form .clearfix.error textarea:focus { +.control-group.error input:focus, .control-group.error textarea:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; } -form .clearfix.error .input-prepend .add-on, form .clearfix.error .input-append .add-on { +.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { color: #b94a48; background-color: #fce6e6; border-color: #b94a48; } -form .clearfix.warning > label, form .clearfix.warning .help-block, form .clearfix.warning .help-inline { +.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; } -form .clearfix.warning input, form .clearfix.warning textarea { +.control-group.warning input, .control-group.warning textarea { color: #c09853; border-color: #ccae64; } -form .clearfix.warning input:focus, form .clearfix.warning textarea:focus { +.control-group.warning input:focus, .control-group.warning textarea:focus { border-color: #be9a3f; -webkit-box-shadow: 0 0 6px #e5d6b1; -moz-box-shadow: 0 0 6px #e5d6b1; box-shadow: 0 0 6px #e5d6b1; } -form .clearfix.warning .input-prepend .add-on, form .clearfix.warning .input-append .add-on { +.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { color: #c09853; background-color: #d2b877; border-color: #c09853; } -form .clearfix.success > label, form .clearfix.success .help-block, form .clearfix.success .help-inline { +.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } -form .clearfix.success input, form .clearfix.success textarea { +.control-group.success input, .control-group.success textarea { color: #468847; border-color: #57a957; } -form .clearfix.success input:focus, form .clearfix.success textarea:focus { +.control-group.success input:focus, .control-group.success textarea:focus { border-color: #458845; -webkit-box-shadow: 0 0 6px #9acc9a; -moz-box-shadow: 0 0 6px #9acc9a; box-shadow: 0 0 6px #9acc9a; } -form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-append .add-on { +.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { color: #468847; background-color: #bcddbc; border-color: #468847; diff --git a/bootstrap.min.css b/bootstrap.min.css index 2a802744c..7eb899bc1 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -127,15 +127,15 @@ input.span14,textarea.span14,select.span14,.uneditable-input.span14{display:inli input.span15,textarea.span15,select.span15,.uneditable-input.span15{display:inline-block;float:none;width:1450px;margin-left:0;} input.span16,textarea.span16,select.span16,.uneditable-input.span16{display:inline-block;float:none;width:1550px;margin-left:0;} input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} -form .clearfix.error>label,form .clearfix.error .help-block,form .clearfix.error .help-inline{color:#b94a48;} -form .clearfix.error input,form .clearfix.error textarea{color:#b94a48;border-color:#ee5f5b;}form .clearfix.error input:focus,form .clearfix.error textarea:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -form .clearfix.error .input-prepend .add-on,form .clearfix.error .input-append .add-on{color:#b94a48;background-color:#fce6e6;border-color:#b94a48;} -form .clearfix.warning>label,form .clearfix.warning .help-block,form .clearfix.warning .help-inline{color:#c09853;} -form .clearfix.warning input,form .clearfix.warning textarea{color:#c09853;border-color:#ccae64;}form .clearfix.warning input:focus,form .clearfix.warning textarea:focus{border-color:#be9a3f;-webkit-box-shadow:0 0 6px #e5d6b1;-moz-box-shadow:0 0 6px #e5d6b1;box-shadow:0 0 6px #e5d6b1;} -form .clearfix.warning .input-prepend .add-on,form .clearfix.warning .input-append .add-on{color:#c09853;background-color:#d2b877;border-color:#c09853;} -form .clearfix.success>label,form .clearfix.success .help-block,form .clearfix.success .help-inline{color:#468847;} -form .clearfix.success input,form .clearfix.success textarea{color:#468847;border-color:#57a957;}form .clearfix.success input:focus,form .clearfix.success textarea:focus{border-color:#458845;-webkit-box-shadow:0 0 6px #9acc9a;-moz-box-shadow:0 0 6px #9acc9a;box-shadow:0 0 6px #9acc9a;} -form .clearfix.success .input-prepend .add-on,form .clearfix.success .input-append .add-on{color:#468847;background-color:#bcddbc;border-color:#468847;} +.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} +.control-group.error input,.control-group.error textarea{color:#b94a48;border-color:#ee5f5b;}.control-group.error input:focus,.control-group.error textarea:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} +.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#fce6e6;border-color:#b94a48;} +.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} +.control-group.warning input,.control-group.warning textarea{color:#c09853;border-color:#ccae64;}.control-group.warning input:focus,.control-group.warning textarea:focus{border-color:#be9a3f;-webkit-box-shadow:0 0 6px #e5d6b1;-moz-box-shadow:0 0 6px #e5d6b1;box-shadow:0 0 6px #e5d6b1;} +.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#d2b877;border-color:#c09853;} +.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} +.control-group.success input,.control-group.success textarea{color:#468847;border-color:#57a957;}.control-group.success input:focus,.control-group.success textarea:focus{border-color:#458845;-webkit-box-shadow:0 0 6px #9acc9a;-moz-box-shadow:0 0 6px #9acc9a;box-shadow:0 0 6px #9acc9a;} +.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#bcddbc;border-color:#468847;} .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;} .uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} :-moz-placeholder{color:#bfbfbf;} diff --git a/lib/forms.less b/lib/forms.less index 39c293799..23cdb28c9 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -220,15 +220,15 @@ textarea[readonly] { } } // Error -form .clearfix.error { +.control-group.error { .formFieldState(#b94a48, #ee5f5b, lighten(#ee5f5b, 30%)); } // Warning -form .clearfix.warning { +.control-group.warning { .formFieldState(#c09853, #ccae64, lighten(#CCAE64, 5%)); } // Success -form .clearfix.success { +.control-group.success { .formFieldState(#468847, #57a957, lighten(#57a957, 30%)); } -- cgit v1.2.3 From b36df463108e2e4df8c389a06f577823564788d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 22:35:03 -0800 Subject: misc docs updates, revamped tables CSS save for grid columns and tablesorter options --- bootstrap.css | 538 +++++++++++++++++++++++------------------------ bootstrap.min.css | 195 +++++++---------- docs/assets/css/docs.css | 46 +++- docs/base-css.html | 4 +- docs/index.html | 1 + docs/scaffolding.html | 8 +- lib/tables.less | 96 +++++---- 7 files changed, 428 insertions(+), 460 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index e8b9d2d53..87e12fca0 100644 --- a/bootstrap.css +++ b/bootstrap.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: Thu Nov 17 00:52:01 PST 2011 + * Date: Tue Nov 29 22:34:51 PST 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). @@ -118,9 +118,9 @@ audio:not([controls]) { display: none; } sub, sup { + position: relative; font-size: 75%; line-height: 0; - position: relative; vertical-align: baseline; } sup { @@ -137,18 +137,18 @@ button, input, select, textarea { - font-size: 100%; margin: 0; + font-size: 100%; vertical-align: baseline; *vertical-align: middle; } button, input { - line-height: normal; *overflow: visible; + line-height: normal; } button::-moz-focus-inner, input::-moz-focus-inner { - border: 0; padding: 0; + border: 0; } button, input[type="button"], @@ -181,12 +181,12 @@ textarea { * Basic and global styles for generating a grid system, structural layout, and page templates * ------------------------------------------------------------------------------------------- */ body { - background-color: #ffffff; margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; line-height: 18px; color: #404040; + background-color: #ffffff; } .container { width: 940px; @@ -196,9 +196,9 @@ body { } .container:before, .container:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .container:after { clear: both; @@ -212,9 +212,9 @@ body { } .fluid-container:before, .fluid-container:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .fluid-container:after { clear: both; @@ -236,10 +236,10 @@ body { margin-right: 240px; } a { + font-weight: inherit; + line-height: inherit; color: #0069d6; text-decoration: none; - line-height: inherit; - font-weight: inherit; } a:hover { color: #00438a; @@ -263,9 +263,9 @@ a:hover { } .row:before, .row:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .row:after { clear: both; @@ -348,10 +348,10 @@ a:hover { * Headings, body text, lists, code, and more for a versatile and durable typography system * ---------------------------------------------------------------------------------------- */ p { + margin-bottom: 9px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; line-height: 18px; - margin-bottom: 9px; } p small { font-size: 11px; @@ -433,8 +433,8 @@ li { color: #404040; } ul.unstyled { - list-style: none; margin-left: 0; + list-style: none; } dl { margin-bottom: 18px; @@ -472,15 +472,15 @@ abbr { cursor: help; } blockquote { + padding-left: 15px; margin-bottom: 18px; border-left: 5px solid #eee; - padding-left: 15px; } blockquote p { + margin-bottom: 0; font-size: 300; font-weight: 16px; line-height: 22.5px; - margin-bottom: 0; } blockquote small { display: block; @@ -498,8 +498,8 @@ blockquote.pull-right p, blockquote.pull-right small { } address { display: block; - line-height: 18px; margin-bottom: 18px; + line-height: 18px; } code, pre { padding: 0 3px 2px; @@ -511,16 +511,16 @@ code, pre { border-radius: 3px; } code { - background-color: #fee9cc; padding: 1px 3px; + background-color: #fee9cc; } pre { - background-color: #f5f5f5; display: block; padding: 8.5px; margin: 0 0 9px; - line-height: 18px; font-size: 12px; + line-height: 18px; + background-color: #f5f5f5; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; @@ -593,11 +593,11 @@ input[type=checkbox], input[type=radio] { cursor: pointer; } input[type=file] { - background-color: #ffffff; - background-color: initial; padding: initial; - border: initial; line-height: initial; + border: initial; + background-color: #ffffff; + background-color: initial; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; @@ -608,34 +608,34 @@ input[type=button], input[type=reset], input[type=submit] { } select, input[type=file] { height: 27px; - line-height: 27px; *margin-top: 4px; /* For IE7, add top margin to align select with labels */ + line-height: 27px; } select[multiple] { - background-color: #ffffff; height: inherit; + background-color: #ffffff; } textarea { height: auto; } input, textarea { + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; -ms-transition: border linear 0.2s, box-shadow linear 0.2s; -o-transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s; - -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); } input:focus, textarea:focus { - outline: 0; border-color: rgba(82, 168, 236, 0.8); -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + outline: 0; } input[type=file]:focus, input[type=checkbox]:focus, select:focus { -webkit-box-shadow: none; @@ -877,8 +877,8 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app border-top: 1px solid #ddd; } .uneditable-input { - background-color: #ffffff; display: block; + background-color: #ffffff; border-color: #eee; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); @@ -897,14 +897,14 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app color: #bfbfbf; } .help-inline { - display: inline; - padding-left: 5px; *position: relative; /* IE6-7 */ *top: -5px; /* IE6-7 */ + display: inline; + padding-left: 5px; } .help-block { display: block; @@ -932,27 +932,27 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app } .input-prepend .add-on, .input-append .add-on { position: relative; - background: #f5f5f5; - border: 1px solid #ccc; z-index: 2; float: left; display: block; width: auto; min-width: 16px; height: 18px; - padding: 4px 4px 4px 5px; margin-right: -1px; + padding: 4px 4px 4px 5px; font-weight: normal; line-height: 18px; color: #bfbfbf; text-align: center; text-shadow: 0 1px 0 #ffffff; + background-color: #f5f5f5; + border: 1px solid #ccc; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } .input-prepend .active, .input-append .active { - background: #a9dba9; + background-color: #a9dba9; border-color: #46a546; } .input-prepend .add-on { @@ -967,11 +967,11 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app border-radius: 3px 0 0 3px; } .input-append .add-on { + margin-right: 0; + margin-left: -1px; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; - margin-right: 0; - margin-left: -1px; } .search-form .search-query { -webkit-border-radius: 14px; @@ -1005,43 +1005,38 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app * ---------------------------------------- */ table { width: 100%; - padding: 0; margin-bottom: 18px; - font-size: 13px; - border-collapse: collapse; } -table th, table td { - padding: 10px 10px 9px; +th, td { + padding: 8px; line-height: 18px; text-align: left; + border-bottom: 1px solid #ddd; } -table th { - padding-top: 9px; +th { font-weight: bold; - vertical-align: middle; + vertical-align: bottom; } -table td { +td { vertical-align: top; - border-top: 1px solid #ddd; } -table tbody th { - border-top: 1px solid #ddd; - vertical-align: top; +tbody tr:last-child th, tbody tr:last-child td { + border-bottom: 0; } .condensed-table th, .condensed-table td { - padding: 5px 5px 4px; + padding: 4px 5px; } .bordered-table { border: 1px solid #ddd; border-collapse: separate; - *border-collapse: collapse; - /* IE7, collapse table to remove spacing */ - -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -.bordered-table th + th, .bordered-table td + td, .bordered-table th + td { +.bordered-table th + th, +.bordered-table td + td, +.bordered-table th + td, +.bordered-table td + th { border-left: 1px solid #ddd; } .bordered-table thead:first-child tr:first-child th:first-child, .bordered-table tbody:first-child tr:first-child td:first-child { @@ -1054,153 +1049,151 @@ table tbody th { -moz-border-radius: 0 4px 0 0; border-radius: 0 4px 0 0; } -.bordered-table tbody tr:last-child td:first-child { +.bordered-table thead:last-child tr:last-child th:first-child, .bordered-table tbody:last-child tr:last-child td:first-child { -webkit-border-radius: 0 0 0 4px; -moz-border-radius: 0 0 0 4px; border-radius: 0 0 0 4px; } -.bordered-table tbody tr:last-child td:last-child { +.bordered-table thead:last-child tr:last-child th:last-child, .bordered-table tbody:last-child tr:last-child td:last-child { -webkit-border-radius: 0 0 4px 0; -moz-border-radius: 0 0 4px 0; border-radius: 0 0 4px 0; } -table .span1 { - width: 40px; -} -table .span2 { - width: 120px; -} -table .span3 { - width: 200px; -} -table .span4 { - width: 280px; -} -table .span5 { - width: 360px; -} -table .span6 { - width: 440px; -} -table .span7 { - width: 520px; -} -table .span8 { - width: 600px; -} -table .span9 { - width: 680px; -} -table .span10 { - width: 760px; -} -table .span11 { - width: 840px; -} -table .span12 { - width: 920px; -} -table .span13 { - width: 1000px; -} -table .span14 { - width: 1080px; -} -table .span15 { - width: 1160px; -} -table .span16 { - width: 1240px; -} .striped-table tbody tr:nth-child(odd) td, .striped-table tbody tr:nth-child(odd) th { background-color: #f9f9f9; } -.striped-table tbody tr:hover td, .striped-table tbody tr:hover th { - background-color: #f5f5f5; -} -table .header { - cursor: pointer; -} -table .header:after { - content: ""; - float: right; - margin-top: 7px; - border-width: 0 4px 4px; - border-style: solid; - border-color: #000 transparent; - visibility: hidden; -} -table .headerSortUp, table .headerSortDown { - background-color: rgba(141, 192, 219, 0.25); - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); -} -table .header:hover:after { - visibility: visible; -} -table .headerSortDown:after, table .headerSortDown:hover:after { - visibility: visible; - filter: alpha(opacity=60); - -khtml-opacity: 0.6; - -moz-opacity: 0.6; - opacity: 0.6; -} -table .headerSortUp:after { - border-bottom: none; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #000; - visibility: visible; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - filter: alpha(opacity=60); - -khtml-opacity: 0.6; - -moz-opacity: 0.6; - opacity: 0.6; -} -table .blue { - color: #049cdb; - border-bottom-color: #049cdb; -} -table .headerSortUp.blue, table .headerSortDown.blue { - background-color: #ade6fe; -} -table .green { - color: #46a546; - border-bottom-color: #46a546; -} -table .headerSortUp.green, table .headerSortDown.green { - background-color: #cdeacd; -} -table .red { - color: #9d261d; - border-bottom-color: #9d261d; -} -table .headerSortUp.red, table .headerSortDown.red { - background-color: #f4c8c5; -} -table .yellow { - color: #ffc40d; - border-bottom-color: #ffc40d; -} -table .headerSortUp.yellow, table .headerSortDown.yellow { - background-color: #fff6d9; -} -table .orange { - color: #f89406; - border-bottom-color: #f89406; -} -table .headerSortUp.orange, table .headerSortDown.orange { - background-color: #fee9cc; -} -table .purple { - color: #7a43b6; - border-bottom-color: #7a43b6; +/* +// ---------------- + +// This is a duplication of the main grid .columns() mixin, but subtracts 20px to account for input padding and border +.tableColumns(@columnSpan: 1) { + width: ((@gridColumnWidth - 20) * @columnSpan) + ((@gridColumnWidth - 20) * (@columnSpan - 1)); } -table .headerSortUp.purple, table .headerSortDown.purple { - background-color: #e2d5f0; +table { + // Default columns + .span1 { .tableColumns(1); } + .span2 { .tableColumns(2); } + .span3 { .tableColumns(3); } + .span4 { .tableColumns(4); } + .span5 { .tableColumns(5); } + .span6 { .tableColumns(6); } + .span7 { .tableColumns(7); } + .span8 { .tableColumns(8); } + .span9 { .tableColumns(9); } + .span10 { .tableColumns(10); } + .span11 { .tableColumns(11); } + .span12 { .tableColumns(12); } + .span13 { .tableColumns(13); } + .span14 { .tableColumns(14); } + .span15 { .tableColumns(15); } + .span16 { .tableColumns(16); } } -/* Patterns.less + + +// TABLESORTER +// ----------- + +table { + // Tablesorting styles w/ jQuery plugin + .header { + cursor: pointer; + &:after { + float: right; + margin-top: 7px; + border-width: 0 4px 4px; + border-style: solid; + border-color: #000 transparent; + content: ""; + visibility: hidden; + } + } + // Style the sorted column headers (THs) + .headerSortUp, + .headerSortDown { + text-shadow: 0 1px 1px rgba(255,255,255,.75); + background-color: rgba(141,192,219,.25); + } + // Style the ascending (reverse alphabetical) column header + .header:hover { + &:after { + visibility: visible; + } + } + // Style the descending (alphabetical) column header + .headerSortDown, + .headerSortDown:hover { + &:after { + visibility: visible; + .opacity(60); + } + } + // Style the ascending (reverse alphabetical) column header + .headerSortUp { + &:after { + border-bottom: none; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #000; + visibility:visible; + .box-shadow(none); //can't add boxshadow to downward facing arrow :( + .opacity(60); + } + } + // Blue Table Headings + .blue { + color: @blue; + border-bottom-color: @blue; + } + .headerSortUp.blue, + .headerSortDown.blue { + background-color: lighten(@blue, 40%); + } + // Green Table Headings + .green { + color: @green; + border-bottom-color: @green; + } + .headerSortUp.green, + .headerSortDown.green { + background-color: lighten(@green, 40%); + } + // Red Table Headings + .red { + color: @red; + border-bottom-color: @red; + } + .headerSortUp.red, + .headerSortDown.red { + background-color: lighten(@red, 50%); + } + // Yellow Table Headings + .yellow { + color: @yellow; + border-bottom-color: @yellow; + } + .headerSortUp.yellow, + .headerSortDown.yellow { + background-color: lighten(@yellow, 40%); + } + // Orange Table Headings + .orange { + color: @orange; + border-bottom-color: @orange; + } + .headerSortUp.orange, + .headerSortDown.orange { + background-color: lighten(@orange, 40%); + } + // Purple Table Headings + .purple { + color: @purple; + border-bottom-color: @purple; + } + .headerSortUp.purple, + .headerSortDown.purple { + background-color: lighten(@purple, 40%); + } +}*//* Patterns.less * Repeatable UI elements outside the base styles provided from the scaffolding * ---------------------------------------------------------------------------- */ .navbar { @@ -1228,45 +1221,45 @@ table .headerSortUp.purple, table .headerSortDown.purple { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .navbar .brand a:hover, .navbar ul .active > a { - background-color: #333333; - background-color: rgba(255, 255, 255, 0.05); color: #ffffff; text-decoration: none; + background-color: #333333; + background-color: rgba(255, 255, 255, 0.05); } .navbar .brand { float: left; display: block; padding: 8px 20px 12px; margin-left: -20px; - color: #ffffff; font-size: 20px; font-weight: 200; line-height: 1; + color: #ffffff; } .navbar p { margin: 0; line-height: 40px; } .navbar p a:hover { - background-color: transparent; color: #ffffff; + background-color: transparent; } .navbar-search { position: relative; + float: left; margin-top: 6px; margin-bottom: 0; - float: left; } .navbar-search .search-query { - background-color: #444; - background-color: rgba(255, 255, 255, 0.3); + padding: 4px 9px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - padding: 4px 9px; color: #ffffff; color: rgba(255, 255, 255, 0.75); + background-color: #444; + background-color: rgba(255, 255, 255, 0.3); border: 1px solid #111; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); @@ -1284,20 +1277,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #e6e6e6; } .navbar-search .search-query:hover { + color: #ffffff; background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); - color: #ffffff; } .navbar-search .search-query:focus, .navbar-search .search-query.focused { - outline: 0; - background-color: #ffffff; + padding: 5px 10px; color: #404040; text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; border: 0; - padding: 5px 10px; -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; } .navbar-static { margin-bottom: 18px; @@ -1312,16 +1305,16 @@ table .headerSortUp.purple, table .headerSortDown.purple { .navbar-fixed { position: fixed; top: 0; - left: 0; right: 0; + left: 0; z-index: 10000; } .nav { + position: relative; + left: 0; display: block; float: left; margin: 0 10px 0 0; - position: relative; - left: 0; } .nav > li { display: block; @@ -1396,42 +1389,39 @@ table .headerSortUp.purple, table .headerSortDown.purple { position: relative; } .dropdown-toggle:after { + display: inline-block; width: 0; height: 0; - display: inline-block; - content: "↓"; - text-indent: -99999px; - vertical-align: top; margin-top: 8px; margin-left: 6px; + text-indent: -99999px; + vertical-align: top; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid #ffffff; filter: alpha(opacity=30); - -khtml-opacity: 0.3; -moz-opacity: 0.3; opacity: 0.3; + content: "↓"; } .dropdown:hover .dropdown-toggle:after { filter: alpha(opacity=100); - -khtml-opacity: 1; -moz-opacity: 1; opacity: 1; } .dropdown-menu { - background-color: #ffffff; - float: left; - display: none; position: absolute; top: 40px; z-index: 900; + float: left; + display: none; min-width: 160px; max-width: 220px; _width: 160px; + padding: 6px 0; margin-left: 0; margin-right: 0; - padding: 6px 0; - zoom: 1; + background-color: #ffffff; border-color: #999; border-color: rgba(0, 0, 0, 0.2); border-style: solid; @@ -1445,6 +1435,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + zoom: 1; } .dropdown-menu li { float: none; @@ -1468,6 +1459,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { text-shadow: 0 1px 0 #ffffff; } .topbar .dropdown-menu a:hover, .dropdown-menu a:hover { + color: #404040; + text-decoration: none; background-color: #dddddd; background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); @@ -1478,8 +1471,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { background-image: linear-gradient(top, #eeeeee, #dddddd); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - color: #404040; - text-decoration: none; -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); @@ -1493,9 +1484,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { display: block; } .hero-unit { - background-color: #f5f5f5; - margin-bottom: 30px; padding: 60px; + margin-bottom: 30px; + background-color: #f5f5f5; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -1512,8 +1503,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { line-height: 27px; } footer { - margin-top: 17px; padding-top: 17px; + margin-top: 17px; border-top: 1px solid #eee; } .page-header { @@ -1548,6 +1539,7 @@ footer { .alert-message.danger, .btn.error, .alert-message.error { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #c43c35; background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); @@ -1558,11 +1550,11 @@ footer { background-image: linear-gradient(top, #ee5f5b, #c43c35); background-repeat: repeat-x; 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 { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #57a957; background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); background-image: -moz-linear-gradient(top, #62c462, #57a957); @@ -1573,11 +1565,11 @@ footer { background-image: linear-gradient(top, #62c462, #57a957); background-repeat: repeat-x; 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 { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #339bb9; background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); @@ -1588,13 +1580,16 @@ footer { background-image: linear-gradient(top, #5bc0de, #339bb9); background-repeat: repeat-x; 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); } .btn { - cursor: pointer; display: inline-block; + padding: 5px 14px 6px; + font-size: 13px; + line-height: normal; + color: #333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #e6e6e6; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); @@ -1604,11 +1599,6 @@ footer { background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 13px; - line-height: normal; border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; @@ -1617,6 +1607,7 @@ footer { -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); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + cursor: pointer; -webkit-transition: 0.1s linear all; -moz-transition: 0.1s linear all; -ms-transition: 0.1s linear all; @@ -1624,15 +1615,16 @@ footer { transition: 0.1s linear all; } .btn:hover { - background-position: 0 -15px; color: #333; text-decoration: none; + background-position: 0 -15px; } .btn:focus { outline: 1px dotted #666; } .btn.primary { color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0064cd; background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); background-image: -moz-linear-gradient(top, #049cdb, #0064cd); @@ -1643,7 +1635,6 @@ footer { background-image: linear-gradient(top, #049cdb, #0064cd); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #0064cd #0064cd #003f81; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } @@ -1657,7 +1648,6 @@ footer { background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: alpha(opacity=65); - -khtml-opacity: 0.65; -moz-opacity: 0.65; opacity: 0.65; -webkit-box-shadow: none; @@ -1669,7 +1659,6 @@ footer { background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: alpha(opacity=65); - -khtml-opacity: 0.65; -moz-opacity: 0.65; opacity: 0.65; -webkit-box-shadow: none; @@ -1677,9 +1666,9 @@ footer { box-shadow: none; } .btn.large { + padding: 9px 14px 9px; font-size: 15px; line-height: normal; - padding: 9px 14px 9px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -1700,9 +1689,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .btn-toolbar:before, .btn-toolbar:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .btn-toolbar:after { clear: both; @@ -1716,9 +1705,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .btn-group:before, .btn-group:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .btn-group:after { clear: both; @@ -1753,13 +1742,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .close { float: right; - color: #000000; font-size: 20px; font-weight: bold; line-height: 13.5px; + color: #000000; text-shadow: 0 1px 0 #ffffff; filter: alpha(opacity=20); - -khtml-opacity: 0.2; -moz-opacity: 0.2; opacity: 0.2; } @@ -1767,7 +1755,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { color: #000000; text-decoration: none; filter: alpha(opacity=40); - -khtml-opacity: 0.4; -moz-opacity: 0.4; opacity: 0.4; } @@ -1776,6 +1763,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 7px 15px; margin-bottom: 18px; color: #404040; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #eedc94; background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); background-image: -moz-linear-gradient(top, #fceec1, #eedc94); @@ -1786,10 +1775,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-image: linear-gradient(top, #fceec1, #eedc94); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #eedc94 #eedc94 #e4c652; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); border-width: 1px; border-style: solid; -webkit-border-radius: 4px; @@ -1821,10 +1808,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); } .alert-message.block-message { + padding: 14px; background-image: none; background-color: #fdf5d9; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - padding: 14px; border-color: #fceec1; -webkit-box-shadow: none; -moz-box-shadow: none; @@ -1859,10 +1846,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-color: #c6edf9; } .well { - background-color: #f5f5f5; - margin-bottom: 20px; - padding: 19px; min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; border: 1px solid #eee; border: 1px solid rgba(0, 0, 0, 0.05); -webkit-border-radius: 4px; @@ -1889,11 +1876,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .label { padding: 1px 3px 2px; - background-color: #bfbfbf; font-size: 9.75px; font-weight: bold; color: #ffffff; text-transform: uppercase; + background-color: #bfbfbf; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1910,15 +1897,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .label.notice { background-color: #62cffc; } -.pull-right { - float: right; -} -.pull-left { - float: left; -} .tabs, .pills { - margin: 0 0 20px; padding: 0; + margin: 0 0 20px; list-style: none; zoom: 1; } @@ -1927,9 +1908,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tabs:after, .pills:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .tabs:after, .pills:after { clear: both; @@ -2005,9 +1986,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tabbable.tabs-left:after, .tabbable.tabs-right:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .tabbable.tabs-left:after, .tabbable.tabs-right:after { clear: both; @@ -2088,8 +2069,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-top-color: #555; } .pills a { - margin: 5px 3px 5px 0; padding: 0 15px; + margin: 5px 3px 5px 0; line-height: 30px; text-shadow: 0 1px 1px #ffffff; -webkit-border-radius: 15px; @@ -2117,8 +2098,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { display: block; } .breadcrumb { - margin: 0 0 18px; padding: 7px 14px; + margin: 0 0 18px; background-color: #f5f5f5; background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); @@ -2171,39 +2152,38 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { float: left; padding: 0 14px; line-height: 34px; + text-decoration: none; border-right: 1px solid; border-right-color: #ddd; border-right-color: rgba(0, 0, 0, 0.15); *border-right-color: #ddd; /* IE6-7 */ - text-decoration: none; } .pagination a:hover, .pagination .active a { background-color: #c7eefe; } .pagination .disabled a, .pagination .disabled a:hover { - background-color: transparent; color: #bfbfbf; + background-color: transparent; } .pagination .next a { border: 0; } .modal-backdrop { - background-color: #000000; position: fixed; top: 0; - left: 0; right: 0; bottom: 0; + left: 0; z-index: 10000; + background-color: #000000; } .modal-backdrop.fade { opacity: 0; } .modal-backdrop, .modal-backdrop.fade.in { filter: alpha(opacity=80); - -khtml-opacity: 0.8; -moz-opacity: 0.8; opacity: 0.8; } @@ -2245,15 +2225,16 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { top: 50%; } .modal-header { - border-bottom: 1px solid #eee; padding: 5px 15px; + border-bottom: 1px solid #eee; } .modal-body { padding: 15px; } .modal-footer { - background-color: #f5f5f5; padding: 14px 15px 15px; + margin-bottom: 0; + background-color: #f5f5f5; border-top: 1px solid #ddd; -webkit-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px; @@ -2262,13 +2243,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; zoom: 1; - margin-bottom: 0; } .modal-footer:before, .modal-footer:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .modal-footer:after { clear: both; @@ -2278,20 +2258,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 5px; } .twipsy { - display: block; position: absolute; + z-index: 1000; + display: block; visibility: visible; padding: 5px; font-size: 11px; - z-index: 1000; filter: alpha(opacity=80); - -khtml-opacity: 0.8; -moz-opacity: 0.8; opacity: 0.8; } .twipsy.fade.in { filter: alpha(opacity=80); - -khtml-opacity: 0.8; -moz-opacity: 0.8; opacity: 0.8; } @@ -2328,12 +2306,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-right: 5px solid #000000; } .twipsy-inner { + max-width: 200px; padding: 3px 8px; - background-color: #000000; color: white; text-align: center; - max-width: 200px; text-decoration: none; + background-color: #000000; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -2348,8 +2326,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { top: 0; left: 0; z-index: 1000; - padding: 5px; display: none; + padding: 5px; } .popover.above .arrow { bottom: 0; @@ -2389,11 +2367,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { height: 0; } .popover .inner { - background-color: #000000; - background-color: rgba(0, 0, 0, 0.8); padding: 3px; - overflow: hidden; width: 280px; + overflow: hidden; + background-color: #000000; + background-color: rgba(0, 0, 0, 0.8); -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -2402,17 +2380,17 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); } .popover .title { - background-color: #f5f5f5; padding: 9px 15px; line-height: 1; + background-color: #f5f5f5; + border-bottom: 1px solid #eee; -webkit-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; - border-bottom: 1px solid #eee; } .popover .content { - background-color: #ffffff; padding: 14px; + background-color: #ffffff; -webkit-border-radius: 0 0 3px 3px; -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; @@ -2430,9 +2408,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .media-grid:before, .media-grid:after { display: table; + *display: inline; content: ""; zoom: 1; - *display: inline; } .media-grid:after { clear: both; diff --git a/bootstrap.min.css b/bootstrap.min.css index 832d50ff8..32d4a9967 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -9,33 +9,33 @@ a:hover,a:active{outline:0;} article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]){display:none;} -sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;} +sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} sup{top:-0.5em;} sub{bottom:-0.25em;} img{border:0;-ms-interpolation-mode:bicubic;} -button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;} -button,input{line-height:normal;*overflow:visible;} -button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;} +button,input,select,textarea{margin:0;font-size:100%;vertical-align:baseline;*vertical-align:middle;} +button,input{*overflow:visible;line-height:normal;} +button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;} textarea{overflow:auto;vertical-align:top;} -body{background-color:#ffffff;margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;} +body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#404040;background-color:#ffffff;} +.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;*display:inline;content:"";zoom:1;} .container:after{clear:both;} -.fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.fluid-container:before,.fluid-container:after{display:table;content:"";zoom:1;*display:inline;} +.fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.fluid-container:before,.fluid-container:after{display:table;*display:inline;content:"";zoom:1;} .fluid-container:after{clear:both;} .fluid-sidebar-left,.fluid-sidebar-right{width:220px;} .fluid-sidebar-left{float:left;} .fluid-sidebar-right{float:right;} .fluid-content{margin-left:240px;} .fluid-container.reverse .fluid-content{margin-left:0;margin-right:240px;} -a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;} +a{font-weight:inherit;line-height:inherit;color:#0069d6;text-decoration:none;}a:hover{color:#00438a;text-decoration:underline;} .pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} .show{display:block;} -.row{margin-left:-20px;zoom:1;}.row:before,.row:after{display:table;content:"";zoom:1;*display:inline;} +.row{margin-left:-20px;zoom:1;}.row:before,.row:after{display:table;*display:inline;content:"";zoom:1;} .row:after{clear:both;} [class*="span"]{display:inline;float:left;margin-left:20px;} .span1{width:60px;} @@ -61,7 +61,7 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a: .offset9{margin-left:740px;} .offset10{margin-left:820px;} .offset11{margin-left:900px;} -p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} +p{margin-bottom:9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#bfbfbf;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;} @@ -74,7 +74,7 @@ ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} ul{list-style:disc;} ol{list-style:decimal;} li{line-height:18px;color:#404040;} -ul.unstyled{list-style:none;margin-left:0;} +ul.unstyled{margin-left:0;list-style:none;} dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;} dl dt{font-weight:bold;} dl dd{margin-left:9px;} @@ -83,26 +83,26 @@ strong{font-style:inherit;font-weight:bold;} em{font-style:italic;font-weight:inherit;line-height:inherit;} .muted{color:#bfbfbf;} abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;} -blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:300;font-weight:16px;line-height:22.5px;margin-bottom:0;} +blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eee;}blockquote p{margin-bottom:0;font-size:300;font-weight:16px;line-height:22.5px;} blockquote small{display:block;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} -address{display:block;line-height:18px;margin-bottom:18px;} +address{display:block;margin-bottom:18px;line-height:18px;} code,pre{padding:0 3px 2px;font-family:"Menlo",Monaco,Courier New,monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -code{background-color:#fee9cc;padding:1px 3px;} -pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 9px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre code{padding:0;background-color:transparent;} +code{padding:1px 3px;background-color:#fee9cc;} +pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre code{padding:0;background-color:transparent;} form{margin-bottom:18px;} legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#404040;border-bottom:1px solid #eee;} label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;} label{display:block;margin-bottom:5px;color:#404040;} input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;} -input[type=file]{background-color:#ffffff;background-color:initial;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} -select,input[type=file]{height:27px;line-height:27px;*margin-top:4px;} -select[multiple]{background-color:#ffffff;height:inherit;} +select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;} +select[multiple]{height:inherit;background-color:#ffffff;} textarea{height:auto;} -input,textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);} -input:focus,textarea:focus{outline:0;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);} +input,textarea{-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} +input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;} input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;} .input-mini{width:60px;} .input-small{width:90px;} @@ -137,22 +137,22 @@ form .clearfix.success>label,form .clearfix.success .help-block,form .clearfix.s form .clearfix.success input,form .clearfix.success textarea{color:#468847;border-color:#57a957;}form .clearfix.success input:focus,form .clearfix.success textarea:focus{border-color:#458845;-webkit-box-shadow:0 0 6px #9acc9a;-moz-box-shadow:0 0 6px #9acc9a;box-shadow:0 0 6px #9acc9a;} form .clearfix.success .input-prepend .add-on,form .clearfix.success .input-append .add-on{color:#468847;background-color:#bcddbc;border-color:#468847;} .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;} -.uneditable-input{background-color:#ffffff;display:block;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} +.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} :-moz-placeholder{color:#bfbfbf;} ::-webkit-input-placeholder{color:#bfbfbf;} .help-text{margin-top:5px;margin-bottom:0;color:#bfbfbf;} -.help-inline{display:inline;padding-left:5px;*position:relative;*top:-5px;} +.help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;} .help-block{display:block;max-width:600px;} .inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input{display:inline-block;} .inline-inputs input.mini{width:60px;} .inline-inputs input.small{width:90px;} .inline-inputs span{padding:0 2px 0 1px;} .input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.input-prepend .add-on,.input-append .add-on{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;} +.input-prepend .add-on,.input-append .add-on{position:relative;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;} .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;margin-right:0;margin-left:-1px;} +.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} .search-form .search-query{-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} .control-group{margin-bottom:18px;} .control-group>label{font-weight:bold;} @@ -160,65 +160,32 @@ form .clearfix.success .input-prepend .add-on,form .clearfix.success .input-appe .horizontal-form .controls{margin-left:150px;} .horizontal-form .control-list{padding-top:6px;} .horizontal-form .form-actions{padding-left:150px;} -table{width:100%;padding:0;margin-bottom:18px;font-size:13px;border-collapse:collapse;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} -table th{padding-top:9px;font-weight:bold;vertical-align:middle;} -table td{vertical-align:top;border-top:1px solid #ddd;} -table tbody th{border-top:1px solid #ddd;vertical-align:top;} -.condensed-table th,.condensed-table td{padding:5px 5px 4px;} -.bordered-table{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td{border-left:1px solid #ddd;} +table{width:100%;margin-bottom:18px;} +th,td{padding:8px;line-height:18px;text-align:left;border-bottom:1px solid #ddd;} +th{font-weight:bold;vertical-align:bottom;} +td{vertical-align:top;} +tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} +.condensed-table th,.condensed-table td{padding:4px 5px;} +.bordered-table{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td,.bordered-table td+th{border-left:1px solid #ddd;} .bordered-table thead:first-child tr:first-child th:first-child,.bordered-table tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} .bordered-table thead:first-child tr:first-child th:last-child,.bordered-table tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} -.bordered-table tbody tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} -.bordered-table tbody tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} -table .span1{width:40px;} -table .span2{width:120px;} -table .span3{width:200px;} -table .span4{width:280px;} -table .span5{width:360px;} -table .span6{width:440px;} -table .span7{width:520px;} -table .span8{width:600px;} -table .span9{width:680px;} -table .span10{width:760px;} -table .span11{width:840px;} -table .span12{width:920px;} -table .span13{width:1000px;} -table .span14{width:1080px;} -table .span15{width:1160px;} -table .span16{width:1240px;} +.bordered-table thead:last-child tr:last-child th:first-child,.bordered-table tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} +.bordered-table thead:last-child tr:last-child th:last-child,.bordered-table tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .striped-table tbody tr:nth-child(odd) td,.striped-table tbody tr:nth-child(odd) th{background-color:#f9f9f9;} -.striped-table tbody tr:hover td,.striped-table tbody tr:hover th{background-color:#f5f5f5;} -table .header{cursor:pointer;}table .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} -table .headerSortUp,table .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} -table .header:hover:after{visibility:visible;} -table .headerSortDown:after,table .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} -table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} -table .blue{color:#049cdb;border-bottom-color:#049cdb;} -table .headerSortUp.blue,table .headerSortDown.blue{background-color:#ade6fe;} -table .green{color:#46a546;border-bottom-color:#46a546;} -table .headerSortUp.green,table .headerSortDown.green{background-color:#cdeacd;} -table .red{color:#9d261d;border-bottom-color:#9d261d;} -table .headerSortUp.red,table .headerSortDown.red{background-color:#f4c8c5;} -table .yellow{color:#ffc40d;border-bottom-color:#ffc40d;} -table .headerSortUp.yellow,table .headerSortDown.yellow{background-color:#fff6d9;} -table .orange{color:#f89406;border-bottom-color:#f89406;} -table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;} -table .purple{color:#7a43b6;border-bottom-color:#7a43b6;} -table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;} .navbar{height:40px;overflow:visible;} .navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} .navbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} -.navbar .brand a:hover,.navbar ul .active>a{background-color:#333333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} -.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} -.navbar p{margin:0;line-height:40px;}.navbar p a:hover{background-color:transparent;color:#ffffff;} -.navbar-search{position:relative;margin-top:6px;margin-bottom:0;float:left;}.navbar-search .search-query{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#e6e6e6;} +.navbar .brand a:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);} +.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} +.navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;} +.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background-color:#444;background-color:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#e6e6e6;} .navbar-search .search-query::-webkit-input-placeholder{color:#e6e6e6;} -.navbar-search .search-query:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} -.navbar-search .search-query:focus,.navbar-search .search-query.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} +.navbar-search .search-query:hover{color:#ffffff;background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);} +.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#404040;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} .navbar-static{margin-bottom:18px;} .navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.navbar-fixed{position:fixed;top:0;left:0;right:0;z-index:10000;} -.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav>li{display:block;float:left;} +.navbar-fixed{position:fixed;top:0;right:0;left:0;z-index:10000;} +.nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}.nav>li{display:block;float:left;} .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;} .nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;border:0;} @@ -229,46 +196,46 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .nav .dropdown-menu .divider{background-color:#222;border-color:#444;} .topbar ul .dropdown-menu li a{padding:4px 15px;} .dropdown{position:relative;} -.dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:6px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=30);-khtml-opacity:0.3;-moz-opacity:0.3;opacity:0.3;} -.dropdown:hover .dropdown-toggle:after{filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} -.dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} +.dropdown-toggle:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;content:"↓";} +.dropdown:hover .dropdown-toggle:after{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;} +.dropdown-menu{position:absolute;top:40px;z-index:900;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:6px 0;margin-left:0;margin-right:0;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;zoom:1;}.dropdown-menu li{float:none;display:block;background-color:none;} .dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} -.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} +.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{color:#404040;text-decoration:none;background-color:#dddddd;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} .dropdown.open .dropdown-menu{display:block;} -.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} -footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} +footer{padding-top:17px;margin-top:17px;border-top:1px solid #eee;} .page-header{margin-bottom:27px;border-bottom:1px solid #eee;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:13.5px;} .btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;} -.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;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);background-repeat:repeat-x;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-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);background-repeat:repeat-x;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-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);background-repeat:repeat-x;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);} -.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} +.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);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{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#339bb9;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);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);} +.btn{display:inline-block;padding:5px 14px 6px;font-size:13px;line-height:normal;color:#333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333;text-decoration:none;background-position:0 -15px;} .btn:focus{outline:1px dotted #666;} -.btn.primary{color:#ffffff;background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .btn:active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);} -.btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn.large{font-size:15px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding:7px 9px 7px;font-size:11px;} :root .alert-message,:root .btn{border-radius:0 \0;} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} -.btn-toolbar{zoom:1;}.btn-toolbar:before,.btn-toolbar:after{display:table;content:"";zoom:1;*display:inline;} +.btn-toolbar{zoom:1;}.btn-toolbar:before,.btn-toolbar:after{display:table;*display:inline;content:"";zoom:1;} .btn-toolbar:after{clear:both;} .btn-toolbar .btn-group{float:left;margin-right:10px;} -.btn-group{zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";zoom:1;*display:inline;} +.btn-group{zoom:1;}.btn-group:before,.btn-group:after{display:table;*display:inline;content:"";zoom:1;} .btn-group:after{clear:both;} .btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} .btn-group .btn:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;} -.close{float:right;color:#000000;font-size:20px;font-weight:bold;line-height:13.5px;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} -.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;} +.close{float:right;font-size:20px;font-weight:bold;line-height:13.5px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;} +.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;} .alert-message h5{line-height:18px;} .alert-message p{margin-bottom:0;} .alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;} .alert-message .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);} -.alert-message.block-message{background-image:none;background-color:#fdf5d9;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-message.block-message ul,.alert-message.block-message p{margin-right:30px;} +.alert-message.block-message{padding:14px;background-image:none;background-color:#fdf5d9;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-message.block-message ul,.alert-message.block-message p{margin-right:30px;} .alert-message.block-message ul{margin-bottom:0;} .alert-message.block-message li{color:#404040;} .alert-message.block-message .alert-actions{margin-top:5px;} @@ -276,15 +243,13 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;} .alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;} .alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;} -.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} +.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} -.label{padding:1px 3px 2px;background-color:#bfbfbf;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} +.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#bfbfbf;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} .label.warning{background-color:#f89406;} .label.success{background-color:#46a546;} .label.notice{background-color:#62cffc;} -.pull-right{float:right;} -.pull-left{float:left;} -.tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;*display:inline;} +.tabs,.pills{padding:0;margin:0 0 20px;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;*display:inline;content:"";zoom:1;} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} .tabs{border-color:#ddd;border-style:solid;border-width:0 0 1px;}.tabs>li{position:relative;margin-bottom:-1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} @@ -294,7 +259,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .tabbable.tabs-bottom .tabs>li{margin-top:-1px;margin-bottom:0;} .tabbable.tabs-bottom .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabbable.tabs-bottom .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} .tabbable.tabs-bottom .tabs>.active>a,.tabbable.tabs-bottom .tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd;} -.tabbable.tabs-left,.tabbable.tabs-right{zoom:1;}.tabbable.tabs-left:before,.tabbable.tabs-right:before,.tabbable.tabs-left:after,.tabbable.tabs-right:after{display:table;content:"";zoom:1;*display:inline;} +.tabbable.tabs-left,.tabbable.tabs-right{zoom:1;}.tabbable.tabs-left:before,.tabbable.tabs-right:before,.tabbable.tabs-left:after,.tabbable.tabs-right:after{display:table;*display:inline;content:"";zoom:1;} .tabbable.tabs-left:after,.tabbable.tabs-right:after{clear:both;} .tabbable.tabs-left .tabs,.tabbable.tabs-right .tabs{width:100px;}.tabbable.tabs-left .tabs>li,.tabbable.tabs-right .tabs>li{float:none;margin-bottom:-1px;}.tabbable.tabs-left .tabs>li>a,.tabbable.tabs-right .tabs>li>a{margin-bottom:2px;}.tabbable.tabs-left .tabs>li>a:hover,.tabbable.tabs-right .tabs>li>a:hover{border-color:transparent;} .tabbable.tabs-left .tab-content{margin-left:100px;} @@ -307,46 +272,46 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} .tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} .tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} -.pills a{margin:5px 3px 5px 0;padding:0 15px;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} +.pills a{padding:0 15px;margin:5px 3px 5px 0;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} .pills .active a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} .pills-vertical>li{float:none;} .tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} .tab-content>.active,.pill-content>.active{display:block;} -.breadcrumb{margin:0 0 18px;padding:7px 14px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} +.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#bfbfbf;} .breadcrumb .active a{color:#404040;} .pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);} .pagination li{display:inline;} -.pagination a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;} +.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;} .pagination a:hover,.pagination .active a{background-color:#c7eefe;} -.pagination .disabled a,.pagination .disabled a:hover{background-color:transparent;color:#bfbfbf;} +.pagination .disabled a,.pagination .disabled a:hover{color:#bfbfbf;background-color:transparent;} .pagination .next a{border:0;} -.modal-backdrop{background-color:#000000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;}.modal-backdrop.fade{opacity:0;} -.modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} +.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:10000;background-color:#000000;}.modal-backdrop.fade{opacity:0;} +.modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;} .modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} .modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} .modal.fade.in{top:50%;} -.modal-header{border-bottom:1px solid #eee;padding:5px 15px;} +.modal-header{padding:5px 15px;border-bottom:1px solid #eee;} .modal-body{padding:15px;} -.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;} +.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}.modal-footer:before,.modal-footer:after{display:table;*display:inline;content:"";zoom:1;} .modal-footer:after{clear:both;} .modal-footer .btn{float:right;margin-left:5px;} -.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} +.twipsy{position:absolute;z-index:1000;display:block;visibility:visible;padding:5px;font-size:11px;filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;}.twipsy.fade.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;} .twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.twipsy-inner{padding:3px 8px;background-color:#000000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.twipsy-inner{max-width:200px;padding:3px 8px;color:white;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .twipsy-arrow{position:absolute;width:0;height:0;} -.popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.popover{position:absolute;top:0;left:0;z-index:1000;display:none;padding:5px;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} -.popover .inner{background-color:#000000;background-color:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);} -.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} -.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} -.media-grid{margin-left:-20px;margin-bottom:0;zoom:1;}.media-grid:before,.media-grid:after{display:table;content:"";zoom:1;*display:inline;} +.popover .inner{padding:3px;width:280px;overflow:hidden;background-color:#000000;background-color:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);} +.popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} +.popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} +.media-grid{margin-left:-20px;margin-bottom:0;zoom:1;}.media-grid:before,.media-grid:after{display:table;*display:inline;content:"";zoom:1;} .media-grid:after{clear:both;} .media-grid li{display:inline;} .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}.media-grid a img{display:block;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b503c23e4..6c57fddab 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -41,36 +41,62 @@ body > .navbar-fixed .brand:hover { /* Github buttons -------------------------------------------------- */ -.github-btn + .github-btn { - margin-left: 10px; -} .github-btn { display: inline-block; height: 20px; overflow: hidden; } -.github-btn .btn, -.github-btn .count { +.github-btn .gh-btn, +.github-btn .gh-count, +.github-btn .gh-ico { float: left; +} +.github-btn .gh-btn, +.github-btn .gh-count { padding: 1px 5px 1px 4px; font-size: 11px; font-weight: bold; line-height: 16px; color: #666; text-shadow: 0 1px 0 #fff; + cursor: pointer; +} +.github-btn .gh-btn { + background-color: #e6e6e6; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); + background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-repeat: no-repeat; + border: 1px solid #ccc; + border-bottom-color: #bbb; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); + box-shadow: inset 0 1px 0 rgba(255,255,255,.2); } -.github-btn .btn { - box-shadow: none; +.github-btn .gh-btn:hover { + color: #333; + text-decoration: none; + background-position: 0 -10px; } -.github-btn .github-ico { - float: left; +.github-btn .gh-btn:active { + -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); + -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); + box-shadow: inset 0 2px 4px rgba(0,0,0,.15); +} +.github-btn .gh-ico { margin-right: 4px; opacity: .65; } -.github-btn .count { +.github-btn .gh-btn:hover .gh-ico { + opacity: .75; +} +.github-btn .gh-count { display: inline-block; margin-left: 2px; background-color: #fff; diff --git a/docs/base-css.html b/docs/base-css.html index aa4a2ebfc..48704cbd4 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -519,7 +519,7 @@

      Table options

      - + @@ -551,7 +551,7 @@ - +
      Name Class .condensed-table Cuts padding in half, from 10px to 5px, within all td and th elementsCuts vertical padding in half, from 8px to 4px, within all td and th elements
      diff --git a/docs/index.html b/docs/index.html index c9c5df7cd..977ba5c9d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -56,6 +56,7 @@

      Bootstrap is a responsive 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.

      Download on GitHub + Get started Currently v2.0.0

      diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 10ad71a74..f330d750d 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -162,7 +162,7 @@

      Grid customization

      - +
      @@ -173,12 +173,12 @@ - + - + @@ -274,7 +274,7 @@

      Supported devices

      Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

      -
      Variable
      @gridColumns1612 The number of columns within the grid
      @gridColumnWidth40px60px The width of each column within the grid
      +
      diff --git a/lib/tables.less b/lib/tables.less index 4aed466b1..c8cda1cf9 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -4,45 +4,41 @@ * ---------------------------------------- */ + // BASELINE STYLES // --------------- table { width: 100%; - padding: 0; margin-bottom: @baseLineHeight; - font-size: @baseFontSize; - border-collapse: collapse; - th, - td { - padding: 10px 10px 9px; - line-height: @baseLineHeight; - text-align: left; - } - th { - padding-top: 9px; - font-weight: bold; - vertical-align: middle; - } - td { - vertical-align: top; - border-top: 1px solid #ddd; - } - // When scoped to row, fix th in tbody - tbody th { - border-top: 1px solid #ddd; - vertical-align: top; - } +} +th, +td { + padding: 8px; + line-height: @baseLineHeight; + text-align: left; + border-bottom: 1px solid #ddd; +} +th { + font-weight: bold; + vertical-align: bottom; +} +td { + vertical-align: top; +} +tbody tr:last-child th, +tbody tr:last-child td { + border-bottom: 0; } -// CONDENSED VERSION -// ----------------- +// CONDENSED TABLE W/ HALF PADDING +// ------------------------------- .condensed-table { th, td { - padding: 5px 5px 4px; + padding: 4px 5px; } } @@ -53,13 +49,14 @@ table { .bordered-table { border: 1px solid #ddd; border-collapse: separate; // Done so we can round those corners! - *border-collapse: collapse; /* IE7, collapse table to remove spacing */ .border-radius(4px); th + th, td + td, - th + td { + th + td, + td + th { border-left: 1px solid #ddd; } + // For first th or td in the first row in the first thead or tbody thead:first-child tr:first-child th:first-child, tbody:first-child tr:first-child td:first-child { .border-radius(4px 0 0 0); @@ -68,15 +65,34 @@ table { tbody:first-child tr:first-child td:last-child { .border-radius(0 4px 0 0); } - tbody tr:last-child td:first-child { + // For first th or td in the first row in the first thead or tbody + thead:last-child tr:last-child th:first-child, + tbody:last-child tr:last-child td:first-child { .border-radius(0 0 0 4px); } - tbody tr:last-child td:last-child { + thead:last-child tr:last-child th:last-child, + tbody:last-child tr:last-child td:last-child { .border-radius(0 0 4px 0); } } +// ZEBRA-STRIPING +// -------------- + +// Default zebra-stripe styles (alternating gray and transparent backgrounds) +.striped-table { + tbody { + tr:nth-child(odd) td, + tr:nth-child(odd) th { + background-color: #f9f9f9; + } + } +} + + + +/* // ---------------- // This is a duplication of the main grid .columns() mixin, but subtracts 20px to account for input padding and border @@ -104,24 +120,6 @@ table { } -// ZEBRA-STRIPING -// -------------- - -// Default zebra-stripe styles (alternating gray and transparent backgrounds) -.striped-table { - tbody { - tr:nth-child(odd) td, - tr:nth-child(odd) th { - background-color: #f9f9f9; - } - tr:hover td, - tr:hover th { - background-color: #f5f5f5; - } - } -} - - // TABLESORTER // ----------- @@ -225,4 +223,4 @@ table { .headerSortDown.purple { background-color: lighten(@purple, 40%); } -} \ No newline at end of file +}*/ \ No newline at end of file -- cgit v1.2.3 From 61e84d8762d79befb2d75685705fd4e451a609fe Mon Sep 17 00:00:00 2001 From: Evan Meagher Date: Tue, 29 Nov 2011 23:16:09 -0800 Subject: Add vertical nav divider. --- lib/patterns.less | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/patterns.less b/lib/patterns.less index 15c3c9c06..a2d512339 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -157,6 +157,15 @@ background-color: #222; background-color: rgba(0,0,0,.5); } + // Dividers (basically a vertical hr) + .divider { + height: 40px; + width: 1px; + margin: 0 5px; + overflow: hidden; + background-color: #222; + border-right: 1px solid #444; + } // Secondary (floated right) nav in topbar &.secondary-nav { -- cgit v1.2.3 From 0c8d2e37e76db3d3b47ca9eb5340def031b9196b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:16:38 -0800 Subject: adding bordered table to docs and showing it works with colspan --- docs/base-css.html | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index bab55f0e4..7626d1668 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -630,7 +630,42 @@ <table class="striped-table"> ... </table> -

      3. Condensed table

      +

      3. Bordered table

      +

      Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.

      +
      Label
      + + + + + + + + + + + + + + + + + + + + + + + + + + +
      #First NameLast NameLanguage
      1Some OneEnglish
      2 JoeSixpackEnglish
      3StuDentCode
      +

      Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

      +
      +<table class="striped-table">
+  ...
+</table>
      +

      4. Condensed table

      Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).

      @@ -666,7 +701,7 @@ <table class="condensed-table"> ... </table> -

      4. Striped table w/ TableSorter.js

      +

      5. Striped table w/ TableSorter.js

      Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

      -- cgit v1.2.3 From 90c190d4efedd4080c574b34bffdf54cd5b9ed88 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:48:27 -0800 Subject: updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks --- bootstrap.css | 5 ++++- bootstrap.min.css | 3 ++- docs/base-css.html | 9 ++++++++- lib/type.less | 5 +++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 6c5e58b71..aa852460e 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Nov 29 22:53:00 PST 2011 + * Date: Tue Nov 29 23:48:09 PST 2011 */ html, body { margin: 0; @@ -514,6 +514,9 @@ pre { white-space: pre-wrap; word-break: break-all; } +pre.prettyprint { + margin-bottom: 18px; +} pre code { padding: 0; background-color: transparent; diff --git a/bootstrap.min.css b/bootstrap.min.css index 7e9e633ae..e7505341e 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -89,7 +89,8 @@ blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right address{display:block;margin-bottom:18px;line-height:18px;} code,pre{padding:0 3px 2px;font-family:"Menlo",Monaco,Courier New,monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{padding:1px 3px;background-color:#fee9cc;} -pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre code{padding:0;background-color:transparent;} +pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;} +pre code{padding:0;background-color:transparent;} form{margin-bottom:18px;} legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#404040;border-bottom:1px solid #eee;} label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;} diff --git a/docs/base-css.html b/docs/base-css.html index 7626d1668..cc1b4903c 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -632,6 +632,7 @@ </table>

      3. Bordered table

      Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.

      +

      Note Bordered tables do not work well with rowspan due to somewhat hacky CSS applied to the tables. Sorry about that!

      @@ -648,7 +649,13 @@ - + + + + + + + diff --git a/lib/type.less b/lib/type.less index 407a20ec2..bdc99acdf 100644 --- a/lib/type.less +++ b/lib/type.less @@ -205,6 +205,11 @@ pre { white-space: pre-wrap; word-break: break-all; + // Make prettyprint styles more spaced out for readability + &.prettyprint { + margin-bottom: @baseLineHeight; + } + // Account for some code outputs that place code tags in pre tags code { padding: 0; -- cgit v1.2.3 From 447c9322e96ebd1102115aea01d925536016351a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:56:01 -0800 Subject: update all leads on docs pages --- docs/base-css.html | 2 +- docs/components.html | 2 +- docs/index.html | 4 ++-- docs/javascript.html | 2 +- docs/less.html | 2 +- docs/scaffolding.html | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index cc1b4903c..2b7d17b4a 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -50,7 +50,7 @@ ================================================== -->

      Base CSS

      -

      The core typography, form, and table styles of Bootstrap

      +

      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.

      diff --git a/docs/components.html b/docs/components.html index bb2f326b4..c311d20e6 100644 --- a/docs/components.html +++ b/docs/components.html @@ -50,7 +50,7 @@ ================================================== -->

      Components

      -

      Reusable patterns for navigation, alerts, popovers, and much more

      +

      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

      diff --git a/docs/index.html b/docs/index.html index 977ba5c9d..ff7d56976 100644 --- a/docs/index.html +++ b/docs/index.html @@ -55,8 +55,8 @@

      Bootstrap,
      from Twitter

      Bootstrap is a responsive 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.

      - Download on GitHub - Get started + Download on GitHub + Get started Currently v2.0.0

      diff --git a/docs/javascript.html b/docs/javascript.html index 2db37a9fe..09cdc714c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -83,7 +83,7 @@ ================================================== -->

      Javascript for Bootstrap

      -

      Bring Bootstrap's components to life with custom plugins for jQuery and Ender

      +

      Bring Bootstrap's components to life with flexible, custom javascript plugins for many of our custom components that work with jQuery and Ender.

      diff --git a/docs/less.html b/docs/less.html index 2d35eea26..97d95a3ab 100644 --- a/docs/less.html +++ b/docs/less.html @@ -50,7 +50,7 @@ ================================================== -->

      Using LESS with Bootstrap

      -

      Be a boss and use Bootstrap's built-in variables, mixins, and more via LESS

      +

      Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.

      diff --git a/docs/scaffolding.html b/docs/scaffolding.html index f330d750d..d4d1c6526 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -50,7 +50,7 @@ ================================================== -->

      Scaffolding

      -

      Responsive 12-column grid and fixed- and fluid-width layouts

      +

      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

      -- cgit v1.2.3 From f2c40ee24d0caa26e79ed206370858918c603419 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Nov 2011 00:39:38 -0800 Subject: adding step nav to components --- bootstrap.css | 44 +++++++++++++++++++++++- bootstrap.min.css | 6 ++++ docs/assets/css/docs.css | 88 ------------------------------------------------ docs/components.html | 22 ++++++++++++ lib/tabs-pills.less | 43 +++++++++++++++++++++++ 5 files changed, 114 insertions(+), 89 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index aa852460e..6e10706f7 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Nov 29 23:48:09 PST 2011 + * Date: Wed Nov 30 00:39:32 PST 2011 */ html, body { margin: 0; @@ -2088,6 +2088,48 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tab-content > .active, .pill-content > .active { display: block; } +.step-nav { + position: relative; + margin: 0 0 18px; + list-style: none; + line-height: 30px; + text-align: center; + background-color: #f5f5f5; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +.step-nav li { + display: inline; + color: #bfbfbf; +} +.step-nav .prev, .step-nav .next { + position: absolute; + top: 6px; +} +.step-nav .prev { + left: 15px; +} +.step-nav .next { + right: 15px; +} +.step-nav .dot { + display: inline-block; + width: 10px; + height: 10px; + margin: 0 3px; + text-indent: -999em; + background-color: #bfbfbf; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); +} +.step-nav .dot:hover, .step-nav .active .dot { + background-color: #404040; +} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; diff --git a/bootstrap.min.css b/bootstrap.min.css index e7505341e..7042c7a10 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -279,6 +279,12 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .pills-vertical>li{float:none;} .tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} .tab-content>.active,.pill-content>.active{display:block;} +.step-nav{position:relative;margin:0 0 18px;list-style:none;line-height:30px;text-align:center;background-color:#f5f5f5;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.step-nav li{display:inline;color:#bfbfbf;} +.step-nav .prev,.step-nav .next{position:absolute;top:6px;} +.step-nav .prev{left:15px;} +.step-nav .next{right:15px;} +.step-nav .dot{display:inline-block;width:10px;height:10px;margin:0 3px;text-indent:-999em;background-color:#bfbfbf;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);} +.step-nav .dot:hover,.step-nav .active .dot{background-color:#404040;} .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#bfbfbf;} .breadcrumb .active a{color:#404040;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ec3cd83cb..a7b52821e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -39,71 +39,6 @@ body > .navbar-fixed .brand:hover { } -/* Github buttons --------------------------------------------------- */ -.github-btn { - display: inline-block; - height: 20px; - overflow: hidden; -} -.github-btn .gh-btn, -.github-btn .gh-count, -.github-btn .gh-ico { - float: left; -} -.github-btn .gh-btn, -.github-btn .gh-count { - padding: 1px 5px 1px 4px; - font-size: 11px; - font-weight: bold; - line-height: 16px; - color: #666; - text-shadow: 0 1px 0 #fff; - cursor: pointer; -} -.github-btn .gh-btn { - background-color: #e6e6e6; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-repeat: no-repeat; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); - -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2); - box-shadow: inset 0 1px 0 rgba(255,255,255,.2); -} -.github-btn .gh-btn:hover { - color: #333; - text-decoration: none; - background-position: 0 -10px; -} -.github-btn .gh-btn:active { - -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); - -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15); - box-shadow: inset 0 2px 4px rgba(0,0,0,.15); -} -.github-btn .gh-ico { - margin-right: 4px; - opacity: .65; -} -.github-btn .gh-btn:hover .gh-ico { - opacity: .75; -} -.github-btn .gh-count { - display: inline-block; - margin-left: 2px; - background-color: #fff; - border: 1px solid #ddd; -} - - /* Jumbotrons -------------------------------------------------- */ .jumbotron { @@ -330,13 +265,6 @@ body > .navbar-fixed .brand:hover { margin-left: 10px; } -/* scrollspy docs */ - -.scrollspy-example { - overflow: auto; - height: 200px; - position: relative; -} /* Popover docs -------------------------------------------------- */ @@ -499,19 +427,3 @@ h2 + table { } } -#accordion dt a{ - display:block; - padding: 9px 15px; - line-height: 1; - background-color: whiteSmoke; - border: 1px solid #EEE; - border-top-color: #fff; -} - -#accordion dt:first-child a { - border-top-color:#eee; -} - -#accordion dd p { - padding: 10px; -} diff --git a/docs/components.html b/docs/components.html index c311d20e6..833f532d9 100644 --- a/docs/components.html +++ b/docs/components.html @@ -412,6 +412,28 @@ + +
      +
      +

      Step nav

      +

      Placeholder for now!

      +
      +
      +
      + +
      +
      +
      +
      +
      diff --git a/lib/tabs-pills.less b/lib/tabs-pills.less index 3ff08a676..7fc73f69c 100644 --- a/lib/tabs-pills.less +++ b/lib/tabs-pills.less @@ -216,3 +216,46 @@ .pill-content > .active { display: block; } + + +// Step nav +.step-nav { + position: relative; // for prev/next links + margin: 0 0 @baseLineHeight; + list-style: none; + line-height: 30px; + text-align: center; + background-color: #f5f5f5; + .border-radius(15px); + li { + display: inline; + color: @grayLight; + } + // prev/next links + .prev, + .next { + position: absolute; + top: 6px; + } + .prev { + left: 15px; + } + .next { + right: 15px; + } + // indicators for each step/page/item/etc + .dot { + display: inline-block; + width: 10px; + height: 10px; + margin: 0 3px; + text-indent: -999em; + background-color: @grayLight; + .border-radius(5px); + .box-shadow(inset 0 1px 1px rgba(0,0,0,.25)); + } + .dot:hover, + .active .dot { + background-color: @grayDark; + } +} -- cgit v1.2.3 From bc51c15709469fd0c2e78886a15e849626a8f191 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Nov 2011 01:00:55 -0800 Subject: adding temp idea for subnav to docs --- bootstrap.css | 45 ++++++++++++++++++++++++++++++++++++++++++++- bootstrap.min.css | 4 ++++ docs/scaffolding.html | 9 +++++++++ lib/tabs-pills.less | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index 6e10706f7..2bef99e1a 100644 --- a/bootstrap.css +++ b/bootstrap.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: Wed Nov 30 00:39:32 PST 2011 + * Date: Wed Nov 30 00:54:47 PST 2011 */ html, body { margin: 0; @@ -2130,6 +2130,49 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .step-nav .dot:hover, .step-nav .active .dot { background-color: #404040; } +.subnav { + position: relative; + background-color: #eeeeee; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee)); + background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: linear-gradient(top, #f5f5f5, #eeeeee); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.subnav a { + padding: 10px 15px; + color: #0069d6; + text-shadow: 0 1px 0 #fff; + border-left: 1px solid #f9f9f9; + border-right: 1px solid #e5e5e5; +} +.subnav a:hover { + color: #00438a; + background-color: #eee; +} +.subnav li:first-child a { + border-left: 0; + -webkit-border-radius: 6px 0 0 6px; + -moz-border-radius: 6px 0 0 6px; + border-radius: 6px 0 0 6px; +} +.subnav li:last-child a { + border-right: 0; + -webkit-border-radius: 0 6px 6px 0; + -moz-border-radius: 0 6px 6px 0; + border-radius: 0 6px 6px 0; +} +.subnav ul .active > a { + color: #404040; + background-color: #eee; +} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 7042c7a10..d8ee06c15 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -285,6 +285,10 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .step-nav .next{right:15px;} .step-nav .dot{display:inline-block;width:10px;height:10px;margin:0 3px;text-indent:-999em;background-color:#bfbfbf;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);} .step-nav .dot:hover,.step-nav .active .dot{background-color:#404040;} +.subnav{position:relative;background-color:#eeeeee;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee));background-image:-moz-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-ms-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee));background-image:-webkit-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-o-linear-gradient(top, #f5f5f5, #eeeeee);background-image:linear-gradient(top, #f5f5f5, #eeeeee);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.subnav a{padding:10px 15px;color:#0069d6;text-shadow:0 1px 0 #fff;border-left:1px solid #f9f9f9;border-right:1px solid #e5e5e5;}.subnav a:hover{color:#00438a;background-color:#eee;} +.subnav li:first-child a{border-left:0;-webkit-border-radius:6px 0 0 6px;-moz-border-radius:6px 0 0 6px;border-radius:6px 0 0 6px;} +.subnav li:last-child a{border-right:0;-webkit-border-radius:0 6px 6px 0;-moz-border-radius:0 6px 6px 0;border-radius:0 6px 6px 0;} +.subnav ul .active>a{color:#404040;background-color:#eee;} .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#bfbfbf;} .breadcrumb .active a{color:#404040;} diff --git a/docs/scaffolding.html b/docs/scaffolding.html index d4d1c6526..dd7f05bc6 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -53,6 +53,15 @@

      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

      + +
      + +
      +
      diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 210512a8b..069130080 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -32,7 +32,9 @@ Alert.prototype = { - close: function ( e ) { + constructor: Alert + + , close: function ( e ) { var $element = $(this) $element = $element.hasClass('alert-message') ? $element : $element.parent() diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index 1cafe4d68..4ed24d98b 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -31,7 +31,9 @@ Button.prototype = { - setState: function (state) { + constructor: Button + + , setState: function (state) { var d = 'disabled' , $el = this.$element , data = $el.data() diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 93f91513e..f56f6c705 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -34,7 +34,9 @@ Collapse.prototype = { - dimension: function () { + constructor: Collapse + + , dimension: function () { var hasWidth = this.$element.hasClass('width') return hasWidth ? 'width' : 'height' } diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 7259284bf..238a52e08 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -32,7 +32,9 @@ Dropdown.prototype = { - toggle: function ( e ) { + constructor: Dropdown + + , toggle: function ( e ) { var li = $(this).parent('li') , isActive = li.hasClass('open') diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 5f543c553..189bcf2ac 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -34,7 +34,9 @@ Modal.prototype = { - toggle: function () { + constructor: Modal + + , toggle: function () { return this[!this.isShown ? 'show' : 'hide']() } diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 3c67b18fc..890f6efc0 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -34,7 +34,9 @@ Popover.prototype = $.extend({}, $.fn.twipsy.Twipsy.prototype, { - setContent: function () { + constructor: Popover + + , setContent: function () { var $tip = this.tip() , title = this.getTitle() , content = this.getContent() diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index fe34019ff..8248b6cbd 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -39,7 +39,9 @@ ScrollSpy.prototype = { - refresh: function () { + constructor: ScrollSpy + + , refresh: function () { this.targets = this.$body .find(this.selector) .map(function () { diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index ba956cbe8..6aa8ae32c 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -31,7 +31,9 @@ Tab.prototype = { - show: function () { + constructor: Tab + + , show: function () { var $this = this.element , $ul = $this.closest('ul:not(.dropdown-menu)') , href = $this.attr('data-target') || $this.attr('href') diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index fe4469a23..ca8ac8800 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -34,7 +34,9 @@ Twipsy.prototype = { - show: function() { + constructor: Twipsy + + , show: function() { var pos , actualWidth , actualHeight @@ -183,7 +185,7 @@ return this } - $.fn.twipsy.initWith = function (options, Constructor, name) { + $.fn.twipsy.initWith = function (options, Base, name) { var twipsy , binder , eventIn @@ -209,7 +211,7 @@ var twipsy = $.data(ele, name) if (!twipsy) { - twipsy = new Constructor(ele, $.fn.twipsy.elementOptions(ele, options)) + twipsy = new Base(ele, $.fn.twipsy.elementOptions(ele, options)) $.data(ele, name, twipsy) } -- cgit v1.2.3 From 6e70d490e1c189518164d7f08035c34e21745715 Mon Sep 17 00:00:00 2001 From: Evan Meagher Date: Fri, 2 Dec 2011 11:37:39 -0800 Subject: Add vertical nav divider example in components doc page. --- bootstrap.css | 10 +++++++++- bootstrap.min.css | 1 + docs/components.html | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index afd87d137..977737f67 100644 --- a/bootstrap.css +++ b/bootstrap.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: Wed Nov 30 22:05:44 PST 2011 + * Date: Fri Dec 2 11:32:48 PST 2011 */ html, body { margin: 0; @@ -1313,6 +1313,14 @@ table { background-color: #222; background-color: rgba(0, 0, 0, 0.5); } +.nav .divider { + height: 40px; + width: 1px; + margin: 0 5px; + overflow: hidden; + background-color: #222; + border-right: 1px solid #444; +} .nav.secondary-nav { float: right; margin-left: 10px; diff --git a/bootstrap.min.css b/bootstrap.min.css index d8ee06c15..37e966784 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -189,6 +189,7 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}.nav>li{display:block;float:left;} .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;} .nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} +.nav .divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;} .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;border:0;} .nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);} .nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#ffffff;}.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);} diff --git a/docs/components.html b/docs/components.html index 833f532d9..ba9542fdb 100644 --- a/docs/components.html +++ b/docs/components.html @@ -180,6 +180,7 @@
        +
      • Dropdown
          -- cgit v1.2.3 From e603009fca162178de3265192b2e5da40ce3a151 Mon Sep 17 00:00:00 2001 From: Chris Sternal-Johnson Date: Thu, 8 Dec 2011 14:42:42 -0500 Subject: fix docs for bordered-table --- docs/base-css.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index 2b7d17b4a..a9529821b 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -667,9 +667,8 @@
      English
      2 Joe2JoeSixpackEnglish
      Joe Sixpack English
      -

      Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

      -<table class="striped-table">
+<table class="bordered-table">
   ...
 </table>

      4. Condensed table

      -- cgit v1.2.3 From b12b71bf7ca76437a532122d8efff59506b61530 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 11:32:07 -0800 Subject: updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings --- bootstrap.css | 216 ++++++++++++++++++++++++++--------------- bootstrap.min.css | 7 +- docs/assets/css/docs.css | 15 +-- docs/assets/img/less-small.png | Bin 0 -> 2235 bytes docs/index.html | 14 ++- docs/less.html | 51 ++-------- docs/scaffolding.html | 9 -- lib/patterns.less | 3 - lib/responsive.less | 90 ++++++++++++----- lib/tabs-pills.less | 7 +- 10 files changed, 234 insertions(+), 178 deletions(-) create mode 100644 docs/assets/img/less-small.png diff --git a/bootstrap.css b/bootstrap.css index 2bef99e1a..d0c78d037 100644 --- a/bootstrap.css +++ b/bootstrap.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: Wed Nov 30 00:54:47 PST 2011 + * Date: Fri Dec 9 11:23:25 PST 2011 */ html, body { margin: 0; @@ -1175,7 +1175,6 @@ table { } }*/ .navbar { - height: 40px; overflow: visible; } .navbar-inner { @@ -2131,7 +2130,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-color: #404040; } .subnav { - position: relative; background-color: #eeeeee; background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee)); background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); @@ -2142,12 +2140,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-image: linear-gradient(top, #f5f5f5, #eeeeee); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); + box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5); } .subnav a { - padding: 10px 15px; + padding: 8px 10px; + font-size: 12px; color: #0069d6; text-shadow: 0 1px 0 #fff; border-left: 1px solid #f9f9f9; @@ -2515,44 +2514,35 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } +.hidden { + display: none; + visibility: hidden; +} @media (max-width: 480px) { - .container { - width: auto; - padding: 0 15px; - } - .row { - margin-left: 0; - } - [class*="span"] { - float: none; - display: block; - width: auto; - margin: 0; - } .modal { width: auto; margin: 0; } - .form-horizontal .control-group > label { + .horizontal-form .control-group > label { float: none; width: auto; padding-top: 0; text-align: left; } - .form-horizontal .controls { + .horizontal-form .controls { margin-left: 0; } - .form-horizontal .control-list { + .horizontal-form .control-list { padding-top: 0; } - .form-horizontal .form-actions { + .horizontal-form .form-actions { padding-left: 0; } } -@media (min-width: 480px) and (max-width: 768px) { +@media (max-width: 768px) { .container { width: auto; - padding: 0 10px; + padding: 0 20px; } .row { margin-left: 0; @@ -2563,6 +2553,55 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { width: auto; margin: 0; } + .nav { + position: absolute; + top: 0; + left: 0; + width: 180px; + padding-top: 40px; + list-style: none; + } + .nav, .nav > li:last-child a { + -webkit-border-radius: 0 0 4px 0; + -moz-border-radius: 0 0 4px 0; + border-radius: 0 0 4px 0; + } + .nav > li { + float: none; + display: none; + } + .nav > li > a { + float: none; + background-color: #222; + } + .nav > .active { + display: block; + position: absolute; + top: 0; + left: 0; + } + .navbar ul .active > a { + background-color: transparent; + } + .nav > .active a:after { + display: inline-block; + width: 0; + height: 0; + margin-top: 8px; + margin-left: 6px; + text-indent: -99999px; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #ffffff; + filter: alpha(opacity=100); + -moz-opacity: 1; + opacity: 1; + content: "↓"; + } + .nav > .active a:hover { + background-color: rgba(255, 255, 255, 0.05); + } } @media (min-width: 768px) and (max-width: 940px) { .container { @@ -2641,60 +2680,83 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 768px; } } -/* -// LARGE DESKTOP & UP -// ------------------ - @media (min-width: 1210px) { - - // Reset grid variables - @gridColumns: 12; - @gridColumnWidth: 70px; - @gridGutterWidth: 30px; - @siteWidth: 1170px; - - // Bring grid mixins to recalculate widths - .columns(@columnSpan: 1) { - width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); - } - .offset(@columnOffset: 1) { - margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth; - } - .container { - width: @siteWidth; + width: 1170px; } [class*="span"] { - margin-left: @gridGutterWidth; + margin-left: 30px; + } + .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: 100px; + } + .offset2 { + margin-left: 200px; + } + .offset3 { + margin-left: 300px; + } + .offset4 { + margin-left: 400px; + } + .offset5 { + margin-left: 500px; + } + .offset6 { + margin-left: 600px; + } + .offset7 { + margin-left: 700px; + } + .offset8 { + margin-left: 800px; + } + .offset9 { + margin-left: 900px; + } + .offset10 { + margin-left: 1000px; + } + .offset11 { + margin-left: 1100px; + } + .offset12 { + margin-left: 1200px; } - - // Default columns - .span1 { .columns(1); } - .span2 { .columns(2); } - .span3 { .columns(3); } - .span4 { .columns(4); } - .span5 { .columns(5); } - .span6 { .columns(6); } - .span7 { .columns(7); } - .span8 { .columns(8); } - .span9 { .columns(9); } - .span10 { .columns(10); } - .span11 { .columns(11); } - .span12 { .columns(12); } - - // Offset column options - .offset1 { .offset(1); } - .offset2 { .offset(2); } - .offset3 { .offset(3); } - .offset4 { .offset(4); } - .offset5 { .offset(5); } - .offset6 { .offset(6); } - .offset7 { .offset(7); } - .offset8 { .offset(8); } - .offset9 { .offset(9); } - .offset10 { .offset(10); } - .offset11 { .offset(11); } - .offset12 { .offset(12); } - } -*/ \ No newline at end of file diff --git a/bootstrap.min.css b/bootstrap.min.css index d8ee06c15..4ee8f84fa 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -173,7 +173,7 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .bordered-table thead:last-child tr:last-child th:first-child,.bordered-table tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} .bordered-table thead:last-child tr:last-child th:last-child,.bordered-table tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .striped-table tbody tr:nth-child(odd) td,.striped-table tbody tr:nth-child(odd) th{background-color:#f9f9f9;} -.navbar{height:40px;overflow:visible;} +.navbar{overflow:visible;} .navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} .navbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} .navbar .brand a:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);} @@ -285,7 +285,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .step-nav .next{right:15px;} .step-nav .dot{display:inline-block;width:10px;height:10px;margin:0 3px;text-indent:-999em;background-color:#bfbfbf;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.25);} .step-nav .dot:hover,.step-nav .active .dot{background-color:#404040;} -.subnav{position:relative;background-color:#eeeeee;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee));background-image:-moz-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-ms-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee));background-image:-webkit-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-o-linear-gradient(top, #f5f5f5, #eeeeee);background-image:linear-gradient(top, #f5f5f5, #eeeeee);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.subnav a{padding:10px 15px;color:#0069d6;text-shadow:0 1px 0 #fff;border-left:1px solid #f9f9f9;border-right:1px solid #e5e5e5;}.subnav a:hover{color:#00438a;background-color:#eee;} +.subnav{background-color:#eeeeee;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee));background-image:-moz-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-ms-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee));background-image:-webkit-linear-gradient(top, #f5f5f5, #eeeeee);background-image:-o-linear-gradient(top, #f5f5f5, #eeeeee);background-image:linear-gradient(top, #f5f5f5, #eeeeee);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0);-webkit-box-shadow:inset 0 1px 0 #ffffff,0 0 5px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 0 1px 0 #ffffff,0 0 5px rgba(0, 0, 0, 0.5);box-shadow:inset 0 1px 0 #ffffff,0 0 5px rgba(0, 0, 0, 0.5);}.subnav a{padding:8px 10px;font-size:12px;color:#0069d6;text-shadow:0 1px 0 #fff;border-left:1px solid #f9f9f9;border-right:1px solid #e5e5e5;}.subnav a:hover{color:#00438a;background-color:#eee;} .subnav li:first-child a{border-left:0;-webkit-border-radius:6px 0 0 6px;-moz-border-radius:6px 0 0 6px;border-radius:6px 0 0 6px;} .subnav li:last-child a{border-right:0;-webkit-border-radius:0 6px 6px 0;-moz-border-radius:0 6px 6px 0;border-radius:0 6px 6px 0;} .subnav ul .active>a{color:#404040;background-color:#eee;} @@ -328,4 +328,5 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .media-grid li{display:inline;} .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}.media-grid a img{display:block;} .media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} -@media (max-width: 480px){.container{width:auto;padding:0 15px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@media (min-width: 480px) and (max-width: 768px){.container{width:auto;padding:0 10px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} +.hidden{display:none;visibility:hidden;} +@media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}@media (min-width: 1210px){.container{width:1170px;} [class*="span"]{margin-left:30px;} .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:100px;} .offset2{margin-left:200px;} .offset3{margin-left:300px;} .offset4{margin-left:400px;} .offset5{margin-left:500px;} .offset6{margin-left:600px;} .offset7{margin-left:700px;} .offset8{margin-left:800px;} .offset9{margin-left:900px;} .offset10{margin-left:1000px;} .offset11{margin-left:1100px;} .offset12{margin-left:1200px;}} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a7b52821e..281b224e3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -315,11 +315,6 @@ h2 + table { -------------------------------------------------- */ @media (max-width: 480px) { - /* Hide the nav for now */ - body > .navbar-fixed .nav { - display: none; - } - /* Change up some type stuff */ h1 small { display: block; @@ -365,11 +360,6 @@ h2 + table { @media (max-width: 768px) { - /* Hide the nav for now */ - body > .navbar-fixed .nav { - display: none; - } - /* Adjust the jumbotron */ .jumbotron .benefits { position: relative; @@ -394,6 +384,9 @@ h2 + table { .footer .pull-right { float: none; } + .footer p { + margin-bottom: 9px; + } } @@ -423,7 +416,7 @@ h2 + table { /* Provide enough space on right-hand side for benefits list */ .jumbotron h1, .jumbotron p { - margin-right: 40%; + margin-right: 20%; } } diff --git a/docs/assets/img/less-small.png b/docs/assets/img/less-small.png new file mode 100644 index 000000000..763b847e8 Binary files /dev/null and b/docs/assets/img/less-small.png differ diff --git a/docs/index.html b/docs/index.html index ff7d56976..16eed36c8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -151,7 +151,7 @@

      What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.

    - +

    Built on LESS

    Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.

    @@ -175,7 +175,7 @@

    Made at Twitter

    -

    Brought to you by experienced engineers and designers.

    +

    Brought to you by an experienced engineer and designer.

    @@ -196,6 +196,16 @@ + + + diff --git a/docs/less.html b/docs/less.html index 97d95a3ab..e9334a552 100644 --- a/docs/less.html +++ b/docs/less.html @@ -63,7 +63,7 @@

    Why LESS?

    -

    Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

    +

    Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

    What's included?

    @@ -72,7 +72,7 @@

    Learn more

    LESS CSS -

    Visit the official website at http://lesscss.org to learn more.

    +

    Visit the official website at http://lesscss.org to learn more.

    @@ -98,11 +98,7 @@

    Variables from variables.less

    -
    -

    Hyperlinks

    -
    -
    @@ -124,92 +120,70 @@
    -
    -
    -
    +

    Grayscale colors

    -
    -
    - - - - - -
    @black #000Black
    @grayDark lighten(@black, 25%)Dark gray
    @gray lighten(@black, 50%)Medium gray
    @grayLight lighten(@black, 75%)Light gray
    @grayLighter lighten(@black, 90%)Lighter gray
    @white #fffWhite
    -
    - -
    -
    +

    Accent colors

    -
    -
    - - - - - - -
    @blue #049CDB
    @green #46a546
    @red #9d261d
    @yellow #ffc40d
    @orange #f89406
    @pink #c3325f
    @purple #7a43b6
    @@ -217,48 +191,36 @@
    -
    +

    Grid system

    -
    -
    - - - -
    @gridColumns 12
    @gridColumnWidth 60px
    @gridGutterWidth 20px
    @siteWidth (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
    -
    - -
    -
    +

    Typography

    -
    -
    - @@ -268,7 +230,6 @@ -
    @baseFontSize 13px
    @baseFontFamily
    @baseLineHeight 18px
    diff --git a/docs/scaffolding.html b/docs/scaffolding.html index dd7f05bc6..d4d1c6526 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -53,15 +53,6 @@

    Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

    - -
    - -
    - + + + diff --git a/docs/components.html b/docs/components.html index 833f532d9..049908c20 100644 --- a/docs/components.html +++ b/docs/components.html @@ -683,6 +683,17 @@ Lorem ipsum dolar sit amet illo error ipsum verita + + + diff --git a/docs/index.html b/docs/index.html index 16eed36c8..daf7eb308 100644 --- a/docs/index.html +++ b/docs/index.html @@ -198,6 +198,7 @@ + + + + diff --git a/docs/less.html b/docs/less.html index e9334a552..cbc410302 100644 --- a/docs/less.html +++ b/docs/less.html @@ -456,6 +456,17 @@ + + + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index d4d1c6526..625c4bdb7 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -373,6 +373,17 @@ + + + -- cgit v1.2.3 From 7b810bf9a617e1f02e073aafcc70857dc915ee59 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 12:10:01 -0800 Subject: update js in footer, add max-width to img --- bootstrap.css | 4 +++- bootstrap.min.css | 2 +- docs/base-css.html | 4 ++-- docs/components.html | 4 ++-- docs/index.html | 5 +++-- docs/javascript.html | 4 ++-- docs/less.html | 4 ++-- docs/scaffolding.html | 4 ++-- lib/reset.less | 2 ++ 9 files changed, 19 insertions(+), 14 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index adae67ec9..2180ae446 100644 --- a/bootstrap.css +++ b/bootstrap.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: Fri Dec 9 11:32:45 PST 2011 + * Date: Fri Dec 9 12:09:50 PST 2011 */ html, body { margin: 0; @@ -127,6 +127,8 @@ sub { bottom: -0.25em; } img { + max-width: 100%; + height: auto; border: 0; -ms-interpolation-mode: bicubic; } diff --git a/bootstrap.min.css b/bootstrap.min.css index 4ee8f84fa..cc4363fe3 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -12,7 +12,7 @@ audio:not([controls]){display:none;} sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} sup{top:-0.5em;} sub{bottom:-0.25em;} -img{border:0;-ms-interpolation-mode:bicubic;} +img{max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;} button,input,select,textarea{margin:0;font-size:100%;vertical-align:baseline;*vertical-align:middle;} button,input{*overflow:visible;line-height:normal;} button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} diff --git a/docs/base-css.html b/docs/base-css.html index e087432fe..efdc1e271 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1122,9 +1122,9 @@ diff --git a/docs/components.html b/docs/components.html index 049908c20..d0456cc74 100644 --- a/docs/components.html +++ b/docs/components.html @@ -687,9 +687,9 @@ Lorem ipsum dolar sit amet illo error ipsum verita diff --git a/docs/index.html b/docs/index.html index daf7eb308..0598fc449 100644 --- a/docs/index.html +++ b/docs/index.html @@ -4,6 +4,7 @@ Bootstrap, from Twitter + @@ -200,9 +201,9 @@ diff --git a/docs/javascript.html b/docs/javascript.html index 4e405521d..d71de6924 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -30,9 +30,9 @@ diff --git a/docs/less.html b/docs/less.html index cbc410302..cd2c992df 100644 --- a/docs/less.html +++ b/docs/less.html @@ -460,9 +460,9 @@ diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 625c4bdb7..f597e7e88 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -377,9 +377,9 @@ diff --git a/lib/reset.less b/lib/reset.less index c95c7b04c..200215456 100644 --- a/lib/reset.less +++ b/lib/reset.less @@ -93,6 +93,8 @@ sub { // ------------------------- // Source: http://github.com/necolas/normalize.css img { + max-width: 100%; + height: auto; border: 0; -ms-interpolation-mode: bicubic; } -- cgit v1.2.3 From 97b285896f50bed4a66b00a70ed67eb3224bc7f3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 12:51:54 -0800 Subject: help tables not look like shit on mobile maybe? also fix bordered table example --- bootstrap.css | 3 ++- bootstrap.min.css | 2 +- docs/base-css.html | 1 + lib/reset.less | 6 +++++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 2180ae446..d52b96fa6 100644 --- a/bootstrap.css +++ b/bootstrap.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: Fri Dec 9 12:09:50 PST 2011 + * Date: Fri Dec 9 12:51:39 PST 2011 */ html, body { margin: 0; @@ -70,6 +70,7 @@ td { font-family: inherit; } table { + max-width: 100%; border-collapse: collapse; border-spacing: 0; } diff --git a/bootstrap.min.css b/bootstrap.min.css index cc4363fe3..6a728864f 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -1,6 +1,6 @@ html,body{margin:0;padding:0;} h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;} -table{border-collapse:collapse;border-spacing:0;} +table{max-width:100%;border-collapse:collapse;border-spacing:0;} ol,ul{list-style:none;} q:before,q:after,blockquote:before,blockquote:after{content:"";} html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} diff --git a/docs/base-css.html b/docs/base-css.html index efdc1e271..cb6c699f9 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -655,6 +655,7 @@ English + 3 Joe Sixpack English diff --git a/lib/reset.less b/lib/reset.less index 200215456..28638b6b3 100644 --- a/lib/reset.less +++ b/lib/reset.less @@ -10,7 +10,11 @@ html, body { margin: 0; padding: 0; } h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; } -table { border-collapse: collapse; border-spacing: 0; } +table { + max-width: 100%; + border-collapse: collapse; + border-spacing: 0; +} ol, ul { list-style: none; } q:before, q:after, blockquote:before, blockquote:after { content: ""; } -- cgit v1.2.3 From 5c8df1d2858c3d5f2cc65a80acaef5312b1ae87f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 14:34:38 -0800 Subject: updated index page to add featured sites, more docs tweaks --- bootstrap.css | 7 +++-- bootstrap.min.css | 2 +- docs/assets/css/docs.css | 10 +++++- docs/assets/img/example-sites/bartop.png | Bin 0 -> 86214 bytes docs/assets/img/example-sites/fleetio.png | Bin 0 -> 47275 bytes docs/assets/img/example-sites/jshint.png | Bin 0 -> 8886 bytes docs/assets/img/example-sites/kippt.png | Bin 0 -> 57064 bytes docs/assets/img/example-sites/railwayjs.png | Bin 0 -> 34839 bytes docs/assets/img/example-sites/totalwireframe.png | Bin 0 -> 47095 bytes docs/index.html | 37 +++++++++++++++++++++++ lib/type.less | 5 +-- 11 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 docs/assets/img/example-sites/bartop.png create mode 100644 docs/assets/img/example-sites/fleetio.png create mode 100644 docs/assets/img/example-sites/jshint.png create mode 100644 docs/assets/img/example-sites/kippt.png create mode 100644 docs/assets/img/example-sites/railwayjs.png create mode 100644 docs/assets/img/example-sites/totalwireframe.png diff --git a/bootstrap.css b/bootstrap.css index d52b96fa6..0c1c02566 100644 --- a/bootstrap.css +++ b/bootstrap.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: Fri Dec 9 12:51:39 PST 2011 + * Date: Fri Dec 9 13:29:05 PST 2011 */ html, body { margin: 0; @@ -436,9 +436,10 @@ dl dd { margin-left: 9px; } hr { - margin: 20px 0 19px; + margin: 27px 0; border: 0; - border-bottom: 1px solid #eee; + border-top: 1px solid #e5e5e5; + border-bottom: 1px solid #fff; } strong { font-style: inherit; diff --git a/bootstrap.min.css b/bootstrap.min.css index 6a728864f..336d6f68c 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -78,7 +78,7 @@ ul.unstyled{margin-left:0;list-style:none;} dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;} dl dt{font-weight:bold;} dl dd{margin-left:9px;} -hr{margin:20px 0 19px;border:0;border-bottom:1px solid #eee;} +hr{margin:27px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #fff;} strong{font-style:inherit;font-weight:bold;} em{font-style:italic;font-weight:inherit;line-height:inherit;} .muted{color:#bfbfbf;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 281b224e3..73e619d29 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -160,7 +160,10 @@ body > .navbar-fixed .brand:hover { margin-bottom: 18px; } .marketing h1 { - margin-bottom: 18px; + margin: 36px 0 27px; + font-size: 36px; + font-weight: 300; + text-align: center; } .marketing h2, .marketing h3 { @@ -310,6 +313,11 @@ h2 + table { margin-top: 5px; } +/* Example sites showcase */ +.example-sites img { + width: 290px; +} + /* Responsive Docs -------------------------------------------------- */ diff --git a/docs/assets/img/example-sites/bartop.png b/docs/assets/img/example-sites/bartop.png new file mode 100644 index 000000000..962851636 Binary files /dev/null and b/docs/assets/img/example-sites/bartop.png differ diff --git a/docs/assets/img/example-sites/fleetio.png b/docs/assets/img/example-sites/fleetio.png new file mode 100644 index 000000000..b48d6f010 Binary files /dev/null and b/docs/assets/img/example-sites/fleetio.png differ diff --git a/docs/assets/img/example-sites/jshint.png b/docs/assets/img/example-sites/jshint.png new file mode 100644 index 000000000..e532320a3 Binary files /dev/null and b/docs/assets/img/example-sites/jshint.png differ diff --git a/docs/assets/img/example-sites/kippt.png b/docs/assets/img/example-sites/kippt.png new file mode 100644 index 000000000..af15baa11 Binary files /dev/null and b/docs/assets/img/example-sites/kippt.png differ diff --git a/docs/assets/img/example-sites/railwayjs.png b/docs/assets/img/example-sites/railwayjs.png new file mode 100644 index 000000000..2480dd68e Binary files /dev/null and b/docs/assets/img/example-sites/railwayjs.png differ diff --git a/docs/assets/img/example-sites/totalwireframe.png b/docs/assets/img/example-sites/totalwireframe.png new file mode 100644 index 000000000..b6256138e Binary files /dev/null and b/docs/assets/img/example-sites/totalwireframe.png differ diff --git a/docs/index.html b/docs/index.html index 0598fc449..c2b9d12d7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -106,6 +106,43 @@
    +

    Built with Bootstrap

    + + +

    Designed for everyone, everywhere

    diff --git a/lib/type.less b/lib/type.less index bdc99acdf..b2ba73b86 100644 --- a/lib/type.less +++ b/lib/type.less @@ -116,9 +116,10 @@ dl { // Horizontal rules hr { - margin: 20px 0 19px; + margin: @baseLineHeight * 1.5 0; border: 0; - border-bottom: 1px solid #eee; + border-top: 1px solid #e5e5e5; + border-bottom: 1px solid #fff; } // Emphasis -- cgit v1.2.3 From 4d55356e9b476cbfea5eb2ea01099dc19a5fc5f4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 14:39:23 -0800 Subject: remove uber large responsive stuff --- bootstrap.css | 124 +++++++++++++++++++++------------------------------- bootstrap.min.css | 2 +- lib/responsive.less | 3 +- 3 files changed, 52 insertions(+), 77 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 0c1c02566..6cfb0fbf9 100644 --- a/bootstrap.css +++ b/bootstrap.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: Fri Dec 9 13:29:05 PST 2011 + * Date: Fri Dec 9 14:39:08 PST 2011 */ html, body { margin: 0; @@ -2684,83 +2684,57 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin-left: 768px; } } +/* @media (min-width: 1210px) { - .container { - width: 1170px; - } - [class*="span"] { - margin-left: 30px; - } - .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: 100px; - } - .offset2 { - margin-left: 200px; - } - .offset3 { - margin-left: 300px; - } - .offset4 { - margin-left: 400px; - } - .offset5 { - margin-left: 500px; - } - .offset6 { - margin-left: 600px; - } - .offset7 { - margin-left: 700px; - } - .offset8 { - margin-left: 800px; + + // Reset grid variables + @gridColumns: 12; + @gridColumnWidth: 70px; + @gridGutterWidth: 30px; + @siteWidth: 1170px; + + // Bring grid mixins to recalculate widths + .columns(@columnSpan: 1) { + width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); } - .offset9 { - margin-left: 900px; + .offset(@columnOffset: 1) { + margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth; } - .offset10 { - margin-left: 1000px; - } - .offset11 { - margin-left: 1100px; + + .container { + width: @siteWidth; } - .offset12 { - margin-left: 1200px; + [class*="span"] { + margin-left: @gridGutterWidth; } + + // Default columns + .span1 { .columns(1); } + .span2 { .columns(2); } + .span3 { .columns(3); } + .span4 { .columns(4); } + .span5 { .columns(5); } + .span6 { .columns(6); } + .span7 { .columns(7); } + .span8 { .columns(8); } + .span9 { .columns(9); } + .span10 { .columns(10); } + .span11 { .columns(11); } + .span12 { .columns(12); } + + // Offset column options + .offset1 { .offset(1); } + .offset2 { .offset(2); } + .offset3 { .offset(3); } + .offset4 { .offset(4); } + .offset5 { .offset(5); } + .offset6 { .offset(6); } + .offset7 { .offset(7); } + .offset8 { .offset(8); } + .offset9 { .offset(9); } + .offset10 { .offset(10); } + .offset11 { .offset(11); } + .offset12 { .offset(12); } + } +*/ diff --git a/bootstrap.min.css b/bootstrap.min.css index 336d6f68c..0be081c0a 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -329,4 +329,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}.media-grid a img{display:block;} .media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} .hidden{display:none;visibility:hidden;} -@media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}@media (min-width: 1210px){.container{width:1170px;} [class*="span"]{margin-left:30px;} .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:100px;} .offset2{margin-left:200px;} .offset3{margin-left:300px;} .offset4{margin-left:400px;} .offset5{margin-left:500px;} .offset6{margin-left:600px;} .offset7{margin-left:700px;} .offset8{margin-left:800px;} .offset9{margin-left:900px;} .offset10{margin-left:1000px;} .offset11{margin-left:1100px;} .offset12{margin-left:1200px;}} +@media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} diff --git a/lib/responsive.less b/lib/responsive.less index e0772b111..c74f6b98e 100644 --- a/lib/responsive.less +++ b/lib/responsive.less @@ -173,7 +173,7 @@ // LARGE DESKTOP & UP // ------------------ - +/* @media (min-width: 1210px) { // Reset grid variables @@ -226,3 +226,4 @@ .offset12 { .offset(12); } } +*/ -- cgit v1.2.3 From d587845149471ad9ed07bc57c1a8652c54d17c55 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Dec 2011 22:21:08 -0800 Subject: tweaks and increase specificity of pills and active classes --- bootstrap.css | 8 ++++---- bootstrap.min.css | 4 ++-- docs/index.html | 2 +- lib/tabs-pills.less | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 6cfb0fbf9..b7a820f71 100644 --- a/bootstrap.css +++ b/bootstrap.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: Fri Dec 9 14:39:08 PST 2011 + * Date: Sat Dec 10 22:20:18 PST 2011 */ html, body { margin: 0; @@ -2062,7 +2062,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { border-top-color: #555; } -.pills a { +.pills > a { padding: 0 15px; margin: 5px 3px 5px 0; line-height: 30px; @@ -2071,13 +2071,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius: 15px; border-radius: 15px; } -.pills a:hover { +.pills > a:hover { color: #ffffff; text-decoration: none; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); background-color: #00438a; } -.pills .active a { +.pills .active > a { color: #ffffff; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); background-color: #0069d6; diff --git a/bootstrap.min.css b/bootstrap.min.css index 0be081c0a..3a77a1df2 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -274,8 +274,8 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} .tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} .tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} -.pills a{padding:0 15px;margin:5px 3px 5px 0;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} -.pills .active a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} +.pills>a{padding:0 15px;margin:5px 3px 5px 0;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills>a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} +.pills .active>a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} .pills-vertical>li{float:none;} .tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} .tab-content>.active,.pill-content>.active{display:block;} diff --git a/docs/index.html b/docs/index.html index c2b9d12d7..0a63c1910 100644 --- a/docs/index.html +++ b/docs/index.html @@ -57,7 +57,7 @@

    Bootstrap is a responsive 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.

    Download on GitHub - Get started + Get started → Currently v2.0.0

    diff --git a/lib/tabs-pills.less b/lib/tabs-pills.less index ad6459c0d..26c62c950 100644 --- a/lib/tabs-pills.less +++ b/lib/tabs-pills.less @@ -182,7 +182,7 @@ // Pills .pills { - a { + > a { padding: 0 15px; margin: 5px 3px 5px 0; line-height: 30px; @@ -195,7 +195,7 @@ background-color: @linkColorHover; } } - .active a { + .active > a { color: @white; text-shadow: 0 1px 1px rgba(0,0,0,.25); background-color: @linkColor; -- cgit v1.2.3 From d2e56ad53d5d5c93cd6206a6829ee2054f583c5b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Dec 2011 22:29:49 -0800 Subject: unstyle image inputs --- bootstrap.css | 10 +++++++--- bootstrap.min.css | 3 ++- lib/forms.less | 8 +++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index b7a820f71..5fb8b6fc8 100644 --- a/bootstrap.css +++ b/bootstrap.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 Dec 10 22:20:18 PST 2011 + * Date: Sat Dec 10 22:29:17 PST 2011 */ html, body { margin: 0; @@ -567,8 +567,7 @@ select, -moz-border-radius: 3px; border-radius: 3px; } -/* Mini reset for unique input types */ -input[type=checkbox], input[type=radio] { +input[type=image], input[type=checkbox], input[type=radio] { width: auto; height: auto; padding: 0; @@ -605,6 +604,11 @@ select[multiple] { height: inherit; background-color: #ffffff; } +input[type=image] { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} textarea { height: auto; } diff --git a/bootstrap.min.css b/bootstrap.min.css index 3a77a1df2..eecca66d0 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -96,11 +96,12 @@ legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height: label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;} label{display:block;margin-bottom:5px;color:#404040;} input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;} +input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;} input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;} select[multiple]{height:inherit;background-color:#ffffff;} +input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} textarea{height:auto;} input,textarea{-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;} diff --git a/lib/forms.less b/lib/forms.less index e85b9f201..8d4369b18 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -53,7 +53,8 @@ select, .border-radius(3px); } -/* Mini reset for unique input types */ +// Mini reset for unique input types +input[type=image], input[type=checkbox], input[type=radio] { width: auto; @@ -98,6 +99,11 @@ select[multiple] { background-color: @white; // Fixes Chromium bug? } +// Remove shadow from image inputs +input[type=image] { + .box-shadow(none); +} + textarea { height: auto; } -- cgit v1.2.3 From 95048c271eb4166a4e22ab1f0ff6d69bade7d62b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Dec 2011 01:03:57 -0800 Subject: fix specificity on pills --- bootstrap.css | 6 +++--- bootstrap.min.css | 2 +- lib/tabs-pills.less | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 79fe4826c..1c04bc09c 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sun Dec 11 00:58:00 PST 2011 + * Date: Sun Dec 11 01:03:44 PST 2011 */ html, body { margin: 0; @@ -2074,7 +2074,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { border-top-color: #555; } -.pills > a { +.pills > li > a { padding: 0 15px; margin: 5px 3px 5px 0; line-height: 30px; @@ -2083,7 +2083,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius: 15px; border-radius: 15px; } -.pills > a:hover { +.pills > li > a:hover { color: #ffffff; text-decoration: none; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); diff --git a/bootstrap.min.css b/bootstrap.min.css index 48cc90703..b9e7dd1ee 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -276,7 +276,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} .tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} .tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} -.pills>a{padding:0 15px;margin:5px 3px 5px 0;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills>a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} +.pills>li>a{padding:0 15px;margin:5px 3px 5px 0;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills>li>a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} .pills .active>a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} .pills-vertical>li{float:none;} .tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} diff --git a/lib/tabs-pills.less b/lib/tabs-pills.less index 26c62c950..23ba9ccfa 100644 --- a/lib/tabs-pills.less +++ b/lib/tabs-pills.less @@ -182,7 +182,7 @@ // Pills .pills { - > a { + > li > a { padding: 0 15px; margin: 5px 3px 5px 0; line-height: 30px; -- cgit v1.2.3 From 401f84a7ec65996a8573671b2c17077f85e63e6f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Dec 2011 01:58:06 -0800 Subject: center example sites in docs on mobile --- bootstrap.css | 2 +- docs/assets/css/docs.css | 20 ++++++++++++++++++++ docs/index.html | 11 ++++++++++- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 1c04bc09c..49164fa53 100644 --- a/bootstrap.css +++ b/bootstrap.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: Sun Dec 11 01:03:44 PST 2011 + * Date: Sun Dec 11 01:57:49 PST 2011 */ html, body { margin: 0; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 73e619d29..9324f9990 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -323,6 +323,11 @@ h2 + table { -------------------------------------------------- */ @media (max-width: 480px) { + /* Reduce padding above jumbotron */ + body { + padding-top: 70px; + } + /* Change up some type stuff */ h1 small { display: block; @@ -362,6 +367,21 @@ h2 + table { .quick-links { margin: 40px 0 0; } + /* hide the bullets on mobile since our horizontal space is limited */ + .quick-links .divider { + display: none; + } + + /* center example sites */ + .example-sites { + margin-left: 0; + } + .example-sites a { + float: none; + display: block; + max-width: 300px; + margin: 0 auto 18px; + } } diff --git a/docs/index.html b/docs/index.html index 0a63c1910..55a75b1bf 100644 --- a/docs/index.html +++ b/docs/index.html @@ -54,7 +54,7 @@

    Bootstrap,
    from Twitter

    -

    Bootstrap is a responsive 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.

    +

    Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.

    Download on GitHub Get started → @@ -236,6 +236,15 @@ - + diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js deleted file mode 100644 index 25f8b111f..000000000 --- a/js/bootstrap-transition.js +++ /dev/null @@ -1,45 +0,0 @@ -/* =================================================== - * bootstrap-transitions.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html - * =================================================== - * Copyright 2011 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -$(function () { - - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - - return support && { - end: (function () { - var transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - return transitionEnd - }()) - } - })() - -}) \ No newline at end of file diff --git a/js/bootstrap-transitions.js b/js/bootstrap-transitions.js new file mode 100644 index 000000000..25f8b111f --- /dev/null +++ b/js/bootstrap-transitions.js @@ -0,0 +1,45 @@ +/* =================================================== + * bootstrap-transitions.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html + * =================================================== + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +$(function () { + + /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + * ======================================================= */ + + $.support.transition = (function () { + var thisBody = document.body || document.documentElement + , thisStyle = thisBody.style + , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined + + return support && { + end: (function () { + var transitionEnd = "TransitionEnd" + if ( $.browser.webkit ) { + transitionEnd = "webkitTransitionEnd" + } else if ( $.browser.mozilla ) { + transitionEnd = "transitionend" + } else if ( $.browser.opera ) { + transitionEnd = "oTransitionEnd" + } + return transitionEnd + }()) + } + })() + +}) \ No newline at end of file -- cgit v1.2.3 From 7df0d1c7d18a72f401094d08afa4eaa9142fe511 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 14 Dec 2011 18:45:33 -0800 Subject: rename transitions to transition and fix scrollspy example --- docs/assets/css/docs.css | 6 ++++++ docs/javascript.html | 2 +- js/bootstrap-transition.js | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 js/bootstrap-transition.js diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 586b5334b..fa8c92e50 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -318,6 +318,12 @@ h2 + table { width: 290px; } +.scrollspy-example { + height: 200px; + overflow: auto; + position: relative; +} + /* Responsive Docs -------------------------------------------------- */ diff --git a/docs/javascript.html b/docs/javascript.html index 6c0e12c19..4e4004132 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -39,7 +39,7 @@ - + diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js new file mode 100644 index 000000000..25f8b111f --- /dev/null +++ b/js/bootstrap-transition.js @@ -0,0 +1,45 @@ +/* =================================================== + * bootstrap-transitions.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html + * =================================================== + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +$(function () { + + /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + * ======================================================= */ + + $.support.transition = (function () { + var thisBody = document.body || document.documentElement + , thisStyle = thisBody.style + , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined + + return support && { + end: (function () { + var transitionEnd = "TransitionEnd" + if ( $.browser.webkit ) { + transitionEnd = "webkitTransitionEnd" + } else if ( $.browser.mozilla ) { + transitionEnd = "transitionend" + } else if ( $.browser.opera ) { + transitionEnd = "oTransitionEnd" + } + return transitionEnd + }()) + } + })() + +}) \ No newline at end of file -- cgit v1.2.3 From 72a536393c2f2aba4f855384e94c4ce09bc2e39c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 19 Dec 2011 22:58:56 -0800 Subject: mostly docs updates, but also some bug fixes per github issues --- bootstrap.css | 35 +++++---- bootstrap.min.css | 15 ++-- docs/assets/css/docs.css | 4 +- docs/components.html | 179 ++++++++++++++++++++++++++++++----------------- docs/javascript.html | 2 +- docs/scaffolding.html | 51 ++++++++------ docs/upgrading.html | 152 ++++++++++++++++++++++++++++++++++++++++ lib/forms.less | 6 +- lib/media-grids.less | 49 +++++++------ 9 files changed, 364 insertions(+), 129 deletions(-) create mode 100644 docs/upgrading.html diff --git a/bootstrap.css b/bootstrap.css index 6411413ff..f57423b0c 100644 --- a/bootstrap.css +++ b/bootstrap.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: Mon Dec 12 09:51:27 PST 2011 + * Date: Mon Dec 19 22:58:34 PST 2011 */ html, body { margin: 0; @@ -600,9 +600,11 @@ select, input[type=file] { line-height: 27px; } +select { + background-color: #ffffff; +} select[multiple] { height: inherit; - background-color: #ffffff; } input[type=image] { -webkit-box-shadow: none; @@ -2492,27 +2494,28 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .popover .content p, .popover .content ul, .popover .content ol { margin-bottom: 0; } -.media-grid { +.thumbnails { margin-left: -20px; margin-bottom: 0; + list-style: none; zoom: 1; } -.media-grid:before, .media-grid:after { +.thumbnails:before, .thumbnails:after { display: table; *display: inline; content: ""; zoom: 1; } -.media-grid:after { +.thumbnails:after { clear: both; } -.media-grid li { - display: inline; -} -.media-grid a { +.thumbnails > li { float: left; - padding: 4px; margin: 0 0 20px 20px; +} +.thumbnail { + display: block; + line-height: 1; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -2521,15 +2524,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); } -.media-grid a img { - display: block; -} -.media-grid a:hover { +a.thumbnail:hover { border-color: #0069d6; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } +.thumbnail > img { + display: block; + margin: 4px; +} +.thumbnail .caption { + padding: 9px; +} .hidden { display: none; visibility: hidden; diff --git a/bootstrap.min.css b/bootstrap.min.css index b9e7dd1ee..4bb1adc5c 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -100,7 +100,8 @@ input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto; input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;} -select[multiple]{height:inherit;background-color:#ffffff;} +select{background-color:#ffffff;} +select[multiple]{height:inherit;} input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} textarea{height:auto;} input,textarea{-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} @@ -325,10 +326,12 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .popover .inner{padding:3px;width:280px;overflow:hidden;background-color:#000000;background-color:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);} .popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} .popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} -.media-grid{margin-left:-20px;margin-bottom:0;zoom:1;}.media-grid:before,.media-grid:after{display:table;*display:inline;content:"";zoom:1;} -.media-grid:after{clear:both;} -.media-grid li{display:inline;} -.media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}.media-grid a img{display:block;} -.media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} +.thumbnails{margin-left:-20px;margin-bottom:0;list-style:none;zoom:1;}.thumbnails:before,.thumbnails:after{display:table;*display:inline;content:"";zoom:1;} +.thumbnails:after{clear:both;} +.thumbnails>li{float:left;margin:0 0 20px 20px;} +.thumbnail{display:block;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);} +a.thumbnail:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} +.thumbnail>img{display:block;margin:4px;} +.thumbnail .caption{padding:9px;} .hidden{display:none;visibility:hidden;} @media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 586b5334b..3cf2208e9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -25,7 +25,7 @@ body > .navbar-fixed .brand { float: right; font-weight: bold; color: #000; - text-shadow: 0 1px 0 rgba(255,255,255,.1); + text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125); } body > .navbar-fixed .brand:hover { text-decoration: none; @@ -449,7 +449,7 @@ h2 + table { /* Provide enough space on right-hand side for benefits list */ .jumbotron h1, .jumbotron p { - margin-right: 20%; + margin-right: 40%; } } diff --git a/docs/components.html b/docs/components.html index b4a88dd07..56e71b0f7 100644 --- a/docs/components.html +++ b/docs/components.html @@ -58,94 +58,145 @@ ================================================== -->

    -

    Media Displaying images and videos

    +

    Thumbnails Grids of images, videos, text, and more

    - +
    -
    -

    Media grid

    -

    Display thumbnails of varying sizes on pages with a low HTML footprint and minimal styles.

    -
    -
    -

    Example thumbnails

    -

    Thumbnails in the .media-grid can be any size, but they work best when mapped directly to the built-in Bootstrap grid system. Image widths like 90, 210, and 330 combine with a few pixels of padding to equal the .span2, .span4, and .span6 column sizes.

    -

    Large

    -
    + +
    +
    +

    Why use thumbnails

    +

    Thumbnails (previously .media-grid up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.

    +
    +
    +

    Simple, flexible markup

    +

    Thumbnail markup is simple—a ul with any number of li elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.

    +
    +
    +

    Uses grid column sizes

    +

    Lastly, the thumbnails component uses existing grid system classes—like .span2 or .span3—for control of thumbnail dimensions.

    +
    +
    + +
    +
    +

    The markup

    +

    As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup for linked images:

    +
    +<ul class="thumbnails">
+  <li class="span3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/210x150" alt="">
+    </a>
+  </li>
+  ...
+</ul>
+
    +

    For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <a> for a <div> like so:

    +
    +<ul class="thumbnails">
+  <li class="span3">
+    <div class="thumbnail">
+      <img src="http://placehold.it/210x150" alt="">
+      <h5>Thumbnail label</h5>
+      <p>Thumbnail caption right here...</p>
+    </div>
+  </li>
+  ...
+</ul>
+
    +
    +
    +

    More examples

    +

    Explore all your options with the various grid classes available to you. You can also mix and match different sizes.

    + -

    Small

    - -

    Coding them

    -

    Media grids are easy to use and rather simple on the markup side. Their dimensions are purely based on the size of the images included.

    -
    -<ul class="media-grid">
-  <li>
-    <a href="#">
-      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
-    </a>
-  </li>
-  <li>
-    <a href="#">
-      <img class="thumbnail" src="http://placehold.it/330x230" alt="">
-    </a>
-  </li>
-</ul>
-
    -
    +
    +
    diff --git a/docs/javascript.html b/docs/javascript.html index 6c0e12c19..56e60e98c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -819,7 +819,7 @@ $('a[data-toggle="tab"]').bind('shown', function (e) { 
    <button class="btn" data-complete-text="finished!" >...</button>
 <script>
   $('.btn').button('complete')
-</scrip>
    +</script>

    Demo

    diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 8b7e620fb..7431ae58b 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -64,34 +64,34 @@

    Default 940px grid

    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    -
    4
    -
    4
    -
    4
    +
    4
    +
    4
    +
    4
    -
    4
    -
    8
    +
    4
    +
    8
    -
    6
    -
    6
    +
    6
    +
    6
    -
    12
    +
    12
    @@ -383,6 +383,17 @@ }); + + diff --git a/docs/upgrading.html b/docs/upgrading.html new file mode 100644 index 000000000..cd0ca8e22 --- /dev/null +++ b/docs/upgrading.html @@ -0,0 +1,152 @@ + + + + + Bootstrap, from Twitter: Upgrading from v1.4 to v2.0 + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + Bootstrap + +
    +
    +
    + +
    + + +
    +

    Upgrading to Bootstrap 2

    +

    Learn about significant changes and additions since v1.4 with this handy guide.

    +
    + + +

    Rough outline

    +
      +
    • Docs completely overhauled +
        +
      • Responsive thanks to new grid system
        • +
      • Now less marketing and more information
        • +
      • Extensive use of tables to share classes and elements of most components
        • +
      • Broken down into several pages for easier consumption
        • +
      +
      • +
    • Updated grid system, now only 12 columns +
        +
      • Same great classes, but now only 12 columns
        • +
      • Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more
        • +
      +
      • +
    • New thumbnails (previously media grids) +
        +
      • .media-grid class has been changed to .thumbnails
        • +
      • Individual thumbnails now require .thumbnail class
        • +
      +
      • +
    • Updated forms +
        +
      • Default form style is now stacked to use less CSS and add flexibility
        • +
      • Exact same markup is required for vertical or horizontal forms—just swap the classes
        • +
      • New form defaults for search, inline, vertical, and horizontal
        • +
      +
      • +
    • Updated tables +
        +
      • Table classes made more consistent
        • +
      • Removed unused table color options (too much code for such little impact)
        • +
      +
      • +
    • Typography +
        +
      • Right-aligned option for blockquotes if float: right;
        • +
      +
      • +
    • Buttons +
        +
      • Added button bar options
        • +
      +
      • +
    • +
        +
      • +
      +
      • +
    + + + + + + + + + +
    + + + + + + + + + + + + + + + + + diff --git a/lib/forms.less b/lib/forms.less index 8d4369b18..a73e6f545 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -93,10 +93,14 @@ input[type=file] { line-height: @baseLineHeight * 1.5; } +// Chrome on Linux needs background color +select { + background-color: @white; +} + // Make multiple select elements height not fixed select[multiple] { height: inherit; - background-color: @white; // Fixes Chromium bug? } // Remove shadow from image inputs diff --git a/lib/media-grids.less b/lib/media-grids.less index 7ceade651..12626df3f 100644 --- a/lib/media-grids.less +++ b/lib/media-grids.less @@ -1,26 +1,33 @@ -// MEDIA GRIDS -// ----------- +// THUMBNAILS +// ---------- -.media-grid { +.thumbnails { margin-left: -20px; margin-bottom: 0; + list-style: none; .clearfix(); - li { - display: inline; - } - a { - float: left; - padding: 4px; - margin: 0 0 20px 20px; - border: 1px solid #ddd; - .border-radius(4px); - .box-shadow(0 1px 1px rgba(0,0,0,.075)); - img { - display: block; - } - &:hover { - border-color: @linkColor; - .box-shadow(0 1px 4px rgba(0,105,214,.25)); - } - } +} +.thumbnails > li { + float: left; + margin: 0 0 20px 20px; +} +.thumbnail { + display: block; + line-height: 1; + border: 1px solid #ddd; + .border-radius(4px); + .box-shadow(0 1px 1px rgba(0,0,0,.075)); +} +// Add a hover state for linked versions only +a.thumbnail:hover { + border-color: @linkColor; + .box-shadow(0 1px 4px rgba(0,105,214,.25)); +} +// Images and captions +.thumbnail > img { + display: block; + margin: 4px; +} +.thumbnail .caption { + padding: 9px; } -- cgit v1.2.3 From 1ef5fa7d6b4e50230c0c12919b0a06a9a2ac07f1 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 20 Dec 2011 18:02:47 -0800 Subject: giant refactor - all spec passing again... --- docs/javascript.html | 29 +- js/README.md | 4 +- js/bootstrap-alert.js | 6 +- js/bootstrap-button.js | 12 +- js/bootstrap-carousel.js | 18 +- js/bootstrap-collapse.js | 14 +- js/bootstrap-dropdown.js | 6 +- js/bootstrap-modal.js | 20 +- js/bootstrap-popover.js | 38 +- js/bootstrap-scrollspy.js | 4 +- js/bootstrap-tab.js | 8 +- js/bootstrap-transitions.js | 45 - js/bootstrap-twipsy.js | 226 +- js/tests/index.html | 24 +- js/tests/unit/bootstrap-alert.js | 41 + js/tests/unit/bootstrap-alerts.js | 41 - js/tests/unit/bootstrap-button.js | 54 + js/tests/unit/bootstrap-collapse.js | 25 + js/tests/unit/bootstrap-dropdown.js | 21 +- js/tests/unit/bootstrap-modal.js | 28 +- js/tests/unit/bootstrap-popover.js | 12 +- js/tests/unit/bootstrap-scrollspy.js | 6 +- js/tests/unit/bootstrap-tab.js | 46 + js/tests/unit/bootstrap-tabs.js | 49 - js/tests/unit/bootstrap-transition.js | 13 + js/tests/unit/bootstrap-twipsy.js | 36 +- js/tests/vendor/jquery.js | 9252 +++++++++++++++++++++++++++++++++ js/tests/vendor/qunit.css | 2 +- 28 files changed, 9654 insertions(+), 426 deletions(-) delete mode 100644 js/bootstrap-transitions.js create mode 100644 js/tests/unit/bootstrap-alert.js delete mode 100644 js/tests/unit/bootstrap-alerts.js create mode 100644 js/tests/unit/bootstrap-button.js create mode 100644 js/tests/unit/bootstrap-collapse.js create mode 100644 js/tests/unit/bootstrap-tab.js delete mode 100644 js/tests/unit/bootstrap-tabs.js create mode 100644 js/tests/unit/bootstrap-transition.js create mode 100644 js/tests/vendor/jquery.js diff --git a/docs/javascript.html b/docs/javascript.html index 4e4004132..964d2f7aa 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -25,7 +25,8 @@ - + + + + - - + + + + - + + - + + + + - - + + +
    @@ -33,7 +41,7 @@

      -
      +
      \ No newline at end of file diff --git a/js/tests/unit/bootstrap-alert.js b/js/tests/unit/bootstrap-alert.js new file mode 100644 index 000000000..8eecaff0d --- /dev/null +++ b/js/tests/unit/bootstrap-alert.js @@ -0,0 +1,41 @@ +$(function () { + + module("bootstrap-alerts") + + test("should be defined on jquery object", function () { + ok($(document.body).alert, 'alert method is defined') + }) + + test("should return element", function () { + ok($(document.body).alert()[0] == document.body, 'document.body returned') + }) + + test("should fade element out on clicking .close", function () { + var alertHTML = '
      ' + + '×' + + '

      Holy guacamole! Best check yo self, you’re not looking too good.

      ' + + '
      ' + , alert = $(alertHTML).alert() + + alert.find('.close').click() + + ok(!alert.hasClass('in'), 'remove .in class on .close click') + }) + + test("should remove element when clicking .close", function () { + $.support.transition = false + + var alertHTML = '
      ' + + '×' + + '

      Holy guacamole! Best check yo self, you’re not looking too good.

      ' + + '
      ' + , alert = $(alertHTML).appendTo('#qunit-fixture').alert() + + ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom') + + alert.find('.close').click() + + ok(!$('#qunit-fixture').find('.alert-message').length, 'element removed from dom') + }) + +}) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-alerts.js b/js/tests/unit/bootstrap-alerts.js deleted file mode 100644 index 152d97ab7..000000000 --- a/js/tests/unit/bootstrap-alerts.js +++ /dev/null @@ -1,41 +0,0 @@ -$(function () { - - module("bootstrap-alerts") - - test("should be defined on jquery object", function () { - ok($(document.body).alert, 'alert method is defined') - }) - - test("should return element", function () { - ok($(document.body).alert()[0] == document.body, 'document.body returned') - }) - - test("should fade element out on clicking .close", function () { - var alertHTML = '
      ' - + '×' - + '

      Holy guacamole! Best check yo self, you’re not looking too good.

      ' - + '
      ' - , alert = $(alertHTML).alert() - - alert.find('.close').click() - - ok(!alert.hasClass('in'), 'remove .in class on .close click') - }) - - test("should remove element when clicking .close", function () { - $.support.transition = false - - var alertHTML = '
      ' - + '×' - + '

      Holy guacamole! Best check yo self, you’re not looking too good.

      ' - + '
      ' - , alert = $(alertHTML).appendTo('#qunit-runoff').alert() - - ok($('#qunit-runoff').find('.alert-message').length, 'element added to dom') - - alert.find('.close').click() - - ok(!$('#qunit-runoff').find('.alert-message').length, 'element removed from dom') - }) - -}) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-button.js b/js/tests/unit/bootstrap-button.js new file mode 100644 index 000000000..59e8f33bc --- /dev/null +++ b/js/tests/unit/bootstrap-button.js @@ -0,0 +1,54 @@ +$(function () { + + module("bootstrap-buttons") + + test("should be defined on jquery object", function () { + ok($(document.body).button, 'tabs method is defined') + }) + + test("should return element", function () { + ok($(document.body).button()[0] == document.body, 'document.body returned') + }) + + test("should return set state to loading", function () { + var btn = $('') + equals(btn.html(), 'mdo', 'btn text equals mdo') + btn.button('loading') + equals(btn.html(), 'fat', 'btn text equals fat') + stop() + setTimeout(function () { + ok(btn.attr('disabled'), 'btn is disabled') + ok(btn.hasClass('disabled'), 'btn has disabled class') + start() + }, 0) + }) + + test("should return reset state", function () { + var btn = $('') + equals(btn.html(), 'mdo', 'btn text equals mdo') + btn.button('loading') + equals(btn.html(), 'fat', 'btn text equals fat') + stop() + setTimeout(function () { + ok(btn.attr('disabled'), 'btn is disabled') + ok(btn.hasClass('disabled'), 'btn has disabled class') + start() + stop() + }, 0) + btn.button('reset') + equals(btn.html(), 'mdo', 'btn text equals mdo') + setTimeout(function () { + ok(!btn.attr('disabled'), 'btn is not disabled') + ok(!btn.hasClass('disabled'), 'btn does not have disabled class') + start() + }, 0) + }) + + test("should toggle active", function () { + var btn = $('') + ok(!btn.hasClass('active'), 'btn does not have active class') + btn.button('toggle') + ok(btn.hasClass('active'), 'btn has class active') + }) + +}) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-collapse.js b/js/tests/unit/bootstrap-collapse.js new file mode 100644 index 000000000..698238d96 --- /dev/null +++ b/js/tests/unit/bootstrap-collapse.js @@ -0,0 +1,25 @@ +$(function () { + + module("bootstrap-collapse") + + test("should be defined on jquery object", function () { + ok($(document.body).collapse, 'collapse method is defined') + }) + + test("should return element", function () { + ok($(document.body).collapse()[0] == document.body, 'document.body returned') + }) + + test("should show a collapsed element", function () { + var el = $('
      ').collapse('show') + ok(el.hasClass('in'), 'has class in') + ok(/height/.test(el.attr('style')), 'has height set') + }) + + test("should hide a collapsed element", function () { + var el = $('
      ').collapse('hide') + ok(!el.hasClass('in'), 'does not have class in') + ok(/height/.test(el.attr('style')), 'has height set') + }) + +}) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-dropdown.js b/js/tests/unit/bootstrap-dropdown.js index 2c2acb9bb..368ced2a5 100644 --- a/js/tests/unit/bootstrap-dropdown.js +++ b/js/tests/unit/bootstrap-dropdown.js @@ -13,7 +13,7 @@ $(function () { test("should add class open to menu if clicked", function () { var dropdownHTML = '' - , dropdown = $(dropdownHTML).dropdown() + , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() - dropdown.find('.dropdown-toggle').click() - ok(dropdown.find('.dropdown').hasClass('open'), 'open class added on click') + ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') }) test("should remove open class if body clicked", function () { var dropdownHTML = '' - , dropdown = $(dropdownHTML).dropdown().appendTo('#qunit-runoff') - - dropdown.find('.dropdown-toggle').click() - ok(dropdown.find('.dropdown').hasClass('open'), 'open class added on click') + , dropdown = $(dropdownHTML) + .appendTo('#qunit-fixture') + .find('[data-toggle="dropdown"]') + .dropdown() + .click() + ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') $('body').click() - ok(!dropdown.find('.dropdown').hasClass('open'), 'open class removed') + ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class removed') dropdown.remove() }) diff --git a/js/tests/unit/bootstrap-modal.js b/js/tests/unit/bootstrap-modal.js index 4bbb3313c..22f5781ea 100644 --- a/js/tests/unit/bootstrap-modal.js +++ b/js/tests/unit/bootstrap-modal.js @@ -10,6 +10,7 @@ $(function () { test("should return element", function () { var div = $("") ok(div.modal() == div, 'document.body returned') + $('#modal-test').remove() }) test("should expose defaults var for settings", function () { @@ -19,32 +20,29 @@ $(function () { test("should insert into dom when show method is called", function () { stop() $.support.transition = false - var div = $("") - div - .modal() - .modal("show") + $("") .bind("shown", function () { ok($('#modal-test').length, 'modal insterted into dom') + $(this).remove() start() - div.remove() }) + .modal("show") }) test("should hide modal when hide is called", function () { stop() $.support.transition = false - var div = $("") - div - .modal() + + $("") .bind("shown", function () { ok($('#modal-test').is(":visible"), 'modal visible') ok($('#modal-test').length, 'modal insterted into dom') - div.modal("hide") + $(this).modal("hide") }) .bind("hidden", function() { ok(!$('#modal-test').is(":visible"), 'modal hidden') + $('#modal-test').remove() start() - div.remove() }) .modal("show") }) @@ -54,7 +52,6 @@ $(function () { $.support.transition = false var div = $("") div - .modal() .bind("shown", function () { ok($('#modal-test').is(":visible"), 'modal visible') ok($('#modal-test').length, 'modal insterted into dom') @@ -62,18 +59,17 @@ $(function () { }) .bind("hidden", function() { ok(!$('#modal-test').is(":visible"), 'modal hidden') - start() div.remove() + start() }) .modal("toggle") }) - test("should remove from dom when click .close", function () { + test("should remove from dom when click [data-dismiss=modal]", function () { stop() $.support.transition = false - var div = $("") + var div = $("") div - .modal() .bind("shown", function () { ok($('#modal-test').is(":visible"), 'modal visible') ok($('#modal-test').length, 'modal insterted into dom') @@ -81,8 +77,8 @@ $(function () { }) .bind("hidden", function() { ok(!$('#modal-test').is(":visible"), 'modal hidden') - start() div.remove() + start() }) .modal("toggle") }) diff --git a/js/tests/unit/bootstrap-popover.js b/js/tests/unit/bootstrap-popover.js index 3e13d2fd2..9180c043e 100644 --- a/js/tests/unit/bootstrap-popover.js +++ b/js/tests/unit/bootstrap-popover.js @@ -15,14 +15,12 @@ $(function () { test("should render popover element", function () { $.support.transition = false var popover = $('@mdo') - .appendTo('#qunit-runoff') - .popover() + .appendTo('#qunit-fixture') .popover('show') ok($('.popover').length, 'popover was inserted') popover.popover('hide') ok(!$(".popover").length, 'popover removed') - $('#qunit-runoff').empty() }) test("should store popover instance in popover data object", function () { @@ -36,7 +34,7 @@ $(function () { test("should get title and content from options", function () { $.support.transition = false var popover = $('@fat') - .appendTo('#qunit-runoff') + .appendTo('#qunit-fixture') .popover({ title: function () { return '@fat' @@ -54,13 +52,13 @@ $(function () { popover.popover('hide') ok(!$('.popover').length, 'popover was removed') - $('#qunit-runoff').empty() + $('#qunit-fixture').empty() }) test("should get title and content from attributes", function () { $.support.transition = false var popover = $('@mdo') - .appendTo('#qunit-runoff') + .appendTo('#qunit-fixture') .popover() .popover('show') @@ -70,7 +68,7 @@ $(function () { popover.popover('hide') ok(!$('.popover').length, 'popover was removed') - $('#qunit-runoff').empty() + $('#qunit-fixture').empty() }) }) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-scrollspy.js b/js/tests/unit/bootstrap-scrollspy.js index b9b309062..bee46a925 100644 --- a/js/tests/unit/bootstrap-scrollspy.js +++ b/js/tests/unit/bootstrap-scrollspy.js @@ -12,7 +12,7 @@ $(function () { test("should switch active class on scroll", function () { var sectionHTML = '
      ' - , $section = $(sectionHTML).append('#qunit-runoff') + , $section = $(sectionHTML).append('#qunit-fixture') , topbarHTML ='
      ' + '
      ' + '
      ' @@ -23,9 +23,9 @@ $(function () { + '
      ' + '
      ' + '
      ' - , $topbar = $(topbarHTML).topbar() + , $topbar = $(topbarHTML).scrollspy() - ok(topbar.find('.active', true) + ok($topbar.find('.active', true)) }) }) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-tab.js b/js/tests/unit/bootstrap-tab.js new file mode 100644 index 000000000..f32649078 --- /dev/null +++ b/js/tests/unit/bootstrap-tab.js @@ -0,0 +1,46 @@ +$(function () { + + module("bootstrap-tabs") + + test("should be defined on jquery object", function () { + ok($(document.body).tab, 'tabs method is defined') + }) + + test("should return element", function () { + ok($(document.body).tab()[0] == document.body, 'document.body returned') + }) + + test("should activate element by tab id", function () { + var tabsHTML = + '' + + + $('
      ').appendTo("#qunit-fixture") + + $(tabsHTML).find('li:last a').tab('show') + equals($("#qunit-fixture").find('.active').attr('id'), "profile") + + $(tabsHTML).find('li:first a').tab('show') + equals($("#qunit-fixture").find('.active').attr('id'), "home") + }) + + test("should activate element by tab id", function () { + var pillsHTML = + '' + + $('
      ').appendTo("#qunit-fixture") + + $(pillsHTML).find('li:last a').tab('show') + equals($("#qunit-fixture").find('.active').attr('id'), "profile") + + $(pillsHTML).find('li:first a').tab('show') + equals($("#qunit-fixture").find('.active').attr('id'), "home") + }) + +}) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-tabs.js b/js/tests/unit/bootstrap-tabs.js deleted file mode 100644 index 2ee6761ed..000000000 --- a/js/tests/unit/bootstrap-tabs.js +++ /dev/null @@ -1,49 +0,0 @@ -$(function () { - - module("bootstrap-tabs") - - test("should be defined on jquery object", function () { - ok($(document.body).tabs, 'tabs method is defined') - }) - - test("should return element", function () { - ok($(document.body).tabs()[0] == document.body, 'document.body returned') - }) - - test("should activate element by tab id", function () { - var tabsHTML = '' - - - $('
      ').appendTo("#qunit-runoff") - - $(tabsHTML).tabs().find('a').last().click() - equals($("#qunit-runoff").find('.active').attr('id'), "profile") - - $(tabsHTML).tabs().find('a').first().click() - equals($("#qunit-runoff").find('.active').attr('id'), "home") - - $("#qunit-runoff").empty() - }) - - test("should activate element by pill id", function () { - var pillsHTML = '' - - - $('
      ').appendTo("#qunit-runoff") - - $(pillsHTML).pills().find('a').last().click() - equals($("#qunit-runoff").find('.active').attr('id'), "profile") - - $(pillsHTML).pills().find('a').first().click() - equals($("#qunit-runoff").find('.active').attr('id'), "home") - - $("#qunit-runoff").empty() - }) - -}) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-transition.js b/js/tests/unit/bootstrap-transition.js new file mode 100644 index 000000000..ff4a0f0c3 --- /dev/null +++ b/js/tests/unit/bootstrap-transition.js @@ -0,0 +1,13 @@ +$(function () { + + module("bootstrap-transition") + + test("should be defined on jquery support object", function () { + ok($.support.transition != undefined, 'transition object is defined') + }) + + test("should provide an end object", function () { + ok($.support.transition.end, 'end string is defined') + }) + +}) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-twipsy.js b/js/tests/unit/bootstrap-twipsy.js index 04000696a..7a88ab2f1 100644 --- a/js/tests/unit/bootstrap-twipsy.js +++ b/js/tests/unit/bootstrap-twipsy.js @@ -29,53 +29,23 @@ $(function () { test("should place tooltips relative to placement option", function () { $.support.transition = false var twipsy = $('') - .appendTo('#qunit-runoff') + .appendTo('#qunit-fixture') .twipsy({placement: 'below'}) .twipsy('show') ok($(".twipsy").hasClass('fade below in'), 'has correct classes applied') twipsy.twipsy('hide') - ok(!$(".twipsy").length, 'twipsy removed') - $('#qunit-runoff').empty() - }) - - test("should add a fallback in cases where elements have no title tag", function () { - $.support.transition = false - var twipsy = $('') - .appendTo('#qunit-runoff') - .twipsy({fallback: '@fat'}) - .twipsy('show') - - equals($(".twipsy").text(), "@fat", 'has correct default text') - twipsy.twipsy('hide') - ok(!$(".twipsy").length, 'twipsy removed') - $('#qunit-runoff').empty() - }) - - test("should not allow html entities", function () { - $.support.transition = false - var twipsy = $('') - .appendTo('#qunit-runoff') - .twipsy() - .twipsy('show') - - ok(!$('.twipsy b').length, 'b tag was not inserted') - twipsy.twipsy('hide') - ok(!$(".twipsy").length, 'twipsy removed') - $('#qunit-runoff').empty() }) - test("should allow html entities if html option set to true", function () { + test("should always allow html entities", function () { $.support.transition = false var twipsy = $('') - .appendTo('#qunit-runoff') - .twipsy({html: true}) + .appendTo('#qunit-fixture') .twipsy('show') ok($('.twipsy b').length, 'b tag was inserted') twipsy.twipsy('hide') ok(!$(".twipsy").length, 'twipsy removed') - $('#qunit-runoff').empty() }) }) \ No newline at end of file diff --git a/js/tests/vendor/jquery.js b/js/tests/vendor/jquery.js new file mode 100644 index 000000000..01fbe13c8 --- /dev/null +++ b/js/tests/vendor/jquery.js @@ -0,0 +1,9252 @@ +/*! jQuery v1.7.1 jquery.com | jquery.org/license */ +(function( window, undefined ) { + +// Use the correct document accordingly with window argument (sandbox) +var document = window.document, + navigator = window.navigator, + location = window.location; +var jQuery = (function() { + +// Define a local copy of jQuery +var jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + return new jQuery.fn.init( selector, context, rootjQuery ); + }, + + // Map over jQuery in case of overwrite + _jQuery = window.jQuery, + + // Map over the $ in case of overwrite + _$ = window.$, + + // A central reference to the root jQuery(document) + rootjQuery, + + // A simple way to check for HTML strings or ID strings + // Prioritize #id over to avoid XSS via location.hash (#9521) + quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/, + + // Check if a string has a non-whitespace character in it + rnotwhite = /\S/, + + // Used for trimming whitespace + trimLeft = /^\s+/, + trimRight = /\s+$/, + + // Match a standalone tag + rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, + + // JSON RegExp + rvalidchars = /^[\],:{}\s]*$/, + rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, + rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, + rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, + + // Useragent RegExp + rwebkit = /(webkit)[ \/]([\w.]+)/, + ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/, + rmsie = /(msie) ([\w.]+)/, + rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/, + + // Matches dashed string for camelizing + rdashAlpha = /-([a-z]|[0-9])/ig, + rmsPrefix = /^-ms-/, + + // Used by jQuery.camelCase as callback to replace() + fcamelCase = function( all, letter ) { + return ( letter + "" ).toUpperCase(); + }, + + // Keep a UserAgent string for use with jQuery.browser + userAgent = navigator.userAgent, + + // For matching the engine and version of the browser + browserMatch, + + // The deferred used on DOM ready + readyList, + + // The ready event handler + DOMContentLoaded, + + // Save a reference to some core methods + toString = Object.prototype.toString, + hasOwn = Object.prototype.hasOwnProperty, + push = Array.prototype.push, + slice = Array.prototype.slice, + trim = String.prototype.trim, + indexOf = Array.prototype.indexOf, + + // [[Class]] -> type pairs + class2type = {}; + +jQuery.fn = jQuery.prototype = { + constructor: jQuery, + init: function( selector, context, rootjQuery ) { + var match, elem, ret, doc; + + // Handle $(""), $(null), or $(undefined) + if ( !selector ) { + return this; + } + + // Handle $(DOMElement) + if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + } + + // The body element only exists once, optimize finding it + if ( selector === "body" && !context && document.body ) { + this.context = document; + this[0] = document.body; + this.selector = selector; + this.length = 1; + return this; + } + + // Handle HTML strings + if ( typeof selector === "string" ) { + // Are we dealing with HTML string or an ID? + if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { + // Assume that strings that start and end with <> are HTML and skip the regex check + match = [ null, selector, null ]; + + } else { + match = quickExpr.exec( selector ); + } + + // Verify a match, and that no context was specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) { + context = context instanceof jQuery ? context[0] : context; + doc = ( context ? context.ownerDocument || context : document ); + + // If a single string is passed in and it's a single tag + // just do a createElement and skip the rest + ret = rsingleTag.exec( selector ); + + if ( ret ) { + if ( jQuery.isPlainObject( context ) ) { + selector = [ document.createElement( ret[1] ) ]; + jQuery.fn.attr.call( selector, context, true ); + + } else { + selector = [ doc.createElement( ret[1] ) ]; + } + + } else { + ret = jQuery.buildFragment( [ match[1] ], [ doc ] ); + selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes; + } + + return jQuery.merge( this, selector ); + + // HANDLE: $("#id") + } else { + elem = document.getElementById( match[2] ); + + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id !== match[2] ) { + return rootjQuery.find( selector ); + } + + // Otherwise, we inject the element directly into the jQuery object + this.length = 1; + this[0] = elem; + } + + this.context = document; + this.selector = selector; + return this; + } + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return ( context || rootjQuery ).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return this.constructor( context ).find( selector ); + } + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) { + return rootjQuery.ready( selector ); + } + + if ( selector.selector !== undefined ) { + this.selector = selector.selector; + this.context = selector.context; + } + + return jQuery.makeArray( selector, this ); + }, + + // Start with an empty selector + selector: "", + + // The current version of jQuery being used + jquery: "1.7.1", + + // The default length of a jQuery object is 0 + length: 0, + + // The number of elements contained in the matched element set + size: function() { + return this.length; + }, + + toArray: function() { + return slice.call( this, 0 ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num == null ? + + // Return a 'clean' array + this.toArray() : + + // Return just the object + ( num < 0 ? this[ this.length + num ] : this[ num ] ); + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems, name, selector ) { + // Build a new jQuery matched element set + var ret = this.constructor(); + + if ( jQuery.isArray( elems ) ) { + push.apply( ret, elems ); + + } else { + jQuery.merge( ret, elems ); + } + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + + ret.context = this.context; + + if ( name === "find" ) { + ret.selector = this.selector + ( this.selector ? " " : "" ) + selector; + } else if ( name ) { + ret.selector = this.selector + "." + name + "(" + selector + ")"; + } + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + ready: function( fn ) { + // Attach the listeners + jQuery.bindReady(); + + // Add the callback + readyList.add( fn ); + + return this; + }, + + eq: function( i ) { + i = +i; + return i === -1 ? + this.slice( i ) : + this.slice( i, i + 1 ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ), + "slice", slice.call(arguments).join(",") ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function( elem, i ) { + return callback.call( elem, i, elem ); + })); + }, + + end: function() { + return this.prevObject || this.constructor(null); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: [].sort, + splice: [].splice +}; + +// Give the init function the jQuery prototype for later instantiation +jQuery.fn.init.prototype = jQuery.fn; + +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[0] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + target = arguments[1] || {}; + // skip the boolean and the target + i = 2; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction(target) ) { + target = {}; + } + + // extend jQuery itself if only one argument is passed + if ( length === i ) { + target = this; + --i; + } + + for ( ; i < length; i++ ) { + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) { + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( copyIsArray ) { + copyIsArray = false; + clone = src && jQuery.isArray(src) ? src : []; + + } else { + clone = src && jQuery.isPlainObject(src) ? src : {}; + } + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend({ + noConflict: function( deep ) { + if ( window.$ === jQuery ) { + window.$ = _$; + } + + if ( deep && window.jQuery === jQuery ) { + window.jQuery = _jQuery; + } + + return jQuery; + }, + + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, + + // Hold (or release) the ready event + holdReady: function( hold ) { + if ( hold ) { + jQuery.readyWait++; + } else { + jQuery.ready( true ); + } + }, + + // Handle when the DOM is ready + ready: function( wait ) { + // Either a released hold or an DOMready/load event and not yet ready + if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) { + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( !document.body ) { + return setTimeout( jQuery.ready, 1 ); + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + + // If there are functions bound, to execute + readyList.fireWith( document, [ jQuery ] ); + + // Trigger any bound ready events + if ( jQuery.fn.trigger ) { + jQuery( document ).trigger( "ready" ).off( "ready" ); + } + } + }, + + bindReady: function() { + if ( readyList ) { + return; + } + + readyList = jQuery.Callbacks( "once memory" ); + + // Catch cases where $(document).ready() is called after the + // browser event has already occurred. + if ( document.readyState === "complete" ) { + // Handle it asynchronously to allow scripts the opportunity to delay ready + return setTimeout( jQuery.ready, 1 ); + } + + // Mozilla, Opera and webkit nightlies currently support this event + if ( document.addEventListener ) { + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", jQuery.ready, false ); + + // If IE event model is used + } else if ( document.attachEvent ) { + // ensure firing before onload, + // maybe late but safe also for iframes + document.attachEvent( "onreadystatechange", DOMContentLoaded ); + + // A fallback to window.onload, that will always work + window.attachEvent( "onload", jQuery.ready ); + + // If IE and not a frame + // continually check to see if the document is ready + var toplevel = false; + + try { + toplevel = window.frameElement == null; + } catch(e) {} + + if ( document.documentElement.doScroll && toplevel ) { + doScrollCheck(); + } + } + }, + + // See test/unit/core.js for details concerning isFunction. + // Since version 1.3, DOM methods and functions like alert + // aren't supported. They return false on IE (#2968). + isFunction: function( obj ) { + return jQuery.type(obj) === "function"; + }, + + isArray: Array.isArray || function( obj ) { + return jQuery.type(obj) === "array"; + }, + + // A crude way of determining if an object is a window + isWindow: function( obj ) { + return obj && typeof obj === "object" && "setInterval" in obj; + }, + + isNumeric: function( obj ) { + return !isNaN( parseFloat(obj) ) && isFinite( obj ); + }, + + type: function( obj ) { + return obj == null ? + String( obj ) : + class2type[ toString.call(obj) ] || "object"; + }, + + isPlainObject: function( obj ) { + // Must be an Object. + // Because of IE, we also have to check the presence of the constructor property. + // Make sure that DOM nodes and window objects don't pass through, as well + if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + return false; + } + + try { + // Not own constructor property must be Object + if ( obj.constructor && + !hasOwn.call(obj, "constructor") && + !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { + return false; + } + } catch ( e ) { + // IE8,9 Will throw exceptions on certain host objects #9897 + return false; + } + + // Own properties are enumerated firstly, so to speed up, + // if last one is own, then all properties are own. + + var key; + for ( key in obj ) {} + + return key === undefined || hasOwn.call( obj, key ); + }, + + isEmptyObject: function( obj ) { + for ( var name in obj ) { + return false; + } + return true; + }, + + error: function( msg ) { + throw new Error( msg ); + }, + + parseJSON: function( data ) { + if ( typeof data !== "string" || !data ) { + return null; + } + + // Make sure leading/trailing whitespace is removed (IE can't handle it) + data = jQuery.trim( data ); + + // Attempt to parse using the native JSON parser first + if ( window.JSON && window.JSON.parse ) { + return window.JSON.parse( data ); + } + + // Make sure the incoming data is actual JSON + // Logic borrowed from http://json.org/json2.js + if ( rvalidchars.test( data.replace( rvalidescape, "@" ) + .replace( rvalidtokens, "]" ) + .replace( rvalidbraces, "")) ) { + + return ( new Function( "return " + data ) )(); + + } + jQuery.error( "Invalid JSON: " + data ); + }, + + // Cross-browser xml parsing + parseXML: function( data ) { + var xml, tmp; + try { + if ( window.DOMParser ) { // Standard + tmp = new DOMParser(); + xml = tmp.parseFromString( data , "text/xml" ); + } else { // IE + xml = new ActiveXObject( "Microsoft.XMLDOM" ); + xml.async = "false"; + xml.loadXML( data ); + } + } catch( e ) { + xml = undefined; + } + if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) { + jQuery.error( "Invalid XML: " + data ); + } + return xml; + }, + + noop: function() {}, + + // Evaluates a script in a global context + // Workarounds based on findings by Jim Driscoll + // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context + globalEval: function( data ) { + if ( data && rnotwhite.test( data ) ) { + // We use execScript on Internet Explorer + // We use an anonymous function so that context is window + // rather than jQuery in Firefox + ( window.execScript || function( data ) { + window[ "eval" ].call( window, data ); + } )( data ); + } + }, + + // Convert dashed to camelCase; used by the css and data modules + // Microsoft forgot to hump their vendor prefix (#9572) + camelCase: function( string ) { + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); + }, + + // args is for internal usage only + each: function( object, callback, args ) { + var name, i = 0, + length = object.length, + isObj = length === undefined || jQuery.isFunction( object ); + + if ( args ) { + if ( isObj ) { + for ( name in object ) { + if ( callback.apply( object[ name ], args ) === false ) { + break; + } + } + } else { + for ( ; i < length; ) { + if ( callback.apply( object[ i++ ], args ) === false ) { + break; + } + } + } + + // A special, fast, case for the most common use of each + } else { + if ( isObj ) { + for ( name in object ) { + if ( callback.call( object[ name ], name, object[ name ] ) === false ) { + break; + } + } + } else { + for ( ; i < length; ) { + if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) { + break; + } + } + } + } + + return object; + }, + + // Use native String.trim function wherever possible + trim: trim ? + function( text ) { + return text == null ? + "" : + trim.call( text ); + } : + + // Otherwise use our own trimming functionality + function( text ) { + return text == null ? + "" : + text.toString().replace( trimLeft, "" ).replace( trimRight, "" ); + }, + + // results is for internal usage only + makeArray: function( array, results ) { + var ret = results || []; + + if ( array != null ) { + // The window, strings (and functions) also have 'length' + // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 + var type = jQuery.type( array ); + + if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) { + push.call( ret, array ); + } else { + jQuery.merge( ret, array ); + } + } + + return ret; + }, + + inArray: function( elem, array, i ) { + var len; + + if ( array ) { + if ( indexOf ) { + return indexOf.call( array, elem, i ); + } + + len = array.length; + i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0; + + for ( ; i < len; i++ ) { + // Skip accessing in sparse arrays + if ( i in array && array[ i ] === elem ) { + return i; + } + } + } + + return -1; + }, + + merge: function( first, second ) { + var i = first.length, + j = 0; + + if ( typeof second.length === "number" ) { + for ( var l = second.length; j < l; j++ ) { + first[ i++ ] = second[ j ]; + } + + } else { + while ( second[j] !== undefined ) { + first[ i++ ] = second[ j++ ]; + } + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, inv ) { + var ret = [], retVal; + inv = !!inv; + + // Go through the array, only saving the items + // that pass the validator function + for ( var i = 0, length = elems.length; i < length; i++ ) { + retVal = !!callback( elems[ i ], i ); + if ( inv !== retVal ) { + ret.push( elems[ i ] ); + } + } + + return ret; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var value, key, ret = [], + i = 0, + length = elems.length, + // jquery objects are treated as arrays + isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ; + + // Go through the array, translating each of the items to their + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret[ ret.length ] = value; + } + } + + // Go through every key on the object + } else { + for ( key in elems ) { + value = callback( elems[ key ], key, arg ); + + if ( value != null ) { + ret[ ret.length ] = value; + } + } + } + + // Flatten any nested arrays + return ret.concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + // Bind a function to a context, optionally partially applying any + // arguments. + proxy: function( fn, context ) { + if ( typeof context === "string" ) { + var tmp = fn[ context ]; + context = fn; + fn = tmp; + } + + // Quick check to determine if target is callable, in the spec + // this throws a TypeError, but we will just return undefined. + if ( !jQuery.isFunction( fn ) ) { + return undefined; + } + + // Simulated bind + var args = slice.call( arguments, 2 ), + proxy = function() { + return fn.apply( context, args.concat( slice.call( arguments ) ) ); + }; + + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++; + + return proxy; + }, + + // Mutifunctional method to get and set values to a collection + // The value/s can optionally be executed if it's a function + access: function( elems, key, value, exec, fn, pass ) { + var length = elems.length; + + // Setting many attributes + if ( typeof key === "object" ) { + for ( var k in key ) { + jQuery.access( elems, k, key[k], exec, fn, value ); + } + return elems; + } + + // Setting one attribute + if ( value !== undefined ) { + // Optionally, function values get executed if exec is true + exec = !pass && exec && jQuery.isFunction(value); + + for ( var i = 0; i < length; i++ ) { + fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); + } + + return elems; + } + + // Getting an attribute + return length ? fn( elems[0], key ) : undefined; + }, + + now: function() { + return ( new Date() ).getTime(); + }, + + // Use of jQuery.browser is frowned upon. + // More details: http://docs.jquery.com/Utilities/jQuery.browser + uaMatch: function( ua ) { + ua = ua.toLowerCase(); + + var match = rwebkit.exec( ua ) || + ropera.exec( ua ) || + rmsie.exec( ua ) || + ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) || + []; + + return { browser: match[1] || "", version: match[2] || "0" }; + }, + + sub: function() { + function jQuerySub( selector, context ) { + return new jQuerySub.fn.init( selector, context ); + } + jQuery.extend( true, jQuerySub, this ); + jQuerySub.superclass = this; + jQuerySub.fn = jQuerySub.prototype = this(); + jQuerySub.fn.constructor = jQuerySub; + jQuerySub.sub = this.sub; + jQuerySub.fn.init = function init( selector, context ) { + if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) { + context = jQuerySub( context ); + } + + return jQuery.fn.init.call( this, selector, context, rootjQuerySub ); + }; + jQuerySub.fn.init.prototype = jQuerySub.fn; + var rootjQuerySub = jQuerySub(document); + return jQuerySub; + }, + + browser: {} +}); + +// Populate the class2type map +jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +}); + +browserMatch = jQuery.uaMatch( userAgent ); +if ( browserMatch.browser ) { + jQuery.browser[ browserMatch.browser ] = true; + jQuery.browser.version = browserMatch.version; +} + +// Deprecated, use jQuery.browser.webkit instead +if ( jQuery.browser.webkit ) { + jQuery.browser.safari = true; +} + +// IE doesn't match non-breaking spaces with \s +if ( rnotwhite.test( "\xA0" ) ) { + trimLeft = /^[\s\xA0]+/; + trimRight = /[\s\xA0]+$/; +} + +// All jQuery objects should point back to these +rootjQuery = jQuery(document); + +// Cleanup functions for the document ready method +if ( document.addEventListener ) { + DOMContentLoaded = function() { + document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + jQuery.ready(); + }; + +} else if ( document.attachEvent ) { + DOMContentLoaded = function() { + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( document.readyState === "complete" ) { + document.detachEvent( "onreadystatechange", DOMContentLoaded ); + jQuery.ready(); + } + }; +} + +// The DOM ready check for Internet Explorer +function doScrollCheck() { + if ( jQuery.isReady ) { + return; + } + + try { + // If IE is used, use the trick by Diego Perini + // http://javascript.nwbox.com/IEContentLoaded/ + document.documentElement.doScroll("left"); + } catch(e) { + setTimeout( doScrollCheck, 1 ); + return; + } + + // and execute any waiting functions + jQuery.ready(); +} + +return jQuery; + +})(); + + +// String to Object flags format cache +var flagsCache = {}; + +// Convert String-formatted flags into Object-formatted ones and store in cache +function createFlags( flags ) { + var object = flagsCache[ flags ] = {}, + i, length; + flags = flags.split( /\s+/ ); + for ( i = 0, length = flags.length; i < length; i++ ) { + object[ flags[i] ] = true; + } + return object; +} + +/* + * Create a callback list using the following parameters: + * + * flags: an optional list of space-separated flags that will change how + * the callback list behaves + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible flags: + * + * once: will ensure the callback list can only be fired once (like a Deferred) + * + * memory: will keep track of previous values and will call any callback added + * after the list has been fired right away with the latest "memorized" + * values (like a Deferred) + * + * unique: will ensure a callback can only be added once (no duplicate in the list) + * + * stopOnFalse: interrupt callings when a callback returns false + * + */ +jQuery.Callbacks = function( flags ) { + + // Convert flags from String-formatted to Object-formatted + // (we check in cache first) + flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {}; + + var // Actual callback list + list = [], + // Stack of fire calls for repeatable lists + stack = [], + // Last fire value (for non-forgettable lists) + memory, + // Flag to know if list is currently firing + firing, + // First callback to fire (used internally by add and fireWith) + firingStart, + // End of the loop when firing + firingLength, + // Index of currently firing callback (modified by remove if needed) + firingIndex, + // Add one or several callbacks to the list + add = function( args ) { + var i, + length, + elem, + type, + actual; + for ( i = 0, length = args.length; i < length; i++ ) { + elem = args[ i ]; + type = jQuery.type( elem ); + if ( type === "array" ) { + // Inspect recursively + add( elem ); + } else if ( type === "function" ) { + // Add if not in unique mode and callback is not in + if ( !flags.unique || !self.has( elem ) ) { + list.push( elem ); + } + } + } + }, + // Fire callbacks + fire = function( context, args ) { + args = args || []; + memory = !flags.memory || [ context, args ]; + firing = true; + firingIndex = firingStart || 0; + firingStart = 0; + firingLength = list.length; + for ( ; list && firingIndex < firingLength; firingIndex++ ) { + if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) { + memory = true; // Mark as halted + break; + } + } + firing = false; + if ( list ) { + if ( !flags.once ) { + if ( stack && stack.length ) { + memory = stack.shift(); + self.fireWith( memory[ 0 ], memory[ 1 ] ); + } + } else if ( memory === true ) { + self.disable(); + } else { + list = []; + } + } + }, + // Actual Callbacks object + self = { + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + var length = list.length; + add( arguments ); + // Do we need to add the callbacks to the + // current firing batch? + if ( firing ) { + firingLength = list.length; + // With memory, if we're not firing then + // we should call right away, unless previous + // firing was halted (stopOnFalse) + } else if ( memory && memory !== true ) { + firingStart = length; + fire( memory[ 0 ], memory[ 1 ] ); + } + } + return this; + }, + // Remove a callback from the list + remove: function() { + if ( list ) { + var args = arguments, + argIndex = 0, + argLength = args.length; + for ( ; argIndex < argLength ; argIndex++ ) { + for ( var i = 0; i < list.length; i++ ) { + if ( args[ argIndex ] === list[ i ] ) { + // Handle firingIndex and firingLength + if ( firing ) { + if ( i <= firingLength ) { + firingLength--; + if ( i <= firingIndex ) { + firingIndex--; + } + } + } + // Remove the element + list.splice( i--, 1 ); + // If we have some unicity property then + // we only need to do this once + if ( flags.unique ) { + break; + } + } + } + } + } + return this; + }, + // Control if a given callback is in the list + has: function( fn ) { + if ( list ) { + var i = 0, + length = list.length; + for ( ; i < length; i++ ) { + if ( fn === list[ i ] ) { + return true; + } + } + } + return false; + }, + // Remove all callbacks from the list + empty: function() { + list = []; + return this; + }, + // Have the list do nothing anymore + disable: function() { + list = stack = memory = undefined; + return this; + }, + // Is it disabled? + disabled: function() { + return !list; + }, + // Lock the list in its current state + lock: function() { + stack = undefined; + if ( !memory || memory === true ) { + self.disable(); + } + return this; + }, + // Is it locked? + locked: function() { + return !stack; + }, + // Call all callbacks with the given context and arguments + fireWith: function( context, args ) { + if ( stack ) { + if ( firing ) { + if ( !flags.once ) { + stack.push( [ context, args ] ); + } + } else if ( !( flags.once && memory ) ) { + fire( context, args ); + } + } + return this; + }, + // Call all the callbacks with the given arguments + fire: function() { + self.fireWith( this, arguments ); + return this; + }, + // To know if the callbacks have already been called at least once + fired: function() { + return !!memory; + } + }; + + return self; +}; + + + + +var // Static reference to slice + sliceDeferred = [].slice; + +jQuery.extend({ + + Deferred: function( func ) { + var doneList = jQuery.Callbacks( "once memory" ), + failList = jQuery.Callbacks( "once memory" ), + progressList = jQuery.Callbacks( "memory" ), + state = "pending", + lists = { + resolve: doneList, + reject: failList, + notify: progressList + }, + promise = { + done: doneList.add, + fail: failList.add, + progress: progressList.add, + + state: function() { + return state; + }, + + // Deprecated + isResolved: doneList.fired, + isRejected: failList.fired, + + then: function( doneCallbacks, failCallbacks, progressCallbacks ) { + deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks ); + return this; + }, + always: function() { + deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments ); + return this; + }, + pipe: function( fnDone, fnFail, fnProgress ) { + return jQuery.Deferred(function( newDefer ) { + jQuery.each( { + done: [ fnDone, "resolve" ], + fail: [ fnFail, "reject" ], + progress: [ fnProgress, "notify" ] + }, function( handler, data ) { + var fn = data[ 0 ], + action = data[ 1 ], + returned; + if ( jQuery.isFunction( fn ) ) { + deferred[ handler ](function() { + returned = fn.apply( this, arguments ); + if ( returned && jQuery.isFunction( returned.promise ) ) { + returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify ); + } else { + newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] ); + } + }); + } else { + deferred[ handler ]( newDefer[ action ] ); + } + }); + }).promise(); + }, + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + if ( obj == null ) { + obj = promise; + } else { + for ( var key in promise ) { + obj[ key ] = promise[ key ]; + } + } + return obj; + } + }, + deferred = promise.promise({}), + key; + + for ( key in lists ) { + deferred[ key ] = lists[ key ].fire; + deferred[ key + "With" ] = lists[ key ].fireWith; + } + + // Handle state + deferred.done( function() { + state = "resolved"; + }, failList.disable, progressList.lock ).fail( function() { + state = "rejected"; + }, doneList.disable, progressList.lock ); + + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); + } + + // All done! + return deferred; + }, + + // Deferred helper + when: function( firstParam ) { + var args = sliceDeferred.call( arguments, 0 ), + i = 0, + length = args.length, + pValues = new Array( length ), + count = length, + pCount = length, + deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ? + firstParam : + jQuery.Deferred(), + promise = deferred.promise(); + function resolveFunc( i ) { + return function( value ) { + args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; + if ( !( --count ) ) { + deferred.resolveWith( deferred, args ); + } + }; + } + function progressFunc( i ) { + return function( value ) { + pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; + deferred.notifyWith( promise, pValues ); + }; + } + if ( length > 1 ) { + for ( ; i < length; i++ ) { + if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) { + args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) ); + } else { + --count; + } + } + if ( !count ) { + deferred.resolveWith( deferred, args ); + } + } else if ( deferred !== firstParam ) { + deferred.resolveWith( deferred, length ? [ firstParam ] : [] ); + } + return promise; + } +}); + + + + +jQuery.support = (function() { + + var support, + all, + a, + select, + opt, + input, + marginDiv, + fragment, + tds, + events, + eventName, + i, + isSupported, + div = document.createElement( "div" ), + documentElement = document.documentElement; + + // Preliminary tests + div.setAttribute("className", "t"); + div.innerHTML = "
      a"; + + all = div.getElementsByTagName( "*" ); + a = div.getElementsByTagName( "a" )[ 0 ]; + + // Can't get basic test support + if ( !all || !all.length || !a ) { + return {}; + } + + // First batch of supports tests + select = document.createElement( "select" ); + opt = select.appendChild( document.createElement("option") ); + input = div.getElementsByTagName( "input" )[ 0 ]; + + support = { + // IE strips leading whitespace when .innerHTML is used + leadingWhitespace: ( div.firstChild.nodeType === 3 ), + + // Make sure that tbody elements aren't automatically inserted + // IE will insert them into empty tables + tbody: !div.getElementsByTagName("tbody").length, + + // Make sure that link elements get serialized correctly by innerHTML + // This requires a wrapper element in IE + htmlSerialize: !!div.getElementsByTagName("link").length, + + // Get the style information from getAttribute + // (IE uses .cssText instead) + style: /top/.test( a.getAttribute("style") ), + + // Make sure that URLs aren't manipulated + // (IE normalizes it by default) + hrefNormalized: ( a.getAttribute("href") === "/a" ), + + // Make sure that element opacity exists + // (IE uses filter instead) + // Use a regex to work around a WebKit issue. See #5145 + opacity: /^0.55/.test( a.style.opacity ), + + // Verify style float existence + // (IE uses styleFloat instead of cssFloat) + cssFloat: !!a.style.cssFloat, + + // Make sure that if no value is specified for a checkbox + // that it defaults to "on". + // (WebKit defaults to "" instead) + checkOn: ( input.value === "on" ), + + // Make sure that a selected-by-default option has a working selected property. + // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) + optSelected: opt.selected, + + // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) + getSetAttribute: div.className !== "t", + + // Tests for enctype support on a form(#6743) + enctype: !!document.createElement("form").enctype, + + // Makes sure cloning an html5 element does not cause problems + // Where outerHTML is undefined, this still works + html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>", + + // Will be defined later + submitBubbles: true, + changeBubbles: true, + focusinBubbles: false, + deleteExpando: true, + noCloneEvent: true, + inlineBlockNeedsLayout: false, + shrinkWrapBlocks: false, + reliableMarginRight: true + }; + + // Make sure checked status is properly cloned + input.checked = true; + support.noCloneChecked = input.cloneNode( true ).checked; + + // Make sure that the options inside disabled selects aren't marked as disabled + // (WebKit marks them as disabled) + select.disabled = true; + support.optDisabled = !opt.disabled; + + // Test to see if it's possible to delete an expando from an element + // Fails in Internet Explorer + try { + delete div.test; + } catch( e ) { + support.deleteExpando = false; + } + + if ( !div.addEventListener && div.attachEvent && div.fireEvent ) { + div.attachEvent( "onclick", function() { + // Cloning a node shouldn't copy over any + // bound event handlers (IE does this) + support.noCloneEvent = false; + }); + div.cloneNode( true ).fireEvent( "onclick" ); + } + + // Check if a radio maintains its value + // after being appended to the DOM + input = document.createElement("input"); + input.value = "t"; + input.setAttribute("type", "radio"); + support.radioValue = input.value === "t"; + + input.setAttribute("checked", "checked"); + div.appendChild( input ); + fragment = document.createDocumentFragment(); + fragment.appendChild( div.lastChild ); + + // WebKit doesn't clone checked state correctly in fragments + support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; + + // Check if a disconnected checkbox will retain its checked + // value of true after appended to the DOM (IE6/7) + support.appendChecked = input.checked; + + fragment.removeChild( input ); + fragment.appendChild( div ); + + div.innerHTML = ""; + + // Check if div with explicit width and no margin-right incorrectly + // gets computed margin-right based on width of container. For more + // info see bug #3333 + // Fails in WebKit before Feb 2011 nightlies + // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right + if ( window.getComputedStyle ) { + marginDiv = document.createElement( "div" ); + marginDiv.style.width = "0"; + marginDiv.style.marginRight = "0"; + div.style.width = "2px"; + div.appendChild( marginDiv ); + support.reliableMarginRight = + ( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0; + } + + // Technique from Juriy Zaytsev + // http://perfectionkills.com/detecting-event-support-without-browser-sniffing/ + // We only care about the case where non-standard event systems + // are used, namely in IE. Short-circuiting here helps us to + // avoid an eval call (in setAttribute) which can cause CSP + // to go haywire. See: https://developer.mozilla.org/en/Security/CSP + if ( div.attachEvent ) { + for( i in { + submit: 1, + change: 1, + focusin: 1 + }) { + eventName = "on" + i; + isSupported = ( eventName in div ); + if ( !isSupported ) { + div.setAttribute( eventName, "return;" ); + isSupported = ( typeof div[ eventName ] === "function" ); + } + support[ i + "Bubbles" ] = isSupported; + } + } + + fragment.removeChild( div ); + + // Null elements to avoid leaks in IE + fragment = select = opt = marginDiv = div = input = null; + + // Run tests that need a body at doc ready + jQuery(function() { + var container, outer, inner, table, td, offsetSupport, + conMarginTop, ptlm, vb, style, html, + body = document.getElementsByTagName("body")[0]; + + if ( !body ) { + // Return for frameset docs that don't have a body + return; + } + + conMarginTop = 1; + ptlm = "position:absolute;top:0;left:0;width:1px;height:1px;margin:0;"; + vb = "visibility:hidden;border:0;"; + style = "style='" + ptlm + "border:5px solid #000;padding:0;'"; + html = "
      " + + "" + + "
      "; + + container = document.createElement("div"); + container.style.cssText = vb + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px"; + body.insertBefore( container, body.firstChild ); + + // Construct the test element + div = document.createElement("div"); + container.appendChild( div ); + + // Check if table cells still have offsetWidth/Height when they are set + // to display:none and there are still other visible table cells in a + // table row; if so, offsetWidth/Height are not reliable for use when + // determining if an element has been hidden directly using + // display:none (it is still safe to use offsets if a parent element is + // hidden; don safety goggles and see bug #4512 for more information). + // (only IE 8 fails this test) + div.innerHTML = "
      t
      "; + tds = div.getElementsByTagName( "td" ); + isSupported = ( tds[ 0 ].offsetHeight === 0 ); + + tds[ 0 ].style.display = ""; + tds[ 1 ].style.display = "none"; + + // Check if empty table cells still have offsetWidth/Height + // (IE <= 8 fail this test) + support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); + + // Figure out if the W3C box model works as expected + div.innerHTML = ""; + div.style.width = div.style.paddingLeft = "1px"; + jQuery.boxModel = support.boxModel = div.offsetWidth === 2; + + if ( typeof div.style.zoom !== "undefined" ) { + // Check if natively block-level elements act like inline-block + // elements when setting their display to 'inline' and giving + // them layout + // (IE < 8 does this) + div.style.display = "inline"; + div.style.zoom = 1; + support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 ); + + // Check if elements with layout shrink-wrap their children + // (IE 6 does this) + div.style.display = ""; + div.innerHTML = "
      "; + support.shrinkWrapBlocks = ( div.offsetWidth !== 2 ); + } + + div.style.cssText = ptlm + vb; + div.innerHTML = html; + + outer = div.firstChild; + inner = outer.firstChild; + td = outer.nextSibling.firstChild.firstChild; + + offsetSupport = { + doesNotAddBorder: ( inner.offsetTop !== 5 ), + doesAddBorderForTableAndCells: ( td.offsetTop === 5 ) + }; + + inner.style.position = "fixed"; + inner.style.top = "20px"; + + // safari subtracts parent border width here which is 5px + offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 ); + inner.style.position = inner.style.top = ""; + + outer.style.overflow = "hidden"; + outer.style.position = "relative"; + + offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 ); + offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop ); + + body.removeChild( container ); + div = container = null; + + jQuery.extend( support, offsetSupport ); + }); + + return support; +})(); + + + + +var rbrace = /^(?:\{.*\}|\[.*\])$/, + rmultiDash = /([A-Z])/g; + +jQuery.extend({ + cache: {}, + + // Please use with caution + uuid: 0, + + // Unique for each copy of jQuery on the page + // Non-digits removed to match rinlinejQuery + expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ), + + // The following elements throw uncatchable exceptions if you + // attempt to add expando properties to them. + noData: { + "embed": true, + // Ban all objects except for Flash (which handle expandos) + "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", + "applet": true + }, + + hasData: function( elem ) { + elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; + return !!elem && !isEmptyDataObject( elem ); + }, + + data: function( elem, name, data, pvt /* Internal Use Only */ ) { + if ( !jQuery.acceptData( elem ) ) { + return; + } + + var privateCache, thisCache, ret, + internalKey = jQuery.expando, + getByName = typeof name === "string", + + // We have to handle DOM nodes and JS objects differently because IE6-7 + // can't GC object references properly across the DOM-JS boundary + isNode = elem.nodeType, + + // Only DOM nodes need the global jQuery cache; JS object data is + // attached directly to the object so GC can occur automatically + cache = isNode ? jQuery.cache : elem, + + // Only defining an ID for JS objects if its cache already exists allows + // the code to shortcut on the same path as a DOM node with no cache + id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey, + isEvents = name === "events"; + + // Avoid doing any more work than we need to when trying to get data on an + // object that has no data at all + if ( (!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined ) { + return; + } + + if ( !id ) { + // Only DOM nodes need a new unique ID for each element since their data + // ends up in the global cache + if ( isNode ) { + elem[ internalKey ] = id = ++jQuery.uuid; + } else { + id = internalKey; + } + } + + if ( !cache[ id ] ) { + cache[ id ] = {}; + + // Avoids exposing jQuery metadata on plain JS objects when the object + // is serialized using JSON.stringify + if ( !isNode ) { + cache[ id ].toJSON = jQuery.noop; + } + } + + // An object can be passed to jQuery.data instead of a key/value pair; this gets + // shallow copied over onto the existing cache + if ( typeof name === "object" || typeof name === "function" ) { + if ( pvt ) { + cache[ id ] = jQuery.extend( cache[ id ], name ); + } else { + cache[ id ].data = jQuery.extend( cache[ id ].data, name ); + } + } + + privateCache = thisCache = cache[ id ]; + + // jQuery data() is stored in a separate object inside the object's internal data + // cache in order to avoid key collisions between internal data and user-defined + // data. + if ( !pvt ) { + if ( !thisCache.data ) { + thisCache.data = {}; + } + + thisCache = thisCache.data; + } + + if ( data !== undefined ) { + thisCache[ jQuery.camelCase( name ) ] = data; + } + + // Users should not attempt to inspect the internal events object using jQuery.data, + // it is undocumented and subject to change. But does anyone listen? No. + if ( isEvents && !thisCache[ name ] ) { + return privateCache.events; + } + + // Check for both converted-to-camel and non-converted data property names + // If a data property was specified + if ( getByName ) { + + // First Try to find as-is property data + ret = thisCache[ name ]; + + // Test for null|undefined property data + if ( ret == null ) { + + // Try to find the camelCased property + ret = thisCache[ jQuery.camelCase( name ) ]; + } + } else { + ret = thisCache; + } + + return ret; + }, + + removeData: function( elem, name, pvt /* Internal Use Only */ ) { + if ( !jQuery.acceptData( elem ) ) { + return; + } + + var thisCache, i, l, + + // Reference to internal data cache key + internalKey = jQuery.expando, + + isNode = elem.nodeType, + + // See jQuery.data for more information + cache = isNode ? jQuery.cache : elem, + + // See jQuery.data for more information + id = isNode ? elem[ internalKey ] : internalKey; + + // If there is already no cache entry for this object, there is no + // purpose in continuing + if ( !cache[ id ] ) { + return; + } + + if ( name ) { + + thisCache = pvt ? cache[ id ] : cache[ id ].data; + + if ( thisCache ) { + + // Support array or space separated string names for data keys + if ( !jQuery.isArray( name ) ) { + + // try the string as a key before any manipulation + if ( name in thisCache ) { + name = [ name ]; + } else { + + // split the camel cased version by spaces unless a key with the spaces exists + name = jQuery.camelCase( name ); + if ( name in thisCache ) { + name = [ name ]; + } else { + name = name.split( " " ); + } + } + } + + for ( i = 0, l = name.length; i < l; i++ ) { + delete thisCache[ name[i] ]; + } + + // If there is no data left in the cache, we want to continue + // and let the cache object itself get destroyed + if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) { + return; + } + } + } + + // See jQuery.data for more information + if ( !pvt ) { + delete cache[ id ].data; + + // Don't destroy the parent cache unless the internal data object + // had been the only thing left in it + if ( !isEmptyDataObject(cache[ id ]) ) { + return; + } + } + + // Browsers that fail expando deletion also refuse to delete expandos on + // the window, but it will allow it on all other JS objects; other browsers + // don't care + // Ensure that `cache` is not a window object #10080 + if ( jQuery.support.deleteExpando || !cache.setInterval ) { + delete cache[ id ]; + } else { + cache[ id ] = null; + } + + // We destroyed the cache and need to eliminate the expando on the node to avoid + // false lookups in the cache for entries that no longer exist + if ( isNode ) { + // IE does not allow us to delete expando properties from nodes, + // nor does it have a removeAttribute function on Document nodes; + // we must handle all of these cases + if ( jQuery.support.deleteExpando ) { + delete elem[ internalKey ]; + } else if ( elem.removeAttribute ) { + elem.removeAttribute( internalKey ); + } else { + elem[ internalKey ] = null; + } + } + }, + + // For internal use only. + _data: function( elem, name, data ) { + return jQuery.data( elem, name, data, true ); + }, + + // A method for determining if a DOM node can handle the data expando + acceptData: function( elem ) { + if ( elem.nodeName ) { + var match = jQuery.noData[ elem.nodeName.toLowerCase() ]; + + if ( match ) { + return !(match === true || elem.getAttribute("classid") !== match); + } + } + + return true; + } +}); + +jQuery.fn.extend({ + data: function( key, value ) { + var parts, attr, name, + data = null; + + if ( typeof key === "undefined" ) { + if ( this.length ) { + data = jQuery.data( this[0] ); + + if ( this[0].nodeType === 1 && !jQuery._data( this[0], "parsedAttrs" ) ) { + attr = this[0].attributes; + for ( var i = 0, l = attr.length; i < l; i++ ) { + name = attr[i].name; + + if ( name.indexOf( "data-" ) === 0 ) { + name = jQuery.camelCase( name.substring(5) ); + + dataAttr( this[0], name, data[ name ] ); + } + } + jQuery._data( this[0], "parsedAttrs", true ); + } + } + + return data; + + } else if ( typeof key === "object" ) { + return this.each(function() { + jQuery.data( this, key ); + }); + } + + parts = key.split("."); + parts[1] = parts[1] ? "." + parts[1] : ""; + + if ( value === undefined ) { + data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + + // Try to fetch any internally stored data first + if ( data === undefined && this.length ) { + data = jQuery.data( this[0], key ); + data = dataAttr( this[0], key, data ); + } + + return data === undefined && parts[1] ? + this.data( parts[0] ) : + data; + + } else { + return this.each(function() { + var self = jQuery( this ), + args = [ parts[0], value ]; + + self.triggerHandler( "setData" + parts[1] + "!", args ); + jQuery.data( this, key, value ); + self.triggerHandler( "changeData" + parts[1] + "!", args ); + }); + } + }, + + removeData: function( key ) { + return this.each(function() { + jQuery.removeData( this, key ); + }); + } +}); + +function dataAttr( elem, key, data ) { + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { + + var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); + + data = elem.getAttribute( name ); + + if ( typeof data === "string" ) { + try { + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : + jQuery.isNumeric( data ) ? parseFloat( data ) : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch( e ) {} + + // Make sure we set the data so it isn't changed later + jQuery.data( elem, key, data ); + + } else { + data = undefined; + } + } + + return data; +} + +// checks a cache object for emptiness +function isEmptyDataObject( obj ) { + for ( var name in obj ) { + + // if the public data object is empty, the private is still empty + if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) { + continue; + } + if ( name !== "toJSON" ) { + return false; + } + } + + return true; +} + + + + +function handleQueueMarkDefer( elem, type, src ) { + var deferDataKey = type + "defer", + queueDataKey = type + "queue", + markDataKey = type + "mark", + defer = jQuery._data( elem, deferDataKey ); + if ( defer && + ( src === "queue" || !jQuery._data(elem, queueDataKey) ) && + ( src === "mark" || !jQuery._data(elem, markDataKey) ) ) { + // Give room for hard-coded callbacks to fire first + // and eventually mark/queue something else on the element + setTimeout( function() { + if ( !jQuery._data( elem, queueDataKey ) && + !jQuery._data( elem, markDataKey ) ) { + jQuery.removeData( elem, deferDataKey, true ); + defer.fire(); + } + }, 0 ); + } +} + +jQuery.extend({ + + _mark: function( elem, type ) { + if ( elem ) { + type = ( type || "fx" ) + "mark"; + jQuery._data( elem, type, (jQuery._data( elem, type ) || 0) + 1 ); + } + }, + + _unmark: function( force, elem, type ) { + if ( force !== true ) { + type = elem; + elem = force; + force = false; + } + if ( elem ) { + type = type || "fx"; + var key = type + "mark", + count = force ? 0 : ( (jQuery._data( elem, key ) || 1) - 1 ); + if ( count ) { + jQuery._data( elem, key, count ); + } else { + jQuery.removeData( elem, key, true ); + handleQueueMarkDefer( elem, type, "mark" ); + } + } + }, + + queue: function( elem, type, data ) { + var q; + if ( elem ) { + type = ( type || "fx" ) + "queue"; + q = jQuery._data( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( data ) { + if ( !q || jQuery.isArray(data) ) { + q = jQuery._data( elem, type, jQuery.makeArray(data) ); + } else { + q.push( data ); + } + } + return q || []; + } + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), + fn = queue.shift(), + hooks = {}; + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + } + + if ( fn ) { + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift( "inprogress" ); + } + + jQuery._data( elem, type + ".run", hooks ); + fn.call( elem, function() { + jQuery.dequeue( elem, type ); + }, hooks ); + } + + if ( !queue.length ) { + jQuery.removeData( elem, type + "queue " + type + ".run", true ); + handleQueueMarkDefer( elem, type, "queue" ); + } + } +}); + +jQuery.fn.extend({ + queue: function( type, data ) { + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + } + + if ( data === undefined ) { + return jQuery.queue( this[0], type ); + } + return this.each(function() { + var queue = jQuery.queue( this, type, data ); + + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + }); + }, + dequeue: function( type ) { + return this.each(function() { + jQuery.dequeue( this, type ); + }); + }, + // Based off of the plugin by Clint Helfers, with permission. + // http://blindsignals.com/index.php/2009/07/jquery-delay/ + delay: function( time, type ) { + time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; + type = type || "fx"; + + return this.queue( type, function( next, hooks ) { + var timeout = setTimeout( next, time ); + hooks.stop = function() { + clearTimeout( timeout ); + }; + }); + }, + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); + }, + // Get a promise resolved when queues of a certain type + // are emptied (fx is the type by default) + promise: function( type, object ) { + if ( typeof type !== "string" ) { + object = type; + type = undefined; + } + type = type || "fx"; + var defer = jQuery.Deferred(), + elements = this, + i = elements.length, + count = 1, + deferDataKey = type + "defer", + queueDataKey = type + "queue", + markDataKey = type + "mark", + tmp; + function resolve() { + if ( !( --count ) ) { + defer.resolveWith( elements, [ elements ] ); + } + } + while( i-- ) { + if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) || + ( jQuery.data( elements[ i ], queueDataKey, undefined, true ) || + jQuery.data( elements[ i ], markDataKey, undefined, true ) ) && + jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) { + count++; + tmp.add( resolve ); + } + } + resolve(); + return defer.promise(); + } +}); + + + + +var rclass = /[\n\t\r]/g, + rspace = /\s+/, + rreturn = /\r/g, + rtype = /^(?:button|input)$/i, + rfocusable = /^(?:button|input|object|select|textarea)$/i, + rclickable = /^a(?:rea)?$/i, + rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, + getSetAttribute = jQuery.support.getSetAttribute, + nodeHook, boolHook, fixSpecified; + +jQuery.fn.extend({ + attr: function( name, value ) { + return jQuery.access( this, name, value, true, jQuery.attr ); + }, + + removeAttr: function( name ) { + return this.each(function() { + jQuery.removeAttr( this, name ); + }); + }, + + prop: function( name, value ) { + return jQuery.access( this, name, value, true, jQuery.prop ); + }, + + removeProp: function( name ) { + name = jQuery.propFix[ name ] || name; + return this.each(function() { + // try/catch handles cases where IE balks (such as removing a property on window) + try { + this[ name ] = undefined; + delete this[ name ]; + } catch( e ) {} + }); + }, + + addClass: function( value ) { + var classNames, i, l, elem, + setClass, c, cl; + + if ( jQuery.isFunction( value ) ) { + return this.each(function( j ) { + jQuery( this ).addClass( value.call(this, j, this.className) ); + }); + } + + if ( value && typeof value === "string" ) { + classNames = value.split( rspace ); + + for ( i = 0, l = this.length; i < l; i++ ) { + elem = this[ i ]; + + if ( elem.nodeType === 1 ) { + if ( !elem.className && classNames.length === 1 ) { + elem.className = value; + + } else { + setClass = " " + elem.className + " "; + + for ( c = 0, cl = classNames.length; c < cl; c++ ) { + if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) { + setClass += classNames[ c ] + " "; + } + } + elem.className = jQuery.trim( setClass ); + } + } + } + } + + return this; + }, + + removeClass: function( value ) { + var classNames, i, l, elem, className, c, cl; + + if ( jQuery.isFunction( value ) ) { + return this.each(function( j ) { + jQuery( this ).removeClass( value.call(this, j, this.className) ); + }); + } + + if ( (value && typeof value === "string") || value === undefined ) { + classNames = ( value || "" ).split( rspace ); + + for ( i = 0, l = this.length; i < l; i++ ) { + elem = this[ i ]; + + if ( elem.nodeType === 1 && elem.className ) { + if ( value ) { + className = (" " + elem.className + " ").replace( rclass, " " ); + for ( c = 0, cl = classNames.length; c < cl; c++ ) { + className = className.replace(" " + classNames[ c ] + " ", " "); + } + elem.className = jQuery.trim( className ); + + } else { + elem.className = ""; + } + } + } + } + + return this; + }, + + toggleClass: function( value, stateVal ) { + var type = typeof value, + isBool = typeof stateVal === "boolean"; + + if ( jQuery.isFunction( value ) ) { + return this.each(function( i ) { + jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal ); + }); + } + + return this.each(function() { + if ( type === "string" ) { + // toggle individual class names + var className, + i = 0, + self = jQuery( this ), + state = stateVal, + classNames = value.split( rspace ); + + while ( (className = classNames[ i++ ]) ) { + // check each className given, space seperated list + state = isBool ? state : !self.hasClass( className ); + self[ state ? "addClass" : "removeClass" ]( className ); + } + + } else if ( type === "undefined" || type === "boolean" ) { + if ( this.className ) { + // store className if set + jQuery._data( this, "__className__", this.className ); + } + + // toggle whole className + this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; + } + }); + }, + + hasClass: function( selector ) { + var className = " " + selector + " ", + i = 0, + l = this.length; + for ( ; i < l; i++ ) { + if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { + return true; + } + } + + return false; + }, + + val: function( value ) { + var hooks, ret, isFunction, + elem = this[0]; + + if ( !arguments.length ) { + if ( elem ) { + hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ]; + + if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) { + return ret; + } + + ret = elem.value; + + return typeof ret === "string" ? + // handle most common string cases + ret.replace(rreturn, "") : + // handle cases where value is null/undef or number + ret == null ? "" : ret; + } + + return; + } + + isFunction = jQuery.isFunction( value ); + + return this.each(function( i ) { + var self = jQuery(this), val; + + if ( this.nodeType !== 1 ) { + return; + } + + if ( isFunction ) { + val = value.call( this, i, self.val() ); + } else { + val = value; + } + + // Treat null/undefined as ""; convert numbers to string + if ( val == null ) { + val = ""; + } else if ( typeof val === "number" ) { + val += ""; + } else if ( jQuery.isArray( val ) ) { + val = jQuery.map(val, function ( value ) { + return value == null ? "" : value + ""; + }); + } + + hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ]; + + // If set returns undefined, fall back to normal setting + if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) { + this.value = val; + } + }); + } +}); + +jQuery.extend({ + valHooks: { + option: { + get: function( elem ) { + // attributes.value is undefined in Blackberry 4.7 but + // uses .value. See #6932 + var val = elem.attributes.value; + return !val || val.specified ? elem.value : elem.text; + } + }, + select: { + get: function( elem ) { + var value, i, max, option, + index = elem.selectedIndex, + values = [], + options = elem.options, + one = elem.type === "select-one"; + + // Nothing was selected + if ( index < 0 ) { + return null; + } + + // Loop through all the selected options + i = one ? index : 0; + max = one ? index + 1 : options.length; + for ( ; i < max; i++ ) { + option = options[ i ]; + + // Don't return options that are disabled or in a disabled optgroup + if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && + (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) { + + // Get the specific value for the option + value = jQuery( option ).val(); + + // We don't need an array for one selects + if ( one ) { + return value; + } + + // Multi-Selects return an array + values.push( value ); + } + } + + // Fixes Bug #2551 -- select.val() broken in IE after form.reset() + if ( one && !values.length && options.length ) { + return jQuery( options[ index ] ).val(); + } + + return values; + }, + + set: function( elem, value ) { + var values = jQuery.makeArray( value ); + + jQuery(elem).find("option").each(function() { + this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0; + }); + + if ( !values.length ) { + elem.selectedIndex = -1; + } + return values; + } + } + }, + + attrFn: { + val: true, + css: true, + html: true, + text: true, + data: true, + width: true, + height: true, + offset: true + }, + + attr: function( elem, name, value, pass ) { + var ret, hooks, notxml, + nType = elem.nodeType; + + // don't get/set attributes on text, comment and attribute nodes + if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { + return; + } + + if ( pass && name in jQuery.attrFn ) { + return jQuery( elem )[ name ]( value ); + } + + // Fallback to prop when attributes are not supported + if ( typeof elem.getAttribute === "undefined" ) { + return jQuery.prop( elem, name, value ); + } + + notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); + + // All attributes are lowercase + // Grab necessary hook if one is defined + if ( notxml ) { + name = name.toLowerCase(); + hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook ); + } + + if ( value !== undefined ) { + + if ( value === null ) { + jQuery.removeAttr( elem, name ); + return; + + } else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) { + return ret; + + } else { + elem.setAttribute( name, "" + value ); + return value; + } + + } else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) { + return ret; + + } else { + + ret = elem.getAttribute( name ); + + // Non-existent attributes return null, we normalize to undefined + return ret === null ? + undefined : + ret; + } + }, + + removeAttr: function( elem, value ) { + var propName, attrNames, name, l, + i = 0; + + if ( value && elem.nodeType === 1 ) { + attrNames = value.toLowerCase().split( rspace ); + l = attrNames.length; + + for ( ; i < l; i++ ) { + name = attrNames[ i ]; + + if ( name ) { + propName = jQuery.propFix[ name ] || name; + + // See #9699 for explanation of this approach (setting first, then removal) + jQuery.attr( elem, name, "" ); + elem.removeAttribute( getSetAttribute ? name : propName ); + + // Set corresponding property to false for boolean attributes + if ( rboolean.test( name ) && propName in elem ) { + elem[ propName ] = false; + } + } + } + } + }, + + attrHooks: { + type: { + set: function( elem, value ) { + // We can't allow the type property to be changed (since it causes problems in IE) + if ( rtype.test( elem.nodeName ) && elem.parentNode ) { + jQuery.error( "type property can't be changed" ); + } else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { + // Setting the type on a radio button after the value resets the value in IE6-9 + // Reset value to it's default in case type is set after value + // This is for element creation + var val = elem.value; + elem.setAttribute( "type", value ); + if ( val ) { + elem.value = val; + } + return value; + } + } + }, + // Use the value property for back compat + // Use the nodeHook for button elements in IE6/7 (#1954) + value: { + get: function( elem, name ) { + if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { + return nodeHook.get( elem, name ); + } + return name in elem ? + elem.value : + null; + }, + set: function( elem, value, name ) { + if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { + return nodeHook.set( elem, value, name ); + } + // Does not return so that setAttribute is also used + elem.value = value; + } + } + }, + + propFix: { + tabindex: "tabIndex", + readonly: "readOnly", + "for": "htmlFor", + "class": "className", + maxlength: "maxLength", + cellspacing: "cellSpacing", + cellpadding: "cellPadding", + rowspan: "rowSpan", + colspan: "colSpan", + usemap: "useMap", + frameborder: "frameBorder", + contenteditable: "contentEditable" + }, + + prop: function( elem, name, value ) { + var ret, hooks, notxml, + nType = elem.nodeType; + + // don't get/set properties on text, comment and attribute nodes + if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { + return; + } + + notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); + + if ( notxml ) { + // Fix name and attach hooks + name = jQuery.propFix[ name ] || name; + hooks = jQuery.propHooks[ name ]; + } + + if ( value !== undefined ) { + if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { + return ret; + + } else { + return ( elem[ name ] = value ); + } + + } else { + if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { + return ret; + + } else { + return elem[ name ]; + } + } + }, + + propHooks: { + tabIndex: { + get: function( elem ) { + // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set + // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + var attributeNode = elem.getAttributeNode("tabindex"); + + return attributeNode && attributeNode.specified ? + parseInt( attributeNode.value, 10 ) : + rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? + 0 : + undefined; + } + } + } +}); + +// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional) +jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex; + +// Hook for boolean attributes +boolHook = { + get: function( elem, name ) { + // Align boolean attributes with corresponding properties + // Fall back to attribute presence where some booleans are not supported + var attrNode, + property = jQuery.prop( elem, name ); + return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ? + name.toLowerCase() : + undefined; + }, + set: function( elem, value, name ) { + var propName; + if ( value === false ) { + // Remove boolean attributes when set to false + jQuery.removeAttr( elem, name ); + } else { + // value is true since we know at this point it's type boolean and not false + // Set boolean attributes to the same name and set the DOM property + propName = jQuery.propFix[ name ] || name; + if ( propName in elem ) { + // Only set the IDL specifically if it already exists on the element + elem[ propName ] = true; + } + + elem.setAttribute( name, name.toLowerCase() ); + } + return name; + } +}; + +// IE6/7 do not support getting/setting some attributes with get/setAttribute +if ( !getSetAttribute ) { + + fixSpecified = { + name: true, + id: true + }; + + // Use this for any attribute in IE6/7 + // This fixes almost every IE6/7 issue + nodeHook = jQuery.valHooks.button = { + get: function( elem, name ) { + var ret; + ret = elem.getAttributeNode( name ); + return ret && ( fixSpecified[ name ] ? ret.nodeValue !== "" : ret.specified ) ? + ret.nodeValue : + undefined; + }, + set: function( elem, value, name ) { + // Set the existing or create a new attribute node + var ret = elem.getAttributeNode( name ); + if ( !ret ) { + ret = document.createAttribute( name ); + elem.setAttributeNode( ret ); + } + return ( ret.nodeValue = value + "" ); + } + }; + + // Apply the nodeHook to tabindex + jQuery.attrHooks.tabindex.set = nodeHook.set; + + // Set width and height to auto instead of 0 on empty string( Bug #8150 ) + // This is for removals + jQuery.each([ "width", "height" ], function( i, name ) { + jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { + set: function( elem, value ) { + if ( value === "" ) { + elem.setAttribute( name, "auto" ); + return value; + } + } + }); + }); + + // Set contenteditable to false on removals(#10429) + // Setting to empty string throws an error as an invalid value + jQuery.attrHooks.contenteditable = { + get: nodeHook.get, + set: function( elem, value, name ) { + if ( value === "" ) { + value = "false"; + } + nodeHook.set( elem, value, name ); + } + }; +} + + +// Some attributes require a special call on IE +if ( !jQuery.support.hrefNormalized ) { + jQuery.each([ "href", "src", "width", "height" ], function( i, name ) { + jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { + get: function( elem ) { + var ret = elem.getAttribute( name, 2 ); + return ret === null ? undefined : ret; + } + }); + }); +} + +if ( !jQuery.support.style ) { + jQuery.attrHooks.style = { + get: function( elem ) { + // Return undefined in the case of empty string + // Normalize to lowercase since IE uppercases css property names + return elem.style.cssText.toLowerCase() || undefined; + }, + set: function( elem, value ) { + return ( elem.style.cssText = "" + value ); + } + }; +} + +// Safari mis-reports the default selected property of an option +// Accessing the parent's selectedIndex property fixes it +if ( !jQuery.support.optSelected ) { + jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, { + get: function( elem ) { + var parent = elem.parentNode; + + if ( parent ) { + parent.selectedIndex; + + // Make sure that it also works with optgroups, see #5701 + if ( parent.parentNode ) { + parent.parentNode.selectedIndex; + } + } + return null; + } + }); +} + +// IE6/7 call enctype encoding +if ( !jQuery.support.enctype ) { + jQuery.propFix.enctype = "encoding"; +} + +// Radios and checkboxes getter/setter +if ( !jQuery.support.checkOn ) { + jQuery.each([ "radio", "checkbox" ], function() { + jQuery.valHooks[ this ] = { + get: function( elem ) { + // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified + return elem.getAttribute("value") === null ? "on" : elem.value; + } + }; + }); +} +jQuery.each([ "radio", "checkbox" ], function() { + jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], { + set: function( elem, value ) { + if ( jQuery.isArray( value ) ) { + return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 ); + } + } + }); +}); + + + + +var rformElems = /^(?:textarea|input|select)$/i, + rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/, + rhoverHack = /\bhover(\.\S+)?\b/, + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|contextmenu)|click/, + rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/, + quickParse = function( selector ) { + var quick = rquickIs.exec( selector ); + if ( quick ) { + // 0 1 2 3 + // [ _, tag, id, class ] + quick[1] = ( quick[1] || "" ).toLowerCase(); + quick[3] = quick[3] && new RegExp( "(?:^|\\s)" + quick[3] + "(?:\\s|$)" ); + } + return quick; + }, + quickIs = function( elem, m ) { + var attrs = elem.attributes || {}; + return ( + (!m[1] || elem.nodeName.toLowerCase() === m[1]) && + (!m[2] || (attrs.id || {}).value === m[2]) && + (!m[3] || m[3].test( (attrs[ "class" ] || {}).value )) + ); + }, + hoverHack = function( events ) { + return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" ); + }; + +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { + + add: function( elem, types, handler, data, selector ) { + + var elemData, eventHandle, events, + t, tns, type, namespaces, handleObj, + handleObjIn, quick, handlers, special; + + // Don't attach events to noData or text/comment nodes (allow plain objects tho) + if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) { + return; + } + + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + } + + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure and main handler, if this is the first + events = elemData.events; + if ( !events ) { + elemData.events = events = {}; + } + eventHandle = elemData.handle; + if ( !eventHandle ) { + elemData.handle = eventHandle = function( e ) { + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded + return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ? + jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : + undefined; + }; + // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events + eventHandle.elem = elem; + } + + // Handle multiple events separated by a space + // jQuery(...).bind("mouseover mouseout", fn); + types = jQuery.trim( hoverHack(types) ).split( " " ); + for ( t = 0; t < types.length; t++ ) { + + tns = rtypenamespace.exec( types[t] ) || []; + type = tns[1]; + namespaces = ( tns[2] || "" ).split( "." ).sort(); + + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; + + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; + + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; + + // handleObj is passed to all event handlers + handleObj = jQuery.extend({ + type: type, + origType: tns[1], + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + quick: quickParse( selector ), + namespace: namespaces.join(".") + }, handleObjIn ); + + // Init the event handler queue if we're the first + handlers = events[ type ]; + if ( !handlers ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; + + // Only use addEventListener/attachEvent if the special events handler returns false + if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + // Bind the global event handler to the element + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle, false ); + + } else if ( elem.attachEvent ) { + elem.attachEvent( "on" + type, eventHandle ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } + + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } + + // Nullify elem to prevent memory leaks in IE + elem = null; + }, + + global: {}, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + + var elemData = jQuery.hasData( elem ) && jQuery._data( elem ), + t, tns, type, origType, namespaces, origCount, + j, events, special, handle, eventType, handleObj; + + if ( !elemData || !(events = elemData.events) ) { + return; + } + + // Once for each type.namespace in types; type may be omitted + types = jQuery.trim( hoverHack( types || "" ) ).split(" "); + for ( t = 0; t < types.length; t++ ) { + tns = rtypenamespace.exec( types[t] ) || []; + type = origType = tns[1]; + namespaces = tns[2]; + + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); + } + continue; + } + + special = jQuery.event.special[ type ] || {}; + type = ( selector? special.delegateType : special.bindType ) || type; + eventType = events[ type ] || []; + origCount = eventType.length; + namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null; + + // Remove matching events + for ( j = 0; j < eventType.length; j++ ) { + handleObj = eventType[ j ]; + + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !namespaces || namespaces.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + eventType.splice( j--, 1 ); + + if ( handleObj.selector ) { + eventType.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + } + + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( eventType.length === 0 && origCount !== eventType.length ) { + if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { + jQuery.removeEvent( elem, type, elemData.handle ); + } + + delete events[ type ]; + } + } + + // Remove the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + handle = elemData.handle; + if ( handle ) { + handle.elem = null; + } + + // removeData also checks for emptiness and clears the expando if empty + // so use it instead of delete + jQuery.removeData( elem, [ "events", "handle" ], true ); + } + }, + + // Events that are safe to short-circuit if no handlers are attached. + // Native DOM events should not be added, they may have inline handlers. + customEvent: { + "getData": true, + "setData": true, + "changeData": true + }, + + trigger: function( event, data, elem, onlyHandlers ) { + // Don't do events on text and comment nodes + if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) { + return; + } + + // Event object or event type + var type = event.type || event, + namespaces = [], + cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType; + + // focus/blur morphs to focusin/out; ensure we're not firing them right now + if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { + return; + } + + if ( type.indexOf( "!" ) >= 0 ) { + // Exclusive events trigger only for the exact event (no namespaces) + type = type.slice(0, -1); + exclusive = true; + } + + if ( type.indexOf( "." ) >= 0 ) { + // Namespaced trigger; create a regexp to match event type in handle() + namespaces = type.split("."); + type = namespaces.shift(); + namespaces.sort(); + } + + if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) { + // No jQuery handlers for this event type, and it can't have inline handlers + return; + } + + // Caller can pass in an Event, Object, or just an event type string + event = typeof event === "object" ? + // jQuery.Event object + event[ jQuery.expando ] ? event : + // Object literal + new jQuery.Event( type, event ) : + // Just the event type (string) + new jQuery.Event( type ); + + event.type = type; + event.isTrigger = true; + event.exclusive = exclusive; + event.namespace = namespaces.join( "." ); + event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null; + ontype = type.indexOf( ":" ) < 0 ? "on" + type : ""; + + // Handle a global trigger + if ( !elem ) { + + // TODO: Stop taunting the data cache; remove global events and always attach to document + cache = jQuery.cache; + for ( i in cache ) { + if ( cache[ i ].events && cache[ i ].events[ type ] ) { + jQuery.event.trigger( event, data, cache[ i ].handle.elem, true ); + } + } + return; + } + + // Clean up the event in case it is being reused + event.result = undefined; + if ( !event.target ) { + event.target = elem; + } + + // Clone any incoming data and prepend the event, creating the handler arg list + data = data != null ? jQuery.makeArray( data ) : []; + data.unshift( event ); + + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } + + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + eventPath = [[ elem, special.bindType || type ]]; + if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { + + bubbleType = special.delegateType || type; + cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode; + old = null; + for ( ; cur; cur = cur.parentNode ) { + eventPath.push([ cur, bubbleType ]); + old = cur; + } + + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( old && old === elem.ownerDocument ) { + eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]); + } + } + + // Fire handlers on the event path + for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) { + + cur = eventPath[i][0]; + event.type = eventPath[i][1]; + + handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); + if ( handle ) { + handle.apply( cur, data ); + } + // Note that this is a bare JS function and not a jQuery handler + handle = ontype && cur[ ontype ]; + if ( handle && jQuery.acceptData( cur ) && handle.apply( cur, data ) === false ) { + event.preventDefault(); + } + } + event.type = type; + + // If nobody prevented the default action, do it now + if ( !onlyHandlers && !event.isDefaultPrevented() ) { + + if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) && + !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) { + + // Call a native DOM method on the target with the same name name as the event. + // Can't use an .isFunction() check here because IE6/7 fails that test. + // Don't do default actions on window, that's where global variables be (#6170) + // IE<9 dies on focus/blur to hidden element (#1486) + if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) { + + // Don't re-trigger an onFOO event when we call its FOO() method + old = elem[ ontype ]; + + if ( old ) { + elem[ ontype ] = null; + } + + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + elem[ type ](); + jQuery.event.triggered = undefined; + + if ( old ) { + elem[ ontype ] = old; + } + } + } + } + + return event.result; + }, + + dispatch: function( event ) { + + // Make a writable jQuery.Event from the native event object + event = jQuery.event.fix( event || window.event ); + + var handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []), + delegateCount = handlers.delegateCount, + args = [].slice.call( arguments, 0 ), + run_all = !event.exclusive && !event.namespace, + handlerQueue = [], + i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related; + + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[0] = event; + event.delegateTarget = this; + + // Determine handlers that should run if there are delegated events + // Avoid disabled elements in IE (#6911) and non-left-click bubbling in Firefox (#3861) + if ( delegateCount && !event.target.disabled && !(event.button && event.type === "click") ) { + + // Pregenerate a single jQuery object for reuse with .is() + jqcur = jQuery(this); + jqcur.context = this.ownerDocument || this; + + for ( cur = event.target; cur != this; cur = cur.parentNode || this ) { + selMatch = {}; + matches = []; + jqcur[0] = cur; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + sel = handleObj.selector; + + if ( selMatch[ sel ] === undefined ) { + selMatch[ sel ] = ( + handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel ) + ); + } + if ( selMatch[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push({ elem: cur, matches: matches }); + } + } + } + + // Add the remaining (directly-bound) handlers + if ( handlers.length > delegateCount ) { + handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) }); + } + + // Run delegates first; they may want to stop propagation beneath us + for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) { + matched = handlerQueue[ i ]; + event.currentTarget = matched.elem; + + for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) { + handleObj = matched.matches[ j ]; + + // Triggered event must either 1) be non-exclusive and have no namespace, or + // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). + if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) { + + event.data = handleObj.data; + event.handleObj = handleObj; + + ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) + .apply( matched.elem, args ); + + if ( ret !== undefined ) { + event.result = ret; + if ( ret === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + return event.result; + }, + + // Includes some event props shared by KeyEvent and MouseEvent + // *** attrChange attrName relatedNode srcElement are not normalized, non-W3C, deprecated, will be removed in 1.8 *** + props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), + + fixHooks: {}, + + keyHooks: { + props: "char charCode key keyCode".split(" "), + filter: function( event, original ) { + + // Add which for key events + if ( event.which == null ) { + event.which = original.charCode != null ? original.charCode : original.keyCode; + } + + return event; + } + }, + + mouseHooks: { + props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + filter: function( event, original ) { + var eventDoc, doc, body, + button = original.button, + fromElement = original.fromElement; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && original.clientX != null ) { + eventDoc = event.target.ownerDocument || document; + doc = eventDoc.documentElement; + body = eventDoc.body; + + event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); + } + + // Add relatedTarget, if necessary + if ( !event.relatedTarget && fromElement ) { + event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } + + return event; + } + }, + + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; + } + + // Create a writable copy of the event object and normalize some properties + var i, prop, + originalEvent = event, + fixHook = jQuery.event.fixHooks[ event.type ] || {}, + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; + + event = jQuery.Event( originalEvent ); + + for ( i = copy.length; i; ) { + prop = copy[ --i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Fix target property, if necessary (#1925, IE 6/7/8 & Safari2) + if ( !event.target ) { + event.target = originalEvent.srcElement || document; + } + + // Target should not be a text node (#504, Safari) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + // For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8) + if ( event.metaKey === undefined ) { + event.metaKey = event.ctrlKey; + } + + return fixHook.filter? fixHook.filter( event, originalEvent ) : event; + }, + + special: { + ready: { + // Make sure the ready event is setup + setup: jQuery.bindReady + }, + + load: { + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + + focus: { + delegateType: "focusin" + }, + blur: { + delegateType: "focusout" + }, + + beforeunload: { + setup: function( data, namespaces, eventHandle ) { + // We only want to do this special case on windows + if ( jQuery.isWindow( this ) ) { + this.onbeforeunload = eventHandle; + } + }, + + teardown: function( namespaces, eventHandle ) { + if ( this.onbeforeunload === eventHandle ) { + this.onbeforeunload = null; + } + } + } + }, + + simulate: function( type, elem, event, bubble ) { + // Piggyback on a donor event to simulate a different one. + // Fake originalEvent to avoid donor's stopPropagation, but if the + // simulated event prevents default then we do the same on the donor. + var e = jQuery.extend( + new jQuery.Event(), + event, + { type: type, + isSimulated: true, + originalEvent: {} + } + ); + if ( bubble ) { + jQuery.event.trigger( e, null, elem ); + } else { + jQuery.event.dispatch.call( elem, e ); + } + if ( e.isDefaultPrevented() ) { + event.preventDefault(); + } + } +}; + +// Some plugins are using, but it's undocumented/deprecated and will be removed. +// The 1.7 special event interface should provide all the hooks needed now. +jQuery.event.handle = jQuery.event.dispatch; + +jQuery.removeEvent = document.removeEventListener ? + function( elem, type, handle ) { + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle, false ); + } + } : + function( elem, type, handle ) { + if ( elem.detachEvent ) { + elem.detachEvent( "on" + type, handle ); + } + }; + +jQuery.Event = function( src, props ) { + // Allow instantiation without the 'new' keyword + if ( !(this instanceof jQuery.Event) ) { + return new jQuery.Event( src, props ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false || + src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse; + + // Event type + } else { + this.type = src; + } + + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } + + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || jQuery.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +function returnFalse() { + return false; +} +function returnTrue() { + return true; +} + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + preventDefault: function() { + this.isDefaultPrevented = returnTrue; + + var e = this.originalEvent; + if ( !e ) { + return; + } + + // if preventDefault exists run it on the original event + if ( e.preventDefault ) { + e.preventDefault(); + + // otherwise set the returnValue property of the original event to false (IE) + } else { + e.returnValue = false; + } + }, + stopPropagation: function() { + this.isPropagationStopped = returnTrue; + + var e = this.originalEvent; + if ( !e ) { + return; + } + // if stopPropagation exists run it on the original event + if ( e.stopPropagation ) { + e.stopPropagation(); + } + // otherwise set the cancelBubble property of the original event to true (IE) + e.cancelBubble = true; + }, + stopImmediatePropagation: function() { + this.isImmediatePropagationStopped = returnTrue; + this.stopPropagation(); + }, + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse +}; + +// Create mouseenter/leave events using mouseover/out and event-time checks +jQuery.each({ + mouseenter: "mouseover", + mouseleave: "mouseout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var target = this, + related = event.relatedTarget, + handleObj = event.handleObj, + selector = handleObj.selector, + ret; + + // For mousenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || (related !== target && !jQuery.contains( target, related )) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; + } + }; +}); + +// IE submit delegation +if ( !jQuery.support.submitBubbles ) { + + jQuery.event.special.submit = { + setup: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } + + // Lazy-add a submit handler when a descendant form may potentially be submitted + jQuery.event.add( this, "click._submit keypress._submit", function( e ) { + // Node name check avoids a VML-related crash in IE (#9807) + var elem = e.target, + form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; + if ( form && !form._submit_attached ) { + jQuery.event.add( form, "submit._submit", function( event ) { + // If form was submitted by the user, bubble the event up the tree + if ( this.parentNode && !event.isTrigger ) { + jQuery.event.simulate( "submit", this.parentNode, event, true ); + } + }); + form._submit_attached = true; + } + }); + // return undefined since we don't need an event listener + }, + + teardown: function() { + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } + + // Remove delegated handlers; cleanData eventually reaps submit handlers attached above + jQuery.event.remove( this, "._submit" ); + } + }; +} + +// IE change delegation and checkbox/radio fix +if ( !jQuery.support.changeBubbles ) { + + jQuery.event.special.change = { + + setup: function() { + + if ( rformElems.test( this.nodeName ) ) { + // IE doesn't fire change on a check/radio until blur; trigger it on click + // after a propertychange. Eat the blur-change in special.change.handle. + // This still fires onchange a second time for check/radio after blur. + if ( this.type === "checkbox" || this.type === "radio" ) { + jQuery.event.add( this, "propertychange._change", function( event ) { + if ( event.originalEvent.propertyName === "checked" ) { + this._just_changed = true; + } + }); + jQuery.event.add( this, "click._change", function( event ) { + if ( this._just_changed && !event.isTrigger ) { + this._just_changed = false; + jQuery.event.simulate( "change", this, event, true ); + } + }); + } + return false; + } + // Delegated event; lazy-add a change handler on descendant inputs + jQuery.event.add( this, "beforeactivate._change", function( e ) { + var elem = e.target; + + if ( rformElems.test( elem.nodeName ) && !elem._change_attached ) { + jQuery.event.add( elem, "change._change", function( event ) { + if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { + jQuery.event.simulate( "change", this.parentNode, event, true ); + } + }); + elem._change_attached = true; + } + }); + }, + + handle: function( event ) { + var elem = event.target; + + // Swallow native change events from checkbox/radio, we already triggered them above + if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { + return event.handleObj.handler.apply( this, arguments ); + } + }, + + teardown: function() { + jQuery.event.remove( this, "._change" ); + + return rformElems.test( this.nodeName ); + } + }; +} + +// Create "bubbling" focus and blur events +if ( !jQuery.support.focusinBubbles ) { + jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { + + // Attach a single capturing handler while someone wants focusin/focusout + var attaches = 0, + handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); + }; + + jQuery.event.special[ fix ] = { + setup: function() { + if ( attaches++ === 0 ) { + document.addEventListener( orig, handler, true ); + } + }, + teardown: function() { + if ( --attaches === 0 ) { + document.removeEventListener( orig, handler, true ); + } + } + }; + }); +} + +jQuery.fn.extend({ + + on: function( types, selector, data, fn, /*INTERNAL*/ one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + // ( types-Object, data ) + data = selector; + selector = undefined; + } + for ( type in types ) { + this.on( type, selector, data, types[ type ], one ); + } + return this; + } + + if ( data == null && fn == null ) { + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return this; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return this.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + }); + }, + one: function( types, selector, data, fn ) { + return this.on.call( this, types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + if ( types && types.preventDefault && types.handleObj ) { + // ( event ) dispatched jQuery.Event + var handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace? handleObj.type + "." + handleObj.namespace : handleObj.type, + handleObj.selector, + handleObj.handler + ); + return this; + } + if ( typeof types === "object" ) { + // ( types-object [, selector] ) + for ( var type in types ) { + this.off( type, selector, types[ type ] ); + } + return this; + } + if ( selector === false || typeof selector === "function" ) { + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each(function() { + jQuery.event.remove( this, types, fn, selector ); + }); + }, + + bind: function( types, data, fn ) { + return this.on( types, null, data, fn ); + }, + unbind: function( types, fn ) { + return this.off( types, null, fn ); + }, + + live: function( types, data, fn ) { + jQuery( this.context ).on( types, this.selector, data, fn ); + return this; + }, + die: function( types, fn ) { + jQuery( this.context ).off( types, this.selector || "**", fn ); + return this; + }, + + delegate: function( selector, types, data, fn ) { + return this.on( types, selector, data, fn ); + }, + undelegate: function( selector, types, fn ) { + // ( namespace ) or ( selector, types [, fn] ) + return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector, fn ); + }, + + trigger: function( type, data ) { + return this.each(function() { + jQuery.event.trigger( type, data, this ); + }); + }, + triggerHandler: function( type, data ) { + if ( this[0] ) { + return jQuery.event.trigger( type, data, this[0], true ); + } + }, + + toggle: function( fn ) { + // Save reference to arguments for access in closure + var args = arguments, + guid = fn.guid || jQuery.guid++, + i = 0, + toggler = function( event ) { + // Figure out which function to execute + var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i; + jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 ); + + // Make sure that clicks stop + event.preventDefault(); + + // and execute the function + return args[ lastToggle ].apply( this, arguments ) || false; + }; + + // link all the functions, so any of them can unbind this click handler + toggler.guid = guid; + while ( i < args.length ) { + args[ i++ ].guid = guid; + } + + return this.click( toggler ); + }, + + hover: function( fnOver, fnOut ) { + return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); + } +}); + +jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + + "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + + "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) { + + // Handle event binding + jQuery.fn[ name ] = function( data, fn ) { + if ( fn == null ) { + fn = data; + data = null; + } + + return arguments.length > 0 ? + this.on( name, null, data, fn ) : + this.trigger( name ); + }; + + if ( jQuery.attrFn ) { + jQuery.attrFn[ name ] = true; + } + + if ( rkeyEvent.test( name ) ) { + jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks; + } + + if ( rmouseEvent.test( name ) ) { + jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks; + } +}); + + + +/*! + * Sizzle CSS Selector Engine + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){ + +var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, + expando = "sizcache" + (Math.random() + '').replace('.', ''), + done = 0, + toString = Object.prototype.toString, + hasDuplicate = false, + baseHasDuplicate = true, + rBackslash = /\\/g, + rReturn = /\r\n/g, + rNonWord = /\W/; + +// Here we check if the JavaScript engine is using some sort of +// optimization where it does not always call our comparision +// function. If that is the case, discard the hasDuplicate value. +// Thus far that includes Google Chrome. +[0, 0].sort(function() { + baseHasDuplicate = false; + return 0; +}); + +var Sizzle = function( selector, context, results, seed ) { + results = results || []; + context = context || document; + + var origContext = context; + + if ( context.nodeType !== 1 && context.nodeType !== 9 ) { + return []; + } + + if ( !selector || typeof selector !== "string" ) { + return results; + } + + var m, set, checkSet, extra, ret, cur, pop, i, + prune = true, + contextXML = Sizzle.isXML( context ), + parts = [], + soFar = selector; + + // Reset the position of the chunker regexp (start from head) + do { + chunker.exec( "" ); + m = chunker.exec( soFar ); + + if ( m ) { + soFar = m[3]; + + parts.push( m[1] ); + + if ( m[2] ) { + extra = m[3]; + break; + } + } + } while ( m ); + + if ( parts.length > 1 && origPOS.exec( selector ) ) { + + if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { + set = posProcess( parts[0] + parts[1], context, seed ); + + } else { + set = Expr.relative[ parts[0] ] ? + [ context ] : + Sizzle( parts.shift(), context ); + + while ( parts.length ) { + selector = parts.shift(); + + if ( Expr.relative[ selector ] ) { + selector += parts.shift(); + } + + set = posProcess( selector, set, seed ); + } + } + + } else { + // Take a shortcut and set the context if the root selector is an ID + // (but not if it'll be faster if the inner selector is an ID) + if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && + Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { + + ret = Sizzle.find( parts.shift(), context, contextXML ); + context = ret.expr ? + Sizzle.filter( ret.expr, ret.set )[0] : + ret.set[0]; + } + + if ( context ) { + ret = seed ? + { expr: parts.pop(), set: makeArray(seed) } : + Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); + + set = ret.expr ? + Sizzle.filter( ret.expr, ret.set ) : + ret.set; + + if ( parts.length > 0 ) { + checkSet = makeArray( set ); + + } else { + prune = false; + } + + while ( parts.length ) { + cur = parts.pop(); + pop = cur; + + if ( !Expr.relative[ cur ] ) { + cur = ""; + } else { + pop = parts.pop(); + } + + if ( pop == null ) { + pop = context; + } + + Expr.relative[ cur ]( checkSet, pop, contextXML ); + } + + } else { + checkSet = parts = []; + } + } + + if ( !checkSet ) { + checkSet = set; + } + + if ( !checkSet ) { + Sizzle.error( cur || selector ); + } + + if ( toString.call(checkSet) === "[object Array]" ) { + if ( !prune ) { + results.push.apply( results, checkSet ); + + } else if ( context && context.nodeType === 1 ) { + for ( i = 0; checkSet[i] != null; i++ ) { + if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) { + results.push( set[i] ); + } + } + + } else { + for ( i = 0; checkSet[i] != null; i++ ) { + if ( checkSet[i] && checkSet[i].nodeType === 1 ) { + results.push( set[i] ); + } + } + } + + } else { + makeArray( checkSet, results ); + } + + if ( extra ) { + Sizzle( extra, origContext, results, seed ); + Sizzle.uniqueSort( results ); + } + + return results; +}; + +Sizzle.uniqueSort = function( results ) { + if ( sortOrder ) { + hasDuplicate = baseHasDuplicate; + results.sort( sortOrder ); + + if ( hasDuplicate ) { + for ( var i = 1; i < results.length; i++ ) { + if ( results[i] === results[ i - 1 ] ) { + results.splice( i--, 1 ); + } + } + } + } + + return results; +}; + +Sizzle.matches = function( expr, set ) { + return Sizzle( expr, null, null, set ); +}; + +Sizzle.matchesSelector = function( node, expr ) { + return Sizzle( expr, null, null, [node] ).length > 0; +}; + +Sizzle.find = function( expr, context, isXML ) { + var set, i, len, match, type, left; + + if ( !expr ) { + return []; + } + + for ( i = 0, len = Expr.order.length; i < len; i++ ) { + type = Expr.order[i]; + + if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { + left = match[1]; + match.splice( 1, 1 ); + + if ( left.substr( left.length - 1 ) !== "\\" ) { + match[1] = (match[1] || "").replace( rBackslash, "" ); + set = Expr.find[ type ]( match, context, isXML ); + + if ( set != null ) { + expr = expr.replace( Expr.match[ type ], "" ); + break; + } + } + } + } + + if ( !set ) { + set = typeof context.getElementsByTagName !== "undefined" ? + context.getElementsByTagName( "*" ) : + []; + } + + return { set: set, expr: expr }; +}; + +Sizzle.filter = function( expr, set, inplace, not ) { + var match, anyFound, + type, found, item, filter, left, + i, pass, + old = expr, + result = [], + curLoop = set, + isXMLFilter = set && set[0] && Sizzle.isXML( set[0] ); + + while ( expr && set.length ) { + for ( type in Expr.filter ) { + if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { + filter = Expr.filter[ type ]; + left = match[1]; + + anyFound = false; + + match.splice(1,1); + + if ( left.substr( left.length - 1 ) === "\\" ) { + continue; + } + + if ( curLoop === result ) { + result = []; + } + + if ( Expr.preFilter[ type ] ) { + match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); + + if ( !match ) { + anyFound = found = true; + + } else if ( match === true ) { + continue; + } + } + + if ( match ) { + for ( i = 0; (item = curLoop[i]) != null; i++ ) { + if ( item ) { + found = filter( item, match, i, curLoop ); + pass = not ^ found; + + if ( inplace && found != null ) { + if ( pass ) { + anyFound = true; + + } else { + curLoop[i] = false; + } + + } else if ( pass ) { + result.push( item ); + anyFound = true; + } + } + } + } + + if ( found !== undefined ) { + if ( !inplace ) { + curLoop = result; + } + + expr = expr.replace( Expr.match[ type ], "" ); + + if ( !anyFound ) { + return []; + } + + break; + } + } + } + + // Improper expression + if ( expr === old ) { + if ( anyFound == null ) { + Sizzle.error( expr ); + + } else { + break; + } + } + + old = expr; + } + + return curLoop; +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Utility function for retreiving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +var getText = Sizzle.getText = function( elem ) { + var i, node, + nodeType = elem.nodeType, + ret = ""; + + if ( nodeType ) { + if ( nodeType === 1 || nodeType === 9 ) { + // Use textContent || innerText for elements + if ( typeof elem.textContent === 'string' ) { + return elem.textContent; + } else if ( typeof elem.innerText === 'string' ) { + // Replace IE's carriage returns + return elem.innerText.replace( rReturn, '' ); + } else { + // Traverse it's children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + } else { + + // If no nodeType, this is expected to be an array + for ( i = 0; (node = elem[i]); i++ ) { + // Do not traverse comment nodes + if ( node.nodeType !== 8 ) { + ret += getText( node ); + } + } + } + return ret; +}; + +var Expr = Sizzle.selectors = { + order: [ "ID", "NAME", "TAG" ], + + match: { + ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, + CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, + NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/, + ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/, + TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/, + CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/, + POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/, + PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/ + }, + + leftMatch: {}, + + attrMap: { + "class": "className", + "for": "htmlFor" + }, + + attrHandle: { + href: function( elem ) { + return elem.getAttribute( "href" ); + }, + type: function( elem ) { + return elem.getAttribute( "type" ); + } + }, + + relative: { + "+": function(checkSet, part){ + var isPartStr = typeof part === "string", + isTag = isPartStr && !rNonWord.test( part ), + isPartStrNotTag = isPartStr && !isTag; + + if ( isTag ) { + part = part.toLowerCase(); + } + + for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { + if ( (elem = checkSet[i]) ) { + while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} + + checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ? + elem || false : + elem === part; + } + } + + if ( isPartStrNotTag ) { + Sizzle.filter( part, checkSet, true ); + } + }, + + ">": function( checkSet, part ) { + var elem, + isPartStr = typeof part === "string", + i = 0, + l = checkSet.length; + + if ( isPartStr && !rNonWord.test( part ) ) { + part = part.toLowerCase(); + + for ( ; i < l; i++ ) { + elem = checkSet[i]; + + if ( elem ) { + var parent = elem.parentNode; + checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false; + } + } + + } else { + for ( ; i < l; i++ ) { + elem = checkSet[i]; + + if ( elem ) { + checkSet[i] = isPartStr ? + elem.parentNode : + elem.parentNode === part; + } + } + + if ( isPartStr ) { + Sizzle.filter( part, checkSet, true ); + } + } + }, + + "": function(checkSet, part, isXML){ + var nodeCheck, + doneName = done++, + checkFn = dirCheck; + + if ( typeof part === "string" && !rNonWord.test( part ) ) { + part = part.toLowerCase(); + nodeCheck = part; + checkFn = dirNodeCheck; + } + + checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML ); + }, + + "~": function( checkSet, part, isXML ) { + var nodeCheck, + doneName = done++, + checkFn = dirCheck; + + if ( typeof part === "string" && !rNonWord.test( part ) ) { + part = part.toLowerCase(); + nodeCheck = part; + checkFn = dirNodeCheck; + } + + checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML ); + } + }, + + find: { + ID: function( match, context, isXML ) { + if ( typeof context.getElementById !== "undefined" && !isXML ) { + var m = context.getElementById(match[1]); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + return m && m.parentNode ? [m] : []; + } + }, + + NAME: function( match, context ) { + if ( typeof context.getElementsByName !== "undefined" ) { + var ret = [], + results = context.getElementsByName( match[1] ); + + for ( var i = 0, l = results.length; i < l; i++ ) { + if ( results[i].getAttribute("name") === match[1] ) { + ret.push( results[i] ); + } + } + + return ret.length === 0 ? null : ret; + } + }, + + TAG: function( match, context ) { + if ( typeof context.getElementsByTagName !== "undefined" ) { + return context.getElementsByTagName( match[1] ); + } + } + }, + preFilter: { + CLASS: function( match, curLoop, inplace, result, not, isXML ) { + match = " " + match[1].replace( rBackslash, "" ) + " "; + + if ( isXML ) { + return match; + } + + for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { + if ( elem ) { + if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) { + if ( !inplace ) { + result.push( elem ); + } + + } else if ( inplace ) { + curLoop[i] = false; + } + } + } + + return false; + }, + + ID: function( match ) { + return match[1].replace( rBackslash, "" ); + }, + + TAG: function( match, curLoop ) { + return match[1].replace( rBackslash, "" ).toLowerCase(); + }, + + CHILD: function( match ) { + if ( match[1] === "nth" ) { + if ( !match[2] ) { + Sizzle.error( match[0] ); + } + + match[2] = match[2].replace(/^\+|\s*/g, ''); + + // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' + var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec( + match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" || + !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); + + // calculate the numbers (first)n+(last) including if they are negative + match[2] = (test[1] + (test[2] || 1)) - 0; + match[3] = test[3] - 0; + } + else if ( match[2] ) { + Sizzle.error( match[0] ); + } + + // TODO: Move to normal caching system + match[0] = done++; + + return match; + }, + + ATTR: function( match, curLoop, inplace, result, not, isXML ) { + var name = match[1] = match[1].replace( rBackslash, "" ); + + if ( !isXML && Expr.attrMap[name] ) { + match[1] = Expr.attrMap[name]; + } + + // Handle if an un-quoted value was used + match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" ); + + if ( match[2] === "~=" ) { + match[4] = " " + match[4] + " "; + } + + return match; + }, + + PSEUDO: function( match, curLoop, inplace, result, not ) { + if ( match[1] === "not" ) { + // If we're dealing with a complex expression, or a simple one + if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { + match[3] = Sizzle(match[3], null, null, curLoop); + + } else { + var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); + + if ( !inplace ) { + result.push.apply( result, ret ); + } + + return false; + } + + } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { + return true; + } + + return match; + }, + + POS: function( match ) { + match.unshift( true ); + + return match; + } + }, + + filters: { + enabled: function( elem ) { + return elem.disabled === false && elem.type !== "hidden"; + }, + + disabled: function( elem ) { + return elem.disabled === true; + }, + + checked: function( elem ) { + return elem.checked === true; + }, + + selected: function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + elem.parentNode.selectedIndex; + } + + return elem.selected === true; + }, + + parent: function( elem ) { + return !!elem.firstChild; + }, + + empty: function( elem ) { + return !elem.firstChild; + }, + + has: function( elem, i, match ) { + return !!Sizzle( match[3], elem ).length; + }, + + header: function( elem ) { + return (/h\d/i).test( elem.nodeName ); + }, + + text: function( elem ) { + var attr = elem.getAttribute( "type" ), type = elem.type; + // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) + // use getAttribute instead to test this case + return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null ); + }, + + radio: function( elem ) { + return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type; + }, + + checkbox: function( elem ) { + return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type; + }, + + file: function( elem ) { + return elem.nodeName.toLowerCase() === "input" && "file" === elem.type; + }, + + password: function( elem ) { + return elem.nodeName.toLowerCase() === "input" && "password" === elem.type; + }, + + submit: function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && "submit" === elem.type; + }, + + image: function( elem ) { + return elem.nodeName.toLowerCase() === "input" && "image" === elem.type; + }, + + reset: function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && "reset" === elem.type; + }, + + button: function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && "button" === elem.type || name === "button"; + }, + + input: function( elem ) { + return (/input|select|textarea|button/i).test( elem.nodeName ); + }, + + focus: function( elem ) { + return elem === elem.ownerDocument.activeElement; + } + }, + setFilters: { + first: function( elem, i ) { + return i === 0; + }, + + last: function( elem, i, match, array ) { + return i === array.length - 1; + }, + + even: function( elem, i ) { + return i % 2 === 0; + }, + + odd: function( elem, i ) { + return i % 2 === 1; + }, + + lt: function( elem, i, match ) { + return i < match[3] - 0; + }, + + gt: function( elem, i, match ) { + return i > match[3] - 0; + }, + + nth: function( elem, i, match ) { + return match[3] - 0 === i; + }, + + eq: function( elem, i, match ) { + return match[3] - 0 === i; + } + }, + filter: { + PSEUDO: function( elem, match, i, array ) { + var name = match[1], + filter = Expr.filters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + + } else if ( name === "contains" ) { + return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0; + + } else if ( name === "not" ) { + var not = match[3]; + + for ( var j = 0, l = not.length; j < l; j++ ) { + if ( not[j] === elem ) { + return false; + } + } + + return true; + + } else { + Sizzle.error( name ); + } + }, + + CHILD: function( elem, match ) { + var first, last, + doneName, parent, cache, + count, diff, + type = match[1], + node = elem; + + switch ( type ) { + case "only": + case "first": + while ( (node = node.previousSibling) ) { + if ( node.nodeType === 1 ) { + return false; + } + } + + if ( type === "first" ) { + return true; + } + + node = elem; + + case "last": + while ( (node = node.nextSibling) ) { + if ( node.nodeType === 1 ) { + return false; + } + } + + return true; + + case "nth": + first = match[2]; + last = match[3]; + + if ( first === 1 && last === 0 ) { + return true; + } + + doneName = match[0]; + parent = elem.parentNode; + + if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) { + count = 0; + + for ( node = parent.firstChild; node; node = node.nextSibling ) { + if ( node.nodeType === 1 ) { + node.nodeIndex = ++count; + } + } + + parent[ expando ] = doneName; + } + + diff = elem.nodeIndex - last; + + if ( first === 0 ) { + return diff === 0; + + } else { + return ( diff % first === 0 && diff / first >= 0 ); + } + } + }, + + ID: function( elem, match ) { + return elem.nodeType === 1 && elem.getAttribute("id") === match; + }, + + TAG: function( elem, match ) { + return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match; + }, + + CLASS: function( elem, match ) { + return (" " + (elem.className || elem.getAttribute("class")) + " ") + .indexOf( match ) > -1; + }, + + ATTR: function( elem, match ) { + var name = match[1], + result = Sizzle.attr ? + Sizzle.attr( elem, name ) : + Expr.attrHandle[ name ] ? + Expr.attrHandle[ name ]( elem ) : + elem[ name ] != null ? + elem[ name ] : + elem.getAttribute( name ), + value = result + "", + type = match[2], + check = match[4]; + + return result == null ? + type === "!=" : + !type && Sizzle.attr ? + result != null : + type === "=" ? + value === check : + type === "*=" ? + value.indexOf(check) >= 0 : + type === "~=" ? + (" " + value + " ").indexOf(check) >= 0 : + !check ? + value && result !== false : + type === "!=" ? + value !== check : + type === "^=" ? + value.indexOf(check) === 0 : + type === "$=" ? + value.substr(value.length - check.length) === check : + type === "|=" ? + value === check || value.substr(0, check.length + 1) === check + "-" : + false; + }, + + POS: function( elem, match, i, array ) { + var name = match[2], + filter = Expr.setFilters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + } + } + } +}; + +var origPOS = Expr.match.POS, + fescape = function(all, num){ + return "\\" + (num - 0 + 1); + }; + +for ( var type in Expr.match ) { + Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) ); + Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) ); +} + +var makeArray = function( array, results ) { + array = Array.prototype.slice.call( array, 0 ); + + if ( results ) { + results.push.apply( results, array ); + return results; + } + + return array; +}; + +// Perform a simple check to determine if the browser is capable of +// converting a NodeList to an array using builtin methods. +// Also verifies that the returned array holds DOM nodes +// (which is not the case in the Blackberry browser) +try { + Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType; + +// Provide a fallback method if it does not work +} catch( e ) { + makeArray = function( array, results ) { + var i = 0, + ret = results || []; + + if ( toString.call(array) === "[object Array]" ) { + Array.prototype.push.apply( ret, array ); + + } else { + if ( typeof array.length === "number" ) { + for ( var l = array.length; i < l; i++ ) { + ret.push( array[i] ); + } + + } else { + for ( ; array[i]; i++ ) { + ret.push( array[i] ); + } + } + } + + return ret; + }; +} + +var sortOrder, siblingCheck; + +if ( document.documentElement.compareDocumentPosition ) { + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { + return a.compareDocumentPosition ? -1 : 1; + } + + return a.compareDocumentPosition(b) & 4 ? -1 : 1; + }; + +} else { + sortOrder = function( a, b ) { + // The nodes are identical, we can exit early + if ( a === b ) { + hasDuplicate = true; + return 0; + + // Fallback to using sourceIndex (in IE) if it's available on both nodes + } else if ( a.sourceIndex && b.sourceIndex ) { + return a.sourceIndex - b.sourceIndex; + } + + var al, bl, + ap = [], + bp = [], + aup = a.parentNode, + bup = b.parentNode, + cur = aup; + + // If the nodes are siblings (or identical) we can do a quick check + if ( aup === bup ) { + return siblingCheck( a, b ); + + // If no parents were found then the nodes are disconnected + } else if ( !aup ) { + return -1; + + } else if ( !bup ) { + return 1; + } + + // Otherwise they're somewhere else in the tree so we need + // to build up a full list of the parentNodes for comparison + while ( cur ) { + ap.unshift( cur ); + cur = cur.parentNode; + } + + cur = bup; + + while ( cur ) { + bp.unshift( cur ); + cur = cur.parentNode; + } + + al = ap.length; + bl = bp.length; + + // Start walking down the tree looking for a discrepancy + for ( var i = 0; i < al && i < bl; i++ ) { + if ( ap[i] !== bp[i] ) { + return siblingCheck( ap[i], bp[i] ); + } + } + + // We ended someplace up the tree so do a sibling check + return i === al ? + siblingCheck( a, bp[i], -1 ) : + siblingCheck( ap[i], b, 1 ); + }; + + siblingCheck = function( a, b, ret ) { + if ( a === b ) { + return ret; + + var cur = a.nextSibling; + } + + while ( cur ) { + if ( cur === b ) { + return -1; + } + + cur = cur.nextSibling; + } + + return 1; + }; +} + +// Check to see if the browser returns elements by name when +// querying by getElementById (and provide a workaround) +(function(){ + // We're going to inject a fake input element with a specified name + var form = document.createElement("div"), + id = "script" + (new Date()).getTime(), + root = document.documentElement; + + form.innerHTML = ""; + + // Inject it into the root element, check its status, and remove it quickly + root.insertBefore( form, root.firstChild ); + + // The workaround has to do additional checks after a getElementById + // Which slows things down for other browsers (hence the branching) + if ( document.getElementById( id ) ) { + Expr.find.ID = function( match, context, isXML ) { + if ( typeof context.getElementById !== "undefined" && !isXML ) { + var m = context.getElementById(match[1]); + + return m ? + m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? + [m] : + undefined : + []; + } + }; + + Expr.filter.ID = function( elem, match ) { + var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); + + return elem.nodeType === 1 && node && node.nodeValue === match; + }; + } + + root.removeChild( form ); + + // release memory in IE + root = form = null; +})(); + +(function(){ + // Check to see if the browser returns only elements + // when doing getElementsByTagName("*") + + // Create a fake element + var div = document.createElement("div"); + div.appendChild( document.createComment("") ); + + // Make sure no comments are found + if ( div.getElementsByTagName("*").length > 0 ) { + Expr.find.TAG = function( match, context ) { + var results = context.getElementsByTagName( match[1] ); + + // Filter out possible comments + if ( match[1] === "*" ) { + var tmp = []; + + for ( var i = 0; results[i]; i++ ) { + if ( results[i].nodeType === 1 ) { + tmp.push( results[i] ); + } + } + + results = tmp; + } + + return results; + }; + } + + // Check to see if an attribute returns normalized href attributes + div.innerHTML = ""; + + if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && + div.firstChild.getAttribute("href") !== "#" ) { + + Expr.attrHandle.href = function( elem ) { + return elem.getAttribute( "href", 2 ); + }; + } + + // release memory in IE + div = null; +})(); + +if ( document.querySelectorAll ) { + (function(){ + var oldSizzle = Sizzle, + div = document.createElement("div"), + id = "__sizzle__"; + + div.innerHTML = "

      "; + + // Safari can't handle uppercase or unicode characters when + // in quirks mode. + if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { + return; + } + + Sizzle = function( query, context, extra, seed ) { + context = context || document; + + // Only use querySelectorAll on non-XML documents + // (ID selectors don't work in non-HTML documents) + if ( !seed && !Sizzle.isXML(context) ) { + // See if we find a selector to speed up + var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query ); + + if ( match && (context.nodeType === 1 || context.nodeType === 9) ) { + // Speed-up: Sizzle("TAG") + if ( match[1] ) { + return makeArray( context.getElementsByTagName( query ), extra ); + + // Speed-up: Sizzle(".CLASS") + } else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) { + return makeArray( context.getElementsByClassName( match[2] ), extra ); + } + } + + if ( context.nodeType === 9 ) { + // Speed-up: Sizzle("body") + // The body element only exists once, optimize finding it + if ( query === "body" && context.body ) { + return makeArray( [ context.body ], extra ); + + // Speed-up: Sizzle("#ID") + } else if ( match && match[3] ) { + var elem = context.getElementById( match[3] ); + + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id === match[3] ) { + return makeArray( [ elem ], extra ); + } + + } else { + return makeArray( [], extra ); + } + } + + try { + return makeArray( context.querySelectorAll(query), extra ); + } catch(qsaError) {} + + // qSA works strangely on Element-rooted queries + // We can work around this by specifying an extra ID on the root + // and working up from there (Thanks to Andrew Dupont for the technique) + // IE 8 doesn't work on object elements + } else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + var oldContext = context, + old = context.getAttribute( "id" ), + nid = old || id, + hasParent = context.parentNode, + relativeHierarchySelector = /^\s*[+~]/.test( query ); + + if ( !old ) { + context.setAttribute( "id", nid ); + } else { + nid = nid.replace( /'/g, "\\$&" ); + } + if ( relativeHierarchySelector && hasParent ) { + context = context.parentNode; + } + + try { + if ( !relativeHierarchySelector || hasParent ) { + return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra ); + } + + } catch(pseudoError) { + } finally { + if ( !old ) { + oldContext.removeAttribute( "id" ); + } + } + } + } + + return oldSizzle(query, context, extra, seed); + }; + + for ( var prop in oldSizzle ) { + Sizzle[ prop ] = oldSizzle[ prop ]; + } + + // release memory in IE + div = null; + })(); +} + +(function(){ + var html = document.documentElement, + matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector; + + if ( matches ) { + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9 fails this) + var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ), + pseudoWorks = false; + + try { + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( document.documentElement, "[test!='']:sizzle" ); + + } catch( pseudoError ) { + pseudoWorks = true; + } + + Sizzle.matchesSelector = function( node, expr ) { + // Make sure that attribute selectors are quoted + expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']"); + + if ( !Sizzle.isXML( node ) ) { + try { + if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) { + var ret = matches.call( node, expr ); + + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || !disconnectedMatch || + // As well, disconnected nodes are said to be in a document + // fragment in IE 9, so check for that + node.document && node.document.nodeType !== 11 ) { + return ret; + } + } + } catch(e) {} + } + + return Sizzle(expr, null, null, [node]).length > 0; + }; + } +})(); + +(function(){ + var div = document.createElement("div"); + + div.innerHTML = "
      "; + + // Opera can't find a second classname (in 9.6) + // Also, make sure that getElementsByClassName actually exists + if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) { + return; + } + + // Safari caches class attributes, doesn't catch changes (in 3.2) + div.lastChild.className = "e"; + + if ( div.getElementsByClassName("e").length === 1 ) { + return; + } + + Expr.order.splice(1, 0, "CLASS"); + Expr.find.CLASS = function( match, context, isXML ) { + if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { + return context.getElementsByClassName(match[1]); + } + }; + + // release memory in IE + div = null; +})(); + +function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + + if ( elem ) { + var match = false; + + elem = elem[dir]; + + while ( elem ) { + if ( elem[ expando ] === doneName ) { + match = checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType === 1 && !isXML ){ + elem[ expando ] = doneName; + elem.sizset = i; + } + + if ( elem.nodeName.toLowerCase() === cur ) { + match = elem; + break; + } + + elem = elem[dir]; + } + + checkSet[i] = match; + } + } +} + +function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + + if ( elem ) { + var match = false; + + elem = elem[dir]; + + while ( elem ) { + if ( elem[ expando ] === doneName ) { + match = checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType === 1 ) { + if ( !isXML ) { + elem[ expando ] = doneName; + elem.sizset = i; + } + + if ( typeof cur !== "string" ) { + if ( elem === cur ) { + match = true; + break; + } + + } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { + match = elem; + break; + } + } + + elem = elem[dir]; + } + + checkSet[i] = match; + } + } +} + +if ( document.documentElement.contains ) { + Sizzle.contains = function( a, b ) { + return a !== b && (a.contains ? a.contains(b) : true); + }; + +} else if ( document.documentElement.compareDocumentPosition ) { + Sizzle.contains = function( a, b ) { + return !!(a.compareDocumentPosition(b) & 16); + }; + +} else { + Sizzle.contains = function() { + return false; + }; +} + +Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; + + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +var posProcess = function( selector, context, seed ) { + var match, + tmpSet = [], + later = "", + root = context.nodeType ? [context] : context; + + // Position selectors must be done after the filter + // And so must :not(positional) so we move all PSEUDOs to the end + while ( (match = Expr.match.PSEUDO.exec( selector )) ) { + later += match[0]; + selector = selector.replace( Expr.match.PSEUDO, "" ); + } + + selector = Expr.relative[selector] ? selector + "*" : selector; + + for ( var i = 0, l = root.length; i < l; i++ ) { + Sizzle( selector, root[i], tmpSet, seed ); + } + + return Sizzle.filter( later, tmpSet ); +}; + +// EXPOSE +// Override sizzle attribute retrieval +Sizzle.attr = jQuery.attr; +Sizzle.selectors.attrMap = {}; +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; +jQuery.expr[":"] = jQuery.expr.filters; +jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; + + +})(); + + +var runtil = /Until$/, + rparentsprev = /^(?:parents|prevUntil|prevAll)/, + // Note: This RegExp should be improved, or likely pulled from Sizzle + rmultiselector = /,/, + isSimple = /^.[^:#\[\.,]*$/, + slice = Array.prototype.slice, + POS = jQuery.expr.match.POS, + // methods guaranteed to produce a unique set when starting from a unique set + guaranteedUnique = { + children: true, + contents: true, + next: true, + prev: true + }; + +jQuery.fn.extend({ + find: function( selector ) { + var self = this, + i, l; + + if ( typeof selector !== "string" ) { + return jQuery( selector ).filter(function() { + for ( i = 0, l = self.length; i < l; i++ ) { + if ( jQuery.contains( self[ i ], this ) ) { + return true; + } + } + }); + } + + var ret = this.pushStack( "", "find", selector ), + length, n, r; + + for ( i = 0, l = this.length; i < l; i++ ) { + length = ret.length; + jQuery.find( selector, this[i], ret ); + + if ( i > 0 ) { + // Make sure that the results are unique + for ( n = length; n < ret.length; n++ ) { + for ( r = 0; r < length; r++ ) { + if ( ret[r] === ret[n] ) { + ret.splice(n--, 1); + break; + } + } + } + } + } + + return ret; + }, + + has: function( target ) { + var targets = jQuery( target ); + return this.filter(function() { + for ( var i = 0, l = targets.length; i < l; i++ ) { + if ( jQuery.contains( this, targets[i] ) ) { + return true; + } + } + }); + }, + + not: function( selector ) { + return this.pushStack( winnow(this, selector, false), "not", selector); + }, + + filter: function( selector ) { + return this.pushStack( winnow(this, selector, true), "filter", selector ); + }, + + is: function( selector ) { + return !!selector && ( + typeof selector === "string" ? + // If this is a positional selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + POS.test( selector ) ? + jQuery( selector, this.context ).index( this[0] ) >= 0 : + jQuery.filter( selector, this ).length > 0 : + this.filter( selector ).length > 0 ); + }, + + closest: function( selectors, context ) { + var ret = [], i, l, cur = this[0]; + + // Array (deprecated as of jQuery 1.7) + if ( jQuery.isArray( selectors ) ) { + var level = 1; + + while ( cur && cur.ownerDocument && cur !== context ) { + for ( i = 0; i < selectors.length; i++ ) { + + if ( jQuery( cur ).is( selectors[ i ] ) ) { + ret.push({ selector: selectors[ i ], elem: cur, level: level }); + } + } + + cur = cur.parentNode; + level++; + } + + return ret; + } + + // String + var pos = POS.test( selectors ) || typeof selectors !== "string" ? + jQuery( selectors, context || this.context ) : + 0; + + for ( i = 0, l = this.length; i < l; i++ ) { + cur = this[i]; + + while ( cur ) { + if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) { + ret.push( cur ); + break; + + } else { + cur = cur.parentNode; + if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) { + break; + } + } + } + } + + ret = ret.length > 1 ? jQuery.unique( ret ) : ret; + + return this.pushStack( ret, "closest", selectors ); + }, + + // Determine the position of an element within + // the matched set of elements + index: function( elem ) { + + // No argument, return index in parent + if ( !elem ) { + return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1; + } + + // index in selector + if ( typeof elem === "string" ) { + return jQuery.inArray( this[0], jQuery( elem ) ); + } + + // Locate the position of the desired element + return jQuery.inArray( + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[0] : elem, this ); + }, + + add: function( selector, context ) { + var set = typeof selector === "string" ? + jQuery( selector, context ) : + jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ), + all = jQuery.merge( this.get(), set ); + + return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? + all : + jQuery.unique( all ) ); + }, + + andSelf: function() { + return this.add( this.prevObject ); + } +}); + +// A painfully simple check to see if an element is disconnected +// from a document (should be improved, where feasible). +function isDisconnected( node ) { + return !node || !node.parentNode || node.parentNode.nodeType === 11; +} + +jQuery.each({ + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return jQuery.dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, i, until ) { + return jQuery.dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return jQuery.nth( elem, 2, "nextSibling" ); + }, + prev: function( elem ) { + return jQuery.nth( elem, 2, "previousSibling" ); + }, + nextAll: function( elem ) { + return jQuery.dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return jQuery.dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, i, until ) { + return jQuery.dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, i, until ) { + return jQuery.dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return jQuery.sibling( elem.parentNode.firstChild, elem ); + }, + children: function( elem ) { + return jQuery.sibling( elem.firstChild ); + }, + contents: function( elem ) { + return jQuery.nodeName( elem, "iframe" ) ? + elem.contentDocument || elem.contentWindow.document : + jQuery.makeArray( elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var ret = jQuery.map( this, fn, until ); + + if ( !runtil.test( name ) ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + ret = jQuery.filter( selector, ret ); + } + + ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret; + + if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) { + ret = ret.reverse(); + } + + return this.pushStack( ret, name, slice.call( arguments ).join(",") ); + }; +}); + +jQuery.extend({ + filter: function( expr, elems, not ) { + if ( not ) { + expr = ":not(" + expr + ")"; + } + + return elems.length === 1 ? + jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : + jQuery.find.matches(expr, elems); + }, + + dir: function( elem, dir, until ) { + var matched = [], + cur = elem[ dir ]; + + while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { + if ( cur.nodeType === 1 ) { + matched.push( cur ); + } + cur = cur[dir]; + } + return matched; + }, + + nth: function( cur, result, dir, elem ) { + result = result || 1; + var num = 0; + + for ( ; cur; cur = cur[dir] ) { + if ( cur.nodeType === 1 && ++num === result ) { + break; + } + } + + return cur; + }, + + sibling: function( n, elem ) { + var r = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + r.push( n ); + } + } + + return r; + } +}); + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, keep ) { + + // Can't pass null or undefined to indexOf in Firefox 4 + // Set to 0 to skip string check + qualifier = qualifier || 0; + + if ( jQuery.isFunction( qualifier ) ) { + return jQuery.grep(elements, function( elem, i ) { + var retVal = !!qualifier.call( elem, i, elem ); + return retVal === keep; + }); + + } else if ( qualifier.nodeType ) { + return jQuery.grep(elements, function( elem, i ) { + return ( elem === qualifier ) === keep; + }); + + } else if ( typeof qualifier === "string" ) { + var filtered = jQuery.grep(elements, function( elem ) { + return elem.nodeType === 1; + }); + + if ( isSimple.test( qualifier ) ) { + return jQuery.filter(qualifier, filtered, !keep); + } else { + qualifier = jQuery.filter( qualifier, filtered ); + } + } + + return jQuery.grep(elements, function( elem, i ) { + return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep; + }); +} + + + + +function createSafeFragment( document ) { + var list = nodeNames.split( "|" ), + safeFrag = document.createDocumentFragment(); + + if ( safeFrag.createElement ) { + while ( list.length ) { + safeFrag.createElement( + list.pop() + ); + } + } + return safeFrag; +} + +var nodeNames = "abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|" + + "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", + rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, + rleadingWhitespace = /^\s+/, + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, + rtagName = /<([\w:]+)/, + rtbody = /", "" ], + legend: [ 1, "
      ", "
      " ], + thead: [ 1, "", "
      " ], + tr: [ 2, "", "
      " ], + td: [ 3, "", "
      " ], + col: [ 2, "", "
      " ], + area: [ 1, "", "" ], + _default: [ 0, "", "" ] + }, + safeFragment = createSafeFragment( document ); + +wrapMap.optgroup = wrapMap.option; +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + +// IE can't serialize and - - - + diff --git a/docs/components.html b/docs/components.html index 11d83c51a..9c683b9b2 100644 --- a/docs/components.html +++ b/docs/components.html @@ -814,18 +814,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita - - - - + diff --git a/docs/index.html b/docs/index.html index 55a75b1bf..1b7edb8c5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -107,19 +107,20 @@

      Built with Bootstrap

      -
        -
      • - +

        For even more sites built with Bootstrap, visit the unofficial Tumblr.

        +
          +
        • + Kippt
          • -
        • - +
        • + Fleetio
          • -
        • - +
        • + JS Hint
          • @@ -233,27 +234,7 @@ - - - - + diff --git a/docs/less.html b/docs/less.html index 52de8b6aa..e004bc24c 100644 --- a/docs/less.html +++ b/docs/less.html @@ -466,18 +466,7 @@ - - - - + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 7431ae58b..473553412 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -371,29 +371,7 @@ - - - - - - + diff --git a/docs/upgrading.html b/docs/upgrading.html index 60c9c325b..3e5a14a8a 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -99,21 +99,14 @@
        • Added button bar options
        • + - - - +
      - - - - + diff --git a/lib/bootstrap.less b/lib/bootstrap.less index ffad35913..a871a7cd4 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -27,6 +27,7 @@ // Temp catchall for what's missing thus far @import "patterns.less"; +@import "dropdowns.less"; @import "tabs-pills.less"; @import "breadcrumbs.less"; @import "pagination.less"; diff --git a/lib/dropdowns.less b/lib/dropdowns.less new file mode 100644 index 000000000..7436f6a2c --- /dev/null +++ b/lib/dropdowns.less @@ -0,0 +1,94 @@ +// Dropdown Menus +// Use the .menu class on any
    1. element within the topbar or ul.tabs and you'll get some superfancy dropdowns +.dropdown { + position: relative; +} +// The link that is clicked to toggle the dropdown +.dropdown-toggle:after { + display: inline-block; + width: 0; + height: 0; + margin-top: 8px; + margin-left: 6px; + text-indent: -99999px; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid @white; + .opacity(30); + content: "↓"; +} +.dropdown:hover .dropdown-toggle:after { + .opacity(100); +} +// The dropdown menu (ul) +.dropdown-menu { + position: absolute; + top: 40px; + z-index: 900; + float: left; + display: none; // None by default, but block on "open" of the menu + min-width: 160px; + max-width: 220px; + _width: 160px; + padding: 6px 0; + margin-left: 0; // override default ul styles + margin-right: 0; + background-color: @white; + border-color: #999; + border-color: rgba(0,0,0,.2); + border-style: solid; + border-width: 0 1px 1px; + .border-radius(0 0 6px 6px); + .box-shadow(0 2px 4px rgba(0,0,0,.2)); + .background-clip(padding-box); + zoom: 1; // do we need this? + + // Unfloat any li's to make them stack + li { + float: none; + display: block; + background-color: none; + } + // Dividers (basically an hr) within the dropdown + .divider { + height: 1px; + margin: 5px 0; + overflow: hidden; + background-color: #eee; + border-bottom: 1px solid @white; + } +} + +.topbar .dropdown-menu, .dropdown-menu { + // Links within the dropdown menu + a { + display: block; + padding: 4px 15px; + clear: both; + font-weight: normal; + line-height: 18px; + color: @gray; + text-shadow: 0 1px 0 @white; + // Hover state + &:hover { + color: @grayDark; + text-decoration: none; + #gradient > .vertical(#eeeeee, #dddddd); + @shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025); + .box-shadow(@shadow); + } + } +} + +// Open state for the dropdown +.dropdown.open { + .dropdown-toggle { + color: @white; + background: #ccc; + background: rgba(0,0,0,.3); + } + .dropdown-menu { + display: block; + } +} diff --git a/lib/patterns.less b/lib/patterns.less index ec717e030..44c427adf 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -401,7 +401,7 @@ footer { cursor: pointer; &:hover { - color: #333; + color: @grayDark; text-decoration: none; background-position: 0 -15px; } @@ -414,6 +414,7 @@ footer { // Primary Button Type &.primary { color: @white; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); .gradientBar(@blue, @blueDark) } -- cgit v1.2.3 From c854ed167ce37d6a008723c78f2e6336211fff69 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:26:21 -0600 Subject: rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones --- bootstrap.css | 2 +- docs/assets/css/docs.css | 2 +- lib/bootstrap.less | 2 +- lib/media-grids.less | 33 --------------------------------- lib/thumbnails.less | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 lib/media-grids.less create mode 100644 lib/thumbnails.less diff --git a/bootstrap.css b/bootstrap.css index 74849e66b..c7f2dfc6a 100644 --- a/bootstrap.css +++ b/bootstrap.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: Wed Dec 21 16:21:54 CST 2011 + * Date: Wed Dec 21 16:26:02 CST 2011 */ html, body { margin: 0; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 5ed38bb47..20ea50d6f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -387,7 +387,7 @@ h2 + table { .example-sites { margin-left: 0; } - .example-sites a { + .example-sites > li { float: none; display: block; max-width: 300px; diff --git a/lib/bootstrap.less b/lib/bootstrap.less index a871a7cd4..e05a966ad 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -34,7 +34,7 @@ @import "modals.less"; @import "twipsy.less"; @import "popovers.less"; -@import "media-grids.less"; +@import "thumbnails.less"; // Responsive @import "responsive.less"; \ No newline at end of file diff --git a/lib/media-grids.less b/lib/media-grids.less deleted file mode 100644 index 12626df3f..000000000 --- a/lib/media-grids.less +++ /dev/null @@ -1,33 +0,0 @@ -// THUMBNAILS -// ---------- - -.thumbnails { - margin-left: -20px; - margin-bottom: 0; - list-style: none; - .clearfix(); -} -.thumbnails > li { - float: left; - margin: 0 0 20px 20px; -} -.thumbnail { - display: block; - line-height: 1; - border: 1px solid #ddd; - .border-radius(4px); - .box-shadow(0 1px 1px rgba(0,0,0,.075)); -} -// Add a hover state for linked versions only -a.thumbnail:hover { - border-color: @linkColor; - .box-shadow(0 1px 4px rgba(0,105,214,.25)); -} -// Images and captions -.thumbnail > img { - display: block; - margin: 4px; -} -.thumbnail .caption { - padding: 9px; -} diff --git a/lib/thumbnails.less b/lib/thumbnails.less new file mode 100644 index 000000000..12626df3f --- /dev/null +++ b/lib/thumbnails.less @@ -0,0 +1,33 @@ +// THUMBNAILS +// ---------- + +.thumbnails { + margin-left: -20px; + margin-bottom: 0; + list-style: none; + .clearfix(); +} +.thumbnails > li { + float: left; + margin: 0 0 20px 20px; +} +.thumbnail { + display: block; + line-height: 1; + border: 1px solid #ddd; + .border-radius(4px); + .box-shadow(0 1px 1px rgba(0,0,0,.075)); +} +// Add a hover state for linked versions only +a.thumbnail:hover { + border-color: @linkColor; + .box-shadow(0 1px 4px rgba(0,105,214,.25)); +} +// Images and captions +.thumbnail > img { + display: block; + margin: 4px; +} +.thumbnail .caption { + padding: 9px; +} -- cgit v1.2.3 From af5793e1cd358862cf510a54dda2476b95a26ca8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 16:41:46 -0600 Subject: fix mobile example sites, remove unused JS from docs index --- docs/assets/css/docs.css | 5 ++++- docs/index.html | 24 ------------------------ 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 20ea50d6f..b3c464941 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -315,7 +315,7 @@ h2 + table { /* Example sites showcase */ .example-sites img { - width: 290px; + max-width: 290px; } .built-with { margin: -18px 0 27px; @@ -393,6 +393,9 @@ h2 + table { max-width: 300px; margin: 0 auto 18px; } + .example-sites img { + max-width: 270px; + } table code { white-space: normal; diff --git a/docs/index.html b/docs/index.html index 1b7edb8c5..9cad06271 100644 --- a/docs/index.html +++ b/docs/index.html @@ -124,23 +124,6 @@ JS Hint
      2. -

    Designed for everyone, everywhere

    @@ -235,13 +218,6 @@ - - - - - - - -- cgit v1.2.3 From 00cbadf9943fea6a196cc01c7705d7f2c012bfa1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 18:21:55 -0600 Subject: update thumbnails to keep images from going past edges of thumbnails --- bootstrap.css | 5 +++-- bootstrap.min.css | 4 ++-- lib/thumbnails.less | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index c7f2dfc6a..3fa776fcb 100644 --- a/bootstrap.css +++ b/bootstrap.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: Wed Dec 21 16:26:02 CST 2011 + * Date: Wed Dec 21 18:20:33 CST 2011 */ html, body { margin: 0; @@ -2615,6 +2615,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .thumbnail { display: block; + padding: 4px; line-height: 1; border: 1px solid #ddd; -webkit-border-radius: 4px; @@ -2632,7 +2633,7 @@ a.thumbnail:hover { } .thumbnail > img { display: block; - margin: 4px; + max-width: 100%; } .thumbnail .caption { padding: 9px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 728a48a12..71996816d 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -338,9 +338,9 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .thumbnails{margin-left:-20px;margin-bottom:0;list-style:none;zoom:1;}.thumbnails:before,.thumbnails:after{display:table;*display:inline;content:"";zoom:1;} .thumbnails:after{clear:both;} .thumbnails>li{float:left;margin:0 0 20px 20px;} -.thumbnail{display:block;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);} +.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);} a.thumbnail:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} -.thumbnail>img{display:block;margin:4px;} +.thumbnail>img{display:block;max-width:100%;} .thumbnail .caption{padding:9px;} .hidden{display:none;visibility:hidden;} @media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} diff --git a/lib/thumbnails.less b/lib/thumbnails.less index 12626df3f..9e25f5027 100644 --- a/lib/thumbnails.less +++ b/lib/thumbnails.less @@ -13,6 +13,7 @@ } .thumbnail { display: block; + padding: 4px; line-height: 1; border: 1px solid #ddd; .border-radius(4px); @@ -26,7 +27,7 @@ a.thumbnail:hover { // Images and captions .thumbnail > img { display: block; - margin: 4px; + max-width: 100%; } .thumbnail .caption { padding: 9px; -- cgit v1.2.3 From 12a0d69454a2831031035d19237d36d38bb2c2a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 18:38:03 -0600 Subject: fix dropdowns in components docs page --- docs/components.html | 30 +++++++++++++++--------------- docs/javascript.html | 23 ++++++----------------- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/docs/components.html b/docs/components.html index 9c683b9b2..2f359ab57 100644 --- a/docs/components.html +++ b/docs/components.html @@ -22,6 +22,18 @@ + + + + + + + + + + + + @@ -230,7 +242,7 @@

    Navbar

    Fixed navbar

    -
    +
    Project Name @@ -240,7 +252,7 @@
  • Link
  • Link
  • - Dropdown + Dropdown
    • - - - - - - - - - - - - diff --git a/docs/javascript.html b/docs/javascript.html index 568991969..91fe94910 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -26,17 +26,6 @@ - - - @@ -147,7 +136,7 @@ bootstrap-popover.js - The popover plugin provides a simple interface for adding popovers to your application. It extends the boostrap-twipsy.js plugin, so be sure to grab that file as well when including popovers in your project! + The popover plugin provides a simple interface for adding popovers to your application. It extends the bootstrap-twipsy.js plugin, so be sure to grab that file as well when including popovers in your project! bootstrap-button.js @@ -306,7 +295,7 @@ $('#myModal').bind('hidden', function () { Download
    -

    Using boostrap-dropdown.js

    +

    Using bootstrap-dropdown.js

    $('.dropdown-toggle').dropdown()

    Markup

    To quickly add dropdown functionality to any element just add data-toggle="dropdown". Any valid bootstrap dropdown will automatically be activated.

    @@ -380,7 +369,7 @@ $('#myModal').bind('hidden', function () { Download
    -

    Using boostrap-scrollspy.js

    +

    Using bootstrap-scrollspy.js

    $('#navbar').dropdown()

    Markup

    To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body). @@ -454,7 +443,7 @@ $('#myModal').bind('hidden', function () { Download

    -

    Using boostrap-tab.js

    +

    Using bootstrap-tab.js

    $('#myTab').tab('show')

    Markup

    You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.

    @@ -651,11 +640,11 @@ $('a[data-toggle="tab"]').bind('shown', function (e) {
    -

    The popover plugin provides a simple interface for adding popovers to your application. It extends the boostrap-twipsy.js plugin, so be sure to grab that file as well when including popovers in your project!

    +

    The popover plugin provides a simple interface for adding popovers to your application. It extends the bootstrap-twipsy.js plugin, so be sure to grab that file as well when including popovers in your project!

    Download
    -

    Using boostrap-popover.js

    +

    Using bootstrap-popover.js

    $('#example').popover(options)

    Options

    -- cgit v1.2.3 From 369cedd87c4447241ce2a73ed6c8414a4cd8bdf8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 19:31:01 -0600 Subject: update comment on select bg bug and confirmed it was fixed, scoped responsive .span* to .row --- bootstrap.css | 4 ++-- bootstrap.min.css | 2 +- lib/forms.less | 2 +- lib/responsive.less | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 354f534b2..fbd909de3 100644 --- a/bootstrap.css +++ b/bootstrap.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: Wed Dec 21 18:38:56 CST 2011 + * Date: Wed Dec 21 19:30:30 CST 2011 */ html, body { margin: 0; @@ -2695,7 +2695,7 @@ a.thumbnail:hover { .row { margin-left: 0; } - [class*="span"] { + .row > [class*="span"] { float: none; display: block; width: auto; diff --git a/bootstrap.min.css b/bootstrap.min.css index 1fb1d4f32..e6cf50d16 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -351,4 +351,4 @@ a.thumbnail:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, .thumbnail>img{display:block;max-width:100%;} .thumbnail .caption{padding:9px;} .hidden{display:none;visibility:hidden;} -@media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} +@media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} diff --git a/lib/forms.less b/lib/forms.less index 64e77fdb4..84fddd7d1 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -93,7 +93,7 @@ input[type=file] { line-height: @baseLineHeight * 1.5; } -// Chrome on Linux needs background color +// Chrome on Linux and Mobile Safari need background-color select { background-color: @white; } diff --git a/lib/responsive.less b/lib/responsive.less index c74f6b98e..d8b453d06 100644 --- a/lib/responsive.less +++ b/lib/responsive.less @@ -60,7 +60,7 @@ margin-left: 0; } // Make all columns even - [class*="span"] { + .row > [class*="span"] { float: none; display: block; width: auto; -- cgit v1.2.3 From 690d3f4d1aeb97a76d22a4dfe056e33606e0bd94 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 19:32:14 -0600 Subject: remove inline input field CSS since that's not required as all inputs are inline-block anyway --- bootstrap.css | 17 +---------------- bootstrap.min.css | 4 ---- lib/forms.less | 21 --------------------- 3 files changed, 1 insertion(+), 41 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index fbd909de3..2ea7a8fbe 100644 --- a/bootstrap.css +++ b/bootstrap.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: Wed Dec 21 19:30:30 CST 2011 + * Date: Wed Dec 21 19:31:39 CST 2011 */ html, body { margin: 0; @@ -904,21 +904,6 @@ textarea[readonly] { display: block; max-width: 600px; } -.inline-inputs { - color: #808080; -} -.inline-inputs span, .inline-inputs input { - display: inline-block; -} -.inline-inputs input.mini { - width: 60px; -} -.inline-inputs input.small { - width: 90px; -} -.inline-inputs span { - padding: 0 2px 0 1px; -} .input-prepend, .input-append { overflow: hidden; } diff --git a/bootstrap.min.css b/bootstrap.min.css index e6cf50d16..f6587dd87 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -146,10 +146,6 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .help-text{margin-top:5px;margin-bottom:0;color:#bfbfbf;} .help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;} .help-block{display:block;max-width:600px;} -.inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input{display:inline-block;} -.inline-inputs input.mini{width:60px;} -.inline-inputs input.small{width:90px;} -.inline-inputs span{padding:0 2px 0 1px;} .input-prepend,.input-append{overflow:hidden;}.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} .input-prepend .add-on,.input-append .add-on{position:relative;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;} diff --git a/lib/forms.less b/lib/forms.less index 84fddd7d1..99d6fcb59 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -298,27 +298,6 @@ textarea[readonly] { -// INLINE FIELDS -// ------------- - -.inline-inputs { - color: @gray; - span, input { - display: inline-block; - } - input.mini { - width: 60px; - } - input.small { - width: 90px; - } - span { - padding: 0 2px 0 1px; - } -} - - - // INPUT GROUPS // ------------ -- cgit v1.2.3 From 6d5b5065176a9e46ce71ec5fc16ae4a079e9e636 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Dec 2011 17:38:05 -0800 Subject: minor cleanups --- Makefile | 11 ++++++----- js/bootstrap-collapse.js | 4 ++-- js/bootstrap-transition.js | 2 ++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e5c083ae6..1f38338f8 100644 --- a/Makefile +++ b/Makefile @@ -22,15 +22,16 @@ build: uglify: @@if test ! -z ${UGLIFY_JS}; then \ mkdir -p js/min; \ - uglifyjs -o js/min/bootstrap-accordion.js js/bootstrap-accordion.js;\ - uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alerts.js;\ - uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-buttons.js;\ + uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alert.js;\ + uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-button.js;\ + uglifyjs -o js/min/bootstrap-carousel.js js/bootstrap-carousel.js;\ + uglifyjs -o js/min/bootstrap-collapse.js js/bootstrap-collapse.js;\ uglifyjs -o js/min/bootstrap-dropdown.js js/bootstrap-dropdown.js;\ uglifyjs -o js/min/bootstrap-modal.js js/bootstrap-modal.js;\ uglifyjs -o js/min/bootstrap-popover.js js/bootstrap-popover.js;\ uglifyjs -o js/min/bootstrap-scrollspy.js js/bootstrap-scrollspy.js;\ - uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tabs.js;\ - uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transitions.js;\ + uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tab.js;\ + uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transition.js;\ uglifyjs -o js/min/bootstrap-twipsy.js js/bootstrap-twipsy.js;\ else \ echo "You must have the UGLIFYJS minifier installed in order to minify Bootstrap's js."; \ diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 313c0abca..9301c7309 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -17,7 +17,7 @@ * limitations under the License. * ============================================================ */ -(function( $ ){ +!function( $ ){ "use strict" @@ -132,4 +132,4 @@ }) }) -})( window.jQuery ) \ No newline at end of file +}( window.jQuery ) \ No newline at end of file diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 25f8b111f..29fa1bdeb 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -19,6 +19,8 @@ $(function () { + "use strict" + /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) * ======================================================= */ -- cgit v1.2.3 From efacac0d6c812abffa8a84a48fa760f5f56c92f0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Dec 2011 18:42:43 -0800 Subject: clean up all the js across all the doc pages --- bootstrap.css | 2 +- docs/assets/js/application.js | 86 ++++++++++++++++++++++----------------- docs/base-css.html | 19 +-------- docs/components.html | 91 +++++++++++++++++++---------------------- docs/index.html | 37 ++--------------- docs/javascript.html | 95 +++++++++++++++++++------------------------ docs/less.html | 20 +-------- docs/scaffolding.html | 74 +++++++++++---------------------- docs/upgrading.html | 39 ------------------ 9 files changed, 165 insertions(+), 298 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 612fe24bc..6515b12b5 100644 --- a/bootstrap.css +++ b/bootstrap.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: Wed Dec 21 13:29:41 PST 2011 + * Date: Wed Dec 21 18:41:55 PST 2011 */ html, body { margin: 0; diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index dd759bf8b..c653233e6 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -1,52 +1,64 @@ $(function(){ - // table sort example - // ================== + // NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT + // IT'S ALL JUST JUNK FOR OUR DOCS! + // ++++++++++++++++++++++++++++++++++++++++++ - $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) + // make code pretty + prettyPrint && prettyPrint() + // table sort example + if ($.fn.tableSorter) { + $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) + } // add on logic - // ============ - - $('.add-on :checkbox').click(function () { - if ($(this).attr('checked')) { - $(this).parents('.add-on').addClass('active') - } else { - $(this).parents('.add-on').removeClass('active') - } + $('.add-on :checkbox').on('click', function () { + var $this = $(this) + , method = $this.attr('checked') ? 'addClass' : 'removeClass' + $(this).parents('.add-on')[method]('active') }) - // Disable certain links in docs - // ============================= - // Please do not carry these styles over to your projects, it's merely here to prevent button clicks form taking you away from your spot on page + // Please do not carry these styles over to your projects + // it's merely here to prevent button clicks form taking you + // away from your spot on page!! - $('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function (e) { + $('[href^=#]').click(function (e) { e.preventDefault() }) // Copy code blocks in docs - $(".copy-code").focus(function () { - var el = this; - // push select to event loop for chrome :{o - setTimeout(function () { $(el).select(); }, 1); - }); - - - // POSITION STATIC TWIPSIES - // ======================== - - $(window).on('load resize', function () { - $(".twipsies a").each(function () { - $(this) - .twipsy({ - live: false - , placement: $(this).attr('title') - , trigger: 'manual' - , offset: 2 - }) - .twipsy('show') - }) + $(".copy-code").on('focus', function () { + var el = this + setTimeout(function () { $(el).select() }, 0) }) -}); + + if ($.fn.twipsy) { + + // position static twipsies for components page + if ($(".twipsies a").length) { + $(window).on('load resize', function () { + $(".twipsies a").each(function () { + $(this) + .twipsy({ + placement: $(this).attr('title') + , trigger: 'manual' + }) + .twipsy('show') + }) + }) + } + + // add tipsies to grid for scaffolding + if ($('#grid-system').length) { + + $('#grid-system').twipsy({ + selector: '.show-grid > div' + , title: function () { return $(this).width() + 'px' } + }) + + } + } + +}) \ No newline at end of file diff --git a/docs/base-css.html b/docs/base-css.html index 209897402..6173a4de6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1110,25 +1110,10 @@ - - - - - + + - - - - diff --git a/docs/components.html b/docs/components.html index 56e71b0f7..4d2c60823 100644 --- a/docs/components.html +++ b/docs/components.html @@ -208,7 +208,7 @@

    Navigation

    Fixed navbar

    -
    +
    Project Name @@ -218,7 +218,7 @@
  • Link
  • Link
  • - Dropdown + Dropdown
    • Secondary link
    • Something else here
      • @@ -233,7 +233,7 @@
      • - Dropdown + Dropdown
        • Secondary link
        • Something else here
          • @@ -279,8 +279,8 @@
        • Messages
        • Settings
        • Contact
          • -
        • - Dropdown +
        • + Dropdown
          • Secondary link
          • Something else here
            • @@ -302,11 +302,11 @@

            As mentioned above, you can bring your tabs to life with a simple plugin. Here we have integrated all four variations of the tabs—default (top), right, bottom, left—with example tab areas.

            -
              -
            • Section 1
              • -
            • Section 2
              • -
            • Section 3
              • -
            • Section 4
              • +
              @@ -327,21 +327,21 @@
              -
                -
              • Section 1
                • -
              • Section 2
                • -
              • Section 3
                • +
                -
                +

                Section 1

                Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                -
                +

                Section 2

                Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                -
                +

                Section 3

                Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                @@ -350,21 +350,21 @@
                -
                  -
                • Section 1
                  • -
                • Section 2
                  • -
                • Section 3
                  • +
                  -
                  +

                  Section 1

                  Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                  -
                  +

                  Section 2

                  Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                  -
                  +

                  Section 3

                  Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

                  @@ -375,24 +375,24 @@
                  -
                  +

                  Oh hai #1!

                  -
                  +

                  Oh hai #2!

                  -
                  +

                  Oh hai #3!

                  -
                  +

                  Oh hai #4!

                  -
                  @@ -733,25 +733,16 @@ Lorem ipsum dolar sit amet illo error ipsum verita - - - - - + + + - - - + + - + + + diff --git a/docs/index.html b/docs/index.html index 55a75b1bf..81d7df41e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -97,10 +97,10 @@
                • ·
                • - +
                @@ -233,35 +233,6 @@ - - - - - - - - - - - - - + - + \ No newline at end of file diff --git a/docs/javascript.html b/docs/javascript.html index acde34d46..aed64d30a 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -23,49 +23,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -839,16 +796,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) { -
    • @@ -1040,5 +987,47 @@ $('#myCollapsible').on('hidden', function () {

    Icons from Glyphicons Free, licensed under CC BY 3.0.

    + + + + + + + + + + + + + + + + + + + diff --git a/docs/less.html b/docs/less.html index 52de8b6aa..13dfee282 100644 --- a/docs/less.html +++ b/docs/less.html @@ -466,25 +466,9 @@ - - - - - + + - - - - - diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 7431ae58b..311a6954c 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -64,34 +64,34 @@

    Default 940px grid

    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    -
    4
    -
    4
    -
    4
    +
    4
    +
    4
    +
    4
    -
    4
    -
    8
    +
    4
    +
    8
    -
    6
    -
    6
    +
    6
    +
    6
    -
    12
    +
    12
    @@ -358,7 +358,6 @@ -
    @@ -371,36 +370,11 @@ - - - - - - - + + - - - + - - + \ No newline at end of file diff --git a/docs/upgrading.html b/docs/upgrading.html index cd0ca8e22..4dedb37d8 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -99,23 +99,7 @@
  • Added button bar options
    • -
  • -
      -
    • -
    -
    • - - - - - - -
    - - - - - - - - - - - - - - - -- cgit v1.2.3 From 5de1e39a8fba831faa170f46e868068fa069dd0e Mon Sep 17 00:00:00 2001 From: Jonathan Ingram Date: Thu, 22 Dec 2011 16:41:26 +1100 Subject: From #822 --- js/bootstrap-alert.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 90961cdd3..1ce8f01bf 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -39,6 +39,8 @@ , selector = $this.attr('data-target') || $this.attr('href') , $parent = $(selector) + $parent.trigger('close') + e && e.preventDefault() $parent.length || ($parent = $this.hasClass('alert-message') ? $this : $this.parent()) @@ -47,6 +49,8 @@ function removeElement() { $parent.remove() + + $parent.trigger('closed') } $.support.transition && $parent.hasClass('fade') ? -- cgit v1.2.3 From 2ebc0ad2ef13c4eb9ab2e7b57ff6ca661687ca4e Mon Sep 17 00:00:00 2001 From: Jonathan Ingram Date: Thu, 22 Dec 2011 16:47:42 +1100 Subject: Update docs to show available events on alert --- docs/javascript.html | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/javascript.html b/docs/javascript.html index bf27dd7f1..0bdcdc8ed 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -750,6 +750,30 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

    .alert('close')

    Closes an alert.

    $(".alert-message").alert('close')
    +

    Events

    +

    Bootstrap's alert class exposes a few events for hooking into alert functionality.

    +
    + + + + + + + + + + + + + + + + +
    EventDescription
    closeThis event fires immediately when the close instance method is called.
    closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
    +
    +$('#my-alert').bind('closed', function () {
+  // do something ...
+})

    Demo

    × -- cgit v1.2.3 From 87ac818253a26bcf09fa55f78ae3f55759c54e64 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Dec 2011 19:10:32 -0800 Subject: change above below to top bottom and add "inside" placement option --- bootstrap.css | 18 +++++++++--------- bootstrap.min.css | 16 ++++++++-------- docs/javascript.html | 4 ++-- js/README.md | 2 +- js/bootstrap-twipsy.js | 29 +++++++++++++---------------- lib/mixins.less | 4 ++-- lib/popovers.less | 16 ++++++++-------- lib/twipsy.less | 18 +++++++++--------- 8 files changed, 52 insertions(+), 55 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 6515b12b5..ee80000c2 100644 --- a/bootstrap.css +++ b/bootstrap.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: Wed Dec 21 18:41:55 PST 2011 + * Date: Thu Dec 22 19:09:49 PST 2011 */ html, body { margin: 0; @@ -2366,19 +2366,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-opacity: 0.8; opacity: 0.8; } -.twipsy.above { +.twipsy.top { margin-top: -2px; } .twipsy.right { margin-left: 2px; } -.twipsy.below { +.twipsy.bottom { margin-top: 2px; } .twipsy.left { margin-left: -2px; } -.twipsy.above .twipsy-arrow { +.twipsy.top .twipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; @@ -2394,7 +2394,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-bottom: 5px solid transparent; border-left: 5px solid #000000; } -.twipsy.below .twipsy-arrow { +.twipsy.bottom .twipsy-arrow { top: 0; left: 50%; margin-left: -5px; @@ -2434,19 +2434,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { display: none; padding: 5px; } -.popover.above { +.popover.top { margin-top: -5px; } .popover.right { margin-left: 5px; } -.popover.below { +.popover.bottom { margin-top: 5px; } .popover.left { margin-left: -5px; } -.popover.above .arrow { +.popover.top .arrow { bottom: 0; left: 50%; margin-left: -5px; @@ -2462,7 +2462,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { border-bottom: 5px solid transparent; border-right: 5px solid #000000; } -.popover.below .arrow { +.popover.bottom .arrow { top: 0; left: 50%; margin-left: -5px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 4e4a1270a..3f48b135e 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -312,23 +312,23 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .modal-footer:after{clear:both;} .modal-footer .btn{float:right;margin-left:5px;} .twipsy{position:absolute;z-index:1000;display:block;visibility:visible;padding:5px;font-size:11px;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;}.twipsy.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;} -.twipsy.above{margin-top:-2px;} +.twipsy.top{margin-top:-2px;} .twipsy.right{margin-left:2px;} -.twipsy.below{margin-top:2px;} +.twipsy.bottom{margin-top:2px;} .twipsy.left{margin-left:-2px;} -.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.twipsy.top .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} -.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.twipsy.bottom .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} .twipsy-inner{max-width:200px;padding:3px 8px;color:white;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .twipsy-arrow{position:absolute;width:0;height:0;} -.popover{position:absolute;top:0;left:0;z-index:1000;display:none;padding:5px;}.popover.above{margin-top:-5px;} +.popover{position:absolute;top:0;left:0;z-index:1000;display:none;padding:5px;}.popover.top{margin-top:-5px;} .popover.right{margin-left:5px;} -.popover.below{margin-top:5px;} +.popover.bottom{margin-top:5px;} .popover.left{margin-left:-5px;} -.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} .popover .inner{padding:3px;width:280px;overflow:hidden;background-color:#000000;background-color:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);} diff --git a/docs/javascript.html b/docs/javascript.html index aed64d30a..c9bb425a4 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -544,8 +544,8 @@ $('a[data-toggle="tab"]').on('shown', function (e) { placement string - 'above' - how to position the tooltip - above | below | left | right + 'top' + how to position the tooltip - top | bottom | left | right selector diff --git a/js/README.md b/js/README.md index 0d8d163a2..2f8e1716f 100644 --- a/js/README.md +++ b/js/README.md @@ -49,7 +49,7 @@ examples: backdrop: true keyboard: false - placement: 'above' + placement: 'top' --- diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 018edb97e..21cf7d20b 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -99,6 +99,7 @@ , show: function () { var $tip + , inside , pos , actualWidth , actualHeight @@ -113,12 +114,18 @@ $tip.addClass('fade') } + placement = typeof this.options.placement == 'function' ? + thing.call(this, $tip[0], this.$element[0]) : + this.options.placement + + inside = /in/.test(placement) + $tip .remove() .css({ top: 0, left: 0, display: 'block' }) - .prependTo(document.body) + .prependTo(inside ? this.$element : document.body) - pos = $.extend({}, this.$element.offset(), { + pos = $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { width: this.$element[0].offsetWidth , height: this.$element[0].offsetHeight }) @@ -126,13 +133,11 @@ actualWidth = $tip[0].offsetWidth actualHeight = $tip[0].offsetHeight - placement = maybeCall(this.options.placement, this, [ $tip[0], this.$element[0] ]) - - switch (placement) { - case 'below': + switch (inside ? placement.split(' ')[1] : placement) { + case 'bottom': tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} break - case 'above': + case 'top': tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} break case 'left': @@ -226,14 +231,6 @@ } - /* TWIPSY PRIVATE METHODS - * ====================== */ - - function maybeCall ( thing, ctx, args ) { - return typeof thing == 'function' ? thing.apply(ctx, args) : thing - } - - /* TWIPSY PLUGIN DEFINITION * ======================== */ @@ -253,7 +250,7 @@ animation: true , delay: 0 , selector: false - , placement: 'above' + , placement: 'top' , trigger: 'hover' , title: '' , template: '
    ' diff --git a/lib/mixins.less b/lib/mixins.less index 0effdfa37..41cf8890d 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -283,7 +283,7 @@ // Popover arrows // For tipsies and popovers #popoverArrow { - .above(@arrowWidth: 5px) { + .top(@arrowWidth: 5px) { bottom: 0; left: 50%; margin-left: -@arrowWidth; @@ -299,7 +299,7 @@ border-bottom: @arrowWidth solid transparent; border-left: @arrowWidth solid @black; } - .below(@arrowWidth: 5px) { + .bottom(@arrowWidth: 5px) { top: 0; left: 50%; margin-left: -@arrowWidth; diff --git a/lib/popovers.less b/lib/popovers.less index ff875eaff..5ecde0923 100644 --- a/lib/popovers.less +++ b/lib/popovers.less @@ -8,14 +8,14 @@ z-index: 1000; display: none; padding: 5px; - &.above { margin-top: -5px; } - &.right { margin-left: 5px; } - &.below { margin-top: 5px; } - &.left { margin-left: -5px; } - &.above .arrow { #popoverArrow > .above(); } - &.right .arrow { #popoverArrow > .right(); } - &.below .arrow { #popoverArrow > .below(); } - &.left .arrow { #popoverArrow > .left(); } + &.top { margin-top: -5px; } + &.right { margin-left: 5px; } + &.bottom { margin-top: 5px; } + &.left { margin-left: -5px; } + &.top .arrow { #popoverArrow > .top(); } + &.right .arrow { #popoverArrow > .right(); } + &.bottom .arrow { #popoverArrow > .bottom(); } + &.left .arrow { #popoverArrow > .left(); } .arrow { position: absolute; width: 0; diff --git a/lib/twipsy.less b/lib/twipsy.less index 05f121a5d..abd0599f4 100644 --- a/lib/twipsy.less +++ b/lib/twipsy.less @@ -9,15 +9,15 @@ padding: 5px; font-size: 11px; .opacity(0); - &.in { .opacity(80); } - &.above { margin-top: -2px; } - &.right { margin-left: 2px; } - &.below { margin-top: 2px; } - &.left { margin-left: -2px; } - &.above .twipsy-arrow { #popoverArrow > .above(); } - &.left .twipsy-arrow { #popoverArrow > .left(); } - &.below .twipsy-arrow { #popoverArrow > .below(); } - &.right .twipsy-arrow { #popoverArrow > .right(); } + &.in { .opacity(80); } + &.top { margin-top: -2px; } + &.right { margin-left: 2px; } + &.bottom { margin-top: 2px; } + &.left { margin-left: -2px; } + &.top .twipsy-arrow { #popoverArrow > .top(); } + &.left .twipsy-arrow { #popoverArrow > .left(); } + &.bottom .twipsy-arrow { #popoverArrow > .bottom(); } + &.right .twipsy-arrow { #popoverArrow > .right(); } } .twipsy-inner { max-width: 200px; -- cgit v1.2.3 From 3396fc0542a5fbbed658a95f931472fc24feee56 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Dec 2011 19:17:41 -0800 Subject: check for prettyprint on window --- docs/assets/js/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index c8e796a39..eae84b138 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -17,7 +17,7 @@ $(function(){ // ================== // make code pretty - prettyPrint && prettyPrint() + window.prettyPrint && prettyPrint() // table sort example if ($.fn.tableSorter) { -- cgit v1.2.3 From 49fb910b11baef4ccfe9270479e8b9bf9e5e7731 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Dec 2011 19:25:29 -0800 Subject: more js cleanup after gnarly merge --- docs/base-css.html | 1 - docs/components.html | 28 ++++++++++++---------------- docs/scaffolding.html | 1 + 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index 34e844df3..dad42381d 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1180,7 +1180,6 @@ Form states - diff --git a/docs/components.html b/docs/components.html index 26a657cb5..5b4e788f1 100644 --- a/docs/components.html +++ b/docs/components.html @@ -22,18 +22,6 @@ - - - - - - - - - - - - @@ -768,7 +756,7 @@

    -Lorem ipsum dolar sit amet illo error ipsum veritatis aut iste perspiciatis iste voluptas natus illo quasi odit aut natus consequuntur consequuntur, aut natus illo voluptatem odit perspiciatis laudantium rem doloremque totam voluptas. Voluptasdicta eaque beatae aperiam ut enim voluptatem explicabo explicabo, voluptas quia odit fugit accusantium totam totam architecto explicabo sit quasi fugit fugit, totam doloremque unde sunt sed dicta quae accusantium fugit voluptas nemo voluptas voluptatem rem quae aut veritatis quasi quae. +Lorem ipsum dolar sit amet illo error ipsum veritatis aut iste perspiciatis iste voluptas natus illo quasi odit aut natus consequuntur consequuntur, aut natus illo voluptatem odit perspiciatis laudantium rem doloremque totam voluptas. Voluptasdicta eaque beatae aperiam ut enim voluptatem explicabo explicabo, voluptas quia odit fugit accusantium totam totam architecto explicabo sit quasi fugit fugit, totam doloremque unde sunt sed dicta quae accusantium fugit voluptas nemo voluptas voluptatem rem quae aut veritatis quasi quae.

    @@ -811,9 +799,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita
    - - -
    + + + + + + + + + + + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index dc35bd577..0a46252dd 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -375,5 +375,6 @@ + -- cgit v1.2.3 From ea2346197075a30f0200665fcd2836b217f33fb3 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 22 Dec 2011 19:28:58 -0800 Subject: fix unit test for twipsy --- js/tests/unit/bootstrap-twipsy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/tests/unit/bootstrap-twipsy.js b/js/tests/unit/bootstrap-twipsy.js index 7a88ab2f1..6623fc026 100644 --- a/js/tests/unit/bootstrap-twipsy.js +++ b/js/tests/unit/bootstrap-twipsy.js @@ -30,10 +30,10 @@ $(function () { $.support.transition = false var twipsy = $('') .appendTo('#qunit-fixture') - .twipsy({placement: 'below'}) + .twipsy({placement: 'bottom'}) .twipsy('show') - ok($(".twipsy").hasClass('fade below in'), 'has correct classes applied') + ok($(".twipsy").hasClass('fade bottom in'), 'has correct classes applied') twipsy.twipsy('hide') }) -- cgit v1.2.3 From 3aba68f832e3406fcd6687ba4687cd339ae3b42d Mon Sep 17 00:00:00 2001 From: Purwandi Date: Fri, 23 Dec 2011 21:39:29 +0700 Subject: Fix id tabs on docs component --- docs/components.html | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/components.html b/docs/components.html index 5b4e788f1..c6a349ff4 100644 --- a/docs/components.html +++ b/docs/components.html @@ -358,20 +358,20 @@
    -
    +

    Section 1

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    -
    +

    Section 2

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    -
    +

    Section 3

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    @@ -381,20 +381,20 @@
    -
    +

    Section 1

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    -
    +

    Section 2

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    -
    +

    Section 3

    Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.

    @@ -405,24 +405,24 @@
    -
    +

    Oh hai #1!

    -
    +

    Oh hai #2!

    -
    +

    Oh hai #3!

    -
    +

    Oh hai #4!

    -- cgit v1.2.3 From 1a295491b275cf55187c913db311e807eda5e989 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Dec 2011 22:15:04 -0800 Subject: update docs for placement --- docs/javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/javascript.html b/docs/javascript.html index e33900432..7c92ef06a 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -635,7 +635,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { placement string 'right' - how to position the popover - above | below | left | right + how to position the popover - top | bottom | left | right selector -- cgit v1.2.3 From 076370f3f9076b177a1f9c8ba9f536faa1a58957 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Dec 2011 22:31:39 -0800 Subject: fix for linux --- Makefile | 3 +-- bootstrap.css | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1f38338f8..3d24eb1c5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ VERSION=2.0.0 -DATE=$(shell DATE) BOOTSTRAP = ./bootstrap.css BOOTSTRAP_MIN = ./bootstrap.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less @@ -9,7 +8,7 @@ WATCHR ?= `which watchr` build: @@if test ! -z ${LESS_COMPESSOR}; then \ - sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"${DATE}"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \ + sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \ lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \ lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \ rm -f ${BOOTSTRAP_LESS}.tmp; \ diff --git a/bootstrap.css b/bootstrap.css index eb7b65678..333d6f04c 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,11 +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. -<<<<<<< HEAD - * Date: Thu Dec 22 19:09:49 PST 2011 -======= - * Date: Wed Dec 21 18:38:56 CST 2011 ->>>>>>> 9fb380151d477f1741b7609ade7a9e7fd5450b2c + * Date: Sat Dec 24 22:30:43 PST 2011 */ html, body { margin: 0; -- cgit v1.2.3 From 823d89dbb23511b7ee929ddbd62661be751429d6 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Dec 2011 22:56:01 -0800 Subject: move position of twipsy into getPosition so it can easily be extended for svg use --- js/bootstrap-twipsy.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 21cf7d20b..2651e3822 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -125,10 +125,7 @@ .css({ top: 0, left: 0, display: 'block' }) .prependTo(inside ? this.$element : document.body) - pos = $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) + pos = this.getPosition(inside) actualWidth = $tip[0].offsetWidth actualHeight = $tip[0].offsetHeight @@ -187,6 +184,13 @@ return this.getTitle() } + , getPosition: function (inside) { + return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { + width: this.$element[0].offsetWidth + , height: this.$element[0].offsetHeight + }) + } + , getTitle: function () { var title , $e = this.$element -- cgit v1.2.3 From 12868933b9141ff9c63277efe36665cc7a8815df Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Dec 2011 23:06:16 -0800 Subject: clean up dead elements in firefox (which is droping transitionEnd events :( --- js/bootstrap-twipsy.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index 2651e3822..a176f0908 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -164,13 +164,20 @@ $tip.removeClass('in') - function removeElement () { - $tip.remove() + function removeWithAnimation() { + var timeout = setTimeout(function () { + $tip.off($.support.transition.end).remove() + }, 500) + + $tip.one($.support.transition.end, function () { + clearTimeout(timeout) + $tip.remove() + }) } $.support.transition && this.$tip.hasClass('fade') ? - $tip.on($.support.transition.end, removeElement) : - removeElement() + removeWithAnimation() : + $tip.remove() } , fixTitle: function () { -- cgit v1.2.3 From 058f47b33b3978bbb484e521e7fc14c6ebadc161 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 26 Dec 2011 17:25:25 -0600 Subject: clean up some comments and fix a bug with buttons in navbar by removing too generic of a link color --- bootstrap.css | 106 ++---------------------------------------------------- bootstrap.min.css | 11 +----- docs/index.html | 1 + lib/patterns.less | 103 ++-------------------------------------------------- 4 files changed, 8 insertions(+), 213 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 5e22415dd..ff21bc836 100644 --- a/bootstrap.css +++ b/bootstrap.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: Mon Dec 26 16:47:02 CST 2011 + * Date: Mon Dec 26 17:12:29 CST 2011 */ html, body { margin: 0; @@ -1191,10 +1191,6 @@ table { -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); } -.navbar a { - color: #bfbfbf; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} .navbar .brand a:hover, .navbar ul .active > a { color: #ffffff; text-decoration: none; @@ -1300,7 +1296,9 @@ table { float: none; padding: 10px 10px 11px; line-height: 19px; + color: #bfbfbf; text-decoration: none; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .nav a:hover { color: #ffffff; @@ -1368,104 +1366,6 @@ table { .topbar ul .dropdown-menu li a { padding: 4px 15px; } -.dropdown { - position: relative; -} -.dropdown-toggle:after { - display: inline-block; - width: 0; - height: 0; - margin-top: 8px; - margin-left: 6px; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #ffffff; - filter: alpha(opacity=30); - -moz-opacity: 0.3; - opacity: 0.3; - content: "↓"; -} -.dropdown:hover .dropdown-toggle:after { - filter: alpha(opacity=100); - -moz-opacity: 1; - opacity: 1; -} -.dropdown-menu { - position: absolute; - top: 40px; - z-index: 900; - float: left; - display: none; - min-width: 160px; - max-width: 220px; - _width: 160px; - padding: 6px 0; - margin-left: 0; - margin-right: 0; - background-color: #ffffff; - border-color: #999; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 0 1px 1px; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -webkit-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); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; - zoom: 1; -} -.dropdown-menu li { - float: none; - display: block; - background-color: none; -} -.dropdown-menu .divider { - height: 1px; - margin: 5px 0; - overflow: hidden; - background-color: #eee; - border-bottom: 1px solid #ffffff; -} -.topbar .dropdown-menu a, .dropdown-menu a { - display: block; - padding: 4px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #808080; - text-shadow: 0 1px 0 #ffffff; -} -.topbar .dropdown-menu a:hover, .dropdown-menu a:hover { - color: #404040; - text-decoration: none; - background-color: #dddddd; - background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -ms-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(top, #eeeeee, #dddddd); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -} -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); -} -.dropdown.open .dropdown-menu { - display: block; -} .hero-unit { padding: 60px; margin-bottom: 30px; diff --git a/bootstrap.min.css b/bootstrap.min.css index aa277ddb8..711e8a37e 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -173,7 +173,6 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .striped-table tbody tr:nth-child(odd) td,.striped-table tbody tr:nth-child(odd) th{background-color:#f9f9f9;} .navbar{overflow:visible;} .navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} -.navbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} .navbar .brand a:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);} .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;} @@ -185,7 +184,7 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .navbar-fixed{position:fixed;top:0;right:0;left:0;z-index:10000;} .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}.nav>li{display:block;float:left;} -.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;} +.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;color:#bfbfbf;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.nav a:hover{color:#ffffff;text-decoration:none;} .nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} .nav .divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;} .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;border:0;} @@ -195,14 +194,6 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .nav .dropdown-menu .active a{color:#ffffff;} .nav .dropdown-menu .divider{background-color:#222;border-color:#444;} .topbar ul .dropdown-menu li a{padding:4px 15px;} -.dropdown{position:relative;} -.dropdown-toggle:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;content:"↓";} -.dropdown:hover .dropdown-toggle:after{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;} -.dropdown-menu{position:absolute;top:40px;z-index:900;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:6px 0;margin-left:0;margin-right:0;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;zoom:1;}.dropdown-menu li{float:none;display:block;background-color:none;} -.dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} -.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{color:#404040;text-decoration:none;background-color:#dddddd;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} -.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} -.dropdown.open .dropdown-menu{display:block;} .hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} footer{padding-top:17px;margin-top:17px;border-top:1px solid #eee;} diff --git a/docs/index.html b/docs/index.html index 0d340fa1a..735fe7ae7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -41,6 +41,7 @@
  • Javascript plugins
  • Using LESS
    • + Button
    diff --git a/lib/patterns.less b/lib/patterns.less index 44c427adf..25934d80a 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -24,11 +24,6 @@ } // Text and links .navbar { - // Links get text-shadow - a { - color: @grayLight; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - } // Hover and active states .brand a:hover, ul .active > a { @@ -146,7 +141,9 @@ float: none; padding: 10px 10px 11px; line-height: 19px; + color: @grayLight; text-decoration: none; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); &:hover { color: @white; text-decoration: none; @@ -213,101 +210,6 @@ padding: 4px 15px; } -// Dropdown Menus -// Use the .menu class on any
  • element within the topbar or ul.tabs and you'll get some superfancy dropdowns -.dropdown { - position: relative; -} -// The link that is clicked to toggle the dropdown -.dropdown-toggle:after { - display: inline-block; - width: 0; - height: 0; - margin-top: 8px; - margin-left: 6px; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid @white; - .opacity(30); - content: "↓"; -} -.dropdown:hover .dropdown-toggle:after { - .opacity(100); -} -// The dropdown menu (ul) -.dropdown-menu { - position: absolute; - top: 40px; - z-index: 900; - float: left; - display: none; // None by default, but block on "open" of the menu - min-width: 160px; - max-width: 220px; - _width: 160px; - padding: 6px 0; - margin-left: 0; // override default ul styles - margin-right: 0; - background-color: @white; - border-color: #999; - border-color: rgba(0,0,0,.2); - border-style: solid; - border-width: 0 1px 1px; - .border-radius(0 0 6px 6px); - .box-shadow(0 2px 4px rgba(0,0,0,.2)); - .background-clip(padding-box); - zoom: 1; // do we need this? - - // Unfloat any li's to make them stack - li { - float: none; - display: block; - background-color: none; - } - // Dividers (basically an hr) within the dropdown - .divider { - height: 1px; - margin: 5px 0; - overflow: hidden; - background-color: #eee; - border-bottom: 1px solid @white; - } -} - -.topbar .dropdown-menu, .dropdown-menu { - // Links within the dropdown menu - a { - display: block; - padding: 4px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: @gray; - text-shadow: 0 1px 0 @white; - // Hover state - &:hover { - color: @grayDark; - text-decoration: none; - #gradient > .vertical(#eeeeee, #dddddd); - @shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025); - .box-shadow(@shadow); - } - } -} - -// Open state for the dropdown -.dropdown.open { - .dropdown-toggle { - color: @white; - background: #ccc; - background: rgba(0,0,0,.3); - } - .dropdown-menu { - display: block; - } -} - @@ -493,6 +395,7 @@ input[type=submit].btn { float: left; margin-left: -1px; .border-radius(0); + // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match &:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; -- cgit v1.2.3 From 324246e4f964437a2dfa7efbd2d1b6b039369b2c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 12:39:39 -0600 Subject: remove negative margin from .brand in docs, update navbar to support buttons up thurr --- bootstrap.css | 5 ++++- bootstrap.min.css | 1 + docs/assets/css/docs.css | 1 + lib/patterns.less | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index ff21bc836..105c10de3 100644 --- a/bootstrap.css +++ b/bootstrap.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: Mon Dec 26 17:12:29 CST 2011 + * Date: Tue Dec 27 12:39:01 CST 2011 */ html, body { margin: 0; @@ -1215,6 +1215,9 @@ table { color: #ffffff; background-color: transparent; } +.navbar .btn { + margin-top: 5px; +} .navbar-search { position: relative; float: left; diff --git a/bootstrap.min.css b/bootstrap.min.css index 711e8a37e..048414c78 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -176,6 +176,7 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .navbar .brand a:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);} .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;} +.navbar .btn{margin-top:5px;} .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background-color:#444;background-color:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#e6e6e6;} .navbar-search .search-query::-webkit-input-placeholder{color:#e6e6e6;} .navbar-search .search-query:hover{color:#ffffff;background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b3c464941..c2c92a251 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -22,6 +22,7 @@ body { body > .navbar-fixed .brand { padding-right: 0; padding-left: 0; + margin-left: 20px; float: right; font-weight: bold; color: #000; diff --git a/lib/patterns.less b/lib/patterns.less index 25934d80a..d48d65e48 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -52,6 +52,10 @@ background-color: transparent; } } + // Buttons in navbar + .btn { + margin-top: 5px; // make buttons vertically centered in navbar + } } // Navbar search -- cgit v1.2.3 From b9adae14fc9fa64134aebb57655dd93e0a7e6ad6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 12:40:30 -0600 Subject: remove button from topbar for testing --- docs/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 735fe7ae7..0d340fa1a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -41,7 +41,6 @@
  • Javascript plugins
  • Using LESS
    • - Button
    -- cgit v1.2.3 From 5801c4d766205c6f1579b9c45e733df5dba3b1fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 13:51:50 -0600 Subject: capitalize Less in makefile, add print less file (not yet compiled) --- Makefile | 2 +- lib/print.less | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 lib/print.less diff --git a/Makefile b/Makefile index 3d24eb1c5..5eee74f2e 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ watch: echo "Watching less files..."; \ watchr -e "watch('lib/.*\.less') { system 'make' }"; \ else \ - echo "You must have the watchr installed in order to watch Bootstrap less files."; \ + echo "You must have the watchr installed in order to watch Bootstrap Less files."; \ echo "You can install it by running: gem install watchr"; \ fi diff --git a/lib/print.less b/lib/print.less new file mode 100644 index 000000000..b45d016fd --- /dev/null +++ b/lib/print.less @@ -0,0 +1,18 @@ +/*! + * Bootstrap @VERSION for Print + * + * Copyright 2011 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + * Date: @DATE + */ + + +// HIDE UNECESSARY COMPONENTS +// -------------------------- + +.navbar-fixed { + display: none; +} \ No newline at end of file -- cgit v1.2.3 From fec02f50455c87f0e01fe74b1fb2e3cd032ade09 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 15:40:58 -0600 Subject: clean up some css for github issues: input prepend z-index, modals revamped for responsive --- bootstrap.css | 18 ++++++++++++------ bootstrap.min.css | 8 ++++---- docs/base-css.html | 2 +- docs/components.html | 2 +- lib/forms.less | 4 +--- lib/modals.less | 3 ++- lib/responsive.less | 12 ++++++++++++ 7 files changed, 33 insertions(+), 16 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 105c10de3..95dde47e8 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Dec 27 12:39:01 CST 2011 + * Date: Tue Dec 27 15:23:07 CST 2011 */ html, body { margin: 0; @@ -602,6 +602,7 @@ select, input[type=file] { } select { background-color: #ffffff; + vertical-align: middle; } select[multiple] { height: inherit; @@ -904,17 +905,12 @@ textarea[readonly] { display: block; max-width: 600px; } -.input-prepend, .input-append { - overflow: hidden; -} .input-prepend input, .input-append input { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } .input-prepend .add-on, .input-append .add-on { - position: relative; - z-index: 2; float: left; display: block; width: auto; @@ -2574,6 +2570,16 @@ a.thumbnail:hover { .horizontal-form .form-actions { padding-left: 0; } + .modal { + position: fixed; + top: 20px; + left: 20px; + right: 20px; + width: auto; + } + .modal .close { + padding: 10px; + } } @media (max-width: 768px) { .container { diff --git a/bootstrap.min.css b/bootstrap.min.css index 048414c78..aff1c43c2 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -100,7 +100,7 @@ input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto; input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;} -select{background-color:#ffffff;} +select{background-color:#ffffff;vertical-align:middle;} select[multiple]{height:inherit;} input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} textarea{height:auto;} @@ -146,8 +146,8 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .help-text{margin-top:5px;margin-bottom:0;color:#bfbfbf;} .help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;} .help-block{display:block;max-width:600px;} -.input-prepend,.input-append{overflow:hidden;}.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.input-prepend .add-on,.input-append .add-on{position:relative;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;} .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;} @@ -339,4 +339,4 @@ a.thumbnail:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, .thumbnail>img{display:block;max-width:100%;} .thumbnail .caption{padding:9px;} .hidden{display:none;visibility:hidden;} -@media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} +@media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal .close{padding:10px;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} diff --git a/docs/base-css.html b/docs/base-css.html index dad42381d..99fb9bd1a 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -894,7 +894,7 @@ Form states @
    - Here's some help text +

    Here's some help text

    diff --git a/docs/components.html b/docs/components.html index c6a349ff4..fbfa9fb31 100644 --- a/docs/components.html +++ b/docs/components.html @@ -716,7 +716,7 @@

    Get the javascript »

    -
    +
    diff --git a/lib/forms.less b/lib/forms.less index 99d6fcb59..9d96e8f33 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -96,6 +96,7 @@ input[type=file] { // Chrome on Linux and Mobile Safari need background-color select { background-color: @white; + vertical-align: middle; } // Make multiple select elements height not fixed @@ -304,13 +305,10 @@ textarea[readonly] { // Allow us to put symbols and text within the input field for a cleaner look .input-prepend, .input-append { - overflow: hidden; input { .border-radius(0 3px 3px 0); } .add-on { - position: relative; - z-index: 2; float: left; display: block; width: auto; diff --git a/lib/modals.less b/lib/modals.less index 53d6cd408..4d2b92cbc 100644 --- a/lib/modals.less +++ b/lib/modals.less @@ -13,7 +13,8 @@ &.fade { opacity: 0; } } -.modal-backdrop, .modal-backdrop.fade.in { +.modal-backdrop, +.modal-backdrop.fade.in { .opacity(80); } diff --git a/lib/responsive.less b/lib/responsive.less index d8b453d06..fe2b7cd49 100644 --- a/lib/responsive.less +++ b/lib/responsive.less @@ -43,6 +43,18 @@ .horizontal-form .form-actions { padding-left: 0; } + + // Modals + .modal { + position: fixed; + top: 20px; + left: 20px; + right: 20px; + width: auto; + .close { + padding: 10px; + } + } } -- cgit v1.2.3 From 3426877c894b858d89e68c72bc300cd4f670c40f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 15:51:36 -0600 Subject: add ie7 inline block mixin and add ability to center pagination --- bootstrap.css | 11 +++++++++-- bootstrap.min.css | 3 ++- lib/mixins.less | 6 ++++++ lib/pagination.less | 8 +++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 95dde47e8..51341e902 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Dec 27 15:23:07 CST 2011 + * Date: Tue Dec 27 15:49:07 CST 2011 */ html, body { margin: 0; @@ -2211,7 +2211,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin: 18px 0; } .pagination ul { - float: left; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; margin: 0; border: 1px solid #ddd; border: 1px solid rgba(0, 0, 0, 0.15); @@ -2247,6 +2251,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .pagination .next a { border: 0; } +.pagination.centered { + text-align: center; +} .modal-backdrop { position: fixed; top: 0; diff --git a/bootstrap.min.css b/bootstrap.min.css index aff1c43c2..4c794c9e7 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -292,12 +292,13 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#bfbfbf;} .breadcrumb .active a{color:#404040;} -.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);} +.pagination{height:36px;margin:18px 0;}.pagination ul{display:inline-block;*display:inline;*zoom:1;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);} .pagination li{display:inline;} .pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;} .pagination a:hover,.pagination .active a{background-color:#c7eefe;} .pagination .disabled a,.pagination .disabled a:hover{color:#bfbfbf;background-color:transparent;} .pagination .next a{border:0;} +.pagination.centered{text-align:center;} .modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:10000;background-color:#000000;}.modal-backdrop.fade{opacity:0;} .modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;} .modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} diff --git a/lib/mixins.less b/lib/mixins.less index e8b5cdd2f..58df9298a 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -25,6 +25,12 @@ margin-right: auto; } +// IE7 inline-block +.ie7-inline-block() { + *display: inline; /* IE7 inline-block hack */ + *zoom: 1; +} + // Sizing shortcuts .size(@height: 5px, @width: 5px) { width: @width; diff --git a/lib/pagination.less b/lib/pagination.less index d82a0bbd0..f63051168 100644 --- a/lib/pagination.less +++ b/lib/pagination.less @@ -5,7 +5,8 @@ height: @baseLineHeight * 2; margin: @baseLineHeight 0; ul { - float: left; + display: inline-block; + .ie7-inline-block(); margin: 0; border: 1px solid #ddd; border: 1px solid rgba(0,0,0,.15); @@ -37,4 +38,9 @@ .next a { border: 0; } + + // Centered + &.centered { + text-align: center; + } } -- cgit v1.2.3 From 46d2ad5e221646807fb2bd71881860462988008e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 16:08:07 -0600 Subject: allow select with size attr to not have fixed height --- bootstrap.css | 4 ++-- bootstrap.min.css | 2 +- lib/forms.less | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 51341e902..a1fcc1df6 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Dec 27 15:49:07 CST 2011 + * Date: Tue Dec 27 16:07:55 CST 2011 */ html, body { margin: 0; @@ -604,7 +604,7 @@ select { background-color: #ffffff; vertical-align: middle; } -select[multiple] { +select[multiple], select[size] { height: inherit; } input[type=image] { diff --git a/bootstrap.min.css b/bootstrap.min.css index 4c794c9e7..0be96084b 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -101,7 +101,7 @@ input[type=file]{padding:initial;line-height:initial;border:initial;background-c input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;} select{background-color:#ffffff;vertical-align:middle;} -select[multiple]{height:inherit;} +select[multiple],select[size]{height:inherit;} input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} textarea{height:auto;} input,textarea{-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} diff --git a/lib/forms.less b/lib/forms.less index 9d96e8f33..e9c392c76 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -100,7 +100,8 @@ select { } // Make multiple select elements height not fixed -select[multiple] { +select[multiple], +select[size] { height: inherit; } -- cgit v1.2.3 From e78d5f8ff33009e4c4ab57496913b43ff1e369dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 16:25:22 -0600 Subject: fix tables for rowspan --- bootstrap.css | 2 +- docs/base-css.html | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index a1fcc1df6..2b870bfce 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Dec 27 16:07:55 CST 2011 + * Date: Tue Dec 27 16:25:12 CST 2011 */ html, body { margin: 0; diff --git a/docs/base-css.html b/docs/base-css.html index 99fb9bd1a..13cbeedbc 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -646,25 +646,24 @@ 1 Some One - English + HTML 2 Joe Sixpack - English + Javascript 3 Joe Sixpack - English 3 Stu Dent - Code + CSS -- cgit v1.2.3 From 550879cf666ec6445d1918604cb71c7202a52999 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 16:50:27 -0600 Subject: fix quotes in font-family usage --- lib/mixins.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mixins.less b/lib/mixins.less index 58df9298a..83a3a31f9 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -54,13 +54,13 @@ #font { #family { .serif() { - font-family: "Georgia", Times New Roman, Times, serif; + font-family: Georgia, "Times New Roman", Times, serif; } .sans-serif() { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } .monospace() { - font-family: "Menlo", Monaco, Courier New, monospace; + font-family: Menlo, Monaco, Courier New, monospace; } } .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { -- cgit v1.2.3 From 53c6dbff0d6dd781df421f07acdd9e98719b41bf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 17:04:55 -0600 Subject: add appended input example to docs, fix help-text wrapping issue by clearing float --- bootstrap.css | 24 ++++++++++++++++++------ bootstrap.min.css | 7 ++++--- docs/base-css.html | 10 ++++++++++ lib/forms.less | 1 + lib/tables.less | 6 +----- 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 2b870bfce..e83f46258 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Dec 27 16:25:12 CST 2011 + * Date: Tue Dec 27 17:02:48 CST 2011 */ html, body { margin: 0; @@ -491,7 +491,7 @@ address { } code, pre { padding: 0 3px 2px; - font-family: "Menlo", Monaco, Courier New, monospace; + font-family: Menlo, Monaco, Courier New, monospace; font-size: 12px; color: #404040; -webkit-border-radius: 3px; @@ -905,6 +905,21 @@ textarea[readonly] { display: block; max-width: 600px; } +.input-prepend, .input-append { + zoom: 1; +} +.input-prepend:before, +.input-append:before, +.input-prepend:after, +.input-append:after { + display: table; + *display: inline; + content: ""; + zoom: 1; +} +.input-prepend:after, .input-append:after { + clear: both; +} .input-prepend input, .input-append input { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; @@ -985,7 +1000,7 @@ th, td { padding: 8px; line-height: 18px; text-align: left; - border-bottom: 1px solid #ddd; + border-top: 1px solid #ddd; } th { font-weight: bold; @@ -994,9 +1009,6 @@ th { td { vertical-align: top; } -tbody tr:last-child th, tbody tr:last-child td { - border-bottom: 0; -} .condensed-table th, .condensed-table td { padding: 4px 5px; } diff --git a/bootstrap.min.css b/bootstrap.min.css index 0be96084b..e2d7fccaa 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -87,7 +87,7 @@ blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eee;}bloc blockquote small{display:block;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} address{display:block;margin-bottom:18px;line-height:18px;} -code,pre{padding:0 3px 2px;font-family:"Menlo",Monaco,Courier New,monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Courier New, monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{padding:1px 3px;background-color:#fee9cc;} pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;} pre code{padding:0;background-color:transparent;} @@ -146,6 +146,8 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .help-text{margin-top:5px;margin-bottom:0;color:#bfbfbf;} .help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;} .help-block{display:block;max-width:600px;} +.input-prepend,.input-append{zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;*display:inline;content:"";zoom:1;} +.input-prepend:after,.input-append:after{clear:both;} .input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} .input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;} @@ -160,10 +162,9 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .horizontal-form .control-list{padding-top:6px;} .horizontal-form .form-actions{padding-left:150px;} table{width:100%;margin-bottom:18px;} -th,td{padding:8px;line-height:18px;text-align:left;border-bottom:1px solid #ddd;} +th,td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;} th{font-weight:bold;vertical-align:bottom;} td{vertical-align:top;} -tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .condensed-table th,.condensed-table td{padding:4px 5px;} .bordered-table{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td,.bordered-table td+th{border-left:1px solid #ddd;} .bordered-table thead:first-child tr:first-child th:first-child,.bordered-table tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} diff --git a/docs/base-css.html b/docs/base-css.html index 13cbeedbc..2bc6f49fb 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -896,6 +896,16 @@ Form states

    Here's some help text

    +
    + +
    +
    + + .00 +
    +

    Here's more help text

    +
    +
    diff --git a/lib/forms.less b/lib/forms.less index e9c392c76..5293d780a 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -306,6 +306,7 @@ textarea[readonly] { // Allow us to put symbols and text within the input field for a cleaner look .input-prepend, .input-append { + .clearfix(); // Clear the float to prevent wrapping input { .border-radius(0 3px 3px 0); } diff --git a/lib/tables.less b/lib/tables.less index 524f959f0..164370562 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -17,7 +17,7 @@ td { padding: 8px; line-height: @baseLineHeight; text-align: left; - border-bottom: 1px solid #ddd; + border-top: 1px solid #ddd; } th { font-weight: bold; @@ -26,10 +26,6 @@ th { td { vertical-align: top; } -tbody tr:last-child th, -tbody tr:last-child td { - border-bottom: 0; -} // CONDENSED TABLE W/ HALF PADDING -- cgit v1.2.3 From 704d713aadbfcd27e39226cb0d1b2243d52dde0a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 17:39:34 -0600 Subject: border radius on large button toolbar --- bootstrap.css | 19 ++++++++++++++++++- bootstrap.min.css | 2 ++ lib/patterns.less | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index e83f46258..1d0a29b51 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Dec 27 17:02:48 CST 2011 + * Date: Tue Dec 27 17:38:27 CST 2011 */ html, body { margin: 0; @@ -1628,6 +1628,23 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius-bottomright: 4px; border-bottom-right-radius: 4px; } +.btn-group .btn.large:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.btn-group .btn.large:last-child { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; +} .btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active { z-index: 2; } diff --git a/bootstrap.min.css b/bootstrap.min.css index e2d7fccaa..51e652bb9 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -221,6 +221,8 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .btn-group:after{clear:both;} .btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} .btn-group .btn:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} +.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;} +.btn-group .btn.large:last-child{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;} .close{float:right;font-size:20px;font-weight:bold;line-height:13.5px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;} .alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;} diff --git a/lib/patterns.less b/lib/patterns.less index d48d65e48..7c9ee7e48 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -417,6 +417,24 @@ input[type=submit].btn { -moz-border-radius-bottomright: 4px; border-bottom-right-radius: 4px; } + // Reset corners for large buttons + &.large:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; + } + &.large:last-child { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; + } } // On hover/focus/active, bring the proper btn to front .btn-group .btn:hover, -- cgit v1.2.3 From 553030ca7de8dac3c5180629ff84fa14173513ab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 30 Dec 2011 16:01:29 -0800 Subject: missing parantheses --- bootstrap.css | 2 +- lib/forms.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 1d0a29b51..8e2ce41f3 100644 --- a/bootstrap.css +++ b/bootstrap.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: Tue Dec 27 17:38:27 CST 2011 + * Date: Fri Dec 30 16:01:05 PST 2011 */ html, body { margin: 0; diff --git a/lib/forms.less b/lib/forms.less index 5293d780a..ededc772e 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -220,7 +220,7 @@ textarea[readonly] { border-color: @borderColor; &:focus { border-color: darken(@borderColor, 10%); - .box-shadow(0 0 6px lighten(@borderColor, 20%); + .box-shadow(0 0 6px lighten(@borderColor, 20%)); } } // Give a small background color for input-prepend/-append -- cgit v1.2.3 From 2d092dfeea969d82bc55a153c6a597a3e87a0a03 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 16:04:01 -0800 Subject: start playing with carousel stuff --- bootstrap.css | 10 +++++++- bootstrap.min.css | 4 ++- docs/javascript.html | 66 +++++++++++++++++++++++++++++++++++++++++++++++- js/bootstrap-carousel.js | 21 +++++++++++++-- lib/modals.less | 2 ++ lib/thumbnails.less | 8 ++++++ 6 files changed, 106 insertions(+), 5 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 333d6f04c..d906168cf 100644 --- a/bootstrap.css +++ b/bootstrap.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 Dec 24 22:30:43 PST 2011 + * Date: Sun Dec 25 21:24:32 PST 2011 */ html, body { margin: 0; @@ -2385,6 +2385,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { top: 50%; left: 50%; z-index: 11000; + max-height: 500px; + overflow: auto; width: 560px; margin: -250px 0 0 -250px; background-color: #ffffff; @@ -2662,6 +2664,12 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; } +.carousel .item { + display: none; +} +.carousel .active { + display: block; +} .hidden { display: none; visibility: hidden; diff --git a/bootstrap.min.css b/bootstrap.min.css index db5e4206d..4036f4645 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -312,7 +312,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .pagination .next a{border:0;} .modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:10000;background-color:#000000;}.modal-backdrop.fade{opacity:0;} .modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;} -.modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} +.modal{position:fixed;top:50%;left:50%;z-index:11000;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} .modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} .modal.fade.in{top:50%;} .modal-header{padding:5px 15px;border-bottom:1px solid #eee;} @@ -350,5 +350,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; a.thumbnail:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} .thumbnail>img{display:block;max-width:100%;} .thumbnail .caption{padding:9px;} +.carousel .item{display:none;} +.carousel .active{display:block;} .hidden{display:none;visibility:hidden;} @media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} diff --git a/docs/javascript.html b/docs/javascript.html index d5aebbacd..8e5e22adb 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -117,6 +117,10 @@ bootstrap-collapse.js The collapse plugin offers simple, generic collapsible element support for making accordions and other collapsible ui components. + + bootstrap-carousel.js + Carousel add +

    Is javascript necessary?

    @@ -1002,6 +1006,61 @@ $('#myCollapsible').on('hidden', function () {
    + + + +
    @@ -1028,6 +1087,7 @@ $('#myCollapsible').on('hidden', function () { + diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index ed4b8f3fa..2e1fde11a 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -25,12 +25,29 @@ /* CAROUSEL CLASS DEFINITION * ========================= */ - var Carousel = function () { - + var Carousel = function (element) { + this.$element = $(element) + this.cycle() } Carousel.prototype = { + cycle: function () { + this.interval = setInterval($.proxy(this.right, this), 500) + } + + , pause: function () { + clearInterval(this.interval) + } + + , right: function () { + + } + + , left: function () { + + } + } diff --git a/lib/modals.less b/lib/modals.less index 53d6cd408..ec1607c51 100644 --- a/lib/modals.less +++ b/lib/modals.less @@ -22,6 +22,8 @@ top: 50%; left: 50%; z-index: 11000; + max-height: 500px; + overflow: auto; width: 560px; margin: -250px 0 0 -250px; background-color: @white; diff --git a/lib/thumbnails.less b/lib/thumbnails.less index 9e25f5027..ae2e6c94e 100644 --- a/lib/thumbnails.less +++ b/lib/thumbnails.less @@ -32,3 +32,11 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; } + +.carousel .item { + display: none; +} + +.carousel .active { + display: block; +} \ No newline at end of file -- cgit v1.2.3 From 0c3bf7275cfe0757c876be6ba6f01cad31375923 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 16:05:14 -0800 Subject: add quotes to courier new --- lib/mixins.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mixins.less b/lib/mixins.less index 83a3a31f9..32d3a83ac 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -60,7 +60,7 @@ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } .monospace() { - font-family: Menlo, Monaco, Courier New, monospace; + font-family: Menlo, Monaco, "Courier New", monospace; } } .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { -- cgit v1.2.3 From 8b58a1c3d9fea740c89f48c1771a6c7dd44e1f41 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 19:13:02 -0800 Subject: placeholder design for carousel --- bootstrap.css | 28 ++++++++++++++++++++++++++-- bootstrap.min.css | 6 ++++-- docs/javascript.html | 43 +++++++++++++++++++++++++++++++++++-------- lib/thumbnails.less | 26 +++++++++++++++++++++----- 4 files changed, 86 insertions(+), 17 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 601c1875b..ae1754aa6 100644 --- a/bootstrap.css +++ b/bootstrap.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: Mon Jan 2 16:04:30 PST 2012 + * Date: Mon Jan 2 19:12:52 PST 2012 */ html, body { margin: 0; @@ -491,7 +491,7 @@ address { } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Courier New, monospace; + font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; color: #404040; -webkit-border-radius: 3px; @@ -2584,12 +2584,36 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; } +.carousel { + position: relative; +} .carousel .item { display: none; } .carousel .active { display: block; } +.carousel .nav { + height: 50px; + position: absolute; + top: 50%; + margin: -25px 0 0; + cursor: pointer; + background: rgba(0, 0, 0, 0.7); + color: white; + font-size: 42px; + left: 5px; + font-weight: 100; + padding: 0 15px; +} +.carousel .nav.right { + right: 5px; + left: auto; +} +.carousel .nav:hover { + text-decoration: none; + background: rgba(0, 0, 0, 0.8); +} .hidden { display: none; visibility: hidden; diff --git a/bootstrap.min.css b/bootstrap.min.css index b3e5a3eef..227250226 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -87,7 +87,7 @@ blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eee;}bloc blockquote small{display:block;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} address{display:block;margin-bottom:18px;line-height:18px;} -code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Courier New, monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{padding:1px 3px;background-color:#fee9cc;} pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;} pre code{padding:0;background-color:transparent;} @@ -342,7 +342,9 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; a.thumbnail:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} .thumbnail>img{display:block;max-width:100%;} .thumbnail .caption{padding:9px;} -.carousel .item{display:none;} +.carousel{position:relative;}.carousel .item{display:none;} .carousel .active{display:block;} +.carousel .nav{height:50px;position:absolute;top:50%;margin:-25px 0 0;cursor:pointer;background:rgba(0, 0, 0, 0.7);color:white;font-size:42px;left:5px;font-weight:100;padding:0 15px;}.carousel .nav.right{right:5px;left:auto;} +.carousel .nav:hover{text-decoration:none;background:rgba(0, 0, 0, 0.8);} .hidden{display:none;visibility:hidden;} @media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal .close{padding:10px;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} diff --git a/docs/javascript.html b/docs/javascript.html index 8e5e22adb..ae464e849 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -118,8 +118,8 @@ The collapse plugin offers simple, generic collapsible element support for making accordions and other collapsible ui components. - bootstrap-carousel.js - Carousel add + bootstrap-carousel.js + A plugin for rotating through elements. A merry-go-round. @@ -1015,7 +1015,7 @@ $('#myCollapsible').on('hidden', function () {
    -

    The carousel plugin creates a carousel douh..

    +

    A generic plugin for cycling through elements. A merry-go-round.

    Download
    @@ -1023,11 +1023,40 @@ $('#myCollapsible').on('hidden', function () { 
    $('.carousel').carousel()

    Markup

    Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.

    - 
    
+
    +<div class="thumbnail carousel">
+
+  <!-- navigation -->
+  <a class="nav" href="#myCarousel" data-show="next">&lt;</a>
+  <a class="nav" href="#myCarousel" data-show="previous">&gt;</a>
+
+  <!-- items -->
+  <div class="item active">
+    <img src="http://placehold.it/1100x350">
+    <div class="caption">
+      <h5>Thumbnail label</h5>
+      <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. </p>
+    </div>
+  </div>
+
+  <div class="item">
+    <img src="http://placehold.it/1100x350">
+    <div class="caption">
+      <h5>Thumbnail label</h5>
+      <p>Donec id elit non mi porta gravida at eget metus.</p>
+    </div>
+  </div>
+
+</div>
+
    
           
    Demo
    
 
           
-          
    
+
+          
 
-            
    
+            
    
               
               
    
                 
    Thumbnail label
    
@@ -1055,8 +1084,6 @@ $('#myCollapsible').on('hidden', function () {
 
           
    
 
-
-
         
    
       
    
     
diff --git a/lib/thumbnails.less b/lib/thumbnails.less
index ae2e6c94e..181cca681 100644
--- a/lib/thumbnails.less
+++ b/lib/thumbnails.less
@@ -33,10 +33,26 @@ a.thumbnail:hover {
   padding: 9px;
 }
 
-.carousel .item {
-  display: none;
-}
+// carousel
+.carousel {
+  position: relative;
 
-.carousel .active {
-  display: block;
+  .item { display: none; }
+  .active { display: block; }
+
+  .nav {
+    height: 50px;
+    position: absolute;
+    top: 50%;
+    margin: -25px 0 0;
+    cursor: pointer;
+    background: rgba(0, 0, 0, 0.7);
+    color: white;
+    font-size: 42px;
+    left: 5px;
+    font-weight: 100;
+    padding: 0 15px;
+    &.right { right: 5px; left: auto; }
+    &:hover { text-decoration: none; background: rgba(0, 0, 0, 0.8); }
+  }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 3fb6f6ee8670acff0c681c621b87a06a087f94be Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Mon, 2 Jan 2012 22:30:57 -0800
Subject: basic carousel implementation

---
 bootstrap.css            | 39 ++++++++++++++++++++++--
 bootstrap.min.css        | 13 ++++++--
 docs/javascript.html     | 79 ++++++++++++++++++++++++------------------------
 js/bootstrap-carousel.js | 48 +++++++++++++++++++++++++----
 lib/thumbnails.less      | 32 ++++++++++++++++++--
 5 files changed, 158 insertions(+), 53 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index ae1754aa6..b4fd7e748 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Mon Jan  2 19:12:52 PST 2012
+ * Date: Mon Jan  2 22:30:09 PST 2012
  */
 html, body {
   margin: 0;
@@ -2587,13 +2587,48 @@ a.thumbnail:hover {
 .carousel {
   position: relative;
 }
+.carousel .carousel-inner {
+  overflow: hidden;
+  width: 100%;
+  position: relative;
+}
 .carousel .item {
   display: none;
+  position: relative;
+  -webkit-transition: 0.25s linear left;
+  -moz-transition: 0.25s linear left;
+  -ms-transition: 0.25s linear left;
+  -o-transition: 0.25s linear left;
+  transition: 0.25s linear left;
 }
-.carousel .active {
+.carousel .active, .carousel .next, .carousel .prev {
   display: block;
 }
+.carousel .next, .carousel .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.carousel .next {
+  left: 100%;
+}
+.carousel .prev {
+  left: -100%;
+}
+.carousel .next.left, .carousel .prev.right {
+  left: 0%;
+}
+.carousel .active.left {
+  left: -100%;
+}
+.carousel .active.right {
+  left: 100%;
+}
 .carousel .nav {
+  width: auto;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
   height: 50px;
   position: absolute;
   top: 50%;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 227250226..49e968683 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -342,9 +342,16 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 a.thumbnail:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
 .thumbnail>img{display:block;max-width:100%;}
 .thumbnail .caption{padding:9px;}
-.carousel{position:relative;}.carousel .item{display:none;}
-.carousel .active{display:block;}
-.carousel .nav{height:50px;position:absolute;top:50%;margin:-25px 0 0;cursor:pointer;background:rgba(0, 0, 0, 0.7);color:white;font-size:42px;left:5px;font-weight:100;padding:0 15px;}.carousel .nav.right{right:5px;left:auto;}
+.carousel{position:relative;}.carousel .carousel-inner{overflow:hidden;width:100%;position:relative;}
+.carousel .item{display:none;position:relative;-webkit-transition:0.25s linear left;-moz-transition:0.25s linear left;-ms-transition:0.25s linear left;-o-transition:0.25s linear left;transition:0.25s linear left;}
+.carousel .active,.carousel .next,.carousel .prev{display:block;}
+.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;}
+.carousel .next{left:100%;}
+.carousel .prev{left:-100%;}
+.carousel .next.left,.carousel .prev.right{left:0%;}
+.carousel .active.left{left:-100%;}
+.carousel .active.right{left:100%;}
+.carousel .nav{width:auto;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;height:50px;position:absolute;top:50%;margin:-25px 0 0;cursor:pointer;background:rgba(0, 0, 0, 0.7);color:white;font-size:42px;left:5px;font-weight:100;padding:0 15px;}.carousel .nav.right{right:5px;left:auto;}
 .carousel .nav:hover{text-decoration:none;background:rgba(0, 0, 0, 0.8);}
 .hidden{display:none;visibility:hidden;}
 @media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal .close{padding:10px;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/docs/javascript.html b/docs/javascript.html
index ae464e849..4d90dbcf1 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1026,62 +1026,66 @@ $('#myCollapsible').on('hidden', function () {
 
     <div class="thumbnail carousel">
 
-  <!-- navigation -->
-  <a class="nav" href="#myCarousel" data-show="next">&lt;</a>
-  <a class="nav" href="#myCarousel" data-show="previous">&gt;</a>
-
   <!-- items -->
-  <div class="item active">
-    <img src="http://placehold.it/1100x350">
-    <div class="caption">
-      <h5>Thumbnail label</h5>
-      <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. </p>
+  <div class="carousel-inner">
+    <div class="item active">
+      <img src="http://placehold.it/1100x350">
+      <div class="caption">
+        <h5>Thumbnail label</h5>
+        <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. </p>
+      </div>
     </div>
-  </div>
 
-  <div class="item">
-    <img src="http://placehold.it/1100x350">
-    <div class="caption">
-      <h5>Thumbnail label</h5>
-      <p>Donec id elit non mi porta gravida at eget metus.</p>
+    <div class="item">
+      <img src="http://placehold.it/1100x350">
+      <div class="caption">
+        <h5>Thumbnail label</h5>
+        <p>Donec id elit non mi porta gravida at eget metus.</p>
+      </div>
     </div>
   </div>
 
+  <!-- navigation -->
+  <a class="nav" href="#myCarousel" data-slide="next">&lt;</a>
+  <a class="nav" href="#myCarousel" data-slide="prev">&gt;</a>
+
 </div>
 
    
           
    Demo
    
 
           
 
-          
+    
    
+      
    Light red background color is only used to show the dimensions of the icons in the docs.
    
+    
    
   
    
 
   
    
@@ -1328,7 +1364,38 @@ Form states
   
    
 
   
    Examples
    
-  
     Button
    
+  
    
+    
    
+      
    Use them in buttons, or in button groups for a toolbar style presentation.
    
+      
    
+         Refresh
+         Settings
+      
    
+      
    
+        
    
+          
+          
+          
+        
    
+        
    
+          
+          
+          
+          
+        
    
+      
    
+    
    
+    
    
+      
    Or, use them in navigation.
    
+      
    
+        
+      
    
+    
    
+  
    
 
 
 
diff --git a/lib/buttons.less b/lib/buttons.less
index bc2df0fb6..3fab6e039 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -35,7 +35,7 @@
 .btn {
   // Button Base
   display: inline-block;
-  padding: 5px 14px 6px;
+  padding: 5px 10px 6px;
   font-size: @baseFontSize;
   line-height: normal;
   color: #333;
diff --git a/lib/forms.less b/lib/forms.less
index 32acbdaba..ddd735cc4 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -42,10 +42,11 @@ input,
 textarea,
 select,
 .uneditable-input {
-  display: inline-block;
+  display: block;
   width: 210px;
   height: @baseLineHeight;
   padding: 4px;
+  margin-bottom: 9px;
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
   color: @gray;
@@ -177,7 +178,6 @@ select:focus {
 // Grid style input sizes
 // This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
 .formColumns(@columnSpan: 1) {
-  display: inline-block;
   float: none;
   width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
   margin-left: 0;
@@ -224,6 +224,7 @@ textarea[readonly] {
 
 
 
+
 // FORM FIELD FEEDBACK STATES
 // --------------------------
 
@@ -289,10 +290,10 @@ textarea[readonly] {
 }
 
 // Placeholder text gets special styles; can't be bundled together though for some reason
-:-moz-placeholder {
+input:-moz-placeholder {
   color: @grayLight;
 }
-::-webkit-input-placeholder {
+input::-webkit-input-placeholder {
   color: @grayLight;
 }
 
@@ -301,7 +302,7 @@ textarea[readonly] {
 // HELP TEXT
 // ---------
 
-.help-text {
+.help-block {
   margin-top: 5px;
   margin-bottom: 0;
   color: @grayLight;
@@ -314,12 +315,6 @@ textarea[readonly] {
   padding-left: 5px;
 }
 
-// Big blocks of help text
-.help-block {
-  display: block;
-  max-width: 600px;
-}
-
 
 
 // INPUT GROUPS
@@ -328,6 +323,7 @@ textarea[readonly] {
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-prepend,
 .input-append {
+  margin-bottom: 5px;
   .clearfix(); // Clear the float to prevent wrapping
   input {
     .border-radius(0 3px 3px 0);
@@ -377,6 +373,8 @@ textarea[readonly] {
 // -----------
 
 .search-form .search-query {
+  padding-left: 14px;
+  padding-right: 14px;
   .border-radius(14px);
 }
 
@@ -388,6 +386,18 @@ textarea[readonly] {
 // Common properties
 // -----------------
 
+.search-form,
+.inline-form,
+.horizontal-form {
+  input,
+  textarea,
+  select,
+  .uneditable-input {
+    display: inline-block;
+    margin-bottom: 0;
+  }
+}
+
 // Margin to space out fieldsets
 .control-group {
   margin-bottom: @baseLineHeight;
diff --git a/lib/mixins.less b/lib/mixins.less
index 32d3a83ac..49eabb875 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -98,7 +98,6 @@
 
 // Necessary grid styles for every column to make them appear next to each other horizontally
 .gridColumn() {
-  display: inline;
   float: left;
   margin-left: @gridGutterWidth;
 }
-- 
cgit v1.2.3


From 7582520808ad6c3610831652d0d4d33ea4ebf15b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 5 Jan 2012 22:37:23 -0800
Subject: docs cleanup and navbar brand hover

---
 bootstrap.css      |  4 ++--
 bootstrap.min.css  |  2 +-
 docs/base-css.html | 68 ++++++++++++++++++++++++++++++++----------------------
 lib/navbar.less    |  2 +-
 4 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 0014fcdcc..e2ef40a6c 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan  5 21:43:09 PST 2012
+ * Date: Thu Jan  5 22:37:16 PST 2012
  */
 html, body {
   margin: 0;
@@ -1644,7 +1644,7 @@ i {
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }
-.navbar .brand a:hover, .navbar ul .active > a {
+.navbar .brand:hover, .navbar ul .active > a {
   color: #ffffff;
   text-decoration: none;
   background-color: #333333;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 86aa51cda..3d5ec0d6c 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -280,7 +280,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .close{float:right;font-size:20px;font-weight:bold;line-height:13.5px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;}
 .navbar{overflow:visible;}
 .navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
-.navbar .brand a:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);}
+.navbar .brand:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);}
 .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
 .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
 .navbar .btn{margin-top:5px;}
diff --git a/docs/base-css.html b/docs/base-css.html
index 225f10ae2..a0c3c4cf1 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -638,7 +638,6 @@
 
   
    3. Bordered table
    
   
    Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.
    
-  
    Note Bordered tables do not work well with rowspan due to somewhat hacky CSS applied to the tables. Sorry about that!
    
   
@@ -1177,37 +1176,52 @@
     
 
-  
    Button groups
    
-  
    
-    
    
-      Left
-      Middle
-      Right
+  
    
+
+  
    
+    
    
+      
    Button groups
    
+      
    Use button groups to join multiple buttons together as one composite component. Button groups can be built with not only <a> or <button> elements, but also radios and checkboxes.
    
+      
    You can also combine sets of button groups into a toolbar for more complex projects.
    
+      
    Get the javascript »
    
+      
    Heads up: CSS for button groups is in a separate file, button-groups.less.
    
     
    
-  
    
-  
    
-    
    
-      
    
-        1
-        2
-        3
-        4
-        5
-      
    
-      
    
-        6
-        7
-        8
-      
    
-      
    
-        9
+    
    
+      
    Linked button group
    
+      
    Using the standard <a class="btn" href="#">...</a> markup, simply add all the buttons you need.
    
+      
    
+        
    
+          Left
+          Middle
+          Right
+        
    
       
    
-      
    
-        10
+      
    Level up one more time by wrapping multiple instances of <div class="btn-group"> with <div class="btn-toolbar">.
    
+      
    
+        
    
+          
    
+            1
+            2
+            3
+            4
+            5
+          
    
+          
    
+            6
+            7
+            8
+          
    
+          
    
+            9
+          
    
+          
    
+            10
+          
    
+        
    
       
    
     
    
   
    
-
+    
 
 
 
diff --git a/lib/navbar.less b/lib/navbar.less
index d57f316f5..7e0b17d43 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -20,7 +20,7 @@
 // Text and links
 .navbar {
   // Hover and active states
-  .brand a:hover,
+  .brand:hover,
   ul .active > a {
     color: @white;
     text-decoration: none;
-- 
cgit v1.2.3


From 5cb76037ae70ca26a923750ca9441b04d2fbd6a7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 5 Jan 2012 23:24:19 -0800
Subject: fixing conflict in dividers in navbar, fix navbar docs, fix search
 form in navbar

---
 bootstrap.css            |  8 +++++---
 bootstrap.min.css        |  6 +++---
 docs/assets/css/docs.css |  1 -
 docs/base-css.html       |  2 +-
 docs/components.html     | 11 +++++------
 lib/forms.less           |  3 ++-
 lib/navbar.less          |  3 ++-
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index e2ef40a6c..4d8edd4fb 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan  5 22:37:16 PST 2012
+ * Date: Thu Jan  5 23:24:01 PST 2012
  */
 html, body {
   margin: 0;
@@ -957,9 +957,10 @@ input::-webkit-input-placeholder {
   -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
-.search-form .search-query {
+.search-query {
   padding-left: 14px;
   padding-right: 14px;
+  margin-bottom: 0;
   -webkit-border-radius: 14px;
   -moz-border-radius: 14px;
   border-radius: 14px;
@@ -1764,7 +1765,7 @@ i {
   background-color: #222;
   background-color: rgba(0, 0, 0, 0.5);
 }
-.nav .divider {
+.nav .vertical-divider {
   height: 40px;
   width: 1px;
   margin: 0 5px;
@@ -1796,6 +1797,7 @@ i {
   background: rgba(255, 255, 255, 0.05);
 }
 .nav .dropdown-menu li a {
+  padding: 4px 15px;
   color: #999;
   text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 3d5ec0d6c..c93f333ee 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -156,7 +156,7 @@ input::-webkit-input-placeholder{color:#999999;}
 .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{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
-.search-form .search-query{padding-left:14px;padding-right:14px;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
+.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
 .search-form input,.inline-form input,.horizontal-form input,.search-form textarea,.inline-form textarea,.horizontal-form textarea,.search-form select,.inline-form select,.horizontal-form select,.search-form .uneditable-input,.inline-form .uneditable-input,.horizontal-form .uneditable-input{display:inline-block;margin-bottom:0;}
 .control-group{margin-bottom:18px;}
 .control-group>label{font-weight:bold;}
@@ -294,11 +294,11 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}.nav>li{display:block;float:left;}
 .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.nav a:hover{color:#ffffff;text-decoration:none;}
 .nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
-.nav .divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;}
+.nav .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;}
 .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;border:0;}
 .nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);}
 .nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#ffffff;}.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);}
-.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);color:#ffffff;}
+.nav .dropdown-menu li a{padding:4px 15px;color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);color:#ffffff;}
 .nav .dropdown-menu .active a{color:#ffffff;}
 .nav .dropdown-menu .divider{background-color:#222;border-color:#444;}
 .tabs,.pills{padding:0;margin:0 0 20px;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;*display:inline;content:"";zoom:1;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 41c7ae4b6..6cffcbc20 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -41,7 +41,6 @@ body > .navbar-fixed .brand:hover {
 }
 .page-header h1 {
   margin-bottom: 17px;
-  font-size: 36px;
   line-height: 1;
 }
 
diff --git a/docs/base-css.html b/docs/base-css.html
index a0c3c4cf1..399a41463 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1181,7 +1181,7 @@
   
    
     
    
       
    Button groups
    
-      
    Use button groups to join multiple buttons together as one composite component. Button groups can be built with not only <a> or <button> elements, but also radios and checkboxes.
    
+      
    Use button groups to join multiple buttons together as one composite component. Just build them with a series of <a> or <button> elements. Button groups can also function as radios and checkboxes (see the Javascript docs for that).
    
       
    You can also combine sets of button groups into a toolbar for more complex projects.
    
       
    Get the javascript »
    
       
    Heads up: CSS for button groups is in a separate file, button-groups.less.
    
diff --git a/docs/components.html b/docs/components.html
index e57d1fd17..5c25a98a4 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -267,7 +267,6 @@
   
    
     
    Navbar
    
   
    
-  
    Fixed navbar
    
   
    
     
    
       
    
@@ -287,11 +286,11 @@
             
           
         
-        
    
+        
           
         
         
      
-          
    • 
+          
    • 
           
    • 
             Dropdown
             
        
@@ -308,15 +307,15 @@
 
   
        
     
        
-      
        What is it
        
+      
        What is it
        
       
        Our navbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.
        
     
        
     
        
-      
        Customizable
        
+      
        Customizable
        
       
        All elements within, and the entire navbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav—or any combination of that.
        
     
        
     
        
-      
        Dropdowns included
        
+      
        Dropdowns included
        
       
        As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns <li> tags also support .active for showing current page selection.
        
     
        
   
        
diff --git a/lib/forms.less b/lib/forms.less
index ddd735cc4..938983536 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -372,9 +372,10 @@ input::-webkit-input-placeholder {
 // SEARCH FORM
 // -----------
 
-.search-form .search-query {
+.search-query {
   padding-left: 14px;
   padding-right: 14px;
+  margin-bottom: 0; // remove the default margin on all inputs
   .border-radius(14px);
 }
 
diff --git a/lib/navbar.less b/lib/navbar.less
index 7e0b17d43..a96aa941c 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -153,7 +153,7 @@
     background-color: rgba(0,0,0,.5);
   }
   // Dividers (basically a vertical hr)
-  .divider {
+  .vertical-divider {
     height: 40px;
     width: 1px;
     margin: 0 5px;
@@ -188,6 +188,7 @@
       }
     }
     li a {
+      padding: 4px 15px;
       color: #999;
       text-shadow: 0 1px 0 rgba(0,0,0,.5);
       &:hover {
-- 
cgit v1.2.3


From f07bcafd397dd39c5490e192ab7b52c49acd3d9b Mon Sep 17 00:00:00 2001
From: Nicklas Ansman Giertz 
Date: Fri, 6 Jan 2012 11:16:29 +0100
Subject: Make twipsy respect custom classes when using a custom template

If you had a custom class to the root object twipsy would overwrite
that class ($tip[0].className = 'twipsy'), now this has been changed
so it removes only classes that twipsy adds.
---
 js/bootstrap-twipsy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js
index a176f0908..1ce4ad85b 100644
--- a/js/bootstrap-twipsy.js
+++ b/js/bootstrap-twipsy.js
@@ -155,7 +155,7 @@
   , setContent: function () {
       var $tip = this.tip()
       $tip.find('.twipsy-inner').html(this.getTitle())
-      $tip[0].className = 'twipsy'
+      $tip.removeClass('fade in top bottom left right')
     }
 
   , hide: function () {
-- 
cgit v1.2.3


From 969fbe71504f6a8159688634cce774d7ffc7ac67 Mon Sep 17 00:00:00 2001
From: Nicklas Ansman Giertz 
Date: Fri, 6 Jan 2012 11:32:11 +0100
Subject: Add a test case for issue #908 (twipsy doesn't respect custom
 classes)

The test case verifies that a custom class is respected.
---
 js/tests/unit/bootstrap-twipsy.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/js/tests/unit/bootstrap-twipsy.js b/js/tests/unit/bootstrap-twipsy.js
index 6623fc026..08512ca97 100644
--- a/js/tests/unit/bootstrap-twipsy.js
+++ b/js/tests/unit/bootstrap-twipsy.js
@@ -48,4 +48,15 @@ $(function () {
         ok(!$(".twipsy").length, 'twipsy removed')
       })
 
+      test("should respect custom classes", function () {
+        var twipsy = $('')
+          .appendTo('#qunit-fixture')
+          .twipsy({ template: '
        '})
+          .twipsy('show')
+
+        ok($('.twipsy').hasClass('some-class'), 'custom class is present')
+        twipsy.twipsy('hide')
+        ok(!$(".twipsy").length, 'twipsy removed')
+      })
+
 })
\ No newline at end of file
-- 
cgit v1.2.3


From dd99e2d0488c503d929909e431a544e472782178 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Fri, 6 Jan 2012 18:30:32 -0800
Subject: start of autocomplete plugin

---
 js/bootstrap-typeahead.js            | 190 +++++++++++++++++++++++++++++++++++
 js/tests/index.html                  |   2 +
 js/tests/unit/bootstrap-typeahead.js | 122 ++++++++++++++++++++++
 3 files changed, 314 insertions(+)
 create mode 100644 js/bootstrap-typeahead.js
 create mode 100644 js/tests/unit/bootstrap-typeahead.js

diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
new file mode 100644
index 000000000..52ced3fef
--- /dev/null
+++ b/js/bootstrap-typeahead.js
@@ -0,0 +1,190 @@
+/* =============================================================
+ * bootstrap-typeahead.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#collapsible
+ * =============================================================
+ * Copyright 2011 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+!function( $ ){
+
+  "use strict"
+
+  var Typeahead = function ( element, options ) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.$menu = $(this.options.menu).appendTo('body')
+    this.data = this.options.data
+    this.shown = false
+    this.listen()
+  }
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead
+
+  , matcher: function(item, query) {
+      return ~item.indexOf(query)
+    }
+
+  , select: function(event) {
+      this.$element.val($(event.target).attr('data-value'))
+      this.hide()
+    }
+
+  , show: function () {
+      this.shown = true
+      this.$menu.show()
+      return this
+    }
+
+  , hide: function () {
+      this.shown = false
+      this.$menu.hide()
+      return this
+    }
+
+  , lookup: function (event) {
+      var query = this.$element.val()
+        , that = this
+
+      var items = this.data.filter(function (item) {
+        if (that.matcher(item, query)) {
+          return item
+        }
+      })
+
+      if (!items.length) {
+        return this.shown ? this.hide() : this
+      }
+
+      return this.render(items).show()
+    }
+
+  , render: function(items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        return $(that.options.item)
+          .text(item)
+          .attr('data-value', item)[0]
+      })
+
+      items.first().addClass('active')
+
+      this.$menu.append(items)
+
+      return this
+    }
+
+  , next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next() || $(this.$menu.find('li')[0])
+
+      next.addClass('active')
+    }
+
+  , prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.prev() || this.$menu.find('li').last()
+
+      next.addClass('active')
+    }
+
+  , keyup: function () {
+      event
+        .stopPropagation()
+        .preventDefault()
+
+      switch(event.keyCode) {
+        case 9: // tab
+        case 13: // enter
+          this.select()
+          break
+
+        case 27: // escape
+          this.hide()
+          break
+
+        default:
+          this.lookup()
+      }
+  }
+
+  , keypress: function (event) {
+      event.stopPropagation()
+      switch(event.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          event.preventDefault()
+          break
+
+        case 38: // up arrow
+          this.prev()
+          event.preventDefault()
+          break
+
+        case 40: // down arrow
+          this.next()
+          event.preventDefault()
+          break
+      }
+  }
+
+  , listen: function () {
+      this.$element
+        .on('focus', this.show)
+        .on('blur', $.proxy(this.hide, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup', this.keyup)
+        .on('change', $.proxy(this.lookup, this))
+
+      if ($.browser.webkit || $.browser.msie) {
+        this.$element.on('keydown', this.keypress)
+      }
+
+      this.$menu
+        .on('click', '* > *', $.proxy(this.select, this))
+        .on('mouseenter', function () {
+          /* remove selected class, add to mouseover */
+        })
+    }
+  }
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+  * ============================== */
+
+  $.fn.typeahead = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.typeahead.defaults = {
+    data: null
+  , items: 8
+  , empty: false
+  , noresults: false
+  , menu: '
          '
+  , item: '
        • '
+  }
+
+  $.fn.typeahead.Constructor = Typeahead
+
+}( window.jQuery )
\ No newline at end of file
diff --git a/js/tests/index.html b/js/tests/index.html
index e8ed2c5fe..27c2b3412 100644
--- a/js/tests/index.html
+++ b/js/tests/index.html
@@ -22,6 +22,7 @@
   
   
   
+  
 
   
   
@@ -34,6 +35,7 @@
   
   
   
+  
 
 
   
          
diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js
new file mode 100644
index 000000000..dc46a7990
--- /dev/null
+++ b/js/tests/unit/bootstrap-typeahead.js
@@ -0,0 +1,122 @@
+$(function () {
+
+    module("bootstrap-typeahead")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).typeahead, 'alert method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).typeahead()[0] == document.body, 'document.body returned')
+      })
+
+      test("should listen to an input", function () {
+        var $input = $('')
+        $input.typeahead()
+        ok($input.data('events').focus, 'has a focus event')
+        ok($input.data('events').blur, 'has a blur event')
+        ok($input.data('events').keypress, 'has a keypress event')
+        ok($input.data('events').keyup, 'has a keyup event')
+        ok($input.data('events').change, 'has a change event')
+        if ($.browser.webkit || $.browser.msie) {
+          ok($input.data('events').keydown, 'has a keydown event')
+        } else {
+          ok($input.data('events').keydown, 'does not have a keydown event')
+        }
+      })
+
+      test("should create a menu", function () {
+        var $input = $('')
+        ok($input.typeahead().data('typeahead').$menu, 'has a menu')
+      })
+
+      test("should listen to the menu", function () {
+        var $input = $('')
+          , $menu = $input.typeahead().data('typeahead').$menu
+
+        ok($menu.data('events').mouseover, 'has a mouseover(pseudo: mouseenter)')
+        ok($menu.data('events').click, 'has a click')
+      })
+
+      test("should show menu when query entered", function () {
+        var $input = $('').typeahead({
+              data: ['aa', 'ab', 'ac']
+            })
+          , typeahead = $input.data('typeahead')
+
+        $input.val('a').change()
+
+        ok(typeahead.$menu.is(":visible"), 'typeahead is visible')
+        equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
+        equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
+
+        typeahead.$menu.remove()
+      })
+
+      test("should hide menu when query entered", function () {
+        var $input = $('').typeahead({
+              data: ['aa', 'ab', 'ac']
+            })
+          , typeahead = $input.data('typeahead')
+
+        $input.val('a').change()
+
+        ok(typeahead.$menu.is(":visible"), 'typeahead is visible')
+        equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
+        equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
+
+        $input.blur()
+
+        ok(!typeahead.$menu.is(":visible"), "typeahead is no longer visible")
+
+        typeahead.$menu.remove()
+      })
+
+      test("should set next item when down arrow is pressed", function () {
+        var $input = $('').typeahead({
+              data: ['aa', 'ab', 'ac']
+            })
+          , typeahead = $input.data('typeahead')
+
+        $input.val('a').change()
+
+        ok(typeahead.$menu.is(":visible"), 'typeahead is visible')
+        equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
+        equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
+        ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
+
+        $input.trigger({
+          type: 'keypress'
+        , keyCode: 40
+        })
+
+        ok(typeahead.$menu.find('li').first().next().hasClass('active'), "second item is active")
+
+
+        $input.trigger({
+          type: 'keypress'
+        , keyCode: 38
+        })
+
+        ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
+
+        typeahead.$menu.remove()
+      })
+
+
+      test("should set input value to selected item", function () {
+        var $input = $('').typeahead({
+              data: ['aa', 'ab', 'ac']
+            })
+          , typeahead = $input.data('typeahead')
+
+        $input.val('a').change()
+
+        $(typeahead.$menu.find('li')[2]).trigger('click')
+
+        equals($input.val(), 'ac', 'input value was correctly set')
+        ok(!typeahead.$menu.is(':visible'), 'the menu was hidden')
+
+        typeahead.$menu.remove()
+      })
+})
\ No newline at end of file
-- 
cgit v1.2.3


From cfc2353059df628c67d19a3c5c3ead2cc6051f53 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 6 Jan 2012 23:59:22 -0800
Subject: front page docs updated to include old getting started section,
 update code styles to look like github gists, and lots more docs updates

---
 bootstrap.css                                    |  50 ++++---
 bootstrap.min.css                                |  19 ++-
 docs/assets/css/docs.css                         |  73 +++++++++-
 docs/assets/js/google-code-prettify/prettify.css |  16 ++-
 docs/base-css.html                               |  14 ++
 docs/components.html                             | 171 +++++++++++++++++------
 docs/index.html                                  |  40 +++++-
 docs/less.html                                   |   6 +-
 docs/scaffolding.html                            |   1 -
 docs/upgrading.html                              |   3 +
 lib/forms.less                                   |  10 ++
 lib/navbar.less                                  |   5 +
 lib/sidenav.less                                 |  11 +-
 lib/type.less                                    |  12 +-
 14 files changed, 340 insertions(+), 91 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 4d8edd4fb..85ed7961a 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan  5 23:24:01 PST 2012
+ * Date: Fri Jan  6 23:58:33 PST 2012
  */
 html, body {
   margin: 0;
@@ -382,20 +382,20 @@ h3 {
 h3 small {
   font-size: 14px;
 }
+h4, h5, h6 {
+  line-height: 18px;
+}
 h4 {
-  font-size: 16px;
-  line-height: 36px;
+  font-size: 14px;
 }
 h4 small {
   font-size: 12px;
 }
 h5 {
-  font-size: 14px;
-  line-height: 18px;
+  font-size: 12px;
 }
 h6 {
-  font-size: 13px;
-  line-height: 18px;
+  font-size: 11px;
   color: #999999;
   text-transform: uppercase;
 }
@@ -625,6 +625,12 @@ textarea {
 .controls > .radio:first-child, .controls > .checkbox:first-child {
   padding-top: 6px;
 }
+.radio.inline, .checkbox.inline {
+  display: inline-block;
+}
+.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
 input, textarea {
   -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
@@ -1672,6 +1678,9 @@ i {
 .navbar .btn {
   margin-top: 5px;
 }
+.navbar-form {
+  margin-bottom: 0;
+}
 .navbar-search {
   position: relative;
   float: left;
@@ -2111,19 +2120,22 @@ i {
 }
 .side-nav .nav-label, .side-nav .nav-item {
   display: block;
-  padding: 3px 16px;
+  padding: 3px 15px;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
 .side-nav .nav-label {
   font-size: 11px;
   line-height: 18px;
-  color: #333333;
+  color: #999999;
   text-transform: uppercase;
 }
 .side-nav .nav-group {
-  margin: 0 -1px;
+  margin: 0;
   list-style: none;
 }
+.side-nav .nav-group + .nav-label {
+  margin-top: 9px;
+}
 .side-nav .nav-item {
   font-weight: bold;
 }
@@ -2136,16 +2148,16 @@ i {
 .side-nav .active .nav-item {
   color: #fff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
-  background-color: #aaaaaa;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#aaaaaa));
-  background-image: -moz-linear-gradient(top, #cccccc, #aaaaaa);
-  background-image: -ms-linear-gradient(top, #cccccc, #aaaaaa);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #aaaaaa));
-  background-image: -webkit-linear-gradient(top, #cccccc, #aaaaaa);
-  background-image: -o-linear-gradient(top, #cccccc, #aaaaaa);
-  background-image: linear-gradient(top, #cccccc, #aaaaaa);
+  background-color: #999999;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#999999));
+  background-image: -moz-linear-gradient(top, #cccccc, #999999);
+  background-image: -ms-linear-gradient(top, #cccccc, #999999);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #999999));
+  background-image: -webkit-linear-gradient(top, #cccccc, #999999);
+  background-image: -o-linear-gradient(top, #cccccc, #999999);
+  background-image: linear-gradient(top, #cccccc, #999999);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#aaaaaa', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#999999', GradientType=0);
   -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05);
   -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05);
diff --git a/bootstrap.min.css b/bootstrap.min.css
index c93f333ee..16f9fb76b 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -66,9 +66,10 @@ h1,h2,h3,h4,h5,h6{font-weight:bold;color:#333333;text-rendering:optimizelegibili
 h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}
 h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}
 h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
-h4{font-size:16px;line-height:36px;}h4 small{font-size:12px;}
-h5{font-size:14px;line-height:18px;}
-h6{font-size:13px;line-height:18px;color:#999999;text-transform:uppercase;}
+h4,h5,h6{line-height:18px;}
+h4{font-size:14px;}h4 small{font-size:12px;}
+h5{font-size:12px;}
+h6{font-size:11px;color:#999999;text-transform:uppercase;}
 ul,ol{margin:0 0 9px 25px;}
 ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
 ul{list-style:disc;}
@@ -107,6 +108,8 @@ textarea{height:auto;}
 .radio,.checkbox{padding-left:18px;}
 .radio input[type=radio],.checkbox input[type=checkbox]{float:left;margin-left:-18px;}
 .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;}
+.radio.inline,.checkbox.inline{display:inline-block;}
+.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
 input,textarea{-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
 input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
 input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;}
@@ -284,6 +287,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
 .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
 .navbar .btn{margin-top:5px;}
+.navbar-form{margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background-color:#444;background-color:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#eeeeee;}
 .navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
@@ -340,13 +344,14 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .subnav li:last-child a{border-right:0;-webkit-border-radius:0 6px 6px 0;-moz-border-radius:0 6px 6px 0;border-radius:0 6px 6px 0;}
 .subnav ul .active>a{color:#333333;background-color:#eee;}
 .side-nav{padding:9px 0;}
-.side-nav .nav-label,.side-nav .nav-item{display:block;padding:3px 16px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
-.side-nav .nav-label{font-size:11px;line-height:18px;color:#333333;text-transform:uppercase;}
-.side-nav .nav-group{margin:0 -1px;list-style:none;}
+.side-nav .nav-label,.side-nav .nav-item{display:block;padding:3px 15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
+.side-nav .nav-label{font-size:11px;line-height:18px;color:#999999;text-transform:uppercase;}
+.side-nav .nav-group{margin:0;list-style:none;}
+.side-nav .nav-group+.nav-label{margin-top:9px;}
 .side-nav .nav-item{font-weight:bold;}
 .side-nav .nav-item i{vertical-align:-2px;}
 .side-nav .nav-item:hover{text-decoration:none;}
-.side-nav .active .nav-item{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);background-color:#aaaaaa;background-image:-khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#aaaaaa));background-image:-moz-linear-gradient(top, #cccccc, #aaaaaa);background-image:-ms-linear-gradient(top, #cccccc, #aaaaaa);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #aaaaaa));background-image:-webkit-linear-gradient(top, #cccccc, #aaaaaa);background-image:-o-linear-gradient(top, #cccccc, #aaaaaa);background-image:linear-gradient(top, #cccccc, #aaaaaa);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#aaaaaa', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.05),inset 0 -1px 0 rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.05),inset 0 -1px 0 rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.05),inset 0 -1px 0 rgba(0, 0, 0, 0.05);}
+.side-nav .active .nav-item{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);background-color:#999999;background-image:-khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#999999));background-image:-moz-linear-gradient(top, #cccccc, #999999);background-image:-ms-linear-gradient(top, #cccccc, #999999);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #999999));background-image:-webkit-linear-gradient(top, #cccccc, #999999);background-image:-o-linear-gradient(top, #cccccc, #999999);background-image:linear-gradient(top, #cccccc, #999999);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#999999', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.05),inset 0 -1px 0 rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.05),inset 0 -1px 0 rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.05),inset 0 -1px 0 rgba(0, 0, 0, 0.05);}
 .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
 .breadcrumb .divider{padding:0 5px;color:#999999;}
 .breadcrumb .active a{color:#333333;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 6cffcbc20..579baad7d 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -192,6 +192,75 @@ body > .navbar-fixed .brand:hover {
 }
 
 
+/* Quickstart section for getting le code
+-------------------------------------------------- */
+.getting-started {
+  background-color: #f5f5f5;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5));
+  background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5);
+  background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5);
+  background-image: -o-linear-gradient(#f9f9f9, #f5f5f5);
+  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)";
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0);
+  background-image: linear-gradient(#f9f9f9, #f5f5f5);
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+.getting-started {
+  border-color: #eee;
+}
+.getting-started td {
+  width: 33%;
+  border-right: 1px solid #eee;
+}
+.getting-started td + td {
+  border-left: 1px solid #fff;
+}
+.getting-started td:last-child {
+  border-right: 0;
+}
+.quick-start {
+  padding: 17px 20px;
+}
+.quick-start h3,
+.quick-start p {
+  line-height: 18px;
+  text-align: center;
+  margin-bottom: 9px;
+}
+.quick-start p {
+  color: #777;
+}
+.quick-start .current-version,
+.quick-start .current-version a {
+  color: #999;
+}
+.quick-start form {
+  margin-bottom: 0;
+}
+.quick-start textarea {
+  display: block;
+  width: 100%;
+  height: auto;
+  margin-bottom: 0;
+  line-height: 21px;
+  white-space: nowrap;
+  overflow: hidden;
+  /* Makes inputs behave like true block-level elements */
+  -webkit-box-sizing: border-box; /* Older Webkit */
+     -moz-box-sizing: border-box; /* Older FF */
+      -ms-box-sizing: border-box; /* IE8 */
+          box-sizing: border-box; /* CSS3 spec*/
+  /* Hacks for IE7 to make this work just okay enough to function */
+  *width: 90%;
+  *height: 24px;
+}
+
+
 /* Footer
 -------------------------------------------------- */
 .footer {
@@ -341,8 +410,10 @@ h2 + table {
 .example-sites img {
   max-width: 290px;
 }
-.built-with {
+.marketing-byline {
   margin: -18px 0 27px;
+  font-size: 18px;
+  font-weight: 300;
   color: #999;
   text-align: center;
 }
diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css
index 7ff618550..e3bbf8b6c 100644
--- a/docs/assets/js/google-code-prettify/prettify.css
+++ b/docs/assets/js/google-code-prettify/prettify.css
@@ -2,10 +2,10 @@
 .lit { color: #195f91; }
 .pun, .opn, .clo { color: #93a1a1; }
 .fun { color: #dc322f; }
-.str, .atv { color: #62C462; }
-.kwd, .linenums .tag { color: #049CD9; }
-.typ, .atn, .dec, .var { color: #EE5F5B; }
-.pln { color: #93a1a1; }
+.str, .atv { color: #D14; }
+.kwd, .linenums .tag { color: #1e347b; }
+.typ, .atn, .dec, .var { color: teal; }
+.pln { color: #48484c; }
 pre.prettyprint {
   background-color: #fefbf3;
   padding: 9px;
@@ -17,8 +17,14 @@ pre.prettyprint {
   background-color: #252525;
 }
 
+pre.prettyprint {
+  padding: 8px;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+
 /* Specify class=linenums on a pre to get line numbering */
 ol.linenums { margin: 0 0 0 40px; } /* IE indents via margin-left */
-ol.linenums li { color: #444; line-height: 18px; }
+ol.linenums li { color: #bebec5; line-height: 18px; text-shadow: 0 1px 0 #fff; }
 /* Alternate shading for lines */
 li.L1, li.L3, li.L5, li.L7, li.L9 {  }
\ No newline at end of file
diff --git a/docs/base-css.html b/docs/base-css.html
index 399a41463..cbdf5ea19 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1044,6 +1044,20 @@
             
          Here's more help text
          
           
          
         
+        
          
+          
+          
          
+            
+            
+            
+          
          
+        
          
         
          
           
           
          
diff --git a/docs/components.html b/docs/components.html
index 5c25a98a4..5bafc5a60 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -227,27 +227,27 @@
 ================================================== -->
 
          
   
          
-    
          Side nav 
          
+    
          Side nav for lists of links
          
   
          
 
   
          
     
          
+      
          Examples
          
+      
          Side navs can be just links, links with headings, and links with icons.
          
       
          
-        
          Your account
          
         
+        
          Your account
          
+        
-      
          
-    
          
-    
          
-      
          
         
          Your account
          
         
       
          
     
          
+    
          
+      
          Why use it
          
+      
          
+    
          
+    
          
+      
          Markup
          
+      
          Marking up a side nav is at the core just writing an unordered list of links.
          
+
          +  <ul class="nav-group">
+    <li class="active">
+      <a class="nav-item" href="#">Home</a>
+    </li>
+    <li><a class="nav-item" href="#">Library</a></li>
+    <li><a class="nav-item" href="#">Help</a></li>
+  </ul>
+
          
+      
          Bootstrap also makes it easy to expand a regular list of links with multiple groups and headings.
          
+
          +  <h6 class="nav-label"></h6>
+  <ul class="nav-group">
+    ...
+  </ul>
+  <h6 class="nav-label"></h6>
+  <ul class="nav-group">
+    ...
+  </ul>
+
          
+    
          
   
          
   
 
          
@@ -267,10 +295,12 @@
   
          
     
          Navbar
          
   
          
-  
          
+  
          Static navbar example
          
+  
          An example of a static (not fixed to the top) navbar with project name, navigation, and search form.
          
+  
          
     
          
       
          
-        Project Name
+        Project name
         
          
 
   
          
-    
          
-      
          What is it
          
-      
          Our navbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.
          
-    
          
-    
          
-      
          Customizable
          
-      
          All elements within, and the entire navbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav—or any combination of that.
          
+    
          
+      
          Navbar scaffolding
          
+      
          The navbar requires only a few divs to structure it well for static or fixed display.
          
+
          +<div class="navbar navbar-static">
+  <div class="navbar-inner">
+    <div class="container" style="width: auto;">
+      ...
+    </div>
+  </div>
+</div>
+
          
+      
          To make the navbar fixed, swamp the .navbar-static class for .navbar-fixed. In your CSS, you will also need to account for the overlap it causes by adding padding-top: 40px; to your <body>.
          
+
          +<div class="navbar navbar-fixed">
+  ...
+</div>
+
          
+      
          
+      
          Brand name
          
+      
          A simple link to show your brand or project name only requires an anchor tag.
          
+
          +<a class="brand" href="#">
+  Project name
+</a>
+
          
+      
          
+      
          Search form
          
+      
          Search forms receive custom styles in the navbar with the .navbar-search class. Include .pull-left or .pull-right on the form to align it.
          
+
          +<form class="navbar-search">
+  <input type="text" class="search-query pull-left" placeholder="Search">
+</form>
+
          
     
          
     
          
-      
          Dropdowns included
          
-      
          As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns <li> tags also support .active for showing current page selection.
          
+      
          Nav links
          
+      
          Nav items are simple to add via unordered lists.
          
+
          +<ul class="nav">
+  <li class="active">
+    <a href="#">Home</a>
+  </li>
+  <li><a href="#">Link</a></li>
+  <li><a href="#">Link</a></li>
+</ul>
+
          
+      
          Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.
          
+
          +<ul class="nav">
+  <li class="dropdown">
+    <a href="#"
+          class="dropdown-toggle"
+          data-toggle="dropdown">
+          Account
+    </a>
+    <ul class="dropdown-menu">
+      ...
+    </ul>
+  </li>
+</ul>
+
          
     
          
   
          
-  
          Note: When using the navbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your <body>.
          
 
 
 
@@ -507,34 +587,39 @@
   
          
 
   
          
-    
          
-      
          Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation.
          
-    
          
-    
          
+    
          
+      
          Why use them
          
+      
          Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation. Keep their use sparse and succinct to be most effective.
          
+
+      
          Examples
          
+      
          A single example shown as it might be displayed across multiple pages.
          
       
            
         
          • Home
            • 
       
          
       
            
         
          • Home /
            • 
-        
          • Middle page
            • 
-      
          
-      
       
+    
          
+    
          
+      
          Markup
          
+      
          HTML is your standard unordered list with links.
          
 
           <ul class="breadcrumb">
-  <li><a href="#">Home</a> <span class="divider">/</span></li>
-  <li><a href="#">Middle page</a> <span class="divider">/</span></li>
-  <li><a href="#">Another one</a> <span class="divider">/</span></li>
-  <li class="active">You are here</li>
+  <li>
+    <a href="#">Home</a> <span class="divider">/</span>
+  </li>
+  <li>
+    <a href="#">Library</a> <span class="divider">/</span>
+  </li>
+  <li class="active">
+    <a href="#">Data</a>
+  </li>
 </ul>
 
          
     
          
@@ -545,13 +630,14 @@
 
 
 
+==================================================
+
+COMMENTED OUT AND NOT SUPPORTED AT THIS TIME.
+
 
          
   
          
     
          Step nav 
          
   
          
-
-  
   
          
     
          
       
          Placeholder for now!
          
@@ -571,8 +657,8 @@
       
          
     
          
   
          
-
 
          
+-->
 
 
 
@@ -682,6 +768,9 @@
 
     
          
   
          
+  
+  
          
+
   
   
          
     
          
diff --git a/docs/index.html b/docs/index.html
index 0d340fa1a..231ed2066 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -106,8 +106,8 @@
 
 
         
          
-          
          Built with Bootstrap
          
-          
          For even more sites built with Bootstrap, visit the unofficial Tumblr.
          
+          
          Built with Bootstrap.
          
+          
          For even more sites built with Bootstrap, visit the unofficial Tumblr.
          
           
 
-          
          Designed for everyone, everywhere
          
+          
          Designed for everyone, everywhere.
          
           
          
             
          
               
@@ -200,8 +200,40 @@
               
          Brought to you by an experienced engineer and designer.
          
             
          
           
          
-        
          
 
+
+          
+          
          Get started in no time.
          
+          
          Built for any skill level, Bootstrap fits your workflow and development process.
          
+          
      
     
       
      
   
      
+            
+              
+                
+                
+                
+              
+            
+          
      
+                  
      Hotlink the CSS
      
+                  
      For the quickest and easiest start, just copy this snippet into your webpage.
      
+                  
      
+                    
+                  
      
+                      		
+                  
      Use it with LESS
      
+                  
      A fan of using LESS? No problem, just clone the repo and add these lines:
      
+                  
      
+                    
+                  
      
+                      		
+                  
      Fork on GitHub
      
+                  
      Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.
      
+                  
      Bootstrap on GitHub »
      
+                  
      Currently v2.0.0
      
+                
      
+        
      
       
      
 
 
diff --git a/docs/less.html b/docs/less.html
index 7d3efd296..05398e966 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -403,8 +403,8 @@
         
           Node with makefile
           
-            
      Install the less command line compiler with npm by running the following command:
      
-            
      $ npm install lessc
      
+            
      Install the LESS command line compiler with npm by running the following command:
      
+            
      $ npm install less
      
             
      Once installed just run make from the root of your bootstrap directory and you're all set.
      
             
      Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).
      
           
@@ -422,7 +422,7 @@
         
           Command line
           
-            
      If you already have the less command line tool installed, simply run the following command:
      
+            
      Install the LESS command line tool via Node and run the following command:
      
               
      $ lessc ./lib/bootstrap.less > bootstrap.css
      
             
      Be sure to include --compress in that command if you're trying to save some bytes!
      
           
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 87394006b..bf42d4468 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -395,7 +395,6 @@
             
      Side nav
      
             
      Navbar
      
             
      Tabs and pills
      
-            
      Step nav
      
             
      Pagination
      
             
      Alerts and errors
      
             
      Modals
      
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 7be1fd708..c84cba123 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -92,6 +92,9 @@
   
    • Typography
     
        
       
      • Right-aligned option for blockquotes if float: right;
        • 
+      
      • h4 elements were dropped from 16px to 14px with a default line-height of 18px
        • 
+      
      • h5 elements were dropped from 14px to 12px
        • 
+      
      • h6 elements were dropped from 13px to 11px
        • 
     
      
   
      • 
   
    • Buttons
diff --git a/lib/forms.less b/lib/forms.less
index 938983536..8b85d240a 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -137,6 +137,16 @@ textarea {
   padding-top: 6px; // has to be padding because margin collaspes
 }
 
+// Radios and checkboxes on same line
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+}
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+
 
 
 // FOCUS STATE
diff --git a/lib/navbar.less b/lib/navbar.less
index a96aa941c..edc19c641 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -53,6 +53,11 @@
   }
 }
 
+// Navbar forms
+.navbar-form {
+  margin-bottom: 0; // remove default bottom margin
+}
+
 // Navbar search
 .navbar-search {
   position: relative;
diff --git a/lib/sidenav.less b/lib/sidenav.less
index afc5ea1dd..51f97f44d 100644
--- a/lib/sidenav.less
+++ b/lib/sidenav.less
@@ -8,19 +8,22 @@
 .side-nav .nav-label,
 .side-nav .nav-item {
   display: block;
-  padding: 3px 16px;
+  padding: 3px 15px;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
 }
 .side-nav .nav-label {
   font-size: 11px;
   line-height: @baseLineHeight;
-  color: @grayDark;
+  color: @grayLight;
   text-transform: uppercase;
 }
 .side-nav .nav-group {
-  margin: 0 -1px;
+  margin: 0; // clear default ul margins
   list-style: none;
 }
+.side-nav .nav-group + .nav-label {
+  margin-top: 9px;
+}
 
 .side-nav .nav-item {
   font-weight: bold;
@@ -34,7 +37,7 @@
 .side-nav .active .nav-item {
   color: #fff;
   text-shadow: 0 -1px 0 rgba(0,0,0,.3);
-  #gradient > .vertical(#ccc, #aaa);
+  #gradient > .vertical(#ccc, #999);
   @shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 -1px 0 rgba(0,0,0,.05);
   .box-shadow(@shadow);
 }
\ No newline at end of file
diff --git a/lib/type.less b/lib/type.less
index 59dae717f..4aa642358 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -50,20 +50,20 @@ h3 {
     font-size: 14px;
   }
 }
+h4, h5, h6 {
+  line-height: @baseLineHeight;
+}
 h4 {
-  font-size: 16px;
-  line-height: @baseLineHeight * 2;
+  font-size: 14px;
   small {
     font-size: 12px;
   }
 }
 h5 {
-  font-size: 14px;
-  line-height: @baseLineHeight;
+  font-size: 12px;
 }
 h6 {
-  font-size: 13px;
-  line-height: @baseLineHeight;
+  font-size: 11px;
   color: @grayLight;
   text-transform: uppercase;
 }
-- 
cgit v1.2.3


From 36e7660383a7639f5d538efb7dc0f349e285b42d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 00:26:58 -0800
Subject: fix forms in navbars, fix examples' navbars

---
 bootstrap.css               |  7 ++++++-
 bootstrap.min.css           |  4 ++--
 docs/base-css.html          |  1 +
 examples/container-app.html |  2 +-
 examples/fluid-reverse.html | 18 +++++++++---------
 examples/fluid.html         | 10 +++++-----
 examples/hero.html          | 10 +++++-----
 lib/forms.less              |  3 ++-
 lib/navbar.less             |  5 +++++
 9 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 85ed7961a..f10d872ac 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Fri Jan  6 23:58:33 PST 2012
+ * Date: Sat Jan  7 00:24:46 PST 2012
  */
 html, body {
   margin: 0;
@@ -627,6 +627,7 @@ textarea {
 }
 .radio.inline, .checkbox.inline {
   display: inline-block;
+  margin-bottom: 0;
 }
 .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
   margin-left: 10px;
@@ -1681,6 +1682,10 @@ i {
 .navbar-form {
   margin-bottom: 0;
 }
+.navbar-form input, .navbar-form select {
+  display: inline-block;
+  margin-bottom: 0;
+}
 .navbar-search {
   position: relative;
   float: left;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 16f9fb76b..17d3c4b39 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -108,7 +108,7 @@ textarea{height:auto;}
 .radio,.checkbox{padding-left:18px;}
 .radio input[type=radio],.checkbox input[type=checkbox]{float:left;margin-left:-18px;}
 .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;}
-.radio.inline,.checkbox.inline{display:inline-block;}
+.radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;}
 .radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
 input,textarea{-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
 input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
@@ -287,7 +287,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
 .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
 .navbar .btn{margin-top:5px;}
-.navbar-form{margin-bottom:0;}
+.navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background-color:#444;background-color:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#eeeeee;}
 .navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
diff --git a/docs/base-css.html b/docs/base-css.html
index cbdf5ea19..cc92bc221 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1102,6 +1102,7 @@
         
      
         
      Checkboxes and radios
      
         
      Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.
      
+        
      Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.
      
       
      • 
     
      
   
      
diff --git a/examples/container-app.html b/examples/container-app.html
index 28807bb05..778bceacf 100644
--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -75,7 +75,7 @@
 
   
 
-    
      
+    
      
       
      
         
      
           Project name
diff --git a/examples/fluid-reverse.html b/examples/fluid-reverse.html
index a32291d46..8df731181 100644
--- a/examples/fluid-reverse.html
+++ b/examples/fluid-reverse.html
@@ -28,7 +28,7 @@
 
   
 
-    
      
+    
      
       
      
         
      
           Project name
@@ -78,17 +78,17 @@
 
         
         
      
-          
      
+          
      
             
      Heading
      
-            
      Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
      
+           
      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
      
             
      View details »
      
           
      
-          
      
+          
      
             
      Heading
      
              
      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
      
             
      View details »
      
          
      
-          
      
+          
      
             
      Heading
      
             
      Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
      
             
      View details »
      
@@ -99,17 +99,17 @@
 
         
         
      
-          
      
+          
      
             
      Heading
      
-            
      Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
      
+           
      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
      
             
      View details »
      
           
      
-          
      
+          
      
             
      Heading
      
              
      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
      
             
      View details »
      
          
      
-          
      
+          
      
             
      Heading
      
             
      Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
      
             
      View details »
      
diff --git a/examples/fluid.html b/examples/fluid.html
index 3b8bb46a8..66e07c82e 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -28,7 +28,7 @@
 
   
 
-    
      
+    
      
       
      
         
      
           Project name
@@ -78,9 +78,9 @@
 
         
         
      
-          
      
+          
      
             
      Heading
      
-            
      Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
      
+           
      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
      
             
      View details »
      
           
      
           
      
@@ -99,9 +99,9 @@
 
         
         
      
-          
      
+          
      
             
      Heading
      
-            
      Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
      
+           
      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
      
             
      View details »
      
           
      
           
      
diff --git a/examples/hero.html b/examples/hero.html
index d84eb8843..3a7a53983 100644
--- a/examples/hero.html
+++ b/examples/hero.html
@@ -28,7 +28,7 @@
 
   
 
-    
      
+    
      
       
      
         
      
           Project name
@@ -52,17 +52,17 @@
 
       
       
      
-        
      
+        
      
           
      Heading
      
-          
      Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
      
+           
      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
      
           
      View details »
      
         
      
-        
      
+        
      
           
      Heading
      
            
      Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
      
           
      View details »
      
        
      
-        
      
+        
      
           
      Heading
      
           
      Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
      
           
      View details »
      
diff --git a/lib/forms.less b/lib/forms.less
index 8b85d240a..9e0b84362 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -141,10 +141,11 @@ textarea {
 .radio.inline,
 .checkbox.inline {
   display: inline-block;
+  margin-bottom: 0;
 }
 .radio.inline + .radio.inline,
 .checkbox.inline + .checkbox.inline {
-  margin-left: 10px;
+  margin-left: 10px; // space out consecutive inline controls
 }
 
 
diff --git a/lib/navbar.less b/lib/navbar.less
index edc19c641..516890ba7 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -56,6 +56,11 @@
 // Navbar forms
 .navbar-form {
   margin-bottom: 0; // remove default bottom margin
+  input,
+  select {
+    display: inline-block;
+    margin-bottom: 0;
+  }
 }
 
 // Navbar search
-- 
cgit v1.2.3


From 0cb2866409c674f834f8e0f4e204c3c3331abbcd Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 00:29:36 -0800
Subject: fix reponsive 1200+ media query to resolve mismatched gutters and
 negative margins on the row

---
 bootstrap.css       | 7 +++++--
 lib/responsive.less | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index f10d872ac..eb338c038 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 00:24:46 PST 2012
+ * Date: Sat Jan  7 00:29:11 PST 2012
  */
 html, body {
   margin: 0;
@@ -3160,6 +3160,9 @@ a.thumbnail:hover {
   .container {
     width: @siteWidth;
   }
+  .row {
+    margin-left: @gridGutterWidth * -1;
+  }
   [class*="span"] {
     margin-left: @gridGutterWidth;
   }
@@ -3193,4 +3196,4 @@ a.thumbnail:hover {
   .offset12  { .offset(12); }
 
 }
-*/
+*/
\ No newline at end of file
diff --git a/lib/responsive.less b/lib/responsive.less
index fe2b7cd49..4cef89180 100644
--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -205,6 +205,9 @@
   .container {
     width: @siteWidth;
   }
+  .row {
+    margin-left: @gridGutterWidth * -1;
+  }
   [class*="span"] {
     margin-left: @gridGutterWidth;
   }
@@ -238,4 +241,4 @@
   .offset12  { .offset(12); }
 
 }
-*/
+*/
\ No newline at end of file
-- 
cgit v1.2.3


From bcf1136f2c8236cd3fa28eac7e57a9a3fc17d104 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 00:47:53 -0800
Subject: fix form field sizing for selects, document form field grid sizing

---
 bootstrap.css            | 155 +++++++++++++++++------------------------------
 bootstrap.min.css        |  43 +++++++------
 docs/assets/css/docs.css |   6 +-
 docs/base-css.html       |   9 +++
 lib/forms.less           |  63 ++++++++++++-------
 5 files changed, 136 insertions(+), 140 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index eb338c038..4f086520a 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 00:29:11 PST 2012
+ * Date: Sat Jan  7 00:47:37 PST 2012
  */
 html, body {
   margin: 0;
@@ -601,8 +601,10 @@ select, input[type=file] {
   line-height: 27px;
 }
 select {
-  background-color: #ffffff;
+  width: 220px;
+  padding: 0;
   vertical-align: middle;
+  background-color: #ffffff;
 }
 select[multiple], select[size] {
   height: inherit;
@@ -673,133 +675,84 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus {
 .input-xxlarge {
   width: 530px;
 }
-input.span1,
-textarea.span1,
-select.span1,
-.uneditable-input.span1 {
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"] {
   float: none;
-  width: 50px;
   margin-left: 0;
 }
-input.span2,
-textarea.span2,
-select.span2,
-.uneditable-input.span2 {
-  float: none;
+input.span1, textarea.span1, .uneditable-input.span1 {
+  width: 50px;
+}
+input.span2, textarea.span2, .uneditable-input.span2 {
   width: 130px;
-  margin-left: 0;
 }
-input.span3,
-textarea.span3,
-select.span3,
-.uneditable-input.span3 {
-  float: none;
+input.span3, textarea.span3, .uneditable-input.span3 {
   width: 210px;
-  margin-left: 0;
 }
-input.span4,
-textarea.span4,
-select.span4,
-.uneditable-input.span4 {
-  float: none;
+input.span4, textarea.span4, .uneditable-input.span4 {
   width: 290px;
-  margin-left: 0;
 }
-input.span5,
-textarea.span5,
-select.span5,
-.uneditable-input.span5 {
-  float: none;
+input.span5, textarea.span5, .uneditable-input.span5 {
   width: 370px;
-  margin-left: 0;
 }
-input.span6,
-textarea.span6,
-select.span6,
-.uneditable-input.span6 {
-  float: none;
+input.span6, textarea.span6, .uneditable-input.span6 {
   width: 450px;
-  margin-left: 0;
 }
-input.span7,
-textarea.span7,
-select.span7,
-.uneditable-input.span7 {
-  float: none;
+input.span7, textarea.span7, .uneditable-input.span7 {
   width: 530px;
-  margin-left: 0;
 }
-input.span8,
-textarea.span8,
-select.span8,
-.uneditable-input.span8 {
-  float: none;
+input.span8, textarea.span8, .uneditable-input.span8 {
   width: 610px;
-  margin-left: 0;
 }
-input.span9,
-textarea.span9,
-select.span9,
-.uneditable-input.span9 {
-  float: none;
+input.span9, textarea.span9, .uneditable-input.span9 {
   width: 690px;
-  margin-left: 0;
 }
-input.span10,
-textarea.span10,
-select.span10,
-.uneditable-input.span10 {
-  float: none;
+input.span10, textarea.span10, .uneditable-input.span10 {
   width: 770px;
-  margin-left: 0;
 }
-input.span11,
-textarea.span11,
-select.span11,
-.uneditable-input.span11 {
-  float: none;
+input.span11, textarea.span11, .uneditable-input.span11 {
   width: 850px;
-  margin-left: 0;
 }
-input.span12,
-textarea.span12,
-select.span12,
-.uneditable-input.span12 {
-  float: none;
+input.span12, textarea.span12, .uneditable-input.span12 {
   width: 930px;
-  margin-left: 0;
 }
-input.span13,
-textarea.span13,
-select.span13,
-.uneditable-input.span13 {
-  float: none;
-  width: 1010px;
-  margin-left: 0;
+select.span1 {
+  width: 70px;
 }
-input.span14,
-textarea.span14,
-select.span14,
-.uneditable-input.span14 {
-  float: none;
-  width: 1090px;
-  margin-left: 0;
+select.span2 {
+  width: 150px;
 }
-input.span15,
-textarea.span15,
-select.span15,
-.uneditable-input.span15 {
-  float: none;
-  width: 1170px;
-  margin-left: 0;
+select.span3 {
+  width: 230px;
 }
-input.span16,
-textarea.span16,
-select.span16,
-.uneditable-input.span16 {
-  float: none;
-  width: 1250px;
-  margin-left: 0;
+select.span4 {
+  width: 310px;
+}
+select.span5 {
+  width: 390px;
+}
+select.span6 {
+  width: 470px;
+}
+select.span7 {
+  width: 550px;
+}
+select.span8 {
+  width: 630px;
+}
+select.span9 {
+  width: 710px;
+}
+select.span10 {
+  width: 790px;
+}
+select.span11 {
+  width: 870px;
+}
+select.span12 {
+  width: 950px;
 }
 input[disabled],
 select[disabled],
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 17d3c4b39..156efff59 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -101,7 +101,7 @@ input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;
 input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
 select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;}
-select{background-color:#ffffff;vertical-align:middle;}
+select{width:220px;padding:0;vertical-align:middle;background-color:#ffffff;}
 select[multiple],select[size]{height:inherit;}
 input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 textarea{height:auto;}
@@ -119,22 +119,31 @@ input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shado
 .input-large{width:210px;}
 .input-xlarge{width:270px;}
 .input-xxlarge{width:530px;}
-input.span1,textarea.span1,select.span1,.uneditable-input.span1{float:none;width:50px;margin-left:0;}
-input.span2,textarea.span2,select.span2,.uneditable-input.span2{float:none;width:130px;margin-left:0;}
-input.span3,textarea.span3,select.span3,.uneditable-input.span3{float:none;width:210px;margin-left:0;}
-input.span4,textarea.span4,select.span4,.uneditable-input.span4{float:none;width:290px;margin-left:0;}
-input.span5,textarea.span5,select.span5,.uneditable-input.span5{float:none;width:370px;margin-left:0;}
-input.span6,textarea.span6,select.span6,.uneditable-input.span6{float:none;width:450px;margin-left:0;}
-input.span7,textarea.span7,select.span7,.uneditable-input.span7{float:none;width:530px;margin-left:0;}
-input.span8,textarea.span8,select.span8,.uneditable-input.span8{float:none;width:610px;margin-left:0;}
-input.span9,textarea.span9,select.span9,.uneditable-input.span9{float:none;width:690px;margin-left:0;}
-input.span10,textarea.span10,select.span10,.uneditable-input.span10{float:none;width:770px;margin-left:0;}
-input.span11,textarea.span11,select.span11,.uneditable-input.span11{float:none;width:850px;margin-left:0;}
-input.span12,textarea.span12,select.span12,.uneditable-input.span12{float:none;width:930px;margin-left:0;}
-input.span13,textarea.span13,select.span13,.uneditable-input.span13{float:none;width:1010px;margin-left:0;}
-input.span14,textarea.span14,select.span14,.uneditable-input.span14{float:none;width:1090px;margin-left:0;}
-input.span15,textarea.span15,select.span15,.uneditable-input.span15{float:none;width:1170px;margin-left:0;}
-input.span16,textarea.span16,select.span16,.uneditable-input.span16{float:none;width:1250px;margin-left:0;}
+input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"]{float:none;margin-left:0;}
+input.span1,textarea.span1,.uneditable-input.span1{width:50px;}
+input.span2,textarea.span2,.uneditable-input.span2{width:130px;}
+input.span3,textarea.span3,.uneditable-input.span3{width:210px;}
+input.span4,textarea.span4,.uneditable-input.span4{width:290px;}
+input.span5,textarea.span5,.uneditable-input.span5{width:370px;}
+input.span6,textarea.span6,.uneditable-input.span6{width:450px;}
+input.span7,textarea.span7,.uneditable-input.span7{width:530px;}
+input.span8,textarea.span8,.uneditable-input.span8{width:610px;}
+input.span9,textarea.span9,.uneditable-input.span9{width:690px;}
+input.span10,textarea.span10,.uneditable-input.span10{width:770px;}
+input.span11,textarea.span11,.uneditable-input.span11{width:850px;}
+input.span12,textarea.span12,.uneditable-input.span12{width:930px;}
+select.span1{width:70px;}
+select.span2{width:150px;}
+select.span3{width:230px;}
+select.span4{width:310px;}
+select.span5{width:390px;}
+select.span6{width:470px;}
+select.span7{width:550px;}
+select.span8{width:630px;}
+select.span9{width:710px;}
+select.span10{width:790px;}
+select.span11{width:870px;}
+select.span12{width:950px;}
 input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
 .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
 .control-group.error input,.control-group.error textarea{color:#b94a48;border-color:#ee5f5b;}.control-group.error input:focus,.control-group.error textarea:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 579baad7d..1180effd1 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -456,7 +456,11 @@ form.well {
   outline: 0;
 }
 
-
+/* For input sizes, make them display block */
+.docs-input-sizes input[type=text] {
+  display: block;
+  margin-bottom: 9px;
+}
 
 /* Icons
 ------------------------- */
diff --git a/docs/base-css.html b/docs/base-css.html
index cc92bc221..b8a6a2f8d 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1024,6 +1024,15 @@
     
      
       
      
         Extending form controls
+        
      
+          
+          
      
+            
+            
+            
+            
      Use the same .span* classes from the grid system for input sizes.
      
+          
      
+        
      
         
      
           
           
      
diff --git a/lib/forms.less b/lib/forms.less
index 9e0b84362..433b1ff98 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -96,8 +96,10 @@ input[type=file] {
 
 // Chrome on Linux and Mobile Safari need background-color
 select {
-  background-color: @white;
+  width: 220px; // default input width + 10px of padding that doesn't get applied
+  padding: 0;
   vertical-align: middle;
+  background-color: @white;
 }
 
 // Make multiple select elements height not fixed
@@ -187,33 +189,52 @@ select:focus {
 .input-xxlarge    { width: 530px; }
 
 // Grid style input sizes
-// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
-.formColumns(@columnSpan: 1) {
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"] {
   float: none;
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
   margin-left: 0;
 }
+
+// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
+.inputColumns(@columnSpan: 1) {
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
+}
 input,
 textarea,
-select,
 .uneditable-input {
   // Default columns
-  &.span1     { .formColumns(1); }
-  &.span2     { .formColumns(2); }
-  &.span3     { .formColumns(3); }
-  &.span4     { .formColumns(4); }
-  &.span5     { .formColumns(5); }
-  &.span6     { .formColumns(6); }
-  &.span7     { .formColumns(7); }
-  &.span8     { .formColumns(8); }
-  &.span9     { .formColumns(9); }
-  &.span10    { .formColumns(10); }
-  &.span11    { .formColumns(11); }
-  &.span12    { .formColumns(12); }
-  &.span13    { .formColumns(13); }
-  &.span14    { .formColumns(14); }
-  &.span15    { .formColumns(15); }
-  &.span16    { .formColumns(16); }
+  &.span1     { .inputColumns(1); }
+  &.span2     { .inputColumns(2); }
+  &.span3     { .inputColumns(3); }
+  &.span4     { .inputColumns(4); }
+  &.span5     { .inputColumns(5); }
+  &.span6     { .inputColumns(6); }
+  &.span7     { .inputColumns(7); }
+  &.span8     { .inputColumns(8); }
+  &.span9     { .inputColumns(9); }
+  &.span10    { .inputColumns(10); }
+  &.span11    { .inputColumns(11); }
+  &.span12    { .inputColumns(12); }
+}
+
+.selectColumns(@columnSpan: 1) {
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) + 10;
+}
+select {
+  &.span1     { .selectColumns(1); }
+  &.span2     { .selectColumns(2); }
+  &.span3     { .selectColumns(3); }
+  &.span4     { .selectColumns(4); }
+  &.span5     { .selectColumns(5); }
+  &.span6     { .selectColumns(6); }
+  &.span7     { .selectColumns(7); }
+  &.span8     { .selectColumns(8); }
+  &.span9     { .selectColumns(9); }
+  &.span10    { .selectColumns(10); }
+  &.span11    { .selectColumns(11); }
+  &.span12    { .selectColumns(12); }
 }
 
 
-- 
cgit v1.2.3


From d6a1402f2af5111e11a87a6029b642dc0b814854 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 01:03:26 -0800
Subject: update form shadows and tweak prettyprint styles

---
 bootstrap.css                                    | 14 +++++++-------
 bootstrap.min.css                                |  4 ++--
 docs/assets/js/google-code-prettify/prettify.css | 18 +++++++++++++++---
 docs/base-css.html                               |  5 +++--
 lib/forms.less                                   |  4 ++--
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 4f086520a..a5bdf2594 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 00:47:37 PST 2012
+ * Date: Sat Jan  7 00:50:40 PST 2012
  */
 html, body {
   margin: 0;
@@ -635,9 +635,9 @@ textarea {
   margin-left: 10px;
 }
 input, textarea {
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
   -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
   -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
   -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
@@ -646,9 +646,9 @@ input, textarea {
 }
 input:focus, textarea:focus {
   border-color: rgba(82, 168, 236, 0.8);
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
   outline: 0;
 }
 input[type=file]:focus, input[type=checkbox]:focus, select:focus {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 156efff59..c0b0bf104 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -110,8 +110,8 @@ textarea{height:auto;}
 .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;}
 .radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;}
 .radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
-input,textarea{-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
-input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
+input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
+input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
 input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;}
 .input-mini{width:60px;}
 .input-small{width:90px;}
diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css
index e3bbf8b6c..c2031b594 100644
--- a/docs/assets/js/google-code-prettify/prettify.css
+++ b/docs/assets/js/google-code-prettify/prettify.css
@@ -21,10 +21,22 @@ pre.prettyprint {
   padding: 8px;
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
+  -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+     -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+          box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
 }
 
 /* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin: 0 0 0 40px; } /* IE indents via margin-left */
-ol.linenums li { color: #bebec5; line-height: 18px; text-shadow: 0 1px 0 #fff; }
+ol.linenums {
+  margin: 0 0 0 33px; /* IE indents via margin-left */
+} 
+ol.linenums li {
+  padding-left: 7px;
+  color: #bebec5;
+  line-height: 18px;
+  text-shadow: 0 1px 0 #fff;
+}
 /* Alternate shading for lines */
-li.L1, li.L3, li.L5, li.L7, li.L9 {  }
\ No newline at end of file
+li.L1, li.L3, li.L5, li.L7, li.L9 {
+  
+}
\ No newline at end of file
diff --git a/docs/base-css.html b/docs/base-css.html
index b8a6a2f8d..5ae1790f7 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1009,8 +1009,9 @@
         
      
         
      Form validation
      
         
      It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
      
-
      -<fieldset class="control-group error">
+
      +<fieldset
+  class="control-group error">
   ...
 </fieldset>
 
      
diff --git a/lib/forms.less b/lib/forms.less
index 433b1ff98..5e02b7fde 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -157,14 +157,14 @@ textarea {
 
 input,
 textarea {
-  .box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.1));
   @transition: border linear .2s, box-shadow linear .2s;
   .transition(@transition);
 }
 input:focus,
 textarea:focus {
   border-color: rgba(82,168,236,.8);
-  @shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
+  @shadow: inset 0 1px 1px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
   .box-shadow(@shadow);
   outline: 0;
 }
-- 
cgit v1.2.3


From e23448ab1b2cc627a3cab54406ffce6c915297b6 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 01:08:58 -0800
Subject: make fixed navbars have lower z-index

---
 bootstrap.css     | 4 ++--
 bootstrap.min.css | 2 +-
 lib/navbar.less   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index a5bdf2594..38ce72cba 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 00:50:40 PST 2012
+ * Date: Sat Jan  7 01:08:05 PST 2012
  */
 html, body {
   margin: 0;
@@ -1702,7 +1702,7 @@ i {
   top: 0;
   right: 0;
   left: 0;
-  z-index: 10000;
+  z-index: 999;
 }
 .nav {
   position: relative;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index c0b0bf104..353a68ebf 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -303,7 +303,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
 .navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.navbar-fixed{position:fixed;top:0;right:0;left:0;z-index:10000;}
+.navbar-fixed{position:fixed;top:0;right:0;left:0;z-index:999;}
 .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}.nav>li{display:block;float:left;}
 .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.nav a:hover{color:#ffffff;text-decoration:none;}
 .nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
diff --git a/lib/navbar.less b/lib/navbar.less
index 516890ba7..9756ce2ca 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -125,7 +125,7 @@
   top: 0;
   right: 0;
   left: 0;
-  z-index: 10000;
+  z-index: 999;
 }
 
 
-- 
cgit v1.2.3


From 45d671d97f4d448780729bbb6357e9ec776f980c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 01:22:52 -0800
Subject: tweak spacing once more on prettify; add support for uneditable
 inputs to input-append and prepend

---
 bootstrap.css                                    | 17 +++++++++++++----
 bootstrap.min.css                                |  8 +++++---
 docs/assets/js/google-code-prettify/prettify.css |  2 +-
 docs/base-css.html                               |  4 ++--
 lib/forms.less                                   | 14 +++++++++++---
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 38ce72cba..411bc9c43 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 01:08:05 PST 2012
+ * Date: Sat Jan  7 01:22:18 PST 2012
  */
 html, body {
   margin: 0;
@@ -678,7 +678,7 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus {
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.uneditable-input[class*="span"] {
+.uneditable-input {
   float: none;
   margin-left: 0;
 }
@@ -871,11 +871,17 @@ input::-webkit-input-placeholder {
 .input-prepend:after, .input-append:after {
   clear: both;
 }
-.input-prepend input, .input-append input {
+.input-prepend input,
+.input-append input,
+.input-prepend .uneditable-input,
+.input-append .uneditable-input {
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
+.input-prepend .uneditable-input, .input-append .uneditable-input {
+  border-left-color: #ccc;
+}
 .input-prepend .add-on, .input-append .add-on {
   float: left;
   display: block;
@@ -904,12 +910,15 @@ input::-webkit-input-placeholder {
   /* IE6-7 */
 
 }
-.input-append input {
+.input-append input, .input-append .uneditable-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 .uneditable-input {
+  border-right-color: #ccc;
+}
 .input-append .add-on {
   margin-right: 0;
   margin-left: -1px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 353a68ebf..fb036b6a0 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -119,7 +119,7 @@ input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shado
 .input-large{width:210px;}
 .input-xlarge{width:270px;}
 .input-xxlarge{width:530px;}
-input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"]{float:none;margin-left:0;}
+input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;}
 input.span1,textarea.span1,.uneditable-input.span1{width:50px;}
 input.span2,textarea.span2,.uneditable-input.span2{width:130px;}
 input.span3,textarea.span3,.uneditable-input.span3{width:210px;}
@@ -162,11 +162,13 @@ input::-webkit-input-placeholder{color:#999999;}
 .help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;}
 .input-prepend,.input-append{margin-bottom:5px;zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;*display:inline;content:"";zoom:1;}
 .input-prepend:after,.input-append:after{clear:both;}
-.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;}
 .input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
 .input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;}
 .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 input,.input-append .uneditable-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 .uneditable-input{border-right-color:#ccc;}
 .input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 .search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
 .search-form input,.inline-form input,.horizontal-form input,.search-form textarea,.inline-form textarea,.horizontal-form textarea,.search-form select,.inline-form select,.horizontal-form select,.search-form .uneditable-input,.inline-form .uneditable-input,.horizontal-form .uneditable-input{display:inline-block;margin-bottom:0;}
diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css
index c2031b594..f195124a9 100644
--- a/docs/assets/js/google-code-prettify/prettify.css
+++ b/docs/assets/js/google-code-prettify/prettify.css
@@ -31,7 +31,7 @@ ol.linenums {
   margin: 0 0 0 33px; /* IE indents via margin-left */
 } 
 ol.linenums li {
-  padding-left: 7px;
+  padding-left: 12px;
   color: #bebec5;
   line-height: 18px;
   text-shadow: 0 1px 0 #fff;
diff --git a/docs/base-css.html b/docs/base-css.html
index 5ae1790f7..910ea10bb 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1039,7 +1039,7 @@
           
      
             
      
               @
-              
+              
             
      
             
      Here's some help text
      
           
      
@@ -1048,7 +1048,7 @@
           
           
      
             
      
-              
+              
               .00
             
      
             
      Here's more help text
      
diff --git a/lib/forms.less b/lib/forms.less
index 5e02b7fde..f0b7c2ea6 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -192,7 +192,7 @@ select:focus {
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.uneditable-input[class*="span"] {
+.uneditable-input {
   float: none;
   margin-left: 0;
 }
@@ -357,9 +357,13 @@ input::-webkit-input-placeholder {
 .input-append {
   margin-bottom: 5px;
   .clearfix(); // Clear the float to prevent wrapping
-  input {
+  input,
+  .uneditable-input {
     .border-radius(0 3px 3px 0);
   }
+  .uneditable-input {
+    border-left-color: #ccc;
+  }
   .add-on {
     float: left;
     display: block;
@@ -388,10 +392,14 @@ input::-webkit-input-placeholder {
   }
 }
 .input-append {
-  input {
+  input,
+  .uneditable-input {
     float: left;
     .border-radius(3px 0 0 3px);
   }
+  .uneditable-input {
+    border-right-color: #ccc;    
+  }
   .add-on {
     margin-right: 0;
     margin-left: -1px;
-- 
cgit v1.2.3


From 5fb2c666acfd5e7d2f134d2cb5b65b828102c5a9 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 01:59:53 -0800
Subject: update the fluid examples to use new classes and clear the floats
 properly from sidebar

---
 bootstrap.css               | 24 +++++++++++++++---------
 bootstrap.min.css           | 11 ++++++-----
 docs/upgrading.html         |  5 +++++
 examples/fluid-reverse.html |  6 ++++--
 examples/fluid.html         | 44 +++++++++++++++++++++++---------------------
 lib/scaffolding.less        | 22 ++++++++++++----------
 6 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 411bc9c43..2f57e5f95 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 01:22:18 PST 2012
+ * Date: Sat Jan  7 01:58:07 PST 2012
  */
 html, body {
   margin: 0;
@@ -209,21 +209,27 @@ body {
 .fluid-container:after {
   clear: both;
 }
-.fluid-sidebar-left, .fluid-sidebar-right {
+.fluid-sidebar {
   width: 220px;
+  margin: 0 20px 18px;
 }
-.fluid-sidebar-left {
+.sidebar-left {
+  padding-left: 260px;
+}
+.sidebar-right {
+  padding-right: 260px;
+}
+.sidebar-left .fluid-sidebar {
   float: left;
+  margin-left: -240px;
 }
-.fluid-sidebar-right {
+.sidebar-right .fluid-sidebar {
   float: right;
+  margin-right: -240px;
 }
 .fluid-content {
-  margin-left: 240px;
-}
-.fluid-container.reverse .fluid-content {
-  margin-left: 0;
-  margin-right: 240px;
+  float: left;
+  width: 100%;
 }
 a {
   font-weight: inherit;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index fb036b6a0..9996dc318 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -25,11 +25,12 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
 .container:after{clear:both;}
 .fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.fluid-container:before,.fluid-container:after{display:table;*display:inline;content:"";zoom:1;}
 .fluid-container:after{clear:both;}
-.fluid-sidebar-left,.fluid-sidebar-right{width:220px;}
-.fluid-sidebar-left{float:left;}
-.fluid-sidebar-right{float:right;}
-.fluid-content{margin-left:240px;}
-.fluid-container.reverse .fluid-content{margin-left:0;margin-right:240px;}
+.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%;}
 a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
 .pull-right{float:right;}
 .pull-left{float:left;}
diff --git a/docs/upgrading.html b/docs/upgrading.html
index c84cba123..d22fa8c27 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -102,6 +102,11 @@
       
    • Added button bar options
      • 
     
   
+  
    • Examples
+    
        
+      
      • Fluid examples redone. .fluid-container now requires a .sidebar-left or .sidebar-right as well. Fluid sidebar element has a new class, .fluid-sidebar.
        • 
+    
      
+  
      • 
 
         
+          
      
+            Action
+            
+            
+          
           
+          
      
+            Danger
+            
+            
+          
      
+        
      
+        
      
+          
      
+            Success
+            
+            
+          
      
+          
      
+            Info
+            
+            
+          
      
+        
      
+      
       
+    
      
+    
      
+      
      Example markup
      
+      
      Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.
      
+
      +<div class="btn-group">
+  <a class="btn" href="#">Action</a>
+  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+    <!-- dropdown menu links -->
+  </ul>
+</div>
+
      
     
      
   
      
-    
 
 
 
@@ -1454,5 +1556,11 @@
     
     
     
+    
+    
   
 
diff --git a/docs/javascript.html b/docs/javascript.html
index 1cba7766f..4671dd6eb 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -274,7 +274,7 @@ $('#myModal').on('hidden', function () {
 <ul class="tabs">
   <li class="active"><a href="#">Home</a></li>
   <li id="secondary" class="dropdown">
-    <a href="#secondary" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>
+    <a href="#secondary" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
     <ul class="dropdown-menu">
       <li><a href="#">Secondary link</a></li>
       <li><a href="#">Something else here</a></li>
@@ -302,7 +302,7 @@ $('#myModal').on('hidden', function () {
                 
                 
        
                   
                   
+  
      • Dropdown menus
+    
          
+      
        • Updated the .dropdown-menu to tighten up spacing
          • 
+      
        • Now requires you to add a <span class="caret"></span> to show the dropdown arrow
          • 
+    
        
+  
        • 
 
      
 
 
 
+
+      
      
+        
      
+          
      Progress bars ... for indicating progress
      
+        
      
+        
      
+          
      
+            
      Basic bars
      
+            
      Default look of progress bars. Absolute minimum.
      
+          
      
+          
      
+            
      
+              
      
+            
      
+          
      
+        
      
+        
      
+          
      
+            
      Striped bars
      
+            
      Bars with stripes painted.
      
+          
      
+          
      
+            
      
+              
      
+            
      
+          
      
+        
      
+        
      
+          
      
+            
      Active state
      
+            
      Animated stripes! Not on Opera, though :(
      
+          
      
+          
      
+            
      
+              
      
+            
      
+          
      
+        
      
+      
      
+
       
       
      
diff --git a/docs/javascript.html b/docs/javascript.html
index 0aebf8609..7e10d63b9 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -23,6 +23,49 @@
     
     
 
+    
+    
+    
+
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
   
 
   
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index df233f128..0335f8651 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -30,6 +30,7 @@
 @import "wells.less";
 @import "component-animations.less";
 @import "close.less";
+@import "progress-bars.less";
 
 // Components: Nav
 @import "navbar.less";
diff --git a/lib/mixins.less b/lib/mixins.less
index 49eabb875..ea8d685f0 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -270,6 +270,15 @@
     background-repeat: no-repeat;
     // Opera cannot do radial gradients yet
   }
+  .striped(@color,@angle: -45deg) {
+    background-color: @color;
+    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255, 255, 255, .2)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.75, rgba(255, 255, 255, .2)), color-stop(.75, transparent), to(transparent));
+    background-image: -webkit-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
+    background-image: -moz-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
+    background-image: -ms-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
+  }
 }
 
 // Reset filters for IE
@@ -320,3 +329,10 @@
     border-right: @arrowWidth solid @black;
   }
 }
+
+.background-size(@width, @height){
+  -webkit-background-size: @width @height;
+     -moz-background-size: @width @height;
+       -o-background-size: @width @height;
+          background-size: @width @height;
+}
diff --git a/lib/progress-bars.less b/lib/progress-bars.less
new file mode 100644
index 000000000..cc524cc9f
--- /dev/null
+++ b/lib/progress-bars.less
@@ -0,0 +1,100 @@
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+
+@-moz-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+
+.progress {
+  height: 25px;
+  margin-bottom: 18px;
+  overflow: hidden;
+  .box-shadow(inset 0 1px 1px 0 rgba(0,0,0,.3), 0 1px 0 0 #fff);
+  #gradient > .vertical(#fff, #f5f5f5);
+  .border-radius(10px);
+  border: 1px solid #ddd;
+  border-color: rgba(0,0,0,.0);
+  &.active {
+    .bar {
+      -webkit-animation: progress-bar-stripes 2s linear infinite;
+      -moz-animation: progress-bar-stripes 2s linear infinite;
+      animation: progress-bar-stripes 2s linear infinite;
+    }
+  }
+  &.animated {
+    .bar {
+      .transition(width .6s ease);
+    }
+  }
+  &.danger,
+  &.error {
+    .bar {
+      #gradient > .vertical(#ee5f5b, #c43c35);
+    }
+    &.striped {
+      .bar {
+        .background-size(40px, 40px);
+        #gradient > .striped(#ee5f5b);
+      }
+    }
+  }
+  &.success {
+    .bar {
+      #gradient > .vertical(#62c462, #57a957);
+    }
+    &.striped {
+      .bar {
+        .background-size(40px, 40px);
+        #gradient > .striped(#62c462);
+      }
+    }
+  }
+  &.info {
+    .bar {
+      #gradient > .vertical(#5bc0de, #339bb9);
+    }
+    &.striped {
+      .bar {
+        .background-size(40px, 40px);
+        #gradient > .striped(#5bc0de);
+      }
+    }
+  }
+  &.striped {
+    .bar {
+      .background-size(40px, 40px);
+      #gradient > .striped(#62c462);
+    }
+  }
+  .bar {
+    width: 0%;
+    height: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+    .gradientBar(#62c462, #57a957);
+    @shadow: inset 0 2px 0 rgba(255,255,255,.2), inset -1px -1px 0 rgba(0,0,0,.25),inset 1px 1px 0 rgba(0,0,0,.25);
+    .box-shadow(@shadow);
+    .border-radius(10px);
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 95c88a2953d6493050192f9c99c8e5597e591ac3 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 04:40:32 -0800
Subject: scratch that, tweaking dropdowns in tabs

---
 docs/components.html |  2 +-
 lib/tabs-pills.less  | 19 +++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/docs/components.html b/docs/components.html
index 5bafc5a60..baeccd6ed 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -427,7 +427,7 @@
         
    • Settings
      • 
         
    • Contact
      • 
         
    • 
-          Dropdown
+          Dropdown 
           
        
             
      • Secondary link
        • 
             
      • Something else here
        • 
diff --git a/lib/tabs-pills.less b/lib/tabs-pills.less
index 23ba9ccfa..8e8856a56 100644
--- a/lib/tabs-pills.less
+++ b/lib/tabs-pills.less
@@ -154,30 +154,17 @@
 
 // Dropdowns in tabs
 .tabs {
-  // first one for backwards compatibility
-  .menu-dropdown,
   .dropdown-menu {
-    top: 35px;
+    top: 36px;
     border-width: 1px;
-    .border-radius(0 6px 6px 6px);
   }
-  // first one for backwards compatibility
-  a.menu:after,
-  .dropdown-toggle:after {
-    border-top-color: #999;
+  .dropdown-toggle .caret {
     margin-top: 15px;
     margin-left: 5px;
   }
-  // first one for backwards compatibility
-  li.open.menu .menu,
-  .open.dropdown .dropdown-toggle {
+  .open .dropdown-toggle {
     border-color: #999;
   }
-  // first one for backwards compatibility
-  li.open a.menu:after,
-  .dropdown.open .dropdown-toggle:after {
-    border-top-color: #555;
-  }
 }
 
 // Pills
-- 
cgit v1.2.3


From fbb42ccbbbfcab985a2c588532511f4af324ebc1 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sat, 7 Jan 2012 10:56:00 -0800
Subject: update link to collapse plugin

---
 docs/javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index 1cba7766f..c20098085 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -869,7 +869,7 @@ $('#my-alert').bind('closed', function () {
       
        
         
        
           
        The collapse plugin offers simple, flexible collapsible element support for making accordions and other collapsible ui components.
        
-          Download
+          Download
         
        
         
        
           
        Using bootstrap-collapse.js
        
-- 
cgit v1.2.3


From a339f0051b21f9e51d47c3eb1fd7d37f126e87a0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 12:22:51 -0800
Subject: fixing tablesorter styles by adding the jquery plugin back to the
 lib, fixing the docs examples

---
 bootstrap.css                        | 59 +++++++++++++++++++++++++++++-------
 bootstrap.min.css                    | 13 +++++---
 docs/assets/js/jquery.tablesorter.js |  3 ++
 docs/base-css.html                   |  4 ++-
 lib/tables.less                      | 54 +++++++++++++++++++++++++++++++++
 lib/tabs-pills.less                  |  6 +++-
 6 files changed, 122 insertions(+), 17 deletions(-)
 create mode 100644 docs/assets/js/jquery.tablesorter.js

diff --git a/bootstrap.css b/bootstrap.css
index 71637d42f..4c56efca5 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 04:34:04 PST 2012
+ * Date: Sat Jan  7 12:21:05 PST 2012
  */
 html, body {
   margin: 0;
@@ -1102,6 +1102,44 @@ table .span12 {
   width: 924px;
   margin-left: 0;
 }
+table .header {
+  cursor: pointer;
+}
+table .header:after {
+  content: "";
+  float: right;
+  margin-top: 7px;
+  border-width: 0 4px 4px;
+  border-style: solid;
+  border-color: #000 transparent;
+  visibility: hidden;
+}
+table .headerSortUp, table .headerSortDown {
+  background-color: rgba(141, 192, 219, 0.25);
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+}
+table .header:hover:after {
+  visibility: visible;
+}
+table .headerSortDown:after, table .headerSortDown:hover:after {
+  visibility: visible;
+  filter: alpha(opacity=60);
+  -moz-opacity: 0.6;
+  opacity: 0.6;
+}
+table .headerSortUp:after {
+  border-bottom: none;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid #000;
+  visibility: visible;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  filter: alpha(opacity=60);
+  -moz-opacity: 0.6;
+  opacity: 0.6;
+}
 i {
   background-image: url(docs/assets/img/glyphicons-halflings-sprite.png);
   background-position: 0 0;
@@ -1891,23 +1929,22 @@ i {
   border-color: #ddd;
   border-left-color: transparent;
 }
-.tabs .menu-dropdown, .tabs .dropdown-menu {
-  top: 35px;
+.tabs .dropdown-menu {
+  top: 37px;
   border-width: 1px;
-  -webkit-border-radius: 0 6px 6px 6px;
-  -moz-border-radius: 0 6px 6px 6px;
-  border-radius: 0 6px 6px 6px;
 }
-.tabs a.menu:after, .tabs .dropdown-toggle:after {
-  border-top-color: #999;
+.tabs .dropdown-toggle .caret {
   margin-top: 15px;
   margin-left: 5px;
 }
-.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle {
+.tabs .open .dropdown-toggle {
   border-color: #999;
 }
-.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after {
-  border-top-color: #555;
+.tabs .open .dropdown-toggle .caret {
+  border-top-color: #fff;
+  filter: alpha(opacity=100);
+  -moz-opacity: 1;
+  opacity: 1;
 }
 .pills > li > a {
   padding: 0 15px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index b0df32036..bb491b7ac 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -203,6 +203,11 @@ table .span9{float:none;width:684px;margin-left:0;}
 table .span10{float:none;width:764px;margin-left:0;}
 table .span11{float:none;width:844px;margin-left:0;}
 table .span12{float:none;width:924px;margin-left:0;}
+table .header{cursor:pointer;}table .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;}
+table .headerSortUp,table .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);}
+table .header:hover:after{visibility:visible;}
+table .headerSortDown:after,table .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;}
+table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;}
 i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
 .glass{background-position:0 0;}
 .music{background-position:-24px 0;}
@@ -349,10 +354,10 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tabbable.tabs-right .tab-content{margin-right:100px;}
 .tabbable.tabs-right .tabs{float:right;}.tabbable.tabs-right .tabs>li{margin-left:-1px;}.tabbable.tabs-right .tabs>li>a{margin-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}.tabbable.tabs-right .tabs>li>a:hover{border-left-color:#ddd;}
 .tabbable.tabs-right .tabs .active>a,.tabbable.tabs-right .tabs .active>a:hover{border-color:#ddd;border-left-color:transparent;}
-.tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;}
-.tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;}
-.tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;}
-.tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;}
+.tabs .dropdown-menu{top:37px;border-width:1px;}
+.tabs .dropdown-toggle .caret{margin-top:15px;margin-left:5px;}
+.tabs .open .dropdown-toggle{border-color:#999;}
+.tabs .open .dropdown-toggle .caret{border-top-color:#fff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
 .pills>li>a{padding:0 15px;margin:5px 3px 5px 0;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills>li>a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#005580;}
 .pills .active>a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0088cc;}
 .pills-vertical>li{float:none;}
diff --git a/docs/assets/js/jquery.tablesorter.js b/docs/assets/js/jquery.tablesorter.js
new file mode 100644
index 000000000..8ca383e39
--- /dev/null
+++ b/docs/assets/js/jquery.tablesorter.js
@@ -0,0 +1,3 @@
+(function($){$.extend({tablesorter:new
+function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((ab)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((ba)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i
       
        How to use
        
       
        With v2.0.0, the <i> tag is essentially dedicated to iconography. To use the icons, you can place the follow code wherever you like one to appear:
        
-
        +
         <i class="chevron-left"></i>
 
        
       
        There are over 100 classes to choose from for your icons. Just add an <i> tag with the right class and you're set. You can find the full list in sprites.less or right here in this document.
        
@@ -1554,11 +1554,13 @@
     
     
     
+    
     
     
     
     
diff --git a/lib/tables.less b/lib/tables.less
index d1a690a3f..92ac57c39 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -116,3 +116,57 @@ table {
   .span11    { .tableColumns(11); }
   .span12    { .tableColumns(12); }
 }
+
+
+
+// TABLESORTER
+// -----------
+// Support for the tablesorter jQuerdy plugin
+
+table {
+  // Tablesorting styles w/ jQuery plugin
+  .header {
+    cursor: pointer;
+    &:after {
+      content: "";
+      float: right;
+      margin-top: 7px;
+      border-width: 0 4px 4px;
+      border-style: solid;
+      border-color: #000 transparent;
+      visibility: hidden;
+    }
+  }
+  // Style the sorted column headers (THs)
+  .headerSortUp,
+  .headerSortDown {
+    background-color: rgba(141,192,219,.25);
+    text-shadow: 0 1px 1px rgba(255,255,255,.75);
+  }
+  // Style the ascending (reverse alphabetical) column header
+  .header:hover {
+    &:after {
+      visibility:visible;
+    }
+  }
+  // Style the descending (alphabetical) column header
+  .headerSortDown,
+  .headerSortDown:hover {
+    &:after {
+      visibility:visible;
+      .opacity(60);
+    }
+  }
+  // Style the ascending (reverse alphabetical) column header
+  .headerSortUp {
+    &:after {
+      border-bottom: none;
+      border-left: 4px solid transparent;
+      border-right: 4px solid transparent;
+      border-top: 4px solid #000;
+      visibility:visible;
+      .box-shadow(none); //can't add boxshadow to downward facing arrow :(
+      .opacity(60);
+    }
+  }
+}
diff --git a/lib/tabs-pills.less b/lib/tabs-pills.less
index 8e8856a56..4a94266a3 100644
--- a/lib/tabs-pills.less
+++ b/lib/tabs-pills.less
@@ -155,7 +155,7 @@
 // Dropdowns in tabs
 .tabs {
   .dropdown-menu {
-    top: 36px;
+    top: 37px;
     border-width: 1px;
   }
   .dropdown-toggle .caret {
@@ -165,6 +165,10 @@
   .open .dropdown-toggle {
     border-color: #999;
   }
+  .open .dropdown-toggle .caret {
+    border-top-color: #fff;
+    .opacity(100);
+  }
 }
 
 // Pills
-- 
cgit v1.2.3


From 28420311d89fe2656320cee7306d01a361f1c3c7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 13:40:05 -0800
Subject: more table docs cleanup

---
 docs/base-css.html | 414 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 244 insertions(+), 170 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 47858fe10..c1cb3fd2d 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -556,211 +556,285 @@
     
   
 
+
   
        Example tables
        
+
   
        1. Default table styles
        
-  
        All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.
        
-  
-    
-      
-        
-        
-        
-        
-      
-    
-    
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-    
-  
        #First NameLast NameLanguage
        1SomeOneEnglish
        2JoeSixpackEnglish
        3StuDentCode
        
+  
        
+    
        
+      
        Tables are automatically styled with only the a few borders to ensure readability and maintain structure. No classes are required.
        
 
         <table>
   ...
 </table>
        
+    
        
+    
        
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
        #First NameLast NameLanguage
        1MarkOttoCSS
        2JacobThorntonJavascript
        3StuDentHTML
        
+    
        
+  
        
 
-  
        
 
   
        2. Striped table
        
-  
        Get a little fancy with your tables by adding zebra-striping—just add the .striped-table class.
        
-  
-    
-      
-        
-        
-        
-        
-      
-    
-    
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-    
-  
        #First NameLast NameLanguage
        1SomeOneEnglish
        2JoeSixpackEnglish
        3StuDentCode
        
-  
        Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.
        
-
        +  
        
+    
        
+      
        Get a little fancy with your tables by adding zebra-striping—just add the .striped-table class.
        
+      
        Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.
        
+
         <table class="striped-table">
   ...
 </table>
        
+    
        
+    
        
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
        #First NameLast NameLanguage
        1MarkOttoCSS
        2JacobThorntonJavascript
        3StuDentHTML
        
+    
        
+  
        
 
-  
        
 
   
        3. Bordered table
        
-  
        Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.
        
-  
-    
-      
-        
-        
-        
-        
-      
-    
-    
-      
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-    
-  
        #First NameLast NameLanguage
        1Some OneHTML
        2JoeSixpackJavascript
        3JoeSixpack
        3StuDentCSS
        
+  
        
+    
        
+      
        Add borders around the entire table and rounded corners for aesthetic purposes.
        
 
         <table class="bordered-table">
   ...
 </table>
        
+    
        
+    
        
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
        #First NameLast NameLanguage
        1Mark OttoCSS
        2JacobThorntonJavascript
        3StuDent
        3BrosefStalinHTML
        
+    
        
+  
        
 
-  
        
 
   
        4. Condensed table
        
-  
        Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).
        
-  
-    
-      
-        
-        
-        
-        
-      
-    
-    
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-    
-  
        #First NameLast NameLanguage
        1SomeOneEnglish
        2JoeSixpackEnglish
        3StuDentCode
        
-
        +  
        
+    
        
+      
        Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).
        
+
         <table class="condensed-table">
   ...
 </table>
        
+    
        
+    
        
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
        #First NameLast NameLanguage
        1MarkOttoCSS
        2JacobThorntonJavascript
        3StuDentHTML
        
+    
        
+  
        
+
 
-  
        
 
   
        5. Striped table w/ TableSorter.js
        
-  
        Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.
        
-  
-    
-      
-        
-        
-        
-        
-      
-    
-    
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-      
-        
-        
-        
-        
-      
-    
-  
        #First NameLast NameLanguage
        1YourOneEnglish
        2JoeSixpackEnglish
        3StuDentCode
        
+  
        
+    
        
+      
        Include the jQuery Tablesorter plugin and automaically get clear styles for sorted columns.
        
 
        -<script src="js/jquery/jquery.tablesorter.min.js"></script>
+<script src="jquery.tablesorter.js"></script>
 <script >
   $(function() {
-    $("table#sortTableExample").tablesorter({ sortList: [[1,0]] });
+    $("table#sortTableExample")
+    .tablesorter({
+      sortList: [[1,0]]
+    });
   });
 </script>
 <table class="striped-table">
   ...
 </table>
        
-
+    
        
+    
        
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
        #First NameLast NameLanguage
        1MarkOttoCSS
        2JacobThorntonJavascript
        3StuDentHTML
        4BrosefStalinHTML
        
+      
        Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.
        
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
        #First NameLast NameLanguage
        1MarkOttoCSS
        2JacobThorntonJavascript
        3StuDentHTML
        4BrosefStalinHTML
        
+    
        
+  
        
 
 
 
@@ -1560,7 +1634,7 @@
     
     
-- 
cgit v1.2.3


From 1438b14f74fc30c3b9bd63bd54d3bcfe5ce33c3c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 15:52:57 -0800
Subject: overhauled docs to include example markup, add language around
 browser support and classes

---
 bootstrap.css          | 332 +++++++++++++++++++++++--------------------------
 bootstrap.min.css      |  21 ++--
 docs/components.html   |  81 ++++++++----
 lib/bootstrap.less     |   2 +-
 lib/mixins.less        |  19 ++-
 lib/progress-bars.less | 180 +++++++++++++--------------
 6 files changed, 330 insertions(+), 305 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index cc58b2ab8..f6dd39226 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 13:52:27 PST 2012
+ * Date: Sat Jan  7 15:52:40 PST 2012
  */
 html, body {
   margin: 0;
@@ -1574,180 +1574,6 @@ i {
   -moz-opacity: 0.4;
   opacity: 0.4;
 }
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-/* COMMENTED OUT SO LESS COMPILES
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-*/
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-.progress {
-  height: 25px;
-  margin-bottom: 18px;
-  overflow: hidden;
-  -webkit-box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.3);
-  box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.3);
-  background-color: #f5f5f5;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));
-  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));
-  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: linear-gradient(top, #ffffff, #f5f5f5);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-  border: 1px solid #ddd;
-  border-color: rgba(0, 0, 0, 0);
-}
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-  -moz-animation: progress-bar-stripes 2s linear infinite;
-  animation: progress-bar-stripes 2s linear infinite;
-}
-.progress.animated .bar {
-  -webkit-transition: width 0.6s ease;
-  -moz-transition: width 0.6s ease;
-  -ms-transition: width 0.6s ease;
-  -o-transition: width 0.6s ease;
-  transition: width 0.6s ease;
-}
-.progress.danger .bar, .progress.error .bar {
-  background-color: #c43c35;
-  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);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
-}
-.progress.danger.striped .bar, .progress.error.striped .bar {
-  -webkit-background-size: 40px 40px;
-  -moz-background-size: 40px 40px;
-  -o-background-size: 40px 40px;
-  background-size: 40px 40px;
-  background-color: #ee5f5b;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-}
-.progress.success .bar {
-  background-color: #57a957;
-  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);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
-}
-.progress.success.striped .bar {
-  -webkit-background-size: 40px 40px;
-  -moz-background-size: 40px 40px;
-  -o-background-size: 40px 40px;
-  background-size: 40px 40px;
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-}
-.progress.info .bar {
-  background-color: #339bb9;
-  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);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
-}
-.progress.info.striped .bar {
-  -webkit-background-size: 40px 40px;
-  -moz-background-size: 40px 40px;
-  -o-background-size: 40px 40px;
-  background-size: 40px 40px;
-  background-color: #5bc0de;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-}
-.progress.striped .bar {
-  -webkit-background-size: 40px 40px;
-  -moz-background-size: 40px 40px;
-  -o-background-size: 40px 40px;
-  background-size: 40px 40px;
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-}
-.progress .bar {
-  width: 0%;
-  height: 100%;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  background-color: #57a957;
-  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);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
-  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);
-  -webkit-box-shadow: inset 0 2px 0 rgba(255, 255, 255, 0.2), inset -1px -1px 0 rgba(0, 0, 0, 0.25), inset 1px 1px 0 rgba(0, 0, 0, 0.25);
-  -moz-box-shadow: inset 0 2px 0 rgba(255, 255, 255, 0.2), inset -1px -1px 0 rgba(0, 0, 0, 0.25), inset 1px 1px 0 rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 2px 0 rgba(255, 255, 255, 0.2), inset -1px -1px 0 rgba(0, 0, 0, 0.25), inset 1px 1px 0 rgba(0, 0, 0, 0.25);
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
 .navbar {
   overflow: visible;
 }
@@ -3102,6 +2928,162 @@ a.thumbnail:hover {
 .label.notice {
   background-color: #62cffc;
 }
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+.progress, .progress .bar {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.progress {
+  height: 18px;
+  margin-bottom: 18px;
+  background-color: #f9f9f9;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9));
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
+  border: 1px solid #ddd;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+.progress .bar {
+  width: 0%;
+  height: 20px;
+  margin: -1px;
+  background-color: #57a957;
+  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);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+  background-color: #0480be;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -ms-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(top, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+  -moz-transition: width 0.6s ease;
+  -ms-transition: width 0.6s ease;
+  -o-transition: width 0.6s ease;
+  transition: width 0.6s ease;
+}
+.progress.striped .bar {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+  -moz-background-size: 40px 40px;
+  -o-background-size: 40px 40px;
+  background-size: 40px 40px;
+}
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+  -moz-animation: progress-bar-stripes 2s linear infinite;
+  animation: progress-bar-stripes 2s linear infinite;
+}
+.progress.danger .bar {
+  background-color: #c43c35;
+  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);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
+}
+.progress.danger.striped .bar {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress.success .bar {
+  background-color: #57a957;
+  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);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+}
+.progress.success.striped .bar {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress.info .bar {
+  background-color: #339bb9;
+  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);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
+}
+.progress.info.striped .bar {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
 .hidden {
   display: none;
   visibility: hidden;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index fd23c25cc..e08068a78 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -311,16 +311,6 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
 .collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
 .close{float:right;font-size:20px;font-weight:bold;line-height:13.5px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;}
-@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{height:25px;margin-bottom:18px;overflow:hidden;-webkit-box-shadow:inset 0 1px 1px 0 rgba(0, 0, 0, 0.3);-moz-box-shadow:inset 0 1px 1px 0 rgba(0, 0, 0, 0.3);box-shadow:inset 0 1px 1px 0 rgba(0, 0, 0, 0.3);background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px;border:1px solid #ddd;border-color:rgba(0, 0, 0, 0);}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
-.progress.animated .bar{-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
-.progress.danger .bar,.progress.error .bar{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
-.progress.danger.striped .bar,.progress.error.striped .bar{-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);}
-.progress.success .bar{background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
-.progress.success.striped .bar{-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);}
-.progress.info .bar{background-color:#339bb9;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
-.progress.info.striped .bar{-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);}
-.progress.striped .bar{-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);}
-.progress .bar{width:0%;height:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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);-webkit-box-shadow:inset 0 2px 0 rgba(255, 255, 255, 0.2),inset -1px -1px 0 rgba(0, 0, 0, 0.25),inset 1px 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:inset 0 2px 0 rgba(255, 255, 255, 0.2),inset -1px -1px 0 rgba(0, 0, 0, 0.25),inset 1px 1px 0 rgba(0, 0, 0, 0.25);box-shadow:inset 0 2px 0 rgba(255, 255, 255, 0.2),inset -1px -1px 0 rgba(0, 0, 0, 0.25),inset 1px 1px 0 rgba(0, 0, 0, 0.25);-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px;}
 .navbar{overflow:visible;}
 .navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
 .navbar .brand:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);}
@@ -499,5 +489,16 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .label.warning{background-color:#f89406;}
 .label.success{background-color:#46a546;}
 .label.notice{background-color:#62cffc;}
+@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.progress{height:18px;margin-bottom:18px;background-color:#f9f9f9;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9));background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
+.progress .bar{width:0%;height:20px;margin:-1px;background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);background-color:#0480be;background-image:-khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+.progress.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
+.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
+.progress.danger .bar{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
+.progress.danger.striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress.success .bar{background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
+.progress.success.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress.info .bar{background-color:#339bb9;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
+.progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
 .hidden{display:none;visibility:hidden;}
 @media (max-width: 480px){.modal{width:auto;margin:0;}.modal.fade.in{top:auto;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal .close{padding:10px;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/docs/components.html b/docs/components.html
index 8be1f824a..ce16c8092 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -929,43 +929,82 @@ Lorem ipsum dolar sit amet illo error ipsum verit
 ================================================== -->
       
        
         
        
-          
        Progress bars ... for indicating progress
        
+          
        Progress bars For loading, redirecting, or action status
        
         
        
+
+        
        Examples and markup
        
         
        
-          
        
-            
        Basic bars
        
-            
        Default look of progress bars. Absolute minimum.
        
-          
        
-          
        
+          
        
+            
        Basic
        
+            
        Default progress bar with a vertical gradient.
        
             
        
-              
        
+              
        
             
        
+
        +<div class="progress">
+  <div class="bar"
+       style="width: 60%;"></div>
+</div>
+
        
           
        
-        
        
-        
        
-          
        
-            
        Striped bars
        
-            
        Bars with stripes painted.
        
-          
        
-          
        
+          
        
+            
        Striped
        
+            
        Uses a gradient to create a striped effect.
        
             
        
               
        
             
        
+
        +<div class="progress info
+     striped">
+  <div class="bar"
+       style="width: 20%;"></div>
+</div>
+
        
           
        
-        
        
-        
        
-          
        
-            
        Active state
        
-            
        Animated stripes! Not on Opera, though :(
        
-          
        
-          
        
+          
        
+            
        Animated
        
+            
        Takes the striped example and animates it.
        
             
        
               
        
             
        
+
        +<div class="progress danger
+     striped active">
+  <div class="bar"
+       style="width: 40%;"></div>
+</div>
+
        
           
        
         
        
+
+        
        Options and browser support
        
+        
        
+          
        
+            
        Additional colors
        
+            
        Progress bars utilize some of the same classes as buttons and alert messages for quick styling.
        
+            
          
+              
        • .info
          • 
+              
        • .success
          • 
+              
        • .danger
          • 
+            
        
+            
        Alternatively, you can customize the LESS files and roll your own colors and sizes.
        
+          
        
+          
        
+            
        Behavior
        
+            
        Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.
        
+            
        If you use the .active class, your .striped progress bars will animate the stripes left to right.
        
+          
        
+          
        
+            
        Browser support
        
+            
        Progress bars use CSS3 gradients, transitions, and animations to achieve all theire effects. These features are not supported in IE7-8 or older versions of Firefox.
        
+            
        Opera does not support animations at this time.
        
+          
        
+        
        
+
       
        
 
+
+
       
       
        
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 0335f8651..d82dffc65 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -30,7 +30,6 @@
 @import "wells.less";
 @import "component-animations.less";
 @import "close.less";
-@import "progress-bars.less";
 
 // Components: Nav
 @import "navbar.less";
@@ -52,6 +51,7 @@
 // Components: Misc
 @import "thumbnails.less";
 @import "labels.less";
+@import "progress-bars.less";
 
 // Responsive
 @import "responsive.less";
\ No newline at end of file
diff --git a/lib/mixins.less b/lib/mixins.less
index ea8d685f0..50986c68c 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -179,6 +179,13 @@
           background-clip: @clip;
 }
 
+// Box sizing
+.box-sizing(@boxmodel) {
+  -webkit-box-sizing: @boxmodel;
+     -moz-box-sizing: @boxmodel;
+          box-sizing: @boxmodel;
+}
+
 // Resize anything
 .resizable(@direction: both) {
   resize: @direction; // Options: horizontal, vertical, both
@@ -272,12 +279,12 @@
   }
   .striped(@color,@angle: -45deg) {
     background-color: @color;
-    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255, 255, 255, .2)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.75, rgba(255, 255, 255, .2)), color-stop(.75, transparent), to(transparent));
-    background-image: -webkit-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
-    background-image: -moz-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
-    background-image: -ms-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
-    background-image: -o-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
-    background-image: linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
+    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
+    background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -ms-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
   }
 }
 
diff --git a/lib/progress-bars.less b/lib/progress-bars.less
index 1a9afb275..28c56d131 100644
--- a/lib/progress-bars.less
+++ b/lib/progress-bars.less
@@ -1,102 +1,98 @@
+// PROGRESS BARS
+// -------------
+
+
+// ANIMATIONS
+// ----------
+
+// Webkit
 @-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
+  from  { background-position: 0 0; }
+  to    { background-position: 40px 0; }
 }
 
-/* COMMENTED OUT SO LESS COMPILES
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-*/
+// Temporarily commented out since LESS won't compile with this
+// @-moz-keyframes progress-bar-stripes {
+//   from  { background-position: 0 0; }
+//   to    { background-position: 40px 0; }
+// }
 
+// Spec
 @keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
+  from  { background-position: 0 0; }
+  to    { background-position: 40px 0; }
+}
+
+
+
+// THE BARS
+// --------
+
+// Common styles
+.progress,
+.progress .bar {
+  .border-radius(4px);
 }
 
+// Outer container
 .progress {
-  height: 25px;
+  height: 18px;
   margin-bottom: 18px;
-  overflow: hidden;
-  .box-shadow(inset 0 1px 1px 0 rgba(0,0,0,.3), 0 1px 0 0 #fff);
-  #gradient > .vertical(#fff, #f5f5f5);
-  .border-radius(10px);
+  #gradient > .vertical(#f5f5f5, #f9f9f9);
   border: 1px solid #ddd;
-  border-color: rgba(0,0,0,.0);
-  &.active {
-    .bar {
-      -webkit-animation: progress-bar-stripes 2s linear infinite;
-      -moz-animation: progress-bar-stripes 2s linear infinite;
-      animation: progress-bar-stripes 2s linear infinite;
-    }
-  }
-  &.animated {
-    .bar {
-      .transition(width .6s ease);
-    }
-  }
-  &.danger,
-  &.error {
-    .bar {
-      #gradient > .vertical(#ee5f5b, #c43c35);
-    }
-    &.striped {
-      .bar {
-        .background-size(40px, 40px);
-        #gradient > .striped(#ee5f5b);
-      }
-    }
-  }
-  &.success {
-    .bar {
-      #gradient > .vertical(#62c462, #57a957);
-    }
-    &.striped {
-      .bar {
-        .background-size(40px, 40px);
-        #gradient > .striped(#62c462);
-      }
-    }
-  }
-  &.info {
-    .bar {
-      #gradient > .vertical(#5bc0de, #339bb9);
-    }
-    &.striped {
-      .bar {
-        .background-size(40px, 40px);
-        #gradient > .striped(#5bc0de);
-      }
-    }
-  }
-  &.striped {
-    .bar {
-      .background-size(40px, 40px);
-      #gradient > .striped(#62c462);
-    }
-  }
-  .bar {
-    width: 0%;
-    height: 100%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-    .gradientBar(#62c462, #57a957);
-    @shadow: inset 0 2px 0 rgba(255,255,255,.2), inset -1px -1px 0 rgba(0,0,0,.25),inset 1px 1px 0 rgba(0,0,0,.25);
-    .box-shadow(@shadow);
-    .border-radius(10px);
-  }
-}
\ No newline at end of file
+  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
+}
+
+// Bar of progress
+.progress .bar {
+  width: 0%;
+  height: 20px;
+  margin: -1px;
+  #gradient > .vertical(#62c462, #57a957);
+  #gradient > .vertical(#149bdf, #0480be);
+  .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
+  .box-sizing(border-box);
+  .transition(width .6s ease);
+}
+
+// Striped bars
+.progress.striped .bar {
+  #gradient > .striped(#62c462);
+  .background-size(40px, 40px);
+}
+
+// Call animation for the active one
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+     -moz-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+
+
+
+// COLORS
+// ------
+
+// Danger (red)
+.progress.danger .bar {
+  #gradient > .vertical(#ee5f5b, #c43c35);
+}
+.progress.danger.striped .bar {
+  #gradient > .striped(#ee5f5b);
+}
+
+// Success (green)
+.progress.success .bar {
+  #gradient > .vertical(#62c462, #57a957);
+}
+.progress.success.striped .bar {
+  #gradient > .striped(#62c462);
+}
+
+// Info (teal)
+.progress.info .bar {
+  #gradient > .vertical(#5bc0de, #339bb9);
+}
+.progress.info.striped .bar {
+  #gradient > .striped(#5bc0de);
+}
-- 
cgit v1.2.3


From 4961aa8c2306b77dae2c0d5d54edc9d40b138217 Mon Sep 17 00:00:00 2001
From: Purwandi 
Date: Sun, 8 Jan 2012 08:17:54 +0700
Subject: Fix line number pretyprint in javascript docs

---
 docs/javascript.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index d19343675..ca9217674 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -38,7 +38,6 @@
     
 
     
-    
     
     
     
-- 
cgit v1.2.3


From 2948d1c3b247a5aff1fd1f15cf72540e3f492f57 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 20:40:28 -0800
Subject: overhaul the entire tabs component structure and docs; remove side
 nav and make it a nav list to build on new .nav base class

---
 bootstrap.css                                    | 302 ++++----
 bootstrap.min.css                                |  70 +-
 docs/assets/js/google-code-prettify/prettify.css |  14 +-
 docs/components.html                             | 837 ++++++++++++-----------
 docs/upgrading.html                              |   9 +
 lib/bootstrap.less                               |   3 +-
 lib/dropdowns.less                               |   5 +-
 lib/forms.less                                   |   1 +
 lib/navbar.less                                  |   7 +-
 lib/navs.less                                    | 327 +++++++++
 lib/sidenav.less                                 |  43 --
 lib/tabs-pills.less                              | 285 --------
 lib/type.less                                    |   2 +-
 13 files changed, 1005 insertions(+), 900 deletions(-)
 create mode 100644 lib/navs.less
 delete mode 100644 lib/sidenav.less
 delete mode 100644 lib/tabs-pills.less

diff --git a/bootstrap.css b/bootstrap.css
index f6dd39226..5c9d4aa97 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 15:52:40 PST 2012
+ * Date: Sat Jan  7 20:25:41 PST 2012
  */
 html, body {
   margin: 0;
@@ -516,9 +516,9 @@ pre {
   background-color: #f5f5f5;
   border: 1px solid #ccc;
   border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
   white-space: pre;
   white-space: pre-wrap;
   word-break: break-all;
@@ -541,6 +541,7 @@ legend {
   line-height: 36px;
   color: #333333;
   border-bottom: 1px solid #eee;
+  -webkit-margin-collapse: separate;
 }
 label,
 input,
@@ -1502,6 +1503,16 @@ i {
   background-image: linear-gradient(top, #049cdb, #0064cd);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  background-color: #0077b3;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3));
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -ms-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #0088cc), color-stop(100%, #0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(top, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0);
   -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
   -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
@@ -1692,19 +1703,51 @@ i {
   left: 0;
   z-index: 1010;
 }
-.nav {
+.navbar .nav {
   position: relative;
   left: 0;
   display: block;
   float: left;
   margin: 0 10px 0 0;
+  /*  // Dropdowns within the .nav
+  .dropdown-toggle:hover,
+  .dropdown.open .dropdown-toggle {
+    background: #444;
+    background: rgba(255,255,255,.05);
+  }
+  .dropdown-menu {
+    background-color: #333;
+    .dropdown-toggle {
+      color: @white;
+      &.open {
+        background: #444;
+        background: rgba(255,255,255,.05);
+      }
+    }
+    li a {
+      padding: 4px 15px;
+      color: #999;
+      text-shadow: 0 1px 0 rgba(0,0,0,.5);
+      &:hover {
+        #gradient > .vertical(#292929,#191919);
+        color: @white;
+      }
+    }
+    .active a {
+      color: @white;
+    }
+    .divider {
+      background-color: #222;
+      border-color: #444;
+    }
+  }*/
+
 }
-.nav > li {
+.navbar .nav > li {
   display: block;
   float: left;
 }
-.nav a {
-  display: block;
+.navbar .nav a {
   float: none;
   padding: 10px 10px 11px;
   line-height: 19px;
@@ -1712,15 +1755,15 @@ i {
   text-decoration: none;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
-.nav a:hover {
+.navbar .nav a:hover {
   color: #ffffff;
   text-decoration: none;
 }
-.nav .active > a {
+.navbar .nav .active > a {
   background-color: #222;
   background-color: rgba(0, 0, 0, 0.5);
 }
-.nav .vertical-divider {
+.navbar .nav .vertical-divider {
   height: 40px;
   width: 1px;
   margin: 0 5px;
@@ -1728,58 +1771,55 @@ i {
   background-color: #222;
   border-right: 1px solid #444;
 }
-.nav.secondary-nav {
+.navbar .nav.secondary-nav {
   float: right;
   margin-left: 10px;
   margin-right: 0;
 }
-.nav.secondary-nav .dropdown-menu {
+.navbar .nav.secondary-nav .dropdown-menu {
   right: 0;
   border: 0;
 }
-.nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle {
-  background: #444;
-  background: rgba(255, 255, 255, 0.05);
+.nav {
+  margin-left: 0;
+  margin-bottom: 18px;
+  list-style: none;
 }
-.nav .dropdown-menu {
-  background-color: #333;
+.nav > li > a {
+  display: block;
 }
-.nav .dropdown-menu .dropdown-toggle {
-  color: #ffffff;
+.nav > li > a:hover {
+  text-decoration: none;
+  background-color: #eee;
 }
-.nav .dropdown-menu .dropdown-toggle.open {
-  background: #444;
-  background: rgba(255, 255, 255, 0.05);
-}
-.nav .dropdown-menu li a {
-  padding: 4px 15px;
-  color: #999;
-  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
-}
-.nav .dropdown-menu li a:hover {
-  background-color: #191919;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));
-  background-image: -moz-linear-gradient(top, #292929, #191919);
-  background-image: -ms-linear-gradient(top, #292929, #191919);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));
-  background-image: -webkit-linear-gradient(top, #292929, #191919);
-  background-image: -o-linear-gradient(top, #292929, #191919);
-  background-image: linear-gradient(top, #292929, #191919);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);
-  color: #ffffff;
+.nav.list {
+  padding-left: 14px;
+  padding-right: 14px;
+  margin-bottom: 0;
 }
-.nav .dropdown-menu .active a {
-  color: #ffffff;
+.nav.list > li > a, .nav.list .nav-header {
+  display: block;
+  padding: 3px 15px;
+  margin-left: -15px;
+  margin-right: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
-.nav .dropdown-menu .divider {
-  background-color: #222;
-  border-color: #444;
+.nav.list .nav-header {
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #999999;
+  text-transform: uppercase;
+}
+.nav.list > li + .nav-header {
+  margin-top: 9px;
+}
+.nav.list .active > a {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
 }
 .tabs, .pills {
-  padding: 0;
-  margin: 0 0 20px;
-  list-style: none;
   zoom: 1;
 }
 .tabs:before,
@@ -1798,29 +1838,26 @@ i {
   float: left;
 }
 .tabs > li > a, .pills > li > a {
-  display: block;
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
 }
 .tabs {
-  border-color: #ddd;
-  border-style: solid;
-  border-width: 0 0 1px;
+  border-bottom: 1px solid #ddd;
 }
 .tabs > li {
-  position: relative;
   margin-bottom: -1px;
 }
 .tabs > li > a {
-  padding: 0 15px;
-  margin-right: 2px;
-  line-height: 36px;
+  padding-top: 9px;
+  padding-bottom: 9px;
   border: 1px solid transparent;
   -webkit-border-radius: 4px 4px 0 0;
   -moz-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
 .tabs > li > a:hover {
-  text-decoration: none;
-  background-color: #eee;
   border-color: #eee #eee #ddd;
 }
 .tabs .active > a, .tabs .active > a:hover {
@@ -1830,6 +1867,76 @@ i {
   border-bottom-color: transparent;
   cursor: default;
 }
+.pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.pills .active > a, .pills .active > a:hover {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+.nav.stacked > li {
+  float: none;
+}
+.nav.stacked > li > a {
+  margin-right: 0;
+}
+.tabs.stacked {
+  border-bottom: 0;
+}
+.tabs.stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.tabs.stacked > li:first-child > a {
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+}
+.tabs.stacked > li:last-child > a {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+.tabs.stacked > li > a:hover {
+  border-color: #ddd;
+  z-index: 2;
+}
+.pills.stacked > li > a {
+  margin-bottom: 3px;
+}
+.pills.stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+.tabs .dropdown-menu, .pills .dropdown-menu {
+  top: 33px;
+  border-width: 1px;
+}
+.pills .dropdown-menu {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
+  margin-top: 6px;
+}
+.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle {
+  background-color: #999;
+  border-color: #999;
+}
+.tabs .open .caret, .pills .open .caret {
+  border-top-color: #fff;
+  filter: alpha(opacity=100);
+  -moz-opacity: 1;
+  opacity: 1;
+}
 .tabbable {
   margin-bottom: 18px;
 }
@@ -1929,46 +2036,6 @@ i {
   border-color: #ddd;
   border-left-color: transparent;
 }
-.tabs .dropdown-menu {
-  top: 37px;
-  border-width: 1px;
-}
-.tabs .dropdown-toggle .caret {
-  margin-top: 15px;
-  margin-left: 5px;
-}
-.tabs .open .dropdown-toggle {
-  border-color: #999;
-}
-.tabs .open .dropdown-toggle .caret {
-  border-top-color: #fff;
-  filter: alpha(opacity=100);
-  -moz-opacity: 1;
-  opacity: 1;
-}
-.pills > li > a {
-  padding: 0 15px;
-  margin: 5px 3px 5px 0;
-  line-height: 30px;
-  text-shadow: 0 1px 1px #ffffff;
-  -webkit-border-radius: 15px;
-  -moz-border-radius: 15px;
-  border-radius: 15px;
-}
-.pills > li > a:hover {
-  color: #ffffff;
-  text-decoration: none;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
-  background-color: #005580;
-}
-.pills .active > a {
-  color: #ffffff;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
-  background-color: #0088cc;
-}
-.pills-vertical > li {
-  float: none;
-}
 .tab-content > .tab-pane, .pill-content > .pill-pane {
   display: none;
 }
@@ -2060,27 +2127,29 @@ i {
   color: #333333;
   background-color: #eee;
 }
-.side-nav {
-  padding: 9px 0;
+/*.side-nav {
+  padding: @baseLineHeight / 2 0;
 }
-.side-nav .nav-label, .side-nav .nav-item {
+.side-nav .nav-label,
+.side-nav .nav-item {
   display: block;
   padding: 3px 15px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
 }
 .side-nav .nav-label {
   font-size: 11px;
-  line-height: 18px;
-  color: #999999;
+  line-height: @baseLineHeight;
+  color: @grayLight;
   text-transform: uppercase;
 }
 .side-nav .nav-group {
-  margin: 0;
+  margin: 0; // clear default ul margins
   list-style: none;
 }
 .side-nav .nav-group + .nav-label {
   margin-top: 9px;
 }
+
 .side-nav .nav-item {
   font-weight: bold;
 }
@@ -2092,22 +2161,11 @@ i {
 }
 .side-nav .active .nav-item {
   color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
-  background-color: #999999;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#999999));
-  background-image: -moz-linear-gradient(top, #cccccc, #999999);
-  background-image: -ms-linear-gradient(top, #cccccc, #999999);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #999999));
-  background-image: -webkit-linear-gradient(top, #cccccc, #999999);
-  background-image: -o-linear-gradient(top, #cccccc, #999999);
-  background-image: linear-gradient(top, #cccccc, #999999);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#999999', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05);
-}
-.breadcrumb {
+  text-shadow: 0 -1px 0 rgba(0,0,0,.3);
+  #gradient > .vertical(#ccc, #999);
+  @shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 -1px 0 rgba(0,0,0,.05);
+  .box-shadow(@shadow);
+}*/.breadcrumb {
   padding: 7px 14px;
   margin: 0 0 18px;
   background-color: #f5f5f5;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index e08068a78..5597bf1ef 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -91,10 +91,10 @@ blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right
 address{display:block;margin-bottom:18px;line-height:18px;}
 code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 code{padding:1px 3px;background-color:#fee9cc;}
-pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
+pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
 pre code{padding:0;background-color:transparent;}
 form{margin-bottom:18px;}
-legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border-bottom:1px solid #eee;}
+legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
 label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
 input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
@@ -304,7 +304,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .dropdown .caret{margin-top:8px;margin-left:2px;}
 .dropdown:hover .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
 .dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:5px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.1);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
-.dropdown-menu a{display:block;padding:2px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;}.dropdown-menu a:hover{color:#fff;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);}
+.dropdown-menu a{display:block;padding:2px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;}.dropdown-menu a:hover{color:#fff;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-color:#0077b3;background-image:-khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3));background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-ms-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #0088cc), color-stop(100%, #0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(top, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);}
 .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
 .dropdown.open .dropdown-menu{display:block;}
 .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
@@ -325,21 +325,43 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar-static{margin-bottom:18px;}
 .navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .navbar-fixed{position:fixed;top:0;right:0;left:0;z-index:1010;}
-.nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}.nav>li{display:block;float:left;}
-.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.nav a:hover{color:#ffffff;text-decoration:none;}
-.nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
-.nav .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;}
-.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;border:0;}
-.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);}
-.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#ffffff;}.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);}
-.nav .dropdown-menu li a{padding:4px 15px;color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);color:#ffffff;}
-.nav .dropdown-menu .active a{color:#ffffff;}
-.nav .dropdown-menu .divider{background-color:#222;border-color:#444;}
-.tabs,.pills{padding:0;margin:0 0 20px;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;*display:inline;content:"";zoom:1;}
+.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}.navbar .nav>li{display:block;float:left;}
+.navbar .nav a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.navbar .nav a:hover{color:#ffffff;text-decoration:none;}
+.navbar .nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
+.navbar .nav .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;}
+.navbar .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.navbar .nav.secondary-nav .dropdown-menu{right:0;border:0;}
+.nav{margin-left:0;margin-bottom:18px;list-style:none;}
+.nav>li>a{display:block;}
+.nav>li>a:hover{text-decoration:none;background-color:#eee;}
+.nav.list{padding-left:14px;padding-right:14px;margin-bottom:0;}
+.nav.list>li>a,.nav.list .nav-header{display:block;padding:3px 15px;margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
+.nav.list .nav-header{font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-transform:uppercase;}
+.nav.list>li+.nav-header{margin-top:9px;}
+.nav.list .active>a{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;}
+.tabs,.pills{zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;*display:inline;content:"";zoom:1;}
 .tabs:after,.pills:after{clear:both;}
-.tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;}
-.tabs{border-color:#ddd;border-style:solid;border-width:0 0 1px;}.tabs>li{position:relative;margin-bottom:-1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;}
+.tabs>li,.pills>li{float:left;}
+.tabs>li>a,.pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
+.tabs{border-bottom:1px solid #ddd;}
+.tabs>li{margin-bottom:-1px;}
+.tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{border-color:#eee #eee #ddd;}
 .tabs .active>a,.tabs .active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
+.pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.pills .active>a,.pills .active>a:hover{color:#ffffff;background-color:#0088cc;}
+.nav.stacked>li{float:none;}
+.nav.stacked>li>a{margin-right:0;}
+.tabs.stacked{border-bottom:0;}
+.tabs.stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.tabs.stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
+.tabs.stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
+.tabs.stacked>li>a:hover{border-color:#ddd;z-index:2;}
+.pills.stacked>li>a{margin-bottom:3px;}
+.pills.stacked>li:last-child>a{margin-bottom:1px;}
+.tabs .dropdown-menu,.pills .dropdown-menu{top:33px;border-width:1px;}
+.pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{margin-top:6px;}
+.tabs .open .dropdown-toggle,.pills .open .dropdown-toggle{background-color:#999;border-color:#999;}
+.tabs .open .caret,.pills .open .caret{border-top-color:#fff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
 .tabbable{margin-bottom:18px;}.tabbable .tabs{margin-bottom:0;border-bottom:0;}
 .tabbable .tab-content{padding:19px;border:1px solid #ddd;}
 .tabbable.tabs-bottom .tabs>li{margin-top:-1px;margin-bottom:0;}
@@ -354,13 +376,6 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tabbable.tabs-right .tab-content{margin-right:100px;}
 .tabbable.tabs-right .tabs{float:right;}.tabbable.tabs-right .tabs>li{margin-left:-1px;}.tabbable.tabs-right .tabs>li>a{margin-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}.tabbable.tabs-right .tabs>li>a:hover{border-left-color:#ddd;}
 .tabbable.tabs-right .tabs .active>a,.tabbable.tabs-right .tabs .active>a:hover{border-color:#ddd;border-left-color:transparent;}
-.tabs .dropdown-menu{top:37px;border-width:1px;}
-.tabs .dropdown-toggle .caret{margin-top:15px;margin-left:5px;}
-.tabs .open .dropdown-toggle{border-color:#999;}
-.tabs .open .dropdown-toggle .caret{border-top-color:#fff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
-.pills>li>a{padding:0 15px;margin:5px 3px 5px 0;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills>li>a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#005580;}
-.pills .active>a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0088cc;}
-.pills-vertical>li{float:none;}
 .tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
 .tab-content>.active,.pill-content>.active{display:block;}
 .step-nav{position:relative;margin:0 0 18px;list-style:none;line-height:30px;text-align:center;background-color:#f5f5f5;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.step-nav li{display:inline;color:#999999;}
@@ -373,15 +388,6 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .subnav li:first-child a{border-left:0;-webkit-border-radius:6px 0 0 6px;-moz-border-radius:6px 0 0 6px;border-radius:6px 0 0 6px;}
 .subnav li:last-child a{border-right:0;-webkit-border-radius:0 6px 6px 0;-moz-border-radius:0 6px 6px 0;border-radius:0 6px 6px 0;}
 .subnav ul .active>a{color:#333333;background-color:#eee;}
-.side-nav{padding:9px 0;}
-.side-nav .nav-label,.side-nav .nav-item{display:block;padding:3px 15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
-.side-nav .nav-label{font-size:11px;line-height:18px;color:#999999;text-transform:uppercase;}
-.side-nav .nav-group{margin:0;list-style:none;}
-.side-nav .nav-group+.nav-label{margin-top:9px;}
-.side-nav .nav-item{font-weight:bold;}
-.side-nav .nav-item i{vertical-align:-2px;}
-.side-nav .nav-item:hover{text-decoration:none;}
-.side-nav .active .nav-item{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);background-color:#999999;background-image:-khtml-gradient(linear, left top, left bottom, from(#cccccc), to(#999999));background-image:-moz-linear-gradient(top, #cccccc, #999999);background-image:-ms-linear-gradient(top, #cccccc, #999999);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #cccccc), color-stop(100%, #999999));background-image:-webkit-linear-gradient(top, #cccccc, #999999);background-image:-o-linear-gradient(top, #cccccc, #999999);background-image:linear-gradient(top, #cccccc, #999999);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#999999', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.05),inset 0 -1px 0 rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.05),inset 0 -1px 0 rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.05),inset 0 -1px 0 rgba(0, 0, 0, 0.05);}
 .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
 .breadcrumb .divider{padding:0 5px;color:#999999;}
 .breadcrumb .active a{color:#333333;}
diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css
index f195124a9..0d54905fb 100644
--- a/docs/assets/js/google-code-prettify/prettify.css
+++ b/docs/assets/js/google-code-prettify/prettify.css
@@ -6,21 +6,13 @@
 .kwd, .linenums .tag { color: #1e347b; }
 .typ, .atn, .dec, .var { color: teal; }
 .pln { color: #48484c; }
-pre.prettyprint {
-  background-color: #fefbf3;
-  padding: 9px;
-  margin-bottom: 9px;
-}
-
-pre.prettyprint {
-  color: #ccc;
-  background-color: #252525;
-}
 
-pre.prettyprint {
+.prettyprint {
   padding: 8px;
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
+}
+.prettyprint.linenums {
   -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
      -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
           box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
diff --git a/docs/components.html b/docs/components.html
index ce16c8092..eb9932473 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -54,397 +54,218 @@
       
 
 
-
-
        
+
        
   
        
-    
        Thumbnails Grids of images, videos, text, and more
        
+    
        Nav, tabs, and pills Highly customizable list-style navigation
        
   
        
 
+  
        Lightweight defaults Same markup, different classes
        
   
        
-    
        
-      
        Default thumbnails
        
-      
        By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.
        
-      
          
-        
        • 
-          
-            
-          
-        
          • 
-        
        • 
-          
-            
-          
-        
          • 
-        
        • 
-          
-            
-          
-        
          • 
-        
        • 
-          
-            
-          
-        
          • 
+    
          
+      
          Powerful base class
          
+      
          All nav components here—tabs, pills, and lists—share the same base markup and styles through the .nav class.
          
+      
          Why tabs and pills
          
+      
          Tabs and pills in Bootstrap are built on a <ul> with the same core HTML, a list of links. Swap between tabs or pills with only a class.
          
+      
          Both options are great for sub-sections of content or navigating between pages of related content.
          
+    
          
+    
          
+      
          Basic tabs
          
+      
          Take a regular <ul> of links and add .tabs:
          
+      
+
          +<ul class="nav tabs">
+  <li class="active">
+    <a href="#">Home</a>
+  </li>
+  <li><a href="#">...</a></li>
+  <li><a href="#">...</a></li>
+</ul>
+
          
     
          
-    
          
-      
          Highly customizable
          
-      
          With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.
          
-      
            
-        
          • 
-          
            
-            
-            
            
-              
            Thumbnail label
            
-              
            Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
            
-              
            Action Action
            
-            
            
-          
            
-        
            • 
-        
          • 
-          
            
-            
-            
            
-              
            Thumbnail label
            
-              
            Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
            
-              
            Action Action
            
-            
            
-          
            
-        
            • 
+    
            
+      
            Basic pills
            
+      
            Take that same HTML, but use .pills instead:
            
+      
+
            +<ul class="nav pills">
+  <li class="active">
+    <a href="#">Home</a>
+  </li>
+  <li><a href="#">...</a></li>
+  <li><a href="#">...</a></li>
+</ul>
+
            
     
            
   
          
 
+  
          Stackable Make tabs or pills vertical
          
   
          
     
          
-      
          Why use thumbnails
          
-      
          Thumbnails (previously .media-grid up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.
          
+      
          How to stack 'em
          
+      
          As tabs and pills are horizontal by default, just add a second class, .stacked, to make them appear vertically stacked.
          
     
          
     
          
-      
          Simple, flexible markup
          
-      
          Thumbnail markup is simple—a ul with any number of li elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.
          
-    
          
-    
          
-      
          Uses grid column sizes
          
-      
          Lastly, the thumbnails component uses existing grid system classes—like .span2 or .span3—for control of thumbnail dimensions.
          
-    
          
-  
          
-
-  
          
-    
          
-      
          The markup
          
-      
          As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup for linked images:
          
+      
          Stacked tabs
          
+      
 
          -<ul class="thumbnails">
-  <li class="span3">
-    <a href="#" class="thumbnail">
-      <img src="http://placehold.it/210x150" alt="">
-    </a>
-  </li>
+<ul class="nav tabs stacked">
   ...
 </ul>
 
          
-      
          For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <a> for a <div> like so:
          
+    
          
+    
          
+      
          Stacked pills
          
+      
 
          -<ul class="thumbnails">
-  <li class="span3">
-    <div class="thumbnail">
-      <img src="http://placehold.it/210x150" alt="">
-      <h5>Thumbnail label</h5>
-      <p>Thumbnail caption right here...</p>
-    </div>
-  </li>
+<ul class="nav pills stacked">
   ...
 </ul>
 
          
     
          
-    
          
-      
          More examples
          
-      
          Explore all your options with the various grid classes available to you. You can also mix and match different sizes.
          
-      
-    
          
-  
          
-
-
        
-
-
-
-
-
        
-  
        
-    
        Autocomplete 
        
-  
        
-
-
        
-
-
-
-
-
-
-
-
-
-
        
-  
        
-    
        Side nav for lists of links
        
   
        
 
+  
        Dropdowns For advanced nav components
        
   
        
-    
        
-      
        Examples
        
-      
        Side navs can be just links, links with headings, and links with icons.
        
-      
        
-        
-        
        Your account
        
-        
-        
        Your account
        
-        
-      
        
-    
        
-    
        
-      
        Why use it
        
-      
        
+    
        
+      
        Rich menus made easy
        
+      
        Dropdown menus in Bootstrap tabs and pills are super easy and require only a little extra HTML and a lightweight jQuery plugin.
        
+      
        Head over to the Javascript page to read the docs on initializing dropdowns in Bootstrap.
        
     
        
-    
        
-      
        Markup
        
-      
        Marking up a side nav is at the core just writing an unordered list of links.
        
+    
        
+      
        Tabs with dropdowns
        
+      
 
        -  <ul class="nav-group">
-    <li class="active">
-      <a class="nav-item" href="#">Home</a>
-    </li>
-    <li><a class="nav-item" href="#">Library</a></li>
-    <li><a class="nav-item" href="#">Help</a></li>
-  </ul>
+<ul class="nav tabs">
+  <li class="dropdown">
+    <a class="dropdown-toggle" 
+       data-toggle="dropdown"
+       href="#">
+        Dropdown
+        <b class="caret"></b>
+      </a>
+    <ul class="dropdown-menu">
+      <!-- links -->
+    </ul>
+  </li>
+</ul>
 
        
-      
        Bootstrap also makes it easy to expand a regular list of links with multiple groups and headings.
        
+    
        
+    
        
+      
        Pills with dropdowns
        
+      
 
        -  <h6 class="nav-label"></h6>
-  <ul class="nav-group">
-    ...
-  </ul>
-  <h6 class="nav-label"></h6>
-  <ul class="nav-group">
-    ...
-  </ul>
+<ul class="nav pills">
+  <li class="dropdown">
+    <a class="dropdown-toggle" 
+       data-toggle="dropdown"
+       href="#">
+        Dropdown
+        <b class="caret"></b>
+      </a>
+    <ul class="dropdown-menu">
+      <!-- links -->
+    </ul>
+  </li>
+</ul>
 
        
     
        
   
        
-  
-
        
 
-
-
-
-
 
 
 
-
-
        
-  
        
-    
        Tabs and pills 
        
-  
        
 
-  
        
-    
        
-      
        Create simple secondary navigation with a <ul>. Swap between tabs or pills by adding the appropriate class.
        
-      
        Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.
        
-    
        
-    
        
-      
        Basic tabs example
        
-      
        Tabs can be used as regular navigation (loading external pages in the same tab) or as tabbable content areas for swapping out panes of content. We have a tabs plugin that can be used to integrate the latter.
        
-      
-
        -<ul class="tabs">
-  <li class="active"><a href="#">Home</a></li>
-  <li><a href="#">Profile</a></li>
-  <li><a href="#">Messages</a></li>
-  <li><a href="#">Settings</a></li>
-  <li><a href="#">Contact</a></li>
-</ul>
-
        
+
+
+
+
+
       
        Tabbable tabs
        
       
        As mentioned above, you can bring your tabs to life with a simple plugin. Here we have integrated all four variations of the tabs—default (top), right, bottom, left—with example tab areas.
        
 
@@ -543,37 +364,119 @@
         
      
       
      • 
 
-
-      
      In addition to tabs, we have pills! Though a bit more limited in functionality, they share much of the same markup.
      
-      
      
-      
      Basic pills example
      
-      
+
+
+
+
+
+
      
 
 
 
@@ -629,39 +532,6 @@
 
 
 
-
-
-
-
 
 
      
+  
      
 
-       
      
-        
      
-          
      
-            
-            
      
-              
      
-                
      Section 1
      
-                
      Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.
      
-              
      
-              
      
-                
      Section 2
      
-                
      Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.
      
-              
      
-              
      
-                
      Section 3
      
-                
      Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.
      
-              
      
-            
      
+  
      Tabbable in any direction
      
+  
      
+   
+    
      
+      
      Tabs on the bottom
      
+      
      Flip the order of the HTML and add a class to put tabs on the bottom.
      
+      
      
+        
      
+          
      
+            
      I'm in Section A.
      
           
      
-        
      
-        
      
-          
      
-            
-            
      
-              
      
-                
      Section 1
      
-                
      Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.
      
-              
      
-              
      
-                
      Section 2
      
-                
      Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.
      
-              
      
-              
      
-                
      Section 3
      
-                
      Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas sed diam eget risus varius blandit sit amet non magna. Vestibulum id ligula porta felis euismod semper.
      
-              
      
-            
      
+          
      
+            
      Howdy, I'm in Section B.
      
+          
      
+          
      
+            
      What up girl, this is Section C.
      
           
      
         
      
-      
      
-
-      
      
+        
+      
       
+    
      
+    
      
+      
      Tabs on the left
      
+      
      Swap the class to put tabs on the left.
      
+      
      
+        
         
      
-          
      
-            
      Oh hai #1!
      
-          
      
-          
      
-            
      Oh hai #2!
      
+          
      
+            
      I'm in Section A.
      
           
      
-          
      
-            
      Oh hai #3!
      
+          
      
+            
      Howdy, I'm in Section B.
      
           
      
-          
      
-            
      Oh hai #4!
      
+          
      
+            
      What up girl, this is Section C.
      
           
      
         
      
-        
       
+    
      
+    
      
+      
      Tabs on the right
      
+      
      Swap the class to put tabs on the right.
      
+      
      
+        
-      
      
+        
      
+          
      
+            
      I'm in Section A.
      
+          
      
+          
      
+            
      Howdy, I'm in Section B.
      
+          
      
+          
      
+            
      What up girl, this is Section C.
      
+          
      
+        
      
+      
       
+    
      
+  
      
 
 
 
diff --git a/lib/navs.less b/lib/navs.less
index 0d31cf3bc..f76f1acad 100644
--- a/lib/navs.less
+++ b/lib/navs.less
@@ -203,36 +203,97 @@
 // TABBABLE
 // --------
 
-/*
+
+// COMMON STYLES
+// ------------- 
+
+// Clear any floats
 .tabbable {
-  margin-bottom: @baseLineHeight;
+  .clearfix();
+}
+// Remove border on bottom, left, right
+.tabs-below .tabs,
+.tabs-right .tabs,
+.tabs-left .tabs {
+  border-bottom: 0;
+}
 
-  // Tabs on top
-  .tabs {
-    margin-bottom: 0;
-    border-bottom: 0;
-  }
-  .tab-content {
-    padding: 19px;
-    border: 1px solid #ddd;
-  }
+// BOTTOM
+// ------
 
-  // Tabs on bottom
-  &.tabs-bottom .tabs > li {
-    margin-top: -1px;
-    margin-bottom: 0;
-  }
-  &.tabs-bottom .tabs > li > a {
-    .border-radius(0 0 4px 4px);
-    &:hover {
-      border-bottom-color: transparent;
-      border-top-color: #ddd;
-    }
-  }
-  &.tabs-bottom .tabs > .active > a,
-  &.tabs-bottom .tabs > .active > a:hover {
-    border-color: transparent #ddd #ddd #ddd;
+.tabs-below .tabs {
+  border-top: 1px solid #ddd;
+}
+.tabs-below .tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+.tabs-below .tabs > li > a {
+  .border-radius(0 0 4px 4px);
+  &:hover {
+    border-bottom-color: transparent;
+    border-top-color: #ddd;
   }
+}
+.tabs-below .tabs .active > a,
+.tabs-below .tabs .active > a:hover {
+  border-color: transparent #ddd #ddd #ddd;
+}
+
+// LEFT & RIGHT
+// ------------
+
+// Common styles
+.tabs-left .tabs > li,
+.tabs-right .tabs > li {
+  float: none;
+}
+.tabs-left .tabs > li > a,
+.tabs-right .tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+
+// Tabs on the left
+.tabs-left .tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+.tabs-left .tabs > li > a {
+  margin-right: -1px;
+  .border-radius(4px 0 0 4px);
+}
+.tabs-left .tabs > li > a:hover {
+  border-color: #eee #ddd #eee #eee;
+}
+.tabs-left .tabs .active > a,
+.tabs-left .tabs .active > a:hover {
+  border-color: #ddd transparent #ddd #ddd;
+}
+
+// Tabs on the right
+.tabs-right .tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+.tabs-right .tabs > li > a {
+  margin-left: -1px;
+  .border-radius(0 4px 4px 0);
+}
+.tabs-right .tabs > li > a:hover {
+  border-color: #eee #eee #eee #ddd;
+}
+.tabs-right .tabs .active > a,
+.tabs-right .tabs .active > a:hover {
+  border-color: #ddd #ddd #ddd transparent;
+}
+
+
+/*
+.tabbable {
 
   // Tabs on left and right
   &.tabs-left,
-- 
cgit v1.2.3


From 961c479422f10cb566ade1f3a08d1b807d590b7a Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 22:07:18 -0800
Subject: remove unused css and reorder the toggle classes

---
 lib/navs.less | 109 +++++++---------------------------------------------------
 1 file changed, 12 insertions(+), 97 deletions(-)

diff --git a/lib/navs.less b/lib/navs.less
index f76f1acad..743d772f3 100644
--- a/lib/navs.less
+++ b/lib/navs.less
@@ -211,6 +211,7 @@
 .tabbable {
   .clearfix();
 }
+
 // Remove border on bottom, left, right
 .tabs-below .tabs,
 .tabs-right .tabs,
@@ -218,6 +219,17 @@
   border-bottom: 0;
 }
 
+// Show/hide tabbable areas
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+
 // BOTTOM
 // ------
 
@@ -290,100 +302,3 @@
 .tabs-right .tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
 }
-
-
-/*
-.tabbable {
-
-  // Tabs on left and right
-  &.tabs-left,
-  &.tabs-right {
-    .clearfix();
-    .tabs {
-      // Give a fixed width to avoid floating .tab-con
-      width: 100px;
-      // Unfloat them so they stack
-      > li {
-        float: none;
-        margin-bottom: -1px;
-        > a {
-          margin-bottom: 2px;
-          &:hover {
-            border-color: transparent;
-          }
-        }
-      }
-    }
-  }
-
-  // Tabs on left
-  &.tabs-left {
-    .tab-content {
-      margin-left: 100px;
-    }
-    .tabs {
-      float: left;
-      > li {
-        margin-right: -1px;
-        > a {
-          margin-right: 0;
-          .border-radius(4px 0 0 4px);
-
-          &:hover {
-            border-right-color: #ddd;
-          }
-        }
-      }
-      // Active state
-      .active > a,
-      .active > a:hover {
-        border-color: #ddd;
-        border-right-color: transparent;
-      }
-    }
-  }
-
-  // Tabs on right
-  &.tabs-right {
-    .tab-content {
-      margin-right: 100px;
-    }
-    .tabs {
-      float: right;
-      > li {
-        margin-left: -1px;
-        > a {
-          margin-left: 0;
-          .border-radius(0 4px 4px 0);
-
-          &:hover {
-            border-left-color: #ddd;
-          }
-        }
-      }
-      // Active state
-      .active > a,
-      .active > a:hover {
-        border-color: #ddd;
-        border-left-color: transparent;
-      }
-    }
-  }
-}
-*/
-
-
-
-
-
-
-// Tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
-- 
cgit v1.2.3


From d170224457581b6ab7305b29b4e2a15cb50ab853 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 23:21:40 -0800
Subject: fix progress bars by removing border and negative margins

---
 bootstrap.css          | 108 +++++--------------------------------------------
 bootstrap.min.css      |   8 ++--
 docs/components.html   |  30 ++++++++++++++
 lib/progress-bars.less |   6 +--
 4 files changed, 45 insertions(+), 107 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index ebb3cbe29..6417871fb 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 22:06:30 PST 2012
+ * Date: Sat Jan  7 23:21:05 PST 2012
  */
 html, body {
   margin: 0;
@@ -1962,6 +1962,12 @@ i {
 .tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs {
   border-bottom: 0;
 }
+.tab-content > .tab-pane, .pill-content > .pill-pane {
+  display: none;
+}
+.tab-content > .active, .pill-content > .active {
+  display: block;
+}
 .tabs-below .tabs {
   border-top: 1px solid #ddd;
 }
@@ -2023,91 +2029,6 @@ i {
 .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
 }
-/*
-.tabbable {
-
-  // Tabs on left and right
-  &.tabs-left,
-  &.tabs-right {
-    .clearfix();
-    .tabs {
-      // Give a fixed width to avoid floating .tab-con
-      width: 100px;
-      // Unfloat them so they stack
-      > li {
-        float: none;
-        margin-bottom: -1px;
-        > a {
-          margin-bottom: 2px;
-          &:hover {
-            border-color: transparent;
-          }
-        }
-      }
-    }
-  }
-
-  // Tabs on left
-  &.tabs-left {
-    .tab-content {
-      margin-left: 100px;
-    }
-    .tabs {
-      float: left;
-      > li {
-        margin-right: -1px;
-        > a {
-          margin-right: 0;
-          .border-radius(4px 0 0 4px);
-
-          &:hover {
-            border-right-color: #ddd;
-          }
-        }
-      }
-      // Active state
-      .active > a,
-      .active > a:hover {
-        border-color: #ddd;
-        border-right-color: transparent;
-      }
-    }
-  }
-
-  // Tabs on right
-  &.tabs-right {
-    .tab-content {
-      margin-right: 100px;
-    }
-    .tabs {
-      float: right;
-      > li {
-        margin-left: -1px;
-        > a {
-          margin-left: 0;
-          .border-radius(0 4px 4px 0);
-
-          &:hover {
-            border-left-color: #ddd;
-          }
-        }
-      }
-      // Active state
-      .active > a,
-      .active > a:hover {
-        border-color: #ddd;
-        border-left-color: transparent;
-      }
-    }
-  }
-}
-*/
-.tab-content > .tab-pane, .pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active, .pill-content > .active {
-  display: block;
-}
 .breadcrumb {
   padding: 7px 14px;
   margin: 0 0 18px;
@@ -2963,25 +2884,14 @@ a.thumbnail:hover {
   background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
-  border: 1px solid #ddd;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
 }
 .progress .bar {
   width: 0%;
-  height: 20px;
-  margin: -1px;
-  background-color: #57a957;
-  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);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+  height: 18px;
+  margin: ;
   background-color: #0480be;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));
   background-image: -moz-linear-gradient(top, #149bdf, #0480be);
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 868cfcb65..db1393fb4 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -374,6 +374,8 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tabbable{zoom:1;}.tabbable:before,.tabbable:after{display:table;*display:inline;content:"";zoom:1;}
 .tabbable:after{clear:both;}
 .tabs-below .tabs,.tabs-right .tabs,.tabs-left .tabs{border-bottom:0;}
+.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
+.tab-content>.active,.pill-content>.active{display:block;}
 .tabs-below .tabs{border-top:1px solid #ddd;}
 .tabs-below .tabs>li{margin-top:-1px;margin-bottom:0;}
 .tabs-below .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
@@ -388,8 +390,6 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tabs-right .tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
 .tabs-right .tabs>li>a:hover{border-color:#eee #eee #eee #ddd;}
 .tabs-right .tabs .active>a,.tabs-right .tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;}
-.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
-.tab-content>.active,.pill-content>.active{display:block;}
 .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
 .breadcrumb .divider{padding:0 5px;color:#999999;}
 .breadcrumb .active a{color:#333333;}
@@ -498,8 +498,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .label.success{background-color:#46a546;}
 .label.notice{background-color:#62cffc;}
 @-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.progress{height:18px;margin-bottom:18px;background-color:#f9f9f9;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9));background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
-.progress .bar{width:0%;height:20px;margin:-1px;background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);background-color:#0480be;background-image:-khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+.progress{height:18px;margin-bottom:18px;background-color:#f9f9f9;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9));background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
+.progress .bar{width:0%;height:18px;margin:;background-color:#0480be;background-image:-khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
 .progress.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
 .progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
 .progress.danger .bar{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
diff --git a/docs/components.html b/docs/components.html
index 6fca1268f..bd8753401 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -346,6 +346,16 @@
           
    • Section 3
      • 
         
       
       
+
      +<div class="tabbable tabs-bottom">
+  <ul class="nav tabs">
+    ...
+  </ul>
+  <div class="tab-content">
+    ...
+  </div>
+</div>
+
      
     
      
     
      
       
      Tabs on the left
      
@@ -368,6 +378,16 @@
           
      
         
      
       
       
+
      +<div class="tabbable tabs-left">
+  <ul class="nav tabs">
+    ...
+  </ul>
+  <div class="tab-content">
+    ...
+  </div>
+</div>
+
      
     
      
     
      
       
      Tabs on the right
      
@@ -390,6 +410,16 @@
           
      
         
      
       
       
+
      +<div class="tabbable tabs-right">
+  <ul class="nav tabs">
+    ...
+  </ul>
+  <div class="tab-content">
+    ...
+  </div>
+</div>
+
      
     
      
   
      
 
diff --git a/lib/progress-bars.less b/lib/progress-bars.less
index 28c56d131..f5a839834 100644
--- a/lib/progress-bars.less
+++ b/lib/progress-bars.less
@@ -39,16 +39,14 @@
   height: 18px;
   margin-bottom: 18px;
   #gradient > .vertical(#f5f5f5, #f9f9f9);
-  border: 1px solid #ddd;
   .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
 }
 
 // Bar of progress
 .progress .bar {
   width: 0%;
-  height: 20px;
-  margin: -1px;
-  #gradient > .vertical(#62c462, #57a957);
+  height: 18px;
+  margin: ;
   #gradient > .vertical(#149bdf, #0480be);
   .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
   .box-sizing(border-box);
-- 
cgit v1.2.3


From 3c2f82f469be4792e85eb73fd1e3b882dcadd48d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 7 Jan 2012 23:31:00 -0800
Subject: recomment out the moz stuff for progress bars since less can't
 compile it right now

---
 bootstrap.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.css b/bootstrap.css
index 6417871fb..2881afefd 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 23:21:05 PST 2012
+ * Date: Sat Jan  7 23:30:30 PST 2012
  */
 html, body {
   margin: 0;
-- 
cgit v1.2.3


From 4478df768168fe41599508688046612bf5f1e526 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 8 Jan 2012 00:49:38 -0800
Subject: first pass at ultra basic autocomplete

---
 bootstrap.css                        | 243 ++---------------------------------
 bootstrap.min.css                    |  20 +--
 docs/javascript.html                 |  95 ++++++++------
 js/bootstrap-typeahead.js            | 147 ++++++++++++++-------
 js/tests/unit/bootstrap-typeahead.js |  22 ++--
 lib/dropdowns.less                   |  21 +--
 6 files changed, 189 insertions(+), 359 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index ebb3cbe29..7d6263c6b 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan  7 22:06:30 PST 2012
+ * Date: Sat Jan  7 23:50:13 PST 2012
  */
 html, body {
   margin: 0;
@@ -1489,7 +1489,7 @@ i {
   line-height: 18px;
   color: #555555;
 }
-.dropdown-menu a:hover {
+.dropdown-menu.typeahead .active a, .dropdown-menu a:hover {
   color: #fff;
   text-decoration: none;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -1962,6 +1962,12 @@ i {
 .tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs {
   border-bottom: 0;
 }
+.tab-content > .tab-pane, .pill-content > .pill-pane {
+  display: none;
+}
+.tab-content > .active, .pill-content > .active {
+  display: block;
+}
 .tabs-below .tabs {
   border-top: 1px solid #ddd;
 }
@@ -2023,91 +2029,6 @@ i {
 .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
 }
-/*
-.tabbable {
-
-  // Tabs on left and right
-  &.tabs-left,
-  &.tabs-right {
-    .clearfix();
-    .tabs {
-      // Give a fixed width to avoid floating .tab-con
-      width: 100px;
-      // Unfloat them so they stack
-      > li {
-        float: none;
-        margin-bottom: -1px;
-        > a {
-          margin-bottom: 2px;
-          &:hover {
-            border-color: transparent;
-          }
-        }
-      }
-    }
-  }
-
-  // Tabs on left
-  &.tabs-left {
-    .tab-content {
-      margin-left: 100px;
-    }
-    .tabs {
-      float: left;
-      > li {
-        margin-right: -1px;
-        > a {
-          margin-right: 0;
-          .border-radius(4px 0 0 4px);
-
-          &:hover {
-            border-right-color: #ddd;
-          }
-        }
-      }
-      // Active state
-      .active > a,
-      .active > a:hover {
-        border-color: #ddd;
-        border-right-color: transparent;
-      }
-    }
-  }
-
-  // Tabs on right
-  &.tabs-right {
-    .tab-content {
-      margin-right: 100px;
-    }
-    .tabs {
-      float: right;
-      > li {
-        margin-left: -1px;
-        > a {
-          margin-left: 0;
-          .border-radius(0 4px 4px 0);
-
-          &:hover {
-            border-left-color: #ddd;
-          }
-        }
-      }
-      // Active state
-      .active > a,
-      .active > a:hover {
-        border-color: #ddd;
-        border-left-color: transparent;
-      }
-    }
-  }
-}
-*/
-.tab-content > .tab-pane, .pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active, .pill-content > .active {
-  display: block;
-}
 .breadcrumb {
   padding: 7px 14px;
   margin: 0 0 18px;
@@ -2937,154 +2858,6 @@ a.thumbnail:hover {
     background-position: 40px 0;
   }
 }
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-.progress, .progress .bar {
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.progress {
-  height: 18px;
-  margin-bottom: 18px;
-  background-color: #f9f9f9;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9));
-  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
-  border: 1px solid #ddd;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-}
-.progress .bar {
-  width: 0%;
-  height: 20px;
-  margin: -1px;
-  background-color: #57a957;
-  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);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
-  background-color: #0480be;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));
-  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
-  background-image: -ms-linear-gradient(top, #149bdf, #0480be);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));
-  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
-  background-image: -o-linear-gradient(top, #149bdf, #0480be);
-  background-image: linear-gradient(top, #149bdf, #0480be);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  -webkit-transition: width 0.6s ease;
-  -moz-transition: width 0.6s ease;
-  -ms-transition: width 0.6s ease;
-  -o-transition: width 0.6s ease;
-  transition: width 0.6s ease;
-}
-.progress.striped .bar {
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  -webkit-background-size: 40px 40px;
-  -moz-background-size: 40px 40px;
-  -o-background-size: 40px 40px;
-  background-size: 40px 40px;
-}
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-  -moz-animation: progress-bar-stripes 2s linear infinite;
-  animation: progress-bar-stripes 2s linear infinite;
-}
-.progress.danger .bar {
-  background-color: #c43c35;
-  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);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
-}
-.progress.danger.striped .bar {
-  background-color: #ee5f5b;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-.progress.success .bar {
-  background-color: #57a957;
-  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);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
-}
-.progress.success.striped .bar {
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-.progress.info .bar {
-  background-color: #339bb9;
-  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);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
-}
-.progress.info.striped .bar {
-  background-color: #5bc0de;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
 .hidden {
   display: none;
   visibility: hidden;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 868cfcb65..6ad22faca 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -304,7 +304,8 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .dropdown .caret{margin-top:8px;margin-left:2px;}
 .dropdown:hover .caret,.open.dropdown .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
 .dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:5px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.1);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
-.dropdown-menu a{display:block;padding:2px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;}.dropdown-menu a:hover{color:#fff;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-color:#0077b3;background-image:-khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3));background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-ms-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #0088cc), color-stop(100%, #0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(top, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);}
+.dropdown-menu a{display:block;padding:2px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;}
+.dropdown-menu.typeahead .active a,.dropdown-menu a:hover{color:#fff;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-color:#0077b3;background-image:-khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3));background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-ms-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #0088cc), color-stop(100%, #0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(top, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);}
 .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
 .dropdown.open .dropdown-menu{display:block;}
 .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
@@ -374,6 +375,8 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tabbable{zoom:1;}.tabbable:before,.tabbable:after{display:table;*display:inline;content:"";zoom:1;}
 .tabbable:after{clear:both;}
 .tabs-below .tabs,.tabs-right .tabs,.tabs-left .tabs{border-bottom:0;}
+.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
+.tab-content>.active,.pill-content>.active{display:block;}
 .tabs-below .tabs{border-top:1px solid #ddd;}
 .tabs-below .tabs>li{margin-top:-1px;margin-bottom:0;}
 .tabs-below .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
@@ -388,8 +391,6 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tabs-right .tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
 .tabs-right .tabs>li>a:hover{border-color:#eee #eee #eee #ddd;}
 .tabs-right .tabs .active>a,.tabs-right .tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;}
-.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
-.tab-content>.active,.pill-content>.active{display:block;}
 .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
 .breadcrumb .divider{padding:0 5px;color:#999999;}
 .breadcrumb .active a{color:#333333;}
@@ -497,16 +498,5 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .label.warning{background-color:#f89406;}
 .label.success{background-color:#46a546;}
 .label.notice{background-color:#62cffc;}
-@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.progress{height:18px;margin-bottom:18px;background-color:#f9f9f9;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9));background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
-.progress .bar{width:0%;height:20px;margin:-1px;background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);background-color:#0480be;background-image:-khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
-.progress.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
-.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
-.progress.danger .bar{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
-.progress.danger.striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.progress.success .bar{background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
-.progress.success.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.progress.info .bar{background-color:#339bb9;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
-.progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.hidden{display:none;visibility:hidden;}
+@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.hidden{display:none;visibility:hidden;}
 @media (max-width: 480px){.modal{width:auto;margin:0;}.modal.fade.in{top:auto;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal .close{padding:10px;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/docs/javascript.html b/docs/javascript.html
index dbf8d922a..1ea618a68 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -23,48 +23,6 @@
     
     
 
-    
-    
-    
-
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
   
 
   
@@ -163,6 +121,10 @@
               bootstrap-carousel.js
               A plugin for rotating through elements. A merry-go-round.
             
+            
+              bootstrap-typeahead.js
+              A basic, easily extended plugin for quickly creating elegant typeaheads.
+            
          
        
        
      Is javascript necessary?
      
@@ -1151,6 +1113,54 @@ $('.myCarousel').carousel({
       
      
     
 
+ 
+
+    
      
+      
      
+        
      Typeahead bootstrap-typeahead.js
      
+      
      
+      
      
+        
      
+          
      A basic, easily extended plugin for quickly creating elegant typeaheads.
      
+          Download
+        
      
+        
      
+          
      Using bootstrap-typeahead.js
      
+          
      $('.typeahead').typeahead()
      
+
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      itemsnumber8The max number of items to display in the dropdown.
      
+
+          
      Markup
      
+          
      Add data attributes to register an element with typeahead functionality.
      
+
      +<input type="text" data-provide="typeahead" />
+
      
+          
      Demo
      
+          
+        
      
+      
      
+    
      
+
+
       
       
      
@@ -1178,6 +1188,7 @@ $('.myCarousel').carousel({
     
     
     
+    
     
     
     
     
-    
+    
     
   
 
diff --git a/docs/javascript.html b/docs/javascript.html
index 119066895..51f3d691e 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -54,7 +54,6 @@
       
 
 
-
       
       
      
@@ -63,61 +62,100 @@
         
      
       
      
         
      
-          
      Modals
      
-          
      A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.
      
+          
         
      
         
      
-          
      Dropdowns
      
-          
      Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.
      
+          
         
      
         
      
-          
      Scrollspy
      
-          
      Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.
      
+          
         
      
         
      
-          
      Togglable tabs
      
-          
      Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.
      
+          
         
      
       
       
       
      
         
      
-          
      Twipsy tooltips
      
-          
      A new take on the jQuery Tipsy plugin, Twipsy uses CSS3 animations, data attributes for titles, and the new event API in jQuery 1.7.
      
+          
         
      
         
      
-          
      Popovers *
      
-          
      Add small overlays of content, like those on the iPad, to any element for housing secondary information.
      
-          
      * Requires Twipsy to be included
      
+          
         
      
         
      
-          
      Alert messages
      
-          
      The alert plugin is a tiny class for adding close functionality to alerts.
      
+          
         
      
         
      
-          
      Buttons
      
-          
      Do more with buttons. Control button states or create groups of buttons for more components like toolbars.
      
+          
         
      
       
       
       
      
         
      
-          
      Collapse
      
-          
      Get base styles and flexible support for collapsible components like accordions and navigation.
      
+          
         
      
         
      
-          
      Carousel
      
-          
      Create a merry-go-round of any content you wish to provide an interactive slideshow of content.
      
+          
         
      
         
      
-          
      Typeahead
      
-          
      A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.
      
+          
         
      
         
      
-          
      Transitions *
      
-          
      For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alert messages.
      
-          
      * Required for animation in plugins
      
+          
         
      
       
       
+      
      
+        
      
+          
+        
      
+      
      
       
      
+      Select/Unselect All Plugins
       
      Note: All plugins require the latest version of jQuery to be included.
      
     
 
@@ -169,8 +207,8 @@
               
      Popover in a modal
      
               
      This button should trigger a popover on hover.
      
 
-              
      Twipsy tooltips in a modal
      
-              
      This link and that link should have Twipsy tooltips on hover.
      
+              
      Tooltips in a modal
      
+              
      This link and that link should have tooltips on hover.
      
             
      
             
      
               Save changes
@@ -596,30 +634,29 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
     
 
 
-
-    
-    
      
+    
      
       
      
-        
      Twipsy bootstrap-twipsy.js
      
+        
      Tooltips bootstrap-tooltip.js
      
       
      
       
      
         
      
-          
      About Twipsy tooltips
      
-          
      Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, data-attributes for local title storage, and now jquery 1.7's new event api!
      
-          Download file
+          
      About Tooltips
      
+          
      Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.
      
+          Download file
         
      
         
      
-          
      Example use of Twipsy
      
+          
      Example use of Tooltips
      
           
      Hover over the links below to see tooltips:
      
-          
      
-            
      Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
+          
      
+            
      Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
             
      
           
      
           
      
-          
      Using bootstrap-twipsy.js
      
-          
      Trigger the Twipsy tooltips via javascript:
      
-          
      $('#example').twipsy(options)
      
+          
      Using bootstrap-tooltip.js
      
+          
      Trigger the tooltip via javascript:
      
+          
      $('#example').tooltip(options)
      
           
      Options
      
           
@@ -647,7 +684,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                
-               
+               
@@ -673,18 +710,18 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
      
             
      selector
                string
                falseIf a selector is provided, twipsy objects will be delegated to the specified targets.If a selector is provided, tooltip objects will be delegated to the specified targets.
              
      
              
      
                title
      
             
           
      
-          
      Notice Individual twipsy instance options can alternatively be specified through the use of data attributes.
      
+          
      Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.
      
           
      Markup
      
-          
      For performance reasons, the Twipsy and Popover data-apis are opt in. If you would like to use them just specify a selector option.
      
+          
      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
      
           
      Methods
      
-          
      $().twipsy(options)
      
-          
      Attaches a twipsy handler to an element collection.
      
-          
      .twipsy('show')
      
-          
      Reveals an elements twipsy.
      
-          
      $('#element').twipsy('show')
      
-          
      .twipsy('hide')
      
-          
      Hides an elements twipsy.
      
-          
      $('#element').twipsy('hide')
      
+          
      $().tooltip(options)
      
+          
      Attaches a tooltip handler to an element collection.
      
+          
      .tooltip('show')
      
+          
      Reveals an elements tooltip.
      
+          
      $('#element').tooltip('show')
      
+          
      .tooltip('hide')
      
+          
      Hides an elements tooltip.
      
+          
      $('#element').tooltip('hide')
      
         
      
       
      
     
      
@@ -701,7 +738,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
         
      
           
      About popovers
      
           
      Add small overlays of content, like those on the iPad, to any element for housing secondary information.
      
-          
      * Requires Twipsy to be included
      
+          
      * Requires Tooltip to be included
      
           Download file
         
      
         
      
@@ -741,7 +778,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                selector
                string
                false
-               if a selector is provided, twipsy objects will be delegated to the specified targets
+               if a selector is provided, tooltip objects will be delegated to the specified targets
              
              
                trigger
@@ -776,7 +813,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
      Notice Individual popover instance options can alternatively be specified through the use of data attributes.
      
           
      Markup
      
           
      
-          For performance reasons, the Twipsy and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
+          For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
           
      
           
      Methods
      
           
      $().popover(options)
      
@@ -1302,7 +1339,7 @@ $('#myCollapsible').on('hidden', function () {
     
     
     
-    
+    
     
     
     
@@ -1311,11 +1348,11 @@ $('#myCollapsible').on('hidden', function () {
     
     
     
     
-    
+    
     
 
   
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 746699d37..9f60cbe95 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -26,10 +26,10 @@
     this.init('popover', element, options)
   }
 
-  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TWIPSY.js
-     ========================================= */
+  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
+     ========================================== */
 
-  Popover.prototype = $.extend({}, $.fn.twipsy.Constructor.prototype, {
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
 
     constructor: Popover
 
@@ -86,7 +86,7 @@
 
   $.fn.popover.Constructor = Popover
 
-  $.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, {
+  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
     placement: 'right'
   , content: ''
   , template: '
      '
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
new file mode 100644
index 000000000..241a44e24
--- /dev/null
+++ b/js/bootstrap-tooltip.js
@@ -0,0 +1,270 @@
+/* ===========================================================
+ * bootstrap-tooltip.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#tooltip
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ===========================================================
+ * Copyright 2011 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+!function( $ ) {
+
+  "use strict"
+
+ /* TOOLTIP PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Tooltip = function ( element, options ) {
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.prototype = {
+
+    constructor: Tooltip
+
+  , init: function ( type, element, options ) {
+      var eventIn
+        , eventOut
+
+      this.type = type
+      this.$element = $(element)
+      this.options = this.getOptions(options)
+      this.enabled = true
+
+      if (this.options.trigger != 'manual') {
+        eventIn  = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
+        eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
+        this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
+      }
+
+      this.options.selector ?
+        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+        this.fixTitle()
+    }
+
+  , getOptions: function ( options ) {
+      options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
+
+      if (options.delay && typeof options.delay == 'number') {
+        options.delay = {
+          show: options.delay
+        , hide: options.delay
+        }
+      }
+
+      return options
+    }
+
+  , enter: function ( e ) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.show) {
+        self.show()
+      } else {
+        self.hoverState = 'in'
+        setTimeout(function() {
+          if (self.hoverState == 'in') {
+            self.show()
+          }
+        }, self.options.delay.show)
+      }
+    }
+
+  , leave: function ( e ) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.hide) {
+        self.hide()
+      } else {
+        self.hoverState = 'out'
+        setTimeout(function() {
+          if (self.hoverState == 'out') {
+            self.hide()
+          }
+        }, self.options.delay.hide)
+      }
+    }
+
+  , show: function () {
+      var $tip
+        , inside
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+
+      if (this.hasContent() && this.enabled) {
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          thing.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        inside = /in/.test(placement)
+
+        $tip
+          .remove()
+          .css({ top: 0, left: 0, display: 'block' })
+          .appendTo(inside ? this.$element : document.body)
+
+        pos = this.getPosition(inside)
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        switch (inside ? placement.split(' ')[1] : placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+        }
+
+        $tip
+          .css(tp)
+          .addClass(placement)
+          .addClass('in')
+      }
+    }
+
+  , setContent: function () {
+      var $tip = this.tip()
+      $tip.find('.tooltip-inner').html(this.getTitle())
+      $tip.removeClass('fade in top bottom left right')
+    }
+
+  , hide: function () {
+      var that = this
+        , $tip = this.tip()
+
+      $tip.removeClass('in')
+
+      function removeWithAnimation() {
+        var timeout = setTimeout(function () {
+          $tip.off($.support.transition.end).remove()
+        }, 500)
+
+        $tip.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          $tip.remove()
+        })
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        removeWithAnimation() :
+        $tip.remove()
+    }
+
+  , fixTitle: function () {
+      var $e = this.$element
+      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+        $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
+      }
+    }
+
+  , hasContent: function () {
+      return this.getTitle()
+    }
+
+  , getPosition: function (inside) {
+      return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
+        width: this.$element[0].offsetWidth
+      , height: this.$element[0].offsetHeight
+      })
+    }
+
+  , getTitle: function () {
+      var title
+        , $e = this.$element
+        , o = this.options
+
+      title = $e.attr('data-original-title')
+        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+      title = title.toString().replace(/(^\s*|\s*$)/, "")
+
+      return title
+    }
+
+  , tip: function () {
+      return this.$tip = this.$tip || $(this.options.template)
+    }
+
+  , validate: function () {
+      if (!this.$element[0].parentNode) {
+        this.hide()
+        this.$element = null
+        this.options = null
+      }
+    }
+
+  , enable: function () {
+      this.enabled = true
+    }
+
+  , disable: function () {
+      this.enabled = false
+    }
+
+  , toggleEnabled: function () {
+      this.enabled = !this.enabled
+    }
+
+  , toggle: function () {
+      this[this.tip().hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* TOOLTIP PLUGIN DEFINITION
+  * ========================= */
+
+  $.fn.tooltip = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+  $.fn.tooltip.defaults = {
+    animation: true
+  , delay: 0
+  , selector: false
+  , placement: 'top'
+  , trigger: 'hover'
+  , title: ''
+  , template: '
      '
+  }
+
+}( window.jQuery )
\ No newline at end of file
diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js
deleted file mode 100644
index b7b802926..000000000
--- a/js/bootstrap-twipsy.js
+++ /dev/null
@@ -1,270 +0,0 @@
-/* ==========================================================
- * bootstrap-twipsy.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#twipsy
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ==========================================================
- * Copyright 2011 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-!function( $ ) {
-
-  "use strict"
-
- /* TWIPSY PUBLIC CLASS DEFINITION
-  * ============================== */
-
-  var Twipsy = function ( element, options ) {
-    this.init('twipsy', element, options)
-  }
-
-  Twipsy.prototype = {
-
-    constructor: Twipsy
-
-  , init: function ( type, element, options ) {
-      var eventIn
-        , eventOut
-
-      this.type = type
-      this.$element = $(element)
-      this.options = this.getOptions(options)
-      this.enabled = true
-
-      if (this.options.trigger != 'manual') {
-        eventIn  = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
-        eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
-        this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
-      }
-
-      this.options.selector ?
-        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-        this.fixTitle()
-    }
-
-  , getOptions: function ( options ) {
-      options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
-
-      if (options.delay && typeof options.delay == 'number') {
-        options.delay = {
-          show: options.delay
-        , hide: options.delay
-        }
-      }
-
-      return options
-    }
-
-  , enter: function ( e ) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
-
-      if (!self.options.delay || !self.options.delay.show) {
-        self.show()
-      } else {
-        self.hoverState = 'in'
-        setTimeout(function() {
-          if (self.hoverState == 'in') {
-            self.show()
-          }
-        }, self.options.delay.show)
-      }
-    }
-
-  , leave: function ( e ) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
-
-      if (!self.options.delay || !self.options.delay.hide) {
-        self.hide()
-      } else {
-        self.hoverState = 'out'
-        setTimeout(function() {
-          if (self.hoverState == 'out') {
-            self.hide()
-          }
-        }, self.options.delay.hide)
-      }
-    }
-
-  , show: function () {
-      var $tip
-        , inside
-        , pos
-        , actualWidth
-        , actualHeight
-        , placement
-        , tp
-
-      if (this.hasContent() && this.enabled) {
-        $tip = this.tip()
-        this.setContent()
-
-        if (this.options.animation) {
-          $tip.addClass('fade')
-        }
-
-        placement = typeof this.options.placement == 'function' ?
-          thing.call(this, $tip[0], this.$element[0]) :
-          this.options.placement
-
-        inside = /in/.test(placement)
-
-        $tip
-          .remove()
-          .css({ top: 0, left: 0, display: 'block' })
-          .appendTo(inside ? this.$element : document.body)
-
-        pos = this.getPosition(inside)
-
-        actualWidth = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
-
-        switch (inside ? placement.split(' ')[1] : placement) {
-          case 'bottom':
-            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'top':
-            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'left':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
-            break
-          case 'right':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
-            break
-        }
-
-        $tip
-          .css(tp)
-          .addClass(placement)
-          .addClass('in')
-      }
-    }
-
-  , setContent: function () {
-      var $tip = this.tip()
-      $tip.find('.twipsy-inner').html(this.getTitle())
-      $tip.removeClass('fade in top bottom left right')
-    }
-
-  , hide: function () {
-      var that = this
-        , $tip = this.tip()
-
-      $tip.removeClass('in')
-
-      function removeWithAnimation() {
-        var timeout = setTimeout(function () {
-          $tip.off($.support.transition.end).remove()
-        }, 500)
-
-        $tip.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          $tip.remove()
-        })
-      }
-
-      $.support.transition && this.$tip.hasClass('fade') ?
-        removeWithAnimation() :
-        $tip.remove()
-    }
-
-  , fixTitle: function () {
-      var $e = this.$element
-      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-        $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
-      }
-    }
-
-  , hasContent: function () {
-      return this.getTitle()
-    }
-
-  , getPosition: function (inside) {
-      return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
-        width: this.$element[0].offsetWidth
-      , height: this.$element[0].offsetHeight
-      })
-    }
-
-  , getTitle: function () {
-      var title
-        , $e = this.$element
-        , o = this.options
-
-      title = $e.attr('data-original-title')
-        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-      title = title.toString().replace(/(^\s*|\s*$)/, "")
-
-      return title
-    }
-
-  , tip: function () {
-      return this.$tip = this.$tip || $(this.options.template)
-    }
-
-  , validate: function () {
-      if (!this.$element[0].parentNode) {
-        this.hide()
-        this.$element = null
-        this.options = null
-      }
-    }
-
-  , enable: function () {
-      this.enabled = true
-    }
-
-  , disable: function () {
-      this.enabled = false
-    }
-
-  , toggleEnabled: function () {
-      this.enabled = !this.enabled
-    }
-
-  , toggle: function () {
-      this[this.tip().hasClass('in') ? 'hide' : 'show']()
-    }
-
-  }
-
-
- /* TWIPSY PLUGIN DEFINITION
-  * ======================== */
-
-  $.fn.twipsy = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('twipsy')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('twipsy', (data = new Twipsy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.twipsy.Constructor = Twipsy
-
-  $.fn.twipsy.defaults = {
-    animation: true
-  , delay: 0
-  , selector: false
-  , placement: 'top'
-  , trigger: 'hover'
-  , title: ''
-  , template: '
      '
-  }
-
-}( window.jQuery )
\ No newline at end of file
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 4933f9605..180466a74 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -156,11 +156,13 @@
           break
 
         case 38: // up arrow
+          if (!this.shown) return
           e.preventDefault()
           this.prev()
           break
 
         case 40: // down arrow
+          if (!this.shown) return
           e.preventDefault()
           this.next()
           break
diff --git a/js/tests/index.html b/js/tests/index.html
index 27c2b3412..8c710de36 100644
--- a/js/tests/index.html
+++ b/js/tests/index.html
@@ -20,7 +20,7 @@
   
   
   
-  
+  
   
   
 
@@ -33,7 +33,7 @@
   
   
   
-  
+  
   
   
 
diff --git a/js/tests/unit/bootstrap-twipsy.js b/js/tests/unit/bootstrap-twipsy.js
index 08512ca97..8543162c6 100644
--- a/js/tests/unit/bootstrap-twipsy.js
+++ b/js/tests/unit/bootstrap-twipsy.js
@@ -1,62 +1,62 @@
 $(function () {
 
-    module("bootstrap-twipsy")
+    module("bootstrap-tooltip")
 
       test("should be defined on jquery object", function () {
         var div = $("
      ")
-        ok(div.twipsy, 'popover method is defined')
+        ok(div.tooltip, 'popover method is defined')
       })
 
       test("should return element", function () {
         var div = $("
      ")
-        ok(div.twipsy() == div, 'document.body returned')
+        ok(div.tooltip() == div, 'document.body returned')
       })
 
       test("should expose default settings", function () {
-        ok(!!$.fn.twipsy.defaults, 'defaults is defined')
+        ok(!!$.fn.tooltip.defaults, 'defaults is defined')
       })
 
       test("should remove title attribute", function () {
-        var twipsy = $('').twipsy()
-        ok(!twipsy.attr('title'), 'title tag was removed')
+        var tooltip = $('').tooltip()
+        ok(!tooltip.attr('title'), 'title tag was removed')
       })
 
       test("should add data attribute for referencing original title", function () {
-        var twipsy = $('').twipsy()
-        equals(twipsy.attr('data-original-title'), 'Another twipsy', 'original title preserved in data attribute')
+        var tooltip = $('').tooltip()
+        equals(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
       })
 
       test("should place tooltips relative to placement option", function () {
         $.support.transition = false
-        var twipsy = $('')
+        var tooltip = $('')
           .appendTo('#qunit-fixture')
-          .twipsy({placement: 'bottom'})
-          .twipsy('show')
+          .tooltip({placement: 'bottom'})
+          .tooltip('show')
 
-        ok($(".twipsy").hasClass('fade bottom in'), 'has correct classes applied')
-        twipsy.twipsy('hide')
+        ok($(".tooltip").hasClass('fade bottom in'), 'has correct classes applied')
+        tooltip.tooltip('hide')
       })
 
       test("should always allow html entities", function () {
         $.support.transition = false
-        var twipsy = $('')
+        var tooltip = $('')
           .appendTo('#qunit-fixture')
-          .twipsy('show')
+          .tooltip('show')
 
-        ok($('.twipsy b').length, 'b tag was inserted')
-        twipsy.twipsy('hide')
-        ok(!$(".twipsy").length, 'twipsy removed')
+        ok($('.tooltip b').length, 'b tag was inserted')
+        tooltip.tooltip('hide')
+        ok(!$(".tooltip").length, 'tooltip removed')
       })
 
       test("should respect custom classes", function () {
-        var twipsy = $('')
+        var tooltip = $('')
           .appendTo('#qunit-fixture')
-          .twipsy({ template: '
      '})
-          .twipsy('show')
+          .tooltip({ template: '
      '})
+          .tooltip('show')
 
-        ok($('.twipsy').hasClass('some-class'), 'custom class is present')
-        twipsy.twipsy('hide')
-        ok(!$(".twipsy").length, 'twipsy removed')
+        ok($('.tooltip').hasClass('some-class'), 'custom class is present')
+        tooltip.tooltip('hide')
+        ok(!$(".tooltip").length, 'tooltip removed')
       })
 
 })
\ No newline at end of file
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 57ada98a9..d71002c46 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -39,7 +39,7 @@
 
 // Components: Popovers
 @import "modals.less";
-@import "twipsy.less";
+@import "tooltip.less";
 @import "popovers.less";
 
 // Components: Buttons & Alerts
diff --git a/lib/button-groups.less b/lib/button-groups.less
index d2307018e..e9724ba8c 100644
--- a/lib/button-groups.less
+++ b/lib/button-groups.less
@@ -90,6 +90,7 @@
   display: block;
   top: 30px;
   .border-radius(5px);
+  &.large { top: 40px; }
 }
 .btn-group.open .dropdown-toggle {
   background-image: none;
diff --git a/lib/tooltip.less b/lib/tooltip.less
new file mode 100644
index 000000000..b21c6bb7a
--- /dev/null
+++ b/lib/tooltip.less
@@ -0,0 +1,35 @@
+// TOOLTIP
+// ------=
+
+.tooltip {
+  position: absolute;
+  z-index: @zindexTooltip;
+  display: block;
+  visibility: visible;
+  padding: 5px;
+  font-size: 11px;
+  .opacity(0);
+  &.in     { .opacity(80); }
+  &.top    { margin-top:  -2px; }
+  &.right  { margin-left:  2px; }
+  &.bottom { margin-top:   2px; }
+  &.left   { margin-left: -2px; }
+  &.top .tooltip-arrow    { #popoverArrow > .top(); }
+  &.left .tooltip-arrow   { #popoverArrow > .left(); }
+  &.bottom .tooltip-arrow { #popoverArrow > .bottom(); }
+  &.right .tooltip-arrow  { #popoverArrow > .right(); }
+}
+.tooltip-inner {
+  max-width: 200px;
+  padding: 3px 8px;
+  color: white;
+  text-align: center;
+  text-decoration: none;
+  background-color: @black;
+  .border-radius(4px);
+}
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
diff --git a/lib/twipsy.less b/lib/twipsy.less
deleted file mode 100644
index 7eaa7d5bf..000000000
--- a/lib/twipsy.less
+++ /dev/null
@@ -1,35 +0,0 @@
-// TWIPSY
-// ------
-
-.twipsy {
-  position: absolute;
-  z-index: @zindexTwipsy;
-  display: block;
-  visibility: visible;
-  padding: 5px;
-  font-size: 11px;
-  .opacity(0);
-  &.in     { .opacity(80); }
-  &.top    { margin-top:  -2px; }
-  &.right  { margin-left:  2px; }
-  &.bottom { margin-top:   2px; }
-  &.left   { margin-left: -2px; }
-  &.top .twipsy-arrow    { #popoverArrow > .top(); }
-  &.left .twipsy-arrow   { #popoverArrow > .left(); }
-  &.bottom .twipsy-arrow { #popoverArrow > .bottom(); }
-  &.right .twipsy-arrow  { #popoverArrow > .right(); }
-}
-.twipsy-inner {
-  max-width: 200px;
-  padding: 3px 8px;
-  color: white;
-  text-align: center;
-  text-decoration: none;
-  background-color: @black;
-  .border-radius(4px);
-}
-.twipsy-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-}
diff --git a/lib/variables.less b/lib/variables.less
index 97b6f9e3c..3f32c36f4 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -52,7 +52,7 @@
 
 @zindexDropdown:        1000;
 @zindexPopover:         1010;
-@zindexTwipsy:          1020;
+@zindexTooltip:         1020;
 @zindexFixedNavbar:     1030;
 @zindexModalBackdrop:   1040;
 @zindexModal:           1050;
-- 
cgit v1.2.3


From 1fa94bdbf47e592e8c51920bb9489ef760e04830 Mon Sep 17 00:00:00 2001
From: Davide Bellini 
Date: Thu, 12 Jan 2012 12:04:17 +0100
Subject: Fixed broken anchors on js docs page

---
 docs/javascript.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index 51f3d691e..0350103fa 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -528,7 +528,7 @@ $('#myModal').on('hidden', function () {
 
     
-    
      
+    
      
       
      
         
      Togglable tabs bootstrap-tab.js
      
       
      
@@ -832,7 +832,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
 
     
-    
      
+    
      
       
      
         
      Alert messages bootstrap-alert.js
      
       
      
@@ -901,7 +901,7 @@ $('#my-alert').bind('closed', function () {
 
     
-    
      
+    
      
       
      
         
      Buttons bootstrap-button.js
      
       
      
-- 
cgit v1.2.3


From 5e3c21133430112bf8361827dc7a6a29f3f56c72 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 12 Jan 2012 10:19:07 -0800
Subject: fix type shorthand in blockquote

---
 bootstrap.css     | 6 +++---
 bootstrap.min.css | 2 +-
 lib/type.less     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 1250507b5..59cec1cd6 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 11 21:59:22 PST 2012
+ * Date: Thu Jan 12 10:18:57 PST 2012
  */
 html, body {
   margin: 0;
@@ -459,8 +459,8 @@ blockquote {
 }
 blockquote p {
   margin-bottom: 0;
-  font-size: 300;
-  font-weight: 16px;
+  font-size: 16px;
+  font-weight: 300;
   line-height: 22.5px;
 }
 blockquote small {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 3e220de3c..2cbb4427e 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -81,7 +81,7 @@ strong{font-style:inherit;font-weight:bold;}
 em{font-style:italic;font-weight:inherit;line-height:inherit;}
 .muted{color:#999999;}
 abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;}
-blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eee;}blockquote p{margin-bottom:0;font-size:300;font-weight:16px;line-height:22.5px;}
+blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
 blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
 blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
 address{display:block;margin-bottom:18px;line-height:18px;}
diff --git a/lib/type.less b/lib/type.less
index 84130f3fa..73462b38a 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -151,7 +151,7 @@ blockquote {
   border-left: 5px solid #eee;
   p {
     margin-bottom: 0;
-    #font > .shorthand(300,16px,@baseLineHeight * 1.25);
+    #font > .shorthand(16px,300,@baseLineHeight * 1.25);
   }
   small {
     display: block;
-- 
cgit v1.2.3


From ef8b27cdc7ad490b4b52003a7178bd1465ee5dc9 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 12 Jan 2012 12:30:36 -0800
Subject: fix heading

---
 bootstrap.css | 2 +-
 lib/type.less | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 59cec1cd6..8d0847012 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 12 10:18:57 PST 2012
+ * Date: Thu Jan 12 12:30:32 PST 2012
  */
 html, body {
   margin: 0;
diff --git a/lib/type.less b/lib/type.less
index 73462b38a..f7d5077cf 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -69,8 +69,8 @@ h6 {
 }
 
 
-// COLORS
-// ------
+// LISTS
+// -----
 
 // Unordered and Ordered lists
 ul, ol {
-- 
cgit v1.2.3


From 391248c0e3ba9b00b0b4a02e4d94475e9ae9877a Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 12 Jan 2012 15:29:16 -0800
Subject: nuke uber footer, bring back topbar dropdowns

---
 bootstrap.css         |  40 +++++++---------
 bootstrap.min.css     |  14 +++---
 docs/base-css.html    |  70 +++++++++++++++++++++++++--
 docs/components.html  |  72 +++++++++++++++++++++++++---
 docs/index.html       |  71 +++++++++++++++++++++++++--
 docs/javascript.html  |  70 +++++++++++++++++++++++++--
 docs/less.html        |  70 +++++++++++++++++++++++++--
 docs/scaffolding.html | 130 +++++++++++++++++++++++++-------------------------
 docs/upgrading.html   |  70 +++++++++++++++++++++++++--
 lib/dropdowns.less    |  10 ++--
 lib/navbar.less       |  20 ++++++--
 11 files changed, 502 insertions(+), 135 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 8d0847012..8e5ad131c 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 12 12:30:32 PST 2012
+ * Date: Thu Jan 12 15:28:03 PST 2012
  */
 html, body {
   margin: 0;
@@ -1453,12 +1453,12 @@ i {
   min-width: 160px;
   max-width: 220px;
   _width: 160px;
-  padding: 5px 0;
+  padding: 4px 0;
   margin: 0;
   list-style: none;
   background-color: #ffffff;
   border-color: #999;
-  border-color: rgba(0, 0, 0, 0.1);
+  border-color: rgba(0, 0, 0, 0.2);
   border-style: solid;
   border-width: 1px;
   -webkit-border-radius: 0 0 5px 5px;
@@ -1486,24 +1486,12 @@ i {
   font-weight: normal;
   line-height: 18px;
   color: #555555;
+  white-space: nowrap;
 }
 .dropdown-menu li > a:hover {
   color: #fff;
   text-decoration: none;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0077b3;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3));
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -ms-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #0088cc), color-stop(100%, #0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(top, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
+  background-color: #0088cc;
 }
 .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
   color: #fff;
@@ -1747,7 +1735,7 @@ i {
   margin-right: 0;
 }
 .navbar .dropdown-menu {
-  top: 42px;
+  top: 41px;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -1758,10 +1746,10 @@ i {
   border-left: 7px solid transparent;
   border-right: 7px solid transparent;
   border-bottom: 7px solid #ccc;
-  border-bottom-color: rgba(0, 0, 0, 0.1);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
   position: absolute;
   top: -7px;
-  left: 12px;
+  left: 9px;
 }
 .navbar .dropdown-menu:after {
   content: '';
@@ -1771,14 +1759,22 @@ i {
   border-bottom: 6px solid #fff;
   position: absolute;
   top: -6px;
-  left: 13px;
+  left: 10px;
 }
 .navbar .dropdown-toggle .caret, .navbar .open.dropdown .caret {
   border-top-color: #fff;
 }
-.navbar .open .dropdown-toggle {
+.navbar .nav .active .caret {
+  filter: alpha(opacity=100);
+  -moz-opacity: 1;
+  opacity: 1;
+}
+.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
   background-color: transparent;
 }
+.navbar .nav .active > .dropdown-toggle:hover {
+  color: #fff;
+}
 .navbar .nav.pull-right .dropdown-menu {
   right: 0;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 2cbb4427e..1723ca555 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -301,9 +301,9 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;content:"\2193";}
 .dropdown .caret{margin-top:8px;margin-left:2px;}
 .dropdown:hover .caret,.open.dropdown .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
-.dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:5px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.1);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
-.dropdown-menu a{display:block;padding:2px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;}
-.dropdown-menu li>a:hover{color:#fff;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0077b3;background-image:-khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3));background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-ms-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #0088cc), color-stop(100%, #0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(top, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.075),inset 0 -1px rgba(0, 0, 0, 0.075);}
+.dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
+.dropdown-menu a{display:block;padding:2px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
+.dropdown-menu li>a:hover{color:#fff;text-decoration:none;background-color:#0088cc;}
 .dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;background-color:#999;background-image:none;}
 .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
 .dropdown.open .dropdown-menu{display:block;}
@@ -334,10 +334,12 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
 .navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;}
 .navbar .nav.pull-right{margin-left:10px;margin-right:0;}
-.navbar .dropdown-menu{top:42px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.1);position:absolute;top:-7px;left:12px;}
-.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:13px;}
+.navbar .dropdown-menu{top:41px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:10px;}
 .navbar .dropdown-toggle .caret,.navbar .open.dropdown .caret{border-top-color:#fff;}
-.navbar .open .dropdown-toggle{background-color:transparent;}
+.navbar .nav .active .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
+.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
+.navbar .nav .active>.dropdown-toggle:hover{color:#fff;}
 .navbar .nav.pull-right .dropdown-menu{right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
 .navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
 .nav{margin-left:0;margin-bottom:18px;list-style:none;}
diff --git a/docs/base-css.html b/docs/base-css.html
index 29f5d1d19..7f60580b4 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -34,11 +34,71 @@
           Bootstrap
           
         
      
       
      
diff --git a/docs/components.html b/docs/components.html
index 873bbf682..b9d75edbe 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -34,11 +34,71 @@
           Bootstrap
           
         
      
       
      
@@ -127,7 +187,7 @@
 
   
-  
      
+  
      
     
      
       
      Split button dropdowns Built on button groups to provide contextual menus
      
     
      
diff --git a/docs/index.html b/docs/index.html
index 8f7963afd..8d5448ce1 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -35,11 +35,71 @@
           Bootstrap
           
         
      
       
      
@@ -253,5 +313,6 @@
     
     
     
+    
   
 
diff --git a/docs/javascript.html b/docs/javascript.html
index 0350103fa..216bcdef5 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -35,11 +35,71 @@
           Bootstrap
           
         
      
       
      
diff --git a/docs/less.html b/docs/less.html
index 05398e966..cecf22da4 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -34,11 +34,71 @@
           Bootstrap
           
         
      
       
      
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index b868fd215..546a2755a 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -34,11 +34,71 @@
           Bootstrap
           
         
      
       
      
@@ -361,66 +421,6 @@
       
       
      
       
      
diff --git a/lib/dropdowns.less b/lib/dropdowns.less
index 85f74b632..daa7003e3 100644
--- a/lib/dropdowns.less
+++ b/lib/dropdowns.less
@@ -36,12 +36,12 @@
   min-width: 160px;
   max-width: 220px;
   _width: 160px;
-  padding: 5px 0;
+  padding: 4px 0;
   margin: 0; // override default ul
   list-style: none;
   background-color: @white;
   border-color: #999;
-  border-color: rgba(0,0,0,.1);
+  border-color: rgba(0,0,0,.2);
   border-style: solid;
   border-width: 1px;
   .border-radius(0 0 5px 5px);
@@ -68,6 +68,7 @@
     font-weight: normal;
     line-height: 18px;
     color: @gray;
+    white-space: nowrap;
   }
 }
 
@@ -75,10 +76,7 @@
 .dropdown-menu li > a:hover {
   color: #fff;
   text-decoration: none;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  #gradient > .vertical(@linkColor, darken(@linkColor, 5%));
-  @shadow: inset 0 1px 0 rgba(0,0,0,.075), inset 0 -1px rgba(0,0,0,.075);
-  .box-shadow(@shadow);
+  background-color: @linkColor;
 }
 
 // Active state
diff --git a/lib/navbar.less b/lib/navbar.less
index 82f9f7d2e..a3e64cde8 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -192,7 +192,7 @@
 
 // Menu position and menu carets
 .navbar .dropdown-menu {
-  top: 42px;
+  top: 41px;
   .border-radius(4px);
   &:before {
     content: '';
@@ -200,10 +200,10 @@
     border-left:   7px solid transparent;
     border-right:  7px solid transparent;
     border-bottom: 7px solid #ccc;
-    border-bottom-color: rgba(0,0,0,.1);
+    border-bottom-color: rgba(0,0,0,.2);
     position: absolute;
     top: -7px;
-    left: 12px;
+    left: 9px;
   }
   &:after {
     content: '';
@@ -213,7 +213,7 @@
     border-bottom: 6px solid #fff;
     position: absolute;
     top: -6px;
-    left: 13px;
+    left: 10px;
   }
 }
 
@@ -222,12 +222,22 @@
 .navbar .open.dropdown .caret {
   border-top-color: #fff;
 }
+.navbar .nav .active .caret {
+  .opacity(100);
+}
 
 // Remove background color from open dropdown
-.navbar .open .dropdown-toggle {
+.navbar .nav .open > .dropdown-toggle,
+.navbar .nav .active > .dropdown-toggle,
+.navbar .nav .open.active > .dropdown-toggle {
   background-color: transparent;
 }
 
+// Dropdown link on hover
+.navbar .nav .active > .dropdown-toggle:hover {
+  color: #fff;
+}
+
 // Right aligned menus need alt position
 .navbar .nav.pull-right .dropdown-menu {
   right: 0;
-- 
cgit v1.2.3


From 11be9cd16370ecd15d227917d98ff63eccae68ae Mon Sep 17 00:00:00 2001
From: Purwandi 
Date: Fri, 13 Jan 2012 14:57:21 +0700
Subject: Fix id anchor javascript

---
 docs/base-css.html    | 12 ++++++------
 docs/components.html  | 12 ++++++------
 docs/index.html       | 12 ++++++------
 docs/javascript.html  | 12 ++++++------
 docs/less.html        | 12 ++++++------
 docs/scaffolding.html | 12 ++++++------
 docs/upgrading.html   | 12 ++++++------
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 7f60580b4..9491f40aa 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -80,13 +80,13 @@
                 
               
               
      
     
      
       
      Or, use them in navigation.
      
-      
      
-        
      
diff --git a/docs/components.html b/docs/components.html
index 08a1a7b57..fa3dc5a20 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -506,35 +506,7 @@
 
     
      
   
      
-  
      
-    
      
-      
      Sidebar navigation with icon
      
-      
      
-        
-      
       
-    
      
-    
      
-      
      Simple markup
      
-
      -<ul class="nav list">
-  <li class="nav-header">List header</li>
-  <li class="active"><a href="#"><i class="home"></i> Home</a></li>
-  <li><a href="#"><i class="download"></i> Downloads</a></li>
-  <li><a href="#"><i class="film"></i> Movies</a></li>
-  ...
-</ul>
-
      
-    
      
-  
      
+
 
   
      Tabbable nav Bring tabs to life via javascript
      
   
      
-- 
cgit v1.2.3


From 8f09028cff87b68467fb20e295c9dc96ea4a5de0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 13 Jan 2012 09:55:15 -0800
Subject: updated js includes to make nav work everywhere

---
 docs/less.html        | 1 +
 docs/scaffolding.html | 1 +
 docs/upgrading.html   | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/docs/less.html b/docs/less.html
index cecf22da4..202e436e2 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -529,5 +529,6 @@
     
     
     
+    
   
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 546a2755a..d8ff06672 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -434,6 +434,7 @@
     
     
     
+    
     
 
   
diff --git a/docs/upgrading.html b/docs/upgrading.html
index d91bf20af..f8d9a732a 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -204,5 +204,12 @@
       
     
      
 
+    
+    
+    
+    
+    
+    
+
   
 
-- 
cgit v1.2.3


From fc053ac8b27611e3dc7fae769ce28f154250d50e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 13 Jan 2012 10:07:56 -0800
Subject: update dropdowns spacing and docs section spacing

---
 bootstrap.css            | 11 +++--------
 bootstrap.min.css        |  5 ++---
 docs/assets/css/docs.css |  5 ++++-
 lib/dropdowns.less       | 14 ++++----------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 8e5ad131c..ba51a7d45 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 12 15:28:03 PST 2012
+ * Date: Fri Jan 13 10:05:29 PST 2012
  */
 html, body {
   margin: 0;
@@ -1481,23 +1481,18 @@ i {
 }
 .dropdown-menu a {
   display: block;
-  padding: 2px 15px;
+  padding: 3px 15px;
   clear: both;
   font-weight: normal;
   line-height: 18px;
   color: #555555;
   white-space: nowrap;
 }
-.dropdown-menu li > a:hover {
+.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
   color: #fff;
   text-decoration: none;
   background-color: #0088cc;
 }
-.dropdown-menu .active > a, .dropdown-menu .active > a:hover {
-  color: #fff;
-  background-color: #999;
-  background-image: none;
-}
 .dropdown.open .dropdown-toggle {
   color: #ffffff;
   background: #ccc;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 1723ca555..8f2f020d1 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -302,9 +302,8 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .dropdown .caret{margin-top:8px;margin-left:2px;}
 .dropdown:hover .caret,.open.dropdown .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
 .dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
-.dropdown-menu a{display:block;padding:2px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
-.dropdown-menu li>a:hover{color:#fff;text-decoration:none;background-color:#0088cc;}
-.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;background-color:#999;background-image:none;}
+.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
+.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;text-decoration:none;background-color:#0088cc;}
 .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
 .dropdown.open .dropdown-menu{display:block;}
 .typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 134224e56..ca1c5cb83 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -35,8 +35,11 @@ body > .navbar-fixed .brand:hover {
 
 /* Space out sub-sections more
 -------------------------------------------------- */
+section {
+  padding-top: 60px;
+}
 .page-header {
-  margin: 45px 0 18px;
+  margin: 18px 0;
   border-bottom: 1px solid #eee;
 }
 .page-header h1 {
diff --git a/lib/dropdowns.less b/lib/dropdowns.less
index daa7003e3..e2d5fef25 100644
--- a/lib/dropdowns.less
+++ b/lib/dropdowns.less
@@ -63,7 +63,7 @@
   // Links within the dropdown menu
   a {
     display: block;
-    padding: 2px 15px;
+    padding: 3px 15px;
     clear: both;
     font-weight: normal;
     line-height: 18px;
@@ -73,18 +73,12 @@
 }
 
 // Hover state
-.dropdown-menu li > a:hover {
-  color: #fff;
-  text-decoration: none;
-  background-color: @linkColor;
-}
-
-// Active state
+.dropdown-menu li > a:hover,
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
   color: #fff;
-  background-color: #999;
-  background-image: none; // remove the gradient
+  text-decoration: none;
+  background-color: @linkColor;
 }
 
 // Open state for the dropdown
-- 
cgit v1.2.3


From 2cea94e892eabbe5edbca3a51347af57621d672d Mon Sep 17 00:00:00 2001
From: Renault John Lecoultre 
Date: Fri, 13 Jan 2012 22:33:05 +0100
Subject: Fixed when placement is a function

---
 js/bootstrap-tooltip.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 241a44e24..8ce30ab82 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -115,7 +115,7 @@
         }
 
         placement = typeof this.options.placement == 'function' ?
-          thing.call(this, $tip[0], this.$element[0]) :
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
           this.options.placement
 
         inside = /in/.test(placement)
@@ -267,4 +267,4 @@
   , template: '
      '
   }
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
-- 
cgit v1.2.3


From a4b107bf879d47db0a6e036814f5aeee4316d36c Mon Sep 17 00:00:00 2001
From: Chris Gunther 
Date: Sat, 14 Jan 2012 15:15:24 -0500
Subject: fix navbar links to scaffolding > grid system

---
 docs/base-css.html    | 4 ++--
 docs/components.html  | 2 +-
 docs/index.html       | 2 +-
 docs/javascript.html  | 2 +-
 docs/less.html        | 2 +-
 docs/scaffolding.html | 2 +-
 docs/upgrading.html   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 9491f40aa..3ad403ecd 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -40,7 +40,7 @@
                 
               
               
@@ -928,7 +928,7 @@
       
      States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.
      
     
      
   
      
-  
+
   
      Four types of forms
      
   
      Bootstrap provides simple markup and styles for four styles of common web forms.
      
   
diff --git a/docs/components.html b/docs/components.html
index fa3dc5a20..55a007f90 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -40,7 +40,7 @@
                 
diff --git a/docs/index.html b/docs/index.html
index 5d8e61ded..fc1eb498c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -41,7 +41,7 @@
                 
diff --git a/docs/javascript.html b/docs/javascript.html
index 58cc13e8c..ce47c1974 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -41,7 +41,7 @@
                 
diff --git a/docs/less.html b/docs/less.html
index 8831ce094..d99a7903e 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -40,7 +40,7 @@
                 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 57b90d096..145dd5584 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -40,7 +40,7 @@
                 
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 376aae856..1b4864ec7 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -40,7 +40,7 @@
                 
-- 
cgit v1.2.3


From f82fb2a1976060b2d0b71c3e6ad20f6d7a7772f7 Mon Sep 17 00:00:00 2001
From: Chris Gunther 
Date: Sat, 14 Jan 2012 15:18:59 -0500
Subject: fix navbar links to base CSS > typography

---
 docs/base-css.html    | 2 +-
 docs/components.html  | 2 +-
 docs/index.html       | 2 +-
 docs/javascript.html  | 2 +-
 docs/less.html        | 2 +-
 docs/scaffolding.html | 2 +-
 docs/upgrading.html   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 3ad403ecd..7d06ee5d1 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -51,7 +51,7 @@
                 
               
               
        
-                
      • Type
        • 
+                
      • Typography
        • 
                 
      • Tables
        • 
                 
      • Forms
        • 
                 
      • Buttons
        • 
diff --git a/docs/components.html b/docs/components.html
index 55a007f90..223f27584 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -51,7 +51,7 @@
                 
               
               
          
-                
        • Type
          • 
+                
        • Typography
          • 
                 
        • Tables
          • 
                 
        • Forms
          • 
                 
        • Buttons
          • 
diff --git a/docs/index.html b/docs/index.html
index fc1eb498c..8dd4935d5 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -52,7 +52,7 @@
                 
               
               
            
-                
          • Type
            • 
+                
          • Typography
            • 
                 
          • Tables
            • 
                 
          • Forms
            • 
                 
          • Buttons
            • 
diff --git a/docs/javascript.html b/docs/javascript.html
index ce47c1974..424585611 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -52,7 +52,7 @@
                 
               
               
              
-                
            • Type
              • 
+                
            • Typography
              • 
                 
            • Tables
              • 
                 
            • Forms
              • 
                 
            • Buttons
              • 
diff --git a/docs/less.html b/docs/less.html
index d99a7903e..5b956f533 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -51,7 +51,7 @@
                 
               
               
                
-                
              • Type
                • 
+                
              • Typography
                • 
                 
              • Tables
                • 
                 
              • Forms
                • 
                 
              • Buttons
                • 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 145dd5584..4617629ae 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -51,7 +51,7 @@
                 
               
               
                  
-                
                • Type
                  • 
+                
                • Typography
                  • 
                 
                • Tables
                  • 
                 
                • Forms
                  • 
                 
                • Buttons
                  • 
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 1b4864ec7..423c5be27 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -51,7 +51,7 @@
                 
               
               
                    
-                
                  • Type
                    • 
+                
                  • Typography
                    • 
                 
                  • Tables
                    • 
                 
                  • Forms
                    • 
                 
                  • Buttons
                    • 
-- 
cgit v1.2.3


From b723db1e42b6450acdc02ee8086da51ac16fcef6 Mon Sep 17 00:00:00 2001
From: Chris Gunther 
Date: Sat, 14 Jan 2012 15:21:09 -0500
Subject: fix section ID for pagination

---
 docs/components.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/components.html b/docs/components.html
index 223f27584..e11a7decf 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -844,7 +844,7 @@
 
 
-
                  
             
             
                • 
diff --git a/docs/components.html b/docs/components.html
index 0d564cd66..8c91a101f 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -72,6 +72,7 @@
                 
                • Pagination
                  • 
                 
                • Thumbnails
                  • 
                 
                • Alert messages
                  • 
+                
                • Progress bars
                  • 
               
                
             
             
              • 
@@ -1159,7 +1160,7 @@
 
 
-      
                
+      
                
         
                
           
                Progress bars For loading, redirecting, or action status
                
         
                
diff --git a/docs/index.html b/docs/index.html
index 8dd4935d5..ffdac0b3f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -73,6 +73,7 @@
                 
              • Pagination
                • 
                 
              • Thumbnails
                • 
                 
              • Alert messages
                • 
+                
              • Progress bars
                • 
               
              
             
             
            • 
diff --git a/docs/javascript.html b/docs/javascript.html
index 424585611..afe9c329e 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -73,6 +73,7 @@
                 
            • Pagination
              • 
                 
            • Thumbnails
              • 
                 
            • Alert messages
              • 
+                
            • Progress bars
              • 
               
            
             
             
          • 
diff --git a/docs/less.html b/docs/less.html
index 5b956f533..f3bfa3059 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -72,6 +72,7 @@
                 
          • Pagination
            • 
                 
          • Thumbnails
            • 
                 
          • Alert messages
            • 
+                
          • Progress bars
            • 
               
          
             
             
        • 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 4617629ae..b2b4b5647 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -72,6 +72,7 @@
                 
        • Pagination
          • 
                 
        • Thumbnails
          • 
                 
        • Alert messages
          • 
+                
        • Progress bars
          • 
               
        
             
             
      • 
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 423c5be27..e1b9f204e 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -72,6 +72,7 @@
                 
      • Pagination
        • 
                 
      • Thumbnails
        • 
                 
      • Alert messages
        • 
+                
      • Progress bars
        • 
               
      
             
             
    • 
-- 
cgit v1.2.3


From f587e81b7d72e47b16bf808c721c3dfe45ae1062 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 16:18:15 -0800
Subject: rewrite alert messages to use less code, combine the look of default
 and block messages, simplify docs

---
 bootstrap.css        | 123 +++++++++++++++--------------------------------
 bootstrap.min.css    |  36 +++++++-------
 docs/components.html | 131 +++++++++++++++++++++++----------------------------
 lib/alerts.less      | 126 ++++++++++++++++++++++---------------------------
 lib/buttons.less     |   8 +---
 lib/type.less        |   1 -
 6 files changed, 172 insertions(+), 253 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index ba51a7d45..556112c52 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Fri Jan 13 10:05:29 PST 2012
+ * Date: Sat Jan 14 16:13:25 PST 2012
  */
 html, body {
   margin: 0;
@@ -410,7 +410,6 @@ ol {
 }
 li {
   line-height: 18px;
-  color: #555555;
 }
 ul.unstyled {
   margin-left: 0;
@@ -2374,28 +2373,15 @@ i {
   margin-bottom: 0;
 }
 .btn.danger,
-.alert-message.danger,
 .btn.danger:hover,
-.alert-message.danger:hover,
-.btn.error,
-.alert-message.error,
-.btn.error:hover,
-.alert-message.error:hover,
 .btn.success,
-.alert-message.success,
 .btn.success:hover,
-.alert-message.success:hover,
 .btn.info,
-.alert-message.info,
-.btn.info:hover,
-.alert-message.info:hover {
+.btn.info:hover {
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   color: #ffffff;
 }
-.btn.danger,
-.alert-message.danger,
-.btn.error,
-.alert-message.error {
+.btn.danger {
   background-color: #c43c35;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
   background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
@@ -2409,7 +2395,7 @@ i {
   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 {
+.btn.success {
   background-color: #57a957;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
   background-image: -moz-linear-gradient(top, #62c462, #57a957);
@@ -2423,7 +2409,7 @@ i {
   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 {
+.btn.info {
   background-color: #339bb9;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));
   background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
@@ -2638,95 +2624,60 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -moz-opacity: 0.75;
   opacity: 0.75;
 }
-.alert-message {
+.alert {
   position: relative;
-  padding: 7px 15px;
+  padding: 8px 35px 8px 14px;
   margin-bottom: 18px;
-  color: #333333;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  background-color: #eedc94;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
-  background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
-  background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
-  background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
-  background-image: -o-linear-gradient(top, #fceec1, #eedc94);
-  background-image: linear-gradient(top, #fceec1, #eedc94);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
-  border-color: #eedc94 #eedc94 #e4c652;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  border-width: 1px;
-  border-style: solid;
+  background-color: #fcf8e3;
+  border: 1px solid #f3edd2;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-  -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);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
 }
-.alert-message .close {
+.alert, .alert-heading {
+  color: #c09853;
+}
+.alert > .close {
   *margin-top: 3px;
   /* IE7 spacing */
 
+  margin-right: -21px;
 }
-.alert-message h5 {
-  line-height: 18px;
+.success-alert {
+  background-color: #dff0d8;
+  border-color: #cfe8c4;
 }
-.alert-message p {
-  margin-bottom: 0;
+.success-alert, .success-alert .alert-heading {
+  color: #468847;
 }
-.alert-message div {
-  margin-top: 5px;
-  margin-bottom: 2px;
-  line-height: 28px;
+.danger-alert, .error-alert {
+  background-color: #f2dede;
+  border-color: #e9c7c7;
 }
-.alert-message .btn {
-  -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
-  -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
-  box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+.danger-alert,
+.error-alert,
+.danger-alert .alert-heading,
+.error-alert .alert-heading {
+  color: #B94A48;
 }
-.alert-message.error, .alert-message.success, .alert-message.info {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+.info-alert {
+  background-color: #d9edf7;
+  border-color: #bfe1f2;
 }
-.alert-message.block-message {
-  padding: 14px;
-  background-image: none;
-  background-color: #fdf5d9;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  border-color: #fceec1;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
+.info-alert, .info-alert .alert-heading {
+  color: #3a87ad;
 }
-.alert-message.block-message ul, .alert-message.block-message p {
-  margin-right: 30px;
+.block-alert {
+  padding-top: 14px;
+  padding-bottom: 14px;
 }
-.alert-message.block-message ul {
+.block-alert > p, .block-alert > ul {
   margin-bottom: 0;
 }
-.alert-message.block-message li {
-  color: #333333;
-}
-.alert-message.block-message .alert-actions {
+.block-alert p + p {
   margin-top: 5px;
 }
-.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info {
-  color: #333333;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
-.alert-message.block-message.error {
-  background-color: #fddfde;
-  border-color: #fbc7c6;
-}
-.alert-message.block-message.success {
-  background-color: #d1eed1;
-  border-color: #bfe7bf;
-}
-.alert-message.block-message.info {
-  background-color: #ddf4fb;
-  border-color: #c6edf9;
-}
 .thumbnails {
   margin-left: -20px;
   margin-bottom: 0;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 8f2f020d1..09d261081 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -71,7 +71,7 @@ ul,ol{margin:0 0 9px 25px;}
 ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
 ul{list-style:disc;}
 ol{list-style:decimal;}
-li{line-height:18px;color:#555555;}
+li{line-height:18px;}
 ul.unstyled{margin-left:0;list-style:none;}
 dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;}
 dl dt{font-weight:bold;}
@@ -438,10 +438,10 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .popover .inner{padding:3px;width:280px;overflow:hidden;background-color:#000000;background-color:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);}
 .popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
 .popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
-.btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
-.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);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-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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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-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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);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);}
+.btn.danger,.btn.danger:hover,.btn.success,.btn.success:hover,.btn.info,.btn.info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
+.btn.danger{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);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{background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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{background-color:#339bb9;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);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);}
 .btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;}
 .btn:focus{outline:1px dotted #666;}
 .btn.primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
@@ -467,20 +467,18 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
 .btn .caret{margin-top:6px;margin-left:0;}
 .primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#fff;filter:alpha(opacity=75);-moz-opacity:0.75;opacity:0.75;}
-.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#333333;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;}
-.alert-message h5{line-height:18px;}
-.alert-message p{margin-bottom:0;}
-.alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;}
-.alert-message .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);}
-.alert-message.error,.alert-message.success,.alert-message.info{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
-.alert-message.block-message{padding:14px;background-image:none;background-color:#fdf5d9;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-message.block-message ul,.alert-message.block-message p{margin-right:30px;}
-.alert-message.block-message ul{margin-bottom:0;}
-.alert-message.block-message li{color:#333333;}
-.alert-message.block-message .alert-actions{margin-top:5px;}
-.alert-message.block-message.error,.alert-message.block-message.success,.alert-message.block-message.info{color:#333333;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
-.alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;}
-.alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;}
-.alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;}
+.alert{position:relative;padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.alert,.alert-heading{color:#c09853;}
+.alert>.close{*margin-top:3px;margin-right:-21px;}
+.success-alert{background-color:#dff0d8;border-color:#cfe8c4;}
+.success-alert,.success-alert .alert-heading{color:#468847;}
+.danger-alert,.error-alert{background-color:#f2dede;border-color:#e9c7c7;}
+.danger-alert,.error-alert,.danger-alert .alert-heading,.error-alert .alert-heading{color:#B94A48;}
+.info-alert{background-color:#d9edf7;border-color:#bfe1f2;}
+.info-alert,.info-alert .alert-heading{color:#3a87ad;}
+.block-alert{padding-top:14px;padding-bottom:14px;}
+.block-alert>p,.block-alert>ul{margin-bottom:0;}
+.block-alert p+p{margin-top:5px;}
 .thumbnails{margin-left:-20px;margin-bottom:0;list-style:none;zoom:1;}.thumbnails:before,.thumbnails:after{display:table;*display:inline;content:"";zoom:1;}
 .thumbnails:after{clear:both;}
 .thumbnails>li{float:left;margin:0 0 20px 20px;}
diff --git a/docs/components.html b/docs/components.html
index fa3dc5a20..9fc987508 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1058,101 +1058,90 @@
 ================================================== -->
 
      
   
      
-    
      Alerts & Errors Styles for success, warning, and error messages or alerts
      
+    
      Alerts Styles for success, warning, and error messages
      
   
      
-  
+
+  
      Lightweight defaults
      
   
      
-    
      
-      
      Basic alerts
      
-      
      .alert-message
      
-      
      One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.
      
-      
      Get the javascript »
      
+    
      
+      
      Rewritten base class
      
+      
      With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outter <div>.
      
+      
      Single alert message
      
+      
      For a more durable component with less code, we've removed the differentiating look for block alerts, messages that com with more padding and typically more text. The class also has changed to .block-alert.
      
+      
      
+      
      Goes great with javascript
      
+      
      Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.
      
+      
      Get the plugin »
      
     
      
-    
      
-      
      
-        ×
-        
      Holy guacamole! Best check yo self, you’re not looking too good.
      
-      
      
-      
      
-        ×
-        
      Oh snap! Change this and that and try again.
      
-      
      
-      
      
+    
      
+      
      Example alerts
      
+      
      Wrap your message and an optional close icon in a div with simple class.
      
+      
      
         ×
-        
      Well done! You successfully read this alert message.
      
+        Warning! Best check yo self, you’re not looking too good.
       
      
-      
      
+
      +<div class="alert">
+  <a class="close">×</a>
+  <strong>Warning!</strong> Best check yo self, you’re not looking too good.
+</div>
+
      
+      
      Easily extend the standard alert message with two optional classes: .block-alert for more padding and text controls and .alert-heading for a matching heading.
      
+      
      
         ×
-        
      Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.
      
+        
      Warning!
      
+        
      Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
      
       
      
-
-      
      Example code
      
 
      -<div class="alert-message warning">
+<div class="alert block-alert">
   <a class="close">×</a>
-  <p><strong>Holy guacamole!</strong> Best check yo self, you’re not looking too good.</p>
+  <h4 class="alert-heading">Warning!</h4>
+  Best check yo self, you’re not...
 </div>
 
      
     
      
-  
      
-
-  
      
+  
      
 
-  
+  
      Contextual alternatives Add optional classes to change an alert's connotation
      
   
      
-    
      
-      
      Block messages
      
-      
      <div class="alert-message block-message">
      
-      
      For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.
      
-      
      Get the javascript »
      
-    
      
-    
      
-      
      
-        ×
-        
      Holy guacamole! This is a warning! Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
      
-        
      
-          Take this action Or do this
-        
      
-      
      
-      
      
+    
      
+      
      Error or danger
      
+      
      
         ×
-        
      Oh snap! You got an error! Change this and that and try again.
      
-        
        
-          
      • Duis mollis est non commodo luctus
        • 
-          
      • Nisi erat porttitor ligula
        • 
-          
      • Eget lacinia odio sem nec elit
        • 
-        
      
-        
      
-          Take this action Or do this
-        
      
+        Oh snap! Change a few things up and try submitting again.
       
      
-      
      
+
      +<div class="alert error-alert">
+  ...
+</div>
+
      
+    
      
+    
      
+      
      Success
      
+      
      
         ×
-        
      Well done! You successfully read this alert message. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Maecenas faucibus mollis interdum.
      
-        
      
-          Take this action Or do this
-        
      
+        Well done! You successfully read this important alert message.
       
      
-      
      
+
      +<div class="alert success-alert">
+  ...
+</div>
+
      
+    
      
+    
      
+      
      Information
      
+      
      
         ×
-        
      Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.
      
-        
      
-          Take this action Or do this
-        
      
+        Heads up! This alert needs your attention, but it’s not super important.
       
      
-
-      
      Example code
      
 
      -<div class="alert-message block-message warning">
-  <a class="close">×</a>
-  <p><strong>Holy guacamole! This is a warning!</strong> Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
-  <div class="alert-actions">
-    <a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a>
-  </div>
+<div class="alert info-alert">
+  ...
 </div>
 
      
     
      
-  
      
+  
      
+
 
      
 
 
diff --git a/lib/alerts.less b/lib/alerts.less
index bb0bd5d99..d1cd8addd 100644
--- a/lib/alerts.less
+++ b/lib/alerts.less
@@ -2,82 +2,68 @@
 // ------------
 
 // Base alert styles
-.alert-message {
+.alert {
   position: relative;
-  padding: 7px 15px;
+  padding: 8px 35px 8px 14px;
   margin-bottom: @baseLineHeight;
-  color: @grayDark;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  .gradientBar(#fceec1, #eedc94); // warning by default
-  border-width: 1px;
-  border-style: solid;
+  background-color: #fcf8e3;
+  border: 1px solid #f3edd2;
   .border-radius(4px);
-  .box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
+}
+.alert,
+.alert-heading {
+  color: #c09853;
+}
 
-  // Adjust close icon
-  .close {
-    *margin-top: 3px; /* IE7 spacing */
-  }
+// Adjust close link position
+.alert > .close {
+  *margin-top: 3px; /* IE7 spacing */
+  margin-right: -21px;
+}
 
-  // Remove extra margin from content
-  h5 {
-    line-height: @baseLineHeight;
-  }
-  p {
-    margin-bottom: 0;
-  }
-  div {
-    margin-top: 5px;
-    margin-bottom: 2px;
-    line-height: 28px;
-  }
-  .btn {
-    // Provide actions with buttons
-    .box-shadow(0 1px 0 rgba(255,255,255,.25));
-  }
+// Alternate styles
+// ----------------
 
-  &.error,
-  &.success,
-  &.info {
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  }
+.success-alert {
+  background-color: #dff0d8;
+  border-color: #cfe8c4;  
+}
+.success-alert,
+.success-alert .alert-heading {
+  color: #468847;
+}
+.danger-alert,
+.error-alert {
+  background-color: #f2dede;
+  border-color: #e9c7c7;
+}
+.danger-alert,
+.error-alert,
+.danger-alert .alert-heading,
+.error-alert .alert-heading {
+  color: #B94A48;
+}
+.info-alert {
+  background-color: #d9edf7;
+  border-color: #bfe1f2;
+}
+.info-alert,
+.info-alert .alert-heading {
+  color: #3a87ad;
+}
 
-  &.block-message {
-    padding: 14px;
-    background-image: none;
-    background-color: lighten(#fceec1, 5%);
-    .reset-filter(); // undo gradient for IE9
-    border-color: #fceec1;
-    .box-shadow(none);
-    ul, p {
-      margin-right: 30px;
-    }
-    ul {
-      margin-bottom: 0;
-    }
-    li {
-      color: @grayDark;
-    }
-    .alert-actions {
-      margin-top: 5px;
-    }
-    &.error,
-    &.success,
-    &.info {
-      color: @grayDark;
-      text-shadow: 0 1px 0 rgba(255,255,255,.5);
-    }
-    &.error {
-      background-color: lighten(#f56a66, 25%);
-      border-color: lighten(#f56a66, 20%);
-    }
-    &.success {
-      background-color: lighten(#62c462, 30%);
-      border-color: lighten(#62c462, 25%);
-    }
-    &.info {
-      background-color: lighten(#6bd0ee, 25%);
-      border-color: lighten(#6bd0ee, 20%);
-    }
-  }
+
+// Block alerts
+// ------------------------
+.block-alert {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+.block-alert > p,
+.block-alert > ul {
+  margin-bottom: 0;
 }
+.block-alert p + p {
+  margin-top: 5px;
+}
\ No newline at end of file
diff --git a/lib/buttons.less b/lib/buttons.less
index 140d1112c..a7492f9fd 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -2,13 +2,10 @@
 // -------------
 
 // Shared colors for buttons and alerts
-.btn,
-.alert-message {
+.btn {
   // Set text color
   &.danger,
   &.danger:hover,
-  &.error,
-  &.error:hover,
   &.success,
   &.success:hover,
   &.info,
@@ -17,8 +14,7 @@
     color: @white
   }
   // Danger and error appear as red
-  &.danger,
-  &.error {
+  &.danger {
     .gradientBar(#ee5f5b, #c43c35);
   }
   // Success appears as green
diff --git a/lib/type.less b/lib/type.less
index f7d5077cf..ab7409ce3 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -90,7 +90,6 @@ ol {
 }
 li {
   line-height: @baseLineHeight;
-  color: @gray;
 }
 ul.unstyled {
   margin-left: 0;
-- 
cgit v1.2.3


From ceb6836e03b03c757578c9e5614f535d9be2ad7f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 16:24:23 -0800
Subject: move up alert message close icon

---
 bootstrap.css     | 4 ++--
 bootstrap.min.css | 2 +-
 lib/close.less    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 556112c52..c5d011b7e 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan 14 16:13:25 PST 2012
+ * Date: Sat Jan 14 16:23:58 PST 2012
  */
 html, body {
   margin: 0;
@@ -1552,7 +1552,7 @@ i {
   float: right;
   font-size: 20px;
   font-weight: bold;
-  line-height: 13.5px;
+  line-height: 12px;
   color: #000000;
   text-shadow: 0 1px 0 #ffffff;
   filter: alpha(opacity=20);
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 09d261081..637c31ad8 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -310,7 +310,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
 .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
 .collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
-.close{float:right;font-size:20px;font-weight:bold;line-height:13.5px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;cursor:pointer;}
+.close{float:right;font-size:20px;font-weight:bold;line-height:12px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;cursor:pointer;}
 .navbar{overflow:visible;}
 .navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
 .navbar .brand:hover{color:#ffffff;text-decoration:none;}
diff --git a/lib/close.less b/lib/close.less
index 1210ec463..f2c5157c9 100644
--- a/lib/close.less
+++ b/lib/close.less
@@ -5,7 +5,7 @@
   float: right;
   font-size: 20px;
   font-weight: bold;
-  line-height: @baseLineHeight * .75;
+  line-height: 12px;
   color: @black;
   text-shadow: 0 1px 0 rgba(255,255,255,1);
   .opacity(20);
-- 
cgit v1.2.3


From a40b2a636c908859c2bb7434f0c050be2dc7e70e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 16:38:40 -0800
Subject: make inline and search form labels inline-block

---
 bootstrap.css     | 5 ++++-
 bootstrap.min.css | 1 +
 lib/forms.less    | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/bootstrap.css b/bootstrap.css
index c5d011b7e..8d7b08a35 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan 14 16:23:58 PST 2012
+ * Date: Sat Jan 14 16:38:32 PST 2012
  */
 html, body {
   margin: 0;
@@ -957,6 +957,9 @@ input::-webkit-input-placeholder {
   display: inline-block;
   margin-bottom: 0;
 }
+.search-form label, .inline-form label {
+  display: inline-block;
+}
 .control-group {
   margin-bottom: 18px;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 637c31ad8..5341d3595 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -170,6 +170,7 @@ input::-webkit-input-placeholder{color:#999999;}
 .input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 .search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
 .search-form input,.inline-form input,.horizontal-form input,.search-form textarea,.inline-form textarea,.horizontal-form textarea,.search-form select,.inline-form select,.horizontal-form select,.search-form .uneditable-input,.inline-form .uneditable-input,.horizontal-form .uneditable-input{display:inline-block;margin-bottom:0;}
+.search-form label,.inline-form label{display:inline-block;}
 .control-group{margin-bottom:18px;}
 .control-group>label{font-weight:bold;}
 .horizontal-form .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;}
diff --git a/lib/forms.less b/lib/forms.less
index 505331044..ed97d8dd0 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -452,6 +452,10 @@ input::-webkit-input-placeholder {
     margin-bottom: 0;
   }
 }
+.search-form label,
+.inline-form label {
+  display: inline-block;
+}
 
 // Margin to space out fieldsets
 .control-group {
-- 
cgit v1.2.3


From 028726a9a3e2acd56195dacd903680db5d934b8e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 16:45:01 -0800
Subject: add user-select mixin

---
 bootstrap.css   |  2 +-
 lib/mixins.less | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 8d7b08a35..1fc0e9edd 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan 14 16:38:32 PST 2012
+ * Date: Sat Jan 14 16:44:52 PST 2012
  */
 html, body {
   margin: 0;
diff --git a/lib/mixins.less b/lib/mixins.less
index 50986c68c..67e0c27de 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -147,8 +147,7 @@
           transition: @transition;
 }
 
-// Transform for scale and rotate
-// translate, rotate, scale -- need to finalize
+// Transformations
 .rotate(@degrees: 5deg) {
   -webkit-transform: rotate(@degrees);
      -moz-transform: rotate(@degrees);
@@ -171,6 +170,15 @@
           transform: translate(@x, @y);
 }
 
+// User select
+// For selecting text on the page
+.user-select(@select) {
+  -webkit-user-select: @select;
+     -moz-user-select: @select;
+       -o-user-select: @select;
+          user-select: @select;
+}
+
 // Background clipping
 // Heads up: FF 3.6 and under need padding instead of padding-box
 .background-clip(@clip) {
-- 
cgit v1.2.3


From 55ea574f8a56534b1313b5f2d85e7ee22565ea27 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 16:50:36 -0800
Subject: update preventing double border line for bordered tables by account
 for th elements in tr elements

---
 bootstrap.css     | 4 ++--
 bootstrap.min.css | 2 +-
 lib/tables.less   | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 1fc0e9edd..dd0c028b8 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan 14 16:44:52 PST 2012
+ * Date: Sat Jan 14 16:50:17 PST 2012
  */
 html, body {
   margin: 0;
@@ -1017,7 +1017,7 @@ tbody + tbody {
 .bordered-table td + th {
   border-left: 1px solid #ddd;
 }
-.bordered-table thead:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child td {
+.bordered-table thead:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child td {
   border-top: 0;
 }
 .bordered-table thead:first-child tr:first-child th:first-child, .bordered-table tbody:first-child tr:first-child td:first-child {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 5341d3595..c5c0c664e 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -184,7 +184,7 @@ thead:first-child tr th,thead:first-child tr td{border-top:0;}
 tbody+tbody{border-top:2px solid #ddd;}
 .condensed-table th,.condensed-table td{padding:4px 5px;}
 .bordered-table{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td,.bordered-table td+th{border-left:1px solid #ddd;}
-.bordered-table thead:first-child tr:first-child th,.bordered-table tbody:first-child tr:first-child td{border-top:0;}
+.bordered-table thead:first-child tr:first-child th,.bordered-table tbody:first-child tr:first-child th,.bordered-table tbody:first-child tr:first-child td{border-top:0;}
 .bordered-table thead:first-child tr:first-child th:first-child,.bordered-table tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
 .bordered-table thead:first-child tr:first-child th:last-child,.bordered-table tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
 .bordered-table thead:last-child tr:last-child th:first-child,.bordered-table tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
diff --git a/lib/tables.less b/lib/tables.less
index 8b69f5d7f..1d044ec7c 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -65,6 +65,7 @@ tbody + tbody {
   }
   // Prevent a double border
   thead:first-child tr:first-child th,
+  tbody:first-child tr:first-child th,
   tbody:first-child tr:first-child td {
     border-top: 0;
   }
-- 
cgit v1.2.3


From 74c0fc17c826d3a16c1b3e45b71138c048f7d630 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 16:56:47 -0800
Subject: fix duplicate icons

---
 bootstrap.css      | 4 ++--
 bootstrap.min.css  | 2 +-
 docs/base-css.html | 2 +-
 lib/sprites.less   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index dd0c028b8..6bfb8d2da 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan 14 16:50:17 PST 2012
+ * Date: Sat Jan 14 16:56:39 PST 2012
  */
 html, body {
   margin: 0;
@@ -1183,7 +1183,7 @@ i {
 .th {
   background-position: -240px 0;
 }
-.th-lines {
+.th-list {
   background-position: -264px 0;
 }
 .ok {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index c5c0c664e..ad9c18337 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -219,7 +219,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .film{background-position:-192px 0;}
 .th-large{background-position:-216px 0;}
 .th{background-position:-240px 0;}
-.th-lines{background-position:-264px 0;}
+.th-list{background-position:-264px 0;}
 .ok{background-position:-288px 0;}
 .remove{background-position:-312px 0;}
 .zoom-in{background-position:-336px 0;}
diff --git a/docs/base-css.html b/docs/base-css.html
index 79bbaa758..c851c84e9 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1439,7 +1439,7 @@
         
         
         
-        
+        
         
         
         
diff --git a/lib/sprites.less b/lib/sprites.less
index 8b5bcd5a5..aec08a5a2 100644
--- a/lib/sprites.less
+++ b/lib/sprites.less
@@ -32,7 +32,7 @@ i {
 .film               { background-position: -192px 0; }
 .th-large           { background-position: -216px 0; }
 .th                 { background-position: -240px 0; }
-.th-lines           { background-position: -264px 0; }
+.th-list            { background-position: -264px 0; }
 .ok                 { background-position: -288px 0; }
 .remove             { background-position: -312px 0; }
 .zoom-in            { background-position: -336px 0; }
-- 
cgit v1.2.3


From 2c3365f99ef81e53d90593c45d10ebeb3426dea9 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 17:16:46 -0800
Subject: allow btn-groups to work in navbars

---
 bootstrap.css     |  9 ++++++---
 bootstrap.min.css |  5 +++--
 docs/index.html   | 13 ++++++++++++-
 lib/navbar.less   | 10 +++++++---
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 6bfb8d2da..da68a66a8 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan 14 16:56:39 PST 2012
+ * Date: Sat Jan 14 17:11:53 PST 2012
  */
 html, body {
   margin: 0;
@@ -1611,9 +1611,12 @@ i {
   color: #ffffff;
   background-color: transparent;
 }
-.navbar .btn {
+.navbar .btn, .navbar .btn-group {
   margin-top: 5px;
 }
+.navbar .btn-group .btn {
+  margin-top: 0;
+}
 .navbar-form {
   margin-bottom: 0;
 }
@@ -1758,7 +1761,7 @@ i {
   top: -6px;
   left: 10px;
 }
-.navbar .dropdown-toggle .caret, .navbar .open.dropdown .caret {
+.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
   border-top-color: #fff;
 }
 .navbar .nav .active .caret {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index ad9c18337..0ed8fe176 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -317,7 +317,8 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar .brand:hover{color:#ffffff;text-decoration:none;}
 .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
 .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
-.navbar .btn{margin-top:5px;}
+.navbar .btn,.navbar .btn-group{margin-top:5px;}
+.navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background-color:#444;background-color:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#eeeeee;}
 .navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
@@ -336,7 +337,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar .nav.pull-right{margin-left:10px;margin-right:0;}
 .navbar .dropdown-menu{top:41px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
 .navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:10px;}
-.navbar .dropdown-toggle .caret,.navbar .open.dropdown .caret{border-top-color:#fff;}
+.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#fff;}
 .navbar .nav .active .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
 .navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
 .navbar .nav .active>.dropdown-toggle:hover{color:#fff;}
diff --git a/docs/index.html b/docs/index.html
index ffdac0b3f..a89e01c72 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -33,7 +33,7 @@
       
      
         
      
           Bootstrap
-          
      
       
      
     
diff --git a/lib/navbar.less b/lib/navbar.less
index a3e64cde8..0d01fe524 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -45,9 +45,13 @@
     }
   }
   // Buttons in navbar
-  .btn {
+  .btn,
+  .btn-group {
     margin-top: 5px; // make buttons vertically centered in navbar
   }
+  .btn-group .btn {
+    margin-top: 0;
+  }
 }
 
 // Navbar forms
@@ -218,8 +222,8 @@
 }
 
 // Dropdown toggle caret
-.navbar .dropdown-toggle .caret,
-.navbar .open.dropdown .caret {
+.navbar .nav .dropdown-toggle .caret,
+.navbar .nav .open.dropdown .caret {
   border-top-color: #fff;
 }
 .navbar .nav .active .caret {
-- 
cgit v1.2.3


From 1c6048bac2d305085f40324223c32e40bb9ea938 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 19:17:48 -0800
Subject: restore top bar on home page

---
 docs/index.html | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index a89e01c72..ffdac0b3f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -33,7 +33,7 @@
       
      
         
      
           Bootstrap
-          
      
       
      
     
-- 
cgit v1.2.3


From 6d916763f82be8c2d4f87842275170c12bea72ec Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 20:54:37 -0800
Subject: adding the pager component after rewriting the pagination docs and
 css

---
 bootstrap.css        |  55 ++++++++++++++++++++------
 bootstrap.min.css    |  18 ++++++---
 docs/components.html | 106 +++++++++++++++++++++++++++++++++++++++++----------
 lib/bootstrap.less   |   1 +
 lib/pager.less       |  25 ++++++++++++
 lib/pagination.less  |  76 ++++++++++++++++++------------------
 6 files changed, 207 insertions(+), 74 deletions(-)
 create mode 100644 lib/pager.less

diff --git a/bootstrap.css b/bootstrap.css
index da68a66a8..a93aaaee6 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan 14 17:11:53 PST 2012
+ * Date: Sat Jan 14 20:53:46 PST 2012
  */
 html, body {
   margin: 0;
@@ -2082,7 +2082,8 @@ i {
   /* IE7 inline-block hack */
 
   *zoom: 1;
-  margin: 0;
+  margin-left: 0;
+  margin-bottom: 0;
   border: 1px solid #ddd;
   border: 1px solid rgba(0, 0, 0, 0.15);
   -webkit-border-radius: 3px;
@@ -2100,26 +2101,58 @@ i {
   padding: 0 14px;
   line-height: 34px;
   text-decoration: none;
-  border-right: 1px solid;
-  border-right-color: #ddd;
-  border-right-color: rgba(0, 0, 0, 0.15);
-  *border-right-color: #ddd;
-  /* IE6-7 */
-
+  border-right: 1px solid #ddd;
+  border-right: 1px solid rgba(0, 0, 0, 0.15);
 }
 .pagination a:hover, .pagination .active a {
-  background-color: #c7eefe;
+  background-color: #f5f5f5;
 }
 .pagination .disabled a, .pagination .disabled a:hover {
   color: #999999;
   background-color: transparent;
   cursor: default;
 }
-.pagination .next a {
+.pagination li:last-child a {
   border: 0;
 }
-.pagination.centered {
+.pagination-centered {
+  text-align: center;
+}
+.pagination-right {
+  text-align: right;
+}
+.pager {
+  margin-left: 0;
+  margin-bottom: 18px;
+  list-style: none;
   text-align: center;
+  zoom: 1;
+}
+.pager:before, .pager:after {
+  display: table;
+  *display: inline;
+  content: "";
+  zoom: 1;
+}
+.pager:after {
+  clear: both;
+}
+.pager li {
+  display: inline;
+}
+.pager a {
+  display: inline-block;
+  padding: 6px 15px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+}
+.pager .next a {
+  float: right;
+}
+.pager .previous a {
+  float: left;
 }
 .modal-backdrop {
   position: fixed;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 0ed8fe176..2d5774e34 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -401,13 +401,21 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
 .breadcrumb .divider{padding:0 5px;color:#999999;}
 .breadcrumb .active a{color:#333333;}
-.pagination{height:36px;margin:18px 0;}.pagination ul{display:inline-block;*display:inline;*zoom:1;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);}
+.pagination{height:36px;margin:18px 0;}
+.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);}
 .pagination li{display:inline;}
-.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;}
-.pagination a:hover,.pagination .active a{background-color:#c7eefe;}
+.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border-right:1px solid #ddd;border-right:1px solid rgba(0, 0, 0, 0.15);}
+.pagination a:hover,.pagination .active a{background-color:#f5f5f5;}
 .pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;}
-.pagination .next a{border:0;}
-.pagination.centered{text-align:center;}
+.pagination li:last-child a{border:0;}
+.pagination-centered{text-align:center;}
+.pagination-right{text-align:right;}
+.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;zoom:1;}.pager:before,.pager:after{display:table;*display:inline;content:"";zoom:1;}
+.pager:after{clear:both;}
+.pager li{display:inline;}
+.pager a{display:inline-block;padding:6px 15px;background-color:#f5f5f5;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
+.pager .next a{float:right;}
+.pager .previous a{float:left;}
 .modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;}
 .modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;}
 .modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
diff --git a/docs/components.html b/docs/components.html
index f934ac68e..e88bd777c 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -847,63 +847,127 @@
 ================================================== -->
 
      
   
      
-    
      Pagination 
      
+    
      Pagination Two options for paging through content
      
   
      
 
+  
      Multi-page pagination
      
   
      
-    
      
-      
      Pagination
      
-      
      Ultra simplistic and minimally styled pagination inspired by Rdio. The large block is hard to miss, easily scalable, and provides large click areas.
      
+    
      
+      
      When to use
      
+      
      Ultra simplistic and minimally styled pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.
      
+      
      Stateful page links
      
+      
      Links are customizable and work in a number of circumstances with the right class. .disabled for unclickable links and .active for current page.
      
+      
      Flexible alignment
      
+      
      Add either of two optional classes to change the alignment of pagination links: .pagination-centered and .pagination-right.
      
     
      
-    
      
+    
      
+      
      Examples
      
+      
      The default pagination component is flexible and works in a number of variations.
      
       
       
+      
-      
+    
      
+      
      Markup
      
+      
      Wrapped in a <div>, pagination is just a <ul>.
      
 
       <div class="pagination">
   <ul>
-    <li class="prev disabled"><a href="#">&larr; Previous</a></li>
-    <li class="active"><a href="#">1</a></li>
+    <li><a href="#">Prev</a></li>
+    <li class="active">
+      <a href="#">1</a>
+    </li>
     <li><a href="#">2</a></li>
     <li><a href="#">3</a></li>
     <li><a href="#">4</a></li>
-    <li><a href="#">5</a></li>
-    <li class="next"><a href="#">Next &rarr;</a></li>
+    <li><a href="#">Next</a></li>
   </ul>
 </div>
 
      
     
      
   
      
 
+  
      Pager For quick previous and next links
      
+  
      
+    
      
+      
      About pager
      
+      
      The pager component is a set of links for simple pagination implemenations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.
      
+    
      
+    
      
+      
      Default example
      
+      
      By default, the pager centers links.
      
+      
+
      +<ul class="pager">
+  <li>
+    <a href="#">Previous</a>
+  </li>
+  <li>
+    <a href="#">Next</a>
+  </li>
+</ul>
+
      
+    
      
+    
      
+      
      Aligned links
      
+      
      Alternatively, you can align each link to the sides:
      
+      
+
      +<ul class="pager">
+  <li>
+    <a href="#">&larr; Older</a>
+  </li>
+  <li>
+    <a href="#">Newer &rarr;</a>
+  </li>
+</ul>
+
      
+    
      
+  
      
 
      
 
 
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index d71002c46..43b512086 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -36,6 +36,7 @@
 @import "navs.less";
 @import "breadcrumbs.less";
 @import "pagination.less";
+@import "pager.less";
 
 // Components: Popovers
 @import "modals.less";
diff --git a/lib/pager.less b/lib/pager.less
new file mode 100644
index 000000000..de009afda
--- /dev/null
+++ b/lib/pager.less
@@ -0,0 +1,25 @@
+// PAGER
+// -----
+
+.pager {
+  margin-left: 0;
+  margin-bottom: @baseLineHeight;
+  list-style: none;
+  text-align: center;
+  .clearfix();
+}
+.pager li {
+  display: inline;
+}
+.pager a {
+  display: inline-block;
+  padding: 6px 15px;
+  background-color: #f5f5f5;
+  .border-radius(15px);
+}
+.pager .next a {
+  float: right;
+}
+.pager .previous a {
+  float: left;
+}
diff --git a/lib/pagination.less b/lib/pagination.less
index e38805760..655abe5a3 100644
--- a/lib/pagination.less
+++ b/lib/pagination.less
@@ -4,44 +4,46 @@
 .pagination {
   height: @baseLineHeight * 2;
   margin: @baseLineHeight 0;
-  ul {
-    display: inline-block;
-    .ie7-inline-block();
-    margin: 0;
-    border: 1px solid #ddd;
-    border: 1px solid rgba(0,0,0,.15);
-    .border-radius(3px);
-    .box-shadow(0 1px 2px rgba(0,0,0,.05));
-  }
-  li {
+ }
+.pagination ul {
+  display: inline-block;
+  .ie7-inline-block();
+  margin-left: 0;
+  margin-bottom: 0;
+  border: 1px solid #ddd;
+  border: 1px solid rgba(0,0,0,.15);
+  .border-radius(3px);
+  .box-shadow(0 1px 2px rgba(0,0,0,.05));
+}
+.pagination li {
     display: inline;
   }
-  a {
-    float: left;
-    padding: 0 14px;
-    line-height: (@baseLineHeight * 2) - 2;
-    text-decoration: none;
-    border-right: 1px solid;
-    border-right-color: #ddd;
-    border-right-color: rgba(0,0,0,.15);
-    *border-right-color: #ddd; /* IE6-7 */
-  }
-  a:hover,
-  .active a {
-    background-color: lighten(@blue, 45%);
-  }
-  .disabled a,
-  .disabled a:hover {
-    color: @grayLight;
-    background-color: transparent;
-    cursor: default;
-  }
-  .next a {
-    border: 0;
-  }
+.pagination a {
+  float: left;
+  padding: 0 14px;
+  line-height: (@baseLineHeight * 2) - 2;
+  text-decoration: none;
+  border-right: 1px solid #ddd;
+  border-right: 1px solid rgba(0,0,0,.15);
+}
+.pagination a:hover,
+.pagination .active a {
+  background-color: #f5f5f5;
+}
+.pagination .disabled a,
+.pagination .disabled a:hover {
+  color: @grayLight;
+  background-color: transparent;
+  cursor: default;
+}
+.pagination li:last-child a {
+  border: 0;
+}
 
-  // Centered
-  &.centered {
-    text-align: center;
-  }
+// Centered
+.pagination-centered {
+  text-align: center;
+}
+.pagination-right {
+  text-align: right;
 }
-- 
cgit v1.2.3


From dab6d2b17cc2fd67c2462b5a5eb84eb58d9c72bc Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 21:28:47 -0800
Subject: change up classes on tables and forms, fix nav list styles in example

---
 bootstrap.css            | 66 ++++++++++++++++++++---------------------
 bootstrap.min.css        | 28 +++++++++---------
 docs/assets/css/docs.css |  1 -
 docs/base-css.html       | 76 ++++++++++++++++++++++++------------------------
 docs/index.html          |  2 +-
 docs/javascript.html     | 24 +++++++--------
 docs/less.html           | 14 ++++-----
 docs/scaffolding.html    |  4 +--
 lib/forms.less           | 12 ++++----
 lib/responsive.less      |  8 ++---
 lib/tables.less          |  6 ++--
 11 files changed, 120 insertions(+), 121 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index a93aaaee6..dd82e1247 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan 14 20:53:46 PST 2012
+ * Date: Sat Jan 14 21:26:13 PST 2012
  */
 html, body {
   margin: 0;
@@ -942,22 +942,22 @@ input::-webkit-input-placeholder {
   -moz-border-radius: 14px;
   border-radius: 14px;
 }
-.search-form input,
-.inline-form input,
-.horizontal-form input,
-.search-form textarea,
-.inline-form textarea,
-.horizontal-form textarea,
-.search-form select,
-.inline-form select,
-.horizontal-form select,
-.search-form .uneditable-input,
-.inline-form .uneditable-input,
-.horizontal-form .uneditable-input {
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input {
   display: inline-block;
   margin-bottom: 0;
 }
-.search-form label, .inline-form label {
+.form-search label, .form-inline label {
   display: inline-block;
 }
 .control-group {
@@ -966,16 +966,16 @@ input::-webkit-input-placeholder {
 .control-group > label {
   font-weight: bold;
 }
-.horizontal-form .control-group > label {
+.form-horizontal .control-group > label {
   float: left;
   width: 130px;
   padding-top: 5px;
   text-align: right;
 }
-.horizontal-form .controls {
+.form-horizontal .controls {
   margin-left: 150px;
 }
-.horizontal-form .form-actions {
+.form-horizontal .form-actions {
   padding-left: 150px;
 }
 table {
@@ -1001,46 +1001,46 @@ thead:first-child tr th, thead:first-child tr td {
 tbody + tbody {
   border-top: 2px solid #ddd;
 }
-.condensed-table th, .condensed-table td {
+.table-condensed th, .table-condensed td {
   padding: 4px 5px;
 }
-.bordered-table {
+.table-bordered {
   border: 1px solid #ddd;
   border-collapse: separate;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.bordered-table th + th,
-.bordered-table td + td,
-.bordered-table th + td,
-.bordered-table td + th {
+.table-bordered th + th,
+.table-bordered td + td,
+.table-bordered th + td,
+.table-bordered td + th {
   border-left: 1px solid #ddd;
 }
-.bordered-table thead:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child th, .bordered-table tbody:first-child tr:first-child td {
+.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td {
   border-top: 0;
 }
-.bordered-table thead:first-child tr:first-child th:first-child, .bordered-table tbody:first-child tr:first-child td:first-child {
+.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child {
   -webkit-border-radius: 4px 0 0 0;
   -moz-border-radius: 4px 0 0 0;
   border-radius: 4px 0 0 0;
 }
-.bordered-table thead:first-child tr:first-child th:last-child, .bordered-table tbody:first-child tr:first-child td:last-child {
+.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child {
   -webkit-border-radius: 0 4px 0 0;
   -moz-border-radius: 0 4px 0 0;
   border-radius: 0 4px 0 0;
 }
-.bordered-table thead:last-child tr:last-child th:first-child, .bordered-table tbody:last-child tr:last-child td:first-child {
+.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child {
   -webkit-border-radius: 0 0 0 4px;
   -moz-border-radius: 0 0 0 4px;
   border-radius: 0 0 0 4px;
 }
-.bordered-table thead:last-child tr:last-child th:last-child, .bordered-table tbody:last-child tr:last-child td:last-child {
+.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child {
   -webkit-border-radius: 0 0 4px 0;
   -moz-border-radius: 0 0 4px 0;
   border-radius: 0 0 4px 0;
 }
-.striped-table tbody tr:nth-child(odd) td, .striped-table tbody tr:nth-child(odd) th {
+.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th {
   background-color: #f9f9f9;
 }
 table .span1 {
@@ -3071,19 +3071,19 @@ a.thumbnail:hover {
   .navbar .nav:hover > li > a:hover {
     background-color: #333;
   }
-  .horizontal-form .control-group > label {
+  .form-horizontal .control-group > label {
     float: none;
     width: auto;
     padding-top: 0;
     text-align: left;
   }
-  .horizontal-form .controls {
+  .form-horizontal .controls {
     margin-left: 0;
   }
-  .horizontal-form .control-list {
+  .form-horizontal .control-list {
     padding-top: 0;
   }
-  .horizontal-form .form-actions {
+  .form-horizontal .form-actions {
     padding-left: 0;
   }
   .modal {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 2d5774e34..1832263f0 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -169,27 +169,27 @@ input::-webkit-input-placeholder{color:#999999;}
 .input-append .uneditable-input{border-right-color:#ccc;}
 .input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 .search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
-.search-form input,.inline-form input,.horizontal-form input,.search-form textarea,.inline-form textarea,.horizontal-form textarea,.search-form select,.inline-form select,.horizontal-form select,.search-form .uneditable-input,.inline-form .uneditable-input,.horizontal-form .uneditable-input{display:inline-block;margin-bottom:0;}
-.search-form label,.inline-form label{display:inline-block;}
+.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
+.form-search label,.form-inline label{display:inline-block;}
 .control-group{margin-bottom:18px;}
 .control-group>label{font-weight:bold;}
-.horizontal-form .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;}
-.horizontal-form .controls{margin-left:150px;}
-.horizontal-form .form-actions{padding-left:150px;}
+.form-horizontal .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;}
+.form-horizontal .controls{margin-left:150px;}
+.form-horizontal .form-actions{padding-left:150px;}
 table{width:100%;margin-bottom:18px;}
 th,td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;}
 th{font-weight:bold;vertical-align:bottom;}
 td{vertical-align:top;}
 thead:first-child tr th,thead:first-child tr td{border-top:0;}
 tbody+tbody{border-top:2px solid #ddd;}
-.condensed-table th,.condensed-table td{padding:4px 5px;}
-.bordered-table{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td,.bordered-table td+th{border-left:1px solid #ddd;}
-.bordered-table thead:first-child tr:first-child th,.bordered-table tbody:first-child tr:first-child th,.bordered-table tbody:first-child tr:first-child td{border-top:0;}
-.bordered-table thead:first-child tr:first-child th:first-child,.bordered-table tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
-.bordered-table thead:first-child tr:first-child th:last-child,.bordered-table tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
-.bordered-table thead:last-child tr:last-child th:first-child,.bordered-table tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
-.bordered-table thead:last-child tr:last-child th:last-child,.bordered-table tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
-.striped-table tbody tr:nth-child(odd) td,.striped-table tbody tr:nth-child(odd) th{background-color:#f9f9f9;}
+.table-condensed th,.table-condensed td{padding:4px 5px;}
+.table-bordered{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;}
+.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
+.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
+.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
+.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
+.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
+.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;}
 table .span1{float:none;width:44px;margin-left:0;}
 table .span2{float:none;width:124px;margin-left:0;}
 table .span3{float:none;width:204px;margin-left:0;}
@@ -529,4 +529,4 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .show{display:block;}
 .invisible{visibility:hidden;}
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
+@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index ca1c5cb83..2f45032f2 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -116,7 +116,6 @@ section {
 /* supporting docs pages */
 .subhead {
   padding-bottom: 14px;
-  margin-bottom: 45px;
   border-bottom: 3px solid #e5e5e5;
 }
 .subhead h1,
diff --git a/docs/base-css.html b/docs/base-css.html
index c851c84e9..ccc2216c6 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -150,7 +150,7 @@
 
   
   
      Emphasis, address, and abbreviation
      
-  
      • 
               
               
               
               
               
               
               
               
               
               
               
               
      
+  
      
@@ -237,7 +237,7 @@
 
   
      Blockquotes
      
-  
      
     
       
      
         Element
   
      
+  
      
@@ -383,7 +383,7 @@
   
      Code Inline and block
      
-  
      
     
       
      
         Element
 
   
      
+  
      
@@ -425,7 +425,7 @@
 
   
      Inline labels for special attention
      
-  
      
     
       
      
         Element
   
      
+  
      
@@ -490,7 +490,7 @@
   
      Table markup
      
     
      
-      
      
     
       
      
         Labels
   
      
+      
      
@@ -579,7 +579,7 @@
   
      Table options
      
-  
      
         
           
      
             Tag
 
   
      
+  
      
@@ -596,21 +596,21 @@
       
@@ -667,15 +667,15 @@
   
      2. Striped table
      
     
      
-      
      Get a little fancy with your tables by adding zebra-striping—just add the .striped-table class.
      
+      
      Get a little fancy with your tables by adding zebra-striping—just add the .table-striped class.
      
       
      Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.
      
 
      -<table class="striped-table">
+<table class="table-striped">
   ...
 </table>
      
     
      
     
      
-      
      
   
       
      
         Name
      
         Bordered
         
-          .bordered-table
+          .table-bordered
         
         Rounds corners and adds outter border
       
      
       
      
         Zebra-stripe
         
-          .striped-table
+          .table-striped
         
         Adds light gray background color to odd rows (1, 3, 5, etc)
       
      
       
      
         Condensed
         
-          .condensed-table
+          .table-condensed
         
         Cuts vertical padding in half, from 8px to 4px, within all td and th elements
       
      
   
      
+      
      
@@ -714,12 +714,12 @@
     
      
       
      Add borders around the entire table and rounded corners for aesthetic purposes.
      
 
      -<table class="bordered-table">
+<table class="table-bordered">
   ...
 </table>
      
     
      
-      
      
         
           
      
             #
     
      
+      
      
@@ -760,14 +760,14 @@
   
      4. Condensed table
      
     
      
-      
      Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).
      
+      
      Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 10px to 5px).
      
 
      -<table class="condensed-table">
+<table class="table-condensed">
   ...
 </table>
      
     
      
     
      
-      
      
         
           
      
             #
   
      
+      
      
@@ -816,12 +816,12 @@
     });
   });
 </script>
-<table class="striped-table">
+<table class="table-striped">
   ...
 </table>
      
-      
      
         
           
      
             #
     
     
      
+      
      
@@ -858,7 +858,7 @@
         
      
         
           
      
             #
       
      
       
      Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.
      
-      
+      
      
@@ -932,7 +932,7 @@
 
   
      Four types of forms
      Bootstrap provides simple markup and styles for four styles of common web forms.
      
-  
      
         
           
      
             #
   
      
+  
      
@@ -948,17 +948,17 @@
       
-        
+        
-        
+        
-        
+        
@@ -981,16 +981,16 @@
     
      
       
      Search form
      
-      
      Reflecting default WebKit styles, just add .search-form for extra rounded search fields.
      
-      
      
+      
      Reflecting default WebKit styles, just add .form-search for extra rounded search fields.
      
+      
         
         
       
     
      
       
      Inline form
      
-      
      Inputs are block level to start. For .inline-form and .horizontal-form, we use inline-block.
      
-      
      
+      
      Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.
      
+      
         
         
         
@@ -1003,7 +1003,7 @@
   
      Horizontal forms
      
   
      
     
      
-      
+      
         Controls Bootstrap supports
         
      
           
@@ -1087,7 +1087,7 @@
 
   
      
     
      
-      
+      
         Form control states
         
      
           
@@ -1158,7 +1158,7 @@
 
   
      
     
      
-      
+      
         Extending form controls
         
      
           
@@ -1259,7 +1259,7 @@
   
      
     
      Buttons
      
   
      
-  
      
     
       
      
         Name
      
       
      
         Horizontal.horizontal-form.form-horizontal
         Float left, right-aligned labels on same line as controls
       
      
       
      
         Inline.inline-form.form-inline
         Left-aligned label and inline-block controls for compact style
       
      
       
      
         Search.search-form.form-search
         Extra-rounded text input for a typical search aesthetic
       
      
     
     
     
      
+  
      
@@ -1517,13 +1517,13 @@
     
      
       
      Or, use them in navigation.
      
-      
      
-        
       
     
      
diff --git a/docs/index.html b/docs/index.html
index ffdac0b3f..cb924bae6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -268,7 +268,7 @@
           ================================================== -->
           
      Get started in no time.
      Quickly start using Bootstrap within your workflow and development process.
      
-          
      
     
       
      
         Button
     
   
 
           
      
+          
      
@@ -369,11 +369,11 @@
           
      Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      <div>
   <h1>Heading</h1>
-  <p>Something right here...</p>
+  <p>Something right here…</p>
 </div>
      <div>
   <h1>Heading</h1>
-  <p>Something right here...</p>
+  <p>Something right here…</p>
 </div>
      Download google-code-prettify and view the readme for how to use.
      
@@ -521,14 +521,14 @@
 <table>
   <thead>
     <tr>
-      <th>...</th>
-      <th>...</th>
+      <th>…</th>
+      <th>…</th>
     </tr>
   </thead>
   <tbody>
     <tr>
-      <td>...</td>
-      <td>...</td>
+      <td>…</td>
+      <td>…</td>
     </tr>
   </tbody>
 </table>
@@ -591,7 +591,7 @@
       
      Tables are automatically styled with only a few borders to ensure readability and maintain structure. With 2.0, the .table class is required.
       <table class="table">
-  ...
+  …
 </table>
      
@@ -636,7 +636,7 @@
       
      Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.
      
 
       <table class="table table-striped">
-  ...
+  …
 </table>
      
     
      
@@ -680,7 +680,7 @@
       
      Add borders around the entire table and rounded corners for aesthetic purposes.
      
 
       <table class="table table-bordered">
-  ...
+  …
 </table>
      
     
      
@@ -725,10 +725,10 @@
   
      4. Condensed table
      
   
      
     
      
-      
      Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 10px to 5px).
      
+      
      Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 8px to 4px).
      
 
       <table class="table table-condensed">
-  ...
+  …
 </table>
      
     
      
     
      
@@ -770,7 +770,7 @@
   
      5. Striped table w/ TableSorter.js
      
   
      
     
      
-      
      Include the jQuery Tablesorter plugin and automaically get clear styles for sorted columns.
      
+      
      Include the jQuery Tablesorter plugin and automatically get clear styles for sorted columns.
      
 
       <script src="jquery.tablesorter.js"></script>
 <script >
@@ -782,7 +782,7 @@
   });
 </script>
 <table class="table table-striped">
-  ...
+  …
 </table>
      
     
      
     
      
@@ -937,7 +937,7 @@
       
      With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.
      
       
      
         
-        
+        
         
@@ -1057,13 +1057,13 @@
         
      
           
           
      
-            
+            
           
      
         
      
         
      
           
           
      
-            
+            
           
      
         
      
         
      
@@ -1112,7 +1112,7 @@
 
       <fieldset
   class="control-group error">
-  ...
+  …
 </fieldset>
 
      
       
      
@@ -1296,7 +1296,8 @@
         Action
       
      
       
      
-         
+        
+        
       
      
     
      
   
      
-- 
cgit v1.2.3


From 72117c3f9751d9ccb7bebf76f8a5776c99a51857 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 24 Jan 2012 13:57:44 -0800
Subject: add i18n for less.mustache

---
 docs/templates/pages/less.mustache | 138 ++++++++++++++++++-------------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 568e857be..d6376ae2f 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -1,8 +1,8 @@
       
       
      
-        
      Using LESS with Bootstrap
      
-        
      Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.
      
+        
      {{_i}}Using LESS with Bootstrap{{/i}}
      
+        
      {{_i}}Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}
      
       
      
 
 
@@ -10,35 +10,35 @@
       
       
      
-        
      Built with LESS
      
+        
      {{_i}}Built with LESS{{/i}}
      
       
      
       
      
         
      
-          
      Why LESS?
      
-          
      Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
      
+          
      {{_i}}Why LESS?{{/i}}
      
+          
      {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}
      
         
      
         
      
-          
      What's included?
      
-          
      As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.
      
+          
      {{_i}}What's included?{{/i}}
      
+          
      {{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}
      
         
      
         
      
-          
      Learn more
      
+          
      {{_i}}Learn more{{/i}}
      
           LESS CSS
-          
      Visit the official website at http://lesscss.org to learn more.
      
+          
      {{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}
      
         
      
       
      
       
      
         
      
-          
      Variables
      
-          
      Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.
      
+          
      {{_i}}Variables{{/i}}
      
+          
      {{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}
      
         
      
         
      
-          
      Mixins
      
-          
      Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.
      
+          
      {{_i}}Mixins{{/i}}
      
+          
      {{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}
      
         
      
         
      
-          
      Operations
      
-          
      Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.
      
+          
      {{_i}}Operations{{/i}}
      
+          
      {{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}
      
         
      
       
      
 
@@ -47,35 +47,35 @@
       
       
      
-        
      Variables from variables.less
      
+        
      {{_i}}Variables from variables.less{{/i}}
      
       
      
 
-          
      Hyperlinks
      
+          
      {{_i}}Hyperlinks{{/i}}
      
           
      
             
               
      
                 
diff --git a/docs/javascript.html b/docs/javascript.html
index afe9c329e..64159ede7 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -284,7 +284,7 @@
           
      Call the modal via javascript:
      
           
      $('#myModal').modal(options)
      
           
      Options
      
-          
+          
      
@@ -349,7 +349,7 @@ $('#myModal').modal({
           
      $('#myModal').modal('hide')
      Events
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
-          
      
             
              
      
                Name
           
           
      
+          
      
@@ -666,7 +666,7 @@ $('#myModal').on('hidden', function () {
 </script>
      Events
      
-          
      
             
              
      
                Event
           
           
      
+          
      
@@ -719,7 +719,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
      Trigger the tooltip via javascript:
      $('#example').tooltip(options)
      Options
      
-          
      
             
              
      
                Event
           
           
      
+          
      
@@ -813,7 +813,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
      Enable popovers via javascript:
      $('#example').popover(options)
      Options
      
-          
      
             
              
      
                Name
           
           
      
+          
      
@@ -932,7 +932,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
      $(".alert-message").alert('close')
      Events
      Bootstrap's alert class exposes a few events for hooking into alert functionality. 
      
-          
      
             
              
      
                Name
           
           
      
+          
      
@@ -975,7 +975,7 @@ $('#my-alert').bind('closed', function () {
         
      
           
      Example uses
      
           
      Use the buttons plugin for states and toggles.
      
-          
      
             
              
      
                Event
      
+          
      
@@ -1115,7 +1115,7 @@ $('#my-alert').bind('closed', function () {
           
      Enable via javascript:
      $(".collapse").collapse()
      Options
      
-          
      
             
              
      
                Stateful
           
           
      
+          
      
@@ -1165,7 +1165,7 @@ $('#myCollapsible').collapse({
           
      
             Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
           
      
-          
      
             
              
      
                Name
      
+          
      
@@ -1251,7 +1251,7 @@ $('#myCollapsible').on('hidden', function () {
           
      Call via javascript:
      $('.carousel').carousel()
      Options
      
-          
      
             
              
      
                Event
           
           
      
+          
      
@@ -1300,7 +1300,7 @@ $('#myCollapsible').on('hidden', function () {
           
      Cycles to the next item.
      Events
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
-          
      
             
              
      
                Name
           
           
      
+          
      
@@ -1348,7 +1348,7 @@ $('#myCollapsible').on('hidden', function () {
           
      Call the typeahead via javascript:
      $('.typeahead').typeahead()
      Options
      
-          
      
             
              
      
                Event
           
           
      
+          
      
diff --git a/docs/less.html b/docs/less.html
index f3bfa3059..357f242b1 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -160,7 +160,7 @@
       
      Hyperlinks
      
-          
      
             
              
      
                Name
 
           
      
+          
      
@@ -185,7 +185,7 @@
       
      
         
      
           
      Grayscale colors
      
-          
      
             
               
      
                 Variable
      
+          
      
@@ -216,7 +216,7 @@
         
      
           
      Accent colors
      
-          
      
             
               
      
                 @black
         
      
+          
      
@@ -254,7 +254,7 @@
       
      
         
      
           
      Grid system
      
-          
      
             
               
      
                 @blue
      
+          
      
@@ -277,7 +277,7 @@
         
      
           
      Typography
      
-          
      
             
               
      
                 @gridColumns
         
      
+          
      
@@ -302,7 +302,7 @@
           
      Visuals
      
-          
      
             
               
      
                 @baseFontSize
         
         
      
+          
      
@@ -453,7 +453,7 @@
     
      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
      
-    
      
             
               
      
                 @primaryButtonColor
     
     
      
+    
      
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index b2b4b5647..eab6fedf5 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -223,7 +223,7 @@
   
      Grid customization
      
-  
      
       
         
      
           Method
 
   
      
+  
      
@@ -335,7 +335,7 @@
     
      
       
      Supported devices
      
       
      Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:
      
-      
      
     
       
      
         Variable
      
+      
      
diff --git a/lib/forms.less b/lib/forms.less
index ed97d8dd0..04e684c99 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -441,9 +441,9 @@ input::-webkit-input-placeholder {
 // Common properties
 // -----------------
 
-.search-form,
-.inline-form,
-.horizontal-form {
+.form-search,
+.form-inline,
+.form-horizontal {
   input,
   textarea,
   select,
@@ -452,8 +452,8 @@ input::-webkit-input-placeholder {
     margin-bottom: 0;
   }
 }
-.search-form label,
-.inline-form label {
+.form-search label,
+.form-inline label {
   display: inline-block;
 }
 
@@ -469,7 +469,7 @@ input::-webkit-input-placeholder {
 // Horizontal-specific styles
 // --------------------------
 
-.horizontal-form {
+.form-horizontal {
   // Float the labels left
   .control-group > label {
     float: left;
diff --git a/lib/responsive.less b/lib/responsive.less
index 5131aa625..f5c23df3c 100644
--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -76,22 +76,22 @@
   }
 
   // Remove the horizontal form styles
-  .horizontal-form .control-group > label {
+  .form-horizontal .control-group > label {
     float: none;
     width: auto;
     padding-top: 0;
     text-align: left;
   }
   // Move over all input controls and content
-  .horizontal-form .controls {
+  .form-horizontal .controls {
     margin-left: 0;
   }
   // Move the options list down to align with labels
-  .horizontal-form .control-list {
+  .form-horizontal .control-list {
     padding-top: 0; // has to be padding because margin collaspes
   }
   // Move over buttons in .form-actions to align with .controls
-  .horizontal-form .form-actions {
+  .form-horizontal .form-actions {
     padding-left: 0;
   }
 
diff --git a/lib/tables.less b/lib/tables.less
index 1d044ec7c..5b803b3df 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -42,7 +42,7 @@ tbody + tbody {
 // CONDENSED TABLE W/ HALF PADDING
 // -------------------------------
 
-.condensed-table {
+.table-condensed {
   th,
   td {
     padding: 4px 5px;
@@ -53,7 +53,7 @@ tbody + tbody {
 // BORDERED VERSION
 // ----------------
 
-.bordered-table {
+.table-bordered {
   border: 1px solid #ddd;
   border-collapse: separate; // Done so we can round those corners!
   .border-radius(4px);
@@ -94,7 +94,7 @@ tbody + tbody {
 // --------------
 
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
-.striped-table {
+.table-striped {
   tbody {
     tr:nth-child(odd) td,
     tr:nth-child(odd) th {
-- 
cgit v1.2.3


From 16eccc43d9fa6317818b5d1621d0477150214488 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 23:28:48 -0800
Subject: dates updated to 2012

---
 LICENSE                     | 2 +-
 README.md                   | 2 +-
 bootstrap.css               | 4 ++--
 examples/container-app.html | 2 +-
 examples/fluid-reverse.html | 2 +-
 examples/fluid.html         | 2 +-
 examples/hero.html          | 2 +-
 js/bootstrap-alert.js       | 2 +-
 js/bootstrap-button.js      | 2 +-
 js/bootstrap-carousel.js    | 2 +-
 js/bootstrap-collapse.js    | 2 +-
 js/bootstrap-dropdown.js    | 2 +-
 js/bootstrap-modal.js       | 2 +-
 js/bootstrap-popover.js     | 2 +-
 js/bootstrap-scrollspy.js   | 2 +-
 js/bootstrap-tab.js         | 2 +-
 js/bootstrap-tooltip.js     | 2 +-
 js/bootstrap-transition.js  | 2 +-
 js/bootstrap-typeahead.js   | 2 +-
 js/tests/vendor/jquery.js   | 4 ++--
 js/tests/vendor/qunit.css   | 2 +-
 js/tests/vendor/qunit.js    | 2 +-
 lib/bootstrap.less          | 2 +-
 lib/print.less              | 2 +-
 24 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/LICENSE b/LICENSE
index 50a6393c0..1ec0d70de 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2011 Twitter, Inc.
+Copyright 2012 Twitter, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index fd9726584..b77eb95ae 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ Authors
 Copyright and license
 ---------------------
 
-Copyright 2011 Twitter, Inc.
+Copyright 2012 Twitter, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this work except in compliance with the License.
diff --git a/bootstrap.css b/bootstrap.css
index dd82e1247..9a4e6e111 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -1,12 +1,12 @@
 /*!
  * Bootstrap v2.0.0
  *
- * Copyright 2011 Twitter, Inc
+ * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
  * 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 Jan 14 21:26:13 PST 2012
+ * Date: Sat Jan 14 23:28:07 PST 2012
  */
 html, body {
   margin: 0;
diff --git a/examples/container-app.html b/examples/container-app.html
index 778bceacf..788efcbf3 100644
--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -110,7 +110,7 @@
       
 
       
      
-        
      © Company 2011
      
+        
      © Company 2012
      
       
      
 
      
diff --git a/examples/fluid-reverse.html b/examples/fluid-reverse.html
index 61aa08de9..c03cae723 100644
--- a/examples/fluid-reverse.html
+++ b/examples/fluid-reverse.html
@@ -119,7 +119,7 @@
         
      
 
         
      
-          
      © Company 2011
      
+          
      © Company 2012
      
         
      
       
     
diff --git a/examples/fluid.html b/examples/fluid.html
index bba78a329..cb00fb85a 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -119,7 +119,7 @@
         
      
         
         
      
-          
      © Company 2011
      
+          
      © Company 2012
      
         
      
       
     
diff --git a/examples/hero.html b/examples/hero.html
index 3a7a53983..9b82ba62a 100644
--- a/examples/hero.html
+++ b/examples/hero.html
@@ -70,7 +70,7 @@
       
 
       
      
-        
      © Company 2011
      
+        
      © Company 2012
      
       
      
 
      
diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js
index 1ce8f01bf..96b9786aa 100644
--- a/js/bootstrap-alert.js
+++ b/js/bootstrap-alert.js
@@ -2,7 +2,7 @@
  * bootstrap-alert.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js
index cb0c45cdf..046d25614 100644
--- a/js/bootstrap-button.js
+++ b/js/bootstrap-button.js
@@ -2,7 +2,7 @@
  * bootstrap-buttons.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index c49f89ad8..f2d5110a4 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -2,7 +2,7 @@
  * bootstrap-carousel.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index 9301c7309..2521b7c7a 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -2,7 +2,7 @@
  * bootstrap-collapsible.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html#collapsible
  * =============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index 3cb261992..923da6bfa 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -2,7 +2,7 @@
  * bootstrap-dropdown.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html#dropdown
  * ============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index df4f3c764..3652f5c8b 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -2,7 +2,7 @@
  * bootstrap-modal.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html#modal
  * =========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 9f60cbe95..e90899895 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -2,7 +2,7 @@
  * bootstrap-popover.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html#popover
  * ===========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js
index 6201d4cef..63195b4bd 100644
--- a/js/bootstrap-scrollspy.js
+++ b/js/bootstrap-scrollspy.js
@@ -2,7 +2,7 @@
  * bootstrap-scrollspy.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
  * =============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js
index 8492fe955..e5b85e232 100644
--- a/js/bootstrap-tab.js
+++ b/js/bootstrap-tab.js
@@ -2,7 +2,7 @@
  * bootstrap-tabs.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html#tabs
  * ========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 8ce30ab82..07a5d46f5 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -3,7 +3,7 @@
  * http://twitter.github.com/bootstrap/javascript.html#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ===========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js
index 29fa1bdeb..aaaee4bd2 100644
--- a/js/bootstrap-transition.js
+++ b/js/bootstrap-transition.js
@@ -2,7 +2,7 @@
  * bootstrap-transitions.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html
  * ===================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 180466a74..b4957c3f6 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -2,7 +2,7 @@
  * bootstrap-typeahead.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html#collapsible
  * =============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/js/tests/vendor/jquery.js b/js/tests/vendor/jquery.js
index 01fbe13c8..4c7013a87 100644
--- a/js/tests/vendor/jquery.js
+++ b/js/tests/vendor/jquery.js
@@ -1461,7 +1461,7 @@ jQuery.support = (function() {
 	// Check if div with explicit width and no margin-right incorrectly
 	// gets computed margin-right based on width of container. For more
 	// info see bug #3333
-	// Fails in WebKit before Feb 2011 nightlies
+	// Fails in WebKit before Feb 2012 nightlies
 	// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
 	if ( window.getComputedStyle ) {
 		marginDiv = document.createElement( "div" );
@@ -3837,7 +3837,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
 
 /*!
  * Sizzle CSS Selector Engine
- *  Copyright 2011, The Dojo Foundation
+ *  Copyright 2012, The Dojo Foundation
  *  Released under the MIT, BSD, and GPL Licenses.
  *  More information: http://sizzlejs.com/
  */
diff --git a/js/tests/vendor/qunit.css b/js/tests/vendor/qunit.css
index 800dac541..b3e3d002d 100644
--- a/js/tests/vendor/qunit.css
+++ b/js/tests/vendor/qunit.css
@@ -3,7 +3,7 @@
  *
  * http://docs.jquery.com/QUnit
  *
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * or GPL (GPL-LICENSE.txt) licenses.
  */
diff --git a/js/tests/vendor/qunit.js b/js/tests/vendor/qunit.js
index 9047f97a0..46c95b298 100644
--- a/js/tests/vendor/qunit.js
+++ b/js/tests/vendor/qunit.js
@@ -3,7 +3,7 @@
  *
  * http://docs.jquery.com/QUnit
  *
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * or GPL (GPL-LICENSE.txt) licenses.
  */
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 43b512086..db6a192f5 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -1,7 +1,7 @@
 /*!
  * Bootstrap @VERSION
  *
- * Copyright 2011 Twitter, Inc
+ * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/lib/print.less b/lib/print.less
index b45d016fd..4fd45e282 100644
--- a/lib/print.less
+++ b/lib/print.less
@@ -1,7 +1,7 @@
 /*!
  * Bootstrap @VERSION for Print
  *
- * Copyright 2011 Twitter, Inc
+ * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  *
-- 
cgit v1.2.3


From f989c6892f690cf46b0e67158ebb621c3fe690fe Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 14 Jan 2012 23:33:42 -0800
Subject: gray out links for active state on pagination

---
 bootstrap.css       | 5 ++++-
 bootstrap.min.css   | 1 +
 lib/pagination.less | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bootstrap.css b/bootstrap.css
index 9a4e6e111..37241baf0 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan 14 23:28:07 PST 2012
+ * Date: Sat Jan 14 23:33:26 PST 2012
  */
 html, body {
   margin: 0;
@@ -2107,6 +2107,9 @@ i {
 .pagination a:hover, .pagination .active a {
   background-color: #f5f5f5;
 }
+.pagination .active a {
+  color: #999999;
+}
 .pagination .disabled a, .pagination .disabled a:hover {
   color: #999999;
   background-color: transparent;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 1832263f0..6cc8946a5 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -406,6 +406,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .pagination li{display:inline;}
 .pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border-right:1px solid #ddd;border-right:1px solid rgba(0, 0, 0, 0.15);}
 .pagination a:hover,.pagination .active a{background-color:#f5f5f5;}
+.pagination .active a{color:#999999;}
 .pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;}
 .pagination li:last-child a{border:0;}
 .pagination-centered{text-align:center;}
diff --git a/lib/pagination.less b/lib/pagination.less
index 655abe5a3..064362b7b 100644
--- a/lib/pagination.less
+++ b/lib/pagination.less
@@ -30,6 +30,9 @@
 .pagination .active a {
   background-color: #f5f5f5;
 }
+.pagination .active a {
+  color: @grayLight;
+}
 .pagination .disabled a,
 .pagination .disabled a:hover {
   color: @grayLight;
-- 
cgit v1.2.3


From ed9903f797fa6d94789d05c234164bd378a1f3df Mon Sep 17 00:00:00 2001
From: Paul Kauders 
Date: Sun, 15 Jan 2012 07:46:25 -0600
Subject: Fix typo in Responsive design content

---
 docs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.html b/docs/index.html
index cb924bae6..40ffce106 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -215,7 +215,7 @@
             
      
               
               
      Responsive design
      
-              
      With Bootstrap 2, we've gone fully responsive. Our components are scale according to a range of resolutions and devices to provide a consistent experience, no matter what.
      
+              
      With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.
      
             
      
             
      
               
-- 
cgit v1.2.3


From 8ceea1f559fb432fc12df32153911de89caea36f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 15 Jan 2012 11:26:06 -0800
Subject: fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow,
 fix pager example code

---
 bootstrap.css            |  9 ++++++---
 bootstrap.min.css        |  6 +++---
 docs/assets/css/docs.css | 20 +++++++++-----------
 docs/components.html     |  4 ++--
 docs/index.html          |  7 +++----
 lib/dropdowns.less       |  5 ++++-
 lib/tables.less          |  2 +-
 7 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 37241baf0..7e2ba8023 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Jan 14 23:33:26 PST 2012
+ * Date: Sun Jan 15 00:04:02 PST 2012
  */
 html, body {
   margin: 0;
@@ -1116,7 +1116,7 @@ table .header:after {
   visibility: hidden;
 }
 table .headerSortUp, table .headerSortDown {
-  background-color: rgba(141, 192, 219, 0.25);
+  background-color: #f7f7f9;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
 }
 table .header:hover:after {
@@ -1440,6 +1440,7 @@ i {
 .dropdown .caret {
   margin-top: 8px;
   margin-left: 2px;
+  *margin-top: 7px;
 }
 .dropdown:hover .caret, .open.dropdown .caret {
   filter: alpha(opacity=100);
@@ -1459,7 +1460,7 @@ i {
   margin: 0;
   list-style: none;
   background-color: #ffffff;
-  border-color: #999;
+  border-color: #ccc;
   border-color: rgba(0, 0, 0, 0.2);
   border-style: solid;
   border-width: 1px;
@@ -1473,6 +1474,8 @@ i {
   -moz-background-clip: padding;
   background-clip: padding-box;
   zoom: 1;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
 }
 .dropdown-menu .divider {
   height: 1px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 6cc8946a5..6b55745ea 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -203,7 +203,7 @@ table .span10{float:none;width:764px;margin-left:0;}
 table .span11{float:none;width:844px;margin-left:0;}
 table .span12{float:none;width:924px;margin-left:0;}
 table .header{cursor:pointer;}table .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;}
-table .headerSortUp,table .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);}
+table .headerSortUp,table .headerSortDown{background-color:#f7f7f9;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);}
 table .header:hover:after{visibility:visible;}
 table .headerSortDown:after,table .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;}
 table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;}
@@ -300,9 +300,9 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .asterisk{background-position:-456px -96px;}
 .dropdown{position:relative;}
 .caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;content:"\2193";}
-.dropdown .caret{margin-top:8px;margin-left:2px;}
+.dropdown .caret{margin-top:8px;margin-left:2px;*margin-top:7px;}
 .dropdown:hover .caret,.open.dropdown .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
-.dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
+.dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
 .dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
 .dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;text-decoration:none;background-color:#0088cc;}
 .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 2f45032f2..416b1830c 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -130,6 +130,7 @@ section {
 /* Quick links
 -------------------------------------------------- */
 .quick-links {
+  min-height: 30px;
   padding: 5px 20px;
   margin: 45px 0;
   list-style: none;
@@ -141,11 +142,11 @@ section {
   -webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
      -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
           box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
+  overflow: hidden;
 }
 .quick-links li {
   display: inline;
   margin: 0 5px;
-  line-height: 30px;
 }
 .quick-links .divider {
   color: #999;
@@ -258,7 +259,7 @@ section {
       -ms-box-sizing: border-box; /* IE8 */
           box-sizing: border-box; /* CSS3 spec*/
   /* Hacks for IE7 to make this work just okay enough to function */
-  *width: 90%;
+  *width: 270px;
   *height: 24px;
 }
 
@@ -386,7 +387,7 @@ section {
 .popover-well .popover-menu-wrapper {
   height: 80px;
 }
-img.large-bird {
+.large-bird {
   margin: 5px 0 0 310px;
   opacity: .1;
 }
@@ -467,9 +468,6 @@ form.well {
 
 /* Icons
 ------------------------- */
-.the-icons {
-
-}
 .the-icons i {
   display: block;
   margin-bottom: 5px;
@@ -483,11 +481,11 @@ form.well {
   width: 100px;
 }
 
-#javascript input[type='checkbox'] {
-display: inline;
-margin-left: 6px;
-position: relative;
-top: -1px;
+#javascript input[type=checkbox] {
+  position: relative;
+  top: -1px;
+  display: inline;
+  margin-left: 6px;
 }
 
 
diff --git a/docs/components.html b/docs/components.html
index e88bd777c..83a024456 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -958,10 +958,10 @@
       
 
       <ul class="pager">
-  <li>
+  <li class="previous">
     <a href="#">&larr; Older</a>
   </li>
-  <li>
+  <li class="next">
     <a href="#">Newer &rarr;</a>
   </li>
 </ul>
diff --git a/docs/index.html b/docs/index.html
index cb924bae6..736352b43 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -119,7 +119,6 @@
             
      
               Download on GitHub
               Get started →
-              Currently v2.0.0
             
      
 
             
      
@@ -145,10 +144,10 @@
           
    • Changelog
      • 
           
    • ·
      • 
           
    • 
-            
+            
           
      • 
           
    • 
-            
+            
           
      • 
 
   
      Emphasis, address, and abbreviation
      
-  
      
         
           
      
             Label
      
+  
      
@@ -237,7 +237,7 @@
 
   
      Blockquotes
      
-  
      
     
       
      
         Element
   
      
+  
      
@@ -383,7 +383,7 @@
   
      Code Inline and block
      
-  
      
     
       
      
         Element
 
   
      
+  
      
@@ -425,7 +425,7 @@
 
   
      Inline labels for special attention
      
-  
      
     
       
      
         Element
   
      
+  
      
@@ -490,7 +490,7 @@
   
      Table markup
      
     
      
-      
      
     
       
      
         Labels
   
      
+      
      
@@ -579,7 +579,7 @@
   
      Table options
      
-  
      
         
           
      
             Tag
 
   
      
+  
      
@@ -591,6 +591,13 @@
       
+        
+      
+      
+        
+        
@@ -623,14 +630,14 @@
   
      1. Default table styles
      
     
      
-      
      Tables are automatically styled with only a few borders to ensure readability and maintain structure. No classes are required.
      
+      
      Tables are automatically styled with only a few borders to ensure readability and maintain structure. With 2.0, the .table class is required.
      
 
      -<table>
+<table class="table">
   ...
 </table>
      
     
      
     
      
-      
      
   
       
      
         Name
      
         Default
         NoneNo styles, just columns and rows
      Basic
+          .table
+        
         Only horizontal lines between rows
       
      
       
      
   
      
+      
      
@@ -670,12 +677,12 @@
       
      Get a little fancy with your tables by adding zebra-striping—just add the .table-striped class.
      Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.
      -<table class="table-striped">
+<table class="table table-striped">
   ...
 </table>
      
-      
      
         
           
      
             #
       
 
     
     
      
+      
      
@@ -714,12 +721,12 @@
     
      
       
      Add borders around the entire table and rounded corners for aesthetic purposes.
      
 
      -<table class="table-bordered">
+<table class="table table-bordered">
   ...
 </table>
      
     
      
-      
      
         
           
      
             #
     
      
+      
      
@@ -762,12 +769,12 @@
     
      
       
      Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 10px to 5px).
      
 
      -<table class="table-condensed">
+<table class="table table-condensed">
   ...
 </table>
      
     
      
-      
      
         
           
      
             #
     
      
+      
      
@@ -816,12 +823,12 @@
     });
   });
 </script>
-<table class="table-striped">
+<table class="table table-striped">
   ...
 </table>
      
-      
      
         
           
      
             #
     
     
      
+      
      
@@ -858,7 +865,7 @@
         
      
         
           
      
             #
       
      
       
      Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.
      
-      
+      
      
@@ -932,7 +939,7 @@
 
   
      Four types of forms
      Bootstrap provides simple markup and styles for four styles of common web forms.
      
-  
      
         
           
      
             #
   
      
+  
      
@@ -1259,7 +1266,7 @@
   
      
     
      Buttons
      
   
      
-  
      
     
       
      
         Name
      
+  
      
diff --git a/docs/index.html b/docs/index.html
index c30417c8f..ce56a04ef 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -267,7 +267,7 @@
           ================================================== -->
           
      Get started in no time.
      Quickly start using Bootstrap within your workflow and development process.
      
-          
      
     
       
      
         Button
           
      
+          
      
-            
-            
-            
+            
+            
+            
@@ -569,14 +569,14 @@
   
 
 
-  
      2. Striped table
      
+  
      2. {{_i}}Striped table{{/i}}
      
     
      
-      
      Get a little fancy with your tables by adding zebra-striping—just add the .table-striped class.
      
-      
      Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.
      
+      
      {{_i}}Get a little fancy with your tables by adding zebra-striping—just add the .table-striped class.{{/i}}
      
+      
      {{_i}}Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.{{/i}}
      
 
       <table class="table table-striped">
-  ...
+  …
 </table>
      
     
      
     
      
@@ -584,9 +584,9 @@
         
      
-            
-            
-            
+            
+            
+            
@@ -614,13 +614,13 @@
   
 
 
-  
      3. Bordered table
      
+  
      3. {{_i}}Bordered table{{/i}}
      
     
      
-      
      Add borders around the entire table and rounded corners for aesthetic purposes.
      
+      
      {{_i}}Add borders around the entire table and rounded corners for aesthetic purposes.{{/i}}
      
 
       <table class="table table-bordered">
-  ...
+  …
 </table>
      
     
      
     
      
@@ -628,9 +628,9 @@
         
      
-            
-            
-            
+            
+            
+            
@@ -662,13 +662,13 @@
   
 
 
-  
      4. Condensed table
      
+  
      4. {{_i}}Condensed table{{/i}}
      
     
      
-      
      Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 10px to 5px).
      
+      
      {{_i}}Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 8px to 4px).{{/i}}
      
 
       <table class="table table-condensed">
-  ...
+  …
 </table>
      
     
      
     
      
@@ -676,9 +676,9 @@
         
      
-            
-            
-            
+            
+            
+            
@@ -707,10 +707,10 @@
 
 
 
-  
      5. Striped table w/ TableSorter.js
      
+  
      5. {{_i}}Striped table w/ TableSorter.js{{/i}}
      
     
      
-      
      Include the jQuery Tablesorter plugin and automaically get clear styles for sorted columns.
      
+      
      {{_i}}Include the jQuery Tablesorter plugin and automatically get clear styles for sorted columns.{{/i}}
      
 
       <script src="jquery.tablesorter.js"></script>
 <script >
@@ -722,7 +722,7 @@
   });
 </script>
 <table class="table table-striped">
-  ...
+  …
 </table>
      
     
      
     
      
@@ -730,9 +730,9 @@
         
      
-            
-            
-            
+            
+            
+            
@@ -762,14 +762,14 @@
           
      
             
               
      
                 
diff --git a/docs/javascript.html b/docs/javascript.html
index a132a4011..fb854d281 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -284,7 +284,7 @@
           
      Call the modal via javascript:
      
           
      $('#myModal').modal(options)
      
           
      Options
      
-          
+          
      
@@ -349,7 +349,7 @@ $('#myModal').modal({
           
      $('#myModal').modal('hide')
      Events
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
-          
      
             
              
      
                Name
           
           
      
+          
      
@@ -666,7 +666,7 @@ $('#myModal').on('hidden', function () {
 </script>
      Events
      
-          
      
             
              
      
                Event
           
           
      
+          
      
@@ -719,7 +719,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
      Trigger the tooltip via javascript:
      $('#example').tooltip(options)
      Options
      
-          
      
             
              
      
                Event
           
           
      
+          
      
@@ -813,7 +813,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
      Enable popovers via javascript:
      $('#example').popover(options)
      Options
      
-          
      
             
              
      
                Name
           
           
      
+          
      
@@ -933,7 +933,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
      $(".alert-message").alert('close')
      Events
      Bootstrap's alert class exposes a few events for hooking into alert functionality. 
      
-          
      
             
              
      
                Name
           
           
      
+          
      
@@ -976,7 +976,7 @@ $('#my-alert').bind('closed', function () {
         
      
           
      Example uses
      
           
      Use the buttons plugin for states and toggles.
      
-          
      
             
              
      
                Event
      
+          
      
@@ -1125,7 +1125,7 @@ $('#my-alert').bind('closed', function () {
           
      Enable via javascript:
      $(".collapse").collapse()
      Options
      
-          
      
             
              
      
                Stateful
           
           
      
+          
      
@@ -1175,7 +1175,7 @@ $('#myCollapsible').collapse({
           
      
             Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
           
      
-          
      
             
              
      
                Name
      
+          
      
@@ -1261,7 +1261,7 @@ $('#myCollapsible').on('hidden', function () {
           
      Call via javascript:
      $('.carousel').carousel()
      Options
      
-          
      
             
              
      
                Event
           
           
      
+          
      
@@ -1310,7 +1310,7 @@ $('.myCarousel').carousel({
           
      Cycles to the next item.
      Events
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
-          
      
             
              
      
                Name
           
           
      
+          
      
@@ -1358,7 +1358,7 @@ $('.myCarousel').carousel({
           
      Call the typeahead via javascript:
      $('.typeahead').typeahead()
      Options
      
-          
      
             
              
      
                Event
           
           
      
+          
      
diff --git a/docs/less.html b/docs/less.html
index 6e43d95bd..09ff3e8e1 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -160,7 +160,7 @@
       
      Hyperlinks
      
-          
      
             
              
      
                Name
 
           
      
+          
      
@@ -185,7 +185,7 @@
       
      
         
      
           
      Grayscale colors
      
-          
      
             
               
      
                 Variable
      
+          
      
@@ -216,7 +216,7 @@
         
      
           
      Accent colors
      
-          
      
             
               
      
                 @black
         
      
+          
      
@@ -254,7 +254,7 @@
       
      
         
      
           
      Grid system
      
-          
      
             
               
      
                 @blue
      
+          
      
@@ -277,7 +277,7 @@
         
      
           
      Typography
      
-          
      
             
               
      
                 @gridColumns
         
      
+          
      
@@ -302,7 +302,7 @@
           
      Visuals
      
-          
      
             
               
      
                 @baseFontSize
         
         
      
+          
      
@@ -453,7 +453,7 @@
     
      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
      
-    
      
             
               
      
                 @primaryButtonColor
     
     
      
+    
      
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 77b94d8ce..f068c837c 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -223,7 +223,7 @@
   
      Grid customization
      
-  
      
       
         
      
           Method
 
   
      
+  
      
@@ -335,7 +335,7 @@
     
      
       
      Supported devices
      
       
      Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:
      
-      
      
     
       
      
         Variable
      
+      
      
diff --git a/lib/tables.less b/lib/tables.less
index 1edd9e3b8..29e1e2d46 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -4,39 +4,38 @@
 // ----------------------------------------
 
 
-
 // BASELINE STYLES
 // ---------------
 
-table {
+.table {
   width: 100%;
   margin-bottom: @baseLineHeight;
-}
-th,
-td {
-  padding: 8px;
-  line-height: @baseLineHeight;
-  text-align: left;
-  border-top: 1px solid #ddd;
-}
-th {
-  font-weight: bold;
-  vertical-align: bottom;
-}
-td {
-  vertical-align: top;
-}
-
-// Remove top border from thead by default
-thead:first-child tr th,
-thead:first-child tr td {
-  border-top: 0;
+  // Cells
+  th,
+  td {
+    padding: 8px;
+    line-height: @baseLineHeight;
+    text-align: left;
+    border-top: 1px solid #ddd;
+  }
+  th {
+    font-weight: bold;
+    vertical-align: bottom;
+  }
+  td {
+    vertical-align: top;
+  }
+  // Remove top border from thead by default
+  thead:first-child tr th,
+  thead:first-child tr td {
+    border-top: 0;
+  }
+  // Account for multiple tbody instances
+  tbody + tbody {
+    border-top: 2px solid #ddd;
+  }
 }
 
-// Account for multiple tbody instances
-tbody + tbody {
-  border-top: 2px solid #ddd;
-}
 
 
 // CONDENSED TABLE W/ HALF PADDING
-- 
cgit v1.2.3


From dd4140319ab4380dd21f5e90e65ef855c54c3420 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 17 Jan 2012 23:52:49 -0800
Subject: revamp the mixins file to organize things a bit more, make
 placeholder text use a new variable instead of relying solely on @grayLight

---
 bootstrap.css          |  2 +-
 lib/mixins.less        | 97 +++++++++++++++++++++++++++++++++++---------------
 lib/progress-bars.less |  2 +-
 lib/variables.less     |  4 +++
 4 files changed, 74 insertions(+), 31 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index c184d1332..e2fd3539d 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Tue Jan 17 23:38:42 PST 2012
+ * Date: Tue Jan 17 23:52:18 PST 2012
  */
 html, body {
   margin: 0;
diff --git a/lib/mixins.less b/lib/mixins.less
index 67e0c27de..bcc67954a 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -3,7 +3,12 @@
 // -----------------------------------------------------------------
 
 
-// Clearfix for clearing floats like a boss h5bp.com/q
+// UTILITY MIXINS
+// --------------------------------------------------
+
+// Clearfix
+// -------------------------
+// For clearing floats like a boss h5bp.com/q
 .clearfix() {
   zoom: 1;
   &:before,
@@ -19,6 +24,7 @@
 }
 
 // Center-align a block level element
+// -------------------------
 .center-block() {
   display: block;
   margin-left: auto;
@@ -26,12 +32,14 @@
 }
 
 // IE7 inline-block
+// -------------------------
 .ie7-inline-block() {
   *display: inline; /* IE7 inline-block hack */
   *zoom: 1;
 }
 
 // Sizing shortcuts
+// -------------------------
 .size(@height: 5px, @width: 5px) {
   width: @width;
   height: @height;
@@ -40,8 +48,9 @@
   .size(@size, @size);
 }
 
-// Input placeholder text
-.placeholder(@color: @grayLight) {
+// Placeholder text
+// -------------------------
+.placeholder(@color: @placeHolderText) {
   :-moz-placeholder {
     color: @color;
   }
@@ -50,7 +59,11 @@
   }
 }
 
-// Font Stacks
+
+
+// FONTS
+// --------------------------------------------------
+
 #font {
   #family {
     .serif() {
@@ -82,20 +95,28 @@
   }
 }
 
-// Grid System
+
+
+// GRID SYSTEM
+// --------------------------------------------------
+
+// Site container
+// -------------------------
 .fixed-container() {
   width: @siteWidth;
   margin-left: auto;
   margin-right: auto;
   .clearfix();
 }
+
+// Columns and offseting
+// -------------------------
 .columns(@columns: 1) {
   width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
 }
 .offset(@columns: 1) {
   margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
 }
-
 // Necessary grid styles for every column to make them appear next to each other horizontally
 .gridColumn() {
   float: left;
@@ -107,6 +128,11 @@
   .columns(@columnSpan);
 }
 
+
+
+// CSS3 PROPERTIES
+// --------------------------------------------------
+
 // Border Radius
 .border-radius(@radius: 5px) {
   -webkit-border-radius: @radius;
@@ -170,15 +196,6 @@
           transform: translate(@x, @y);
 }
 
-// User select
-// For selecting text on the page
-.user-select(@select) {
-  -webkit-user-select: @select;
-     -moz-user-select: @select;
-       -o-user-select: @select;
-          user-select: @select;
-}
-
 // Background clipping
 // Heads up: FF 3.6 and under need padding instead of padding-box
 .background-clip(@clip) {
@@ -187,6 +204,15 @@
           background-clip: @clip;
 }
 
+// Background sizing
+.background-size(@size){
+  -webkit-background-size: @size;
+     -moz-background-size: @size;
+       -o-background-size: @size;
+          background-size: @size;
+}
+
+
 // Box sizing
 .box-sizing(@boxmodel) {
   -webkit-box-sizing: @boxmodel;
@@ -194,6 +220,15 @@
           box-sizing: @boxmodel;
 }
 
+// User select
+// For selecting text on the page
+.user-select(@select) {
+  -webkit-user-select: @select;
+     -moz-user-select: @select;
+       -o-user-select: @select;
+          user-select: @select;
+}
+
 // Resize anything
 .resizable(@direction: both) {
   resize: @direction; // Options: horizontal, vertical, both
@@ -210,6 +245,18 @@
           column-gap: @columnGap;
 }
 
+// Opacity
+.opacity(@opacity: 100) {
+  filter: e(%("alpha(opacity=%d)", @opacity));
+    -moz-opacity: @opacity / 100;
+         opacity: @opacity / 100;
+}
+
+
+
+// BACKGROUNDS
+// --------------------------------------------------
+
 // Add an alphatransparency value to any background or border color (via Elyse Holladay)
 #translucent {
   .background(@color: @white, @alpha: 1) {
@@ -301,14 +348,13 @@
   filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
 }
 
-// Opacity
-.opacity(@opacity: 100) {
-  filter: e(%("alpha(opacity=%d)", @opacity));
-    -moz-opacity: @opacity / 100;
-         opacity: @opacity / 100;
-}
 
-// Popover arrows
+
+// COMPONENT MIXINS
+// --------------------------------------------------
+
+// POPOVER ARROWS
+// -------------------------
 // For tipsies and popovers
 #popoverArrow {
   .top(@arrowWidth: 5px) {
@@ -344,10 +390,3 @@
     border-right: @arrowWidth solid @black;
   }
 }
-
-.background-size(@width, @height){
-  -webkit-background-size: @width @height;
-     -moz-background-size: @width @height;
-       -o-background-size: @width @height;
-          background-size: @width @height;
-}
diff --git a/lib/progress-bars.less b/lib/progress-bars.less
index fd9d3f427..e8557a99e 100644
--- a/lib/progress-bars.less
+++ b/lib/progress-bars.less
@@ -55,7 +55,7 @@
 // Striped bars
 .progress.striped .bar {
   #gradient > .striped(#62c462);
-  .background-size(40px, 40px);
+  .background-size(40px 40px);
 }
 
 // Call animation for the active one
diff --git a/lib/variables.less b/lib/variables.less
index 3f32c36f4..3709d598d 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -68,3 +68,7 @@
 
 // Visuals
 @primaryButtonColor:    @blue;
+
+
+
+@placeHolderText:       @grayLight;
-- 
cgit v1.2.3


From a920fa2993fa91f3ad62e154eaa6ff7b2481f615 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 18 Jan 2012 00:12:58 -0800
Subject: re-org variables

---
 lib/variables.less | 98 ++++++++++++++++++++++++------------------------------
 1 file changed, 44 insertions(+), 54 deletions(-)

diff --git a/lib/variables.less b/lib/variables.less
index 3709d598d..8afe00032 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -3,53 +3,56 @@
 // -----------------------------------------------------
 
 
-// LINK COLORS
-// -----------
-
-@linkColor:         #08c;
-@linkColorHover:    darken(@linkColor, 15);
-
-
-// GRAYS
-// -----
-
-@black:             #000;
-@grayDark:          #333;
-@gray:              #555;
-@grayLight:         #999;
-@grayLighter:       #eee;
-@white:             #fff;
-
-
-// ACCENT COLORS
-// -------------
-
-@blue:              #049CDB;
-@blueDark:          #0064CD;
-@green:             #46a546;
-@red:               #9d261d;
-@yellow:            #ffc40d;
-@orange:            #f89406;
-@pink:              #c3325f;
-@purple:            #7a43b6;
 
+// GLOBAL VALUES
+// --------------------------------------------------
+
+// Links
+@linkColor:             #08c;
+@linkColorHover:        darken(@linkColor, 15);
+
+// Grays
+@black:                 #000;
+@grayDark:              #333;
+@gray:                  #555;
+@grayLight:             #999;
+@grayLighter:           #eee;
+@white:                 #fff;
+
+// Accent colors
+@blue:                  #049CDB;
+@blueDark:              #0064CD;
+@green:                 #46a546;
+@red:                   #9d261d;
+@yellow:                #ffc40d;
+@orange:                #f89406;
+@pink:                  #c3325f;
+@purple:                #7a43b6;
+
+// Grid system
+// Modify the grid styles in mixins.less
+@gridColumns:           12;
+@gridColumnWidth:       60px;
+@gridGutterWidth:       20px;
+@siteWidth:             (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+// Fluid width sidebar
+@fluidSidebarWidth:     220px;
 
-// GRID
-// ----
+// Typography
+@baseFontSize:          13px;
+@baseFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@baseLineHeight:        18px;
 
-// Modify the grid styles in mixins.less
-@gridColumns:       12;
-@gridColumnWidth:   60px;
-@gridGutterWidth:   20px;
-@siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+// Buttons
+@primaryButtonColor:    @blue;
 
-// Fluid width sidebar
-@fluidSidebarWidth: 220px;
 
 
-// Z-INDEX
-// -------
+// COMPONENT VARIABLES
+// --------------------------------------------------
 
+// Z-index master list
+// Used for a bird's eye view of components dependent on the z-axis
 @zindexDropdown:        1000;
 @zindexPopover:         1010;
 @zindexTooltip:         1020;
@@ -57,18 +60,5 @@
 @zindexModalBackdrop:   1040;
 @zindexModal:           1050;
 
-
-// THEME VARIABLES
-// ---------------
-
-// Typography
-@baseFontSize:          13px;
-@baseFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
-@baseLineHeight:        18px;
-
-// Visuals
-@primaryButtonColor:    @blue;
-
-
-
+// Input placeholder text color
 @placeHolderText:       @grayLight;
-- 
cgit v1.2.3


From f2fadf1f0a3f444893fec394fd0180d03e1058a3 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 18 Jan 2012 00:24:10 -0800
Subject: rename navbar variables, change navbar search placeholder to mixin

---
 bootstrap.css      | 434 ++++++++++++++++++++++++++---------------------------
 bootstrap.min.css  |  62 ++++----
 lib/bootstrap.less |   2 +-
 lib/navbar.less    |  25 ++-
 lib/variables.less |  11 +-
 5 files changed, 268 insertions(+), 266 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index e2fd3539d..681605a88 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Tue Jan 17 23:52:18 PST 2012
+ * Date: Wed Jan 18 00:23:51 PST 2012
  */
 html, body {
   margin: 0;
@@ -1570,222 +1570,6 @@ i {
   opacity: 0.4;
   cursor: pointer;
 }
-.navbar {
-  overflow: visible;
-}
-.navbar-inner {
-  background-color: #222222;
-  background-color: #222222;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
-  background-image: -moz-linear-gradient(top, #333333, #222222);
-  background-image: -ms-linear-gradient(top, #333333, #222222);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
-  background-image: -webkit-linear-gradient(top, #333333, #222222);
-  background-image: -o-linear-gradient(top, #333333, #222222);
-  background-image: linear-gradient(top, #333333, #222222);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-}
-.navbar .brand:hover {
-  color: #ffffff;
-  text-decoration: none;
-}
-.navbar .brand {
-  float: left;
-  display: block;
-  padding: 8px 20px 12px;
-  margin-left: -20px;
-  font-size: 20px;
-  font-weight: 200;
-  line-height: 1;
-  color: #ffffff;
-}
-.navbar p {
-  margin: 0;
-  line-height: 40px;
-}
-.navbar p a:hover {
-  color: #ffffff;
-  background-color: transparent;
-}
-.navbar .btn, .navbar .btn-group {
-  margin-top: 5px;
-}
-.navbar .btn-group .btn {
-  margin-top: 0;
-}
-.navbar-form {
-  margin-bottom: 0;
-}
-.navbar-form input, .navbar-form select {
-  display: inline-block;
-  margin-bottom: 0;
-}
-.navbar-search {
-  position: relative;
-  float: left;
-  margin-top: 6px;
-  margin-bottom: 0;
-}
-.navbar-search .search-query {
-  padding: 4px 9px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  font-weight: normal;
-  line-height: 1;
-  color: #ffffff;
-  color: rgba(255, 255, 255, 0.75);
-  background-color: #444;
-  background-color: rgba(255, 255, 255, 0.3);
-  border: 1px solid #111;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-  -webkit-transition: none;
-  -moz-transition: none;
-  -ms-transition: none;
-  -o-transition: none;
-  transition: none;
-}
-.navbar-search .search-query:-moz-placeholder {
-  color: #eeeeee;
-}
-.navbar-search .search-query::-webkit-input-placeholder {
-  color: #eeeeee;
-}
-.navbar-search .search-query:hover {
-  color: #ffffff;
-  background-color: #999999;
-  background-color: rgba(255, 255, 255, 0.5);
-}
-.navbar-search .search-query:focus, .navbar-search .search-query.focused {
-  padding: 5px 10px;
-  color: #333333;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #ffffff;
-  border: 0;
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  outline: 0;
-}
-.navbar-static {
-  margin-bottom: 18px;
-}
-.navbar-static .navbar-inner {
-  padding-left: 20px;
-  padding-right: 20px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.navbar-fixed {
-  position: fixed;
-  top: 0;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-}
-.navbar .nav {
-  position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.navbar .nav.pull-right {
-  float: right;
-}
-.navbar .nav > li {
-  display: block;
-  float: left;
-}
-.navbar .nav > li > a {
-  float: none;
-  padding: 10px 10px 11px;
-  line-height: 19px;
-  color: #999999;
-  text-decoration: none;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.navbar .nav > li > a:hover {
-  background-color: transparent;
-  color: #ffffff;
-  text-decoration: none;
-}
-.navbar .nav .active > a {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #222;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-.navbar .vertical-divider {
-  height: 40px;
-  width: 1px;
-  margin: 0 5px;
-  overflow: hidden;
-  background-color: #222;
-  border-right: 1px solid #444;
-}
-.navbar .nav.pull-right {
-  margin-left: 10px;
-  margin-right: 0;
-}
-.navbar .dropdown-menu {
-  top: 41px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.navbar .dropdown-menu:before {
-  content: '';
-  display: inline-block;
-  border-left: 7px solid transparent;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  position: absolute;
-  top: -7px;
-  left: 9px;
-}
-.navbar .dropdown-menu:after {
-  content: '';
-  display: inline-block;
-  border-left: 6px solid transparent;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
-  position: absolute;
-  top: -6px;
-  left: 10px;
-}
-.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
-  border-top-color: #fff;
-}
-.navbar .nav .active .caret {
-  filter: alpha(opacity=100);
-  -moz-opacity: 1;
-  opacity: 1;
-}
-.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
-  background-color: transparent;
-}
-.navbar .nav .active > .dropdown-toggle:hover {
-  color: #fff;
-}
-.navbar .nav.pull-right .dropdown-menu {
-  right: 0;
-}
-.navbar .nav.pull-right .dropdown-menu:before {
-  left: auto;
-  right: 12px;
-}
-.navbar .nav.pull-right .dropdown-menu:after {
-  left: auto;
-  right: 13px;
-}
 .nav {
   margin-left: 0;
   margin-bottom: 18px;
@@ -2040,6 +1824,222 @@ i {
 .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
 }
+.navbar {
+  overflow: visible;
+}
+.navbar-inner {
+  background-color: #222222;
+  background-color: #222222;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+}
+.navbar .brand:hover {
+  color: #ffffff;
+  text-decoration: none;
+}
+.navbar .brand {
+  float: left;
+  display: block;
+  padding: 8px 20px 12px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 1;
+  color: #ffffff;
+}
+.navbar p {
+  margin: 0;
+  line-height: 40px;
+}
+.navbar p a:hover {
+  color: #ffffff;
+  background-color: transparent;
+}
+.navbar .btn, .navbar .btn-group {
+  margin-top: 5px;
+}
+.navbar .btn-group .btn {
+  margin-top: 0;
+}
+.navbar-form {
+  margin-bottom: 0;
+}
+.navbar-form input, .navbar-form select {
+  display: inline-block;
+  margin-bottom: 0;
+}
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 6px;
+  margin-bottom: 0;
+}
+.navbar-search .search-query {
+  padding: 4px 9px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  color: #ffffff;
+  color: rgba(255, 255, 255, 0.75);
+  background: #444;
+  background: rgba(255, 255, 255, 0.3);
+  border: 1px solid #111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  -webkit-transition: none;
+  -moz-transition: none;
+  -ms-transition: none;
+  -o-transition: none;
+  transition: none;
+}
+.navbar-search .search-query :-moz-placeholder {
+  color: #eeeeee;
+}
+.navbar-search .search-query ::-webkit-input-placeholder {
+  color: #eeeeee;
+}
+.navbar-search .search-query:hover {
+  color: #ffffff;
+  background-color: #999999;
+  background-color: rgba(255, 255, 255, 0.5);
+}
+.navbar-search .search-query:focus, .navbar-search .search-query.focused {
+  padding: 5px 10px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  outline: 0;
+}
+.navbar-static {
+  margin-bottom: 18px;
+}
+.navbar-static .navbar-inner {
+  padding-left: 20px;
+  padding-right: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.navbar-fixed {
+  position: fixed;
+  top: 0;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+}
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+  float: right;
+}
+.navbar .nav > li {
+  display: block;
+  float: left;
+}
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 10px 11px;
+  line-height: 19px;
+  color: #999999;
+  text-decoration: none;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.navbar .nav > li > a:hover {
+  background-color: transparent;
+  color: #ffffff;
+  text-decoration: none;
+}
+.navbar .nav .active > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #222;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+.navbar .vertical-divider {
+  height: 40px;
+  width: 1px;
+  margin: 0 5px;
+  overflow: hidden;
+  background-color: #222;
+  border-right: 1px solid #444;
+}
+.navbar .nav.pull-right {
+  margin-left: 10px;
+  margin-right: 0;
+}
+.navbar .dropdown-menu {
+  top: 41px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.navbar .dropdown-menu:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top: -7px;
+  left: 9px;
+}
+.navbar .dropdown-menu:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  position: absolute;
+  top: -6px;
+  left: 10px;
+}
+.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
+  border-top-color: #fff;
+}
+.navbar .nav .active .caret {
+  filter: alpha(opacity=100);
+  -moz-opacity: 1;
+  opacity: 1;
+}
+.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
+  background-color: transparent;
+}
+.navbar .nav .active > .dropdown-toggle:hover {
+  color: #fff;
+}
+.navbar .nav.pull-right .dropdown-menu {
+  right: 0;
+}
+.navbar .nav.pull-right .dropdown-menu:before {
+  left: auto;
+  right: 12px;
+}
+.navbar .nav.pull-right .dropdown-menu:after {
+  left: auto;
+  right: 13px;
+}
 .breadcrumb {
   padding: 7px 14px;
   margin: 0 0 18px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index a6128a0b5..9fd65f9a8 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -311,37 +311,6 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
 .collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
 .close{float:right;font-size:20px;font-weight:bold;line-height:12px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;cursor:pointer;}
-.navbar{overflow:visible;}
-.navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
-.navbar .brand:hover{color:#ffffff;text-decoration:none;}
-.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
-.navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
-.navbar .btn,.navbar .btn-group{margin-top:5px;}
-.navbar .btn-group .btn{margin-top:0;}
-.navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
-.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background-color:#444;background-color:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
-.navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
-.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
-.navbar-static{margin-bottom:18px;}
-.navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.navbar-fixed{position:fixed;top:0;right:0;left:0;z-index:1030;}
-.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
-.navbar .nav.pull-right{float:right;}
-.navbar .nav>li{display:block;float:left;}
-.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
-.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;}
-.navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
-.navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;}
-.navbar .nav.pull-right{margin-left:10px;margin-right:0;}
-.navbar .dropdown-menu{top:41px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
-.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:10px;}
-.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#fff;}
-.navbar .nav .active .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
-.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
-.navbar .nav .active>.dropdown-toggle:hover{color:#fff;}
-.navbar .nav.pull-right .dropdown-menu{right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
-.navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
 .nav{margin-left:0;margin-bottom:18px;list-style:none;}
 .nav>li>a{display:block;}
 .nav>li>a:hover{text-decoration:none;background-color:#eee;}
@@ -397,6 +366,37 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tabs-right .tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
 .tabs-right .tabs>li>a:hover{border-color:#eee #eee #eee #ddd;}
 .tabs-right .tabs .active>a,.tabs-right .tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;}
+.navbar{overflow:visible;}
+.navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
+.navbar .brand:hover{color:#ffffff;text-decoration:none;}
+.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
+.navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
+.navbar .btn,.navbar .btn-group{margin-top:5px;}
+.navbar .btn-group .btn{margin-top:0;}
+.navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
+.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
+.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
+.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
+.navbar-static{margin-bottom:18px;}
+.navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.navbar-fixed{position:fixed;top:0;right:0;left:0;z-index:1030;}
+.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
+.navbar .nav.pull-right{float:right;}
+.navbar .nav>li{display:block;float:left;}
+.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
+.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;}
+.navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
+.navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;}
+.navbar .nav.pull-right{margin-left:10px;margin-right:0;}
+.navbar .dropdown-menu{top:41px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:10px;}
+.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#fff;}
+.navbar .nav .active .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
+.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
+.navbar .nav .active>.dropdown-toggle:hover{color:#fff;}
+.navbar .nav.pull-right .dropdown-menu{right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
+.navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
 .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
 .breadcrumb .divider{padding:0 5px;color:#999999;}
 .breadcrumb .active a{color:#333333;}
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index fec87a339..67642d1c4 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -32,8 +32,8 @@
 @import "close.less";
 
 // Components: Nav
-@import "navbar.less";
 @import "navs.less";
+@import "navbar.less";
 @import "breadcrumbs.less";
 @import "pagination.less";
 @import "pager.less";
diff --git a/lib/navbar.less b/lib/navbar.less
index 0d01fe524..94bc65241 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -1,22 +1,21 @@
 // NAVBAR (FIXED AND STATIC)
 // -------------------------
 
-// Navbar variables
-@navBarHeight: 40px;
-@navBarBgStart: #333;
-@navBarBgEnd: #222;
 
-// Common styles
+// COMMON STYLES
+// -------------
+
 .navbar {
   overflow: visible;
 }
 // gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
 .navbar-inner {
-  background-color: @navBarBgEnd;
-  #gradient > .vertical(@navBarBgStart, @navBarBgEnd);
+  background-color: @navbarBackground;
+  #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
   @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
   .box-shadow(@shadow);
 }
+
 // Text and links
 .navbar {
   // Hover and active states
@@ -75,20 +74,16 @@
     #font > .sans-serif(13px, normal, 1);
     color: @white;
     color: rgba(255,255,255,.75);
-    background-color: #444;
-    background-color: rgba(255,255,255,.3);
+    background: #444;
+    background: rgba(255,255,255,.3);
     border: 1px solid #111;
     @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
     .box-shadow(@shadow);
     .transition(none);
 
     // Placeholder text gets special styles; can't be bundled together though for some reason
-    &:-moz-placeholder {
-      color: @grayLighter;
-    }
-    &::-webkit-input-placeholder {
-      color: @grayLighter;
-    }
+    .placeholder(@grayLighter);
+
     // Hover states
     &:hover {
       color: @white;
diff --git a/lib/variables.less b/lib/variables.less
index 8afe00032..807a9ea0d 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -51,6 +51,9 @@
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
+// Input placeholder text color
+@placeHolderText:       @grayLight;
+
 // Z-index master list
 // Used for a bird's eye view of components dependent on the z-axis
 @zindexDropdown:        1000;
@@ -60,5 +63,9 @@
 @zindexModalBackdrop:   1040;
 @zindexModal:           1050;
 
-// Input placeholder text color
-@placeHolderText:       @grayLight;
+// Navbar
+@navBarHeight:                    40px;
+@navbarBackground:                #222;
+@navbarBackgroundHighlight:       #333;
+
+
-- 
cgit v1.2.3


From d12560c0ee77e69011012095b04332aeb97b9c42 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 18 Jan 2012 00:30:49 -0800
Subject: make button active state clearer by lightening the inner shadow and
 removing the background image

---
 bootstrap.css     | 9 +++++----
 bootstrap.min.css | 2 +-
 lib/buttons.less  | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 681605a88..2ba50f1de 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 18 00:23:51 PST 2012
+ * Date: Wed Jan 18 00:30:09 PST 2012
  */
 html, body {
   margin: 0;
@@ -2527,9 +2527,10 @@ i {
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
 }
 .btn.active, .btn:active {
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 .btn.disabled {
   cursor: default;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 9fd65f9a8..7a98ef05c 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -456,7 +456,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;}
 .btn:focus{outline:1px dotted #666;}
 .btn.primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
-.btn.active,.btn:active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
 .btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
diff --git a/lib/buttons.less b/lib/buttons.less
index a7492f9fd..e53dce7af 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -68,7 +68,8 @@
   // Active and Disabled states
   &.active,
   &:active {
-    @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
+    background-image: none;
+    @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
     .box-shadow(@shadow);
   }
   &.disabled {
-- 
cgit v1.2.3


From ab8f2e2767be77120fedb07269dc7db078101dba Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 18 Jan 2012 00:35:14 -0800
Subject: don't scope placeholder text color to just inputs

---
 bootstrap.css     | 6 +++---
 bootstrap.min.css | 4 ++--
 lib/forms.less    | 7 +------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 2ba50f1de..460cd7ba0 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 18 00:30:09 PST 2012
+ * Date: Wed Jan 18 00:34:59 PST 2012
  */
 html, body {
   margin: 0;
@@ -842,10 +842,10 @@ input:invalid:focus, textarea:invalid:focus, select:invalid:focus {
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
   cursor: not-allowed;
 }
-input:-moz-placeholder {
+:-moz-placeholder {
   color: #999999;
 }
-input::-webkit-input-placeholder {
+::-webkit-input-placeholder {
   color: #999999;
 }
 .help-block {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 7a98ef05c..0027eaf1c 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -155,8 +155,8 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
 input:invalid,textarea:invalid,select:invalid{color:#b94a48;border-color:#ee5f5b;}input:invalid:focus,textarea:invalid:focus,select:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
 .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
 .uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
-input:-moz-placeholder{color:#999999;}
-input::-webkit-input-placeholder{color:#999999;}
+:-moz-placeholder{color:#999999;}
+::-webkit-input-placeholder{color:#999999;}
 .help-block{margin-top:5px;margin-bottom:0;color:#999999;}
 .help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;}
 .input-prepend,.input-append{margin-bottom:5px;zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;*display:inline;content:"";zoom:1;}
diff --git a/lib/forms.less b/lib/forms.less
index 703accff8..e956b0046 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -336,12 +336,7 @@ select:invalid {
 }
 
 // Placeholder text gets special styles; can't be bundled together though for some reason
-input:-moz-placeholder {
-  color: @grayLight;
-}
-input::-webkit-input-placeholder {
-  color: @grayLight;
-}
+.placeholder(@grayLight);
 
 
 
-- 
cgit v1.2.3


From 87113396dfbf7bfcb41c52702c6d8c861ab215c9 Mon Sep 17 00:00:00 2001
From: Kevin Martensson 
Date: Wed, 18 Jan 2012 14:02:18 +0100
Subject: Make dropdown menus scalable.

---
 lib/button-groups.less | 2 +-
 lib/dropdowns.less     | 2 +-
 lib/navbar.less        | 2 +-
 lib/navs.less          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/button-groups.less b/lib/button-groups.less
index e9724ba8c..8f4bbc510 100644
--- a/lib/button-groups.less
+++ b/lib/button-groups.less
@@ -88,7 +88,7 @@
 // Reposition menu on open and round all corners
 .btn-group.open .dropdown-menu {
   display: block;
-  top: 30px;
+  margin-top: 1px;
   .border-radius(5px);
   &.large { top: 40px; }
 }
diff --git a/lib/dropdowns.less b/lib/dropdowns.less
index 08054713c..d0316f145 100644
--- a/lib/dropdowns.less
+++ b/lib/dropdowns.less
@@ -30,7 +30,7 @@
 // The dropdown menu (ul)
 .dropdown-menu {
   position: absolute;
-  top: 40px;
+  top: 100%;
   z-index: @zindexDropdown;
   float: left;
   display: none; // none by default, but block on "open" of the menu
diff --git a/lib/navbar.less b/lib/navbar.less
index 94bc65241..f38459a72 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -191,7 +191,7 @@
 
 // Menu position and menu carets
 .navbar .dropdown-menu {
-  top: 41px;
+  margin-top: 1px;
   .border-radius(4px);
   &:before {
     content: '';
diff --git a/lib/navs.less b/lib/navs.less
index 432ab3cbd..edc0d238f 100644
--- a/lib/navs.less
+++ b/lib/navs.less
@@ -177,7 +177,7 @@
 // Position the menu
 .pills .dropdown-menu,
 .tabs .dropdown-menu {
-  top: 33px;
+  margin-top: 1px;
   border-width: 1px;
 }
 .pills .dropdown-menu {
@@ -239,7 +239,7 @@
 
 
 // COMMON STYLES
-// ------------- 
+// -------------
 
 // Clear any floats
 .tabbable {
-- 
cgit v1.2.3


From 9c940784153257efcadc1aa420c57caa86e664bf Mon Sep 17 00:00:00 2001
From: Scott Watermasysk 
Date: Wed, 18 Jan 2012 14:53:59 -0500
Subject: Added missing 'data-dismiss="modal"' on the first example model
 source.

---
 docs/javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index fb854d281..8accce210 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -240,7 +240,7 @@
           
      
             
      
               
      
-                ×
+                ×
                 
      Modal header
      
               
      
               
      
-- 
cgit v1.2.3


From 1c014613a9924a3a3715821ff4b65531bee5b630 Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher 
Date: Thu, 19 Jan 2012 20:31:45 +0000
Subject: Add various always-ignore extensions, files, and folders to
 `.gitignore`

---
 .gitignore | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 38ad09099..2da5c5c5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,36 @@
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+*.sass-cache
+
+# OS or Editor folders
 .DS_Store
-js/min
\ No newline at end of file
+Thumbs.db
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+nbproject
+*.sublime-project
+*.sublime-workspace
+
+# Komodo
+*.komodoproject
+.komodotools
+
+# Folders to ignore
+.hg
+.svn
+.CVS
+.idea
+
+# Misc
+js/min
-- 
cgit v1.2.3


From 25ac318d33329a0fb532d5f9ec922ad76d791959 Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher 
Date: Thu, 19 Jan 2012 20:33:22 +0000
Subject: Remove unnecessary CSS properties from the clearfix mixin.

---
 bootstrap.css     | 44 ++++++++++++--------------------------------
 bootstrap.min.css | 24 ++++++++++++------------
 lib/mixins.less   |  4 +---
 3 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 460cd7ba0..4dcf33955 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 18 00:34:59 PST 2012
+ * Date: Thu 19 Jan 2012 20:33:11 GMT
  */
 html, body {
   margin: 0;
@@ -182,13 +182,11 @@ body {
   width: 940px;
   margin-left: auto;
   margin-right: auto;
-  zoom: 1;
+  *zoom: 1;
 }
 .container:before, .container:after {
   display: table;
-  *display: inline;
   content: "";
-  zoom: 1;
 }
 .container:after {
   clear: both;
@@ -198,13 +196,11 @@ body {
   min-width: 940px;
   padding-left: 20px;
   padding-right: 20px;
-  zoom: 1;
+  *zoom: 1;
 }
 .fluid-container:before, .fluid-container:after {
   display: table;
-  *display: inline;
   content: "";
-  zoom: 1;
 }
 .fluid-container:after {
   clear: both;
@@ -243,13 +239,11 @@ a:hover {
 }
 .row {
   margin-left: -20px;
-  zoom: 1;
+  *zoom: 1;
 }
 .row:before, .row:after {
   display: table;
-  *display: inline;
   content: "";
-  zoom: 1;
 }
 .row:after {
   clear: both;
@@ -865,16 +859,14 @@ input:invalid:focus, textarea:invalid:focus, select:invalid:focus {
 }
 .input-prepend, .input-append {
   margin-bottom: 5px;
-  zoom: 1;
+  *zoom: 1;
 }
 .input-prepend:before,
 .input-append:before,
 .input-prepend:after,
 .input-append:after {
   display: table;
-  *display: inline;
   content: "";
-  zoom: 1;
 }
 .input-prepend:after, .input-append:after {
   clear: both;
@@ -1610,16 +1602,14 @@ i {
   background-color: #0088cc;
 }
 .tabs, .pills {
-  zoom: 1;
+  *zoom: 1;
 }
 .tabs:before,
 .pills:before,
 .tabs:after,
 .pills:after {
   display: table;
-  *display: inline;
   content: "";
-  zoom: 1;
 }
 .tabs:after, .pills:after {
   clear: both;
@@ -1743,13 +1733,11 @@ i {
   border-color: #999;
 }
 .tabbable {
-  zoom: 1;
+  *zoom: 1;
 }
 .tabbable:before, .tabbable:after {
   display: table;
-  *display: inline;
   content: "";
-  zoom: 1;
 }
 .tabbable:after {
   clear: both;
@@ -1907,7 +1895,7 @@ i {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
@@ -2135,13 +2123,11 @@ i {
   margin-bottom: 18px;
   list-style: none;
   text-align: center;
-  zoom: 1;
+  *zoom: 1;
 }
 .pager:before, .pager:after {
   display: table;
-  *display: inline;
   content: "";
-  zoom: 1;
 }
 .pager:after {
   clear: both;
@@ -2237,13 +2223,11 @@ i {
   -webkit-box-shadow: inset 0 1px 0 #ffffff;
   -moz-box-shadow: inset 0 1px 0 #ffffff;
   box-shadow: inset 0 1px 0 #ffffff;
-  zoom: 1;
+  *zoom: 1;
 }
 .modal-footer:before, .modal-footer:after {
   display: table;
-  *display: inline;
   content: "";
-  zoom: 1;
 }
 .modal-footer:after {
   clear: both;
@@ -2575,13 +2559,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 }
 .btn-group {
   position: relative;
-  zoom: 1;
+  *zoom: 1;
 }
 .btn-group:before, .btn-group:after {
   display: table;
-  *display: inline;
   content: "";
-  zoom: 1;
 }
 .btn-group:after {
   clear: both;
@@ -2730,13 +2712,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 .thumbnails {
   margin-left: -20px;
   list-style: none;
-  zoom: 1;
+  *zoom: 1;
 }
 .thumbnails:before, .thumbnails:after {
   display: table;
-  *display: inline;
   content: "";
-  zoom: 1;
 }
 .thumbnails:after {
   clear: both;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 0027eaf1c..97700e87a 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -21,9 +21,9 @@ input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box
 input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}
 textarea{overflow:auto;vertical-align:top;}
 body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#555555;background-color:#ffffff;}
-.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;*display:inline;content:"";zoom:1;}
+.container{width:940px;margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
 .container:after{clear:both;}
-.fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.fluid-container:before,.fluid-container:after{display:table;*display:inline;content:"";zoom:1;}
+.fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;*zoom:1;}.fluid-container:before,.fluid-container:after{display:table;content:"";}
 .fluid-container:after{clear:both;}
 .fluid-sidebar{width:220px;margin:0 20px 18px;}
 .sidebar-left{padding-left:260px;}
@@ -32,7 +32,7 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
 .sidebar-right .fluid-sidebar{float:right;margin-right:-240px;}
 .fluid-content{float:left;width:100%;}
 a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
-.row{margin-left:-20px;zoom:1;}.row:before,.row:after{display:table;*display:inline;content:"";zoom:1;}
+.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
 .row:after{clear:both;}
 [class*="span"]{float:left;margin-left:20px;}
 .span1{width:60px;}
@@ -159,7 +159,7 @@ input:invalid,textarea:invalid,select:invalid{color:#b94a48;border-color:#ee5f5b
 ::-webkit-input-placeholder{color:#999999;}
 .help-block{margin-top:5px;margin-bottom:0;color:#999999;}
 .help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;}
-.input-prepend,.input-append{margin-bottom:5px;zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;*display:inline;content:"";zoom:1;}
+.input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";}
 .input-prepend:after,.input-append:after{clear:both;}
 .input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 .input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;}
@@ -319,7 +319,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .nav.list .nav-header{font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-transform:uppercase;}
 .nav.list>li+.nav-header{margin-top:9px;}
 .nav.list .active>a{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;}
-.tabs,.pills{zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;*display:inline;content:"";zoom:1;}
+.tabs,.pills{*zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
 .tabs:after,.pills:after{clear:both;}
 .tabs>li,.pills>li{float:left;}
 .tabs>li>a,.pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
@@ -347,7 +347,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tabs .open .dropdown-toggle,.pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#fff;background-color:#999;border-color:#999;}
 .nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#fff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
 .tabs.stacked .open>a:hover{border-color:#999;}
-.tabbable{zoom:1;}.tabbable:before,.tabbable:after{display:table;*display:inline;content:"";zoom:1;}
+.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";}
 .tabbable:after{clear:both;}
 .tabs-below .tabs,.tabs-right .tabs,.tabs-left .tabs{border-bottom:0;}
 .tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
@@ -375,7 +375,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
@@ -411,7 +411,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 .pagination-centered{text-align:center;}
 .pagination-right{text-align:right;}
-.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;zoom:1;}.pager:before,.pager:after{display:table;*display:inline;content:"";zoom:1;}
+.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";}
 .pager:after{clear:both;}
 .pager li{display:inline;}
 .pager a{display:inline-block;padding:6px 15px;background-color:#f5f5f5;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
@@ -423,7 +423,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .modal.fade.in{top:50%;}
 .modal-header{padding:5px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:7px;}
 .modal-body{padding:15px;}
-.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}.modal-footer:before,.modal-footer:after{display:table;*display:inline;content:"";zoom:1;}
+.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
 .modal-footer:after{clear:both;}
 .modal-footer .btn{float:right;margin-left:5px;}
 .tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;}.tooltip.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;}
@@ -463,7 +463,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .btn.small{padding:7px 9px 7px;font-size:11px;}
 :root .alert-message,:root .btn{border-radius:0 \0;}
 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
-.btn-group{position:relative;zoom:1;}.btn-group:before,.btn-group:after{display:table;*display:inline;content:"";zoom:1;}
+.btn-group{position:relative;*zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";}
 .btn-group:after{clear:both;}
 .btn-group+.btn-group{margin-left:5px;}
 .btn-toolbar .btn-group{display:inline-block;}
@@ -490,7 +490,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .alert-block{padding-top:14px;padding-bottom:14px;}
 .alert-block>p,.alert-block>ul{margin-bottom:0;}
 .alert-block p+p{margin-top:5px;}
-.thumbnails{margin-left:-20px;list-style:none;zoom:1;}.thumbnails:before,.thumbnails:after{display:table;*display:inline;content:"";zoom:1;}
+.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
 .thumbnails:after{clear:both;}
 .thumbnails>li{float:left;margin:0 0 20px 20px;}
 .thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}
@@ -538,4 +538,4 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .show{display:block;}
 .invisible{visibility:hidden;}
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
+@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/lib/mixins.less b/lib/mixins.less
index bcc67954a..5a3952f3a 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -10,13 +10,11 @@
 // -------------------------
 // For clearing floats like a boss h5bp.com/q
 .clearfix() {
-  zoom: 1;
+  *zoom: 1;
   &:before,
   &:after {
     display: table;
-    *display: inline;
     content: "";
-    zoom: 1;
   }
   &:after {
     clear: both;
-- 
cgit v1.2.3


From 8825443d6e6ff28a97e092f46b42ec508e58cb05 Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher 
Date: Thu, 19 Jan 2012 21:02:00 +0000
Subject: Remove search input cancel button in WebKit-OSX.

On input elements with a `type` of `search`, WebKit on OS X will
display a cancel button after text has been entered. This can
look ugly or be poorly position when you've added other styles to
the input (especially additional padding).
---
 bootstrap.css     | 4 ++--
 bootstrap.min.css | 2 +-
 lib/reset.less    | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 4dcf33955..959eb2421 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu 19 Jan 2012 20:33:11 GMT
+ * Date: Thu 19 Jan 2012 22:27:04 GMT
  */
 html, body {
   margin: 0;
@@ -163,7 +163,7 @@ input[type="search"] {
   -moz-box-sizing: content-box;
   box-sizing: content-box;
 }
-input[type="search"]::-webkit-search-decoration {
+input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
   -webkit-appearance: none;
 }
 textarea {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 97700e87a..f71a05e04 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -18,7 +18,7 @@ button,input{*overflow:visible;line-height:normal;}
 button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
 button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
 input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
-input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}
+input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
 textarea{overflow:auto;vertical-align:top;}
 body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#555555;background-color:#ffffff;}
 .container{width:940px;margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
diff --git a/lib/reset.less b/lib/reset.less
index 28638b6b3..8fe04d6d1 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -140,10 +140,11 @@ input[type="search"] { // Appearance in Safari/Chrome
      -moz-box-sizing: content-box;
           box-sizing: content-box;
 }
-input[type="search"]::-webkit-search-decoration {
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
   -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
 }
 textarea {
   overflow: auto; // Remove vertical scrollbar in IE6-9
   vertical-align: top; // Readability and alignment cross-browser
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 782c994060a984c10d73fdd3cc8e3fe33a2e4477 Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher 
Date: Fri, 20 Jan 2012 21:16:40 +0000
Subject: Remove global reset in favour of contextual reset.

Rather than having a partial reset with individual elements having
their styles built back up, only elements without replacement
styles have specific properties 'reset'.

This commit also includes: a correction to the font mixin arguments
used on forms (the output is now valid CSS); the removal of
`overflow-y:scroll` from the `html` element which is now known to
cause some problems for jQuery modal plugins in Firefox.
---
 bootstrap.css        | 146 +++++++++++++++++----------------------------------
 bootstrap.min.css    |  38 +++++++-------
 lib/forms.less       |  13 ++++-
 lib/reset.less       |  69 ++++++++----------------
 lib/scaffolding.less |   2 -
 lib/tables.less      |   9 ++++
 lib/type.less        |  31 ++++++++---
 7 files changed, 132 insertions(+), 176 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 959eb2421..b2aaece91 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,95 +6,8 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu 19 Jan 2012 22:27:04 GMT
+ * Date: Fri 20 Jan 2012 21:21:51 GMT
  */
-html, body {
-  margin: 0;
-  padding: 0;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-dd,
-dl,
-dt,
-li,
-ol,
-ul,
-fieldset,
-form,
-label,
-legend,
-button,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-weight: normal;
-  font-style: normal;
-  font-size: 100%;
-  line-height: 1;
-  font-family: inherit;
-}
-table {
-  max-width: 100%;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-ol, ul {
-  list-style: none;
-}
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-html {
-  overflow-y: scroll;
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-a:focus {
-  outline: thin dotted;
-}
-a:hover, a:active {
-  outline: 0;
-}
 article,
 aside,
 details,
@@ -115,6 +28,17 @@ audio, canvas, video {
 audio:not([controls]) {
   display: none;
 }
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+}
+a:focus {
+  outline: thin dotted;
+}
+a:hover, a:active {
+  outline: 0;
+}
 sub, sup {
   position: relative;
   font-size: 75%;
@@ -228,8 +152,6 @@ body {
   width: 100%;
 }
 a {
-  font-weight: inherit;
-  line-height: inherit;
   color: #0088cc;
   text-decoration: none;
 }
@@ -322,7 +244,7 @@ a:hover {
   margin-left: 900px;
 }
 p {
-  margin-bottom: 9px;
+  margin: 0 0 9px;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   line-height: 18px;
@@ -337,6 +259,7 @@ h3,
 h4,
 h5,
 h6 {
+  margin: 0;
   font-weight: bold;
   color: #333333;
   text-rendering: optimizelegibility;
@@ -347,6 +270,7 @@ h3 small,
 h4 small,
 h5 small,
 h6 small {
+  font-weight: normal;
   color: #999999;
 }
 h1 {
@@ -388,6 +312,7 @@ h6 {
   text-transform: uppercase;
 }
 ul, ol {
+  padding: 0;
   margin: 0 0 9px 25px;
 }
 ul ul,
@@ -428,13 +353,10 @@ hr {
   border-bottom: 1px solid #fff;
 }
 strong {
-  font-style: inherit;
   font-weight: bold;
 }
 em {
   font-style: italic;
-  font-weight: inherit;
-  line-height: inherit;
 }
 .muted {
   color: #999999;
@@ -446,8 +368,8 @@ abbr {
   cursor: help;
 }
 blockquote {
-  padding-left: 15px;
-  margin-bottom: 18px;
+  padding: 0 0 0 15px;
+  margin: 0 0 18px;
   border-left: 5px solid #eee;
 }
 blockquote p {
@@ -474,10 +396,17 @@ blockquote.pull-right {
 blockquote.pull-right p, blockquote.pull-right small {
   text-align: right;
 }
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
 address {
   display: block;
   margin-bottom: 18px;
   line-height: 18px;
+  font-style: normal;
 }
 code, pre {
   padding: 0 3px 2px;
@@ -515,26 +444,40 @@ pre code {
   padding: 0;
   background-color: transparent;
 }
+small {
+  font-size: 100%;
+}
+cite {
+  font-style: normal;
+}
 form {
-  margin-bottom: 18px;
+  margin: 0 0 18px;
+}
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
 }
 legend {
   display: block;
   width: 100%;
+  padding: 0;
   margin-bottom: 27px;
   font-size: 19.5px;
   line-height: 36px;
   color: #333333;
+  border: 0;
   border-bottom: 1px solid #eee;
   -webkit-margin-collapse: separate;
 }
 label,
 input,
+button,
 select,
 textarea {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: normal;
-  font-weight: 13px;
+  font-size: 13px;
+  font-weight: normal;
   line-height: 18px;
 }
 label {
@@ -967,6 +910,11 @@ input:invalid:focus, textarea:invalid:focus, select:invalid:focus {
 .form-horizontal .form-actions {
   padding-left: 160px;
 }
+table {
+  max-width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
 .table {
   width: 100%;
   margin-bottom: 18px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index f71a05e04..d709e87a9 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -1,14 +1,9 @@
-html,body{margin:0;padding:0;}
-h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;}
-table{max-width:100%;border-collapse:collapse;border-spacing:0;}
-ol,ul{list-style:none;}
-q:before,q:after,blockquote:before,blockquote:after{content:"";}
-html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
-a:focus{outline:thin dotted;}
-a:hover,a:active{outline:0;}
 article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
 audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
 audio:not([controls]){display:none;}
+html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted;}
+a:hover,a:active{outline:0;}
 sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
 sup{top:-0.5em;}
 sub{bottom:-0.25em;}
@@ -31,7 +26,7 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
 .sidebar-left .fluid-sidebar{float:left;margin-left:-240px;}
 .sidebar-right .fluid-sidebar{float:right;margin-right:-240px;}
 .fluid-content{float:left;width:100%;}
-a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
+a{color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
 .row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
 .row:after{clear:both;}
 [class*="span"]{float:left;margin-left:20px;}
@@ -58,8 +53,8 @@ a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:
 .offset9{margin-left:740px;}
 .offset10{margin-left:820px;}
 .offset11{margin-left:900px;}
-p{margin-bottom:9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
-h1,h2,h3,h4,h5,h6{font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#999999;}
+p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
+h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;}
 h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}
 h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}
 h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
@@ -67,7 +62,7 @@ h4,h5,h6{line-height:18px;}
 h4{font-size:14px;}h4 small{font-size:12px;}
 h5{font-size:12px;}
 h6{font-size:11px;color:#999999;text-transform:uppercase;}
-ul,ol{margin:0 0 9px 25px;}
+ul,ol{padding:0;margin:0 0 9px 25px;}
 ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
 ul{list-style:disc;}
 ol{list-style:decimal;}
@@ -78,21 +73,25 @@ dt,dd{line-height:18px;}
 dt{font-weight:bold;}
 dd{margin-left:9px;}
 hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #fff;}
-strong{font-style:inherit;font-weight:bold;}
-em{font-style:italic;font-weight:inherit;line-height:inherit;}
+strong{font-weight:bold;}
+em{font-style:italic;}
 .muted{color:#999999;}
 abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;}
-blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
+blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
 blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
 blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
-address{display:block;margin-bottom:18px;line-height:18px;}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
 code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 code{padding:1px 3px;background-color:#fee9cc;}
 pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
 pre code{padding:0;background-color:transparent;}
-form{margin-bottom:18px;}
-legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
-label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;}
+small{font-size:100%;}
+cite{font-style:normal;}
+form{margin:0 0 18px;}
+fieldset{padding:0;margin:0;border:0;}
+legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
+label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
 input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
@@ -176,6 +175,7 @@ input:invalid,textarea:invalid,select:invalid{color:#b94a48;border-color:#ee5f5b
 .form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
 .form-horizontal .controls{margin-left:160px;}
 .form-horizontal .form-actions{padding-left:160px;}
+table{max-width:100%;border-collapse:collapse;border-spacing:0;}
 .table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;}
 .table th{font-weight:bold;vertical-align:bottom;}
 .table td{vertical-align:top;}
diff --git a/lib/forms.less b/lib/forms.less
index e956b0046..0cc7f2035 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -8,17 +8,25 @@
 
 // Make all forms have space below them
 form {
-  margin-bottom: @baseLineHeight;
+  margin: 0 0 @baseLineHeight;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
 }
 
 // Groups of fields with labels on top (legends)
 legend {
   display: block;
   width: 100%;
+  padding: 0;
   margin-bottom: @baseLineHeight * 1.5;
   font-size: @baseFontSize * 1.5;
   line-height: @baseLineHeight * 2;
   color: @grayDark;
+  border: 0;
   border-bottom: 1px solid #eee;
   -webkit-margin-collapse: separate;
 }
@@ -26,9 +34,10 @@ legend {
 // Set font for forms
 label,
 input,
+button,
 select,
 textarea {
-  #font > .sans-serif(normal,@baseFontSize,@baseLineHeight);
+  #font > .sans-serif(@baseFontSize,normal,@baseLineHeight);
 }
 
 // Identify controls by their labels
diff --git a/lib/reset.less b/lib/reset.less
index 8fe04d6d1..31e7160f2 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -1,50 +1,10 @@
 // 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).
+// Adapted from Normalize.css http://github.com/necolas/normalize.css
 // ------------------------------------------------------------------------
 
-
-// ERIC MEYER RESET
-// --------------------------------------------------
-
-html, body { margin: 0; padding: 0; }
-h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; }
-table {
-  max-width: 100%;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-ol, ul { list-style: none; }
-q:before, q:after, blockquote:before, blockquote:after { content: ""; }
-
-
-// Normalize.css
-// Pulling in select resets form the normalize.css project
-// --------------------------------------------------
-
 // Display in IE6-9 and FF3
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
-html {
-  overflow-y: scroll;
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-// Focus states
-a:focus {
-  outline: thin dotted;
-}
-// Hover & Active
-a:hover,
-a:active {
-  outline: 0;
-}
 
-// Display in IE6-9 and FF3
-// -------------------------
-// Source: http://github.com/necolas/normalize.css
 article,
 aside,
 details,
@@ -60,7 +20,7 @@ section {
 
 // Display block in IE6-9 and FF3
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 audio,
 canvas,
 video {
@@ -71,14 +31,32 @@ video {
 
 // Prevents modern browsers from displaying 'audio' without controls
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 audio:not([controls]) {
     display: none;
 }
 
+// Base settings
+// -------------------------
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+// Focus states
+a:focus {
+  outline: thin dotted;
+}
+// Hover & Active
+a:hover,
+a:active {
+  outline: 0;
+}
+
 // Prevents sub and sup affecting line-height in all browsers
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 sub,
 sup {
   position: relative;
@@ -95,7 +73,7 @@ sub {
 
 // Img border in a's and image quality
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 img {
   max-width: 100%;
   height: auto;
@@ -105,7 +83,6 @@ img {
 
 // Forms
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
 
 // Font size in all browsers, margin changes, misc consistency
 button,
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index a0d54a886..d6fac06f0 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -60,8 +60,6 @@ body {
 
 // Links
 a {
-  font-weight: inherit;
-  line-height: inherit;
   color: @linkColor;
   text-decoration: none;
   &:hover {
diff --git a/lib/tables.less b/lib/tables.less
index 29e1e2d46..98b2b9f92 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -4,6 +4,15 @@
 // ----------------------------------------
 
 
+// BASE TABLES
+// -----------------
+
+table {
+  max-width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
 // BASELINE STYLES
 // ---------------
 
diff --git a/lib/type.less b/lib/type.less
index 707d2215d..e2049fb71 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -7,7 +7,7 @@
 // ---------
 
 p {
-  margin-bottom: @baseLineHeight / 2;
+  margin: 0 0 @baseLineHeight / 2;
   font-family: @baseFontFamily;
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
@@ -17,15 +17,16 @@ p {
   }
 }
 
-
 // HEADINGS
 // --------
 
 h1, h2, h3, h4, h5, h6 {
+  margin: 0;
   font-weight: bold;
   color: @grayDark;
   text-rendering: optimizelegibility; // Fix the character spacing for headings
   small {
+    font-weight: normal;
     color: @grayLight;
   }
 }
@@ -74,6 +75,7 @@ h6 {
 
 // Unordered and Ordered lists
 ul, ol {
+  padding: 0;
   margin: 0 0 @baseLineHeight / 2 25px;
 }
 ul ul,
@@ -124,13 +126,10 @@ hr {
 
 // Emphasis
 strong {
-  font-style: inherit;
   font-weight: bold;
 }
 em {
   font-style: italic;
-  font-weight: inherit;
-  line-height: inherit;
 }
 .muted {
   color: @grayLight;
@@ -146,8 +145,8 @@ abbr {
 
 // Blockquotes
 blockquote {
-  padding-left: 15px;
-  margin-bottom: @baseLineHeight;
+  padding: 0 0 0 15px;
+  margin: 0 0 @baseLineHeight;
   border-left: 5px solid #eee;
   p {
     margin-bottom: 0;
@@ -176,11 +175,19 @@ blockquote {
   }
 }
 
+q:before,
+q:after,
+blockquote:before, 
+blockquote:after {
+  content: "";
+}
+
 // Addresses
 address {
   display: block;
   margin-bottom: @baseLineHeight;
   line-height: @baseLineHeight;
+  font-style: normal;
 }
 
 // Inline and block code styles
@@ -220,4 +227,12 @@ pre {
     padding: 0;
     background-color: transparent;
   }
-}
\ No newline at end of file
+}
+
+small {
+  font-size: 100%;
+}
+
+cite {
+  font-style: normal;
+}
-- 
cgit v1.2.3


From 93c81522164421a03a9093502dae8125aa8b5584 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Fri, 20 Jan 2012 13:42:10 -0800
Subject: only prevent default if getting data-href

---
 js/bootstrap-collapse.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index 2521b7c7a..9278f66d0 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -125,9 +125,8 @@
   $(function () {
     $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
       var $this = $(this)
-        , target = $this.attr('data-target') || $this.attr('href')
+        , target = $this.attr('data-target') || e.preventDefault() || $this.attr('href')
         , option = $(target).data('collapse') ? 'toggle' : $this.data()
-      e.preventDefault()
       $(target).collapse(option)
     })
   })
-- 
cgit v1.2.3


From 3ed836b19888215fe5ad9539898502d203712021 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Fri, 20 Jan 2012 13:50:36 -0800
Subject: should check for alert class not alertmessage

---
 js/bootstrap-alert.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js
index 96b9786aa..d6d2108f9 100644
--- a/js/bootstrap-alert.js
+++ b/js/bootstrap-alert.js
@@ -43,13 +43,12 @@
 
       e && e.preventDefault()
 
-      $parent.length || ($parent = $this.hasClass('alert-message') ? $this : $this.parent())
+      $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
 
       $parent.removeClass('in')
 
       function removeElement() {
         $parent.remove()
-
         $parent.trigger('closed')
       }
 
-- 
cgit v1.2.3


From 7444310c4d0a2f34c7cec66216fdf95d67a0e74d Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Fri, 20 Jan 2012 20:05:16 -0800
Subject: only prevent default of links in sections

---
 docs/assets/js/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 0e14a5350..ba5a26947 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -38,7 +38,7 @@ $(function(){
   // it's merely here to prevent button clicks form taking you
   // away from your spot on page!!
 
-  $('[href^=#]').click(function (e) {
+  $('section [href^=#]').click(function (e) {
     e.preventDefault()
   })
 
-- 
cgit v1.2.3


From 719713ca8730d92d3510e6d4a7cc542fd57fdeef Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Fri, 20 Jan 2012 20:28:40 -0800
Subject: fix typo

---
 lib/tables.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tables.less b/lib/tables.less
index 29e1e2d46..5dad3e896 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -132,7 +132,7 @@ table {
 
 // TABLESORTER
 // -----------
-// Support for the tablesorter jQuerdy plugin
+// Support for the tablesorter jQuery plugin
 
 table {
   // Tablesorting styles w/ jQuery plugin
-- 
cgit v1.2.3


From 4a5867b18b0320b7365337c192b9e1bfe555f864 Mon Sep 17 00:00:00 2001
From: Burak Tuyan 
Date: Sat, 21 Jan 2012 23:52:39 +0200
Subject: Optimizing all PNG files, saving 60.02 KB in total without any
 quality lost. (Using PNGOUTWin 1.5.0.100, Xtreme strategy in compability
 mode)

---
 docs/assets/ico/bootstrap-apple-114x114.png         | Bin 6828 -> 5481 bytes
 docs/assets/ico/bootstrap-apple-57x57.png           | Bin 3923 -> 2798 bytes
 docs/assets/ico/bootstrap-apple-72x72.png           | Bin 4905 -> 3817 bytes
 docs/assets/img/bird.png                            | Bin 4434 -> 3092 bytes
 docs/assets/img/browsers.png                        | Bin 21805 -> 19776 bytes
 docs/assets/img/example-diagram-01.png              | Bin 1641 -> 486 bytes
 docs/assets/img/example-diagram-02.png              | Bin 1742 -> 564 bytes
 docs/assets/img/example-diagram-03.png              | Bin 1428 -> 369 bytes
 docs/assets/img/example-sites/bartop.png            | Bin 86214 -> 78189 bytes
 docs/assets/img/example-sites/fleetio.png           | Bin 47275 -> 41932 bytes
 docs/assets/img/example-sites/jshint.png            | Bin 8886 -> 7258 bytes
 docs/assets/img/example-sites/kippt.png             | Bin 57064 -> 52306 bytes
 docs/assets/img/example-sites/railwayjs.png         | Bin 34839 -> 30550 bytes
 docs/assets/img/example-sites/totalwireframe.png    | Bin 47095 -> 43364 bytes
 docs/assets/img/glyphicons-halflings-sprite.png     | Bin 9944 -> 5249 bytes
 docs/assets/img/glyphicons/glyphicons_009_magic.png | Bin 1426 -> 316 bytes
 docs/assets/img/glyphicons/glyphicons_042_group.png | Bin 1386 -> 305 bytes
 .../assets/img/glyphicons/glyphicons_079_podium.png | Bin 1328 -> 213 bytes
 .../img/glyphicons/glyphicons_082_roundabout.png    | Bin 1516 -> 345 bytes
 .../glyphicons/glyphicons_155_show_thumbnails.png   | Bin 1179 -> 117 bytes
 .../assets/img/glyphicons/glyphicons_163_iphone.png | Bin 1235 -> 172 bytes
 .../img/glyphicons/glyphicons_214_resize_small.png  | Bin 1406 -> 301 bytes
 .../img/glyphicons/glyphicons_266_book_open.png     | Bin 1405 -> 292 bytes
 docs/assets/img/grid-18px-masked.png                | Bin 1621 -> 405 bytes
 docs/assets/img/grid-18px.png                       | Bin 1118 -> 166 bytes
 docs/assets/img/icon-css3.png                       | Bin 1145 -> 370 bytes
 docs/assets/img/icon-github.png                     | Bin 1191 -> 312 bytes
 docs/assets/img/icon-html5.png                      | Bin 1230 -> 452 bytes
 docs/assets/img/icon-twitter.png                    | Bin 1096 -> 264 bytes
 docs/assets/img/less-logo-large.png                 | Bin 13831 -> 13078 bytes
 docs/assets/img/less-small.png                      | Bin 2235 -> 1181 bytes
 docs/assets/img/responsive-illustrations.png        | Bin 2249 -> 1077 bytes
 32 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/assets/ico/bootstrap-apple-114x114.png b/docs/assets/ico/bootstrap-apple-114x114.png
index c434d9713..4e6df51f4 100644
Binary files a/docs/assets/ico/bootstrap-apple-114x114.png and b/docs/assets/ico/bootstrap-apple-114x114.png differ
diff --git a/docs/assets/ico/bootstrap-apple-57x57.png b/docs/assets/ico/bootstrap-apple-57x57.png
index 13c2f7f37..030fdfbc9 100644
Binary files a/docs/assets/ico/bootstrap-apple-57x57.png and b/docs/assets/ico/bootstrap-apple-57x57.png differ
diff --git a/docs/assets/ico/bootstrap-apple-72x72.png b/docs/assets/ico/bootstrap-apple-72x72.png
index c4bfb622c..2ab0a1d0c 100644
Binary files a/docs/assets/ico/bootstrap-apple-72x72.png and b/docs/assets/ico/bootstrap-apple-72x72.png differ
diff --git a/docs/assets/img/bird.png b/docs/assets/img/bird.png
index f0e6fcb51..903e4c78e 100644
Binary files a/docs/assets/img/bird.png and b/docs/assets/img/bird.png differ
diff --git a/docs/assets/img/browsers.png b/docs/assets/img/browsers.png
index 369a7f838..73b668d91 100644
Binary files a/docs/assets/img/browsers.png and b/docs/assets/img/browsers.png differ
diff --git a/docs/assets/img/example-diagram-01.png b/docs/assets/img/example-diagram-01.png
index 0cece3b3e..2c07bf7ff 100644
Binary files a/docs/assets/img/example-diagram-01.png and b/docs/assets/img/example-diagram-01.png differ
diff --git a/docs/assets/img/example-diagram-02.png b/docs/assets/img/example-diagram-02.png
index 557edd311..416d157e6 100644
Binary files a/docs/assets/img/example-diagram-02.png and b/docs/assets/img/example-diagram-02.png differ
diff --git a/docs/assets/img/example-diagram-03.png b/docs/assets/img/example-diagram-03.png
index acf819d40..df13fd5fb 100644
Binary files a/docs/assets/img/example-diagram-03.png and b/docs/assets/img/example-diagram-03.png differ
diff --git a/docs/assets/img/example-sites/bartop.png b/docs/assets/img/example-sites/bartop.png
index 962851636..ab483aa67 100644
Binary files a/docs/assets/img/example-sites/bartop.png and b/docs/assets/img/example-sites/bartop.png differ
diff --git a/docs/assets/img/example-sites/fleetio.png b/docs/assets/img/example-sites/fleetio.png
index b48d6f010..8d975079b 100644
Binary files a/docs/assets/img/example-sites/fleetio.png and b/docs/assets/img/example-sites/fleetio.png differ
diff --git a/docs/assets/img/example-sites/jshint.png b/docs/assets/img/example-sites/jshint.png
index e532320a3..ac7086de1 100644
Binary files a/docs/assets/img/example-sites/jshint.png and b/docs/assets/img/example-sites/jshint.png differ
diff --git a/docs/assets/img/example-sites/kippt.png b/docs/assets/img/example-sites/kippt.png
index af15baa11..b2bb236d9 100644
Binary files a/docs/assets/img/example-sites/kippt.png and b/docs/assets/img/example-sites/kippt.png differ
diff --git a/docs/assets/img/example-sites/railwayjs.png b/docs/assets/img/example-sites/railwayjs.png
index 2480dd68e..23fb1cf3e 100644
Binary files a/docs/assets/img/example-sites/railwayjs.png and b/docs/assets/img/example-sites/railwayjs.png differ
diff --git a/docs/assets/img/example-sites/totalwireframe.png b/docs/assets/img/example-sites/totalwireframe.png
index b6256138e..66a4e8509 100644
Binary files a/docs/assets/img/example-sites/totalwireframe.png and b/docs/assets/img/example-sites/totalwireframe.png differ
diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png
index 525acee6d..2d783eefe 100644
Binary files a/docs/assets/img/glyphicons-halflings-sprite.png and b/docs/assets/img/glyphicons-halflings-sprite.png differ
diff --git a/docs/assets/img/glyphicons/glyphicons_009_magic.png b/docs/assets/img/glyphicons/glyphicons_009_magic.png
index ef048aaaa..f1cfb3785 100644
Binary files a/docs/assets/img/glyphicons/glyphicons_009_magic.png and b/docs/assets/img/glyphicons/glyphicons_009_magic.png differ
diff --git a/docs/assets/img/glyphicons/glyphicons_042_group.png b/docs/assets/img/glyphicons/glyphicons_042_group.png
index 29393dda1..be5c6f94b 100644
Binary files a/docs/assets/img/glyphicons/glyphicons_042_group.png and b/docs/assets/img/glyphicons/glyphicons_042_group.png differ
diff --git a/docs/assets/img/glyphicons/glyphicons_079_podium.png b/docs/assets/img/glyphicons/glyphicons_079_podium.png
index f55445451..20b7c99b9 100644
Binary files a/docs/assets/img/glyphicons/glyphicons_079_podium.png and b/docs/assets/img/glyphicons/glyphicons_079_podium.png differ
diff --git a/docs/assets/img/glyphicons/glyphicons_082_roundabout.png b/docs/assets/img/glyphicons/glyphicons_082_roundabout.png
index bbda0935c..e3a6487a0 100644
Binary files a/docs/assets/img/glyphicons/glyphicons_082_roundabout.png and b/docs/assets/img/glyphicons/glyphicons_082_roundabout.png differ
diff --git a/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png b/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png
index 1062f4844..751e3b718 100644
Binary files a/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png and b/docs/assets/img/glyphicons/glyphicons_155_show_thumbnails.png differ
diff --git a/docs/assets/img/glyphicons/glyphicons_163_iphone.png b/docs/assets/img/glyphicons/glyphicons_163_iphone.png
index bbb71dceb..926df7e55 100644
Binary files a/docs/assets/img/glyphicons/glyphicons_163_iphone.png and b/docs/assets/img/glyphicons/glyphicons_163_iphone.png differ
diff --git a/docs/assets/img/glyphicons/glyphicons_214_resize_small.png b/docs/assets/img/glyphicons/glyphicons_214_resize_small.png
index 5ecaa72b2..707d9e03e 100644
Binary files a/docs/assets/img/glyphicons/glyphicons_214_resize_small.png and b/docs/assets/img/glyphicons/glyphicons_214_resize_small.png differ
diff --git a/docs/assets/img/glyphicons/glyphicons_266_book_open.png b/docs/assets/img/glyphicons/glyphicons_266_book_open.png
index de084d472..ab04b4a1b 100644
Binary files a/docs/assets/img/glyphicons/glyphicons_266_book_open.png and b/docs/assets/img/glyphicons/glyphicons_266_book_open.png differ
diff --git a/docs/assets/img/grid-18px-masked.png b/docs/assets/img/grid-18px-masked.png
index e531d5bc4..1bc82b03a 100644
Binary files a/docs/assets/img/grid-18px-masked.png and b/docs/assets/img/grid-18px-masked.png differ
diff --git a/docs/assets/img/grid-18px.png b/docs/assets/img/grid-18px.png
index 68f9fe1b7..b2f88799b 100644
Binary files a/docs/assets/img/grid-18px.png and b/docs/assets/img/grid-18px.png differ
diff --git a/docs/assets/img/icon-css3.png b/docs/assets/img/icon-css3.png
index eb3651bac..58e107235 100644
Binary files a/docs/assets/img/icon-css3.png and b/docs/assets/img/icon-css3.png differ
diff --git a/docs/assets/img/icon-github.png b/docs/assets/img/icon-github.png
index 8afcce9cb..1a5fb781e 100644
Binary files a/docs/assets/img/icon-github.png and b/docs/assets/img/icon-github.png differ
diff --git a/docs/assets/img/icon-html5.png b/docs/assets/img/icon-html5.png
index e9066c672..1e8788313 100644
Binary files a/docs/assets/img/icon-html5.png and b/docs/assets/img/icon-html5.png differ
diff --git a/docs/assets/img/icon-twitter.png b/docs/assets/img/icon-twitter.png
index 98241d098..a4716545f 100644
Binary files a/docs/assets/img/icon-twitter.png and b/docs/assets/img/icon-twitter.png differ
diff --git a/docs/assets/img/less-logo-large.png b/docs/assets/img/less-logo-large.png
index 1a739b3e9..cb56637cb 100644
Binary files a/docs/assets/img/less-logo-large.png and b/docs/assets/img/less-logo-large.png differ
diff --git a/docs/assets/img/less-small.png b/docs/assets/img/less-small.png
index 763b847e8..93ea597cb 100644
Binary files a/docs/assets/img/less-small.png and b/docs/assets/img/less-small.png differ
diff --git a/docs/assets/img/responsive-illustrations.png b/docs/assets/img/responsive-illustrations.png
index c980da77a..6ca0f0788 100644
Binary files a/docs/assets/img/responsive-illustrations.png and b/docs/assets/img/responsive-illustrations.png differ
-- 
cgit v1.2.3


From e0238bfb08b67c089c1c609e9e68e5252e0ba992 Mon Sep 17 00:00:00 2001
From: Jon Stevens 
Date: Sat, 21 Jan 2012 15:24:06 -0800
Subject: clean up variable usage with colors

---
 lib/breadcrumbs.less   |  2 +-
 lib/button-groups.less |  2 +-
 lib/buttons.less       |  4 ++--
 lib/carousel.less      | 10 +++++-----
 lib/dropdowns.less     |  4 ++--
 lib/navbar.less        | 10 +++++-----
 lib/navs.less          | 22 +++++++++++-----------
 lib/tables.less        |  4 ++--
 lib/tooltip.less       |  2 +-
 lib/type.less          |  6 +++---
 lib/variables.less     |  5 +++--
 11 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/lib/breadcrumbs.less b/lib/breadcrumbs.less
index 2fa9921ac..19b8081e1 100644
--- a/lib/breadcrumbs.less
+++ b/lib/breadcrumbs.less
@@ -4,7 +4,7 @@
 .breadcrumb {
   padding: 7px 14px;
   margin: 0 0 @baseLineHeight;
-  #gradient > .vertical(#ffffff, #f5f5f5);
+  #gradient > .vertical(@white, #f5f5f5);
   border: 1px solid #ddd;
   .border-radius(3px);
   .box-shadow(inset 0 1px 0 @white);
diff --git a/lib/button-groups.less b/lib/button-groups.less
index e9724ba8c..253469f88 100644
--- a/lib/button-groups.less
+++ b/lib/button-groups.less
@@ -110,7 +110,7 @@
 .info,
 .success {
   .caret {
-    border-top-color: #fff;
+    border-top-color: @white;
     .opacity(75);
   }
 }
diff --git a/lib/buttons.less b/lib/buttons.less
index e53dce7af..5da34a525 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -34,9 +34,9 @@
   padding: 5px 10px 6px;
   font-size: @baseFontSize;
   line-height: normal;
-  color: #333;
+  color: @grayDark;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
-  #gradient > .vertical-three-colors(#ffffff, #ffffff, 25%, darken(#ffffff, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
+  #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
   .border-radius(4px);
diff --git a/lib/carousel.less b/lib/carousel.less
index a9399ef63..1a18d44b6 100644
--- a/lib/carousel.less
+++ b/lib/carousel.less
@@ -70,7 +70,7 @@
   line-height: 30px;
   color: #ccc;
   text-align: center;
-  background: #999;
+  background: @grayLight;
   background: rgba(0,0,0,.5);
   .border-radius(20px);
 
@@ -82,9 +82,9 @@
 
   // Hover state
   &:hover {
-    color: #fff;
+    color: @white;
     text-decoration: none;
-    background: #333;
+    background: @grayDark;
     background: rgba(0,0,0,.75);
   }
 }
@@ -98,10 +98,10 @@
   right: 0;
   bottom: 0;
   padding: 10px 15px 5px;
-  background: #333;
+  background: @grayDark;
   background: rgba(0,0,0,.75);
 }
 .carousel-caption h4,
 .carousel-caption p {
-  color: #fff;
+  color: @white;
 }
diff --git a/lib/dropdowns.less b/lib/dropdowns.less
index 08054713c..40b4d7e87 100644
--- a/lib/dropdowns.less
+++ b/lib/dropdowns.less
@@ -14,7 +14,7 @@
   vertical-align: top;
   border-left:  4px solid transparent;
   border-right: 4px solid transparent;
-  border-top:   4px solid #000;
+  border-top:   4px solid @black;
   .opacity(30);
   content: "\2193";
 }
@@ -79,7 +79,7 @@
 .dropdown-menu li > a:hover,
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
-  color: #fff;
+  color: @white;
   text-decoration: none;
   background-color: @linkColor;
 }
diff --git a/lib/navbar.less b/lib/navbar.less
index 94bc65241..8064490f7 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -164,7 +164,7 @@
 .navbar .nav .active > a {
   color: @white;
   text-decoration: none;
-  background-color: #222;
+  background-color: @grayDarker;
   background-color: rgba(0,0,0,.5);
 }
 
@@ -174,7 +174,7 @@
   width: 1px;
   margin: 0 5px;
   overflow: hidden;
-  background-color: #222;
+  background-color: @grayDarker;
   border-right: 1px solid #444;
 }
 
@@ -209,7 +209,7 @@
     display: inline-block;
     border-left:   6px solid transparent;
     border-right:  6px solid transparent;
-    border-bottom: 6px solid #fff;
+    border-bottom: 6px solid @white;
     position: absolute;
     top: -6px;
     left: 10px;
@@ -219,7 +219,7 @@
 // Dropdown toggle caret
 .navbar .nav .dropdown-toggle .caret,
 .navbar .nav .open.dropdown .caret {
-  border-top-color: #fff;
+  border-top-color: @white;
 }
 .navbar .nav .active .caret {
   .opacity(100);
@@ -234,7 +234,7 @@
 
 // Dropdown link on hover
 .navbar .nav .active > .dropdown-toggle:hover {
-  color: #fff;
+  color: @white;
 }
 
 // Right aligned menus need alt position
diff --git a/lib/navs.less b/lib/navs.less
index 432ab3cbd..4db77af4f 100644
--- a/lib/navs.less
+++ b/lib/navs.less
@@ -18,7 +18,7 @@
 }
 .nav > li > a:hover {
   text-decoration: none;
-  background-color: #eee;
+  background-color: @grayLighter;
 }
 
 
@@ -97,7 +97,7 @@
   border: 1px solid transparent;
   .border-radius(4px 4px 0 0);
   &:hover {
-    border-color: #eee #eee #ddd;
+    border-color: @grayLighter @grayLighter #ddd;
   }
 }
 // Active state, and it's :hover to override normal :hover
@@ -201,13 +201,13 @@
 // -------------------------
 .tabs .active .dropdown-toggle .caret,
 .pills .active .dropdown-toggle .caret {
-  border-top-color: #333;
+  border-top-color: @grayDark;
 }
 
 // Active:hover dropdown links
 // -------------------------
 .nav > .dropdown.active > a:hover {
-  color: #000;
+  color: @black;
   cursor: pointer;
 }
 
@@ -216,20 +216,20 @@
 .tabs .open .dropdown-toggle,
 .pills .open .dropdown-toggle,
 .nav > .open.active > a:hover {
-  color: #fff;
-  background-color: #999;
-  border-color: #999;
+  color: @white;
+  background-color: @grayLight;
+  border-color: @grayLight;
 }
 .nav .open .caret,
 .nav .open.active .caret,
 .nav .open a:hover .caret {
-  border-top-color: #fff;
+  border-top-color: @white;
   .opacity(100);
 }
 
 // Dropdowns in stacked tabs
 .tabs.stacked .open > a:hover {
-  border-color: #999;
+  border-color: @grayLight;
 }
 
 
@@ -312,7 +312,7 @@
   .border-radius(4px 0 0 4px);
 }
 .tabs-left .tabs > li > a:hover {
-  border-color: #eee #ddd #eee #eee;
+  border-color: @grayLighter #ddd @grayLighter @grayLighter;
 }
 .tabs-left .tabs .active > a,
 .tabs-left .tabs .active > a:hover {
@@ -330,7 +330,7 @@
   .border-radius(0 4px 4px 0);
 }
 .tabs-right .tabs > li > a:hover {
-  border-color: #eee #eee #eee #ddd;
+  border-color: @grayLighter @grayLighter @grayLighter #ddd;
 }
 .tabs-right .tabs .active > a,
 .tabs-right .tabs .active > a:hover {
diff --git a/lib/tables.less b/lib/tables.less
index 5dad3e896..14e4ea44a 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -144,7 +144,7 @@ table {
       margin-top: 7px;
       border-width: 0 4px 4px;
       border-style: solid;
-      border-color: #000 transparent;
+      border-color: @black transparent;
       visibility: hidden;
     }
   }
@@ -174,7 +174,7 @@ table {
       border-bottom: none;
       border-left: 4px solid transparent;
       border-right: 4px solid transparent;
-      border-top: 4px solid #000;
+      border-top: 4px solid @black;
       visibility:visible;
       .box-shadow(none); //can't add boxshadow to downward facing arrow :(
       .opacity(60);
diff --git a/lib/tooltip.less b/lib/tooltip.less
index b21c6bb7a..5111a193f 100644
--- a/lib/tooltip.less
+++ b/lib/tooltip.less
@@ -22,7 +22,7 @@
 .tooltip-inner {
   max-width: 200px;
   padding: 3px 8px;
-  color: white;
+  color: @white;
   text-align: center;
   text-decoration: none;
   background-color: @black;
diff --git a/lib/type.less b/lib/type.less
index 707d2215d..a94a4956e 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -119,7 +119,7 @@ hr {
   margin: @baseLineHeight 0;
   border: 0;
   border-top: 1px solid #e5e5e5;
-  border-bottom: 1px solid #fff;
+  border-bottom: 1px solid @white;
 }
 
 // Emphasis
@@ -148,7 +148,7 @@ abbr {
 blockquote {
   padding-left: 15px;
   margin-bottom: @baseLineHeight;
-  border-left: 5px solid #eee;
+  border-left: 5px solid @grayLighter;
   p {
     margin-bottom: 0;
     #font > .shorthand(16px,300,@baseLineHeight * 1.25);
@@ -168,7 +168,7 @@ blockquote {
     padding-left: 0;
     padding-right: 15px;
     border-left: 0;
-    border-right: 5px solid #eee;
+    border-right: 5px solid @grayLighter;
     p,
     small {
       text-align: right;
diff --git a/lib/variables.less b/lib/variables.less
index 807a9ea0d..df0d2255d 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -13,6 +13,7 @@
 
 // Grays
 @black:                 #000;
+@grayDarker:			#222;
 @grayDark:              #333;
 @gray:                  #555;
 @grayLight:             #999;
@@ -65,7 +66,7 @@
 
 // Navbar
 @navBarHeight:                    40px;
-@navbarBackground:                #222;
-@navbarBackgroundHighlight:       #333;
+@navbarBackground:                @grayDarker;
+@navbarBackgroundHighlight:       @grayDark;
 
 
-- 
cgit v1.2.3


From 2187e0838f522c102a8b5104970a9f129cdd001a Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sat, 21 Jan 2012 21:35:20 -0800
Subject: change scrollspy offset to be option + fix typo in scrollspy

---
 docs/javascript.html      | 23 +++++++++++++++++++++--
 js/bootstrap-scrollspy.js | 19 +++++++++++++------
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index fb854d281..1b8af662a 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -549,7 +549,7 @@ $('#myModal').on('hidden', function () {
               
      
             
      
           
      
-          
      
+          
      
             
      @fat
      
             
      
             Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
@@ -576,11 +576,30 @@ $('#myModal').on('hidden', function () {
           
      
           
      Using bootstrap-scrollspy.js
      
           
      Call the scrollspy via javascript:
      
-          
      $('#navbar').dropdown()
      
+          
      $('#navbar').scrollspy()
      
           
      Markup
      
           
      To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body).
           
      <body data-spy="scroll" >...</body>
      
            
      Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
+          
      Options
      
+          
      
         
           
      
             Label
      
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      offsetnumber10Pixels to offset from top when calculating position of scroll.
      
         
       
     
diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js
index 63195b4bd..5049bfdf9 100644
--- a/js/bootstrap-scrollspy.js
+++ b/js/bootstrap-scrollspy.js
@@ -24,15 +24,14 @@
   /* SCROLLSPY CLASS DEFINITION
    * ========================== */
 
-  function ScrollSpy( element ) {
+  function ScrollSpy( element, options) {
     var process = $.proxy(this.process, this)
-
+    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
     this.$scrollElement = $(element).on('scroll.scroll.data-api', process)
     this.selector = (this.$scrollElement.attr('data-target')
       || this.$scrollElement.attr('href')
       || '') + ' .nav li > a'
     this.$body = $('body').on('click.scroll.data-api', this.selector, process)
-
     this.refresh()
     this.process()
   }
@@ -55,7 +54,7 @@
       }
 
     , process: function () {
-        var scrollTop = this.$scrollElement.scrollTop() + 10
+        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
           , offsets = this.offsets
           , targets = this.targets
           , activeTarget = this.activeTarget
@@ -98,17 +97,25 @@
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('scrollspy')
-      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this)))
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
 
   $.fn.scrollspy.Constructor = ScrollSpy
 
+  $.fn.scrollspy.defaults = {
+    offset: 10
+  }
+
 
  /* SCROLLSPY DATA-API
   * ============== */
 
-  $(function () { $('[data-spy="scroll"]').scrollspy() })
+  $(function () {
+    var $spy = $('[data-spy="scroll"]')
+    $spy.scrollspy($spy.data())
+  })
 
 }( window.jQuery )
\ No newline at end of file
-- 
cgit v1.2.3


From 4fe11342d049f708c3416e5b29fa3ed5bfc3b393 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sat, 21 Jan 2012 21:46:47 -0800
Subject: make case lookahead case insensitive

---
 js/bootstrap-typeahead.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index b4957c3f6..16539fefb 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -35,7 +35,8 @@
     constructor: Typeahead
 
   , matcher: function (item, query) {
-      return ~item.indexOf(query)
+      // ;_; http://jsperf.com/asdfdfasdfa
+      return ~item.toLowerCase().indexOf(query.toLowerCase())
     }
 
   , select: function () {
-- 
cgit v1.2.3


From 6e490628d1be1a165d95ecf9817fdc7070069947 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sat, 21 Jan 2012 22:06:36 -0800
Subject: more efficient matcher + bold matched query in item

---
 js/bootstrap-typeahead.js | 50 ++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 16539fefb..b8ff5aab0 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -36,7 +36,7 @@
 
   , matcher: function (item, query) {
       // ;_; http://jsperf.com/asdfdfasdfa
-      return ~item.toLowerCase().indexOf(query.toLowerCase())
+      return ~item.toLowerCase().indexOf(query)
     }
 
   , select: function () {
@@ -67,16 +67,20 @@
     }
 
   , lookup: function (event) {
-      var query = this.$element.val()
-        , that = this
+      var that = this
         , items
+        , q
+
+      this.query = this.$element.val()
 
-      if (!query) {
+      if (!this.query) {
         return this.shown ? this.hide() : this
       }
 
+      q = this.query.toLowerCase()
+
       items = this.data.filter(function (item) {
-        if (that.matcher(item, query)) return item
+        if (that.matcher(item, q)) return item
       })
 
       if (!items.length) {
@@ -88,10 +92,15 @@
 
   , render: function (items) {
       var that = this
+        , QUERY = new RegExp('(' + this.query + ')', 'ig')
 
       items = $(items).map(function (i, item) {
         i = $(that.options.item).attr('data-value', item)
-        i.find('a').text(item)
+
+        i.find('a').html(item.replace(QUERY, function ($1, match) {
+          return '' + match + ''
+        }))
+
         return i[0]
       })
 
@@ -122,6 +131,21 @@
       prev.addClass('active')
     }
 
+  , listen: function () {
+      this.$element
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      if ($.browser.webkit || $.browser.msie) {
+        this.$element.on('keydown', $.proxy(this.keypress, this))
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+    }
+
   , keyup: function (e) {
       e.stopPropagation()
       e.preventDefault()
@@ -188,20 +212,6 @@
       $(e.currentTarget).addClass('active')
     }
 
-  , listen: function () {
-      this.$element
-        .on('blur',     $.proxy(this.blur, this))
-        .on('keypress', $.proxy(this.keypress, this))
-        .on('keyup',    $.proxy(this.keyup, this))
-
-      if ($.browser.webkit || $.browser.msie) {
-        this.$element.on('keydown', $.proxy(this.keypress, this))
-      }
-
-      this.$menu
-        .on('click', $.proxy(this.click, this))
-        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
-    }
   }
 
 
-- 
cgit v1.2.3


From 0f2dd75c975b56f082b82a464065c3b2ccc7af86 Mon Sep 17 00:00:00 2001
From: Jon Stevens 
Date: Sat, 21 Jan 2012 22:35:03 -0800
Subject: remove tabs

---
 lib/variables.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/variables.less b/lib/variables.less
index df0d2255d..0a67521df 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -13,7 +13,7 @@
 
 // Grays
 @black:                 #000;
-@grayDarker:			#222;
+@grayDarker:            #222;
 @grayDark:              #333;
 @gray:                  #555;
 @grayLight:             #999;
-- 
cgit v1.2.3


From 373a54187ed5d1f5d00d725e6ef6b84d506f07a8 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sat, 21 Jan 2012 23:02:29 -0800
Subject: add ability to cycle carousel to a particular frame

---
 docs/javascript.html     |  2 ++
 js/bootstrap-carousel.js | 32 +++++++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index 1b8af662a..7f589de4c 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1323,6 +1323,8 @@ $('.myCarousel').carousel({
           
      Cycles through the carousel items from left to right.
      
           
      .carousel('pause')
      
           
      Stops the carousel from cycling through items.
      
+          
      .carousel(number)
      
+          
      Cycles the carousel to a particular frame (0 based, similar to an array).
      
           
      .carousel('prev')
      
           
      Cycles to the previous item.
      
           
      .carousel('next')
      
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index f2d5110a4..4e12e31b5 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -38,6 +38,27 @@
       return this
     }
 
+  , to: function (pos) {
+      var $active = this.$element.find('.active')
+        , children = $active.parent().children()
+        , activePos = children.index($active)
+        , that = this
+
+      if (pos > (children.length - 1) || pos < 0) return
+
+      if (this.sliding) {
+        return this.$element.one('slid', function () {
+          that.to(pos)
+        })
+      }
+
+      if (activePos == pos) {
+        return this.pause().cycle()
+      }
+
+      return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
+    }
+
   , pause: function () {
       clearInterval(this.interval)
       return this
@@ -53,9 +74,9 @@
       return this.slide('prev')
     }
 
-  , slide: function (type) {
+  , slide: function (type, next) {
       var $active = this.$element.find('.active')
-        , $next = $active[type]()
+        , $next = next || $active[type]()
         , isCycling = this.interval
         , direction = type == 'next' ? 'left' : 'right'
         , fallback  = type == 'next' ? 'first' : 'last'
@@ -71,8 +92,8 @@
         this.$element.trigger('slide')
         $active.removeClass('active')
         $next.addClass('active')
-        this.$element.trigger('slid')
         this.sliding = false
+        this.$element.trigger('slid')
       } else {
         $next.addClass(type)
         $next[0].offsetWidth // force reflow
@@ -82,8 +103,8 @@
         this.$element.one($.support.transition.end, function () {
           $next.removeClass([type, direction].join(' ')).addClass('active')
           $active.removeClass(['active', direction].join(' '))
-          that.$element.trigger('slid')
           that.sliding = false
+          setTimeout(function () { that.$element.trigger('slid') }, 0)
         })
       }
 
@@ -104,7 +125,8 @@
         , data = $this.data('carousel')
         , options = typeof option == 'object' && option
       if (!data) $this.data('carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'string' || (option = options.slide)) data[option]()
+      if (typeof option == 'number') data.to(option)
+      else if (typeof option == 'string' || (option = options.slide)) data[option]()
       else data.cycle()
     })
   }
-- 
cgit v1.2.3


From 6a9f169fd6cd2203dee3f6230cc78f5dbbeafdab Mon Sep 17 00:00:00 2001
From: Nicklas Ansman Giertz 
Date: Sun, 22 Jan 2012 12:06:59 +0100
Subject: Make the popove respect custom classes

---
 js/bootstrap-popover.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index e90899895..a0de0f08d 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -41,7 +41,7 @@
       $tip.find('.title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
       $tip.find('.content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
 
-      $tip[0].className = 'popover'
+      $tip.removeClass('fade top bottom left right in')
     }
 
   , hasContent: function () {
@@ -92,4 +92,4 @@
   , template: '
      '
   })
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
-- 
cgit v1.2.3


From 05fdd43e41bae02c8d4006c075b6360599b4467c Mon Sep 17 00:00:00 2001
From: Nicklas Ansman Giertz 
Date: Sun, 22 Jan 2012 12:32:37 +0100
Subject: Add testcase to popover

This test case verifies that custom classes are respected.
---
 js/tests/unit/bootstrap-popover.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/js/tests/unit/bootstrap-popover.js b/js/tests/unit/bootstrap-popover.js
index 9180c043e..462db8b3e 100644
--- a/js/tests/unit/bootstrap-popover.js
+++ b/js/tests/unit/bootstrap-popover.js
@@ -70,5 +70,24 @@ $(function () {
         ok(!$('.popover').length, 'popover was removed')
         $('#qunit-fixture').empty()
       })
+    
+      test("should respect custom classes", function() {
+        $.support.transition = false
+        var popover = $('@fat')
+          .appendTo('#qunit-fixture')
+          .popover({
+            title: 'Test'
+          , content: 'Test'
+          , template: '
      '
+          })
+        
+        popover.popover('show')
+        console.log(popover)
+        ok($('.popover').length, 'popover was inserted')
+        ok($('.popover').hasClass('foobar'), 'custom class is present')
 
+        popover.popover('hide')
+        ok(!$('.popover').length, 'popover was removed')
+        $('#qunit-fixture').empty()
+      })
 })
\ No newline at end of file
-- 
cgit v1.2.3


From 4882e6da2f887c1e8baad96f777b151882adaed8 Mon Sep 17 00:00:00 2001
From: Nicklas Ansman Giertz 
Date: Sun, 22 Jan 2012 12:33:30 +0100
Subject: Rename the tooltip test file

It had not been renamed when twipsys became tooltips.
---
 js/tests/unit/bootstrap-tooltip.js | 62 ++++++++++++++++++++++++++++++++++++++
 js/tests/unit/bootstrap-twipsy.js  | 62 --------------------------------------
 2 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 js/tests/unit/bootstrap-tooltip.js
 delete mode 100644 js/tests/unit/bootstrap-twipsy.js

diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
new file mode 100644
index 000000000..8543162c6
--- /dev/null
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -0,0 +1,62 @@
+$(function () {
+
+    module("bootstrap-tooltip")
+
+      test("should be defined on jquery object", function () {
+        var div = $("
      ")
+        ok(div.tooltip, 'popover method is defined')
+      })
+
+      test("should return element", function () {
+        var div = $("
      ")
+        ok(div.tooltip() == div, 'document.body returned')
+      })
+
+      test("should expose default settings", function () {
+        ok(!!$.fn.tooltip.defaults, 'defaults is defined')
+      })
+
+      test("should remove title attribute", function () {
+        var tooltip = $('').tooltip()
+        ok(!tooltip.attr('title'), 'title tag was removed')
+      })
+
+      test("should add data attribute for referencing original title", function () {
+        var tooltip = $('').tooltip()
+        equals(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
+      })
+
+      test("should place tooltips relative to placement option", function () {
+        $.support.transition = false
+        var tooltip = $('')
+          .appendTo('#qunit-fixture')
+          .tooltip({placement: 'bottom'})
+          .tooltip('show')
+
+        ok($(".tooltip").hasClass('fade bottom in'), 'has correct classes applied')
+        tooltip.tooltip('hide')
+      })
+
+      test("should always allow html entities", function () {
+        $.support.transition = false
+        var tooltip = $('')
+          .appendTo('#qunit-fixture')
+          .tooltip('show')
+
+        ok($('.tooltip b').length, 'b tag was inserted')
+        tooltip.tooltip('hide')
+        ok(!$(".tooltip").length, 'tooltip removed')
+      })
+
+      test("should respect custom classes", function () {
+        var tooltip = $('')
+          .appendTo('#qunit-fixture')
+          .tooltip({ template: '
      '})
+          .tooltip('show')
+
+        ok($('.tooltip').hasClass('some-class'), 'custom class is present')
+        tooltip.tooltip('hide')
+        ok(!$(".tooltip").length, 'tooltip removed')
+      })
+
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-twipsy.js b/js/tests/unit/bootstrap-twipsy.js
deleted file mode 100644
index 8543162c6..000000000
--- a/js/tests/unit/bootstrap-twipsy.js
+++ /dev/null
@@ -1,62 +0,0 @@
-$(function () {
-
-    module("bootstrap-tooltip")
-
-      test("should be defined on jquery object", function () {
-        var div = $("
      ")
-        ok(div.tooltip, 'popover method is defined')
-      })
-
-      test("should return element", function () {
-        var div = $("
      ")
-        ok(div.tooltip() == div, 'document.body returned')
-      })
-
-      test("should expose default settings", function () {
-        ok(!!$.fn.tooltip.defaults, 'defaults is defined')
-      })
-
-      test("should remove title attribute", function () {
-        var tooltip = $('').tooltip()
-        ok(!tooltip.attr('title'), 'title tag was removed')
-      })
-
-      test("should add data attribute for referencing original title", function () {
-        var tooltip = $('').tooltip()
-        equals(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
-      })
-
-      test("should place tooltips relative to placement option", function () {
-        $.support.transition = false
-        var tooltip = $('')
-          .appendTo('#qunit-fixture')
-          .tooltip({placement: 'bottom'})
-          .tooltip('show')
-
-        ok($(".tooltip").hasClass('fade bottom in'), 'has correct classes applied')
-        tooltip.tooltip('hide')
-      })
-
-      test("should always allow html entities", function () {
-        $.support.transition = false
-        var tooltip = $('')
-          .appendTo('#qunit-fixture')
-          .tooltip('show')
-
-        ok($('.tooltip b').length, 'b tag was inserted')
-        tooltip.tooltip('hide')
-        ok(!$(".tooltip").length, 'tooltip removed')
-      })
-
-      test("should respect custom classes", function () {
-        var tooltip = $('')
-          .appendTo('#qunit-fixture')
-          .tooltip({ template: '
      '})
-          .tooltip('show')
-
-        ok($('.tooltip').hasClass('some-class'), 'custom class is present')
-        tooltip.tooltip('hide')
-        ok(!$(".tooltip").length, 'tooltip removed')
-      })
-
-})
\ No newline at end of file
-- 
cgit v1.2.3


From c3625ebb238edbfc4b352a97b964727a919b8599 Mon Sep 17 00:00:00 2001
From: Chris Gunther 
Date: Sun, 22 Jan 2012 11:46:44 -0500
Subject: Move placement of ID in docs example for dropdowns

The ID specified by an href or data-target attribute should match the
li.dropdown, not the ul.dropdown-menu
---
 docs/javascript.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index 7f589de4c..9c7b21779 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -489,12 +489,12 @@ $('#myModal').on('hidden', function () {
 
       <ul class="nav pills">
   <li class="active"><a href="#">Regular link</a></li>
-  <li class="dropdown">
+  <li class="dropdown" id="menu1">
     <a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
       Dropdown
       <b class="caret"></b>
     </a>
-    <ul id="menu1" class="dropdown-menu">
+    <ul class="dropdown-menu">
       <li><a href="#">Action</a></li>
       <li><a href="#">Another action</a></li>
       <li><a href="#">Something else here</a></li>
-- 
cgit v1.2.3


From 88596797f061f97255bb7ed9442ac43a41787405 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 22 Jan 2012 12:19:22 -0800
Subject: rename tooltip test file

---
 js/tests/unit/bootstrap-tooltip.js | 62 ++++++++++++++++++++++++++++++++++++++
 js/tests/unit/bootstrap-twipsy.js  | 62 --------------------------------------
 2 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 js/tests/unit/bootstrap-tooltip.js
 delete mode 100644 js/tests/unit/bootstrap-twipsy.js

diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
new file mode 100644
index 000000000..8543162c6
--- /dev/null
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -0,0 +1,62 @@
+$(function () {
+
+    module("bootstrap-tooltip")
+
+      test("should be defined on jquery object", function () {
+        var div = $("
      ")
+        ok(div.tooltip, 'popover method is defined')
+      })
+
+      test("should return element", function () {
+        var div = $("
      ")
+        ok(div.tooltip() == div, 'document.body returned')
+      })
+
+      test("should expose default settings", function () {
+        ok(!!$.fn.tooltip.defaults, 'defaults is defined')
+      })
+
+      test("should remove title attribute", function () {
+        var tooltip = $('').tooltip()
+        ok(!tooltip.attr('title'), 'title tag was removed')
+      })
+
+      test("should add data attribute for referencing original title", function () {
+        var tooltip = $('').tooltip()
+        equals(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
+      })
+
+      test("should place tooltips relative to placement option", function () {
+        $.support.transition = false
+        var tooltip = $('')
+          .appendTo('#qunit-fixture')
+          .tooltip({placement: 'bottom'})
+          .tooltip('show')
+
+        ok($(".tooltip").hasClass('fade bottom in'), 'has correct classes applied')
+        tooltip.tooltip('hide')
+      })
+
+      test("should always allow html entities", function () {
+        $.support.transition = false
+        var tooltip = $('')
+          .appendTo('#qunit-fixture')
+          .tooltip('show')
+
+        ok($('.tooltip b').length, 'b tag was inserted')
+        tooltip.tooltip('hide')
+        ok(!$(".tooltip").length, 'tooltip removed')
+      })
+
+      test("should respect custom classes", function () {
+        var tooltip = $('')
+          .appendTo('#qunit-fixture')
+          .tooltip({ template: '
      '})
+          .tooltip('show')
+
+        ok($('.tooltip').hasClass('some-class'), 'custom class is present')
+        tooltip.tooltip('hide')
+        ok(!$(".tooltip").length, 'tooltip removed')
+      })
+
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-twipsy.js b/js/tests/unit/bootstrap-twipsy.js
deleted file mode 100644
index 8543162c6..000000000
--- a/js/tests/unit/bootstrap-twipsy.js
+++ /dev/null
@@ -1,62 +0,0 @@
-$(function () {
-
-    module("bootstrap-tooltip")
-
-      test("should be defined on jquery object", function () {
-        var div = $("
      ")
-        ok(div.tooltip, 'popover method is defined')
-      })
-
-      test("should return element", function () {
-        var div = $("
      ")
-        ok(div.tooltip() == div, 'document.body returned')
-      })
-
-      test("should expose default settings", function () {
-        ok(!!$.fn.tooltip.defaults, 'defaults is defined')
-      })
-
-      test("should remove title attribute", function () {
-        var tooltip = $('').tooltip()
-        ok(!tooltip.attr('title'), 'title tag was removed')
-      })
-
-      test("should add data attribute for referencing original title", function () {
-        var tooltip = $('').tooltip()
-        equals(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
-      })
-
-      test("should place tooltips relative to placement option", function () {
-        $.support.transition = false
-        var tooltip = $('')
-          .appendTo('#qunit-fixture')
-          .tooltip({placement: 'bottom'})
-          .tooltip('show')
-
-        ok($(".tooltip").hasClass('fade bottom in'), 'has correct classes applied')
-        tooltip.tooltip('hide')
-      })
-
-      test("should always allow html entities", function () {
-        $.support.transition = false
-        var tooltip = $('')
-          .appendTo('#qunit-fixture')
-          .tooltip('show')
-
-        ok($('.tooltip b').length, 'b tag was inserted')
-        tooltip.tooltip('hide')
-        ok(!$(".tooltip").length, 'tooltip removed')
-      })
-
-      test("should respect custom classes", function () {
-        var tooltip = $('')
-          .appendTo('#qunit-fixture')
-          .tooltip({ template: '
      '})
-          .tooltip('show')
-
-        ok($('.tooltip').hasClass('some-class'), 'custom class is present')
-        tooltip.tooltip('hide')
-        ok(!$(".tooltip").length, 'tooltip removed')
-      })
-
-})
\ No newline at end of file
-- 
cgit v1.2.3


From 0523c053a79430b3dab775fab2d572841f743c5a Mon Sep 17 00:00:00 2001
From: Olivier Laviale 
Date: Sun, 22 Jan 2012 21:45:20 +0100
Subject: Fixed typo

---
 docs/components.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 docs/components.html

diff --git a/docs/components.html b/docs/components.html
old mode 100644
new mode 100755
index 7d0593874..984e8c76d
--- a/docs/components.html
+++ b/docs/components.html
@@ -1128,7 +1128,7 @@
       
      Rewritten base class
      
       
      With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outter <div>.
      
       
      Single alert message
      
-      
      For a more durable component with less code, we've removed the differentiating look for block alerts, messages that com with more padding and typically more text. The class also has changed to .alert-block.
      
+      
      For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to .alert-block.
      
       
      
       
      Goes great with javascript
      
       
      Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.
      
-- 
cgit v1.2.3


From a583f055b382ae2f721e49dea61340257e1482d0 Mon Sep 17 00:00:00 2001
From: Olivier Laviale 
Date: Sun, 22 Jan 2012 22:32:16 +0100
Subject: Using variables rather than numeric values

---
 lib/scaffolding.less | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index a0d54a886..7ad8a7b16 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -24,9 +24,9 @@ body {
 // Fluid layouts (left aligned, with sidebar, min- & max-width content)
 .fluid-container {
   position: relative;
-  min-width: 940px;
-  padding-left: 20px;
-  padding-right: 20px;
+  min-width: @siteWidth;
+  padding-left: @gridGutterWidth;
+  padding-right: @gridGutterWidth;
   .clearfix();
 }
 
@@ -35,17 +35,17 @@ body {
   width: @fluidSidebarWidth;
   margin: 0 20px 18px;
 }
-.sidebar-left   { padding-left: @fluidSidebarWidth + 40; }
-.sidebar-right  { padding-right: @fluidSidebarWidth + 40; }
+.sidebar-left   { padding-left: @fluidSidebarWidth + @gridGutterWidth * 2; }
+.sidebar-right  { padding-right: @fluidSidebarWidth + @gridGutterWidth * 2; }
 
 // Float the sidebars accordingly
 .sidebar-left .fluid-sidebar {
   float: left;
-  margin-left: (@fluidSidebarWidth + 20) * -1;
+  margin-left: (@fluidSidebarWidth + @gridGutterWidth) * -1;
 }
 .sidebar-right .fluid-sidebar {
   float: right;
-  margin-right: (@fluidSidebarWidth + 20) * -1;
+  margin-right: (@fluidSidebarWidth + @gridGutterWidth) * -1;
 }
 
 // The main content area
-- 
cgit v1.2.3


From 155b72e8730e9b8badb5fa80c8d7f8990f10cc82 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 22 Jan 2012 20:02:56 -0800
Subject: share -> share-alt

---
 bootstrap.css      | 4 ++--
 bootstrap.min.css  | 2 +-
 docs/base-css.html | 2 +-
 lib/sprites.less   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 959eb2421..b27045169 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu 19 Jan 2012 22:27:04 GMT
+ * Date: Sun Jan 22 20:02:42 PST 2012
  */
 html, body {
   margin: 0;
@@ -1391,7 +1391,7 @@ i {
 .arrow-down {
   background-position: -312px -96px;
 }
-.share {
+.share-alt {
   background-position: -336px -96px;
 }
 .resize-full {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index f71a05e04..7d12bcc35 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -291,7 +291,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .arrow-right{background-position:-264px -96px;}
 .arrow-up{background-position:-288px -96px;}
 .arrow-down{background-position:-312px -96px;}
-.share{background-position:-336px -96px;}
+.share-alt{background-position:-336px -96px;}
 .resize-full{background-position:-360px -96px;}
 .resize-small{background-position:-384px -96px;}
 .plus{background-position:-408px -96px;}
diff --git a/docs/base-css.html b/docs/base-css.html
index fa60204a8..8ac913477 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1458,7 +1458,7 @@
         
         
         
-        
+        
         
         
         
diff --git a/lib/sprites.less b/lib/sprites.less
index aec08a5a2..4a49bb8b4 100644
--- a/lib/sprites.less
+++ b/lib/sprites.less
@@ -109,7 +109,7 @@ i {
 .arrow-right        { background-position: -264px -96px; }
 .arrow-up           { background-position: -288px -96px; }
 .arrow-down         { background-position: -312px -96px; }
-.share              { background-position: -336px -96px; }
+.share-alt          { background-position: -336px -96px; }
 .resize-full        { background-position: -360px -96px; }
 .resize-small       { background-position: -384px -96px; }
 .plus               { background-position: -408px -96px; }
-- 
cgit v1.2.3


From b8c0388f8af8ae93a514efaa352f63ecdffde279 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 22 Jan 2012 20:07:17 -0800
Subject: fix sans-serif order in forms.less and rebuild

---
 bootstrap.css     | 68 +++++++++++++++++++++++++++----------------------------
 bootstrap.min.css | 58 +++++++++++++++++++++++------------------------
 lib/forms.less    |  2 +-
 3 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index b27045169..fcfcf02f7 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Sun Jan 22 20:02:42 PST 2012
+ * Date: Sun Jan 22 20:06:46 PST 2012
  */
 html, body {
   margin: 0;
@@ -425,7 +425,7 @@ hr {
   margin: 18px 0;
   border: 0;
   border-top: 1px solid #e5e5e5;
-  border-bottom: 1px solid #fff;
+  border-bottom: 1px solid #ffffff;
 }
 strong {
   font-style: inherit;
@@ -448,7 +448,7 @@ abbr {
 blockquote {
   padding-left: 15px;
   margin-bottom: 18px;
-  border-left: 5px solid #eee;
+  border-left: 5px solid #eeeeee;
 }
 blockquote p {
   margin-bottom: 0;
@@ -469,7 +469,7 @@ blockquote.pull-right {
   padding-left: 0;
   padding-right: 15px;
   border-left: 0;
-  border-right: 5px solid #eee;
+  border-right: 5px solid #eeeeee;
 }
 blockquote.pull-right p, blockquote.pull-right small {
   text-align: right;
@@ -533,8 +533,8 @@ input,
 select,
 textarea {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: normal;
-  font-weight: 13px;
+  font-size: 13px;
+  font-weight: normal;
   line-height: 18px;
 }
 label {
@@ -1101,7 +1101,7 @@ table .header:after {
   margin-top: 7px;
   border-width: 0 4px 4px;
   border-style: solid;
-  border-color: #000 transparent;
+  border-color: #000000 transparent;
   visibility: hidden;
 }
 table .headerSortUp, table .headerSortDown {
@@ -1121,7 +1121,7 @@ table .headerSortUp:after {
   border-bottom: none;
   border-left: 4px solid transparent;
   border-right: 4px solid transparent;
-  border-top: 4px solid #000;
+  border-top: 4px solid #000000;
   visibility: visible;
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
@@ -1420,7 +1420,7 @@ i {
   vertical-align: top;
   border-left: 4px solid transparent;
   border-right: 4px solid transparent;
-  border-top: 4px solid #000;
+  border-top: 4px solid #000000;
   filter: alpha(opacity=30);
   -moz-opacity: 0.3;
   opacity: 0.3;
@@ -1483,7 +1483,7 @@ i {
   white-space: nowrap;
 }
 .dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
-  color: #fff;
+  color: #ffffff;
   text-decoration: none;
   background-color: #0088cc;
 }
@@ -1572,7 +1572,7 @@ i {
 }
 .nav > li > a:hover {
   text-decoration: none;
-  background-color: #eee;
+  background-color: #eeeeee;
 }
 .nav.list {
   padding-left: 14px;
@@ -1638,7 +1638,7 @@ i {
   border-radius: 4px 4px 0 0;
 }
 .tabs > li > a:hover {
-  border-color: #eee #eee #ddd;
+  border-color: #eeeeee #eeeeee #dddddd;
 }
 .tabs > .active > a, .tabs > .active > a:hover {
   color: #555555;
@@ -1712,25 +1712,25 @@ i {
   border-top-color: #005580;
 }
 .tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret {
-  border-top-color: #333;
+  border-top-color: #333333;
 }
 .nav > .dropdown.active > a:hover {
-  color: #000;
+  color: #000000;
   cursor: pointer;
 }
 .tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover {
-  color: #fff;
-  background-color: #999;
-  border-color: #999;
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
 }
 .nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
-  border-top-color: #fff;
+  border-top-color: #ffffff;
   filter: alpha(opacity=100);
   -moz-opacity: 1;
   opacity: 1;
 }
 .tabs.stacked .open > a:hover {
-  border-color: #999;
+  border-color: #999999;
 }
 .tabbable {
   *zoom: 1;
@@ -1790,7 +1790,7 @@ i {
   border-radius: 4px 0 0 4px;
 }
 .tabs-left .tabs > li > a:hover {
-  border-color: #eee #ddd #eee #eee;
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
 }
 .tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover {
   border-color: #ddd transparent #ddd #ddd;
@@ -1807,7 +1807,7 @@ i {
   border-radius: 0 4px 4px 0;
 }
 .tabs-right .tabs > li > a:hover {
-  border-color: #eee #eee #eee #ddd;
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
 }
 .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
@@ -1961,7 +1961,7 @@ i {
 .navbar .nav .active > a {
   color: #ffffff;
   text-decoration: none;
-  background-color: #222;
+  background-color: #222222;
   background-color: rgba(0, 0, 0, 0.5);
 }
 .navbar .vertical-divider {
@@ -1969,7 +1969,7 @@ i {
   width: 1px;
   margin: 0 5px;
   overflow: hidden;
-  background-color: #222;
+  background-color: #222222;
   border-right: 1px solid #444;
 }
 .navbar .nav.pull-right {
@@ -1998,13 +1998,13 @@ i {
   display: inline-block;
   border-left: 6px solid transparent;
   border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
+  border-bottom: 6px solid #ffffff;
   position: absolute;
   top: -6px;
   left: 10px;
 }
 .navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
-  border-top-color: #fff;
+  border-top-color: #ffffff;
 }
 .navbar .nav .active .caret {
   filter: alpha(opacity=100);
@@ -2015,7 +2015,7 @@ i {
   background-color: transparent;
 }
 .navbar .nav .active > .dropdown-toggle:hover {
-  color: #fff;
+  color: #ffffff;
 }
 .navbar .nav.pull-right .dropdown-menu {
   right: 0;
@@ -2299,7 +2299,7 @@ i {
 .tooltip-inner {
   max-width: 200px;
   padding: 3px 8px;
-  color: white;
+  color: #ffffff;
   text-align: center;
   text-decoration: none;
   background-color: #000000;
@@ -2460,7 +2460,7 @@ i {
   padding: 5px 10px 6px;
   font-size: 13px;
   line-height: normal;
-  color: #333;
+  color: #333333;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
   background-color: #e6e6e6;
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
@@ -2650,7 +2650,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 .danger .caret,
 .info .caret,
 .success .caret {
-  border-top-color: #fff;
+  border-top-color: #ffffff;
   filter: alpha(opacity=75);
   -moz-opacity: 0.75;
   opacity: 0.75;
@@ -2993,7 +2993,7 @@ a.thumbnail:hover {
   line-height: 30px;
   color: #ccc;
   text-align: center;
-  background: #999;
+  background: #999999;
   background: rgba(0, 0, 0, 0.5);
   -webkit-border-radius: 20px;
   -moz-border-radius: 20px;
@@ -3004,9 +3004,9 @@ a.thumbnail:hover {
   right: 15px;
 }
 .carousel-control:hover {
-  color: #fff;
+  color: #ffffff;
   text-decoration: none;
-  background: #333;
+  background: #333333;
   background: rgba(0, 0, 0, 0.75);
 }
 .carousel-caption {
@@ -3015,11 +3015,11 @@ a.thumbnail:hover {
   right: 0;
   bottom: 0;
   padding: 10px 15px 5px;
-  background: #333;
+  background: #333333;
   background: rgba(0, 0, 0, 0.75);
 }
 .carousel-caption h4, .carousel-caption p {
-  color: #fff;
+  color: #ffffff;
 }
 .pull-right {
   float: right;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 7d12bcc35..bb5745669 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -77,14 +77,14 @@ dl{margin-bottom:18px;}
 dt,dd{line-height:18px;}
 dt{font-weight:bold;}
 dd{margin-left:9px;}
-hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #fff;}
+hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;}
 strong{font-style:inherit;font-weight:bold;}
 em{font-style:italic;font-weight:inherit;line-height:inherit;}
 .muted{color:#999999;}
 abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;}
-blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
+blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
 blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
-blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
+blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
 address{display:block;margin-bottom:18px;line-height:18px;}
 code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 code{padding:1px 3px;background-color:#fee9cc;}
@@ -92,7 +92,7 @@ pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;b
 pre code{padding:0;background-color:transparent;}
 form{margin-bottom:18px;}
 legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
-label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;}
+label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
 input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
@@ -201,11 +201,11 @@ table .span9{float:none;width:684px;margin-left:0;}
 table .span10{float:none;width:764px;margin-left:0;}
 table .span11{float:none;width:844px;margin-left:0;}
 table .span12{float:none;width:924px;margin-left:0;}
-table .header{cursor:pointer;}table .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;}
+table .header{cursor:pointer;}table .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000000 transparent;visibility:hidden;}
 table .headerSortUp,table .headerSortDown{background-color:#f7f7f9;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);}
 table .header:hover:after{visibility:visible;}
 table .headerSortDown:after,table .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;}
-table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;}
+table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;}
 i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
 .glass{background-position:0 0;}
 .music{background-position:-24px 0;}
@@ -298,12 +298,12 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .minus{background-position:-432px -96px;}
 .asterisk{background-position:-456px -96px;}
 .dropdown{position:relative;}
-.caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;content:"\2193";}
+.caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;content:"\2193";}
 .dropdown .caret{margin-top:8px;margin-left:2px;*margin-top:7px;}
 .dropdown:hover .caret,.open.dropdown .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
 .dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
 .dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
-.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;text-decoration:none;background-color:#0088cc;}
+.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;}
 .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
 .dropdown.open .dropdown-menu{display:block;}
 .typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
@@ -313,7 +313,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .close{float:right;font-size:20px;font-weight:bold;line-height:12px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;cursor:pointer;}
 .nav{margin-left:0;margin-bottom:18px;list-style:none;}
 .nav>li>a{display:block;}
-.nav>li>a:hover{text-decoration:none;background-color:#eee;}
+.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;}
 .nav.list{padding-left:14px;padding-right:14px;margin-bottom:0;}
 .nav.list>li>a,.nav.list .nav-header{display:block;padding:3px 15px;margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
 .nav.list .nav-header{font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-transform:uppercase;}
@@ -325,7 +325,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tabs>li>a,.pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
 .tabs{border-bottom:1px solid #ddd;}
 .tabs>li{margin-bottom:-1px;}
-.tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{border-color:#eee #eee #ddd;}
+.tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
 .tabs>.active>a,.tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
 .pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
 .pills .active>a,.pills .active>a:hover{color:#ffffff;background-color:#0088cc;}
@@ -342,11 +342,11 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;}
 .tabs .dropdown-toggle:hover .caret,.pills .dropdown-toggle:hover .caret{border-top-color:#005580;}
-.tabs .active .dropdown-toggle .caret,.pills .active .dropdown-toggle .caret{border-top-color:#333;}
-.nav>.dropdown.active>a:hover{color:#000;cursor:pointer;}
-.tabs .open .dropdown-toggle,.pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#fff;background-color:#999;border-color:#999;}
-.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#fff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
-.tabs.stacked .open>a:hover{border-color:#999;}
+.tabs .active .dropdown-toggle .caret,.pills .active .dropdown-toggle .caret{border-top-color:#333333;}
+.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;}
+.tabs .open .dropdown-toggle,.pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;}
+.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
+.tabs.stacked .open>a:hover{border-color:#999999;}
 .tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";}
 .tabbable:after{clear:both;}
 .tabs-below .tabs,.tabs-right .tabs,.tabs-left .tabs{border-bottom:0;}
@@ -360,11 +360,11 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tabs-left .tabs>li>a,.tabs-right .tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;}
 .tabs-left .tabs{float:left;margin-right:19px;border-right:1px solid #ddd;}
 .tabs-left .tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
-.tabs-left .tabs>li>a:hover{border-color:#eee #ddd #eee #eee;}
+.tabs-left .tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;}
 .tabs-left .tabs .active>a,.tabs-left .tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;}
 .tabs-right .tabs{float:right;margin-left:19px;border-left:1px solid #ddd;}
 .tabs-right .tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
-.tabs-right .tabs>li>a:hover{border-color:#eee #eee #eee #ddd;}
+.tabs-right .tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
 .tabs-right .tabs .active>a,.tabs-right .tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;}
 .navbar{overflow:visible;}
 .navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
@@ -386,15 +386,15 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar .nav>li{display:block;float:left;}
 .navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
 .navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;}
-.navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
-.navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;}
+.navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#222222;background-color:rgba(0, 0, 0, 0.5);}
+.navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222222;border-right:1px solid #444;}
 .navbar .nav.pull-right{margin-left:10px;margin-right:0;}
 .navbar .dropdown-menu{top:41px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
-.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:10px;}
-.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#fff;}
+.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
+.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;}
 .navbar .nav .active .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
 .navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
-.navbar .nav .active>.dropdown-toggle:hover{color:#fff;}
+.navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;}
 .navbar .nav.pull-right .dropdown-menu{right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
 .navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
 .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
@@ -435,7 +435,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
 .tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
 .tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
-.tooltip-inner{max-width:200px;padding:3px 8px;color:white;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .tooltip-arrow{position:absolute;width:0;height:0;}
 .popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
 .popover.right{margin-left:5px;}
@@ -453,7 +453,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .btn.danger{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);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{background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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{background-color:#339bb9;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);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);}
-.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;}
+.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;}
 .btn:focus{outline:1px dotted #666;}
 .btn.primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
 .btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
@@ -477,7 +477,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .btn-group.open .dropdown-menu{display:block;top:30px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}.btn-group.open .dropdown-menu.large{top:40px;}
 .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
 .btn .caret{margin-top:6px;margin-left:0;}
-.primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#fff;filter:alpha(opacity=75);-moz-opacity:0.75;opacity:0.75;}
+.primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;filter:alpha(opacity=75);-moz-opacity:0.75;opacity:0.75;}
 .alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .alert,.alert-heading{color:#c09853;}
 .alert .close{*margin-top:3px;position:relative;right:-21px;}
@@ -528,10 +528,10 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .carousel .next.left,.carousel .prev.right{left:0;}
 .carousel .active.left{left:-100%;}
 .carousel .active.right{left:100%;}
-.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ccc;text-align:center;background:#999;background:rgba(0, 0, 0, 0.5);-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px;}.carousel-control.right{left:auto;right:15px;}
-.carousel-control:hover{color:#fff;text-decoration:none;background:#333;background:rgba(0, 0, 0, 0.75);}
-.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333;background:rgba(0, 0, 0, 0.75);}
-.carousel-caption h4,.carousel-caption p{color:#fff;}
+.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ccc;text-align:center;background:#999999;background:rgba(0, 0, 0, 0.5);-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px;}.carousel-control.right{left:auto;right:15px;}
+.carousel-control:hover{color:#ffffff;text-decoration:none;background:#333333;background:rgba(0, 0, 0, 0.75);}
+.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
+.carousel-caption h4,.carousel-caption p{color:#ffffff;}
 .pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
diff --git a/lib/forms.less b/lib/forms.less
index e956b0046..e728b9d72 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -28,7 +28,7 @@ label,
 input,
 select,
 textarea {
-  #font > .sans-serif(normal,@baseFontSize,@baseLineHeight);
+  #font > .sans-serif(@baseFontSize,normal,@baseLineHeight);
 }
 
 // Identify controls by their labels
-- 
cgit v1.2.3


From 36d56fb1ba803358e8244189fbef883290af87d0 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 22 Jan 2012 20:12:26 -0800
Subject: don't use negative margin - use first child to set to 0

---
 bootstrap.css        | 6 ++++--
 bootstrap.min.css    | 3 ++-
 lib/scaffolding.less | 8 ++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index fcfcf02f7..d96c2277b 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Sun Jan 22 20:06:46 PST 2012
+ * Date: Sun Jan 22 20:11:39 PST 2012
  */
 html, body {
   margin: 0;
@@ -238,7 +238,6 @@ a:hover {
   text-decoration: underline;
 }
 .row {
-  margin-left: -20px;
   *zoom: 1;
 }
 .row:before, .row:after {
@@ -248,6 +247,9 @@ a:hover {
 .row:after {
   clear: both;
 }
+[class*="span"]:first-child {
+  margin-left: 0;
+}
 [class*="span"] {
   float: left;
   margin-left: 20px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index bb5745669..ccc0f1e42 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -32,8 +32,9 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
 .sidebar-right .fluid-sidebar{float:right;margin-right:-240px;}
 .fluid-content{float:left;width:100%;}
 a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
-.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
+.row{*zoom:1;}.row:before,.row:after{display:table;content:"";}
 .row:after{clear:both;}
+[class*="span"]:first-child{margin-left:0;}
 [class*="span"]{float:left;margin-left:20px;}
 .span1{width:60px;}
 .span2{width:140px;}
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 7ad8a7b16..66e5cc32f 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -75,11 +75,15 @@ a {
 // -----------
 // To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
 .row {
-  margin-left: -@gridGutterWidth;
   .clearfix();
 }
 
-// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
+[class*="span"]:first-child{
+  margin-left: 0;
+}
+
+// Find all .span# classes within .row and give them the necessary properties for grid columns 
+// (supported by all browsers back to IE7)
 // Credit to @dhg for the idea
 [class*="span"] {
   .gridColumn();
-- 
cgit v1.2.3


From 36d2679f8358f91d8a2c746e0f14b3500b73c163 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 22 Jan 2012 20:31:58 -0800
Subject: give default valuse for border-radius-custom

---
 bootstrap.css   | 2 +-
 lib/mixins.less | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index d96c2277b..c40172304 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Sun Jan 22 20:11:39 PST 2012
+ * Date: Sun Jan 22 20:31:51 PST 2012
  */
 html, body {
   margin: 0;
diff --git a/lib/mixins.less b/lib/mixins.less
index 5a3952f3a..a54f6762f 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -137,7 +137,7 @@
      -moz-border-radius: @radius;
           border-radius: @radius;
 }
-.border-radius-custom(@topLeft, @topRight, @bottomRight, @bottomLeft) {
+.border-radius-custom(@topLeft: 0, @topRight: 0, @bottomRight: 0, @bottomLeft: 0) {
   -webkit-border-top-left-radius: @topLeft;
       -moz-border-radius-topleft: @topLeft;
           border-top-left-radius: @topLeft;
-- 
cgit v1.2.3


From 2355ea034b2d2c46dde5faf01fd53aa324d13cae Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 22 Jan 2012 20:47:24 -0800
Subject: rebuild

---
 bootstrap.css     | 10 +++++-----
 bootstrap.min.css |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index c40172304..732e0afc8 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Sun Jan 22 20:31:51 PST 2012
+ * Date: Sun Jan 22 20:42:19 PST 2012
  */
 html, body {
   margin: 0;
@@ -1440,7 +1440,7 @@ i {
 }
 .dropdown-menu {
   position: absolute;
-  top: 40px;
+  top: 100%;
   z-index: 1000;
   float: left;
   display: none;
@@ -1698,7 +1698,7 @@ i {
   margin-bottom: 1px;
 }
 .pills .dropdown-menu, .tabs .dropdown-menu {
-  top: 33px;
+  margin-top: 1px;
   border-width: 1px;
 }
 .pills .dropdown-menu {
@@ -1979,7 +1979,7 @@ i {
   margin-right: 0;
 }
 .navbar .dropdown-menu {
-  top: 41px;
+  margin-top: 1px;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -2630,7 +2630,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 }
 .btn-group.open .dropdown-menu {
   display: block;
-  top: 30px;
+  margin-top: 1px;
   -webkit-border-radius: 5px;
   -moz-border-radius: 5px;
   border-radius: 5px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index ccc0f1e42..e1077234d 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -302,7 +302,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;content:"\2193";}
 .dropdown .caret{margin-top:8px;margin-left:2px;*margin-top:7px;}
 .dropdown:hover .caret,.open.dropdown .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
-.dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
+.dropdown-menu{position:absolute;top:100%;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
 .dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
 .dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;}
 .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
@@ -339,7 +339,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .tabs.stacked>li>a:hover{border-color:#ddd;z-index:2;}
 .pills.stacked>li>a{margin-bottom:3px;}
 .pills.stacked>li:last-child>a{margin-bottom:1px;}
-.pills .dropdown-menu,.tabs .dropdown-menu{top:33px;border-width:1px;}
+.pills .dropdown-menu,.tabs .dropdown-menu{margin-top:1px;border-width:1px;}
 .pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;}
 .tabs .dropdown-toggle:hover .caret,.pills .dropdown-toggle:hover .caret{border-top-color:#005580;}
@@ -390,7 +390,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#222222;background-color:rgba(0, 0, 0, 0.5);}
 .navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222222;border-right:1px solid #444;}
 .navbar .nav.pull-right{margin-left:10px;margin-right:0;}
-.navbar .dropdown-menu{top:41px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
 .navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
 .navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;}
 .navbar .nav .active .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
@@ -475,7 +475,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
 .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;}
 .btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);}
-.btn-group.open .dropdown-menu{display:block;top:30px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}.btn-group.open .dropdown-menu.large{top:40px;}
+.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}.btn-group.open .dropdown-menu.large{top:40px;}
 .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
 .btn .caret{margin-top:6px;margin-left:0;}
 .primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;filter:alpha(opacity=75);-moz-opacity:0.75;opacity:0.75;}
-- 
cgit v1.2.3


From 1209a3756c88043008950f74dd287b837e00f7d8 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 22 Jan 2012 20:50:35 -0800
Subject: :focus:required:invalid:
 http://www.alistapart.com/articles/forward-thinking-form-validation

---
 bootstrap.css     | 6 +++---
 bootstrap.min.css | 2 +-
 lib/forms.less    | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 732e0afc8..aa68f04b9 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Sun Jan 22 20:42:19 PST 2012
+ * Date: Sun Jan 22 20:50:28 PST 2012
  */
 html, body {
   margin: 0;
@@ -812,11 +812,11 @@ textarea[readonly] {
   background-color: #bcddbc;
   border-color: #468847;
 }
-input:invalid, textarea:invalid, select:invalid {
+input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid {
   color: #b94a48;
   border-color: #ee5f5b;
 }
-input:invalid:focus, textarea:invalid:focus, select:invalid:focus {
+input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus {
   border-color: #e9322d;
   -webkit-box-shadow: 0 0 6px #f8b9b7;
   -moz-box-shadow: 0 0 6px #f8b9b7;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index e1077234d..216c786f0 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -153,7 +153,7 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
 .control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
 .control-group.success input,.control-group.success textarea{color:#468847;border-color:#57a957;}.control-group.success input:focus,.control-group.success textarea:focus{border-color:#458845;-webkit-box-shadow:0 0 6px #9acc9a;-moz-box-shadow:0 0 6px #9acc9a;box-shadow:0 0 6px #9acc9a;}
 .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#bcddbc;border-color:#468847;}
-input:invalid,textarea:invalid,select:invalid{color:#b94a48;border-color:#ee5f5b;}input:invalid:focus,textarea:invalid:focus,select:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
+input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
 .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
 .uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
 :-moz-placeholder{color:#999999;}
diff --git a/lib/forms.less b/lib/forms.less
index e728b9d72..bdc6e3e07 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -302,9 +302,9 @@ textarea[readonly] {
 
 // HTML5 invalid states
 // Shares styles with the .control-group.error above
-input:invalid,
-textarea:invalid,
-select:invalid {
+input:focus:required:invalid,
+textarea:focus:required:invalid,
+select:focus:required:invalid {
   color: #b94a48;
   border-color: #ee5f5b;
   &:focus {
-- 
cgit v1.2.3


From 00d925819405ef46fb09d4bef83761ea121a9364 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 23 Jan 2012 11:35:39 -0800
Subject: revert to negative margin on grid row

---
 bootstrap.css        | 8 +++-----
 bootstrap.min.css    | 5 ++---
 lib/scaffolding.less | 5 +----
 lib/thumbnails.less  | 2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 85a3edb6f..fc0337f6d 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Mon Jan 23 11:25:06 PST 2012
+ * Date: Mon Jan 23 11:35:22 PST 2012
  */
 article,
 aside,
@@ -160,6 +160,7 @@ a:hover {
   text-decoration: underline;
 }
 .row {
+  margin-left: -20px;
   *zoom: 1;
 }
 .row:before, .row:after {
@@ -169,9 +170,6 @@ a:hover {
 .row:after {
   clear: both;
 }
-[class*="span"]:first-child {
-  margin-left: 0;
-}
 [class*="span"] {
   float: left;
   margin-left: 20px;
@@ -2673,7 +2671,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 }
 .thumbnails > li {
   float: left;
-  margin: 0 0 20px 20px;
+  margin: 0 0 18px 20px;
 }
 .thumbnail {
   display: block;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 172e7961b..bee4eb82a 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -27,9 +27,8 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
 .sidebar-right .fluid-sidebar{float:right;margin-right:-240px;}
 .fluid-content{float:left;width:100%;}
 a{color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
-.row{*zoom:1;}.row:before,.row:after{display:table;content:"";}
+.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
 .row:after{clear:both;}
-[class*="span"]:first-child{margin-left:0;}
 [class*="span"]{float:left;margin-left:20px;}
 .span1{width:60px;}
 .span2{width:140px;}
@@ -493,7 +492,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .alert-block p+p{margin-top:5px;}
 .thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
 .thumbnails:after{clear:both;}
-.thumbnails>li{float:left;margin:0 0 20px 20px;}
+.thumbnails>li{float:left;margin:0 0 18px 20px;}
 .thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}
 a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
 .thumbnail>img{display:block;max-width:100%;}
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 13f55026d..ff029e841 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -73,13 +73,10 @@ a {
 // -----------
 // To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
 .row {
+  margin-left: @gridGutterWidth * -1;
   .clearfix();
 }
 
-[class*="span"]:first-child{
-  margin-left: 0;
-}
-
 // Find all .span# classes within .row and give them the necessary properties for grid columns 
 // (supported by all browsers back to IE7)
 // Credit to @dhg for the idea
diff --git a/lib/thumbnails.less b/lib/thumbnails.less
index 4f9c5f76d..0ba749059 100644
--- a/lib/thumbnails.less
+++ b/lib/thumbnails.less
@@ -8,7 +8,7 @@
 }
 .thumbnails > li {
   float: left;
-  margin: 0 0 20px 20px;
+  margin: 0 0 @baseLineHeight 20px;
 }
 .thumbnail {
   display: block;
-- 
cgit v1.2.3


From a7bf0295fbf3ce9abc1ca44680f4a6eaf17339b5 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 23 Jan 2012 11:55:04 -0800
Subject: remove dropdowns, add in sub nav instead

---
 docs/base-css.html    | 76 ++++++++++------------------------------------
 docs/components.html  | 80 +++++++++++++------------------------------------
 docs/index.html       | 69 ++++++------------------------------------
 docs/javascript.html  | 83 ++++++++++++++-------------------------------------
 docs/less.html        | 69 ++++++------------------------------------
 docs/scaffolding.html | 74 +++++++++------------------------------------
 6 files changed, 91 insertions(+), 360 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 8ac913477..df0c9c7ce 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -34,71 +34,20 @@
           Bootstrap
           
         
      
@@ -112,6 +61,13 @@
       
      
         
      Base CSS
      
         
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
+        
       
      
 
 
diff --git a/docs/components.html b/docs/components.html
index 984e8c76d..47efee5ac 100755
--- a/docs/components.html
+++ b/docs/components.html
@@ -34,71 +34,20 @@
           Bootstrap
           
         
      
@@ -112,6 +61,17 @@
       
      
         
      Components
      
         
      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
      
+        
       
      
 
 
diff --git a/docs/index.html b/docs/index.html
index ce56a04ef..eee32e0d4 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -35,71 +35,20 @@
           Bootstrap
           
         
      
diff --git a/docs/javascript.html b/docs/javascript.html
index 6a240c4d4..0a0a0c9ef 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -35,71 +35,20 @@
           Bootstrap
           
         
      
@@ -112,6 +61,20 @@
       
      
         
      Javascript for Bootstrap
      
         
      Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
+        
      
       
      
 
 
diff --git a/docs/less.html b/docs/less.html
index 09ff3e8e1..0348c0caf 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -34,71 +34,20 @@
           Bootstrap
           
         
      
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index f068c837c..4a27104c3 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -34,71 +34,20 @@
           Bootstrap
           
         
      
@@ -112,6 +61,11 @@
       
      
         
      Scaffolding
      
         
      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
      
+        
       
      
 
 
-- 
cgit v1.2.3


From ea8f5883fd58ff5e356944e4a93543c05abf2220 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 23 Jan 2012 12:04:48 -0800
Subject: clean up subnav aesthetics

---
 docs/assets/css/docs.css | 34 ++++++++++++++++++++++++++++++++--
 docs/components.html     |  4 ++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 416b1830c..e7714fd5c 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -115,8 +115,8 @@ section {
 ------------------------- */
 /* supporting docs pages */
 .subhead {
-  padding-bottom: 14px;
-  border-bottom: 3px solid #e5e5e5;
+  padding-bottom: 0;
+  border-bottom: 0;
 }
 .subhead h1,
 .subhead p {
@@ -126,6 +126,36 @@ section {
   font-size: 45px;
 }
 
+/* Subnav */
+.subhead .nav {
+  padding: 0 10px;
+  background-color: #eeeeee; /* Old browsers */
+  background-repeat: repeat-x; /* Repeat the gradient */
+  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
+  background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */
+  background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */
+  background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
+  background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */
+  border: 1px solid #eee;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+.subhead .nav a {
+  margin: 0;
+  padding-top: 11px;
+  padding-bottom: 11px;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+.subhead .nav .active a {
+  background-color: #fff;
+  color: #333;
+}
+
 
 /* Quick links
 -------------------------------------------------- */
diff --git a/docs/components.html b/docs/components.html
index 47efee5ac..8cd76bedc 100755
--- a/docs/components.html
+++ b/docs/components.html
@@ -63,13 +63,13 @@
         
      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
      
         
       
-- 
cgit v1.2.3


From ff113acba88806380b995fba894d77b562ca0e0a Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 23 Jan 2012 12:21:00 -0800
Subject: cut margin in half on default forms

---
 bootstrap.css     | 5 ++++-
 bootstrap.min.css | 3 ++-
 lib/forms.less    | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index fc0337f6d..6f2a8c751 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Mon Jan 23 11:35:22 PST 2012
+ * Date: Mon Jan 23 12:20:49 PST 2012
  */
 article,
 aside,
@@ -896,6 +896,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   display: inline-block;
 }
 .control-group {
+  margin-bottom: 9px;
+}
+.form-horizontal .control-group {
   margin-bottom: 18px;
 }
 .form-horizontal .control-group > label {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index bee4eb82a..3f6c6a825 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -171,7 +171,8 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir
 .search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
 .form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
 .form-search label,.form-inline label{display:inline-block;}
-.control-group{margin-bottom:18px;}
+.control-group{margin-bottom:9px;}
+.form-horizontal .control-group{margin-bottom:18px;}
 .form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
 .form-horizontal .controls{margin-left:160px;}
 .form-horizontal .form-actions{padding-left:160px;}
diff --git a/lib/forms.less b/lib/forms.less
index 85bf26163..bf3dbe64c 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -463,13 +463,16 @@ select:focus:required:invalid {
 
 // Margin to space out fieldsets
 .control-group {
-  margin-bottom: @baseLineHeight;
+  margin-bottom: @baseLineHeight / 2;
 }
 
 // Horizontal-specific styles
 // --------------------------
 
 .form-horizontal {
+  .control-group {
+    margin-bottom: @baseLineHeight;
+  }
   // Float the labels left
   .control-group > label {
     float: left;
-- 
cgit v1.2.3


From 1fa2801c2f8ad1e3c319fd6fc0d2e8baddccf6cc Mon Sep 17 00:00:00 2001
From: Olivier Laviale 
Date: Mon, 23 Jan 2012 21:22:08 +0100
Subject: .alert-message no longer exists

---
 lib/buttons.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/buttons.less b/lib/buttons.less
index 5da34a525..f13a9acbf 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -102,7 +102,6 @@
   }
 }
 // Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
-:root .alert-message,
 :root .btn {
   border-radius: 0 \0;
 }
-- 
cgit v1.2.3


From cf716bbeccf3ea94dc16d65a3b5800bc22e1472d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Oko=C5=84ski?= 
Date: Mon, 23 Jan 2012 22:03:09 +0100
Subject: Set matching line-height for .close inside .alert

---
 lib/alerts.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/alerts.less b/lib/alerts.less
index 53a43c6e4..da585af31 100644
--- a/lib/alerts.less
+++ b/lib/alerts.less
@@ -20,6 +20,7 @@
   *margin-top: 3px; /* IE7 spacing */
   position: relative;
   right: -21px;
+  line-height: 18px;
 }
 
 // Alternate styles
-- 
cgit v1.2.3


From 1954cf001926a94f7a4d51f16beaf9f2ba671d13 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 23 Jan 2012 13:46:26 -0800
Subject: comment in forms'

---
 docs/assets/css/docs.css | 13 +++++++++++++
 lib/forms.less           |  1 +
 2 files changed, 14 insertions(+)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index e7714fd5c..69d9dac56 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -448,6 +448,7 @@ h2 + .row {
   margin: -18px 0 27px;
   font-size: 18px;
   font-weight: 300;
+  line-height: 24px;
   color: #999;
   text-align: center;
 }
@@ -563,6 +564,18 @@ form.well {
     margin: 0 auto 10px;
   }
 
+  /* Subnav */
+  .subhead .nav {
+    padding: 0;
+    background: none;
+  }
+  .subhead .nav > li {
+    float: none;
+  }
+  .subhead .nav li + li a {
+    border-top: 1px solid #eee;
+  }
+
   /* Don't space out quick links so much */
   .quick-links {
     margin: 40px 0 0;
diff --git a/lib/forms.less b/lib/forms.less
index bf3dbe64c..be53c60cb 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -470,6 +470,7 @@ select:focus:required:invalid {
 // --------------------------
 
 .form-horizontal {
+  // Increase spacing between groups
   .control-group {
     margin-bottom: @baseLineHeight;
   }
-- 
cgit v1.2.3


From cd5ffbe39626303a395448a6c9a507f3ad04ff5e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 23 Jan 2012 13:50:55 -0800
Subject: fix up the modals in responsive a bit

---
 bootstrap.css       | 3 ++-
 bootstrap.min.css   | 2 +-
 lib/responsive.less | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 6f2a8c751..91c4ca701 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Mon Jan 23 12:20:49 PST 2012
+ * Date: Mon Jan 23 13:48:03 PST 2012
  */
 article,
 aside,
@@ -3068,6 +3068,7 @@ a.thumbnail:hover {
     left: 20px;
     right: 20px;
     width: auto;
+    margin: 0;
   }
   .modal.fade.in {
     top: auto;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 3f6c6a825..733ad5d11 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -539,4 +539,4 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .show{display:block;}
 .invisible{visibility:hidden;}
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
+@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/lib/responsive.less b/lib/responsive.less
index f5c23df3c..416a8da7b 100644
--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -97,11 +97,12 @@
 
   // Modals
   .modal {
-    position: fixed;
+    position: absolute;
     top: 20px;
     left: 20px;
     right: 20px;
     width: auto;
+    margin: 0;
     &.fade.in { top: auto; }
   }
   .modal-header .close {
-- 
cgit v1.2.3


From f764aee4b919c28974dba7b91edac9a04172ba25 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Mon, 23 Jan 2012 14:14:16 -0800
Subject: add templates for doc generation

---
 Makefile                                           |   35 +-
 bootstrap.css                                      |    2 +-
 docs/assets/js/application.js                      |   87 +-
 docs/base-css.html                                 |   61 +-
 docs/build/index.js                                |   27 +
 docs/build/node_modules/.bin/hulk                  |    1 +
 docs/build/node_modules/hogan.js/.git_ignore       |    1 +
 docs/build/node_modules/hogan.js/.gitmodules       |    3 +
 docs/build/node_modules/hogan.js/LICENSE           |  177 ++
 docs/build/node_modules/hogan.js/Makefile          |   62 +
 docs/build/node_modules/hogan.js/README.md         |   93 +
 docs/build/node_modules/hogan.js/bin/hulk          |   93 +
 docs/build/node_modules/hogan.js/lib/compiler.js   |  348 +++
 docs/build/node_modules/hogan.js/lib/hogan.js      |   20 +
 docs/build/node_modules/hogan.js/lib/template.js   |  233 ++
 docs/build/node_modules/hogan.js/package.json      |   20 +
 .../node_modules/hogan.js/test/html/list.html      |    8 +
 docs/build/node_modules/hogan.js/test/index.html   |   13 +
 docs/build/node_modules/hogan.js/test/index.js     |  848 +++++++
 docs/build/node_modules/hogan.js/test/mustache.js  |   90 +
 docs/build/node_modules/hogan.js/test/spec.js      |   77 +
 docs/build/node_modules/hogan.js/test/spec/Changes |   31 +
 .../node_modules/hogan.js/test/spec/README.md      |   65 +
 .../build/node_modules/hogan.js/test/spec/Rakefile |   27 +
 .../node_modules/hogan.js/test/spec/TESTING.md     |   46 +
 .../hogan.js/test/spec/specs/comments.json         |    1 +
 .../hogan.js/test/spec/specs/comments.yml          |  103 +
 .../hogan.js/test/spec/specs/delimiters.json       |    1 +
 .../hogan.js/test/spec/specs/delimiters.yml        |  158 ++
 .../hogan.js/test/spec/specs/interpolation.json    |    1 +
 .../hogan.js/test/spec/specs/interpolation.yml     |  230 ++
 .../hogan.js/test/spec/specs/inverted.json         |    1 +
 .../hogan.js/test/spec/specs/inverted.yml          |  193 ++
 .../hogan.js/test/spec/specs/partials.json         |    1 +
 .../hogan.js/test/spec/specs/partials.yml          |  109 +
 .../hogan.js/test/spec/specs/sections.json         |    1 +
 .../hogan.js/test/spec/specs/sections.yml          |  256 +++
 .../hogan.js/test/spec/specs/~lambdas.json         |    1 +
 .../hogan.js/test/spec/specs/~lambdas.yml          |  149 ++
 .../hogan.js/test/templates/list.mustache          |    8 +
 docs/build/node_modules/hogan.js/tools/release.js  |   74 +
 .../node_modules/hogan.js/tools/web_templates.js   |   32 +
 .../build/node_modules/hogan.js/web/1.0.0/hogan.js |  500 ++++
 .../node_modules/hogan.js/web/1.0.0/hogan.min.js   |   14 +
 .../hogan.js/web/builds/1.0.0/hogan.js             |  500 ++++
 .../hogan.js/web/builds/1.0.0/hogan.min.js         |   14 +
 .../hogan.js/web/builds/1.0.3/hogan.js             |  545 +++++
 .../hogan.js/web/builds/1.0.3/hogan.min.js         |    5 +
 .../hogan.js/web/builds/1.0.5/hogan-1.0.5.amd.js   |  576 +++++
 .../web/builds/1.0.5/hogan-1.0.5.common.js         |  576 +++++
 .../hogan.js/web/builds/1.0.5/hogan-1.0.5.js       |  572 +++++
 .../web/builds/1.0.5/hogan-1.0.5.min.amd.js        |    5 +
 .../web/builds/1.0.5/hogan-1.0.5.min.common.js     |    5 +
 .../hogan.js/web/builds/1.0.5/hogan-1.0.5.min.js   |    5 +
 .../web/builds/1.0.5/hogan-1.0.5.min.mustache.js   |    5 +
 .../web/builds/1.0.5/hogan-1.0.5.mustache.js       |  619 +++++
 .../hogan.js/web/builds/1.0.5/template-1.0.5.js    |  233 ++
 .../web/builds/1.0.5/template-1.0.5.min.js         |    5 +
 docs/build/node_modules/hogan.js/web/favicon.ico   |  Bin 0 -> 1150 bytes
 .../node_modules/hogan.js/web/images/logo.png      |  Bin 0 -> 3389 bytes
 .../node_modules/hogan.js/web/images/noise.png     |  Bin 0 -> 10378 bytes
 .../hogan.js/web/images/small-hogan-icon.png       |  Bin 0 -> 472 bytes
 .../node_modules/hogan.js/web/images/stripes.png   |  Bin 0 -> 115 bytes
 .../node_modules/hogan.js/web/index.html.mustache  |  139 ++
 .../hogan.js/web/stylesheets/layout.css            |  206 ++
 .../hogan.js/web/stylesheets/skeleton.css          |  236 ++
 .../node_modules/hogan.js/wrappers/amd.js.mustache |   21 +
 .../hogan.js/wrappers/common.js.mustache           |   21 +
 .../node_modules/hogan.js/wrappers/js.mustache     |   17 +
 .../hogan.js/wrappers/mustache.js.mustache         |   64 +
 docs/build/package.json                            |    6 +
 docs/components.html                               |   51 +-
 docs/index.html                                    |  402 ++--
 docs/javascript.html                               | 2426 ++++++++++----------
 docs/less.html                                     |   41 +-
 docs/scaffolding.html                              |   53 +-
 docs/templates/layout.mustache                     |  144 ++
 docs/templates/pages/base-css.mustache             | 1427 ++++++++++++
 docs/templates/pages/components.mustache           | 1176 ++++++++++
 docs/templates/pages/index.mustache                |  188 ++
 docs/templates/pages/javascript.mustache           | 1299 +++++++++++
 docs/templates/pages/less.mustache                 |  406 ++++
 docs/templates/pages/scaffolding.mustache          |  311 +++
 docs/templates/pages/upgrading.mustache            |   86 +
 docs/upgrading.html                                |   60 +-
 85 files changed, 15165 insertions(+), 1581 deletions(-)
 create mode 100644 docs/build/index.js
 create mode 120000 docs/build/node_modules/.bin/hulk
 create mode 100644 docs/build/node_modules/hogan.js/.git_ignore
 create mode 100644 docs/build/node_modules/hogan.js/.gitmodules
 create mode 100644 docs/build/node_modules/hogan.js/LICENSE
 create mode 100644 docs/build/node_modules/hogan.js/Makefile
 create mode 100644 docs/build/node_modules/hogan.js/README.md
 create mode 100755 docs/build/node_modules/hogan.js/bin/hulk
 create mode 100644 docs/build/node_modules/hogan.js/lib/compiler.js
 create mode 100644 docs/build/node_modules/hogan.js/lib/hogan.js
 create mode 100644 docs/build/node_modules/hogan.js/lib/template.js
 create mode 100644 docs/build/node_modules/hogan.js/package.json
 create mode 100644 docs/build/node_modules/hogan.js/test/html/list.html
 create mode 100644 docs/build/node_modules/hogan.js/test/index.html
 create mode 100644 docs/build/node_modules/hogan.js/test/index.js
 create mode 100644 docs/build/node_modules/hogan.js/test/mustache.js
 create mode 100644 docs/build/node_modules/hogan.js/test/spec.js
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/Changes
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/README.md
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/Rakefile
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/TESTING.md
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/comments.json
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/comments.yml
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/delimiters.json
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/delimiters.yml
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/interpolation.json
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/interpolation.yml
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/inverted.json
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/inverted.yml
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/partials.json
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/partials.yml
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/sections.json
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/sections.yml
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/~lambdas.json
 create mode 100644 docs/build/node_modules/hogan.js/test/spec/specs/~lambdas.yml
 create mode 100644 docs/build/node_modules/hogan.js/test/templates/list.mustache
 create mode 100644 docs/build/node_modules/hogan.js/tools/release.js
 create mode 100644 docs/build/node_modules/hogan.js/tools/web_templates.js
 create mode 100644 docs/build/node_modules/hogan.js/web/1.0.0/hogan.js
 create mode 100644 docs/build/node_modules/hogan.js/web/1.0.0/hogan.min.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.0/hogan.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.0/hogan.min.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.3/hogan.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.3/hogan.min.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.amd.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.common.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.amd.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.common.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.min.mustache.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/hogan-1.0.5.mustache.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/template-1.0.5.js
 create mode 100644 docs/build/node_modules/hogan.js/web/builds/1.0.5/template-1.0.5.min.js
 create mode 100644 docs/build/node_modules/hogan.js/web/favicon.ico
 create mode 100644 docs/build/node_modules/hogan.js/web/images/logo.png
 create mode 100644 docs/build/node_modules/hogan.js/web/images/noise.png
 create mode 100644 docs/build/node_modules/hogan.js/web/images/small-hogan-icon.png
 create mode 100644 docs/build/node_modules/hogan.js/web/images/stripes.png
 create mode 100755 docs/build/node_modules/hogan.js/web/index.html.mustache
 create mode 100755 docs/build/node_modules/hogan.js/web/stylesheets/layout.css
 create mode 100755 docs/build/node_modules/hogan.js/web/stylesheets/skeleton.css
 create mode 100644 docs/build/node_modules/hogan.js/wrappers/amd.js.mustache
 create mode 100644 docs/build/node_modules/hogan.js/wrappers/common.js.mustache
 create mode 100644 docs/build/node_modules/hogan.js/wrappers/js.mustache
 create mode 100644 docs/build/node_modules/hogan.js/wrappers/mustache.js.mustache
 create mode 100644 docs/build/package.json
 mode change 100755 => 100644 docs/components.html
 create mode 100644 docs/templates/layout.mustache
 create mode 100644 docs/templates/pages/base-css.mustache
 create mode 100644 docs/templates/pages/components.mustache
 create mode 100644 docs/templates/pages/index.mustache
 create mode 100644 docs/templates/pages/javascript.mustache
 create mode 100644 docs/templates/pages/less.mustache
 create mode 100644 docs/templates/pages/scaffolding.mustache
 create mode 100644 docs/templates/pages/upgrading.mustache

diff --git a/Makefile b/Makefile
index 0dddb13dd..05ac49168 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,10 @@ LESS_COMPESSOR ?= `which lessc`
 UGLIFY_JS ?= `which uglifyjs`
 WATCHR ?= `which watchr`
 
+#
+# Build less files
+#
+
 build:
 	@@if test ! -z ${LESS_COMPESSOR}; then \
 		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
@@ -18,24 +22,9 @@ build:
 		echo "You can install it by running: npm install less -g"; \
 	fi
 
-uglify:
-	@@if test ! -z ${UGLIFY_JS}; then \
-		mkdir -p js/min; \
-		uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alert.js;\
-		uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-button.js;\
-		uglifyjs -o js/min/bootstrap-carousel.js js/bootstrap-carousel.js;\
-		uglifyjs -o js/min/bootstrap-collapse.js js/bootstrap-collapse.js;\
-		uglifyjs -o js/min/bootstrap-dropdown.js js/bootstrap-dropdown.js;\
-		uglifyjs -o js/min/bootstrap-modal.js js/bootstrap-modal.js;\
-		uglifyjs -o js/min/bootstrap-popover.js js/bootstrap-popover.js;\
-		uglifyjs -o js/min/bootstrap-scrollspy.js js/bootstrap-scrollspy.js;\
-		uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tab.js;\
-		uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transition.js;\
-		uglifyjs -o js/min/bootstrap-tooltip.js js/bootstrap-tooltip.js;\
-	else \
-		echo "You must have the UGLIFYJS minifier installed in order to minify Bootstrap's js."; \
-		echo "You can install it by running: npm install uglify-js -g"; \
-	fi
+#
+# Watch less files
+#
 
 watch:
 	@@if test ! -z ${WATCHR}; then \
@@ -46,4 +35,12 @@ watch:
 		echo "You can install it by running: gem install watchr"; \
 	fi
 
-.PHONY: build watch
\ No newline at end of file
+#
+# Build docs from templates
+#
+
+docs:
+	@ node docs/build
+
+
+.PHONY: build watch docs
\ No newline at end of file
diff --git a/bootstrap.css b/bootstrap.css
index aa68f04b9..b911730eb 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Sun Jan 22 20:50:28 PST 2012
+ * Date: Mon Jan 23 14:12:25 PST 2012
  */
 html, body {
   margin: 0;
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index ba5a26947..93f7ea719 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -117,37 +117,66 @@ $(function(){
 
 })
 
+// JS for javascript demos
+$(function () {
+  // tooltip demo
+  $('.tooltip-demo.well').tooltip({
+    selector: "a[rel=tooltip]"
+  })
+  $('.tooltip-test').tooltip()
+
+  // popover demo
+  $("a[rel=popover]")
+    .popover()
+    .click(function(e) {
+      e.preventDefault()
+    })
+
+  // button state demo
+  $('#fat-btn')
+    .click(function () {
+      var btn = $(this)
+      btn.button('loading')
+      setTimeout(function () {
+        btn.button('reset')
+      }, 3000)
+    })
+
+  // carousel demo
+  $('#myCarousel').carousel()
+})
+
 
 // Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi
 // by the talented Ben Vinegar
 !function($) {
-    $.ajaxTransport('jsonpi', function(opts, originalOptions, jqXHR) {
-        var url = opts.url;
-
-        return {
-            send: function(_, completeCallback) {
-                var name = 'jQuery_iframe_' + jQuery.now(),
-                    iframe, form;
-
-                iframe = $('
-          
-          
    • 
-            
-          
      • 
+  
+    
    • ·
      • 
+    
+    
    • 
+      
+    
      • 
+  
 
 
-        
      
-          
      Built with Bootstrap.
      
-          
      For even more sites built with Bootstrap, visit the unofficial Tumblr.
      
-          
+  
      
+    
      Built with Bootstrap.
      
+    
      For even more sites built with Bootstrap, visit the unofficial Tumblr.
      
+    
 
-          
      Designed for everyone, everywhere.
      
-          
      Need reasons to love Bootstrap? Look no further.
      
-          
      
-            
      
-              
-              
      Built for and by nerds
      
-              
      Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.
      
-            
      
-            
      
-              
-              
      For all skill levels
      
-              
      Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.
      
-            
      
-            
      
-              
-              
      Cross-everything
      
-              
      Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.
      
-            
      
-          
      
-          
      
-            
      
-              
-              
      12-column grid
      
-              
      Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.
      
-            
      
-            
      
-              
-              
      Responsive design
      
-              
      With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.
      
-            
      
-            
      
-              
-              
      Styleguide docs
      
-              
      Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.
      
-            
      
-          
      
-          
      
-            
      
-              
-              
      Growing library
      
-              
      Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.
      
-            
      
-            
      
-              
-              
      Custom jQuery plugins
      
-              
      What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.
      
-            
      
-            
      
-              
-              
      Built on LESS
      
-              
      Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.
      
-            
      
-          
      
-          
      
-            
      
-              
-              
      HTML5
      
-              
      Built to support new HTML5 elements and syntax.
      
-            
      
-            
      
-              
-              
      CSS3
      
-              
      Progressively enhanced components for ultimate style.
      
-            
      
-            
      
-              
-              
      Open-source
      
-              
      Built for and maintained by the community via GitHub.
      
-            
      
-            
      
-              
-              
      Made at Twitter
      
-              
      Brought to you by an experienced engineer and designer.
      
-            
      
-          
      
-
-
-          
-          
      Get started in no time.
      
-          
      Quickly start using Bootstrap within your workflow and development process.
      
-          
-            
-              
-                
-                
-                
-              
-            
-          
      
-                  
      Hotlink the CSS
      
-                  
      For the quickest and easiest start, just copy this snippet into your webpage.
      
-                  
-                    
-                  
-                      		
-                  
      Use it with LESS
      
-                  
      A fan of using LESS? No problem, just clone the repo and add these lines:
      
-                  
      
-                    
-                  
      
-                      		
-                  
      Fork on GitHub
      
-                  
      Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.
      
-                  
      Bootstrap on GitHub »
      
-                  
      Currently v2.0.0
      
-                
      
-        
      
-      
      
+    
      Designed for everyone, everywhere.
      
+    
      Need reasons to love Bootstrap? Look no further.
      
+    
      
+      
      
+        
+        
      Built for and by nerds
      
+        
      Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.
      
+      
      
+      
      
+        
+        
      For all skill levels
      
+        
      Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.
      
+      
      
+      
      
+        
+        
      Cross-everything
      
+        
      Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.
      
+      
      
+    
      
+    
      
+      
      
+        
+        
      12-column grid
      
+        
      Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.
      
+      
      
+      
      
+        
+        
      Responsive design
      
+        
      With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.
      
+      
      
+      
      
+        
+        
      Styleguide docs
      
+        
      Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.
      
+      
      
+    
      
+    
      
+      
      
+        
+        
      Growing library
      
+        
      Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.
      
+      
      
+      
      
+        
+        
      Custom jQuery plugins
      
+        
      What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.
      
+      
      
+      
      
+        
+        
      Built on LESS
      
+        
      Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.
      
+      
      
+    
      
+    
      
+      
      
+        
+        
      HTML5
      
+        
      Built to support new HTML5 elements and syntax.
      
+      
      
+      
      
+        
+        
      CSS3
      
+        
      Progressively enhanced components for ultimate style.
      
+      
      
+      
      
+        
+        
      Open-source
      
+        
      Built for and maintained by the community via GitHub.
      
+      
      
+      
      
+        
+        
      Made at Twitter
      
+        
      Brought to you by an experienced engineer and designer.
      
+      
      
+    
      
 
 
+    
+    
      Get started in no time.
      
+    
      Quickly start using Bootstrap within your workflow and development process.
      
+    
+      
+        
+          
+          
+          
+        
+      
+    
      
+            
      Hotlink the CSS
      
+            
      For the quickest and easiest start, just copy this snippet into your webpage.
      
+            
      
+              
+            
      
+                		
+            
      Use it with LESS
      
+            
      A fan of using LESS? No problem, just clone the repo and add these lines:
      
+            
      
+              
+            
      
+                		
+            
      Fork on GitHub
      
+            
      Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.
      
+            
      Bootstrap on GitHub »
      
+            
      Currently v2.0.0
      
+          
      
+  
      
+
      
       
       
+
     
 
+
     
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/javascript.html b/docs/javascript.html
index 6a240c4d4..fda3ae32b 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -25,7 +25,7 @@
 
   
 
-  
+  
 
     
@@ -34,8 +34,8 @@
         
      
           Bootstrap
           
             
-            
    • 
+            
    • 
               
                 Base CSS
                 
@@ -59,7 +59,7 @@
                 
    • Icons by Glyphicons
      • 
               
             
-            
    • 
+            
    • 
               
                 Components
                 
@@ -96,7 +96,7 @@
                 
    • Typeahead
      • 
               
             
-            
    • 
+            
    • 
               
                 Using LESS
               
@@ -107,1308 +107,1306 @@
     
      • 
 
     
      
-      
-      
      
-        
      Javascript for Bootstrap
      
-        
      Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
-      
      
 
+
+
      
+  
      Javascript for Bootstrap
      
+  
      Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
+
      
 
-      
-      
      
-        
      
-          
      jQuery plugins A dozen Bootstrap plugins to get you started
      
-        
      
-      
      
-        
      
-          
-        
      
-        
      
-          
-        
      
-        
      
-          
-        
      
-        
      
-          
-        
      
-      
       
-      
      
-        
      
-          
-        
      
-        
      
-          
-        
      
-        
      
-          
-        
      
-        
      
-          
-        
      
-      
       
-      
      
-        
      
-          
-        
      
-        
      
-          
-        
      
-        
      
-          
-        
      
-        
      
-          
-        
      
-      
       
-      
      
-        
      
-          
      
-            Download Source
-            
-              
-            
-            
+
+  
+  
      
+    
      
+      
      jQuery plugins A dozen Bootstrap plugins to get you started
      
+    
      
+  
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+  
       
+  
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+  
       
+  
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+  
       
+  
      
+    
      
+      
+    
      
+  
      
+  
      
+  Select/Unselect All Plugins
+  
      Note: All plugins require the latest version of jQuery to be included.
      
+
      
+
+
+
+
+
      
+  
      
+    
      Modals bootstrap-modal.js
      
+  
      
+  
      
+    
      
+      
      About modals
      
+      
      A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.
      
+      Download file
+    
      
+    
      
+      
      Static example
      
+      
      Below is a statically rendered modal.
      
+      
      
+        
      
+          
      
+            ×
+            
      Modal header
      
+          
      
+          
      
+            
      One fine body…
      
+          
      
+          
      
+            Save changes
+            Close
           
      
         
      
-      
      
-      
      
-      Select/Unselect All Plugins
-      
      Note: All plugins require the latest version of jQuery to be included.
      
-    
      
-
+      
       
+
+      
      Live demo
      
+      
      Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.
      
+      
+      
      
-
-
-
-    
-    
+
+
+
+
+
       
+
+       
 
-          
      
+      
      
 
-          
      Using bootstrap-dropdown.js
      
-          
      Call the dropdowns via javascript:
      
-          
      $('.dropdown-toggle').dropdown()
      
-          
      Markup
      
-          
      To quickly add dropdown functionality to any element just add data-toggle="dropdown" and any valid bootstrap dropdown will automatically be activated.
      
-          
      Notice For added control and flexibility, optionally specify a data-target="#fat" or href="#fat" - this allows you to target specific dropdowns.
      
+      
      Using bootstrap-dropdown.js
      
+      
      Call the dropdowns via javascript:
      
+      
      $('.dropdown-toggle').dropdown()
      
+      
      Markup
      
+      
      To quickly add dropdown functionality to any element just add data-toggle="dropdown" and any valid bootstrap dropdown will automatically be activated.
      
+      
      Notice For added control and flexibility, optionally specify a data-target="#fat" or href="#fat" - this allows you to target specific dropdowns.
      
 
 
       <ul class="nav pills">
-  <li class="active"><a href="#">Regular link</a></li>
-  <li class="dropdown" id="menu1">
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
-      Dropdown
-      <b class="caret"></b>
-    </a>
-    <ul class="dropdown-menu">
-      <li><a href="#">Action</a></li>
-      <li><a href="#">Another action</a></li>
-      <li><a href="#">Something else here</a></li>
-      <li class="divider"></li>
-      <li><a href="#">Separated link</a></li>
-    </ul>
-  </li>
-  ...
+<li class="active"><a href="#">Regular link</a></li>
+<li class="dropdown" id="menu1">
+<a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
+  Dropdown
+  <b class="caret"></b>
+</a>
+<ul class="dropdown-menu">
+  <li><a href="#">Action</a></li>
+  <li><a href="#">Another action</a></li>
+  <li><a href="#">Something else here</a></li>
+  <li class="divider"></li>
+  <li><a href="#">Separated link</a></li>
+</ul>
+</li>
+...
 </ul>
      
-          
      Methods
      
-          
      $().dropdown()
      
-          
      
-          A programatic api for activating menus for a given navbar or tabbed navigation.
-          
      
-        
-      
-    
+      
      Methods
      
+      
      $().dropdown()
      
+      
      
+      A programatic api for activating menus for a given navbar or tabbed navigation.
+      
      
+    
+  
+
 
 
 
-   
-    
      
-      
      
-        
      ScrollSpy bootstrap-scrollspy.js
      
-      
      
-      
      
-        
      
-          
      The ScrollSpy plugin is for automatically updating nav targets based on scroll position.
      
-          Download file
-        
      
-        
      
-          
      Example navbar with scrollspy
      
-          
      Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!
      
-          
-    
      
+      
      
+        
      @fat
      
+        
      
+        Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
+        
      
+        
      @mdo
      
+        
      
+        Veniam marfa mustache skateboard, adipisicing fugiat velit pitchfork beard. Freegan beard aliqua cupidatat mcsweeney's vero. Cupidatat four loko nisi, ea helvetica nulla carles. Tattooed cosby sweater food truck, mcsweeney's quis non freegan vinyl. Lo-fi wes anderson +1 sartorial. Carles non aesthetic exercitation quis gentrify. Brooklyn adipisicing craft beer vice keytar deserunt.
+        
      
+        
      one
      
+        
      
+        Occaecat commodo aliqua delectus. Fap craft beer deserunt skateboard ea. Lomo bicycle rights adipisicing banh mi, velit ea sunt next level locavore single-origin coffee in magna veniam. High life id vinyl, echo park consequat quis aliquip banh mi pitchfork. Vero VHS est adipisicing. Consectetur nisi DIY minim messenger bag. Cred ex in, sustainable delectus consectetur fanny pack iphone.
+        
      
+        
      two
      
+        
      
+        In incididunt echo park, officia deserunt mcsweeney's proident master cleanse thundercats sapiente veniam. Excepteur VHS elit, proident shoreditch +1 biodiesel laborum craft beer. Single-origin coffee wayfarers irure four loko, cupidatat terry richardson master cleanse. Assumenda you probably haven't heard of them art party fanny pack, tattooed nulla cardigan tempor ad. Proident wolf nesciunt sartorial keffiyeh eu banh mi sustainable. Elit wolf voluptate, lo-fi ea portland before they sold out four loko. Locavore enim nostrud mlkshk brooklyn nesciunt.
+        
      
+        
      three
      
+        
      
+        Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
+        
      
+        
      Keytar twee blog, culpa messenger bag marfa whatever delectus food truck. Sapiente synth id assumenda. Locavore sed helvetica cliche irony, thundercats you probably haven't heard of them consequat hoodie gluten-free lo-fi fap aliquip. Labore elit placeat before they sold out, terry richardson proident brunch nesciunt quis cosby sweater pariatur keffiyeh ut helvetica artisan. Cardigan craft beer seitan readymade velit. VHS chambray laboris tempor veniam. Anim mollit minim commodo ullamco thundercats.
+        
      
+      
      
+      
      
+      
      Using bootstrap-scrollspy.js
      
+      
      Call the scrollspy via javascript:
      
+      
      $('#navbar').scrollspy()
      
+      
      Markup
      
+      
      To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body).
+      
      <body data-spy="scroll" >...</body>
      
+       
      Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
+      
      Options
      
+      
+        
+         
+           
+           
+           
+           
+         
+        
+        
+         
+           
+           
+           
+           
+         
+        
+      
      Nametypedefaultdescription
      offsetnumber10Pixels to offset from top when calculating position of scroll.
      
+    
+  
+
 
 
 
-    
-    
      
-      
      
-        
      Togglable tabs bootstrap-tab.js
      
-      
      
-      
      
-        
      
-          
      This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.
      
-          Download file
-        
      
-        
      
-          
      Example tabs
      
-          
      Click the tabs below to toggle between hidden panes, even via dropdown menus.
      
-          
      
+
      
+
+
+
+
      
+  
      
+    
      Tooltips bootstrap-tooltip.js
      
+  
      
+  
      
+    
      
+      
      About Tooltips
      
+      
      Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.
      
+      Download file
+    
      
+    
      
+      
      Example use of Tooltips
      
+      
      Hover over the links below to see tooltips:
      
+      
      
+        
      Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
+        
      
       
      
-    
      
-
-
-
-    
-    
      
-      
      
-        
      Popovers bootstrap-popover.js
      
+      
      
+      
      Using bootstrap-tooltip.js
      
+      
      Trigger the tooltip via javascript:
      
+      
      $('#example').tooltip(options)
      
+      
      Options
      
+      
+        
+         
+           
+           
+           
+           
+         
+        
+        
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+        
+      
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'top'how to position the tooltip - top | bottom | left | right
      selectorstringfalseIf a selector is provided, tooltip objects will be delegated to the specified targets.
      titlestring | function''default title value if `title` tag isn't present
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      delaynumber | object0
+            
      delay showing/hiding the tooltip (ms)
      
+            
      If a number is supplied, delay is applied to both hide/show
      
+            
      Object structure is: delay: { show: 500, hide: 100 }
      
+           
      
+      
      Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.
      
+      
      Markup
      
+      
      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
      
+      
      Methods
      
+      
      $().tooltip(options)
      
+      
      Attaches a tooltip handler to an element collection.
      
+      
      .tooltip('show')
      
+      
      Reveals an elements tooltip.
      
+      
      $('#element').tooltip('show')
      
+      
      .tooltip('hide')
      
+      
      Hides an elements tooltip.
      
+      
      $('#element').tooltip('hide')
      
+    
      
+  
+
      
+
+
+
+
+
      
+  
      
+    
      Popovers bootstrap-popover.js
      
+  
      
+  
      
+    
      
+      
      About popovers
      
+      
      Add small overlays of content, like those on the iPad, to any element for housing secondary information.
      
+      
      * Requires Tooltip to be included
      
+      Download file
+    
      
+    
      
+      
      Example hover popover
      
+      
      Hover over the button to trigger the popover.
      
+      
      
+        hover for popover
       
      
-      
      
-        
      
-          
      About popovers
      
-          
      Add small overlays of content, like those on the iPad, to any element for housing secondary information.
      
-          
      * Requires Tooltip to be included
      
-          Download file
-        
      
-        
      
-          
      Example hover popover
      
-          
      Hover over the button to trigger the popover.
      
-          
      
-            hover for popover
-          
      
-          
      
-          
      Using bootstrap-popover.js
      
-          
      Enable popovers via javascript:
      
-          
      $('#example').popover(options)
      
-          
      Options
      
-          
-            
-             
-               
-               
-               
-               
-             
-            
-            
-             
-               
-               
-               
-               
-             
-             
-               
-               
-               
-               
-             
-             
-               
-               
-               
-               
-             
-             
-               
-               
-               
-               
-             
-             
-               
-               
-               
-               
-             
-             
-               
-               
-               
-               
-             
-             
-               
-               
-               
-               
-             
-            
-          
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'right'how to position the popover - top | bottom | left | right
      selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      titlestring | function''default title value if `title` attribute isn't present
      contentstring | function''default content value if `data-content` attribute isn't present
      delaynumber | object0
-                
      delay showing/hiding the popover (ms)
      
-                
      If a number is supplied, delay is applied to both hide/show
      
-                
      Object structure is: delay: { show: 500, hide: 100 }
      
-               
      
-          
      Notice Individual popover instance options can alternatively be specified through the use of data attributes.
      
-          
      Markup
      
-          
      
-          For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
-          
      
-          
      Methods
      
-          
      $().popover(options)
      
-          
      Initializes popovers for an element collection.
      
-          
      .popover('show')
      
-          
      Reveals an elements popover.
      
-          
      $('#element').popover('show')
      
-          
      .popover('hide')
      
-          
      Hides an elements popover.
      
-          
      $('#element').popover('hide')
      
-        
      
+      
      
+      
      Using bootstrap-popover.js
      
+      
      Enable popovers via javascript:
      
+      
      $('#example').popover(options)
      
+      
      Options
      
+      
+        
+         
+           
+           
+           
+           
+         
+        
+        
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+        
+      
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'right'how to position the popover - top | bottom | left | right
      selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      titlestring | function''default title value if `title` attribute isn't present
      contentstring | function''default content value if `data-content` attribute isn't present
      delaynumber | object0
+            
      delay showing/hiding the popover (ms)
      
+            
      If a number is supplied, delay is applied to both hide/show
      
+            
      Object structure is: delay: { show: 500, hide: 100 }
      
+           
      
+      
      Notice Individual popover instance options can alternatively be specified through the use of data attributes.
      
+      
      Markup
      
+      
      
+      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
+      
      
+      
      Methods
      
+      
      $().popover(options)
      
+      
      Initializes popovers for an element collection.
      
+      
      .popover('show')
      
+      
      Reveals an elements popover.
      
+      
      $('#element').popover('show')
      
+      
      .popover('hide')
      
+      
      Hides an elements popover.
      
+      
      $('#element').popover('hide')
      
+    
      
+  
      
+
      
+
+
+
+
+
      
+  
      
+    
      Alert messages bootstrap-alert.js
      
+  
      
+  
      
+    
      
+      
      About alerts
      
+      
      The alert plugin is a tiny class for adding close functionality to alerts.
      
+      Download
+    
      
+    
      
+      
      Example alerts
      
+      
      The alerts plugin works on regular alert messages, and block messages.
      
+      
      
+        ×
+        Holy guacamole! Best check yo self, you’re not looking too good.
       
      
-    
      
-
-
-
-    
-    
      
-      
      
-        
      Alert messages bootstrap-alert.js
      
+      
      
+        ×
+        
      Oh snap! You got an error!
      
+        
      Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.
      
+        
      
+          Take this action Or do this
+        
      
       
      
-      
      
-        
      
-          
      About alerts
      
-          
      The alert plugin is a tiny class for adding close functionality to alerts.
      
-          Download
-        
      
-        
      
-          
      Example alerts
      
-          
      The alerts plugin works on regular alert messages, and block messages.
      
-          
      
-            ×
-            Holy guacamole! Best check yo self, you’re not looking too good.
-          
      
-          
      
-            ×
-            
      Oh snap! You got an error!
      
-            
      Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.
      
-            
      
-              Take this action Or do this
-            
      
-          
      
-          
      
-          
      Using bootstrap-alerts.js
      
-          
      Enable dismissal of an alert via javascript:
      
-          
      $(".alert-message").alert()
      
-          
      Markup
      
-          
      Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.
      
-          
      <a class="close" data-dismiss="alert" href="#">&times;</a>
      
-          
      Methods
      
-          
      $().alert()
      
-          
      Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.
      
-          
      .alert('close')
      
-          
      Closes an alert.
      
-          
      $(".alert-message").alert('close')
      
-          
      Events
      
-          
      Bootstrap's alert class exposes a few events for hooking into alert functionality. 
      
-          
-            
-             
-               
-               
-             
-            
-            
-             
-               
-               
-             
-             
-               
-               
-             
-            
-          
      EventDescription
      closeThis event fires immediately when the close instance method is called.
      closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
      
+      
      
+      
      Using bootstrap-alerts.js
      
+      
      Enable dismissal of an alert via javascript:
      
+      
      $(".alert-message").alert()
      
+      
      Markup
      
+      
      Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.
      
+      
      <a class="close" data-dismiss="alert" href="#">&times;</a>
      
+      
      Methods
      
+      
      $().alert()
      
+      
      Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.
      
+      
      .alert('close')
      
+      
      Closes an alert.
      
+      
      $(".alert-message").alert('close')
      
+      
      Events
      
+      
      Bootstrap's alert class exposes a few events for hooking into alert functionality. 
      
+      
+        
+         
+           
+           
+         
+        
+        
+         
+           
+           
+         
+         
+           
+           
+         
+        
+      
      EventDescription
      closeThis event fires immediately when the close instance method is called.
      closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
      
 
       $('#my-alert').bind('closed', function () {
-  // do something ...
+// do something ...
 })
      
-        
      
-      
      
-    
      
-
-
-
-    
-    
      
-      
      
-        
      Buttons bootstrap-button.js
      
-      
      
-      
      
-        
      
-          
      About
      
-          
      Do more with buttons. Control button states or create groups of buttons for more components like toolbars.
      
-          Download file
-        
      
-        
      
-          
      Example uses
      
-          
      Use the buttons plugin for states and toggles.
      
-          
-            
-             
-               
-               
-             
-             
-               
-               
-             
-             
-               
-               
-             
-             
-               
-               
-             
-            
-          
      Stateful
-                  
-                
      Single toggle
-                  
-                
      Checkbox
-                  
      
-                    
-                    
-                    
-                  
      
-               
      Radio
-                  
      
-                    
-                    
-                    
-                  
      
-               
      
-          
      
-          
      Using bootstrap-button.js
      
-          
      Enable buttons via javascript:
      
-          
      $('.tabs').button()
      
-            
      Markup
      
-          
      Data attributes are integral to the button plugin. Check out the example code below for the various markup types.
      
+    
      
+  
      
+
      
+
+
+
+
+
      
+  
      
+    
      Buttons bootstrap-button.js
      
+  
      
+  
      
+    
      
+      
      About
      
+      
      Do more with buttons. Control button states or create groups of buttons for more components like toolbars.
      
+      Download file
+    
      
+    
      
+      
      Example uses
      
+      
      Use the buttons plugin for states and toggles.
      
+      
+        
+         
+           
+           
+         
+         
+           
+           
+         
+         
+           
+           
+         
+         
+           
+           
+         
+        
+      
      Stateful
+              
+            
      Single toggle
+              
+            
      Checkbox
+              
      
+                
+                
+                
+              
      
+           
      Radio
+              
      
+                
+                
+                
+              
      
+           
      
+      
      
+      
      Using bootstrap-button.js
      
+      
      Enable buttons via javascript:
      
+      
      $('.tabs').button()
      
+        
      Markup
      
+      
      Data attributes are integral to the button plugin. Check out the example code below for the various markup types.
      
 
       <!-- Add data-toggle="button" to activate toggling on a single button -->
 <button class="btn" data-toggle="button">Single Toggle</button>
 
 <!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
 <div class="btn-group" data-toggle="buttons-checkbox">
-  <button class="btn">Left</button>
-  <button class="btn">Middle</button>
-  <button class="btn">Right</button>
+<button class="btn">Left</button>
+<button class="btn">Middle</button>
+<button class="btn">Right</button>
 </div>
 
 <!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
 <div class="btn-group" data-toggle="buttons-radio">
-  <button class="btn">Left</button>
-  <button class="btn">Middle</button>
-  <button class="btn">Right</button>
+<button class="btn">Left</button>
+<button class="btn">Middle</button>
+<button class="btn">Right</button>
 </div>
 
      
-          
      Methods
      
-          
      $().button('toggle')
      
-          
      Toggles push state. Gives btn the look that it's been activated.
      
-          
      Notice You can enable auto toggling of a button by using the data-toggle attribute.
      
-          
      <button class="btn" data-toggle="button" >...</button>
      
-          
      $().button('loading')
      
-          
      Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text.
-          
      
-           
      <button class="btn" data-loading-text="loading stuff..." >...</button>
      
-          
      
-            Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here.
-          
      
-           
      $().button('reset')
      
-           
      Resets button state - swaps text to original text.
      
-           
      $().button(string)
      
-           
      Resets button state - swaps text to any data defined text state.
      
+      
      Methods
      
+      
      $().button('toggle')
      
+      
      Toggles push state. Gives btn the look that it's been activated.
      
+      
      Notice You can enable auto toggling of a button by using the data-toggle attribute.
      
+      
      <button class="btn" data-toggle="button" >...</button>
      
+      
      $().button('loading')
      
+      
      Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text.
+      
      
+       
      <button class="btn" data-loading-text="loading stuff..." >...</button>
      
+      
      
+        Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here.
+      
      
+       
      $().button('reset')
      
+       
      Resets button state - swaps text to original text.
      
+       
      $().button(string)
      
+       
      Resets button state - swaps text to any data defined text state.
      
 
      <button class="btn" data-complete-text="finished!" >...</button>
 <script>
-  $('.btn').button('complete')
+$('.btn').button('complete')
 </script>
      
-        
      
-      
      
-    
      
-
-
-
-    
-    
      
-      
      
-        
      Collapse bootstrap-collapse.js
      
-      
      
-      
      
-        
      
-          
      About
      
-          
      Get base styles and flexible support for collapsible components like accordions and navigation.
      
-          Download file
-        
      
-        
      
-          
      Example accordion
      
-          
      Using the collapse plugin, we built a simple accordion style widget:
      
-        
-          
      
-            
      
-              
      
-                
-                  Collapsible Group Item #1
-                
-              
      
-              
      
-                
      
-                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-                
      
-              
      
+    
      
+  
      
+
      
+
+
+
+
+
      
+  
      
+    
      Collapse bootstrap-collapse.js
      
+  
      
+  
      
+    
      
+      
      About
      
+      
      Get base styles and flexible support for collapsible components like accordions and navigation.
      
+      Download file
+    
      
+    
      
+      
      Example accordion
      
+      
      Using the collapse plugin, we built a simple accordion style widget:
      
+    
+      
      
+        
      
+          
      
+            
+              Collapsible Group Item #1
+            
+          
      
+          
      
+            
      
+              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
             
      
-            
      
-              
      
-                
-                  Collapsible Group Item #2
-                
-              
      
-              
      
-                
      
-                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-                
      
-              
      
+          
      
+        
      
+        
      
+          
      
+            
+              Collapsible Group Item #2
+            
+          
      
+          
      
+            
      
+              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
             
      
-            
      
-              
      
-                
-                  Collapsible Group Item #3
-                
-              
      
-              
      
-                
      
-                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-                
      
-              
      
+          
      
+        
      
+        
      
+          
      
+            
+              Collapsible Group Item #3
+            
+          
      
+          
      
+            
      
+              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
             
      
           
      
+        
      
+      
      
 
-          
-          
      
-          
      Using bootstrap-collapse.js
      
-          
      Enable via javascript:
      
-          
      $(".collapse").collapse()
      
-          
      Options
      
-          
-            
-             
-               
-               
-               
-               
-             
-            
-            
-             
-               
-               
-               
-               
-             
-             
-               
-               
-               
-               
-             
-            
-          
      Nametypedefaultdescription
      parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
      togglebooleantrueToggles the collapsible element on invocation
      
-          
      Markup
      
-          
      Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.
      
-          
      +      
+      
      
+      
      Using bootstrap-collapse.js
      
+      
      Enable via javascript:
      
+      
      $(".collapse").collapse()
      
+      
      Options
      
+      
+        
+         
+           
+           
+           
+           
+         
+        
+        
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+        
+      
      Nametypedefaultdescription
      parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
      togglebooleantrueToggles the collapsible element on invocation
      
+      
      Markup
      
+      
      Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.
      
+      
       <button class="btn danger" data-toggle="collapse" data-target="#demo">
-  simple collapsible
+simple collapsible
 </button>
 
 <div id="demo" class="collapse in"> … </div>
      
-         
      Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.
      
-          
      Methods
      
-          
      .collapse(options)
      
-          
      Activates your content as a collapsible element. Accepts an optional options object.
+     
      Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.
      
+      
      Methods
      
+      
      .collapse(options)
      
+      
      Activates your content as a collapsible element. Accepts an optional options object.
 
       $('#myCollapsible').collapse({
-  toggle: false
+toggle: false
 })
      
-          
      .collapse('toggle')
      
-          
      Toggles a collapsible element to shown or hidden.
      
-          
      .collapse('show')
      
-          
      Shows a collapsible element.
      
-          
      .collapse('hide')
      
-          
      Hides a collapsible element.
      
-          
      Events
      
-          
      
-            Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
-          
      
-          
-            
-             
-               
-               
-             
-            
-            
-             
-               
-               
-             
-             
-               
-               
-             
-             
-               
-               
-             
-             
-               
-               
-             
-            
-          
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
      hide
-                This event is fired immediately when the hide method has been called.
-               
      hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
      
+      
      .collapse('toggle')
      
+      
      Toggles a collapsible element to shown or hidden.
      
+      
      .collapse('show')
      
+      
      Shows a collapsible element.
      
+      
      .collapse('hide')
      
+      
      Hides a collapsible element.
      
+      
      Events
      
+      
      
+        Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
+      
      
+      
+        
+         
+           
+           
+         
+        
+        
+         
+           
+           
+         
+         
+           
+           
+         
+         
+           
+           
+         
+         
+           
+           
+         
+        
+      
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
      hide
+            This event is fired immediately when the hide method has been called.
+           
      hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
      
 
 
       $('#myCollapsible').on('hidden', function () {
-  // do something ...
+// do something ...
 })
      
-        
      
-      
      
-    
      
-
-
-
-     
-    
+
+
+
+ 
+
-
-
-
-    
-    
      
-      
      
-        
      Typeahead bootstrap-typeahead.js
      
+      
      .carousel('cycle')
      
+      
      Cycles through the carousel items from left to right.
      
+      
      .carousel('pause')
      
+      
      Stops the carousel from cycling through items.
      
+      
      .carousel(number)
      
+      
      Cycles the carousel to a particular frame (0 based, similar to an array).
      
+      
      .carousel('prev')
      
+      
      Cycles to the previous item.
      
+      
      .carousel('next')
      
+      
      Cycles to the next item.
      
+      
      Events
      
+      
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
+      
+        
+         
+           
+           
+         
+        
+        
+         
+           
+           
+         
+         
+           
+           
+         
+         
+        
+      
      EventDescription
      slideThis event fires immediately when the slide instance method is invoked.
      slidThis event is fired when the carousel has completed it's slide transition.
      
+    
      
+  
+
      
+
+
+
+
+
      
+  
      
+    
      Typeahead bootstrap-typeahead.js
      
+  
      
+  
      
+    
      
+      
      About
      
+      
      A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.
      
+      Download file
+    
      
+    
      
+      
      Example
      
+      
      Start typing in the field below to show the typeahead results.
      
+      
      
+        
       
      
-      
      
-        
      
-          
      About
      
-          
      A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.
      
-          Download file
-        
      
-        
      
-          
      Example
      
-          
      Start typing in the field below to show the typeahead results.
      
-          
      
-            
-          
      
-          
      
-          
      Using bootstrap-typeahead.js
      
-          
      Call the typeahead via javascript:
      
-          
      $('.typeahead').typeahead()
      
-          
      Options
      
-          
-            
-             
-               
-               
-               
-               
-             
-            
-            
-             
-               
-               
-               
-               
-             
-            
-          
      Nametypedefaultdescription
      itemsnumber8The max number of items to display in the dropdown.
      
-
-          
      Markup
      
-          
      Add data attributes to register an element with typeahead functionality.
      
+      
      
+      
      Using bootstrap-typeahead.js
      
+      
      Call the typeahead via javascript:
      
+      
      $('.typeahead').typeahead()
      
+      
      Options
      
+      
+        
+         
+           
+           
+           
+           
+         
+        
+        
+         
+           
+           
+           
+           
+         
+        
+      
      Nametypedefaultdescription
      itemsnumber8The max number of items to display in the dropdown.
      
+
+      
      Markup
      
+      
      Add data attributes to register an element with typeahead functionality.
      
 
       <input type="text" data-provide="typeahead">
 
      
-        
      
-      
      
-    
      
-
-
-
+    
+  
+
       
       
+
     
 
 
@@ -1438,34 +1437,5 @@ $('.myCarousel').carousel({
     
     
     
-    
   
 
diff --git a/docs/less.html b/docs/less.html
index 09ff3e8e1..84f58f00d 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -7,7 +7,7 @@
     
     
 
-    
+    
     
@@ -18,10 +18,11 @@
     
 
     
-    
-    
-    
-    
+    
+    
+    
+    
+
   
 
   
@@ -33,8 +34,8 @@
         
      
           Bootstrap
           
             
-            
    • 
+            
    • 
               
                 Base CSS
                 
@@ -58,7 +59,7 @@
                 
    • Icons by Glyphicons
      • 
               
             
-            
    • 
+            
    • 
               
                 Components
                 
@@ -75,7 +76,7 @@
                 
    • Progress bars
      • 
               
             
-            
    • 
+            
    • 
               
                 Javascript plugins
                 
@@ -513,8 +514,6 @@
 
      • 
 
 
-
-
       
       
+
     
 
+
     
     
-    
+    
+    
     
-    
+    
+    
+    
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index f068c837c..7fdbea0ec 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -7,7 +7,7 @@
     
     
 
-    
+    
     
@@ -18,10 +18,11 @@
     
 
     
-    
-    
-    
-    
+    
+    
+    
+    
+
   
 
   
@@ -33,7 +34,7 @@
         
      
           Bootstrap
           
             
-            
    • 
+            
    • 
               
                 Base CSS
                 
@@ -58,7 +59,7 @@
                 
    • Icons by Glyphicons
      • 
               
             
-            
    • 
+            
    • 
               
                 Components
                 
@@ -75,7 +76,7 @@
                 
    • Progress bars
      • 
               
             
-            
    • 
+            
    • 
               
                 Javascript plugins
                 
@@ -95,7 +96,7 @@
                 
    • Typeahead
      • 
               
             
-            
    • 
+            
    • 
               
                 Using LESS
               
@@ -107,12 +108,13 @@
 
     
      
 
-      
-      
      
-        
      Scaffolding
      
-        
      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
      
-      
      
+
+
+
      
+  
      Scaffolding
      
+  
      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
      
+
      
 
 
 
@@ -417,8 +419,6 @@
     
      
   
      • 
 
-
-
       
       
+
     
 
+
     
     
-    
+    
+    
     
     
-    
+    
+    
     
+    
+    
+    
+    
+    
+    
+    
+    
     
-
   
 
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
new file mode 100644
index 000000000..cc36a05ed
--- /dev/null
+++ b/docs/templates/layout.mustache
@@ -0,0 +1,144 @@
+
+
+  
+    
+    Bootstrap, from Twitter
+    
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+
+  
+
+  
+
+    
+    
      
+      
      
+        
      
+          Bootstrap
+          
+        
      
+      
      
+    
      
+
+    
      
+
+{{>body}}
+
+      
+      
+
+    
      
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
new file mode 100644
index 000000000..3933c867d
--- /dev/null
+++ b/docs/templates/pages/base-css.mustache
@@ -0,0 +1,1427 @@
+
+
      
+  
      Base CSS
      
+  
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
+
      
+
+
+
+
      
+  
      
+    
      Typography Headings, paragraphs, lists, and other inline type elements
      
+  
      
+
+  
      Headings & body copy
      
+
+  
+  
      
+    
      
+      
      Typographic scale
      
+      
      The entire typographic grid is based on two Less variables in our preboot.less file: @baseFontSize and @baseLineHeight. The first is the base font-size used throughout and the second is the base line-height.
      
+      
      We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.
      
+    
      
+    
      
+      
      Example body text
      
+      
      Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.
      
+      
      Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.
      
+    
      
+    
      
+      
      
+        
      h1. Heading 1
      
+        
      h2. Heading 2
      
+        
      h3. Heading 3
      
+        
      h4. Heading 4
      
+        
      h5. Heading 5
      
+        
      h6. Heading 6
      
+      
      
+    
      
+  
      
+
+  
+  
      Emphasis, address, and abbreviation
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      ElementUsageOptional
      
+          <strong>
+        
+          For emphasizing a snippet of text with important
+        
+          None
+        
      
+          <em>
+        
+          For emphasizing a snippet of text with stress
+        
+          None
+        
      
+          <abbr>
+        
+          Wraps abbreviations and acronyms to show the expanded version on hover
+        
+          Include optional title for expanded text
+        
      
+          <address>
+        
+          For contact information for its nearest ancestor or the entire body of work
+        
+          Preserve formatting by ending all lines with <br>
+        
      
+
+  
      
+    
      
+      
      Using emphasis
      
+      
      Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.
      
+      
      Note: Feel free to use <b> and <i> in HTML5, but their usage has changed a bit. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.
      
+    
      
+    
      
+      
      Example addresses
      
+      
      Here are two examples of how the <address> tag can be used:
      
+      
      
+        Twitter, Inc.
      
+        795 Folsom Ave, Suite 600
      
+        San Francisco, CA 94107
      
+        P: (123) 456-7890
+      
      
+      
      
+        Full Name
      
+        first.last@gmail.com
+      
      
+    
      
+    
      
+      
      Example abbreviations
      
+      
      Abbreviations are styled with uppercase text and a light dotted bottom border. They also have a help cursor on hover so users have extra indication something will be shown on hover.
      
+      
      HTML is the best thing since sliced bread.
      
+      
      An abbreviation of the word attribute is attr.
      
+    
      
+  
      
+
+
+  
+  
      Blockquotes
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      ElementUsageOptional
      
+          <blockquote>
+        
+          Block-level element for quoting content from another source
+        
+          
      Add cite attribute for source URL
      
+          Use .pull-left and .pull-right classes for floated options
+        
      
+          <small>
+        
+          Optional element for adding a user-facing citation, typically an author with title of work
+        
+          Place the <cite> around the title or name of source
+        
      
+  
      
+    
      
+      
      To include a blockquote, wrap <blockquote> around any HTML as the quote. For straight quotes we recommend a <p>.
      
+      
      Include an optional <small> element to cite your source and you'll get an em dash &mdash; before it for styling purposes.
      
+    
      
+    
      
+
      +<blockquote>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
+  <small>Someone famous</small>
+</blockquote>
+
      
+    
      
+  
      
+
+  
      Example blockquotes
      
+  
      
+    
      
+      
      Default blockquotes are styled as such:
      
+      
      
+        
      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.
      
+        Someone famous in Body of work
+      
      
+    
      
+    
      
+      
      To float your blockquote to the right, add class="pull-right":
      
+      
      
+        
      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.
      
+        Someone famous in Body of work
+      
      
+    
      
+  
      
+
+
+  
+  
      Lists
      
+  
      
+    
      
+      
      Unordered
      
+      
      <ul>
      
+      
        
+        
      • Lorem ipsum dolor sit amet
        • 
+        
      • Consectetur adipiscing elit
        • 
+        
      • Integer molestie lorem at massa
        • 
+        
      • Facilisis in pretium nisl aliquet
        • 
+        
      • Nulla volutpat aliquam velit
+          
          
+            
        • Phasellus iaculis neque
          • 
+            
        • Purus sodales ultricies
          • 
+            
        • Vestibulum laoreet porttitor sem
          • 
+            
        • Ac tristique libero volutpat at
          • 
+          
        
+        
        • 
+        
      • Faucibus porta lacus fringilla vel
        • 
+        
      • Aenean sit amet erat nunc
        • 
+        
      • Eget porttitor lorem
        • 
+      
      
+    
      
+    
      
+      
      Unstyled
      
+      
      <ul class="unstyled">
      
+      
        
+        
      • Lorem ipsum dolor sit amet
        • 
+        
      • Consectetur adipiscing elit
        • 
+        
      • Integer molestie lorem at massa
        • 
+        
      • Facilisis in pretium nisl aliquet
        • 
+        
      • Nulla volutpat aliquam velit
+          
          
+            
        • Phasellus iaculis neque
          • 
+            
        • Purus sodales ultricies
          • 
+            
        • Vestibulum laoreet porttitor sem
          • 
+            
        • Ac tristique libero volutpat at
          • 
+          
        
+        
        • 
+        
      • Faucibus porta lacus fringilla vel
        • 
+        
      • Aenean sit amet erat nunc
        • 
+        
      • Eget porttitor lorem
        • 
+      
      
+    
      
+    
      
+      
      Ordered
      
+      
      <ol>
      
+      
        
+        
      1. Lorem ipsum dolor sit amet
        2. 
+        
      2. Consectetur adipiscing elit
        3. 
+        
      3. Integer molestie lorem at massa
        4. 
+        
      4. Facilisis in pretium nisl aliquet
        5. 
+        
      5. Nulla volutpat aliquam velit
        6. 
+        
      6. Faucibus porta lacus fringilla vel
        7. 
+        
      7. Aenean sit amet erat nunc
        8. 
+        
      8. Eget porttitor lorem
        9. 
+      
      
+    
      
+    
      
+      
      Description
      
+      
      <dl>
      
+      
      
+        
      Description lists
      
+        
      A description list is perfect for defining terms.
      
+        
      Euismod
      
+        
      Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
      
+        
      Donec id elit non mi porta gravida at eget metus.
      
+        
      Malesuada porta
      
+        
      Etiam porta sem malesuada magna mollis euismod.
      
+      
      
+    
      
+  
      
+
+
+  
+
+  
      Code Inline and block
      
+  
+    
+      
+        
+        
+      
+    
+    
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+    
+  
      ElementResult
      <code>In a line of text like this, your wrapped code will look like this <html> element.
      <pre>
+
      <div>
+  <h1>Heading</h1>
+  <p>Something right here...</p>
+</div>
      
+          
      Note: Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.
      
+        
      <pre class="prettyprint">
+          
      Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
+
      <div>
+  <h1>Heading</h1>
+  <p>Something right here...</p>
+</div>
      
+
      <div>
+  <h1>Heading</h1>
+  <p>Something right here...</p>
+</div>
      
+          
      Download google-code-prettify and view the readme for how to use.
      
+        
      
+
+  
+  
      Inline labels for special attention
      
+  
+    
+      
+        
+        
+      
+    
+    
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+    
+  
      LabelsMarkup
      
+          Default
+        
+          <span class="label">Default</span>
+        
      
+          New
+        
+          <span class="label success">New</span>
+        
      
+          Warning
+        
+          <span class="label warning">Warning</span>
+        
      
+          Important
+        
+          <span class="label important">Important</span>
+        
      
+          Notice
+        
+          <span class="label notice">Notice</span>
+        
      
+
+
      
+
+
+
+
+
      
+  
      
+    
      Tables For, you guessed it, tabular data
      
+  
      
+
+  
      Table markup
      
+  
      
+    
      
+      
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      TagDescription
      
+              <table>
+            
+              Wrapping element for displaying data in a tabular format
+            
      
+              <thead>
+            
+              Container element for table header rows (<tr>) to label table columns
+            
      
+              <tbody>
+            
+              Container element for table rows (<tr>) in the body of the table
+            
      
+              <tr>
+            
+              Container element for a set of table cells (<td> or <th>) that appears on a single row
+            
      
+              <td>
+            
+              Default table cell
+            
      
+              <th>
+            
+              Special table cell for column (or row, depending on scope and placement) labels
      
+              Must be used within a <thead>
+            
      
+              <caption>
+            
+              Description or summary of what the table holds, especially useful for screen readers
+            
      
+    
      
+    
      
+
      +<table>
+  <thead>
+    <tr>
+      <th>...</th>
+      <th>...</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>...</td>
+      <td>...</td>
+    </tr>
+  </tbody>
+</table>
+
      
+    
      
+  
      
+
+  
      Table options
      
+  
+  
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      NameClassDescription
      DefaultNoneNo styles, just columns and rows
      Basic
+          .table
+        Only horizontal lines between rows
      Bordered
+          .table-bordered
+        Rounds corners and adds outter border
      Zebra-stripe
+          .table-striped
+        Adds light gray background color to odd rows (1, 3, 5, etc)
      Condensed
+          .table-condensed
+        Cuts vertical padding in half, from 8px to 4px, within all td and th elements
      
+
+
+  
      Example tables
      
+
+  
      1. Default table styles
      
+  
      
+    
      
+      
      Tables are automatically styled with only a few borders to ensure readability and maintain structure. With 2.0, the .table class is required.
      
+
      +<table class="table">
+  ...
+</table>
      
+    
      
+    
      
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
      #First NameLast NameLanguage
      1MarkOttoCSS
      2JacobThorntonJavascript
      3StuDentHTML
      
+    
      
+  
      
+
+
+  
      2. Striped table
      
+  
      
+    
      
+      
      Get a little fancy with your tables by adding zebra-striping—just add the .table-striped class.
      
+      
      Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.
      
+
      +<table class="table table-striped">
+  ...
+</table>
      
+    
      
+    
      
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
      #First NameLast NameLanguage
      1MarkOttoCSS
      2JacobThorntonJavascript
      3StuDentHTML
      
+    
      
+  
      
+
+
+  
      3. Bordered table
      
+  
      
+    
      
+      
      Add borders around the entire table and rounded corners for aesthetic purposes.
      
+
      +<table class="table table-bordered">
+  ...
+</table>
      
+    
      
+    
      
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
      #First NameLast NameLanguage
      1Mark OttoCSS
      2JacobThorntonJavascript
      3StuDent
      3BrosefStalinHTML
      
+    
      
+  
      
+
+
+  
      4. Condensed table
      
+  
      
+    
      
+      
      Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 10px to 5px).
      
+
      +<table class="table table-condensed">
+  ...
+</table>
      
+    
      
+    
      
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
      #First NameLast NameLanguage
      1MarkOttoCSS
      2JacobThorntonJavascript
      3StuDentHTML
      
+    
      
+  
      
+
+
+
+  
      5. Striped table w/ TableSorter.js
      
+  
      
+    
      
+      
      Include the jQuery Tablesorter plugin and automaically get clear styles for sorted columns.
      
+
      +<script src="jquery.tablesorter.js"></script>
+<script >
+  $(function() {
+    $("table#sortTableExample")
+    .tablesorter({
+      sortList: [[1,0]]
+    });
+  });
+</script>
+<table class="table table-striped">
+  ...
+</table>
      
+    
      
+    
      
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
      #First NameLast NameLanguage
      1MarkOttoCSS
      2JacobThorntonJavascript
      3StuDentHTML
      4BrosefStalinHTML
      
+      
      Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.
      
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
      #First NameLast NameLanguage
      1MarkOttoCSS
      2JacobThorntonJavascript
      3StuDentHTML
      4BrosefStalinHTML
      
+    
      
+  
      
+
      
+
+
+
+
+
      
+  
      
+    
      Forms
      
+  
      
+  
      
+    
      
+      
      Flexible HTML and CSS
      
+      
      The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.
      
+      
      More complicated layouts come with succinct and scalable classes for easy styling and event binding, so you're covered at every step.
      
+    
      
+    
      
+      
      Four layouts included
      
+      
      Bootstrap comes with support for four types of form layouts:
      
+      
        
+        
      • Vertical (default)
        • 
+        
      • Search
        • 
+        
      • Inline
        • 
+        
      • Horizontal
        • 
+      
      
+      
      Different types of form layouts require some changes to markup, but the controls themselves remain and behave the same.
      
+    
      
+    
      
+      
      Control states and more
      
+      
      Bootstrap's forms include styles for all the base form controls like input, textarea, and select you'd expect. But it also comes with a number of custom components like appended and prepended inputs and support for lists of checkboxes.
      
+      
      States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.
      
+    
      
+  
      
+
+  
      Four types of forms
      
+  
      Bootstrap provides simple markup and styles for four styles of common web forms.
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      NameClassDescription
      Vertical (default).vertical-form (not required)Stacked, left-aligned labels over controls
      Horizontal.form-horizontalFloat left, right-aligned labels on same line as controls
      Inline.form-inlineLeft-aligned label and inline-block controls for compact style
      Search.form-searchExtra-rounded text input for a typical search aesthetic
      
+
+
+  
      Example forms using just form controls, no extra markup
      
+  
      
+    
      
+      
      Basic form
      
+      
      With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.
      
+      
      
+        
+        
+        
+        
+      
      
+    
      
+    
      
+      
      Search form
      
+      
      Reflecting default WebKit styles, just add .form-search for extra rounded search fields.
      
+      
      
+        
+        
+      
      
+    
      
+    
      
+      
      Inline form
      
+      
      Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.
      
+      
      
+        
+        
+        
+      
      
+    
      
+  
      
+
+  
      
+
+  
      Horizontal forms
      
+  
      
+    
      
+      
      
+        Controls Bootstrap supports
+        
      
+          
+          
      
+            
+            
      In addition to freeform text, any HTML5 text-based input appears like so.
      
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
+        
      
+      
      
+    
      
+    
      
+      
      
+        
      What's included
      
+        
      Shown on the left are all the default form controls we support. Here's the bulleted list:
      
+        
        
+          
      • text inputs (text, password, email, etc)
        • 
+          
      • checkbox
        • 
+          
      • radio
        • 
+          
      • select
        • 
+          
      • multiple select
        • 
+          
      • file input
        • 
+          
      • textarea
        • 
+        
      
+        
      
+        
      New defaults with v2.0
      
+        
      Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.
      
+      
      
+    
      
+  
      
+
+  
      
+
+  
      
+    
      
+      
      
+        Form control states
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
+            Something may have gone wrong
+          
      
+        
      
+        
      
+          
+          
      
+            
+            Please correct the error
+          
      
+        
      
+        
      
+          
+          
      
+            
+            Woohoo!
+          
      
+        
      
+        
      
+          
+          
+        
      
+      
      
+    
      
+    
      
+      
      
+        
      Redesigned browser states
      
+        
      Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
      
+        
      
+        
      Form validation
      
+        
      It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
      
+
      +<fieldset
+  class="control-group error">
+  ...
+</fieldset>
+
      
+      
      
+    
      
+  
      
+
+  
      
+
+  
      
+    
      
+      
      
+        Extending form controls
+        
      
+          
+          
      
+            
+            
+            
+            
      Use the same .span* classes from the grid system for input sizes.
      
+          
      
+        
      
+        
      
+          
+          
      
+            
      
+              @
+              
+            
      
+            
      Here's some help text
      
+          
      
+        
      
+        
      
+          
+          
      
+            
      
+              
+              .00
+            
      
+            
      Here's more help text
      
+          
      
+        
      
+        
      
+          
+          
      
+            
+            
+            
+          
      
+        
      
+        
      
+          
+          
      
+            
+            
+            
+            
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
+          
      
+        
      
+        
      
+          
+          
      
+            
+            
+          
      
+        
      
+        
      
+          
+          
+        
      
+      
      
+    
      
+    
      
+      
      
+        
      Prepend & append inputs
      
+        
      Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.
      
+        
      
+        
      Checkboxes and radios
      
+        
      Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.
      
+        
      Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.
      
+      
      
+    
      
+  
      
+
      
+
+
+
+
      
+  
      
+    
      Buttons
      
+  
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      ButtonClassDescription
      Default.btnStandard gray button with gradient
      Primary.primaryProvides extra visual weight and identifies the primary action in a set of buttons
      Info.infoUsed as an alternate to the default styles
      Success.successIndicates a successful or positive action
      Danger.dangerIndicates a dangerous or potentially negative action
      
+
+  
      
+    
      
+      
      Buttons for actions
      
+      
      As a convention, buttons should only be used for actions while hyperlinks are to be used for objects. For instance, "Download" should be a button while "recent activity" should be a link.
      
+    
      
+    
      
+      
      For anchors and forms
      
+      
      Button styles can be applied to anything with the .btn applied. However, typically you’ll want to apply these to only <a> and <button> elements.
      
+    
      
+    
      
+      
      Note: All buttons must include the .btn class. Button styles should be applied to <button> and <a> elements for consistency.
      
+    
      
+  
      
+
+  
      
+    
      
+      
      Multiple sizes
      
+      
      Fancy larger or smaller buttons? Have at it!
      
+      
      
+        Primary action
+        Action
+      
      
+      
      
+        Primary action
+        Action
+      
      
+    
      
+    
      
+      
      Disabled state
      
+      
      For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.
      
+      
      
+        Primary action
+        Action
+      
      
+      
      
+         
+      
      
+    
      
+  
      
+
+  
      
+
+
      
+
+
+
+
+
      
+  
      
+    
      Icons Graciously provided by Glyphicons
      
+  
      
+  
      
+    
      
+      
      
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
      
+    
      
+    
      
+      
      
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
      
+    
      
+    
      
+      
      
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
      
+    
      
+    
      
+      
      
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
      
+    
      
+    
      
+      
      
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
      
+    
      
+    
      
+      
      Light red background color is only used to show the dimensions of the icons in the docs.
      
+    
      
+  
      
+
+  
      
+
+  
      
+    
      
+      
      Built as a sprite
      
+      
      Instead of making every icon an extra request, we've compiled them into a sprite—a bunch of images in one file that uses CSS to position the images with background-position. This is the same method we use on Twitter.com and it has worked well for us.
      
+      
      Glyphicons has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit. Please consider doing the same in your projects.
      
+    
      
+    
      
+      
      How to use
      
+      
      With v2.0.0, the <i> tag is essentially dedicated to iconography. To use the icons, you can place the follow code wherever you like one to appear:
      
+
      +<i class="chevron-left"></i>
+
      
+      
      There are over 100 classes to choose from for your icons. Just add an <i> tag with the right class and you're set. You can find the full list in sprites.less or right here in this document.
      
+    
      
+    
      
+      
      Use cases
      
+      
      Icons are great, but where would one use them? Here are a few ideas:
      
+      
        
+        
      • As visuals for your sidebar navigation
        • 
+        
      • For a purely icon-driven nav
        • 
+        
      • For buttons to help convey the meaning of an action
        • 
+        
      • With links to share context on a user's destination
        • 
+      
      
+      
      Essentially, anywhere you can put an <i> tag, you can put an icon.
      
+    
      
+  
      
+
+  
      Examples
      
+  
      
+    
      
+      
      Use them in buttons, or in button groups for a toolbar style presentation.
      
+      
      
+         Refresh
+         Settings
+      
      
+      
      
+        
      
+          
+          
+          
+        
      
+        
      
+          
+          
+          
+          
+        
      
+      
      
+    
      
+    
      
+      
      Or, use them in navigation.
      
+      
      
+        
+      
       
+    
      
+  
      
+
      
\ No newline at end of file
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
new file mode 100644
index 000000000..21ddf4747
--- /dev/null
+++ b/docs/templates/pages/components.mustache
@@ -0,0 +1,1176 @@
+
+
      
+  
      Components
      
+  
      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
      
+
      
+
+
+  
+  
      
+    
      
+      
      Button groups Join buttons for more toolbar-like functionality
      
+    
      
+    
      
+      
      
+        
      Button groups
      
+        
      Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.
      
+        
      You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.
      
+        
      
+          
      
+            Left
+            Middle
+            Right
+          
      
+        
      
+        
      
+          
      
+            
      
+              1
+              2
+              3
+              4
+            
      
+            
      
+              5
+              6
+              7
+            
      
+            
      
+              8
+            
      
+          
      
+        
      
+
+      
      
+      
      
+        
      Example markup
      
+        
      Here's how the HTML looks for a standard button group built with anchor tag buttons:
      
+
      +<div class="btn-group">
+  <a class="btn" href="#">1</a>
+  <a class="btn" href="#">2</a>
+  <a class="btn" href="#">3</a>
+</div>
+
      
+      
      And with a toolbar for multiple groups:
      
+
      +<div class="btn-toolbar">
+  <div class="btn-group">
+    ...
+  </div>
+</div>
+
      
+      
      
+      
      
+        
      Checkbox and radio flavors
      
+        
      Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the Javascript docs for that.
      
+        
      Get the javascript »
      
+        
      
+        
      Heads up
      
+        
      CSS for button groups is in a separate file, button-groups.less.
      
+      
      
+    
      
+  
      
+
+
+
+  
+  
      
+    
      
+      
      Split button dropdowns Built on button groups to provide contextual menus
      
+    
      
+    
      
+      
      
+        
      Split button dropdowns
      
+        
      Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.
      
+        
      
+          
      
+            
      
+              Action
+              
+              
+            
      
+            
      
+              Action
+              
+              
+            
      
+            
      
+              Danger
+              
+              
+            
      
+          
      
+          
      
+            
      
+              Success
+              
+              
+            
      
+            
      
+              Info
+              
+              
+            
      
+          
      
+        
       
+      
      
+      
      
+        
      Example markup
      
+        
      Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.
      
+
      +<div class="btn-group">
+  <a class="btn" href="#">Action</a>
+  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+    <!-- dropdown menu links -->
+  </ul>
+</div>
+
      
+      
      
+    
      
+  
      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      
+  
      
+    
      Pagination Two options for paging through content
      
+  
      
+
+  
      Multi-page pagination
      
+  
      
+    
      
+      
      When to use
      
+      
      Ultra simplistic and minimally styled pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.
      
+      
      Stateful page links
      
+      
      Links are customizable and work in a number of circumstances with the right class. .disabled for unclickable links and .active for current page.
      
+      
      Flexible alignment
      
+      
      Add either of two optional classes to change the alignment of pagination links: .pagination-centered and .pagination-right.
      
+    
      
+    
      
+      
      Examples
      
+      
      The default pagination component is flexible and works in a number of variations.
      
+      
+      
+      
+      
+    
      
+    
      
+      
      Markup
      
+      
      Wrapped in a <div>, pagination is just a <ul>.
      
+
      +<div class="pagination">
+  <ul>
+    <li><a href="#">Prev</a></li>
+    <li class="active">
+      <a href="#">1</a>
+    </li>
+    <li><a href="#">2</a></li>
+    <li><a href="#">3</a></li>
+    <li><a href="#">4</a></li>
+    <li><a href="#">Next</a></li>
+  </ul>
+</div>
+
      
+    
      
+  
      
+
+  
      Pager For quick previous and next links
      
+  
      
+    
      
+      
      About pager
      
+      
      The pager component is a set of links for simple pagination implemenations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.
      
+    
      
+    
      
+      
      Default example
      
+      
      By default, the pager centers links.
      
+      
+
      +<ul class="pager">
+  <li>
+    <a href="#">Previous</a>
+  </li>
+  <li>
+    <a href="#">Next</a>
+  </li>
+</ul>
+
      
+    
      
+    
      
+      
      Aligned links
      
+      
      Alternatively, you can align each link to the sides:
      
+      
+
      +<ul class="pager">
+  <li class="previous">
+    <a href="#">&larr; Older</a>
+  </li>
+  <li class="next">
+    <a href="#">Newer &rarr;</a>
+  </li>
+</ul>
+
      
+    
      
+  
      
+
      
+
+
+
+
+
      
+  
      
+    
      Thumbnails Grids of images, videos, text, and more
      
+  
      
+
+  
      
+    
      
+      
      Default thumbnails
      
+      
      By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.
      
+      
+    
      
+    
      
+      
      Highly customizable
      
+      
      With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.
      
+      
        
+        
      • 
+          
        
+            
+            
        
+              
        Thumbnail label
        
+              
        Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
        
+              
        Action Action
        
+            
        
+          
        
+        
        • 
+        
      • 
+          
        
+            
+            
        
+              
        Thumbnail label
        
+              
        Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
        
+              
        Action Action
        
+            
        
+          
        
+        
        • 
+      
      
+    
      
+  
      
+
+  
      
+    
      
+      
      Why use thumbnails
      
+      
      Thumbnails (previously .media-grid up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.
      
+    
      
+    
      
+      
      Simple, flexible markup
      
+      
      Thumbnail markup is simple—a ul with any number of li elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.
      
+    
      
+    
      
+      
      Uses grid column sizes
      
+      
      Lastly, the thumbnails component uses existing grid system classes—like .span2 or .span3—for control of thumbnail dimensions.
      
+    
      
+  
      
+
+  
      
+    
      
+      
      The markup
      
+      
      As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup for linked images:
      
+
      +<ul class="thumbnails">
+  <li class="span3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/210x150" alt="">
+    </a>
+  </li>
+  ...
+</ul>
+
      
+      
      For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <a> for a <div> like so:
      
+
      +<ul class="thumbnails">
+  <li class="span3">
+    <div class="thumbnail">
+      <img src="http://placehold.it/210x150" alt="">
+      <h5>Thumbnail label</h5>
+      <p>Thumbnail caption right here...</p>
+    </div>
+  </li>
+  ...
+</ul>
+
      
+    
      
+    
      
+      
      More examples
      
+      
      Explore all your options with the various grid classes available to you. You can also mix and match different sizes.
      
+      
+    
      
+  
      
+
+
      
+
+
+
+
+
      
+  
      
+    
      Alerts Styles for success, warning, and error messages
      
+  
      
+
+  
      Lightweight defaults
      
+  
      
+    
      
+      
      Rewritten base class
      
+      
      With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outter <div>.
      
+      
      Single alert message
      
+      
      For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to .alert-block.
      
+      
      
+      
      Goes great with javascript
      
+      
      Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.
      
+      
      Get the plugin »
      
+    
      
+    
      
+      
      Example alerts
      
+      
      Wrap your message and an optional close icon in a div with simple class.
      
+      
      
+        ×
+        Warning! Best check yo self, you’re not looking too good.
+      
      
+
      +<div class="alert">
+  <a class="close">×</a>
+  <strong>Warning!</strong> Best check yo self, you’re not looking too good.
+</div>
+
      
+      
      Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.
      
+      
      
+        ×
+        
      Warning!
      
+        
      Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
      
+      
      
+
      +<div class="alert alert-block">
+  <a class="close">×</a>
+  <h4 class="alert-heading">Warning!</h4>
+  Best check yo self, you’re not...
+</div>
+
      
+    
      
+  
      
+
+  
      Contextual alternatives Add optional classes to change an alert's connotation
      
+  
      
+    
      
+      
      Error or danger
      
+      
      
+        ×
+        Oh snap! Change a few things up and try submitting again.
+      
      
+
      +<div class="alert alert-error">
+  ...
+</div>
+
      
+    
      
+    
      
+      
      Success
      
+      
      
+        ×
+        Well done! You successfully read this important alert message.
+      
      
+
      +<div class="alert alert-success">
+  ...
+</div>
+
      
+    
      
+    
      
+      
      Information
      
+      
      
+        ×
+        Heads up! This alert needs your attention, but it’s not super important.
+      
      
+
      +<div class="alert alert-info">
+  ...
+</div>
+
      
+    
      
+  
      
+
+
      
+
+
+
+
+      
      
+        
      
+          
      Progress bars For loading, redirecting, or action status
      
+        
      
+
+        
      Examples and markup
      
+        
      
+          
      
+            
      Basic
      
+            
      Default progress bar with a vertical gradient.
      
+            
      
+              
      
+            
      
+
      +<div class="progress">
+  <div class="bar"
+       style="width: 60%;"></div>
+</div>
+
      
+          
      
+          
      
+            
      Striped
      
+            
      Uses a gradient to create a striped effect.
      
+            
      
+              
      
+            
      
+
      +<div class="progress info
+     striped">
+  <div class="bar"
+       style="width: 20%;"></div>
+</div>
+
      
+          
      
+          
      
+            
      Animated
      
+            
      Takes the striped example and animates it.
      
+            
      
+              
      
+            
      
+
      +<div class="progress danger
+     striped active">
+  <div class="bar"
+       style="width: 40%;"></div>
+</div>
+
      
+          
      
+        
      
+
+        
      Options and browser support
      
+        
      
+          
      
+            
      Additional colors
      
+            
      Progress bars utilize some of the same classes as buttons and alert messages for quick styling.
      
+            
        
+              
      • .info
        • 
+              
      • .success
        • 
+              
      • .danger
        • 
+            
      
+            
      Alternatively, you can customize the LESS files and roll your own colors and sizes.
      
+          
      
+          
      
+            
      Behavior
      
+            
      Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.
      
+            
      If you use the .active class, your .striped progress bars will animate the stripes left to right.
      
+          
      
+          
      
+            
      Browser support
      
+            
      Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-8 or older versions of Firefox.
      
+            
      Opera does not support animations at this time.
      
+          
      
+        
      
+
+      
      
\ No newline at end of file
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
new file mode 100644
index 000000000..f07116a5a
--- /dev/null
+++ b/docs/templates/pages/index.mustache
@@ -0,0 +1,188 @@
+
      
+
+  
+  
      
+    
      
+      
      Bootstrap,
       from Twitter
      
+      
      Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.
      
+      
      
+        Download on GitHub
+        Get started →
+      
      
+
+      
      
+        
      Feature highlights
      
+        
        
+          
      • × Built on LESS
        • 
+          
      • × Complete styleguide docs
        • 
+          
      • × Fully responsive design
        • 
+          
      • × Small footprint (7kb gzipped)
        • 
+          
      • × Support for IE7 and up
        • 
+          
      • × Custom jQuery plugins
        • 
+          
      • × Dozens of components
        • 
+        
      
+      
      
+    
      
+  
      
+
+  
+
+
+  
      
+    
      Built with Bootstrap.
      
+    
      For even more sites built with Bootstrap, visit the unofficial Tumblr.
      
+    
+
+    
      Designed for everyone, everywhere.
      
+    
      Need reasons to love Bootstrap? Look no further.
      
+    
      
+      
      
+        
+        
      Built for and by nerds
      
+        
      Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.
      
+      
      
+      
      
+        
+        
      For all skill levels
      
+        
      Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.
      
+      
      
+      
      
+        
+        
      Cross-everything
      
+        
      Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.
      
+      
      
+    
      
+    
      
+      
      
+        
+        
      12-column grid
      
+        
      Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.
      
+      
      
+      
      
+        
+        
      Responsive design
      
+        
      With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.
      
+      
      
+      
      
+        
+        
      Styleguide docs
      
+        
      Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.
      
+      
      
+    
      
+    
      
+      
      
+        
+        
      Growing library
      
+        
      Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.
      
+      
      
+      
      
+        
+        
      Custom jQuery plugins
      
+        
      What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.
      
+      
      
+      
      
+        
+        
      Built on LESS
      
+        
      Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.
      
+      
      
+    
      
+    
      
+      
      
+        
+        
      HTML5
      
+        
      Built to support new HTML5 elements and syntax.
      
+      
      
+      
      
+        
+        
      CSS3
      
+        
      Progressively enhanced components for ultimate style.
      
+      
      
+      
      
+        
+        
      Open-source
      
+        
      Built for and maintained by the community via GitHub.
      
+      
      
+      
      
+        
+        
      Made at Twitter
      
+        
      Brought to you by an experienced engineer and designer.
      
+      
      
+    
      
+
+
+    
+    
      Get started in no time.
      
+    
      Quickly start using Bootstrap within your workflow and development process.
      
+    
+      
+        
+          
+          
+          
+        
+      
+    
      
+            
      Hotlink the CSS
      
+            
      For the quickest and easiest start, just copy this snippet into your webpage.
      
+            
      
+              
+            
      
+                		
+            
      Use it with LESS
      
+            
      A fan of using LESS? No problem, just clone the repo and add these lines:
      
+            
      
+              
+            
      
+                		
+            
      Fork on GitHub
      
+            
      Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.
      
+            
      Bootstrap on GitHub »
      
+            
      Currently v2.0.0
      
+          
      
+  
      
+
      
\ No newline at end of file
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
new file mode 100644
index 000000000..aefe87846
--- /dev/null
+++ b/docs/templates/pages/javascript.mustache
@@ -0,0 +1,1299 @@
+
+
      
+  
      Javascript for Bootstrap
      
+  
      Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
+
      
+
+
+  
+  
      
+    
      
+      
      jQuery plugins A dozen Bootstrap plugins to get you started
      
+    
      
+  
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+  
       
+  
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+  
       
+  
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+    
      
+      
+    
      
+  
       
+  
      
+    
      
+      
+    
      
+  
      
+  
      
+  Select/Unselect All Plugins
+  
      Note: All plugins require the latest version of jQuery to be included.
      
+
      
+
+
+
+
+
      
+  
      
+    
      Modals bootstrap-modal.js
      
+  
      
+  
      
+    
      
+      
      About modals
      
+      
      A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.
      
+      Download file
+    
      
+    
      
+      
      Static example
      
+      
      Below is a statically rendered modal.
      
+      
      
+        
      
+          
      
+            ×
+            
      Modal header
      
+          
      
+          
      
+            
      One fine body…
      
+          
      
+          
      
+            Save changes
+            Close
+          
      
+        
      
+      
       
+
+      
      Live demo
      
+      
      Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.
      
+      
+      
+      Launch demo modal
+
+      
      
+
+      
      Using bootstrap-modal
      
+      
      Call the modal via javascript:
      
+      
      $('#myModal').modal(options)
      
+      
      Options
      
+      
+        
+         
+           
+           
+           
+           
+         
+        
+        
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+        
+      
      Nametypedefaultdescription
      backdropbooleantrueIncludes a modal-backdrop element
      keyboardbooleantrueCloses the modal when escape key is pressed
      
+      
      Markup
      
+      
      You can activate modals on your page easily without having to write a single line of javascript. Just set data-toggle="modal" on a controller element with a data-target="#foo" or href="#foo" which corresponds to a modal element id, and when clicked, it will launch your modal.
      
+      
      Also, to add options to your modal instance, just include them as additional data attributes on either the control element or the modal markup itself.
      
+
      +<a class="btn" data-toggle="modal" href="#myModal" >Launch Modal</a>
+
      
+
+
      +<div class="modal">
+<div class="modal-header">
+<a href="#" class="close js-dismiss">×</a>
+<h3>Modal header</h3>
+</div>
+<div class="modal-body">
+<p>One fine body…</p>
+</div>
+<div class="modal-footer">
+<a href="#" class="btn primary">Save changes</a>
+<a href="#" class="btn">Close</a>
+</div>
+</div>
+
      
+      
      Notice If you want your modal to animate in and out, just add a .fade class to the .modal element (refer to the demo to see this in action).
      
+      
      Methods
      
+      
      .modal(options)
      
+      
      Activates your content as a modal. Accepts an optional options object.
+
      +$('#myModal').modal({
+keyboard: false
+})
      
+      
      .modal('toggle')
      
+      
      Manually toggles a modal.
      
+      
      $('#myModal').modal('toggle')
      
+      
      .modal('show')
      
+      
      Manually opens a modal.
      
+      
      $('#myModal').modal('show')
      
+      
      .modal('hide')
      
+      
      Manually hides a modal.
      
+      
      $('#myModal').modal('hide')
      
+      
      Events
      
+      
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
+      
+        
+         
+           
+           
+         
+        
+        
+         
+           
+           
+         
+         
+           
+           
+         
+         
+           
+           
+         
+         
+           
+           
+         
+        
+      
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when the modal has been made visible to the user (will wait for css transitions to complete).
      hideThis event is fired immediately when the hide instance method has been called.
      hiddenThis event is fired when the modal has finished being hidden from the user (will wait for css transitions to complete).
      
+
+
      +$('#myModal').on('hidden', function () {
+// do something ...
+})
      
+    
      
+  
      
+
      
+
+
+
+
+
+
+
+
+
+
      
+  
      
+    
      ScrollSpy bootstrap-scrollspy.js
      
+  
      
+  
      
+    
      
+      
      The ScrollSpy plugin is for automatically updating nav targets based on scroll position.
      
+      Download file
+    
      
+    
      
+      
      Example navbar with scrollspy
      
+      
      Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!
      
+      
+      
      
+        
      @fat
      
+        
      
+        Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
+        
      
+        
      @mdo
      
+        
      
+        Veniam marfa mustache skateboard, adipisicing fugiat velit pitchfork beard. Freegan beard aliqua cupidatat mcsweeney's vero. Cupidatat four loko nisi, ea helvetica nulla carles. Tattooed cosby sweater food truck, mcsweeney's quis non freegan vinyl. Lo-fi wes anderson +1 sartorial. Carles non aesthetic exercitation quis gentrify. Brooklyn adipisicing craft beer vice keytar deserunt.
+        
      
+        
      one
      
+        
      
+        Occaecat commodo aliqua delectus. Fap craft beer deserunt skateboard ea. Lomo bicycle rights adipisicing banh mi, velit ea sunt next level locavore single-origin coffee in magna veniam. High life id vinyl, echo park consequat quis aliquip banh mi pitchfork. Vero VHS est adipisicing. Consectetur nisi DIY minim messenger bag. Cred ex in, sustainable delectus consectetur fanny pack iphone.
+        
      
+        
      two
      
+        
      
+        In incididunt echo park, officia deserunt mcsweeney's proident master cleanse thundercats sapiente veniam. Excepteur VHS elit, proident shoreditch +1 biodiesel laborum craft beer. Single-origin coffee wayfarers irure four loko, cupidatat terry richardson master cleanse. Assumenda you probably haven't heard of them art party fanny pack, tattooed nulla cardigan tempor ad. Proident wolf nesciunt sartorial keffiyeh eu banh mi sustainable. Elit wolf voluptate, lo-fi ea portland before they sold out four loko. Locavore enim nostrud mlkshk brooklyn nesciunt.
+        
      
+        
      three
      
+        
      
+        Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
+        
      
+        
      Keytar twee blog, culpa messenger bag marfa whatever delectus food truck. Sapiente synth id assumenda. Locavore sed helvetica cliche irony, thundercats you probably haven't heard of them consequat hoodie gluten-free lo-fi fap aliquip. Labore elit placeat before they sold out, terry richardson proident brunch nesciunt quis cosby sweater pariatur keffiyeh ut helvetica artisan. Cardigan craft beer seitan readymade velit. VHS chambray laboris tempor veniam. Anim mollit minim commodo ullamco thundercats.
+        
      
+      
      
+      
      
+      
      Using bootstrap-scrollspy.js
      
+      
      Call the scrollspy via javascript:
      
+      
      $('#navbar').scrollspy()
      
+      
      Markup
      
+      
      To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body).
+      
      <body data-spy="scroll" >...</body>
      
+       
      Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
+      
      Options
      
+      
+        
+         
+           
+           
+           
+           
+         
+        
+        
+         
+           
+           
+           
+           
+         
+        
+      
      Nametypedefaultdescription
      offsetnumber10Pixels to offset from top when calculating position of scroll.
      
+    
      
+  
      
+
      
+
+
+
+
+
      
+  
      
+    
      Togglable tabs bootstrap-tab.js
      
+  
      
+  
      
+    
      
+      
      This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.
      
+      Download file
+    
      
+    
      
+      
      Example tabs
      
+      
      Click the tabs below to toggle between hidden panes, even via dropdown menus.
      
+      
+      
      
+        
      
+          
      Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.
      
+        
      
+        
      
+          
      Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.
      
+        
      
+        
+        
+      
      
+      
      
+      
      Using bootstrap-tab.js
      
+      
      Enable tabbable tabs via javascript:
      
+      
      $('#myTab').tab('show')
      
+      
      Markup
      
+      
      You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.
      
+
      +<ul class="tabs">
+<li><a href="#home" data-toggle="tab">Home</a></li>
+<li><a href="#profile" data-toggle="tab">Profile</a></li>
+<li><a href="#messages" data-toggle="tab">Messages</a></li>
+<li><a href="#ettings" data-toggle="tab">Settings</a></li>
+</ul>
      
+      
      Methods
      
+      
      $().tab
      
+      
      
+        Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.
+      
      
+
      +<ul class="tabs">
+<li class="active"><a href="#home">Home</a></li>
+<li><a href="#profile">Profile</a></li>
+<li><a href="#messages">Messages</a></li>
+<li><a href="#settings">Settings</a></li>
+</ul>
+
+<div class="tab-content">
+<div class="active" id="home">...</div>
+<div id="profile">...</div>
+<div id="messages">...</div>
+<div id="settings">...</div>
+</div>
+
+<script>
+$(function () {
+$('.tabs a:last').tab('show')
+})
+</script>
      
+      
      
+      
      Events
      
+      
+        
+         
+           
+           
+         
+        
+        
+         
+           
+           
+        
+        
+           
+           
+         
+        
+      
      EventDescription
      showThis event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
      shownThis event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
      
+
+      
      +$('a[data-toggle="tab"]').on('shown', function (e) {
+e.target // activated tab
+e.relatedTarget // previous tab
+})
      
+   
      
+  
      
+
      
+
+
+
+
      
+  
      
+    
      Tooltips bootstrap-tooltip.js
      
+  
      
+  
      
+    
      
+      
      About Tooltips
      
+      
      Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.
      
+      Download file
+    
      
+    
      
+      
      Example use of Tooltips
      
+      
      Hover over the links below to see tooltips:
      
+      
      
+        
      Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
+        
      
+      
      
+      
      
+      
      Using bootstrap-tooltip.js
      
+      
      Trigger the tooltip via javascript:
      
+      
      $('#example').tooltip(options)
      
+      
      Options
      
+      
+        
+         
+           
+           
+           
+           
+         
+        
+        
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+        
+      
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'top'how to position the tooltip - top | bottom | left | right
      selectorstringfalseIf a selector is provided, tooltip objects will be delegated to the specified targets.
      titlestring | function''default title value if `title` tag isn't present
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      delaynumber | object0
+            
      delay showing/hiding the tooltip (ms)
      
+            
      If a number is supplied, delay is applied to both hide/show
      
+            
      Object structure is: delay: { show: 500, hide: 100 }
      
+           
      
+      
      Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.
      
+      
      Markup
      
+      
      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
      
+      
      Methods
      
+      
      $().tooltip(options)
      
+      
      Attaches a tooltip handler to an element collection.
      
+      
      .tooltip('show')
      
+      
      Reveals an elements tooltip.
      
+      
      $('#element').tooltip('show')
      
+      
      .tooltip('hide')
      
+      
      Hides an elements tooltip.
      
+      
      $('#element').tooltip('hide')
      
+    
      
+  
      
+
      
+
+
+
+
+
      
+  
      
+    
      Popovers bootstrap-popover.js
      
+  
      
+  
      
+    
      
+      
      About popovers
      
+      
      Add small overlays of content, like those on the iPad, to any element for housing secondary information.
      
+      
      * Requires Tooltip to be included
      
+      Download file
+    
      
+    
      
+      
      Example hover popover
      
+      
      Hover over the button to trigger the popover.
      
+      
      
+        hover for popover
+      
      
+      
      
+      
      Using bootstrap-popover.js
      
+      
      Enable popovers via javascript:
      
+      
      $('#example').popover(options)
      
+      
      Options
      
+      
+        
+         
+           
+           
+           
+           
+         
+        
+        
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+        
+      
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'right'how to position the popover - top | bottom | left | right
      selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      titlestring | function''default title value if `title` attribute isn't present
      contentstring | function''default content value if `data-content` attribute isn't present
      delaynumber | object0
+            
      delay showing/hiding the popover (ms)
      
+            
      If a number is supplied, delay is applied to both hide/show
      
+            
      Object structure is: delay: { show: 500, hide: 100 }
      
+           
      
+      
      Notice Individual popover instance options can alternatively be specified through the use of data attributes.
      
+      
      Markup
      
+      
      
+      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
+      
      
+      
      Methods
      
+      
      $().popover(options)
      
+      
      Initializes popovers for an element collection.
      
+      
      .popover('show')
      
+      
      Reveals an elements popover.
      
+      
      $('#element').popover('show')
      
+      
      .popover('hide')
      
+      
      Hides an elements popover.
      
+      
      $('#element').popover('hide')
      
+    
      
+  
      
+
      
+
+
+
+
+
      
+  
      
+    
      Alert messages bootstrap-alert.js
      
+  
      
+  
      
+    
      
+      
      About alerts
      
+      
      The alert plugin is a tiny class for adding close functionality to alerts.
      
+      Download
+    
      
+    
      
+      
      Example alerts
      
+      
      The alerts plugin works on regular alert messages, and block messages.
      
+      
      
+        ×
+        Holy guacamole! Best check yo self, you’re not looking too good.
+      
      
+      
      
+        ×
+        
      Oh snap! You got an error!
      
+        
      Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.
      
+        
      
+          Take this action Or do this
+        
      
+      
      
+      
      
+      
      Using bootstrap-alerts.js
      
+      
      Enable dismissal of an alert via javascript:
      
+      
      $(".alert-message").alert()
      
+      
      Markup
      
+      
      Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.
      
+      
      <a class="close" data-dismiss="alert" href="#">&times;</a>
      
+      
      Methods
      
+      
      $().alert()
      
+      
      Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.
      
+      
      .alert('close')
      
+      
      Closes an alert.
      
+      
      $(".alert-message").alert('close')
      
+      
      Events
      
+      
      Bootstrap's alert class exposes a few events for hooking into alert functionality. 
      
+      
+        
+         
+           
+           
+         
+        
+        
+         
+           
+           
+         
+         
+           
+           
+         
+        
+      
      EventDescription
      closeThis event fires immediately when the close instance method is called.
      closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
      
+
      +$('#my-alert').bind('closed', function () {
+// do something ...
+})
      
+    
      
+  
      
+
      
+
+
+
+
+
      
+  
      
+    
      Buttons bootstrap-button.js
      
+  
      
+  
      
+    
      
+      
      About
      
+      
      Do more with buttons. Control button states or create groups of buttons for more components like toolbars.
      
+      Download file
+    
      
+    
      
+      
      Example uses
      
+      
      Use the buttons plugin for states and toggles.
      
+      
+        
+         
+           
+           
+         
+         
+           
+           
+         
+         
+           
+           
+         
+         
+           
+           
+         
+        
+      
      Stateful
+              
+            
      Single toggle
+              
+            
      Checkbox
+              
      
+                
+                
+                
+              
      
+           
      Radio
+              
      
+                
+                
+                
+              
      
+           
      
+      
      
+      
      Using bootstrap-button.js
      
+      
      Enable buttons via javascript:
      
+      
      $('.tabs').button()
      
+        
      Markup
      
+      
      Data attributes are integral to the button plugin. Check out the example code below for the various markup types.
      
+
      +<!-- Add data-toggle="button" to activate toggling on a single button -->
+<button class="btn" data-toggle="button">Single Toggle</button>
+
+<!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
+<div class="btn-group" data-toggle="buttons-checkbox">
+<button class="btn">Left</button>
+<button class="btn">Middle</button>
+<button class="btn">Right</button>
+</div>
+
+<!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
+<div class="btn-group" data-toggle="buttons-radio">
+<button class="btn">Left</button>
+<button class="btn">Middle</button>
+<button class="btn">Right</button>
+</div>
+
      
+      
      Methods
      
+      
      $().button('toggle')
      
+      
      Toggles push state. Gives btn the look that it's been activated.
      
+      
      Notice You can enable auto toggling of a button by using the data-toggle attribute.
      
+      
      <button class="btn" data-toggle="button" >...</button>
      
+      
      $().button('loading')
      
+      
      Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text.
+      
      
+       
      <button class="btn" data-loading-text="loading stuff..." >...</button>
      
+      
      
+        Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here.
+      
      
+       
      $().button('reset')
      
+       
      Resets button state - swaps text to original text.
      
+       
      $().button(string)
      
+       
      Resets button state - swaps text to any data defined text state.
      
+
      <button class="btn" data-complete-text="finished!" >...</button>
+<script>
+$('.btn').button('complete')
+</script>
      
+    
      
+  
      
+
      
+
+
+
+
+
      
+  
      
+    
      Collapse bootstrap-collapse.js
      
+  
      
+  
      
+    
      
+      
      About
      
+      
      Get base styles and flexible support for collapsible components like accordions and navigation.
      
+      Download file
+    
      
+    
      
+      
      Example accordion
      
+      
      Using the collapse plugin, we built a simple accordion style widget:
      
+    
+      
      
+        
      
+          
      
+            
+              Collapsible Group Item #1
+            
+          
      
+          
      
+            
      
+              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+            
      
+          
      
+        
      
+        
      
+          
      
+            
+              Collapsible Group Item #2
+            
+          
      
+          
      
+            
      
+              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+            
      
+          
      
+        
      
+        
      
+          
      
+            
+              Collapsible Group Item #3
+            
+          
      
+          
      
+            
      
+              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+            
      
+          
      
+        
      
+      
      
+
+      
+      
      
+      
      Using bootstrap-collapse.js
      
+      
      Enable via javascript:
      
+      
      $(".collapse").collapse()
      
+      
      Options
      
+      
+        
+         
+           
+           
+           
+           
+         
+        
+        
+         
+           
+           
+           
+           
+         
+         
+           
+           
+           
+           
+         
+        
+      
      Nametypedefaultdescription
      parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
      togglebooleantrueToggles the collapsible element on invocation
      
+      
      Markup
      
+      
      Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.
      
+      
      +<button class="btn danger" data-toggle="collapse" data-target="#demo">
+simple collapsible
+</button>
+
+<div id="demo" class="collapse in"> … </div>
      
+     
      Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.
      
+      
      Methods
      
+      
      .collapse(options)
      
+      
      Activates your content as a collapsible element. Accepts an optional options object.
+
      +$('#myCollapsible').collapse({
+toggle: false
+})
      
+      
      .collapse('toggle')
      
+      
      Toggles a collapsible element to shown or hidden.
      
+      
      .collapse('show')
      
+      
      Shows a collapsible element.
      
+      
      .collapse('hide')
      
+      
      Hides a collapsible element.
      
+      
      Events
      
+      
      
+        Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
+      
      
+      
+        
+         
+           
+           
+         
+        
+        
+         
+           
+           
+         
+         
+           
+           
+         
+         
+           
+           
+         
+         
+           
+           
+         
+        
+      
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
      hide
+            This event is fired immediately when the hide method has been called.
+           
      hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
      
+
+
      +$('#myCollapsible').on('hidden', function () {
+// do something ...
+})
      
+    
      
+  
      
+
      
+
+
+
+ 
+
+
+
+
+
+
      
+  
      
+    
      Typeahead bootstrap-typeahead.js
      
+  
      
+  
      
+    
      
+      
      About
      
+      
      A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.
      
+      Download file
+    
      
+    
      
+      
      Example
      
+      
      Start typing in the field below to show the typeahead results.
      
+      
      
+        
+      
      
+      
      
+      
      Using bootstrap-typeahead.js
      
+      
      Call the typeahead via javascript:
      
+      
      $('.typeahead').typeahead()
      
+      
      Options
      
+      
+        
+         
+           
+           
+           
+           
+         
+        
+        
+         
+           
+           
+           
+           
+         
+        
+      
      Nametypedefaultdescription
      itemsnumber8The max number of items to display in the dropdown.
      
+
+      
      Markup
      
+      
      Add data attributes to register an element with typeahead functionality.
      
+
      +<input type="text" data-provide="typeahead">
+
      
+    
      
+  
      
+
      
\ No newline at end of file
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
new file mode 100644
index 000000000..568e857be
--- /dev/null
+++ b/docs/templates/pages/less.mustache
@@ -0,0 +1,406 @@
+      
+      
      
+        
      Using LESS with Bootstrap
      
+        
      Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.
      
+      
      
+
+
+
+      
+      
      
+        
      Built with LESS
      
+      
      
+      
      
+        
      
+          
      Why LESS?
      
+          
      Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
      
+        
      
+        
      
+          
      What's included?
      
+          
      As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.
      
+        
      
+        
      
+          
      Learn more
      
+          LESS CSS
+          
      Visit the official website at http://lesscss.org to learn more.
      
+        
      
+      
      
+      
      
+        
      
+          
      Variables
      
+          
      Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.
      
+        
      
+        
      
+          
      Mixins
      
+          
      Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.
      
+        
      
+        
      
+          
      Operations
      
+          
      Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.
      
+        
      
+      
      
+
+
+
+      
+      
      
+        
      Variables from variables.less
      
+      
      
+
+          
      Hyperlinks
      
+          
+            
+              
+                
+                
+                
+              
+            
+            
+              
+                
+                
+                
+              
+              
+                
+                
+                
+              
+            
+          
      VariableValueUsage
      @linkColor#0069d6Default link text color
      @linkColorHoverdarken(@linkColor, 15)Default link text hover color
      
+
+      
      
+        
      
+          
      Grayscale colors
      
+          
+            
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+            
+          
      @black#000
      @grayDarklighten(@black, 25%)
      @graylighten(@black, 50%)
      @grayLightlighten(@black, 75%)
      @grayLighterlighten(@black, 90%)
      @white#fff
      
+        
      
+        
      
+          
      Accent colors
      
+          
+            
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+            
+          
      @blue#049CDB
      @green#46a546
      @red#9d261d
      @yellow#ffc40d
      @orange#f89406
      @pink#c3325f
      @purple#7a43b6
      
+        
      
+      
      
+
+      
      
+        
      
+          
      Grid system
      
+          
+            
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+            
+          
      @gridColumns12
      @gridColumnWidth60px
      @gridGutterWidth20px
      @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
      
+        
      
+        
      
+          
      Typography
      
+          
+            
+              
+                
+                
+              
+              
+                
+                
+                
+              
+              
+                
+                
+              
+            
+          
      @baseFontSize13px
      @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
      @baseLineHeight18px
      
+        
      
+      
      
+
+      
      
+        
      
+          
      Visuals
      
+        
      
+        
      
+          
+            
+              
+                
+                
+                
+              
+            
+          
      @primaryButtonColor@blue
      
+        
      
+      
      
+
+
+      
+      
      
+        
      Mixins from mixins.less
      
+      
      
+
+
+
+      
+      
      
+        
      Operations
      
+      
      
+
+
+
+      
+      
      
+        
      Compiling LESS and Bootstrap
      
+      
      
+
+
+
+
+
+
      
+
      
+  
      Using Bootstrap with Less Supercharge your CSS with variables, mixins, and functions
      
+
      
+
      
+  
      
+    
      Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.
      
+    
      Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.
      
+  
      
+  
      
+    
      How to use it
      
+    
      Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.
      
+
      +<link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
+<script src="js/less-1.1.3.min.js"></script>
      
+
      Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.
      
+
+    
      What’s included
      
+    
      Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.
      
+    
      Variables
      
+    
      Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.
      
+
      +// Links
+@linkColor:         #8b59c2;
+@linkColorHover:    darken(@linkColor, 10);
+
+// Grays
+@black:             #000;
+@grayDark:          lighten(@black, 25%);
+@gray:              lighten(@black, 50%);
+@grayLight:         lighten(@black, 70%);
+@grayLighter:       lighten(@black, 90%);
+@white:             #fff;
+
+// Accent Colors
+@blue:              #08b5fb;
+@green:             #46a546;
+@red:               #9d261d;
+@yellow:            #ffc40d;
+@orange:            #f89406;
+@pink:              #c3325f;
+@purple:            #7a43b6;
+
+// Baseline grid
+@basefont:          13px;
+@baseline:          18px;
+
      
+
+
      Commenting
      
+
      Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.
      
+
      +// This is a comment
+/* This is also a comment */
+
      
+
+
      Mixins up the wazoo
      
+
      Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.
      
+
      Font stacks
      
+
      +#font {
+  .shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) {
+    font-size: @size;
+    font-weight: @weight;
+    line-height: @lineHeight;
+  }
+  .sans-serif(@weight: normal, @size: 14px, @lineHeight: 20px) {
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: @size;
+    font-weight: @weight;
+    line-height: @lineHeight;
+  }
+  ...
+}
+
      
+
      Gradients
      
+
      +#gradient {
+  ...
+  .vertical (@startColor: #555, @endColor: #333) {
+    background-color: @endColor;
+    background-repeat: repeat-x;
+    background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror
+    background-image: -moz-linear-gradient(@startColor, @endColor); // FF 3.6+
+    background-image: -ms-linear-gradient(@startColor, @endColor); // IE10
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(@startColor, @endColor); // The standard
+  }
+  ...
+}
+
      
+
+
      Operations
      
+
      Get fancy and perform some math to generate flexible and powerful mixins like the one below.
      
+
      +// Griditude
+@gridColumns:       16;
+@gridColumnWidth:   40px;
+@gridGutterWidth:   20px;
+@siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+// Make some columns
+.columns(@columnSpan: 1) {
+  width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
+}
+
      
+
+    
      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
      
+    
+      
+        
+          
+          
+        
+      
+      
+        
+          
+          
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+          
+        
+      
+    
      MethodSteps
      Node with makefile
+            
      Install the LESS command line compiler with npm by running the following command:
      
+            
      $ npm install less
      
+            
      Once installed just run make from the root of your bootstrap directory and you're all set.
      
+            
      Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).
      
+          
      Javascript
+            
      Download the latest Less.js and include the path to it (and Bootstrap) 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
+            
      Install the LESS command line tool via Node and run the following command:
      
+              
      $ lessc ./lib/bootstrap.less > bootstrap.css
      
+            
      Be sure to include --compress in that command if you're trying to save some bytes!
      
+          
      Unofficial 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.
      
+          
      CrunchCrunch is a great looking LESS editor and compiler built on Adobe Air.
      CodeKitCreated by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.
      SimplessMac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.
      
+  
      
+
      
+
+
      
\ No newline at end of file
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
new file mode 100644
index 000000000..567ac6d0d
--- /dev/null
+++ b/docs/templates/pages/scaffolding.mustache
@@ -0,0 +1,311 @@
+
+
+
      
+  
      Scaffolding
      
+  
      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
      
+
      
+
+
+
+
+
      
+  
      
+    
      Grid system 12 columns with a responsive twist
      
+  
      
+
+  
      Default 940px grid
      
+  
      
+    
      1
      
+    
      1
      
+    
      1
      
+    
      1
      
+    
      1
      
+    
      1
      
+    
      1
      
+    
      1
      
+    
      1
      
+    
      1
      
+    
      1
      
+    
      1
      
+  
      
+  
      
+    
      4
      
+    
      4
      
+    
      4
      
+  
      
+  
      
+    
      4
      
+    
      8
      
+  
      
+  
      
+    
      6
      
+    
      6
      
+  
      
+  
      
+    
      12
      
+  
      
+
+  
      
+    
      
+      
      The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.
      
+      
      It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.
      
+    
      
+    
      
+
      +<div class="row">
+  <div class="span4">...</div>
+  <div class="span8">...</div>
+</div>
+
      
+    
      
+    
      
+      
      As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.
      
+    
      
+  
      
+
+  
      Offsetting columns
      
+  
      
+    
      4
      
+    
      4 offset 4
      
+  
      
+  
      
+    
      3 offset 3
      
+    
      3 offset 3
      
+  
      
+  
      
+    
      8 offset 4
      
+  
      
+
+  
      
+
+  
      Nesting columns
      
+  
      
+    
      
+      
      With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.
      
+      
      Example
      
+      
      
+        
      
+          Level 1 of column
+          
      
+            
      
+              Level 2
+            
      
+            
      
+              Level 2
+            
      
+          
      
+        
      
+      
      
+    
      
+    
      
+
      +<div class="row">
+  <div class="span12">
+    Level 1 of column
+    <div class="row">
+      <div class="span6">Level 2</div>
+      <div class="span6">Level 2</div>
+    </div>
+  </div>
+</div>
+
      
+    
      
+  
      
+
+  
      Grid customization
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      VariableDefault valueDescription
      @gridColumns12Number of columns
      @gridColumnWidth60pxWidth of each column
      @gridGutterWidth20pxNegative space between columns
      @siteWidthComputed sum of all columns and guttersCounts number of columns and gutters to set width of the .fixed-container() mixin
      
+  
      
+    
      
+      
      Variables in LESS
      
+      
      Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.
      
+    
      
+    
      
+      
      How to customize
      
+      
      Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.
      
+    
      
+    
      
+      
      Staying responsive
      
+      
      Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.
      
+    
      
+  
      
+
+
      
+
+
+
+
+
      
+  
      
+    
      Layouts Basic templates to create webpages
      
+  
      
+
+  
      
+    
      
+      
      Fixed layout
      
+      
      The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.
      
+      
      
+        
      
+      
      
+
      +<body>
+  <div class="container">
+    ...
+  </div>
+</body>
+
      
+    
      
+    
      
+      
      Fluid layout
      
+      
      <div class="fluid-container"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.
      
+      
      
+        
      
+        
      
+      
      
+
      +<body>
+  <div class="fluid-container sidebar-left">
+    <div class="fluid-sidebar">
+      ...
+    </div>
+    <div class="fluid-content">
+      ...
+    </div>
+  </div>
+</body>
+
      
+    
      
+  
      
+
      
+
+
+
+
+
+
      
+  
      
+    
      Responsive design Media queries for various devices and resolutions
      
+  
      
+  
+  
      
+    
      
+      Responsive devices
+    
      
+    
      
+      
      Supported devices
      
+      
      Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:
      
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+            
+            
+            
+          
+          
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
+      
      LabelLayout widthColumn widthGutter width
      Smartphones480px and belowFluid columns, no fixed widths
      Portrait tablets480px to 768pxFluid columns, no fixed widths
      Landscape tablets768px to 940px44px20px
      Default940px and up60px20px
      Large display1210px and up70px30px
      
+
+      
      What they do
      
+      
      Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.
      
+      
        
+        
      • Modify the width of column in our grid
        • 
+        
      • Stack elements instead of float wherever necessary
        • 
+        
      • Resize headings and text to be more appropriate for devices
        • 
+      
      
+    
      
+  
      
+
+  
      
+
+  
+  
      Using the media queries
      
+  
      
+    
      
+      
      Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:
      
+      
        
+        
      1. Use the compiled responsive version, bootstrap.reponsive.css
        2. 
+        
      2. Add @import "responsive.less" and recompile Bootstrap
        3. 
+        
      3. Compile responsive.less as a separate file and include that
        4. 
+      
      
+      
      Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.
      
+    
      
+    
      
+
      +  // Landscape phones and down
+  @media (max-width: 480px) { ... }
+
+  // Landscape phone to portrait tablet
+  @media (min-width: 480px) and (max-width: 768px) { ... }
+
+  // Portrait tablet to landscape and desktop
+  @media (min-width: 768px) and (max-width: 940px) { ... }
+
+  // Large desktop
+  @media (min-width: 1210px) { .. }
+
      
+    
      
+  
      
+
      
\ No newline at end of file
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
new file mode 100644
index 000000000..a243d6ad5
--- /dev/null
+++ b/docs/templates/pages/upgrading.mustache
@@ -0,0 +1,86 @@
+
+
      
+  
      Upgrading to Bootstrap 2
      
+  
      Learn about significant changes and additions since v1.4 with this handy guide.
      
+
      
+
+
+
      Rough outline
      
+
        
+  
      • Docs completely overhauled
+    
          
+      
        • Responsive thanks to new grid system
          • 
+      
        • Now less marketing and more information
          • 
+      
        • Extensive use of tables to share classes and elements of most components
          • 
+      
        • Broken down into several pages for easier consumption
          • 
+    
        
+  
        • 
+  
      • Updated grid system, now only 12 columns
+    
          
+      
        • Same great classes, but now only 12 columns
          • 
+      
        • Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more
          • 
+    
        
+  
        • 
+  
      • New thumbnails (previously media grids)
+    
          
+      
        • .media-grid class has been changed to .thumbnails
          • 
+      
        • Individual thumbnails now require .thumbnail class
          • 
+    
        
+  
        • 
+  
      • Updated forms
+    
          
+      
        • Default form style is now stacked to use less CSS and add flexibility
          • 
+      
        • Exact same markup is required for vertical or horizontal forms—just swap the classes
          • 
+      
        • New form defaults for search, inline, vertical, and horizontal
          • 
+    
        
+  
        • 
+  
      • Updated tables
+    
          
+      
        • Table classes made more consistent
          • 
+      
        • Removed unused table color options (too much code for such little impact)
          • 
+    
        
+  
        • 
+  
      • Typography
+    
          
+      
        • Right-aligned option for blockquotes if float: right;
          • 
+      
        • h4 elements were dropped from 16px to 14px with a default line-height of 18px
          • 
+      
        • h5 elements were dropped from 14px to 12px
          • 
+      
        • h6 elements were dropped from 13px to 11px
          • 
+    
        
+  
        • 
+  
      • Buttons
+    
          
+      
        • Added button bar options
          • 
+    
        
+  
        • 
+  
      • Examples
+    
          
+      
        • Fluid examples redone. .fluid-container now requires a .sidebar-left or .sidebar-right as well. Fluid sidebar element has a new class, .fluid-sidebar.
          • 
+    
        
+  
        • 
+  
      • Dropdown menus
+    
          
+      
        • Updated the .dropdown-menu to tighten up spacing
          • 
+      
        • Now requires you to add a <span class="caret"></span> to show the dropdown arrow
          • 
+      
        • The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.
          • 
+    
        
+  
        • 
+  
      • Navigation
+    
          
+      
        • Tabs and pills now require the use of a new base class, .nav, on their <ul>
          • 
+      
        • New nav list component added that uses the same base class, .nav
          • 
+      
        • Vertical tabs and pills have been added—just add .stacked to the <ul>
          • 
+      
        • Pills were restyled to be less rounded by default
          • 
+      
        • Pills now have dropdown menu support (they share the same markup and styles as tabs)
          • 
+    
        
+  
        • 
+
      
+
+
\ No newline at end of file
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 42521bb9a..7e43408ac 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -2,12 +2,12 @@
 
   
     
-    Bootstrap, from Twitter: Upgrading from v1.4 to v2.0
+    Bootstrap, from Twitter
     
     
     
 
-    
+    
     
@@ -18,10 +18,11 @@
     
 
     
-    
-    
-    
-    
+    
+    
+    
+    
+
   
 
   
@@ -33,8 +34,8 @@
         
      
           Bootstrap
           
             
-            
    • 
+            
    • 
               
                 Base CSS
                 
@@ -58,7 +59,7 @@
                 
    • Icons by Glyphicons
      • 
               
             
-            
    • 
+            
    • 
               
                 Components
                 
@@ -75,7 +76,7 @@
                 
    • Progress bars
      • 
               
             
-            
    • 
+            
    • 
               
                 Javascript plugins
                 
@@ -95,7 +96,7 @@
                 
    • Typeahead
      • 
               
             
-            
    • 
+            
    • 
               
                 Using LESS
               
@@ -107,12 +108,12 @@
 
     
      
 
-      
-      
      
-        
      Upgrading to Bootstrap 2
      
-        
      Learn about significant changes and additions since v1.4 with this handy guide.
      
-      
      
+
+
      
+  
      Upgrading to Bootstrap 2
      
+  
      Learn about significant changes and additions since v1.4 with this handy guide.
      
+
      
 
 
 
      Rough outline
      
@@ -193,8 +194,6 @@
   
      • 
 -->
 
-
-
       
       
+
     
      
 
+
     
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
-
+    
+    
+    
+    
+    
+    
+    
+    
+    
   
 
-- 
cgit v1.2.3


From 9a68f115e7d850c47297bc7931fcbd1125b39f59 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Mon, 23 Jan 2012 15:07:07 -0800
Subject: rebuild

---
 bootstrap.css     | 12 ++++--------
 bootstrap.min.css |  6 +++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 2908ac296..c1ac5102f 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,11 +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.
-<<<<<<< HEAD
- * Date: Mon Jan 23 14:12:25 PST 2012
-=======
- * Date: Mon Jan 23 13:48:03 PST 2012
->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
+ * Date: Mon Jan 23 15:07:02 PST 2012
  */
 article,
 aside,
@@ -1850,7 +1846,7 @@ i {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
@@ -2505,7 +2501,7 @@ i {
   padding: 7px 9px 7px;
   font-size: 11px;
 }
-:root .alert-message, :root .btn {
+:root .btn {
   border-radius: 0 \0;
 }
 button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
@@ -3067,7 +3063,7 @@ a.thumbnail:hover {
     padding-left: 0;
   }
   .modal {
-    position: fixed;
+    position: absolute;
     top: 20px;
     left: 20px;
     right: 20px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 733ad5d11..0416ccc6e 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -376,7 +376,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
@@ -462,7 +462,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
 .btn.small{padding:7px 9px 7px;font-size:11px;}
-:root .alert-message,:root .btn{border-radius:0 \0;}
+:root .btn{border-radius:0 \0;}
 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
 .btn-group{position:relative;*zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";}
 .btn-group:after{clear:both;}
@@ -539,4 +539,4 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .show{display:block;}
 .invisible{visibility:hidden;}
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
+@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
-- 
cgit v1.2.3


From b4b1ef68398b68dcdfa29465d06cd76d6bf2c49d Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Mon, 23 Jan 2012 15:17:32 -0800
Subject: rebuild with new templates

---
 bootstrap.css                             |    2 +-
 docs/assets/js/application.js             |    1 +
 docs/base-css.html                        |   95 +-
 docs/components.html                      |  110 +-
 docs/index.html                           |  438 +++---
 docs/javascript.html                      | 2442 ++++++++++++++---------------
 docs/less.html                            |   78 +-
 docs/scaffolding.html                     |   93 +-
 docs/templates/layout.mustache            |   79 +-
 docs/templates/pages/base-css.mustache    |    7 +
 docs/templates/pages/components.mustache  |   26 +-
 docs/templates/pages/index.mustache       |  356 ++---
 docs/templates/pages/javascript.mustache  | 2338 +++++++++++++--------------
 docs/templates/pages/scaffolding.mustache |   18 +-
 docs/templates/pages/upgrading.mustache   |   12 +-
 docs/upgrading.html                       |   89 +-
 16 files changed, 2868 insertions(+), 3316 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index c1ac5102f..c448c33c5 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Mon Jan 23 15:07:02 PST 2012
+ * Date: Mon Jan 23 15:15:08 PST 2012
  */
 article,
 aside,
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 93f7ea719..2da4ab8e2 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -24,6 +24,7 @@ $(function(){
   // table sort example
   if ($.fn.tableSorter) {
     $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } )
+    $(".tablesorter-example").tablesorter({ sortList: [[1,0]] })
   }
 
   // add on logic
diff --git a/docs/base-css.html b/docs/base-css.html
index a869eecf8..91cb4ec70 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -27,86 +27,30 @@
 
   
 
-    
     
      
       
      
         
      
           Bootstrap
           
         
      
@@ -115,28 +59,19 @@
 
     
      
 
-<<<<<<< HEAD
 
 
      
   
      Base CSS
      
   
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
+  
 
      
-=======
-      
-      
      
-        
      Base CSS
      
-        
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
-        
-      
      
->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 
 
       
      
         
      Back to top
      
diff --git a/docs/components.html b/docs/components.html
index ee14526e5..4a1e4fc6f 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -27,82 +27,30 @@
 
   
 
-    
     
      
       
      
         
      
           Bootstrap
           
         
      
@@ -111,33 +59,24 @@
 
     
      
 
-<<<<<<< HEAD
-
-
      
-  
      Components
      
-  
      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
      
-
      
-=======
-      
-      
      
-        
      Components
      
-        
      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
      
-        
-      
      
+  
+  
      
+    
      Components
      
+    
      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
      
+    
+  
      
 
->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 
   
       
      
         
      Back to top
      
diff --git a/docs/index.html b/docs/index.html
index f61518e07..9693b9f7e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -27,96 +27,30 @@
 
   
 
-    
     
      
       
      
         
      
           Bootstrap
           
         
      
@@ -125,195 +59,195 @@
 
     
      
 
-
      
+      
      
 
-  
-  
      
-    
      
-      
      Bootstrap,
       from Twitter
      
-      
      Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.
      
-      
      
-        Download on GitHub
-        Get started →
-      
      
+        
+        
      
+          
      
+            
      Bootstrap,
       from Twitter
      
+            
      Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.
      
+            
      
+              Download on GitHub
+              Get started →
+            
      
 
-      
      
-        
      Feature highlights
      
-        
        
-          
      • × Built on LESS
        • 
-          
      • × Complete styleguide docs
        • 
-          
      • × Fully responsive design
        • 
-          
      • × Small footprint (7kb gzipped)
        • 
-          
      • × Support for IE7 and up
        • 
-          
      • × Custom jQuery plugins
        • 
-          
      • × Dozens of components
        • 
-        
      
-      
      
-    
      
-  
      
+            
      
+              
      Feature highlights
      
+              
        
+                
      • × Built on LESS
        • 
+                
      • × Complete styleguide docs
        • 
+                
      • × Fully responsive design
        • 
+                
      • × Small footprint (7kb gzipped)
        • 
+                
      • × Support for IE7 and up
        • 
+                
      • × Custom jQuery plugins
        • 
+                
      • × Dozens of components
        • 
+              
      
+            
      
+          
      
+        
      
 
-  
 
 
-  
      
-    
      Built with Bootstrap.
      
-    
      For even more sites built with Bootstrap, visit the unofficial Tumblr.
      
-    
+        
      
+          
      Built with Bootstrap.
      
+          
      For even more sites built with Bootstrap, visit the unofficial Tumblr.
      
+          
 
-    
      Designed for everyone, everywhere.
      
-    
      Need reasons to love Bootstrap? Look no further.
      
-    
      
-      
      
-        
-        
      Built for and by nerds
      
-        
      Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.
      
-      
      
-      
      
-        
-        
      For all skill levels
      
-        
      Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.
      
-      
      
-      
      
-        
-        
      Cross-everything
      
-        
      Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.
      
-      
      
-    
      
-    
      
-      
      
-        
-        
      12-column grid
      
-        
      Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.
      
-      
      
-      
      
-        
-        
      Responsive design
      
-        
      With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.
      
-      
      
-      
      
-        
-        
      Styleguide docs
      
-        
      Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.
      
-      
      
-    
      
-    
      
-      
      
-        
-        
      Growing library
      
-        
      Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.
      
-      
      
-      
      
-        
-        
      Custom jQuery plugins
      
-        
      What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.
      
-      
      
-      
      
-        
-        
      Built on LESS
      
-        
      Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.
      
-      
      
-    
      
-    
      
-      
      
-        
-        
      HTML5
      
-        
      Built to support new HTML5 elements and syntax.
      
-      
      
-      
      
-        
-        
      CSS3
      
-        
      Progressively enhanced components for ultimate style.
      
-      
      
-      
      
-        
-        
      Open-source
      
-        
      Built for and maintained by the community via GitHub.
      
-      
      
-      
      
-        
-        
      Made at Twitter
      
-        
      Brought to you by an experienced engineer and designer.
      
-      
      
-    
      
+          
      Designed for everyone, everywhere.
      
+          
      Need reasons to love Bootstrap? Look no further.
      
+          
      
+            
      
+              
+              
      Built for and by nerds
      
+              
      Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.
      
+            
      
+            
      
+              
+              
      For all skill levels
      
+              
      Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.
      
+            
      
+            
      
+              
+              
      Cross-everything
      
+              
      Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.
      
+            
      
+          
      
+          
      
+            
      
+              
+              
      12-column grid
      
+              
      Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.
      
+            
      
+            
      
+              
+              
      Responsive design
      
+              
      With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.
      
+            
      
+            
      
+              
+              
      Styleguide docs
      
+              
      Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.
      
+            
      
+          
      
+          
      
+            
      
+              
+              
      Growing library
      
+              
      Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.
      
+            
      
+            
      
+              
+              
      Custom jQuery plugins
      
+              
      What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.
      
+            
      
+            
      
+              
+              
      Built on LESS
      
+              
      Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.
      
+            
      
+          
      
+          
      
+            
      
+              
+              
      HTML5
      
+              
      Built to support new HTML5 elements and syntax.
      
+            
      
+            
      
+              
+              
      CSS3
      
+              
      Progressively enhanced components for ultimate style.
      
+            
      
+            
      
+              
+              
      Open-source
      
+              
      Built for and maintained by the community via GitHub.
      
+            
      
+            
      
+              
+              
      Made at Twitter
      
+              
      Brought to you by an experienced engineer and designer.
      
+            
      
+          
      
 
 
-    
-    
      Get started in no time.
      
-    
      Quickly start using Bootstrap within your workflow and development process.
      
-    
-      
-        
-          
-          
-          
-        
-      
-    
      
-            
      Hotlink the CSS
      
-            
      For the quickest and easiest start, just copy this snippet into your webpage.
      
-            
      
-              
-            
      
-                		
-            
      Use it with LESS
      
-            
      A fan of using LESS? No problem, just clone the repo and add these lines:
      
-            
      
-              
-            
      
-                		
-            
      Fork on GitHub
      
-            
      Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.
      
-            
      Bootstrap on GitHub »
      
-            
      Currently v2.0.0
      
-          
      
-  
      
-
      
-      
+          
      Get started in no time.
      
+          
      Quickly start using Bootstrap within your workflow and development process.
      
+          
+            
+              
+                
+                
+                
+              
+            
+          
      
+                  
      Hotlink the CSS
      
+                  
      For the quickest and easiest start, just copy this snippet into your webpage.
      
+                  
      
+                    
+                  
      
+                      		
+                  
      Use it with LESS
      
+                  
      A fan of using LESS? No problem, just clone the repo and add these lines:
      
+                  
      
+                    
+                  
      
+                      		
+                  
      Fork on GitHub
      
+                  
      Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.
      
+                  
      Bootstrap on GitHub »
      
+                  
      Currently v2.0.0
      
+                
      
+        
      
+      
      
+     
       
      
         
      Back to top
      
diff --git a/docs/javascript.html b/docs/javascript.html
index ac933b9cf..7b7f88c5c 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -27,79 +27,30 @@
 
   
 
-    
     
      
       
      
         
      
           Bootstrap
           
         
      
@@ -107,8 +58,7 @@
     
      
 
     
      
-<<<<<<< HEAD
-=======
+
       
       
      
@@ -129,1308 +79,1300 @@
           
    • Typeahead
      • 
         
       
      
->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
-
-
      
-  
      Javascript for Bootstrap
      
-  
      Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
-
      
 
-
-  
-  
      
-    
      
-      
      jQuery plugins A dozen Bootstrap plugins to get you started
      
-    
      
-  
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-  
       
-  
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-  
       
-  
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-  
       
-  
      
-    
      
-      
-    
      
-  
      
-  
      
-  Select/Unselect All Plugins
-  
      Note: All plugins require the latest version of jQuery to be included.
      
-
      
-
-
-
-
-
      
-  
      
-    
      Modals bootstrap-modal.js
      
-  
      
-  
      
-    
      
-      
      About modals
      
-      
      A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.
      
-      Download file
-    
      
-    
      
-      
      Static example
      
-      
      Below is a statically rendered modal.
      
-      
      
-        
      
-          
      
-            ×
-            
      Modal header
      
-          
      
-          
      
-            
      One fine body…
      
-          
      
-          
      
-            Save changes
-            Close
-          
      
+      
+      
      
+        
      
+          
      jQuery plugins A dozen Bootstrap plugins to get you started
      
         
      
-      
       
-
-      
      Live demo
      
-      
      Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.
      
-      
-      
      
+
+
+
+    
+    
      
+      
      
+        
      Modals bootstrap-modal.js
      
+      
      
+      
      
+        
      
+          
      About modals
      
+          
      A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.
      
+          Download file
+        
      
+        
      
+          
      Static example
      
+          
      Below is a statically rendered modal.
      
+          
      
+            
      
+              
      
+                ×
+                
      Modal header
      
+              
      
+              
      
+                
      One fine body…
      
+              
      
+              
      
+                Save changes
+                Close
+              
      
+            
      
+          
       
+
+          
      Live demo
      
+          
      Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.
      
+          
+          
+          Launch demo modal
+
+          
      
+
+          
      Using bootstrap-modal
      
+          
      Call the modal via javascript:
      
+          
      $('#myModal').modal(options)
      
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      backdropbooleantrueIncludes a modal-backdrop element
      keyboardbooleantrueCloses the modal when escape key is pressed
      
+          
      Markup
      
+          
      You can activate modals on your page easily without having to write a single line of javascript. Just set data-toggle="modal" on a controller element with a data-target="#foo" or href="#foo" which corresponds to a modal element id, and when clicked, it will launch your modal.
      
+          
      Also, to add options to your modal instance, just include them as additional data attributes on either the control element or the modal markup itself.
      
 
       <a class="btn" data-toggle="modal" href="#myModal" >Launch Modal</a>
 
      
 
 
       <div class="modal">
-<div class="modal-header">
-<a href="#" class="close js-dismiss">×</a>
-<h3>Modal header</h3>
-</div>
-<div class="modal-body">
-<p>One fine body…</p>
-</div>
-<div class="modal-footer">
-<a href="#" class="btn primary">Save changes</a>
-<a href="#" class="btn">Close</a>
-</div>
+  <div class="modal-header">
+    <a href="#" class="close js-dismiss">×</a>
+    <h3>Modal header</h3>
+  </div>
+  <div class="modal-body">
+    <p>One fine body…</p>
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn primary">Save changes</a>
+    <a href="#" class="btn">Close</a>
+  </div>
 </div>
 
      
-      
      Notice If you want your modal to animate in and out, just add a .fade class to the .modal element (refer to the demo to see this in action).
      
-      
      Methods
      
-      
      .modal(options)
      
-      
      Activates your content as a modal. Accepts an optional options object.
+          
      Notice If you want your modal to animate in and out, just add a .fade class to the .modal element (refer to the demo to see this in action).
      
+          
      Methods
      
+          
      .modal(options)
      
+          
      Activates your content as a modal. Accepts an optional options object.
 
       $('#myModal').modal({
-keyboard: false
+  keyboard: false
 })
      
-      
      .modal('toggle')
      
-      
      Manually toggles a modal.
      
-      
      $('#myModal').modal('toggle')
      
-      
      .modal('show')
      
-      
      Manually opens a modal.
      
-      
      $('#myModal').modal('show')
      
-      
      .modal('hide')
      
-      
      Manually hides a modal.
      
-      
      $('#myModal').modal('hide')
      
-      
      Events
      
-      
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
-      
-        
-         
-           
-           
-         
-        
-        
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-        
-      
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when the modal has been made visible to the user (will wait for css transitions to complete).
      hideThis event is fired immediately when the hide instance method has been called.
      hiddenThis event is fired when the modal has finished being hidden from the user (will wait for css transitions to complete).
      
+          
      .modal('toggle')
      
+          
      Manually toggles a modal.
      
+          
      $('#myModal').modal('toggle')
      
+          
      .modal('show')
      
+          
      Manually opens a modal.
      
+          
      $('#myModal').modal('show')
      
+          
      .modal('hide')
      
+          
      Manually hides a modal.
      
+          
      $('#myModal').modal('hide')
      
+          
      Events
      
+          
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
+          
+            
+             
+               
+               
+             
+            
+            
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+            
+          
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when the modal has been made visible to the user (will wait for css transitions to complete).
      hideThis event is fired immediately when the hide instance method has been called.
      hiddenThis event is fired when the modal has finished being hidden from the user (will wait for css transitions to complete).
      
 
 
       $('#myModal').on('hidden', function () {
-// do something ...
+  // do something ...
 })
      
-    
      
-  
      
-
      
-
-
-
-
-
+
+
+
+    
+    
       
+
+           
 
-      
      
+          
      
 
-      
      Using bootstrap-dropdown.js
      
-      
      Call the dropdowns via javascript:
      
-      
      $('.dropdown-toggle').dropdown()
      
-      
      Markup
      
-      
      To quickly add dropdown functionality to any element just add data-toggle="dropdown" and any valid bootstrap dropdown will automatically be activated.
      
-      
      Notice For added control and flexibility, optionally specify a data-target="#fat" or href="#fat" - this allows you to target specific dropdowns.
      
+          
      Using bootstrap-dropdown.js
      
+          
      Call the dropdowns via javascript:
      
+          
      $('.dropdown-toggle').dropdown()
      
+          
      Markup
      
+          
      To quickly add dropdown functionality to any element just add data-toggle="dropdown" and any valid bootstrap dropdown will automatically be activated.
      
+          
      Notice For added control and flexibility, optionally specify a data-target="#fat" or href="#fat" - this allows you to target specific dropdowns.
      
 
 
       <ul class="nav pills">
-<li class="active"><a href="#">Regular link</a></li>
-<li class="dropdown" id="menu1">
-<a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
-  Dropdown
-  <b class="caret"></b>
-</a>
-<ul class="dropdown-menu">
-  <li><a href="#">Action</a></li>
-  <li><a href="#">Another action</a></li>
-  <li><a href="#">Something else here</a></li>
-  <li class="divider"></li>
-  <li><a href="#">Separated link</a></li>
-</ul>
-</li>
-...
+  <li class="active"><a href="#">Regular link</a></li>
+  <li class="dropdown" id="menu1">
+    <a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
+      Dropdown
+      <b class="caret"></b>
+    </a>
+    <ul class="dropdown-menu">
+      <li><a href="#">Action</a></li>
+      <li><a href="#">Another action</a></li>
+      <li><a href="#">Something else here</a></li>
+      <li class="divider"></li>
+      <li><a href="#">Separated link</a></li>
+    </ul>
+  </li>
+  ...
 </ul>
      
-      
      Methods
      
-      
      $().dropdown()
      
-      
      
-      A programatic api for activating menus for a given navbar or tabbed navigation.
-      
      
-    
      
-  
      
-
+          
      Methods
      
+          
      $().dropdown()
      
+          
      
+          A programatic api for activating menus for a given navbar or tabbed navigation.
+          
      
+        
      
+      
      
+    
 
 
 
-
-
      
-  
      
-    
      ScrollSpy bootstrap-scrollspy.js
      
-  
      
-  
      
-    
      
-      
      The ScrollSpy plugin is for automatically updating nav targets based on scroll position.
      
-      Download file
-    
      
-    
      
-      
      Example navbar with scrollspy
      
-      
      Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!
      
-      
+          
      
+            
      @fat
      
+            
      
+            Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
+            
      
+            
      @mdo
      
+            
      
+            Veniam marfa mustache skateboard, adipisicing fugiat velit pitchfork beard. Freegan beard aliqua cupidatat mcsweeney's vero. Cupidatat four loko nisi, ea helvetica nulla carles. Tattooed cosby sweater food truck, mcsweeney's quis non freegan vinyl. Lo-fi wes anderson +1 sartorial. Carles non aesthetic exercitation quis gentrify. Brooklyn adipisicing craft beer vice keytar deserunt.
+            
      
+            
      one
      
+            
      
+            Occaecat commodo aliqua delectus. Fap craft beer deserunt skateboard ea. Lomo bicycle rights adipisicing banh mi, velit ea sunt next level locavore single-origin coffee in magna veniam. High life id vinyl, echo park consequat quis aliquip banh mi pitchfork. Vero VHS est adipisicing. Consectetur nisi DIY minim messenger bag. Cred ex in, sustainable delectus consectetur fanny pack iphone.
+            
      
+            
      two
      
+            
      
+            In incididunt echo park, officia deserunt mcsweeney's proident master cleanse thundercats sapiente veniam. Excepteur VHS elit, proident shoreditch +1 biodiesel laborum craft beer. Single-origin coffee wayfarers irure four loko, cupidatat terry richardson master cleanse. Assumenda you probably haven't heard of them art party fanny pack, tattooed nulla cardigan tempor ad. Proident wolf nesciunt sartorial keffiyeh eu banh mi sustainable. Elit wolf voluptate, lo-fi ea portland before they sold out four loko. Locavore enim nostrud mlkshk brooklyn nesciunt.
+            
      
+            
      three
      
+            
      
+            Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
+            
      
+            
      Keytar twee blog, culpa messenger bag marfa whatever delectus food truck. Sapiente synth id assumenda. Locavore sed helvetica cliche irony, thundercats you probably haven't heard of them consequat hoodie gluten-free lo-fi fap aliquip. Labore elit placeat before they sold out, terry richardson proident brunch nesciunt quis cosby sweater pariatur keffiyeh ut helvetica artisan. Cardigan craft beer seitan readymade velit. VHS chambray laboris tempor veniam. Anim mollit minim commodo ullamco thundercats.
+            
      
+          
      
+          
      
+          
      Using bootstrap-scrollspy.js
      
+          
      Call the scrollspy via javascript:
      
+          
      $('#navbar').scrollspy()
      
+          
      Markup
      
+          
      To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body).
+          
      <body data-spy="scroll" >...</body>
      
+           
      Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      offsetnumber10Pixels to offset from top when calculating position of scroll.
      
         
      
       
      
-      
      
-        
      @fat
      
-        
      
-        Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
-        
      
-        
      @mdo
      
-        
      
-        Veniam marfa mustache skateboard, adipisicing fugiat velit pitchfork beard. Freegan beard aliqua cupidatat mcsweeney's vero. Cupidatat four loko nisi, ea helvetica nulla carles. Tattooed cosby sweater food truck, mcsweeney's quis non freegan vinyl. Lo-fi wes anderson +1 sartorial. Carles non aesthetic exercitation quis gentrify. Brooklyn adipisicing craft beer vice keytar deserunt.
-        
      
-        
      one
      
-        
      
-        Occaecat commodo aliqua delectus. Fap craft beer deserunt skateboard ea. Lomo bicycle rights adipisicing banh mi, velit ea sunt next level locavore single-origin coffee in magna veniam. High life id vinyl, echo park consequat quis aliquip banh mi pitchfork. Vero VHS est adipisicing. Consectetur nisi DIY minim messenger bag. Cred ex in, sustainable delectus consectetur fanny pack iphone.
-        
      
-        
      two
      
-        
      
-        In incididunt echo park, officia deserunt mcsweeney's proident master cleanse thundercats sapiente veniam. Excepteur VHS elit, proident shoreditch +1 biodiesel laborum craft beer. Single-origin coffee wayfarers irure four loko, cupidatat terry richardson master cleanse. Assumenda you probably haven't heard of them art party fanny pack, tattooed nulla cardigan tempor ad. Proident wolf nesciunt sartorial keffiyeh eu banh mi sustainable. Elit wolf voluptate, lo-fi ea portland before they sold out four loko. Locavore enim nostrud mlkshk brooklyn nesciunt.
-        
      
-        
      three
      
-        
      
-        Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
-        
      
-        
      Keytar twee blog, culpa messenger bag marfa whatever delectus food truck. Sapiente synth id assumenda. Locavore sed helvetica cliche irony, thundercats you probably haven't heard of them consequat hoodie gluten-free lo-fi fap aliquip. Labore elit placeat before they sold out, terry richardson proident brunch nesciunt quis cosby sweater pariatur keffiyeh ut helvetica artisan. Cardigan craft beer seitan readymade velit. VHS chambray laboris tempor veniam. Anim mollit minim commodo ullamco thundercats.
-        
      
-      
      
-      
      
-      
      Using bootstrap-scrollspy.js
      
-      
      Call the scrollspy via javascript:
      
-      
      $('#navbar').scrollspy()
      
-      
      Markup
      
-      
      To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body).
-      
      <body data-spy="scroll" >...</body>
      
-       
      Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
-      
      Options
      
-      
-        
-         
-           
-           
-           
-           
-         
-        
-        
-         
-           
-           
-           
-           
-         
-        
-      
      Nametypedefaultdescription
      offsetnumber10Pixels to offset from top when calculating position of scroll.
      
-    
      
-  
      
-
+    
 
 
 
-
-
      
-  
      
-    
      Togglable tabs bootstrap-tab.js
      
-  
      
-  
      
-    
      
-      
      This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.
      
-      Download file
-    
      
-    
      
-      
      Example tabs
      
-      
      Click the tabs below to toggle between hidden panes, even via dropdown menus.
      
-      
-      
      
-        
      
-          
      Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.
      
-        
      
-        
      
-          
      Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.
      
-        
      
-        
-        
+    
+    
      
+      
      
+        
      Togglable tabs bootstrap-tab.js
      
       
      
-      
      
-      
      Using bootstrap-tab.js
      
-      
      Enable tabbable tabs via javascript:
      
-      
      $('#myTab').tab('show')
      
-      
      Markup
      
-      
      You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.
      
+      
      
+        
      
+          
      This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.
      
+          Download file
+        
      
+        
      
+          
      Example tabs
      
+          
      Click the tabs below to toggle between hidden panes, even via dropdown menus.
      
+          
+          
      
+            
      
+              
      Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.
      
+            
      
+            
      
+              
      Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.
      
+            
      
+            
+            
+          
      
+          
      
+          
      Using bootstrap-tab.js
      
+          
      Enable tabbable tabs via javascript:
      
+          
      $('#myTab').tab('show')
      
+          
      Markup
      
+          
      You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.
      
 
       <ul class="tabs">
-<li><a href="#home" data-toggle="tab">Home</a></li>
-<li><a href="#profile" data-toggle="tab">Profile</a></li>
-<li><a href="#messages" data-toggle="tab">Messages</a></li>
-<li><a href="#ettings" data-toggle="tab">Settings</a></li>
+  <li><a href="#home" data-toggle="tab">Home</a></li>
+  <li><a href="#profile" data-toggle="tab">Profile</a></li>
+  <li><a href="#messages" data-toggle="tab">Messages</a></li>
+  <li><a href="#ettings" data-toggle="tab">Settings</a></li>
 </ul>
      
-      
      Methods
      
-      
      $().tab
      
-      
      
-        Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.
-      
      
+          
      Methods
      
+          
      $().tab
      
+          
      
+            Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.
+          
      
 
       <ul class="tabs">
-<li class="active"><a href="#home">Home</a></li>
-<li><a href="#profile">Profile</a></li>
-<li><a href="#messages">Messages</a></li>
-<li><a href="#settings">Settings</a></li>
+  <li class="active"><a href="#home">Home</a></li>
+  <li><a href="#profile">Profile</a></li>
+  <li><a href="#messages">Messages</a></li>
+  <li><a href="#settings">Settings</a></li>
 </ul>
 
 <div class="tab-content">
-<div class="active" id="home">...</div>
-<div id="profile">...</div>
-<div id="messages">...</div>
-<div id="settings">...</div>
+  <div class="active" id="home">...</div>
+  <div id="profile">...</div>
+  <div id="messages">...</div>
+  <div id="settings">...</div>
 </div>
 
 <script>
-$(function () {
-$('.tabs a:last').tab('show')
-})
+  $(function () {
+    $('.tabs a:last').tab('show')
+  })
 </script>
      
-      
      
-      
      Events
      
-      
-        
-         
-           
-           
-         
-        
-        
-         
-           
-           
-        
-        
-           
-           
-         
-        
-      
      EventDescription
      showThis event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
      shownThis event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
      
-
-      
      +          
      
+          
      Events
      
+          
+            
+             
+               
+               
+             
+            
+            
+             
+               
+               
+            
+            
+               
+               
+             
+            
+          
      EventDescription
      showThis event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
      shownThis event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
      
+
+          
       $('a[data-toggle="tab"]').on('shown', function (e) {
-e.target // activated tab
-e.relatedTarget // previous tab
+  e.target // activated tab
+  e.relatedTarget // previous tab
 })
      
-   
      
-  
      
-
      
-
-
-
-
      
-  
      
-    
      Tooltips bootstrap-tooltip.js
      
-  
      
-  
      
-    
      
-      
      About Tooltips
      
-      
      Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.
      
-      Download file
-    
      
-    
      
-      
      Example use of Tooltips
      
-      
      Hover over the links below to see tooltips:
      
-      
      
-        
      Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
-        
      
+       
      
       
      
-      
      
-      
      Using bootstrap-tooltip.js
      
-      
      Trigger the tooltip via javascript:
      
-      
      $('#example').tooltip(options)
      
-      
      Options
      
-      
-        
-         
-           
-           
-           
-           
-         
-        
-        
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-        
-      
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'top'how to position the tooltip - top | bottom | left | right
      selectorstringfalseIf a selector is provided, tooltip objects will be delegated to the specified targets.
      titlestring | function''default title value if `title` tag isn't present
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      delaynumber | object0
-            
      delay showing/hiding the tooltip (ms)
      
-            
      If a number is supplied, delay is applied to both hide/show
      
-            
      Object structure is: delay: { show: 500, hide: 100 }
      
-           
      
-      
      Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.
      
-      
      Markup
      
-      
      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
      
-      
      Methods
      
-      
      $().tooltip(options)
      
-      
      Attaches a tooltip handler to an element collection.
      
-      
      .tooltip('show')
      
-      
      Reveals an elements tooltip.
      
-      
      $('#element').tooltip('show')
      
-      
      .tooltip('hide')
      
-      
      Hides an elements tooltip.
      
-      
      $('#element').tooltip('hide')
      
-    
      
-  
      
-
      
-
-
-
-
-
      
-  
      
-    
      Popovers bootstrap-popover.js
      
-  
      
-  
      
-    
      
-      
      About popovers
      
-      
      Add small overlays of content, like those on the iPad, to any element for housing secondary information.
      
-      
      * Requires Tooltip to be included
      
-      Download file
-    
      
-    
      
-      
      Example hover popover
      
-      
      Hover over the button to trigger the popover.
      
-      
      
-        hover for popover
+    
      
+
+
+    
+    
      
+      
      
+        
      Tooltips bootstrap-tooltip.js
      
       
      
-      
      
-      
      Using bootstrap-popover.js
      
-      
      Enable popovers via javascript:
      
-      
      $('#example').popover(options)
      
-      
      Options
      
-      
-        
-         
-           
-           
-           
-           
-         
-        
-        
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-        
-      
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'right'how to position the popover - top | bottom | left | right
      selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      titlestring | function''default title value if `title` attribute isn't present
      contentstring | function''default content value if `data-content` attribute isn't present
      delaynumber | object0
-            
      delay showing/hiding the popover (ms)
      
-            
      If a number is supplied, delay is applied to both hide/show
      
-            
      Object structure is: delay: { show: 500, hide: 100 }
      
-           
      
-      
      Notice Individual popover instance options can alternatively be specified through the use of data attributes.
      
-      
      Markup
      
-      
      
-      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
-      
      
-      
      Methods
      
-      
      $().popover(options)
      
-      
      Initializes popovers for an element collection.
      
-      
      .popover('show')
      
-      
      Reveals an elements popover.
      
-      
      $('#element').popover('show')
      
-      
      .popover('hide')
      
-      
      Hides an elements popover.
      
-      
      $('#element').popover('hide')
      
-    
      
-  
      
-
-
-
-
-
-
      
-  
      
-    
      Alert messages bootstrap-alert.js
      
-  
      
-  
      
-    
      
-      
      About alerts
      
-      
      The alert plugin is a tiny class for adding close functionality to alerts.
      
-      Download
-    
      
-    
      
-      
      Example alerts
      
-      
      The alerts plugin works on regular alert messages, and block messages.
      
-      
      
-        ×
-        Holy guacamole! Best check yo self, you’re not looking too good.
+      
      
+        
      
+          
      About Tooltips
      
+          
      Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.
      
+          Download file
+        
      
+        
      
+          
      Example use of Tooltips
      
+          
      Hover over the links below to see tooltips:
      
+          
      
+            
      Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
+            
      
+          
      
+          
      
+          
      Using bootstrap-tooltip.js
      
+          
      Trigger the tooltip via javascript:
      
+          
      $('#example').tooltip(options)
      
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'top'how to position the tooltip - top | bottom | left | right
      selectorstringfalseIf a selector is provided, tooltip objects will be delegated to the specified targets.
      titlestring | function''default title value if `title` tag isn't present
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      delaynumber | object0
+                
      delay showing/hiding the tooltip (ms)
      
+                
      If a number is supplied, delay is applied to both hide/show
      
+                
      Object structure is: delay: { show: 500, hide: 100 }
      
+               
      
+          
      Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.
      
+          
      Markup
      
+          
      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
      
+          
      Methods
      
+          
      $().tooltip(options)
      
+          
      Attaches a tooltip handler to an element collection.
      
+          
      .tooltip('show')
      
+          
      Reveals an elements tooltip.
      
+          
      $('#element').tooltip('show')
      
+          
      .tooltip('hide')
      
+          
      Hides an elements tooltip.
      
+          
      $('#element').tooltip('hide')
      
+        
      
       
      
-      
      
-        ×
-        
      Oh snap! You got an error!
      
-        
      Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.
      
-        
      
-          Take this action Or do this
-        
      
+    
      
+
+
+
+    
+    
      
+      
      
+        
      Popovers bootstrap-popover.js
      
       
      
-      
      
-      
      Using bootstrap-alerts.js
      
-      
      Enable dismissal of an alert via javascript:
      
-      
      $(".alert-message").alert()
      
-      
      Markup
      
-      
      Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.
      
-      
      <a class="close" data-dismiss="alert" href="#">&times;</a>
      
-      
      Methods
      
-      
      $().alert()
      
-      
      Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.
      
-      
      .alert('close')
      
-      
      Closes an alert.
      
-      
      $(".alert-message").alert('close')
      
-      
      Events
      
-      
      Bootstrap's alert class exposes a few events for hooking into alert functionality. 
      
-      
-        
-         
-           
-           
-         
-        
-        
-         
-           
-           
-         
-         
-           
-           
-         
-        
-      
      EventDescription
      closeThis event fires immediately when the close instance method is called.
      closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
      
+      
      
+        
      
+          
      About popovers
      
+          
      Add small overlays of content, like those on the iPad, to any element for housing secondary information.
      
+          
      * Requires Tooltip to be included
      
+          Download file
+        
      
+        
      
+          
      Example hover popover
      
+          
      Hover over the button to trigger the popover.
      
+          
      
+            hover for popover
+          
      
+          
      
+          
      Using bootstrap-popover.js
      
+          
      Enable popovers via javascript:
      
+          
      $('#example').popover(options)
      
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'right'how to position the popover - top | bottom | left | right
      selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      titlestring | function''default title value if `title` attribute isn't present
      contentstring | function''default content value if `data-content` attribute isn't present
      delaynumber | object0
+                
      delay showing/hiding the popover (ms)
      
+                
      If a number is supplied, delay is applied to both hide/show
      
+                
      Object structure is: delay: { show: 500, hide: 100 }
      
+               
      
+          
      Notice Individual popover instance options can alternatively be specified through the use of data attributes.
      
+          
      Markup
      
+          
      
+          For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
+          
      
+          
      Methods
      
+          
      $().popover(options)
      
+          
      Initializes popovers for an element collection.
      
+          
      .popover('show')
      
+          
      Reveals an elements popover.
      
+          
      $('#element').popover('show')
      
+          
      .popover('hide')
      
+          
      Hides an elements popover.
      
+          
      $('#element').popover('hide')
      
+        
      
+      
      
+    
      
+
+
+
+    
+    
      
+      
      
+        
      Alert messages bootstrap-alert.js
      
+      
      
+      
      
+        
      
+          
      About alerts
      
+          
      The alert plugin is a tiny class for adding close functionality to alerts.
      
+          Download
+        
      
+        
      
+          
      Example alerts
      
+          
      The alerts plugin works on regular alert messages, and block messages.
      
+          
      
+            ×
+            Holy guacamole! Best check yo self, you’re not looking too good.
+          
      
+          
      
+            ×
+            
      Oh snap! You got an error!
      
+            
      Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.
      
+            
      
+              Take this action Or do this
+            
      
+          
      
+          
      
+          
      Using bootstrap-alerts.js
      
+          
      Enable dismissal of an alert via javascript:
      
+          
      $(".alert-message").alert()
      
+          
      Markup
      
+          
      Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.
      
+          
      <a class="close" data-dismiss="alert" href="#">&times;</a>
      
+          
      Methods
      
+          
      $().alert()
      
+          
      Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.
      
+          
      .alert('close')
      
+          
      Closes an alert.
      
+          
      $(".alert-message").alert('close')
      
+          
      Events
      
+          
      Bootstrap's alert class exposes a few events for hooking into alert functionality. 
      
+          
+            
+             
+               
+               
+             
+            
+            
+             
+               
+               
+             
+             
+               
+               
+             
+            
+          
      EventDescription
      closeThis event fires immediately when the close instance method is called.
      closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
      
 
       $('#my-alert').bind('closed', function () {
-// do something ...
+  // do something ...
 })
      
-    
      
-  
      
-
      
-
-
-
-
-
      
-  
      
-    
      Buttons bootstrap-button.js
      
-  
      
-  
      
-    
      
-      
      About
      
-      
      Do more with buttons. Control button states or create groups of buttons for more components like toolbars.
      
-      Download file
-    
      
-    
      
-      
      Example uses
      
-      
      Use the buttons plugin for states and toggles.
      
-      
-        
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-        
-      
      Stateful
-              
-            
      Single toggle
-              
-            
      Checkbox
-              
      
-                
-                
-                
-              
      
-           
      Radio
-              
      
-                
-                
-                
-              
      
-           
      
-      
      
-      
      Using bootstrap-button.js
      
-      
      Enable buttons via javascript:
      
-      
      $('.tabs').button()
      
-        
      Markup
      
-      
      Data attributes are integral to the button plugin. Check out the example code below for the various markup types.
      
+        
      
+      
      
+    
      
+
+
+
+    
+    
      
+      
      
+        
      Buttons bootstrap-button.js
      
+      
      
+      
      
+        
      
+          
      About
      
+          
      Do more with buttons. Control button states or create groups of buttons for more components like toolbars.
      
+          Download file
+        
      
+        
      
+          
      Example uses
      
+          
      Use the buttons plugin for states and toggles.
      
+          
+            
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+            
+          
      Stateful
+                  
+                
      Single toggle
+                  
+                
      Checkbox
+                  
      
+                    
+                    
+                    
+                  
      
+               
      Radio
+                  
      
+                    
+                    
+                    
+                  
      
+               
      
+          
      
+          
      Using bootstrap-button.js
      
+          
      Enable buttons via javascript:
      
+          
      $('.tabs').button()
      
+            
      Markup
      
+          
      Data attributes are integral to the button plugin. Check out the example code below for the various markup types.
      
 
       <!-- Add data-toggle="button" to activate toggling on a single button -->
 <button class="btn" data-toggle="button">Single Toggle</button>
 
 <!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
 <div class="btn-group" data-toggle="buttons-checkbox">
-<button class="btn">Left</button>
-<button class="btn">Middle</button>
-<button class="btn">Right</button>
+  <button class="btn">Left</button>
+  <button class="btn">Middle</button>
+  <button class="btn">Right</button>
 </div>
 
 <!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
 <div class="btn-group" data-toggle="buttons-radio">
-<button class="btn">Left</button>
-<button class="btn">Middle</button>
-<button class="btn">Right</button>
+  <button class="btn">Left</button>
+  <button class="btn">Middle</button>
+  <button class="btn">Right</button>
 </div>
 
      
-      
      Methods
      
-      
      $().button('toggle')
      
-      
      Toggles push state. Gives btn the look that it's been activated.
      
-      
      Notice You can enable auto toggling of a button by using the data-toggle attribute.
      
-      
      <button class="btn" data-toggle="button" >...</button>
      
-      
      $().button('loading')
      
-      
      Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text.
-      
      
-       
      <button class="btn" data-loading-text="loading stuff..." >...</button>
      
-      
      
-        Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here.
-      
      
-       
      $().button('reset')
      
-       
      Resets button state - swaps text to original text.
      
-       
      $().button(string)
      
-       
      Resets button state - swaps text to any data defined text state.
      
+          
      Methods
      
+          
      $().button('toggle')
      
+          
      Toggles push state. Gives btn the look that it's been activated.
      
+          
      Notice You can enable auto toggling of a button by using the data-toggle attribute.
      
+          
      <button class="btn" data-toggle="button" >...</button>
      
+          
      $().button('loading')
      
+          
      Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text.
+          
      
+           
      <button class="btn" data-loading-text="loading stuff..." >...</button>
      
+          
      
+            Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here.
+          
      
+           
      $().button('reset')
      
+           
      Resets button state - swaps text to original text.
      
+           
      $().button(string)
      
+           
      Resets button state - swaps text to any data defined text state.
      
 
      <button class="btn" data-complete-text="finished!" >...</button>
 <script>
-$('.btn').button('complete')
+  $('.btn').button('complete')
 </script>
      
-    
      
-  
      
-
      
-
-
-
-
-
      
-  
      
-    
      Collapse bootstrap-collapse.js
      
-  
      
-  
      
-    
      
-      
      About
      
-      
      Get base styles and flexible support for collapsible components like accordions and navigation.
      
-      Download file
-    
      
-    
      
-      
      Example accordion
      
-      
      Using the collapse plugin, we built a simple accordion style widget:
      
-    
-      
      
-        
      
-          
      
-            
-              Collapsible Group Item #1
-            
-          
      
-          
      
-            
      
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-            
      
-          
      
         
      
-        
      
-          
      
-            
-              Collapsible Group Item #2
-            
-          
      
-          
      
-            
      
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-            
      
-          
      
+      
      
+    
      
+
+
+
+    
+    
      
+      
      
+        
      Collapse bootstrap-collapse.js
      
+      
      
+      
      
+        
      
+          
      About
      
+          
      Get base styles and flexible support for collapsible components like accordions and navigation.
      
+          Download file
         
      
-        
      
-          
      
-            
-              Collapsible Group Item #3
-            
-          
      
-          
      
-            
      
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+        
      
+          
      Example accordion
      
+          
      Using the collapse plugin, we built a simple accordion style widget:
      
+        
+          
      
+            
      
+              
      
+                
+                  Collapsible Group Item #1
+                
+              
      
+              
      
+                
      
+                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                
      
+              
      
+            
      
+            
      
+              
      
+                
+                  Collapsible Group Item #2
+                
+              
      
+              
      
+                
      
+                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                
      
+              
      
+            
      
+            
      
+              
      
+                
+                  Collapsible Group Item #3
+                
+              
      
+              
      
+                
      
+                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                
      
+              
      
             
      
           
      
-        
      
-      
      
 
-      
-      
      
-      
      Using bootstrap-collapse.js
      
-      
      Enable via javascript:
      
-      
      $(".collapse").collapse()
      
-      
      Options
      
-      
-        
-         
-           
-           
-           
-           
-         
-        
-        
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-        
-      
      Nametypedefaultdescription
      parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
      togglebooleantrueToggles the collapsible element on invocation
      
-      
      Markup
      
-      
      Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.
      
-      
      +          
+          
      
+          
      Using bootstrap-collapse.js
      
+          
      Enable via javascript:
      
+          
      $(".collapse").collapse()
      
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
      togglebooleantrueToggles the collapsible element on invocation
      
+          
      Markup
      
+          
      Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.
      
+          
       <button class="btn danger" data-toggle="collapse" data-target="#demo">
-simple collapsible
+  simple collapsible
 </button>
 
 <div id="demo" class="collapse in"> … </div>
      
-     
      Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.
      
-      
      Methods
      
-      
      .collapse(options)
      
-      
      Activates your content as a collapsible element. Accepts an optional options object.
+         
      Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.
      
+          
      Methods
      
+          
      .collapse(options)
      
+          
      Activates your content as a collapsible element. Accepts an optional options object.
 
       $('#myCollapsible').collapse({
-toggle: false
+  toggle: false
 })
      
-      
      .collapse('toggle')
      
-      
      Toggles a collapsible element to shown or hidden.
      
-      
      .collapse('show')
      
-      
      Shows a collapsible element.
      
-      
      .collapse('hide')
      
-      
      Hides a collapsible element.
      
-      
      Events
      
-      
      
-        Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
-      
      
-      
-        
-         
-           
-           
-         
-        
-        
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-        
-      
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
      hide
-            This event is fired immediately when the hide method has been called.
-           
      hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
      
+          
      .collapse('toggle')
      
+          
      Toggles a collapsible element to shown or hidden.
      
+          
      .collapse('show')
      
+          
      Shows a collapsible element.
      
+          
      .collapse('hide')
      
+          
      Hides a collapsible element.
      
+          
      Events
      
+          
      
+            Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
+          
      
+          
+            
+             
+               
+               
+             
+            
+            
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+            
+          
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
      hide
+                This event is fired immediately when the hide method has been called.
+               
      hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
      
 
 
       $('#myCollapsible').on('hidden', function () {
-// do something ...
+  // do something ...
 })
      
-    
      
-  
      
-
      
-
-
-
- 
-
+
+
+
+     
+    
-
-
-
-
-
      
-  
      
-    
      Typeahead bootstrap-typeahead.js
      
-  
      
-  
      
-    
      
-      
      About
      
-      
      A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.
      
-      Download file
-    
      
-    
      
-      
      Example
      
-      
      Start typing in the field below to show the typeahead results.
      
-      
      
-        
+          
      .carousel('cycle')
      
+          
      Cycles through the carousel items from left to right.
      
+          
      .carousel('pause')
      
+          
      Stops the carousel from cycling through items.
      
+          
      .carousel(number)
      
+          
      Cycles the carousel to a particular frame (0 based, similar to an array).
      
+          
      .carousel('prev')
      
+          
      Cycles to the previous item.
      
+          
      .carousel('next')
      
+          
      Cycles to the next item.
      
+          
      Events
      
+          
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
+          
+            
+             
+               
+               
+             
+            
+            
+             
+               
+               
+             
+             
+               
+               
+             
+             
+            
+          
      EventDescription
      slideThis event fires immediately when the slide instance method is invoked.
      slidThis event is fired when the carousel has completed it's slide transition.
      
+        
      
       
      
-      
      
-      
      Using bootstrap-typeahead.js
      
-      
      Call the typeahead via javascript:
      
-      
      $('.typeahead').typeahead()
      
-      
      Options
      
-      
-        
-         
-           
-           
-           
-           
-         
-        
-        
-         
-           
-           
-           
-           
-         
-        
-      
      Nametypedefaultdescription
      itemsnumber8The max number of items to display in the dropdown.
      
-
-      
      Markup
      
-      
      Add data attributes to register an element with typeahead functionality.
      
+    
      
+
+
+
+    
+    
      
+      
      
+        
      Typeahead bootstrap-typeahead.js
      
+      
      
+      
      
+        
      
+          
      About
      
+          
      A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.
      
+          Download file
+        
      
+        
      
+          
      Example
      
+          
      Start typing in the field below to show the typeahead results.
      
+          
      
+            
+          
      
+          
      
+          
      Using bootstrap-typeahead.js
      
+          
      Call the typeahead via javascript:
      
+          
      $('.typeahead').typeahead()
      
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      itemsnumber8The max number of items to display in the dropdown.
      
+
+          
      Markup
      
+          
      Add data attributes to register an element with typeahead functionality.
      
 
       <input type="text" data-provide="typeahead">
 
      
-    
      
-  
      
-
      
-      
       
      
         
      Back to top
      
diff --git a/docs/less.html b/docs/less.html
index 5c8eb735d..76a47f269 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -27,89 +27,27 @@
 
   
 
-    
     
      
       
      
         
      
           Bootstrap
           
      
 
 
-      
       
      
         
      Back to top
      
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 904d53af6..be49f94d5 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -27,97 +27,30 @@
 
   
 
-    
     
      
       
      
         
      
           Bootstrap
           
         
      
@@ -126,15 +59,6 @@
 
     
      
 
-<<<<<<< HEAD
-
-
-
      
-  
      Scaffolding
      
-  
      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
      
-
      
-=======
       
       
      
@@ -146,7 +70,6 @@
           
    • Responsive design
      • 
         
       
      
->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 
 
@@ -451,7 +374,7 @@
     
      
   
      
 
-      
       
      
         
      Back to top
      
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index cc36a05ed..eccc67974 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -27,79 +27,30 @@
 
   
 
-    
     
      
       
      
         
      
           Bootstrap
           
         
      
@@ -110,7 +61,7 @@
 
 {{>body}}
 
-      
       
      
         
      Back to top
      
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 3933c867d..28ca2912b 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -3,6 +3,13 @@
 
      
   
      Base CSS
      
   
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
+  
 
      
 
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 21ddf4747..20d7ae921 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1,9 +1,21 @@
-
-
      
-  
      Components
      
-  
      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
      
-
      
+  
+  
      
+    
      Components
      
+    
      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
      
+    
+  
      
+
 
 
   
-  
      
-    
      
-      
      Bootstrap,
       from Twitter
      
-      
      Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.
      
-      
      
-        Download on GitHub
-        Get started →
-      
      
+        
+        
      
+          
      
+            
      Bootstrap,
       from Twitter
      
+            
      Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.
      
+            
      
+              Download on GitHub
+              Get started →
+            
      
 
-      
      
-        
      Feature highlights
      
-        
        
-          
      • × Built on LESS
        • 
-          
      • × Complete styleguide docs
        • 
-          
      • × Fully responsive design
        • 
-          
      • × Small footprint (7kb gzipped)
        • 
-          
      • × Support for IE7 and up
        • 
-          
      • × Custom jQuery plugins
        • 
-          
      • × Dozens of components
        • 
-        
      
-      
      
-    
      
-  
      
+            
      
+              
      Feature highlights
      
+              
        
+                
      • × Built on LESS
        • 
+                
      • × Complete styleguide docs
        • 
+                
      • × Fully responsive design
        • 
+                
      • × Small footprint (7kb gzipped)
        • 
+                
      • × Support for IE7 and up
        • 
+                
      • × Custom jQuery plugins
        • 
+                
      • × Dozens of components
        • 
+              
      
+            
      
+          
      
+        
      
 
-  
 
 
-  
      
-    
      Built with Bootstrap.
      
-    
      For even more sites built with Bootstrap, visit the unofficial Tumblr.
      
-    
+        
      
+          
      Built with Bootstrap.
      
+          
      For even more sites built with Bootstrap, visit the unofficial Tumblr.
      
+          
 
-    
      Designed for everyone, everywhere.
      
-    
      Need reasons to love Bootstrap? Look no further.
      
-    
      
-      
      
-        
-        
      Built for and by nerds
      
-        
      Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.
      
-      
      
-      
      
-        
-        
      For all skill levels
      
-        
      Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.
      
-      
      
-      
      
-        
-        
      Cross-everything
      
-        
      Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.
      
-      
      
-    
      
-    
      
-      
      
-        
-        
      12-column grid
      
-        
      Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.
      
-      
      
-      
      
-        
-        
      Responsive design
      
-        
      With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.
      
-      
      
-      
      
-        
-        
      Styleguide docs
      
-        
      Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.
      
-      
      
-    
      
-    
      
-      
      
-        
-        
      Growing library
      
-        
      Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.
      
-      
      
-      
      
-        
-        
      Custom jQuery plugins
      
-        
      What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.
      
-      
      
-      
      
-        
-        
      Built on LESS
      
-        
      Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.
      
-      
      
-    
      
-    
      
-      
      
-        
-        
      HTML5
      
-        
      Built to support new HTML5 elements and syntax.
      
-      
      
-      
      
-        
-        
      CSS3
      
-        
      Progressively enhanced components for ultimate style.
      
-      
      
-      
      
-        
-        
      Open-source
      
-        
      Built for and maintained by the community via GitHub.
      
-      
      
-      
      
-        
-        
      Made at Twitter
      
-        
      Brought to you by an experienced engineer and designer.
      
-      
      
-    
      
+          
      Designed for everyone, everywhere.
      
+          
      Need reasons to love Bootstrap? Look no further.
      
+          
      
+            
      
+              
+              
      Built for and by nerds
      
+              
      Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.
      
+            
      
+            
      
+              
+              
      For all skill levels
      
+              
      Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.
      
+            
      
+            
      
+              
+              
      Cross-everything
      
+              
      Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.
      
+            
      
+          
      
+          
      
+            
      
+              
+              
      12-column grid
      
+              
      Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.
      
+            
      
+            
      
+              
+              
      Responsive design
      
+              
      With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.
      
+            
      
+            
      
+              
+              
      Styleguide docs
      
+              
      Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.
      
+            
      
+          
      
+          
      
+            
      
+              
+              
      Growing library
      
+              
      Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.
      
+            
      
+            
      
+              
+              
      Custom jQuery plugins
      
+              
      What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.
      
+            
      
+            
      
+              
+              
      Built on LESS
      
+              
      Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.
      
+            
      
+          
      
+          
      
+            
      
+              
+              
      HTML5
      
+              
      Built to support new HTML5 elements and syntax.
      
+            
      
+            
      
+              
+              
      CSS3
      
+              
      Progressively enhanced components for ultimate style.
      
+            
      
+            
      
+              
+              
      Open-source
      
+              
      Built for and maintained by the community via GitHub.
      
+            
      
+            
      
+              
+              
      Made at Twitter
      
+              
      Brought to you by an experienced engineer and designer.
      
+            
      
+          
      
 
 
-    
-    
      Get started in no time.
      
-    
      Quickly start using Bootstrap within your workflow and development process.
      
-    
-      
-        
-          
-          
-          
-        
-      
-    
      
-            
      Hotlink the CSS
      
-            
      For the quickest and easiest start, just copy this snippet into your webpage.
      
-            
      
-              
-            
      
-                		
-            
      Use it with LESS
      
-            
      A fan of using LESS? No problem, just clone the repo and add these lines:
      
-            
      
-              
-            
      
-                		
-            
      Fork on GitHub
      
-            
      Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.
      
-            
      Bootstrap on GitHub »
      
-            
      Currently v2.0.0
      
-          
      
-  
      
-
      
\ No newline at end of file
+          
+          
      Get started in no time.
      
+          
      Quickly start using Bootstrap within your workflow and development process.
      
+          
+            
+              
+                
+                
+                
+              
+            
+          
      
+                  
      Hotlink the CSS
      
+                  
      For the quickest and easiest start, just copy this snippet into your webpage.
      
+                  
      
+                    
+                  
      
+                      		
+                  
      Use it with LESS
      
+                  
      A fan of using LESS? No problem, just clone the repo and add these lines:
      
+                  
      
+                    
+                  
      
+                      		
+                  
      Fork on GitHub
      
+                  
      Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.
      
+                  
      Bootstrap on GitHub »
      
+                  
      Currently v2.0.0
      
+                
      
+        
      
+      
      
\ No newline at end of file
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index aefe87846..93789cc03 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1,1299 +1,1313 @@
-
-
      
-  
      Javascript for Bootstrap
      
-  
      Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
-
      
+      
+      
      
+        
      Javascript for Bootstrap
      
+        
      Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
+        
      
+      
      
 
 
-  
-  
      
-    
      
-      
      jQuery plugins A dozen Bootstrap plugins to get you started
      
-    
      
-  
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-  
       
-  
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-  
       
-  
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-    
      
-      
-    
      
-  
       
-  
      
-    
      
-      
      
-        Download Source
-        
-          
-        
-        
+      
+      
      
+        
      
+          
      jQuery plugins A dozen Bootstrap plugins to get you started
      
+        
      
+      
      
+        
      
+          
+        
      
+        
      
+          
+        
      
+        
      
+          
+        
      
+        
      
+          
+        
      
+      
       
+      
      
+        
      
+          
+        
      
+        
      
+          
+        
      
+        
      
+          
+        
      
+        
      
+          
+        
      
+      
       
+      
      
+        
      
+          
+        
      
+        
      
+          
+        
      
+        
      
+          
+        
      
+        
      
+          
+        
      
+      
       
+      
      
+        
      
+          
+        
      
       
      
-    
      
-  
      
-  
      
-  Select/Unselect All Plugins
-  
      Note: All plugins require the latest version of jQuery to be included.
      
-
      
+      
      
+      Select/Unselect All Plugins
+      
      Note: All plugins require the latest version of jQuery to be included.
      
+    
 
 
 
-
-
      
-  
      
-    
      Modals bootstrap-modal.js
      
-  
      
-  
      
-    
      
-      
      About modals
      
-      
      A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.
      
-      Download file
-    
      
-    
      
-      
      Static example
      
-      
      Below is a statically rendered modal.
      
-      
      
-        
      
-          
      
-            ×
-            
      Modal header
      
-          
      
-          
      
-            
      One fine body…
      
-          
      
-          
      
-            Save changes
-            Close
-          
      
+    
+    
      
+      
      
+        
      Modals bootstrap-modal.js
      
+      
      
+      
      
+        
      
+          
      About modals
      
+          
      A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.
      
+          Download file
         
      
-      
       
+        
      
+          
      Static example
      
+          
      Below is a statically rendered modal.
      
+          
      
+            
      
+              
      
+                ×
+                
      Modal header
      
+              
      
+              
      
+                
      One fine body…
      
+              
      
+              
      
+                Save changes
+                Close
+              
      
+            
      
+          
       
 
-      
      Live demo
      
-      
      Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.
      
-      
-      
+          Launch demo modal
 
-      
      
+          
      
 
-      
      Using bootstrap-modal
      
-      
      Call the modal via javascript:
      
-      
      $('#myModal').modal(options)
      
-      
      Options
      
-      
-        
-         
-           
-           
-           
-           
-         
-        
-        
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-        
-      
      Nametypedefaultdescription
      backdropbooleantrueIncludes a modal-backdrop element
      keyboardbooleantrueCloses the modal when escape key is pressed
      
-      
      Markup
      
-      
      You can activate modals on your page easily without having to write a single line of javascript. Just set data-toggle="modal" on a controller element with a data-target="#foo" or href="#foo" which corresponds to a modal element id, and when clicked, it will launch your modal.
      
-      
      Also, to add options to your modal instance, just include them as additional data attributes on either the control element or the modal markup itself.
      
+          
      Using bootstrap-modal
      
+          
      Call the modal via javascript:
      
+          
      $('#myModal').modal(options)
      
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      backdropbooleantrueIncludes a modal-backdrop element
      keyboardbooleantrueCloses the modal when escape key is pressed
      
+          
      Markup
      
+          
      You can activate modals on your page easily without having to write a single line of javascript. Just set data-toggle="modal" on a controller element with a data-target="#foo" or href="#foo" which corresponds to a modal element id, and when clicked, it will launch your modal.
      
+          
      Also, to add options to your modal instance, just include them as additional data attributes on either the control element or the modal markup itself.
      
 
       <a class="btn" data-toggle="modal" href="#myModal" >Launch Modal</a>
 
      
 
 
       <div class="modal">
-<div class="modal-header">
-<a href="#" class="close js-dismiss">×</a>
-<h3>Modal header</h3>
-</div>
-<div class="modal-body">
-<p>One fine body…</p>
-</div>
-<div class="modal-footer">
-<a href="#" class="btn primary">Save changes</a>
-<a href="#" class="btn">Close</a>
-</div>
+  <div class="modal-header">
+    <a href="#" class="close js-dismiss">×</a>
+    <h3>Modal header</h3>
+  </div>
+  <div class="modal-body">
+    <p>One fine body…</p>
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn primary">Save changes</a>
+    <a href="#" class="btn">Close</a>
+  </div>
 </div>
 
      
-      
      Notice If you want your modal to animate in and out, just add a .fade class to the .modal element (refer to the demo to see this in action).
      
-      
      Methods
      
-      
      .modal(options)
      
-      
      Activates your content as a modal. Accepts an optional options object.
+          
      Notice If you want your modal to animate in and out, just add a .fade class to the .modal element (refer to the demo to see this in action).
      
+          
      Methods
      
+          
      .modal(options)
      
+          
      Activates your content as a modal. Accepts an optional options object.
 
       $('#myModal').modal({
-keyboard: false
+  keyboard: false
 })
      
-      
      .modal('toggle')
      
-      
      Manually toggles a modal.
      
-      
      $('#myModal').modal('toggle')
      
-      
      .modal('show')
      
-      
      Manually opens a modal.
      
-      
      $('#myModal').modal('show')
      
-      
      .modal('hide')
      
-      
      Manually hides a modal.
      
-      
      $('#myModal').modal('hide')
      
-      
      Events
      
-      
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
-      
-        
-         
-           
-           
-         
-        
-        
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-        
-      
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when the modal has been made visible to the user (will wait for css transitions to complete).
      hideThis event is fired immediately when the hide instance method has been called.
      hiddenThis event is fired when the modal has finished being hidden from the user (will wait for css transitions to complete).
      
+          
      .modal('toggle')
      
+          
      Manually toggles a modal.
      
+          
      $('#myModal').modal('toggle')
      
+          
      .modal('show')
      
+          
      Manually opens a modal.
      
+          
      $('#myModal').modal('show')
      
+          
      .modal('hide')
      
+          
      Manually hides a modal.
      
+          
      $('#myModal').modal('hide')
      
+          
      Events
      
+          
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
+          
+            
+             
+               
+               
+             
+            
+            
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+            
+          
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when the modal has been made visible to the user (will wait for css transitions to complete).
      hideThis event is fired immediately when the hide instance method has been called.
      hiddenThis event is fired when the modal has finished being hidden from the user (will wait for css transitions to complete).
      
 
 
       $('#myModal').on('hidden', function () {
-// do something ...
+  // do something ...
 })
      
-    
      
-  
      
-
      
+        
      
+      
      
+    
 
 
 
-
-
+          
      Methods
      
+          
      $().dropdown()
      
+          
      
+          A programatic api for activating menus for a given navbar or tabbed navigation.
+          
      
+        
      
+      
      
+    
 
 
 
-
-
      
-  
      
-    
      ScrollSpy bootstrap-scrollspy.js
      
-  
      
-  
      
-    
      
-      
      The ScrollSpy plugin is for automatically updating nav targets based on scroll position.
      
-      Download file
-    
      
-    
      
-      
      Example navbar with scrollspy
      
-      
      Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!
      
-      
+          
      
+            
      @fat
      
+            
      
+            Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
+            
      
+            
      @mdo
      
+            
      
+            Veniam marfa mustache skateboard, adipisicing fugiat velit pitchfork beard. Freegan beard aliqua cupidatat mcsweeney's vero. Cupidatat four loko nisi, ea helvetica nulla carles. Tattooed cosby sweater food truck, mcsweeney's quis non freegan vinyl. Lo-fi wes anderson +1 sartorial. Carles non aesthetic exercitation quis gentrify. Brooklyn adipisicing craft beer vice keytar deserunt.
+            
      
+            
      one
      
+            
      
+            Occaecat commodo aliqua delectus. Fap craft beer deserunt skateboard ea. Lomo bicycle rights adipisicing banh mi, velit ea sunt next level locavore single-origin coffee in magna veniam. High life id vinyl, echo park consequat quis aliquip banh mi pitchfork. Vero VHS est adipisicing. Consectetur nisi DIY minim messenger bag. Cred ex in, sustainable delectus consectetur fanny pack iphone.
+            
      
+            
      two
      
+            
      
+            In incididunt echo park, officia deserunt mcsweeney's proident master cleanse thundercats sapiente veniam. Excepteur VHS elit, proident shoreditch +1 biodiesel laborum craft beer. Single-origin coffee wayfarers irure four loko, cupidatat terry richardson master cleanse. Assumenda you probably haven't heard of them art party fanny pack, tattooed nulla cardigan tempor ad. Proident wolf nesciunt sartorial keffiyeh eu banh mi sustainable. Elit wolf voluptate, lo-fi ea portland before they sold out four loko. Locavore enim nostrud mlkshk brooklyn nesciunt.
+            
      
+            
      three
      
+            
      
+            Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
+            
      
+            
      Keytar twee blog, culpa messenger bag marfa whatever delectus food truck. Sapiente synth id assumenda. Locavore sed helvetica cliche irony, thundercats you probably haven't heard of them consequat hoodie gluten-free lo-fi fap aliquip. Labore elit placeat before they sold out, terry richardson proident brunch nesciunt quis cosby sweater pariatur keffiyeh ut helvetica artisan. Cardigan craft beer seitan readymade velit. VHS chambray laboris tempor veniam. Anim mollit minim commodo ullamco thundercats.
+            
      
+          
      
+          
      
+          
      Using bootstrap-scrollspy.js
      
+          
      Call the scrollspy via javascript:
      
+          
      $('#navbar').scrollspy()
      
+          
      Markup
      
+          
      To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body).
+          
      <body data-spy="scroll" >...</body>
      
+           
      Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      offsetnumber10Pixels to offset from top when calculating position of scroll.
      
         
      
       
      
-      
      
-        
      @fat
      
-        
      
-        Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
-        
      
-        
      @mdo
      
-        
      
-        Veniam marfa mustache skateboard, adipisicing fugiat velit pitchfork beard. Freegan beard aliqua cupidatat mcsweeney's vero. Cupidatat four loko nisi, ea helvetica nulla carles. Tattooed cosby sweater food truck, mcsweeney's quis non freegan vinyl. Lo-fi wes anderson +1 sartorial. Carles non aesthetic exercitation quis gentrify. Brooklyn adipisicing craft beer vice keytar deserunt.
-        
      
-        
      one
      
-        
      
-        Occaecat commodo aliqua delectus. Fap craft beer deserunt skateboard ea. Lomo bicycle rights adipisicing banh mi, velit ea sunt next level locavore single-origin coffee in magna veniam. High life id vinyl, echo park consequat quis aliquip banh mi pitchfork. Vero VHS est adipisicing. Consectetur nisi DIY minim messenger bag. Cred ex in, sustainable delectus consectetur fanny pack iphone.
-        
      
-        
      two
      
-        
      
-        In incididunt echo park, officia deserunt mcsweeney's proident master cleanse thundercats sapiente veniam. Excepteur VHS elit, proident shoreditch +1 biodiesel laborum craft beer. Single-origin coffee wayfarers irure four loko, cupidatat terry richardson master cleanse. Assumenda you probably haven't heard of them art party fanny pack, tattooed nulla cardigan tempor ad. Proident wolf nesciunt sartorial keffiyeh eu banh mi sustainable. Elit wolf voluptate, lo-fi ea portland before they sold out four loko. Locavore enim nostrud mlkshk brooklyn nesciunt.
-        
      
-        
      three
      
-        
      
-        Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.
-        
      
-        
      Keytar twee blog, culpa messenger bag marfa whatever delectus food truck. Sapiente synth id assumenda. Locavore sed helvetica cliche irony, thundercats you probably haven't heard of them consequat hoodie gluten-free lo-fi fap aliquip. Labore elit placeat before they sold out, terry richardson proident brunch nesciunt quis cosby sweater pariatur keffiyeh ut helvetica artisan. Cardigan craft beer seitan readymade velit. VHS chambray laboris tempor veniam. Anim mollit minim commodo ullamco thundercats.
-        
      
-      
      
-      
      
-      
      Using bootstrap-scrollspy.js
      
-      
      Call the scrollspy via javascript:
      
-      
      $('#navbar').scrollspy()
      
-      
      Markup
      
-      
      To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body).
-      
      <body data-spy="scroll" >...</body>
      
-       
      Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
-      
      Options
      
-      
-        
-         
-           
-           
-           
-           
-         
-        
-        
-         
-           
-           
-           
-           
-         
-        
-      
      Nametypedefaultdescription
      offsetnumber10Pixels to offset from top when calculating position of scroll.
      
-    
      
-  
-
+    
 
 
 
-
-
      
-  
      
-    
      Togglable tabs bootstrap-tab.js
      
-  
      
-  
      
-    
      
-      
      This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.
      
-      Download file
-    
      
-    
      
-      
      Example tabs
      
-      
      Click the tabs below to toggle between hidden panes, even via dropdown menus.
      
-      
-      
      
-        
      
-          
      Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.
      
-        
      
-        
      
-          
      Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.
      
-        
      
-        
-        
+    
+    
      
+      
      
+        
      Togglable tabs bootstrap-tab.js
      
       
      
-      
      
-      
      Using bootstrap-tab.js
      
-      
      Enable tabbable tabs via javascript:
      
-      
      $('#myTab').tab('show')
      
-      
      Markup
      
-      
      You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.
      
+      
      
+        
      
+          
      This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.
      
+          Download file
+        
      
+        
      
+          
      Example tabs
      
+          
      Click the tabs below to toggle between hidden panes, even via dropdown menus.
      
+          
+          
      
+            
      
+              
      Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.
      
+            
      
+            
      
+              
      Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.
      
+            
      
+            
+            
+          
      
+          
      
+          
      Using bootstrap-tab.js
      
+          
      Enable tabbable tabs via javascript:
      
+          
      $('#myTab').tab('show')
      
+          
      Markup
      
+          
      You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.
      
 
       <ul class="tabs">
-<li><a href="#home" data-toggle="tab">Home</a></li>
-<li><a href="#profile" data-toggle="tab">Profile</a></li>
-<li><a href="#messages" data-toggle="tab">Messages</a></li>
-<li><a href="#ettings" data-toggle="tab">Settings</a></li>
+  <li><a href="#home" data-toggle="tab">Home</a></li>
+  <li><a href="#profile" data-toggle="tab">Profile</a></li>
+  <li><a href="#messages" data-toggle="tab">Messages</a></li>
+  <li><a href="#ettings" data-toggle="tab">Settings</a></li>
 </ul>
      
-      
      Methods
      
-      
      $().tab
      
-      
      
-        Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.
-      
      
+          
      Methods
      
+          
      $().tab
      
+          
      
+            Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.
+          
      
 
       <ul class="tabs">
-<li class="active"><a href="#home">Home</a></li>
-<li><a href="#profile">Profile</a></li>
-<li><a href="#messages">Messages</a></li>
-<li><a href="#settings">Settings</a></li>
+  <li class="active"><a href="#home">Home</a></li>
+  <li><a href="#profile">Profile</a></li>
+  <li><a href="#messages">Messages</a></li>
+  <li><a href="#settings">Settings</a></li>
 </ul>
 
 <div class="tab-content">
-<div class="active" id="home">...</div>
-<div id="profile">...</div>
-<div id="messages">...</div>
-<div id="settings">...</div>
+  <div class="active" id="home">...</div>
+  <div id="profile">...</div>
+  <div id="messages">...</div>
+  <div id="settings">...</div>
 </div>
 
 <script>
-$(function () {
-$('.tabs a:last').tab('show')
-})
+  $(function () {
+    $('.tabs a:last').tab('show')
+  })
 </script>
      
-      
      
-      
      Events
      
-      
-        
-         
-           
-           
-         
-        
-        
-         
-           
-           
-        
-        
-           
-           
-         
-        
-      
      EventDescription
      showThis event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
      shownThis event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
      
+          
      
+          
      Events
      
+          
+            
+             
+               
+               
+             
+            
+            
+             
+               
+               
+            
+            
+               
+               
+             
+            
+          
      EventDescription
      showThis event fires on tab show, but before the new tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
      shownThis event fires on tab show after a tab has been shown. Use event.target and event.relatedTarget to target the active tab and the previous active tab (if available) respectively.
      
 
-      
      +          
       $('a[data-toggle="tab"]').on('shown', function (e) {
-e.target // activated tab
-e.relatedTarget // previous tab
+  e.target // activated tab
+  e.relatedTarget // previous tab
 })
      
-   
      
-  
      
-
      
+       
      
+      
      
+    
      
 
 
-
-
      
-  
      
-    
      Tooltips bootstrap-tooltip.js
      
-  
      
-  
      
-    
      
-      
      About Tooltips
      
-      
      Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.
      
-      Download file
-    
      
-    
      
-      
      Example use of Tooltips
      
-      
      Hover over the links below to see tooltips:
      
-      
      
-        
      Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
-        
      
+    
+    
      
+      
      
+        
      Tooltips bootstrap-tooltip.js
      
       
      
-      
      
-      
      Using bootstrap-tooltip.js
      
-      
      Trigger the tooltip via javascript:
      
-      
      $('#example').tooltip(options)
      
-      
      Options
      
-      
-        
-         
-           
-           
-           
-           
-         
-        
-        
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-        
-      
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'top'how to position the tooltip - top | bottom | left | right
      selectorstringfalseIf a selector is provided, tooltip objects will be delegated to the specified targets.
      titlestring | function''default title value if `title` tag isn't present
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      delaynumber | object0
-            
      delay showing/hiding the tooltip (ms)
      
-            
      If a number is supplied, delay is applied to both hide/show
      
-            
      Object structure is: delay: { show: 500, hide: 100 }
      
-           
      
-      
      Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.
      
-      
      Markup
      
-      
      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
      
-      
      Methods
      
-      
      $().tooltip(options)
      
-      
      Attaches a tooltip handler to an element collection.
      
-      
      .tooltip('show')
      
-      
      Reveals an elements tooltip.
      
-      
      $('#element').tooltip('show')
      
-      
      .tooltip('hide')
      
-      
      Hides an elements tooltip.
      
-      
      $('#element').tooltip('hide')
      
-    
      
-  
      
-
      
+      
      
+        
      
+          
      About Tooltips
      
+          
      Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.
      
+          Download file
+        
      
+        
      
+          
      Example use of Tooltips
      
+          
      Hover over the links below to see tooltips:
      
+          
      
+            
      Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.
+            
      
+          
      
+          
      
+          
      Using bootstrap-tooltip.js
      
+          
      Trigger the tooltip via javascript:
      
+          
      $('#example').tooltip(options)
      
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'top'how to position the tooltip - top | bottom | left | right
      selectorstringfalseIf a selector is provided, tooltip objects will be delegated to the specified targets.
      titlestring | function''default title value if `title` tag isn't present
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      delaynumber | object0
+                
      delay showing/hiding the tooltip (ms)
      
+                
      If a number is supplied, delay is applied to both hide/show
      
+                
      Object structure is: delay: { show: 500, hide: 100 }
      
+               
      
+          
      Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.
      
+          
      Markup
      
+          
      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
      
+          
      Methods
      
+          
      $().tooltip(options)
      
+          
      Attaches a tooltip handler to an element collection.
      
+          
      .tooltip('show')
      
+          
      Reveals an elements tooltip.
      
+          
      $('#element').tooltip('show')
      
+          
      .tooltip('hide')
      
+          
      Hides an elements tooltip.
      
+          
      $('#element').tooltip('hide')
      
+        
      
+      
      
+    
 
 
 
-
-
      
-  
      
-    
      Popovers bootstrap-popover.js
      
-  
      
-  
      
-    
      
-      
      About popovers
      
-      
      Add small overlays of content, like those on the iPad, to any element for housing secondary information.
      
-      
      * Requires Tooltip to be included
      
-      Download file
-    
      
-    
      
-      
      Example hover popover
      
-      
      Hover over the button to trigger the popover.
      
-      
      
-        hover for popover
+    
+    
      
+      
      
+        
      Popovers bootstrap-popover.js
      
       
      
-      
      
-      
      Using bootstrap-popover.js
      
-      
      Enable popovers via javascript:
      
-      
      $('#example').popover(options)
      
-      
      Options
      
-      
-        
-         
-           
-           
-           
-           
-         
-        
-        
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-        
-      
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'right'how to position the popover - top | bottom | left | right
      selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      titlestring | function''default title value if `title` attribute isn't present
      contentstring | function''default content value if `data-content` attribute isn't present
      delaynumber | object0
-            
      delay showing/hiding the popover (ms)
      
-            
      If a number is supplied, delay is applied to both hide/show
      
-            
      Object structure is: delay: { show: 500, hide: 100 }
      
-           
      
-      
      Notice Individual popover instance options can alternatively be specified through the use of data attributes.
      
-      
      Markup
      
-      
      
-      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
-      
      
-      
      Methods
      
-      
      $().popover(options)
      
-      
      Initializes popovers for an element collection.
      
-      
      .popover('show')
      
-      
      Reveals an elements popover.
      
-      
      $('#element').popover('show')
      
-      
      .popover('hide')
      
-      
      Hides an elements popover.
      
-      
      $('#element').popover('hide')
      
-    
      
-  
      
-
      
+      
      
+        
      
+          
      About popovers
      
+          
      Add small overlays of content, like those on the iPad, to any element for housing secondary information.
      
+          
      * Requires Tooltip to be included
      
+          Download file
+        
      
+        
      
+          
      Example hover popover
      
+          
      Hover over the button to trigger the popover.
      
+          
      
+            hover for popover
+          
      
+          
      
+          
      Using bootstrap-popover.js
      
+          
      Enable popovers via javascript:
      
+          
      $('#example').popover(options)
      
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      animationbooleantrueapply a css fade transition to the tooltip
      placementstring'right'how to position the popover - top | bottom | left | right
      selectorstringfalseif a selector is provided, tooltip objects will be delegated to the specified targets
      triggerstring'hover'how tooltip is triggered - hover | focus | manual
      titlestring | function''default title value if `title` attribute isn't present
      contentstring | function''default content value if `data-content` attribute isn't present
      delaynumber | object0
+                
      delay showing/hiding the popover (ms)
      
+                
      If a number is supplied, delay is applied to both hide/show
      
+                
      Object structure is: delay: { show: 500, hide: 100 }
      
+               
      
+          
      Notice Individual popover instance options can alternatively be specified through the use of data attributes.
      
+          
      Markup
      
+          
      
+          For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
+          
      
+          
      Methods
      
+          
      $().popover(options)
      
+          
      Initializes popovers for an element collection.
      
+          
      .popover('show')
      
+          
      Reveals an elements popover.
      
+          
      $('#element').popover('show')
      
+          
      .popover('hide')
      
+          
      Hides an elements popover.
      
+          
      $('#element').popover('hide')
      
+        
      
+      
      
+    
 
 
 
-
-
      
-  
      
-    
      Alert messages bootstrap-alert.js
      
-  
      
-  
      
-    
      
-      
      About alerts
      
-      
      The alert plugin is a tiny class for adding close functionality to alerts.
      
-      Download
-    
      
-    
      
-      
      Example alerts
      
-      
      The alerts plugin works on regular alert messages, and block messages.
      
-      
      
-        ×
-        Holy guacamole! Best check yo self, you’re not looking too good.
+    
+    
      
+      
      
+        
      Alert messages bootstrap-alert.js
      
       
      
-      
      
-        ×
-        
      Oh snap! You got an error!
      
-        
      Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.
      
-        
      
-          Take this action Or do this
-        
      
-      
      
-      
      
-      
      Using bootstrap-alerts.js
      
-      
      Enable dismissal of an alert via javascript:
      
-      
      $(".alert-message").alert()
      
-      
      Markup
      
-      
      Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.
      
-      
      <a class="close" data-dismiss="alert" href="#">&times;</a>
      
-      
      Methods
      
-      
      $().alert()
      
-      
      Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.
      
-      
      .alert('close')
      
-      
      Closes an alert.
      
-      
      $(".alert-message").alert('close')
      
-      
      Events
      
-      
      Bootstrap's alert class exposes a few events for hooking into alert functionality. 
      
-      
-        
-         
-           
-           
-         
-        
-        
-         
-           
-           
-         
-         
-           
-           
-         
-        
-      
      EventDescription
      closeThis event fires immediately when the close instance method is called.
      closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
      
+      
      
+        
      
+          
      About alerts
      
+          
      The alert plugin is a tiny class for adding close functionality to alerts.
      
+          Download
+        
      
+        
      
+          
      Example alerts
      
+          
      The alerts plugin works on regular alert messages, and block messages.
      
+          
      
+            ×
+            Holy guacamole! Best check yo self, you’re not looking too good.
+          
      
+          
      
+            ×
+            
      Oh snap! You got an error!
      
+            
      Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.
      
+            
      
+              Take this action Or do this
+            
      
+          
      
+          
      
+          
      Using bootstrap-alerts.js
      
+          
      Enable dismissal of an alert via javascript:
      
+          
      $(".alert-message").alert()
      
+          
      Markup
      
+          
      Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.
      
+          
      <a class="close" data-dismiss="alert" href="#">&times;</a>
      
+          
      Methods
      
+          
      $().alert()
      
+          
      Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.
      
+          
      .alert('close')
      
+          
      Closes an alert.
      
+          
      $(".alert-message").alert('close')
      
+          
      Events
      
+          
      Bootstrap's alert class exposes a few events for hooking into alert functionality. 
      
+          
+            
+             
+               
+               
+             
+            
+            
+             
+               
+               
+             
+             
+               
+               
+             
+            
+          
      EventDescription
      closeThis event fires immediately when the close instance method is called.
      closedThis event is fired when the alert has been closed (will wait for css transitions to complete).
      
 
       $('#my-alert').bind('closed', function () {
-// do something ...
+  // do something ...
 })
      
-    
      
-  
      
-
      
+        
      
+      
      
+    
      
 
 
 
-
-
      
-  
      
-    
      Buttons bootstrap-button.js
      
-  
      
-  
      
-    
      
-      
      About
      
-      
      Do more with buttons. Control button states or create groups of buttons for more components like toolbars.
      
-      Download file
-    
      
-    
      
-      
      Example uses
      
-      
      Use the buttons plugin for states and toggles.
      
-      
-        
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-        
-      
      Stateful
-              
-            
      Single toggle
-              
-            
      Checkbox
-              
      
-                
-                
-                
-              
      
-           
      Radio
-              
      
-                
-                
-                
-              
      
-           
      
-      
      
-      
      Using bootstrap-button.js
      
-      
      Enable buttons via javascript:
      
-      
      $('.tabs').button()
      
-        
      Markup
      
-      
      Data attributes are integral to the button plugin. Check out the example code below for the various markup types.
      
+    
+    
      
+      
      
+        
      Buttons bootstrap-button.js
      
+      
      
+      
      
+        
      
+          
      About
      
+          
      Do more with buttons. Control button states or create groups of buttons for more components like toolbars.
      
+          Download file
+        
      
+        
      
+          
      Example uses
      
+          
      Use the buttons plugin for states and toggles.
      
+          
+            
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+            
+          
      Stateful
+                  
+                
      Single toggle
+                  
+                
      Checkbox
+                  
      
+                    
+                    
+                    
+                  
      
+               
      Radio
+                  
      
+                    
+                    
+                    
+                  
      
+               
      
+          
      
+          
      Using bootstrap-button.js
      
+          
      Enable buttons via javascript:
      
+          
      $('.tabs').button()
      
+            
      Markup
      
+          
      Data attributes are integral to the button plugin. Check out the example code below for the various markup types.
      
 
       <!-- Add data-toggle="button" to activate toggling on a single button -->
 <button class="btn" data-toggle="button">Single Toggle</button>
 
 <!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
 <div class="btn-group" data-toggle="buttons-checkbox">
-<button class="btn">Left</button>
-<button class="btn">Middle</button>
-<button class="btn">Right</button>
+  <button class="btn">Left</button>
+  <button class="btn">Middle</button>
+  <button class="btn">Right</button>
 </div>
 
 <!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
 <div class="btn-group" data-toggle="buttons-radio">
-<button class="btn">Left</button>
-<button class="btn">Middle</button>
-<button class="btn">Right</button>
+  <button class="btn">Left</button>
+  <button class="btn">Middle</button>
+  <button class="btn">Right</button>
 </div>
 
      
-      
      Methods
      
-      
      $().button('toggle')
      
-      
      Toggles push state. Gives btn the look that it's been activated.
      
-      
      Notice You can enable auto toggling of a button by using the data-toggle attribute.
      
-      
      <button class="btn" data-toggle="button" >...</button>
      
-      
      $().button('loading')
      
-      
      Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text.
-      
      
-       
      <button class="btn" data-loading-text="loading stuff..." >...</button>
      
-      
      
-        Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here.
-      
      
-       
      $().button('reset')
      
-       
      Resets button state - swaps text to original text.
      
-       
      $().button(string)
      
-       
      Resets button state - swaps text to any data defined text state.
      
+          
      Methods
      
+          
      $().button('toggle')
      
+          
      Toggles push state. Gives btn the look that it's been activated.
      
+          
      Notice You can enable auto toggling of a button by using the data-toggle attribute.
      
+          
      <button class="btn" data-toggle="button" >...</button>
      
+          
      $().button('loading')
      
+          
      Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text.
+          
      
+           
      <button class="btn" data-loading-text="loading stuff..." >...</button>
      
+          
      
+            Notice Firefox persists the disabled state across page loads. A workaround for this is to use: autocomplete="off". More info can be found here.
+          
      
+           
      $().button('reset')
      
+           
      Resets button state - swaps text to original text.
      
+           
      $().button(string)
      
+           
      Resets button state - swaps text to any data defined text state.
      
 
      <button class="btn" data-complete-text="finished!" >...</button>
 <script>
-$('.btn').button('complete')
+  $('.btn').button('complete')
 </script>
      
-    
      
-  
      
-
      
+        
      
+      
      
+    
      
 
 
 
-
-
      
-  
      
-    
      Collapse bootstrap-collapse.js
      
-  
      
-  
      
-    
      
-      
      About
      
-      
      Get base styles and flexible support for collapsible components like accordions and navigation.
      
-      Download file
-    
      
-    
      
-      
      Example accordion
      
-      
      Using the collapse plugin, we built a simple accordion style widget:
      
-    
-      
      
-        
      
-          
      
-            
-              Collapsible Group Item #1
-            
-          
      
-          
      
-            
      
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-            
      
-          
      
+    
+    
      
+      
      
+        
      Collapse bootstrap-collapse.js
      
+      
      
+      
      
+        
      
+          
      About
      
+          
      Get base styles and flexible support for collapsible components like accordions and navigation.
      
+          Download file
         
      
-        
      
-          
      
-            
-              Collapsible Group Item #2
-            
-          
      
-          
      
-            
      
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+        
      
+          
      Example accordion
      
+          
      Using the collapse plugin, we built a simple accordion style widget:
      
+        
+          
      
+            
      
+              
      
+                
+                  Collapsible Group Item #1
+                
+              
      
+              
      
+                
      
+                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                
      
+              
      
             
      
-          
      
-        
      
-        
      
-          
      
-            
-              Collapsible Group Item #3
-            
-          
      
-          
      
-            
      
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+            
      
+              
      
+                
+                  Collapsible Group Item #2
+                
+              
      
+              
      
+                
      
+                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                
      
+              
      
+            
      
+            
      
+              
      
+                
+                  Collapsible Group Item #3
+                
+              
      
+              
      
+                
      
+                  Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+                
      
+              
      
             
      
           
      
-        
      
-      
      
 
-      
-      
      
-      
      Using bootstrap-collapse.js
      
-      
      Enable via javascript:
      
-      
      $(".collapse").collapse()
      
-      
      Options
      
-      
-        
-         
-           
-           
-           
-           
-         
-        
-        
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-        
-      
      Nametypedefaultdescription
      parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
      togglebooleantrueToggles the collapsible element on invocation
      
-      
      Markup
      
-      
      Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.
      
-      
      +          
+          
      
+          
      Using bootstrap-collapse.js
      
+          
      Enable via javascript:
      
+          
      $(".collapse").collapse()
      
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      parentselectorfalseIf selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior)
      togglebooleantrueToggles the collapsible element on invocation
      
+          
      Markup
      
+          
      Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.
      
+          
       <button class="btn danger" data-toggle="collapse" data-target="#demo">
-simple collapsible
+  simple collapsible
 </button>
 
 <div id="demo" class="collapse in"> … </div>
      
-     
      Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.
      
-      
      Methods
      
-      
      .collapse(options)
      
-      
      Activates your content as a collapsible element. Accepts an optional options object.
+         
      Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.
      
+          
      Methods
      
+          
      .collapse(options)
      
+          
      Activates your content as a collapsible element. Accepts an optional options object.
 
       $('#myCollapsible').collapse({
-toggle: false
+  toggle: false
 })
      
-      
      .collapse('toggle')
      
-      
      Toggles a collapsible element to shown or hidden.
      
-      
      .collapse('show')
      
-      
      Shows a collapsible element.
      
-      
      .collapse('hide')
      
-      
      Hides a collapsible element.
      
-      
      Events
      
-      
      
-        Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
-      
      
-      
-        
-         
-           
-           
-         
-        
-        
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-         
-           
-           
-         
-        
-      
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
      hide
-            This event is fired immediately when the hide method has been called.
-           
      hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
      
+          
      .collapse('toggle')
      
+          
      Toggles a collapsible element to shown or hidden.
      
+          
      .collapse('show')
      
+          
      Shows a collapsible element.
      
+          
      .collapse('hide')
      
+          
      Hides a collapsible element.
      
+          
      Events
      
+          
      
+            Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
+          
      
+          
+            
+             
+               
+               
+             
+            
+            
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+             
+               
+               
+             
+            
+          
      EventDescription
      showThis event fires immediately when the show instance method is called.
      shownThis event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).
      hide
+                This event is fired immediately when the hide method has been called.
+               
      hiddenThis event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).
      
 
 
       $('#myCollapsible').on('hidden', function () {
-// do something ...
+  // do something ...
 })
      
-    
      
-  
      
-
      
+        
      
+      
      
+    
      
 
 
 
- 
-
+          
      .carousel('cycle')
      
+          
      Cycles through the carousel items from left to right.
      
+          
      .carousel('pause')
      
+          
      Stops the carousel from cycling through items.
      
+          
      .carousel(number)
      
+          
      Cycles the carousel to a particular frame (0 based, similar to an array).
      
+          
      .carousel('prev')
      
+          
      Cycles to the previous item.
      
+          
      .carousel('next')
      
+          
      Cycles to the next item.
      
+          
      Events
      
+          
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
+          
+            
+             
+               
+               
+             
+            
+            
+             
+               
+               
+             
+             
+               
+               
+             
+             
+            
+          
      EventDescription
      slideThis event fires immediately when the slide instance method is invoked.
      slidThis event is fired when the carousel has completed it's slide transition.
      
+        
+      
+    
 
 
 
-
-
      
-  
      
-    
      Typeahead bootstrap-typeahead.js
      
-  
      
-  
      
-    
      
-      
      About
      
-      
      A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.
      
-      Download file
-    
      
-    
      
-      
      Example
      
-      
      Start typing in the field below to show the typeahead results.
      
-      
      
-        
+    
+    
      
+      
      
+        
      Typeahead bootstrap-typeahead.js
      
       
      
-      
      
-      
      Using bootstrap-typeahead.js
      
-      
      Call the typeahead via javascript:
      
-      
      $('.typeahead').typeahead()
      
-      
      Options
      
-      
-        
-         
-           
-           
-           
-           
-         
-        
-        
-         
-           
-           
-           
-           
-         
-        
-      
      Nametypedefaultdescription
      itemsnumber8The max number of items to display in the dropdown.
      
+      
      
+        
      
+          
      About
      
+          
      A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.
      
+          Download file
+        
      
+        
      
+          
      Example
      
+          
      Start typing in the field below to show the typeahead results.
      
+          
      
+            
+          
      
+          
      
+          
      Using bootstrap-typeahead.js
      
+          
      Call the typeahead via javascript:
      
+          
      $('.typeahead').typeahead()
      
+          
      Options
      
+          
+            
+             
+               
+               
+               
+               
+             
+            
+            
+             
+               
+               
+               
+               
+             
+            
+          
      Nametypedefaultdescription
      itemsnumber8The max number of items to display in the dropdown.
      
 
-      
      Markup
      
-      
      Add data attributes to register an element with typeahead functionality.
      
+          
      Markup
      
+          
      Add data attributes to register an element with typeahead functionality.
      
 
       <input type="text" data-provide="typeahead">
 
      
-    
      
-  
      
-
      
\ No newline at end of file
+        
      
+      
      
+    
      
\ No newline at end of file
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 567ac6d0d..c586af1b9 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -1,10 +1,14 @@
-
-
-
      
-  
      Scaffolding
      
-  
      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
      
-
      
+      
+      
      
+        
      Scaffolding
      
+        
      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
      
+        
+      
      
 
 
 
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index a243d6ad5..475539284 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -1,9 +1,9 @@
-
-
      
-  
      Upgrading to Bootstrap 2
      
-  
      Learn about significant changes and additions since v1.4 with this handy guide.
      
-
      
+      
+      
      
+        
      Upgrading to Bootstrap 2
      
+        
      Learn about significant changes and additions since v1.4 with this handy guide.
      
+      
      
 
 
 
      Rough outline
      
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 7e43408ac..ee18cbeb0 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -27,79 +27,30 @@
 
   
 
-    
     
      
       
      
         
      
           Bootstrap
           
         
      
@@ -108,12 +59,12 @@
 
     
      
 
-
-
      
-  
      Upgrading to Bootstrap 2
      
-  
      Learn about significant changes and additions since v1.4 with this handy guide.
      
-
      
+      
+      
      
+        
      Upgrading to Bootstrap 2
      
+        
      Learn about significant changes and additions since v1.4 with this handy guide.
      
+      
      
 
 
 
      Rough outline
      
@@ -194,7 +145,7 @@
   
 -->
 
-      
       
      
         
      Back to top
      
-- 
cgit v1.2.3


From 82de03b67cf729291ea5a73741e44838a42940f8 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Mon, 23 Jan 2012 19:55:00 -0800
Subject: start wrapping text in {{_i}} for translation

---
 docs/base-css.html                       |   3 +-
 docs/build/index.js                      |   6 +-
 docs/components.html                     |   3 +-
 docs/index.html                          |   3 +-
 docs/javascript.html                     |  17 +-
 docs/less.html                           |   3 +-
 docs/scaffolding.html                    |   3 +-
 docs/templates/layout.mustache           |   3 +-
 docs/templates/pages/javascript.mustache | 460 +++++++++++++++----------------
 docs/upgrading.html                      |   3 +-
 10 files changed, 247 insertions(+), 257 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 91cb4ec70..6485d76a2 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -22,11 +22,10 @@
     
     
     
-
   
 
   
-
+  
   
     
      
diff --git a/docs/build/index.js b/docs/build/index.js
index 4536238c4..9c240ca36 100644
--- a/docs/build/index.js
+++ b/docs/build/index.js
@@ -6,7 +6,7 @@ var layout, pages
 
 // compile layout template
 layout = fs.readFileSync(__dirname + '/../templates/layout.mustache', 'utf-8')
-layout = hogan.compile(layout)
+layout = hogan.compile(layout, { sectionTags: [{o:'_i', c:'i'}] })
 
 // retrieve pages
 pages = fs.readdirSync(__dirname + '/../templates/pages')
@@ -18,7 +18,9 @@ pages.forEach(function (name) {
     , context = {}
 
   context[name.replace(/\.mustache$/, '')] = 'active'
-  page = hogan.compile(page)
+  context._i = true
+
+  page = hogan.compile(page, { sectionTags: [{o:'_i', c:'i'}] })
   page = layout.render(context, {
     body: page
   })
diff --git a/docs/components.html b/docs/components.html
index 4a1e4fc6f..9d28b9e06 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -22,11 +22,10 @@
     
     
     
-
   
 
   
-
+  
   
     
      
diff --git a/docs/index.html b/docs/index.html
index 9693b9f7e..1743676b6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -22,11 +22,10 @@
     
     
     
-
   
 
   
-
+  
   
     
      
diff --git a/docs/javascript.html b/docs/javascript.html
index 7b7f88c5c..cc641ed49 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -22,11 +22,10 @@
     
     
     
-
   
 
   
-
+  
   
     
      
@@ -299,7 +298,7 @@
           
      Notice If you want your modal to animate in and out, just add a .fade class to the .modal element (refer to the demo to see this in action).
      
           
      Methods
      
           
      .modal(options)
      
-          
      Activates your content as a modal. Accepts an optional options object.
+          
      Activates your content as a modal. Accepts an optional options object.
      
 
       $('#myModal').modal({
   keyboard: false
@@ -314,7 +313,7 @@ $('#myModal').modal({
           
      Manually hides a modal.
      
           
      $('#myModal').modal('hide')
      
           
      Events
      
-          
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
+          
      Bootstrap's modal class exposes a few events for hooking into modal functionality.
      
           
@@ -344,7 +343,7 @@ $('#myModal').modal({
 
 
       $('#myModal').on('hidden', function () {
-  // do something ...
+  // do something…
 })
      
@@ -472,9 +471,7 @@ $('#myModal').on('hidden', function () {
 </ul>
      Methods
      $().dropdown()
      
-          
      
-          A programatic api for activating menus for a given navbar or tabbed navigation.
-          
      
+          
      A programatic api for activating menus for a given navbar or tabbed navigation.
      
@@ -544,9 +541,9 @@ $('#myModal').on('hidden', function () {
           
      Call the scrollspy via javascript:
      $('#navbar').scrollspy()
      Markup
      
-          
      To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body).
+          
      To easily add scrollspy behavior to your topbar navigation, just add data-spy="scroll" to the element you want to spy on (most typically this would be the body).
      <body data-spy="scroll" >...</body>
      
-           
      Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
+           
      Notice Navbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
      Options
      
             
              
      
         
       
           
           
         
       
     
           
           
           
           
           
      
diff --git a/docs/less.html b/docs/less.html
index 76a47f269..cd486ac98 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -22,11 +22,10 @@
     
-
   
-
+  
   
      
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index be49f94d5..2684e32ec 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -22,11 +22,10 @@
     
     
     
-
   
 
   
-
+  
   
     
      
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index eccc67974..919872db2 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -22,11 +22,10 @@
     
     
     
-
   
 
   
-
+  
   
     
      
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 93789cc03..e1856d6c2 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1,21 +1,21 @@
       
       
      
-        
      Javascript for Bootstrap
      
-        
      Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
+        
      {{_i}}Javascript for{{/i}} Bootstrap
      
+        
      {{_i}}Bring Bootstrap's components to life—now with 12 custom jQuery plugins.{{/i}}
         
      
       
      
 
@@ -24,105 +24,105 @@
       ================================================== -->
       
      
         
      
-          
      jQuery plugins A dozen Bootstrap plugins to get you started
      
+          
      {{_i}}jQuery plugins{{/i}} {{_i}}A dozen Bootstrap plugins to get you started{{/i}}
      
         
      
       
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
       
       
       
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
       
       
       
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
       
       
       
      
         
      
           
         
      
       
      
       
      
-      Select/Unselect All Plugins
-      
      Note: All plugins require the latest version of jQuery to be included.
      
+      {{_i}}Select/Unselect All Plugins{{/i}}
+      
      {{_i}}Note: All plugins require the latest version of jQuery to be included.{{/i}}
      
     
      
 
 
@@ -131,93 +131,93 @@
     ================================================== -->
     
      
       
      
-        
      Modals bootstrap-modal.js
      
+        
      {{_i}}Modals{{/i}} bootstrap-modal.js
      
       
      
       
      
         
      
-          
      About modals
      
-          
      A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.
      
-          Download file
+          
      {{_i}}About modals{{/i}}
      
+          
      {{_i}}A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.{{/i}}
      
+          {{_i}}Download file{{/i}}
         
      
         
      
-          
      Static example
      
-          
      Below is a statically rendered modal.
      
+          
      {{_i}}Static example{{/i}}
      
+          
      {{_i}}Below is a statically rendered modal.{{/i}}
      
           
      
             
      
               
      
                 ×
-                
      Modal header
      
+                
      {{_i}}Modal header{{/i}}
      
               
      
               
      
-                
      One fine body…
      
+                
      {{_i}}One fine body…{{/i}}
      
               
      
               
      
-                Save changes
-                Close
+                {{_i}}Save changes{{/i}}
+                {{_i}}Close{{/i}}
               
      
             
      
           
       
 
-          
      Live demo
      
-          
      Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.
      
+          
      {{_i}}Live demo{{/i}}
      
+          
      {{_i}}Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.{{/i}}
      
           
           
-          Launch demo modal
+          {{_i}}Launch demo modal{{/i}}
 
           
      
 
-          
      Using bootstrap-modal
      
-          
      Call the modal via javascript:
      
+          
      {{_i}}Using bootstrap-modal{{/i}}
      
+          
      {{_i}}Call the modal via javascript:{{/i}}
      
           
      $('#myModal').modal(options)
      
-          
      Options
      
+          
      {{_i}}Options{{/i}}
      
           
      
             
     
     
 
   
     
      
-               
-               
-               
-               
+               
+               
+               
+               
-               
-               
-               
-               
+               
+               
+               
+               
-               
-               
-               
-               
+               
+               
+               
+               
      
             
              
      Nametypedefaultdescription{{_i}}Name{{/i}}{{_i}}type{{/i}}{{_i}}default{{/i}}{{_i}}description{{/i}}
              
      
                   
             
              
      backdropbooleantrueIncludes a modal-backdrop element{{_i}}backdrop{{/i}}{{_i}}boolean{{/i}}{{_i}}true{{/i}}{{_i}}Includes a modal-backdrop element{{/i}}
              
      
              
      keyboardbooleantrueCloses the modal when escape key is pressed{{_i}}keyboard{{/i}}{{_i}}boolean{{/i}}{{_i}}true{{/i}}{{_i}}Closes the modal when escape key is pressed{{/i}}
              
      
                   
           
      
-          
      Markup
      
-          
      You can activate modals on your page easily without having to write a single line of javascript. Just set data-toggle="modal" on a controller element with a data-target="#foo" or href="#foo" which corresponds to a modal element id, and when clicked, it will launch your modal.
      
-          
      Also, to add options to your modal instance, just include them as additional data attributes on either the control element or the modal markup itself.
      
+          
      {{_i}}Markup{{/i}}
      
+          
      {{_i}}You can activate modals on your page easily without having to write a single line of javascript. Just set data-toggle="modal" on a controller element with a data-target="#foo" or href="#foo" which corresponds to a modal element id, and when clicked, it will launch your modal.
      
+          
      Also, to add options to your modal instance, just include them as additional data attributes on either the control element or the modal markup itself.{{/i}}
      
 
      -<a class="btn" data-toggle="modal" href="#myModal" >Launch Modal</a>
+<a class="btn" data-toggle="modal" href="#myModal" >{{_i}}Launch Modal{{/i}}</a>
 
      
 
 
      @@ -227,63 +227,63 @@
     <h3>Modal header</h3>
   </div>
   <div class="modal-body">
-    <p>One fine body…</p>
+    <p>{{_i}}One fine body…{{/i}}</p>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn primary">Save changes</a>
-    <a href="#" class="btn">Close</a>
+    <a href="#" class="btn primary">{{_i}}Save changes{{/i}}</a>
+    <a href="#" class="btn">{{_i}}Close{{/i}}</a>
   </div>
 </div>
 
      
-          
      Notice If you want your modal to animate in and out, just add a .fade class to the .modal element (refer to the demo to see this in action).
      
-          
      Methods
      
-          
      .modal(options)
      
-          
      Activates your content as a modal. Accepts an optional options object.
+          
      {{_i}}Notice If you want your modal to animate in and out, just add a .fade class to the .modal element (refer to the demo to see this in action).{{/i}}
      
+          Methods{{/i}}
+          
      .modal({{_i}}options{{/i}})
      
+          
      {{_i}}Activates your content as a modal. Accepts an optional options object.{{/i}}
      
 
       $('#myModal').modal({
   keyboard: false
 })
      
           
      .modal('toggle')
      
-          
      Manually toggles a modal.
      
+          
      {{_i}}Manually toggles a modal.{{/i}}
      
           
      $('#myModal').modal('toggle')
      
           
      .modal('show')
      
-          
      Manually opens a modal.
      
+          
      {{_i}}Manually opens a modal.{{/i}}
      
           
      $('#myModal').modal('show')
      
           
      .modal('hide')
      
-          
      Manually hides a modal.
      
+          
      {{_i}}Manually hides a modal.{{/i}}
      
           
      $('#myModal').modal('hide')
      
-          
      Events
      
-          
      Bootstrap's modal class exposes a few events for hooking into modal functionality. 
      
+          
      {{_i}}Events{{/i}}
      
+          
      {{_i}}Bootstrap's modal class exposes a few events for hooking into modal functionality.{{/i}}
      
           
-               
-               
+               
+               
-               
-               
+               
+               
-               
-               
+               
+               
-               
-               
+               
+               
-               
-               
+               
+               
      
             
              
      EventDescription{{_i}}Event{{/i}}{{_i}}Description{{/i}}
              
      
                   
             
              
      showThis event fires immediately when the show instance method is called.{{_i}}show{{/i}}{{_i}}This event fires immediately when the show instance method is called.{{/i}}
              
      
              
      shownThis event is fired when the modal has been made visible to the user (will wait for css transitions to complete).{{_i}}shown{{/i}}{{_i}}This event is fired when the modal has been made visible to the user (will wait for css transitions to complete).{{/i}}
              
      
              
      hideThis event is fired immediately when the hide instance method has been called.{{_i}}hide{{/i}}{{_i}}This event is fired immediately when the hide instance method has been called.{{/i}}
              
      
              
      hiddenThis event is fired when the modal has finished being hidden from the user (will wait for css transitions to complete).{{_i}}hidden{{/i}}{{_i}}This event is fired when the modal has finished being hidden from the user (will wait for css transitions to complete).{{/i}}
              
      
                   
           
      
 
 
       $('#myModal').on('hidden', function () {
-  // do something ...
+  // {{_i}}do something…{{/i}}
 })
      
         
      
       
      
@@ -295,52 +295,52 @@ $('#myModal').on('hidden', function () {
     ================================================== -->
     
@@ -424,30 +422,30 @@ $('#myModal').on('hidden', function () {
     ================================================== -->
     
      
       
      
-        
      ScrollSpy bootstrap-scrollspy.js
      
+        
      {{_i}}ScrollSpy{{/i}} bootstrap-scrollspy.js
      
       
      
       
      
         
      
-          
      The ScrollSpy plugin is for automatically updating nav targets based on scroll position.
      
-          Download file
+          
      {{_i}}The ScrollSpy plugin is for automatically updating nav targets based on scroll position.{{/i}}
      
+          {{_i}}Download file{{/i}}
         
      
         
      
-          
      Example navbar with scrollspy
      
-          
      Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!
      
+          
      {{_i}}Example navbar with scrollspy{{/i}}
      
+          
      {{_i}}Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!{{/i}}
      
           
      
           
      
             #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
           
      
               
         
   
           
      
             #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
           
      
               
         
   
           
      
             #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
           
      
               
         
   
           
      
             #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
           
      
               
         
   
           
      
             #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
           
      
               
         
         
       
      
-      
      Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.
      
+      
      {{_i}}Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.{{/i}}
      
       
-            
-            
-            
+            
+            
+            
-- 
cgit v1.2.3


From 3f54db9c6ac0126b071a1874cd2f5c0379a4f393 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 12:53:30 -0800
Subject: remake

---
 bootstrap.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.css b/bootstrap.css
index 71d942401..845598de2 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Tue Jan 24 12:27:30 PST 2012
+ * Date: Tue Jan 24 12:53:25 PST 2012
  */
 article,
 aside,
-- 
cgit v1.2.3


From 540d229eba6e65c0d18b706df73fb51322b5ea40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Robichet?= 
Date: Tue, 24 Jan 2012 21:57:30 +0100
Subject: Fixed a mailto typo

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index f21f25f6b..79200009a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -181,7 +181,7 @@
       
       
      
         Full Name
      
-        first.last@gmail.com
+        first.last@gmail.com
       
      
     
     
      
-- 
cgit v1.2.3


From 925fef411090f06b34c5e86f4d0ed5630adff87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Robichet?= 
Date: Tue, 24 Jan 2012 22:11:09 +0100
Subject: Typo on tablesorter

---
 docs/assets/js/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 2da4ab8e2..95caa0f31 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -22,7 +22,7 @@ $(function(){
   window.prettyPrint && prettyPrint()
 
   // table sort example
-  if ($.fn.tableSorter) {
+  if ($.fn.tablesorter) {
     $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } )
     $(".tablesorter-example").tablesorter({ sortList: [[1,0]] })
   }
-- 
cgit v1.2.3


From 5fb31670af6df88afb0a82872b6f7935486f91c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Robichet?= 
Date: Tue, 24 Jan 2012 22:12:37 +0100
Subject: Added jquery.tablesorter js file

---
 docs/base-css.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/base-css.html b/docs/base-css.html
index 79200009a..01c4d115c 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1509,6 +1509,7 @@
     
     
     
+    
     
     
     
-- 
cgit v1.2.3


From 425e5bfb71527e932858ad41f9e234fc05d65c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= 
Date: Tue, 24 Jan 2012 22:17:32 +0100
Subject: Final translation tags in Base CSS

---
 docs/templates/pages/base-css.mustache | 325 +++++++++++++++++----------------
 1 file changed, 163 insertions(+), 162 deletions(-)

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 5a58b9663..b8c413888 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -809,125 +809,125 @@
 ================================================== -->
 
      
   
      
-    
      Forms
      
+    
      {{_i}}Forms{{/i}}
      
   
      
   
      
     
      
-      
      Flexible HTML and CSS
      
-      
      The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.
      
-      
      More complicated layouts come with succinct and scalable classes for easy styling and event binding, so you're covered at every step.
      
+      
      {{_i}}Flexible HTML and CSS{{/i}}
      
+      
      {{_i}}The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.{{/i}}
      
+      
      {{_i}}More complicated layouts come with succinct and scalable classes for easy styling and event binding, so you're covered at every step.{{/i}}
      
     
      
     
      
-      
      Four layouts included
      
-      
      Bootstrap comes with support for four types of form layouts:
      
+      
      {{_i}}Four layouts included{{/i}}
      
+      
      {{_i}}Bootstrap comes with support for four types of form layouts:{{/i}}
      
       
        
-        
      • Vertical (default)
        • 
-        
      • Search
        • 
-        
      • Inline
        • 
-        
      • Horizontal
        • 
+        
      • {{_i}}Vertical (default){{/i}}
        • 
+        
      • {{_i}}Search{{/i}}
        • 
+        
      • {{_i}}Inline{{/i}}
        • 
+        
      • {{_i}}Horizontal{{/i}}
        • 
       
      
-      
      Different types of form layouts require some changes to markup, but the controls themselves remain and behave the same.
      
+      
      {{_i}}Different types of form layouts require some changes to markup, but the controls themselves remain and behave the same.{{/i}}
      
     
      
     
      
-      
      Control states and more
      
-      
      Bootstrap's forms include styles for all the base form controls like input, textarea, and select you'd expect. But it also comes with a number of custom components like appended and prepended inputs and support for lists of checkboxes.
      
-      
      States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.
      
+      
      {{_i}}Control states and more{{/i}}
      
+      
      {{_i}}Bootstrap's forms include styles for all the base form controls like input, textarea, and select you'd expect. But it also comes with a number of custom components like appended and prepended inputs and support for lists of checkboxes.{{/i}}
      
+      
      {{_i}}States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.{{/i}}
      
     
      
   
      
 
-  
      Four types of forms
      
-  
      Bootstrap provides simple markup and styles for four styles of common web forms.
      
+  
      {{_i}}Four types of forms{{/i}}
      
+  
      {{_i}}Bootstrap provides simple markup and styles for four styles of common web forms.{{/i}}
      
   
      
         
           
      
             #First NameLast NameLanguage{{_i}}First Name{{/i}}{{_i}}Last Name{{/i}}{{_i}}Language{{/i}}
           
      
               
         
      
-        
-        
-        
+        
+        
+        
-        
-        
-        
+        
+        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
      
     
       
      NameClassDescription{{_i}}Name{{/i}}{{_i}}Class{{/i}}{{_i}}Description{{/i}}
       
      
           
     
       
      Vertical (default).vertical-form (not required)Stacked, left-aligned labels over controls{{_i}}Vertical (default){{/i}}.vertical-form ({{_i}}not required{{/i}}){{_i}}Stacked, left-aligned labels over controls{{/i}}
       
      
       
      Horizontal{{_i}}Horizontal{{/i}}
         .form-horizontalFloat left, right-aligned labels on same line as controls{{_i}}Float left, right-aligned labels on same line as controls{{/i}}
       
      
       
      Inline{{_i}}Inline{{/i}}
         .form-inlineLeft-aligned label and inline-block controls for compact style{{_i}}Left-aligned label and inline-block controls for compact style{{/i}}
       
      
       
      Search{{_i}}Search{{/i}}
         .form-searchExtra-rounded text input for a typical search aesthetic{{_i}}Extra-rounded text input for a typical search aesthetic{{/i}}
       
      
           
   
      
 
 
-  
      Example forms using just form controls, no extra markup
      
+  
      {{_i}}Example forms using just form controls, no extra markup{{/i}}
      
   
      
     
      
-      
      Basic form
      
-      
      With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.
      
+      
      {{_i}}Basic form{{/i}}
      
+      
      {{_i}}With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.{{/i}}
      
       
      
-        
-        
+        
+        
         
-        
+        
       
      
     
      
     
      
-      
      Search form
      
-      
      Reflecting default WebKit styles, just add .form-search for extra rounded search fields.
      
+      
      {{_i}}Search form{{/i}}
      
+      
      {{_i}}Reflecting default WebKit styles, just add .form-search for extra rounded search fields.{{/i}}
      
       
      
         
-        
+        
       
      
     
      
     
      
-      
      Inline form
      
-      
      Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.
      
+      
      {{_i}}Inline form{{/i}}
      
+      
      {{_i}}Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.{{/i}}
      
       
      
-        
-        
-        
+        
+        
+        
       
      
     
      
   
      
 
   
      
 
-  
      Horizontal forms
      
+  
      {{_i}}Horizontal forms{{/i}}
      
   
      
     
      
       
      
-        Controls Bootstrap supports
+        {{_i}}Controls Bootstrap supports{{/i}}
         
      
-          
+          
           
      
             
-            
      In addition to freeform text, any HTML5 text-based input appears like so.
      
+            
      {{_i}}In addition to freeform text, any HTML5 text-based input appears like so.{{/i}}
      
           
      
         
      
         
      
-          
+          
           
      
             
           
      
         
      
         
      
-          
+          
           
      
             
               
@@ -951,39 +951,39 @@
           
      
         
      
         
      
-          
+          
           
      
             
           
      
         
      
         
      
-          
+          
           
      
             
           
      
         
      
         
      
-          
-          
+          
+          
         
      
       
      
     
      
     
      
       
      
-        
      What's included
      
-        
      Shown on the left are all the default form controls we support. Here's the bulleted list:
      
+        
      {{_i}}What's included{{/i}}
      
+        
      {{_i}}Shown on the left are all the default form controls we support. Here's the bulleted list:{{/i}}
      
         
        
-          
      • text inputs (text, password, email, etc)
        • 
-          
      • checkbox
        • 
-          
      • radio
        • 
-          
      • select
        • 
-          
      • multiple select
        • 
-          
      • file input
        • 
-          
      • textarea
        • 
+          
      • {{_i}}text inputs (text, password, email, etc){{/i}}
        • 
+          
      • {{_i}}checkbox{{/i}}
        • 
+          
      • {{_i}}radio{{/i}}
        • 
+          
      • {{_i}}select{{/i}}
        • 
+          
      • {{_i}}multiple select{{/i}}
        • 
+          
      • {{_i}}file input{{/i}}
        • 
+          
      • {{_i}}textarea{{/i}}
        • 
         
      
         
      
-        
      New defaults with v2.0
      
-        
      Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.
      
+        
      {{_i}}New defaults with v2.0{{/i}}
      
+        
      {{_i}}Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.{{/i}}
      
       
      
     
      
   
      
@@ -993,66 +993,66 @@
   
      
     
      
       
      
-        Form control states
+        {{_i}}Form control states{{/i}}
         
      
-          
+          
           
      
-            
+            
           
      
         
      
         
      
-          
+          
           
      
-            
+            
           
      
         
      
         
      
-          
+          
           
      
             
           
      
         
      
         
      
-          
+          
           
      
             
-            Something may have gone wrong
+            {{_i}}Something may have gone wrong{{/i}}
           
      
         
      
         
      
-          
+          
           
      
             
-            Please correct the error
+            {{_i}}Please correct the error{{/i}}
           
      
         
      
         
      
-          
+          
           
      
             
-            Woohoo!
+            {{_i}}Woohoo!{{/i}}
           
      
         
      
         
      
-          
-          
+          
+          
         
      
       
      
     
      
     
      
       
      
-        
      Redesigned browser states
      
-        
      Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
      
+        
      {{_i}}Redesigned browser states{{/i}}
      
+        
      {{_i}}Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.{{/i}}
      
         
      
-        
      Form validation
      
-        
      It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
      
+        
      {{_i}}Form validation{{/i}}
      
+        
      {{_i}}It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.{{/i}}
      
 
       <fieldset
   class="control-group error">
-  ...
+  …
 </fieldset>
 
      
       
      
@@ -1064,38 +1064,38 @@
   
      
     
      
       
      
-        Extending form controls
+        {{_i}}Extending form controls{{/i}}
         
      
-          
+          
           
      
             
             
             
-            
      Use the same .span* classes from the grid system for input sizes.
      
+            
      {{_i}}Use the same .span* classes from the grid system for input sizes.{{/i}}
      
           
      
         
      
         
      
-          
+          
           
      
             
      
               @
               
             
      
-            
      Here's some help text
      
+            
      {{_i}}Here's some help text{{/i}}
      
           
      
         
      
         
      
-          
+          
           
      
             
      
               
               .00
             
      
-            
      Here's more help text
      
+            
      {{_i}}Here's more help text{{/i}}
      
           
      
         
      
         
      
-          
+          
           
      
             
      
         
      
         
      
-          
+          
           
      
             
             
             
-            
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
+            
      {{_i}}Note: Labels surround all the options for much larger click areas and a more usable form.{{/i}}
      
           
      
         
      
         
      
-          
+          
           
      
             
             
           
      
         
      
         
      
-          
-          
+          
+          
         
      
       
      
     
      
     
      
       
      
-        
      Prepend & append inputs
      
-        
      Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.
      
+        
      {{_i}}Prepend & append inputs{{/i}}
      
+        
      {{_i}}Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.{{/i}}
      
         
      
-        
      Checkboxes and radios
      
-        
      Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.
      
-        
      Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.
      
+        
      {{_i}}Checkboxes and radios{{/i}}
      
+        
      {{_i}}Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.{{/i}}
      
+        
      {{_i}}Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.{{/i}}
      
       
      
     
      
   
      
@@ -1162,81 +1162,82 @@
 
 
      
   
      
-    
      Buttons
      
+    
      {{_i}}Buttons{{/i}}
      
   
      
   
-        
-        
-        
+        
+        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
      
     
       
      ButtonClassDescription{{_i}}Button{{/i}}{{_i}}Class{{/i}}{{_i}}Description{{/i}}
       
      
           
     
       
      Default{{_i}}Default{{/i}}
         .btnStandard gray button with gradient{{_i}}Standard gray button with gradient{{/i}}
       
      
       
      Primary{{_i}}Primary{{/i}}
         .primaryProvides extra visual weight and identifies the primary action in a set of buttons{{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}
       
      
       
      Info{{_i}}Info{{/i}}
         .infoUsed as an alternate to the default styles{{_i}}Used as an alternate to the default styles{{/i}}
       
      
       
      Success{{_i}}Success{{/i}}
         .successIndicates a successful or positive action{{_i}}Indicates a successful or positive action{{/i}}
       
      
       
      Danger{{_i}}Danger{{/i}}
         .dangerIndicates a dangerous or potentially negative action{{_i}}Indicates a dangerous or potentially negative action{{/i}}
       
      
           
   
      
 
   
      
     
      
-      
      Buttons for actions
      
-      
      As a convention, buttons should only be used for actions while hyperlinks are to be used for objects. For instance, "Download" should be a button while "recent activity" should be a link.
      
+      
      {{_i}}Buttons for actions{{/i}}
      
+      
      {{_i}}As a convention, buttons should only be used for actions while hyperlinks are to be used for objects. For instance, "Download" should be a button while "recent activity" should be a link.{{/i}}
      
     
      
     
      
-      
      For anchors and forms
      
-      
      Button styles can be applied to anything with the .btn applied. However, typically you’ll want to apply these to only <a> and <button> elements.
      
+      
      {{_i}}For anchors and forms{{/i}}
      
+      
      {{_i}}Button styles can be applied to anything with the .btn applied. However, typically you’ll want to apply these to only <a> and <button> elements.{{/i}}
      
     
      
     
      
-      
      Note: All buttons must include the .btn class. Button styles should be applied to <button> and <a> elements for consistency.
      
+      
      {{_i}}Note: All buttons must include the .btn class. Button styles should be applied to <button> and <a> elements for consistency.{{/i}}
      
     
      
   
      
 
   
      
     
      
-      
      Multiple sizes
      
-      
      Fancy larger or smaller buttons? Have at it!
      
+      
      {{_i}}Multiple sizes{{/i}}
      
+      
      {{_i}}Fancy larger or smaller buttons? Have at it!{{/i}}
      
       
      
-        Primary action
-        Action
+        {{_i}}Primary action{{/i}}
+        {{_i}}Action{{/i}}
       
      
       
      
-        Primary action
-        Action
+        {{_i}}Primary action{{/i}}
+        {{_i}}Action{{/i}}
       
      
     
      
     
      
-      
      Disabled state
      
-      
      For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.
      
+      
      {{_i}}Disabled state{{/i}}
      
+      
      {{_i}}For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.{{/i}}
      
       
      
-        Primary action
-        Action
+        {{_i}}Primary action{{/i}}
+        {{_i}}Action{{/i}}
       
      
       
      
-         
+        
+        
       
      
     
      
   
      
@@ -1251,7 +1252,7 @@
 ================================================== -->
 
      
   
      
-    
      Icons Graciously provided by Glyphicons
      
+    
      {{_i}}Icons Graciously provided by Glyphicons{{/i}}
      
   
      
   
      
     
      
@@ -1365,7 +1366,7 @@
       
      
     
      
     
      
-      
      Light red background color is only used to show the dimensions of the icons in the docs.
      
+      
      {{_i}}Light red background color is only used to show the dimensions of the icons in the docs.{{/i}}
      
     
      
   
      
 
@@ -1373,38 +1374,38 @@
 
   
      
     
      
-      
      Built as a sprite
      
-      
      Instead of making every icon an extra request, we've compiled them into a sprite—a bunch of images in one file that uses CSS to position the images with background-position. This is the same method we use on Twitter.com and it has worked well for us.
      
-      
      Glyphicons has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit. Please consider doing the same in your projects.
      
+      
      {{_i}}Built as a sprite{{/i}}
      
+      
      {{_i}}Instead of making every icon an extra request, we've compiled them into a sprite—a bunch of images in one file that uses CSS to position the images with background-position. This is the same method we use on Twitter.com and it has worked well for us.{{/i}}
      
+      
      {{_i}}Glyphicons has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit. Please consider doing the same in your projects.{{/i}}
      
     
      
     
      
-      
      How to use
      
-      
      With v2.0.0, the <i> tag is essentially dedicated to iconography. To use the icons, you can place the follow code wherever you like one to appear:
      
+      
      {{_i}}How to use{{/i}}
      
+      
      {{_i}}With v2.0.0, the <i> tag is essentially dedicated to iconography. To use the icons, you can place the follow code wherever you like one to appear:{{/i}}
      
 
       <i class="chevron-left"></i>
 
      
-      
      There are over 100 classes to choose from for your icons. Just add an <i> tag with the right class and you're set. You can find the full list in sprites.less or right here in this document.
      
+      
      {{_i}}There are over 100 classes to choose from for your icons. Just add an <i> tag with the right class and you're set. You can find the full list in sprites.less or right here in this document.{{/i}}
      
     
      
     
      
-      
      Use cases
      
-      
      Icons are great, but where would one use them? Here are a few ideas:
      
+      
      {{_i}}Use cases{{/i}}
      
+      
      {{_i}}Icons are great, but where would one use them? Here are a few ideas:{{/i}}
      
       
        
-        
      • As visuals for your sidebar navigation
        • 
-        
      • For a purely icon-driven nav
        • 
-        
      • For buttons to help convey the meaning of an action
        • 
-        
      • With links to share context on a user's destination
        • 
+        
      • {{_i}}As visuals for your sidebar navigation{{/i}}
        • 
+        
      • {{_i}}For a purely icon-driven nav{{/i}}
        • 
+        
      • {{_i}}For buttons to help convey the meaning of an action{{/i}}
        • 
+        
      • {{_i}}With links to share context on a user's destination{{/i}}
        • 
       
      
-      
      Essentially, anywhere you can put an <i> tag, you can put an icon.
      
+      
      {{_i}}Essentially, anywhere you can put an <i> tag, you can put an icon.{{/i}}
      
     
      
   
      
 
-  
      Examples
      
+  
      {{_i}}Examples{{/i}}
      
   
      
     
      
-      
      Use them in buttons, or in button groups for a toolbar style presentation.
      
+      
      {{_i}}Use them in buttons, or in button groups for a toolbar style presentation.{{/i}}
      
       
      
-         Refresh
-         Settings
+         {{_i}}Refresh{{/i}}
+         {{_i}}Settings{{/i}}
       
      
       
      
         
      
@@ -1421,12 +1422,12 @@
       
      
     
      
     
      
-      
      Or, use them in navigation.
      
+      
      {{_i}}Or, use them in navigation.{{/i}}
      
       
      
         
       
       
     
      
-- 
cgit v1.2.3


From 7d52e1dcd479e017d85fee8df4032644970525bd Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 24 Jan 2012 13:47:24 -0800
Subject: remake

---
 docs/base-css.html   | 4 ++--
 docs/components.html | 2 +-
 docs/javascript.html | 2 +-
 docs/less.html       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index f21f25f6b..6485d76a2 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -366,7 +366,7 @@
       
      
         <pre class="prettyprint">
         
-          
      Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
+          
      Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
      
 
      <div>
   <h1>Heading</h1>
   <p>Something right here...</p>
@@ -1105,7 +1105,7 @@
     
      
       
      
         
      Redesigned browser states
      
-        
      Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.
      
+        
      Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
      
         
      
         
      Form validation
      
         
      It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
      
diff --git a/docs/components.html b/docs/components.html
index 3a15541c4..9d28b9e06 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1088,7 +1088,7 @@
   
      
     
      
       
      Rewritten base class
      
-      
      With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outer <div>.
      
+      
      With Bootstrap 2, we've simplified the base class: .alert instead of .alert-message. We've also reduced the minimum required markup—no <p> is required by default, just the outter <div>.
      
       
      Single alert message
      
       
      For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to .alert-block.
      
       
      
diff --git a/docs/javascript.html b/docs/javascript.html
index bdcc622de..a35c29913 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -856,7 +856,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
      Notice Individual popover instance options can alternatively be specified through the use of data attributes.
      
           
      Markup
      
           
      
-          For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
+          For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
           
      
           
      Methods
      
           
      $().popover(options)
      
diff --git a/docs/less.html b/docs/less.html
index cc8197118..cd486ac98 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -75,7 +75,7 @@
       
      
         
      
           
      Why LESS?
      
-          
      Bootstrap is made with LESS at its core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
      
+          
      Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
      
         
      
         
      
           
      What's included?
      
-- 
cgit v1.2.3


From 3aea86370d7d6c717939eebcd6f3a93776c567d4 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 24 Jan 2012 13:48:05 -0800
Subject: rebuild base-css

---
 docs/base-css.html | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 6485d76a2..92117b80e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -358,7 +358,7 @@
         
      		
 
      <div>
   <h1>Heading</h1>
-  <p>Something right here...</p>
+  <p>Something right here…</p>
 </div>
      
           
      Note: Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.
      
               		
 
 
           
         
 
     
     
     
     
      
-                
-                
-                
+                
+                
+                
-                
+                
-                
+                
      
             
               
      VariableValueUsage{{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
               
      
                   
             
               
      
                 @linkColor
                 #0069d6Default link text color{{_i}}Default link text color{{/i}}
               
      
               
      
                 @linkColorHover
                 darken(@linkColor, 15)Default link text hover color{{_i}}Default link text hover color{{/i}}
               
      
                   
           
      
 
       
      
         
      
-          
      Grayscale colors
      
+          
      {{_i}}Grayscale colors{{/i}}
      
           
@@ -106,7 +106,7 @@
           
      
             
               
      
         
      
         
      
-          
      Accent colors
      
+          
      {{_i}}Accent colors{{/i}}
      
           
@@ -144,7 +144,7 @@
 
       
      
         
      
-          
      Grid system
      
+          
      {{_i}}Grid system{{/i}}
      
           
      
             
               
      
@@ -167,7 +167,7 @@
           
      
             
               
      
         
      
         
      
-          
      Typography
      
+          
      {{_i}}Typography{{/i}}
      
           
@@ -190,7 +190,7 @@
 
       
      
         
      
-          
      Visuals
      
+          
      {{_i}}Visuals{{/i}}
      
         
      
         
      
           
      
             
               
      
@@ -209,7 +209,7 @@
       
      
-        
      Mixins from mixins.less
      
+        
      {{_i}}Mixins from mixins.less{{/i}}
      
       
      
 
 
@@ -217,7 +217,7 @@
       
      
-        
      Operations
      
+        
      {{_i}}Operations{{/i}}
      
       
      
 
 
@@ -225,7 +225,7 @@
       
      
-        
      Compiling LESS and Bootstrap
      
+        
      {{_i}}Compiling LESS and Bootstrap{{/i}}
      
       
      
 
 
@@ -235,25 +235,25 @@
 ================================================== -->
 
      
 
      
-  
      Using Bootstrap with Less Supercharge your CSS with variables, mixins, and functions
      
+  
      {{_i}}Using Bootstrap with Less Supercharge your CSS with variables, mixins, and functions{{/i}}
      
 
      
 
      
   
      
-    
      Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.
      
-    
      Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.
      
+    
      {{_i}}Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.{{/i}}
      
+    
      {{_i}}Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.{{/i}}
      
   
      
   
      
-    
      How to use it
      
-    
      Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.
      
+    
      {{_i}}How to use it{{/i}}
      
+    
      {{_i}}Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.{{/i}}
      
 
       <link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
 <script src="js/less-1.1.3.min.js"></script>
      
-
      Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.
      
+
      {{_i}}Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.{{/i}}
      
 
-    
      What’s included
      
-    
      Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.
      
-    
      Variables
      
-    
      Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.
      
+    
      {{_i}}What’s included{{/i}}
      
+    
      {{_i}}Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.{{/i}}
      
+    
      {{_i}}Variables{{/i}}
      
+    
      {{_i}}Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.{{/i}}
      
 
       // Links
 @linkColor:         #8b59c2;
@@ -281,16 +281,16 @@
 @baseline:          18px;
 
      
 
-
      Commenting
      
-
      Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.
      
+
      {{_i}}Commenting{{/i}}
      
+
      {{_i}}Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.{{/i}}
      
 
       // This is a comment
 /* This is also a comment */
 
      
 
-
      Mixins up the wazoo
      
-
      Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.
      
-
      Font stacks
      
+
      {{_i}}Mixins up the wazoo{{/i}}
      
+
      {{_i}}Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.{{/i}}
      
+
      {{_i}}Font stacks{{/i}}
      
 
       #font {
   .shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) {
@@ -307,7 +307,7 @@
   ...
 }
 
      
-
      Gradients
      
+
      {{_i}}Gradients{{/i}}
      
 
       #gradient {
   ...
@@ -326,8 +326,8 @@
 }
 
      
 
-
      Operations
      
-
      Get fancy and perform some math to generate flexible and powerful mixins like the one below.
      
+
      {{_i}}Operations{{/i}}
      
+
      {{_i}}Get fancy and perform some math to generate flexible and powerful mixins like the one below.{{/i}}
      
 
       // Griditude
 @gridColumns:       16;
@@ -341,62 +341,62 @@
 }
 
      
 
-    
      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
      
+    
      {{_i}}Compiling Less{{/i}}
      
+    
      {{_i}}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.{{/i}}
      
+    
      {{_i}}Ways to compile{{/i}}
      
     
      
       
       
       
      
-          
-          
+          
+          
-          
+          
-          
+          
-          
+          
-          
+          
-          
+          
-          
+          
-          
+          
      
       
         
      MethodSteps{{_i}}Method{{/i}}{{_i}}Steps{{/i}}
         
      
             
       
         
      Node with makefile{{_i}}Node with makefile{{/i}}
           
-            
      Install the LESS command line compiler with npm by running the following command:
      
+            
      {{_i}}Install the LESS command line compiler with npm by running the following command:{{/i}}
      
             
      $ npm install less
      
-            
      Once installed just run make from the root of your bootstrap directory and you're all set.
      
-            
      Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).
      
+            
      {{_i}}Once installed just run make from the root of your bootstrap directory and you're all set.{{/i}}
      
+            
      {{_i}}Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).{{/i}}
      
                 		
         
      Javascript{{_i}}Javascript{{/i}}
           
-            
      Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.
      
+            
      {{_i}}Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.{{/i}}
      
 
       <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.
      
+            
      {{_i}}To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.{{/i}}
      
                 		
         
      
         
      Command line{{_i}}Command line{{/i}}
           
-            
      Install the LESS command line tool via Node and run the following command:
      
+            
      {{_i}}Install the LESS command line tool via Node and run the following command:{{/i}}
      
               
      $ lessc ./lib/bootstrap.less > bootstrap.css
      
-            
      Be sure to include --compress in that command if you're trying to save some bytes!
      
+            
      {{_i}}Be sure to include --compress in that command if you're trying to save some bytes!{{/i}}
      
                 		
         
      
         
      Unofficial Mac app{{_i}}Unofficial Mac app{{/i}}
           
-            
      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.
      
+            
      {{_i}}The unofficial Mac app watches directories of .less files and compiles the code to local files after every save of a watched .less file.{{/i}}
      
+            
      {{_i}}If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.{{/i}}
      
                 		
         
      
         
      
           CrunchCrunch is a great looking LESS editor and compiler built on Adobe Air.{{_i}}Crunch is a great looking LESS editor and compiler built on Adobe Air.{{/i}}
         
      
         
      
           CodeKitCreated by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.{{_i}}Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.{{/i}}
         
      
         
      
           SimplessMac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.{{_i}}Mac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.{{/i}}
         
      
             
     
      
-- 
cgit v1.2.3


From f03e170054be081738493c6dace4b37a7a3d40cd Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 24 Jan 2012 14:08:03 -0800
Subject: scaffolding i18n

---
 docs/templates/pages/scaffolding.mustache | 134 +++++++++++++++---------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index c586af1b9..7c0c12e8f 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -1,12 +1,12 @@
       
       
      
-        
      Scaffolding
      
-        
      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
      
+        
      {{_i}}Scaffolding{{/i}}
      
+        
      {{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}
      
         
       
      
 
@@ -16,7 +16,7 @@
 ================================================== -->
 
      
   
      
-    
      Grid system 12 columns with a responsive twist
      
+    
      {{_i}}Grid system 12 columns with a responsive twist{{/i}}
      
   
      
 
   
      Default 940px grid
      
@@ -53,8 +53,8 @@
 
   
      
     
      
-      
      The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.
      
-      
      It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.
      
+      
      {{_i}}The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.{{/i}}
      
+      
      {{_i}}It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.{{/i}}
      
     
      
     
      
 
      @@ -65,7 +65,7 @@
 
      
     
      
     
      
-      
      As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.
      
+      
      {{_i}}As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.{{/i}}
      
     
      
   
      
 
@@ -84,20 +84,20 @@
 
   
      
 
-  
      Nesting columns
      
+  
      {{_i}}Nesting columns{{/i}}
      
   
      
     
      
-      
      With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.
      
-      
      Example
      
+      
      {{_i}}With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new .row and set of .span* columns within an existing .span* column.{{/i}}
      
+      
      {{_i}}Example{{/i}}
      
       
      
         
      
-          Level 1 of column
+          {{_i}}Level 1 of column{{/i}}
           
      
             
      
-              Level 2
+              {{_i}}Level 2{{/i}}
             
      
             
      
-              Level 2
+              {{_i}}Level 2{{/i}}
             
      
           
      
         
      
@@ -107,10 +107,10 @@
 
       <div class="row">
   <div class="span12">
-    Level 1 of column
+    {{_i}}Level 1 of column{{/i}}
     <div class="row">
-      <div class="span6">Level 2</div>
-      <div class="span6">Level 2</div>
+      <div class="span6">{{_i}}Level 2{{/i}}</div>
+      <div class="span6">{{_i}}Level 2{{/i}}</div>
     </div>
   </div>
 </div>
@@ -118,50 +118,50 @@
     
      
   
      
 
-  
      Grid customization
      
+  
      {{_i}}Grid customization{{/i}}
      
   
-        
-        
-        
+        
+        
+        
-        
+        
-        
+        
-        
+        
-        
-        
+        
+        
      
     
       
      VariableDefault valueDescription{{_i}}Variable{{/i}}{{_i}}Default value{{/i}}{{_i}}Description{{/i}}
       
      
           
     
       
      
         @gridColumns
         12Number of columns{{_i}}Number of columns{{/i}}
       
      
       
      
         @gridColumnWidth
         60pxWidth of each column{{_i}}Width of each column{{/i}}
       
      
       
      
         @gridGutterWidth
         20pxNegative space between columns{{_i}}Negative space between columns{{/i}}
       
      
       
      
         @siteWidthComputed sum of all columns and guttersCounts number of columns and gutters to set width of the .fixed-container() mixin{{_i}}Computed sum of all columns and gutters{{/i}}{{_i}}Counts number of columns and gutters to set width of the .fixed-container() mixin{{/i}}
       
      
           
   
      
   
      
     
      
-      
      Variables in LESS
      
-      
      Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.
      
+      
      {{_i}}Variables in LESS{{/i}}
      
+      
      {{_i}}Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.{{/i}}
      
     
      
     
      
-      
      How to customize
      
-      
      Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.
      
+      
      {{_i}}How to customize{{/i}}
      
+      
      {{_i}}Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.{{/i}}
      
     
      
     
      
-      
      Staying responsive
      
-      
      Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.
      
+      
      {{_i}}Staying responsive{{/i}}
      
+      
      {{_i}}Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.{{/i}}
      
     
      
   
      
 
@@ -173,13 +173,13 @@
 ================================================== -->
 
      
   
      
-    
      Layouts Basic templates to create webpages
      
+    
      {{_i}}Layouts Basic templates to create webpages{{/i}}
      
   
      
 
   
      
     
      
-      
      Fixed layout
      
-      
      The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.
      
+      
      {{_i}}Fixed layout{{/i}}
      
+      
      {{_i}}The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.{{/i}}
      
       
      
         
      
       
      
@@ -192,8 +192,8 @@
 
     
      
     
      
-      
      Fluid layout
      
-      
      <div class="fluid-container"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.
      
+      
      {{_i}}Fluid layout{{/i}}
      
+      
      {{_i}}<div class="fluid-container"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}
      
       
      
         
      
         
      
@@ -221,7 +221,7 @@
 ================================================== -->
 
      
   
      
-    
      Responsive design Media queries for various devices and resolutions
      
+    
      {{_i}}Responsive design Media queries for various devices and resolutions{{/i}}
      
   
      
   
   
      
@@ -229,42 +229,42 @@
       Responsive devices
     
      
     
      
-      
      Supported devices
      
-      
      Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:
      
+      
      {{_i}}Supported devices{{/i}}
      
+      
      {{_i}}Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:{{/i}}
      
       
-            
-            
-            
-            
+            
+            
+            
+            
-            
+            
-            
+            
-            
+            
-            
+            
-            
+            
-            
+            
-            
+            
@@ -272,12 +272,12 @@
         
      
         
           
      LabelLayout widthColumn widthGutter width{{_i}}Label{{/i}}{{_i}}Layout width{{/i}}{{_i}}Column width{{/i}}{{_i}}Gutter width{{/i}}
           
      
               
         
           
      Smartphones{{_i}}Smartphones{{/i}}
             480px and belowFluid columns, no fixed widths{{_i}}Fluid columns, no fixed widths{{/i}}
           
      
           
      Portrait tablets{{_i}}Portrait tablets{{/i}}
             480px to 768pxFluid columns, no fixed widths{{_i}}Fluid columns, no fixed widths{{/i}}
           
      
           
      Landscape tablets{{_i}}Landscape tablets{{/i}}
             768px to 940px
             44px
             20px
           
      
           
      Default{{_i}}Default{{/i}}
             940px and up
             60px
             20px
           
      
           
      Large display{{_i}}Large display{{/i}}
             1210px and up
             70px
             30px
      
       
      
 
-      
      What they do
      
-      
      Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.
      
+      
      {{_i}}What they do{{/i}}
      
+      
      {{_i}}Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.{{/i}}
      
       
        
-        
      • Modify the width of column in our grid
        • 
-        
      • Stack elements instead of float wherever necessary
        • 
-        
      • Resize headings and text to be more appropriate for devices
        • 
+        
      • {{_i}}Modify the width of column in our grid{{/i}}
        • 
+        
      • {{_i}}Stack elements instead of float wherever necessary{{/i}}
        • 
+        
      • {{_i}}Resize headings and text to be more appropriate for devices{{/i}}
        • 
       
      
     
      
   
      
@@ -285,29 +285,29 @@
   
      
 
   
-  
      Using the media queries
      
+  
      {{_i}}Using the media queries{{/i}}
      
   
      
     
      
-      
      Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:
      
+      
      {{_i}}Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:{{/i}}
      
       
        
-        
      1. Use the compiled responsive version, bootstrap.reponsive.css
        2. 
-        
      2. Add @import "responsive.less" and recompile Bootstrap
        3. 
-        
      3. Compile responsive.less as a separate file and include that
        4. 
+        
      4. {{_i}}Use the compiled responsive version, bootstrap.reponsive.css{{/i}}
        5. 
+        
      5. {{_i}}Add @import "responsive.less" and recompile Bootstrap{{/i}}
        6. 
+        
      6. {{_i}}Compile responsive.less as a separate file and include that{{/i}}
        7. 
       
      
-      
      Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.
      
+      
      {{_i}}Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.{{/i}}
      
     
      
     
      
 
      -  // Landscape phones and down
+  // {{_i}}Landscape phones and down{{/i}}
   @media (max-width: 480px) { ... }
 
-  // Landscape phone to portrait tablet
+  // {{_i}}Landscape phone to portrait tablet{{/i}}
   @media (min-width: 480px) and (max-width: 768px) { ... }
 
-  // Portrait tablet to landscape and desktop
+  // {{_i}}Portrait tablet to landscape and desktop{{/i}}
   @media (min-width: 768px) and (max-width: 940px) { ... }
 
-  // Large desktop
+  // {{_i}}Large desktop{{/i}}
   @media (min-width: 1210px) { .. }
 
      
     
      
-- 
cgit v1.2.3


From f4543ecb19f41f93db94e56601e0a4132ea4828f Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 24 Jan 2012 14:14:01 -0800
Subject: add i18n to upgrading

---
 docs/templates/pages/upgrading.mustache | 74 ++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 475539284..cc731eae1 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -1,78 +1,78 @@
       
       
      
-        
      Upgrading to Bootstrap 2
      
-        
      Learn about significant changes and additions since v1.4 with this handy guide.
      
+        
      {{_i}}Upgrading to Bootstrap 2{{/i}}
      
+        
      {{_i}}Learn about significant changes and additions since v1.4 with this handy guide.{{/i}}
      
       
      
 
 
 
      Rough outline
      
 
        
-  
      • Docs completely overhauled
+  
      • {{_i}}Docs completely overhauled{{/i}}
     
          
-      
        • Responsive thanks to new grid system
          • 
-      
        • Now less marketing and more information
          • 
-      
        • Extensive use of tables to share classes and elements of most components
          • 
-      
        • Broken down into several pages for easier consumption
          • 
+      
        • {{_i}}Responsive thanks to new grid system{{/i}}
          • 
+      
        • {{_i}}Now less marketing and more information{{/i}}
          • 
+      
        • {{_i}}Extensive use of tables to share classes and elements of most components{{/i}}
          • 
+      
        • {{_i}}Broken down into several pages for easier consumption{{/i}}
          • 
     
        
   
        • 
-  
      • Updated grid system, now only 12 columns
+  
      • {{_i}}Updated grid system, now only 12 columns{{/i}}
     
          
-      
        • Same great classes, but now only 12 columns
          • 
-      
        • Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more
          • 
+      
        • {{_i}}Same great classes, but now only 12 columns{{/i}}
          • 
+      
        • {{_i}}Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more{{/i}}
          • 
     
        
   
        • 
-  
      • New thumbnails (previously media grids)
+  
      • {{_i}}New thumbnails (previously media grids){{/i}}
     
          
-      
        • .media-grid class has been changed to .thumbnails
          • 
-      
        • Individual thumbnails now require .thumbnail class
          • 
+      
        • {{_i}}.media-grid class has been changed to .thumbnails{{/i}}
          • 
+      
        • {{_i}}Individual thumbnails now require .thumbnail class{{/i}}
          • 
     
        
   
        • 
-  
      • Updated forms
+  
      • {{_i}}Updated forms{{/i}}
     
          
-      
        • Default form style is now stacked to use less CSS and add flexibility
          • 
-      
        • Exact same markup is required for vertical or horizontal forms—just swap the classes
          • 
-      
        • New form defaults for search, inline, vertical, and horizontal
          • 
+      
        • {{_i}}Default form style is now stacked to use less CSS and add flexibility{{/i}}
          • 
+      
        • {{_i}}Exact same markup is required for vertical or horizontal forms—just swap the classes{{/i}}
          • 
+      
        • {{_i}}New form defaults for search, inline, vertical, and horizontal{{/i}}
          • 
     
        
   
        • 
   
      • Updated tables
     
          
-      
        • Table classes made more consistent
          • 
-      
        • Removed unused table color options (too much code for such little impact)
          • 
+      
        • {{_i}}Table classes made more consistent{{/i}}
          • 
+      
        • {{_i}}Removed unused table color options (too much code for such little impact){{/i}}
          • 
     
        
   
        • 
   
      • Typography
     
          
-      
        • Right-aligned option for blockquotes if float: right;
          • 
-      
        • h4 elements were dropped from 16px to 14px with a default line-height of 18px
          • 
-      
        • h5 elements were dropped from 14px to 12px
          • 
-      
        • h6 elements were dropped from 13px to 11px
          • 
+      
        • {{_i}}Right-aligned option for blockquotes if float: right;{{/i}}
          • 
+      
        • {{_i}}h4 elements were dropped from 16px to 14px with a default line-height of 18px{{/i}}
          • 
+      
        • {{_i}}h5 elements were dropped from 14px to 12px{{/i}}
          • 
+      
        • {{_i}}h6 elements were dropped from 13px to 11px{{/i}}
          • 
     
        
   
        • 
-  
      • Buttons
+  
      • {{_i}}Buttons{{/i}}
     
          
-      
        • Added button bar options
          • 
+      
        • {{_i}}Added button bar options{{/i}}
          • 
     
        
   
        • 
-  
      • Examples
+  
      • {{_i}}Examples{{/i}}
     
          
-      
        • Fluid examples redone. .fluid-container now requires a .sidebar-left or .sidebar-right as well. Fluid sidebar element has a new class, .fluid-sidebar.
          • 
+      
        • {{_i}}Fluid examples redone. .fluid-container now requires a .sidebar-left or .sidebar-right as well. Fluid sidebar element has a new class, .fluid-sidebar.{{/i}}
          • 
     
        
   
        • 
-  
      • Dropdown menus
+  
      • {{_i}}Dropdown menus{{/i}}
     
          
-      
        • Updated the .dropdown-menu to tighten up spacing
          • 
-      
        • Now requires you to add a <span class="caret"></span> to show the dropdown arrow
          • 
-      
        • The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.
          • 
+      
        • {{_i}}Updated the .dropdown-menu to tighten up spacing{{/i}}
          • 
+      
        • {{_i}}Now requires you to add a <span class="caret"></span> to show the dropdown arrow{{/i}}
          • 
+      
        • {{_i}}The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.{{/i}}
          • 
     
        
   
        • 
-  
      • Navigation
+  
      • {{_i}}Navigation{{/i}}
     
          
-      
        • Tabs and pills now require the use of a new base class, .nav, on their <ul>
          • 
-      
        • New nav list component added that uses the same base class, .nav
          • 
-      
        • Vertical tabs and pills have been added—just add .stacked to the <ul>
          • 
-      
        • Pills were restyled to be less rounded by default
          • 
-      
        • Pills now have dropdown menu support (they share the same markup and styles as tabs)
          • 
+      
        • {{_i}}Tabs and pills now require the use of a new base class, .nav, on their <ul>{{/i}}
          • 
+      
        • {{_i}}New nav list component added that uses the same base class, .nav{{/i}}
          • 
+      
        • {{_i}}Vertical tabs and pills have been added—just add .stacked to the <ul><{{/i}}/li>
+      
        • {{_i}}Pills were restyled to be less rounded by default{{/i}}
          • 
+      
        • {{_i}}Pills now have dropdown menu support (they share the same markup and styles as tabs){{/i}}
          • 
     
        
   
        • 
 
      
-- 
cgit v1.2.3


From a800d6ceac11eb834295567c20e890abf88c64af Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 24 Jan 2012 14:22:02 -0800
Subject: i18n index

---
 docs/index.html                     |   2 +-
 docs/templates/pages/index.mustache | 106 ++++++++++++++++++------------------
 2 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index 1743676b6..d0c0bcae6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -136,7 +136,7 @@
             
           
 
-          
      Designed for everyone, everywhere.
      
+          
           
      Need reasons to love Bootstrap? Look no further.
      
           
      
             
      
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 8927bc640..1e77d4a25 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -4,34 +4,34 @@
         ================================================== -->
         
      
           
      
-            
      Bootstrap,
       from Twitter
      
-            
      Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.
      
+            
      {{_i}}Bootstrap,
       from Twitter{{/i}}
      
+            
      {{_i}}Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.{{/i}}
      
             
      
-              Download on GitHub
-              Get started →
+              {{_i}}Download on GitHub{{/i}}
+              {{_i}}Get started →{{/i}}
             
      
 
             
      
-              
      Feature highlights
      
+              
      {{_i}}Feature highlights{{/i}}
      
               
        
-                
      • × Built on LESS
        • 
-                
      • × Complete styleguide docs
        • 
-                
      • × Fully responsive design
        • 
-                
      • × Small footprint (7kb gzipped)
        • 
-                
      • × Support for IE7 and up
        • 
-                
      • × Custom jQuery plugins
        • 
-                
      • × Dozens of components
        • 
+                
      • {{_i}}× Built on LESS{{/i}}
        • 
+                
      • {{_i}}× Complete styleguide docs{{/i}}
        • 
+                
      • {{_i}}× Fully responsive design{{/i}}
        • 
+                
      • {{_i}}× Small footprint (7kb gzipped){{/i}}
        • 
+                
      • {{_i}}× Support for IE7 and up{{/i}}
        • 
+                
      • {{_i}}× Custom jQuery plugins{{/i}}
        • 
+                
      • {{_i}}× Dozens of components{{/i}}
        • 
               
      
             
      
           
      
         
      
 
         
      
 
-      
      
-        
      
-          
      Visuals
      
-        
      
-        
      
-          
-            
-              
-                
-                
-                
-              
-            
-          
      @primaryButtonColor@blue
      
-        
      
-      
      
 
 
       
-      
      
-        
      {{_i}}Built with LESS{{/i}}
      
-      
      
-      
      
-        
      
-          
      {{_i}}Why LESS?{{/i}}
      
-          
      {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}
      
-        
      
-        
      
-          
      {{_i}}What's included?{{/i}}
      
-          
      {{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}
      
-        
      
-        
      
-          
      {{_i}}Learn more{{/i}}
      
-          LESS CSS
-          
      {{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}
      
-        
      
-      
      
-      
      
-        
      
-          
      {{_i}}Variables{{/i}}
      
-          
      {{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}
      
+      
      
+        
      
+          
      {{_i}}Built with LESS{{/i}}
      
         
      
-        
      
-          
      {{_i}}Mixins{{/i}}
      
-          
      {{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}
      
+        
      
+          
      
+            
      {{_i}}Why LESS?{{/i}}
      
+            
      {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}
      
+          
      
+          
      
+            
      {{_i}}What's included?{{/i}}
      
+            
      {{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}
      
+          
      
+          
      
+            
      {{_i}}Learn more{{/i}}
      
+            LESS CSS
+            
      {{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}
      
+          
      
         
      
-        
      
-          
      {{_i}}Operations{{/i}}
      
-          
      {{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}
      
+        
      
+          
      
+            
      {{_i}}Variables{{/i}}
      
+            
      {{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}
      
+          
      
+          
      
+            
      {{_i}}Mixins{{/i}}
      
+            
      {{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}
      
+          
      
+          
      
+            
      {{_i}}Operations{{/i}}
      
+            
      {{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}
      
+          
      
         
      
-      
      
+      
      
 
 
 
       
-      
      
-        
      {{_i}}Variables from variables.less{{/i}}
      
-      
      
-
-          
      {{_i}}Hyperlinks{{/i}}
      
-          
-            
-              
-                
-                
-                
-              
-            
-            
-              
-                
-                
-                
-              
-              
-                
-                
-                
-              
-            
-          
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
      @linkColor#0069d6{{_i}}Default link text color{{/i}}
      @linkColorHoverdarken(@linkColor, 15){{_i}}Default link text hover color{{/i}}
      
-
-      
      
-        
      
-          
      {{_i}}Grayscale colors{{/i}}
      
-          
-            
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-              
-            
-          
      @black#000
      @grayDarklighten(@black, 25%)
      @graylighten(@black, 50%)
      @grayLightlighten(@black, 75%)
      @grayLighterlighten(@black, 90%)
      @white#fff
      
+      
      
+        
      
+          
      {{_i}}Variables from variables.less{{/i}}
      
         
      
-        
      
-          
      {{_i}}Accent colors{{/i}}
      
-          
-            
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-              
-            
-          
      @blue#049CDB
      @green#46a546
      @red#9d261d
      @yellow#ffc40d
      @orange#f89406
      @pink#c3325f
      @purple#7a43b6
      
-        
      
-      
      
 
-      
      
-        
      
-          
      {{_i}}Grid system{{/i}}
      
-          
-            
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-              
-              
-                
-                
-              
-            
-          
      @gridColumns12
      @gridColumnWidth60px
      @gridGutterWidth20px
      @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
      
-        
      
-        
      
-          
      {{_i}}Typography{{/i}}
      
-          
-            
-              
-                
-                
-              
-              
-                
-                
-                
-              
-              
-                
-                
-              
-            
-          
      @baseFontSize13px
      @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
      @baseLineHeight18px
      
-        
      
-      
      
+        
      {{_i}}Hyperlinks{{/i}}
      
+        
+          
+            
+              
+              
+              
+            
+          
+          
+            
+              
+              
+              
+            
+            
+              
+              
+              
+            
+          
+        
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
      @linkColor#08c{{_i}}Default link text color{{/i}}
      @linkColorHoverdarken(@linkColor, 15%){{_i}}Default link text hover color{{/i}}
      
+
+        
      
+          
      
+            
      {{_i}}Grayscale colors{{/i}}
      
+            
+              
+                
+                  
+                  
+                
+              
+              
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+              
+            
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @black#000
      @grayDarker#222
      @grayDark#333
      @gray#555
      @grayLight#999
      @grayLighter#eee
      @white#fff
      
+          
      
+          
      
+            
      {{_i}}Accent colors{{/i}}
      
+            
+              
+                
+                  
+                  
+                
+              
+              
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+              
+            
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @blue#049cdb
      @green#46a546
      @red#9d261d
      @yellow#ffc40d
      @orange#f89406
      @pink#c3325f
      @purple#7a43b6
      
+          
      
+        
       
+        
      
+          
      
+            
      {{_i}}Grid system{{/i}}
      
+            
+              
+                
+                  
+                  
+                
+              
+              
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+              
+            
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @gridColumns12
      @gridColumnWidth60px
      @gridGutterWidth20px
      @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
      
+          
      
+          
      
+            
      {{_i}}Typography{{/i}}
      
+            
+              
+                
+                  
+                  
+                
+              
+              
+                
+                  
+                  
+                
+                
+                  
+                  
+                  
+                
+                
+                  
+                  
+                
+              
+            
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @baseFontSize13px
      @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
      @baseLineHeight18px
      
+          
      
+        
       
+        
      
+          
      
+            
      {{_i}}Visuals{{/i}}
      
+          
      
+          
      
+            
+              
+                
+                  
+                  
+                  
+                
+              
+            
      @primaryButtonColor@blue
      
+          
      
+        
       
+      
      
 
-      
      
-        
      
-          
      {{_i}}Visuals{{/i}}
      
-        
      
-        
      
-          
-            
-              
-                
-                
-                
-              
-            
-          
      @primaryButtonColor@blue
      
-        
      
-      
      
 
 
       
-        
      
-          
      
-            
      Visuals
      
-          
      
-          
      
-            
-              
-                
-                  
-                  
-                  
-                
-              
-            
      @primaryButtonColor@blue
      
-          
      
-        
       
+
+        
      Components
      
+        
+          
+            
+              
+            
+          
+          
+            
+              
+              
+            
+          
+          
+          
+            
+              
+            
+          
+          
+            
+              
+              
+            
+          
+
+          
+            
+              
+            
+          
+          
+            
+              
+              
+            
+            
+              
+              
+            
+            
+              
+              
+            
+          
+        
      Buttons
      @primaryButtonColor@blue
      Buttons
      @placeholderText@grayLight
      Navbars
      @navbarHeight40px
      @navbarBackground@grayDarker
      @navbarBackgroundHighlight@grayDark
      
+
       
 
 
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 8adc7874f..141000c7c 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -99,23 +99,23 @@
                 
                 
                   @grayDarker
-                  #222
+                  #222
                 
                 
                   @grayDark
-                  #333
+                  #333
                 
                 
                   @gray
-                  #555
+                  #555
                 
                 
                   @grayLight
-                  #999
+                  #999
                 
                 
                   @grayLighter
-                  #eee
+                  #eee
                 
                 
                   @white
@@ -223,22 +223,66 @@
             
           
      
         
       
-        
      
-          
      
-            
      {{_i}}Visuals{{/i}}
      
-          
      
-          
      
-            
-              
-                
-                  
-                  
-                  
-                
-              
-            
      @primaryButtonColor@blue
      
-          
      
-        
       
+
+        
      {{_i}}Components{{/i}}
      
+        
+          
+            
+              
+            
+          
+          
+            
+              
+              
+            
+          
+
+          
+            
+              
+            
+          
+          
+            
+              
+              
+            
+          
+
+          
+            
+              
+            
+          
+          
+            
+              
+              
+            
+            
+              
+              
+            
+            
+              
+              
+            
+          
+          
+          
+            
+              
+            
+          
+          
+            
+              
+              
+            
+          
+        
      {{_i}}Buttons{{/i}}
      @primaryButtonColor@blue
      {{_i}}Buttons{{/i}}
      @placeholderText@grayLight
      {{_i}}Navbars{{/i}}
      @navbarHeight40px
      @navbarBackground@grayDarker
      @navbarBackgroundHighlight@grayDark
      {{_i}}Buttons{{/i}}
      @placeholderText@grayLight
      
+
       
 
 
diff --git a/lib/alerts.less b/lib/alerts.less
index 53a43c6e4..20e935fa9 100644
--- a/lib/alerts.less
+++ b/lib/alerts.less
@@ -6,13 +6,13 @@
   padding: 8px 35px 8px 14px;
   margin-bottom: @baseLineHeight;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  background-color: #fcf8e3;
-  border: 1px solid #f3edd2;
+  background-color: @warningBackground;
+  border: 1px solid @warningBorder;
   .border-radius(4px);
 }
 .alert,
 .alert-heading {
-  color: #c09853;
+  color: @warningText;
 }
 
 // Adjust close link position
@@ -26,31 +26,31 @@
 // ----------------
 
 .alert-success {
-  background-color: #dff0d8;
-  border-color: #cfe8c4;  
+  background-color: @successBackground;
+  border-color: @successBorder;  
 }
 .alert-success,
 .alert-success .alert-heading {
-  color: #468847;
+  color: @successText;
 }
 .alert-danger,
 .alert-error {
-  background-color: #f2dede;
-  border-color: #e9c7c7;
+  background-color: @errorBackground;
+  border-color: @errorBorder;
 }
 .alert-danger,
 .alert-error,
 .alert-danger .alert-heading,
 .alert-error .alert-heading {
-  color: #B94A48;
+  color: @errorText;
 }
 .alert-info {
-  background-color: #d9edf7;
-  border-color: #bfe1f2;
+  background-color: @infoBackground;
+  border-color: @infoBorder;
 }
 .alert-info,
 .alert-info .alert-heading {
-  color: #3a87ad;
+  color: @infoText;
 }
 
 
diff --git a/lib/forms.less b/lib/forms.less
index 1f424abaa..2b24fb2f0 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -295,17 +295,17 @@ textarea[readonly] {
     border-color: @textColor;
   }
 }
-// Error
-.control-group.error {
-  .formFieldState(#b94a48, #ee5f5b, lighten(#ee5f5b, 30%));
-}
 // Warning
 .control-group.warning {
-  .formFieldState(#c09853, #ccae64, lighten(#CCAE64, 5%));
+  .formFieldState(@warningText, @warningBorder, @warningBackground);
+}
+// Error
+.control-group.error {
+  .formFieldState(@errorText, @errorBorder, @errorBackground);
 }
 // Success
 .control-group.success {
-  .formFieldState(#468847, #57a957, lighten(#57a957, 30%));
+  .formFieldState(@successText, @successBorder, @successBackground);
 }
 
 // HTML5 invalid states
diff --git a/lib/mixins.less b/lib/mixins.less
index a54f6762f..e64b80ad3 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -48,7 +48,7 @@
 
 // Placeholder text
 // -------------------------
-.placeholder(@color: @placeHolderText) {
+.placeholder(@color: @placeholderText) {
   :-moz-placeholder {
     color: @color;
   }
diff --git a/lib/variables.less b/lib/variables.less
index 674a358bf..3c4f562ca 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -52,11 +52,9 @@
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
-// Input placeholder text color
-@placeHolderText:       @grayLight;
-
 // Z-index master list
 // Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
 @zindexDropdown:        1000;
 @zindexPopover:         1010;
 @zindexTooltip:         1020;
@@ -64,9 +62,29 @@
 @zindexModalBackdrop:   1040;
 @zindexModal:           1050;
 
+// Input placeholder text color
+@placeholderText:       @grayLight;
+
 // Navbar
-@navBarHeight:                    40px;
+@navbarHeight:                    40px;
 @navbarBackground:                @grayDarker;
 @navbarBackgroundHighlight:       @grayDark;
 
+// Form states and alerts
+@warningText:             #c09853;
+@warningBackground:       #fcf8e3;
+@warningBorder:           #f3edd2;
+
+@errorText:               #b94a48;
+@errorBackground:         #f2dede;
+@errorBorder:             #e9c7c7;
+
+@successText:             #468847;
+@successBackground:       #dff0d8;
+@successBorder:           #cfe8c4;
+
+@infoText:                #3a87ad;
+@infoBackground:          #d9edf7;
+@infoBorder:              #bfe1f2;
+
 
-- 
cgit v1.2.3


From a40d4993ed0a947083b7e85cf7772492d613afc8 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Tue, 24 Jan 2012 17:13:02 -0800
Subject: make subnav fix

---
 docs/assets/css/docs.css      |  6 ++++++
 docs/assets/js/application.js | 21 +++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index d78cea2b1..4ab353069 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -165,6 +165,12 @@ section {
   border-right: 0;
 }
 
+.subhead .subnav-fixed {
+  position: fixed;
+  top: 40px;
+  z-index:1000;
+}
+
 
 /* Quick links
 -------------------------------------------------- */
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 95caa0f31..4b7efe53f 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -116,6 +116,27 @@ $(function(){
     })
   })
 
+  // fix sub nav playa
+  var $win = $(window)
+    , $nav = $('.subhead .nav')
+    , navTop = $('.subhead .nav').offset().top - 40
+    , isFixed = 0
+
+  processScroll()
+
+  $win.on('scroll', processScroll)
+
+  function processScroll() {
+    var i, scrollTop = $win.scrollTop()
+    if (scrollTop >= navTop && !isFixed) {
+      isFixed = 1
+      $nav.addClass('subnav-fixed')
+    } else if (scrollTop <= navTop && isFixed) {
+      isFixed = 0
+      $nav.removeClass('subnav-fixed')
+    }
+  }
+
 })
 
 // JS for javascript demos
-- 
cgit v1.2.3


From 805a965f2e7373db42d99376d4dc3c1ca9ea509d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 17:14:19 -0800
Subject: finish updating form state and alert variables in less docs page

---
 bootstrap.css                      |   2 +-
 docs/assets/css/docs.css           |   2 +
 docs/less.html                     | 143 +++++++++++++++++++++++-----------
 docs/templates/pages/less.mustache | 155 +++++++++++++++++++++++--------------
 4 files changed, 199 insertions(+), 103 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index d7594416b..0cc74c8e2 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Tue Jan 24 16:50:16 PST 2012
+ * Date: Tue Jan 24 17:04:46 PST 2012
  */
 article,
 aside,
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index d78cea2b1..956eff246 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -417,6 +417,8 @@ pre.prettyprint {
 
 /* Make tables spaced out a bit more */
 h2 + table,
+h3 + table,
+h4 + table,
 h2 + .row {
   margin-top: 5px;
 }
diff --git a/docs/less.html b/docs/less.html
index dfa0739a7..c9e447382 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -58,6 +58,10 @@
 
     
      
 
+      
      
+        Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
+      
      
+
       
       
      
@@ -285,51 +289,100 @@
         
       
 
         
      Components
      
-        
-          
-            
-              
-            
-          
-          
-            
-              
-              
-            
-          
-          
-          
-            
-              
-            
-          
-          
-            
-              
-              
-            
-          
-
-          
-            
-              
-            
-          
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
      Buttons
      @primaryButtonColor@blue
      Buttons
      @placeholderText@grayLight
      Navbars
      @navbarHeight40px
      @navbarBackground@grayDarker
      @navbarBackgroundHighlight@grayDark
      
+        
      
+          
      
+            
      Buttons
      
+            
+              
+                
+                  
+                  
+                
+              
+            
      @primaryButtonColor@blue
      
+            
      Forms
      
+            
+              
+                
+                  
+                  
+                
+              
+            
      @placeholderText@grayLight
      
+            
      Navbar
      
+            
+              
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+              
+            
      @navbarHeight40px
      @navbarBackground@grayDarker
      @navbarBackgroundHighlight@grayDark
      
+          
      
+          
      
+            
      Form states and alerts
      
+            
+              
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+              
+            
      @warningText#f3edd2
      @warningBackground#c09853
      @warningBorder#f3edd2
      @errorText#b94a48
      @errorBackground#f2dede
      @errorBorder#e9c7c7
      @successText#468847
      @successBackground#dff0d8
      @successBorder#cfe8c4
      @infoText#3a87ad
      @infoBackground#d9edf7
      @infoBorder#bfe1f2
      
+          
      
+        
      
 
       
 
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 141000c7c..580fac2f6 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -1,3 +1,7 @@
+      
      
+        Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
+      
      
+
       
       
      
@@ -225,63 +229,100 @@
         
       
 
         
      {{_i}}Components{{/i}}
      
-        
-          
-            
-              
-            
-          
-          
-            
-              
-              
-            
-          
-
-          
-            
-              
-            
-          
-          
-            
-              
-              
-            
-          
-
-          
-            
-              
-            
-          
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-          
-          
-            
-              
-            
-          
-          
-            
-              
-              
-            
-          
-        
      {{_i}}Buttons{{/i}}
      @primaryButtonColor@blue
      {{_i}}Buttons{{/i}}
      @placeholderText@grayLight
      {{_i}}Navbars{{/i}}
      @navbarHeight40px
      @navbarBackground@grayDarker
      @navbarBackgroundHighlight@grayDark
      {{_i}}Buttons{{/i}}
      @placeholderText@grayLight
      
+        
      
+          
      
+            
      Buttons
      
+            
+              
+                
+                  
+                  
+                
+              
+            
      @primaryButtonColor@blue
      
+            
      Forms
      
+            
+              
+                
+                  
+                  
+                
+              
+            
      @placeholderText@grayLight
      
+            
      Navbar
      
+            
+              
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+              
+            
      @navbarHeight40px
      @navbarBackground@grayDarker
      @navbarBackgroundHighlight@grayDark
      
+          
      
+          
      
+            
      Form states and alerts
      
+            
+              
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+                
+                  
+                  
+                
+              
+            
      @warningText#f3edd2
      @warningBackground#c09853
      @warningBorder#f3edd2
      @errorText#b94a48
      @errorBackground#f2dede
      @errorBorder#e9c7c7
      @successText#468847
      @successBackground#dff0d8
      @successBorder#cfe8c4
      @infoText#3a87ad
      @infoBackground#d9edf7
      @infoBorder#bfe1f2
      
+          
      
+        
      
 
       
 
-- 
cgit v1.2.3


From 26ed8202ee270ce8b103491613fb2f5053472a70 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 18:24:38 -0800
Subject: modify the scaffolding page to fix the language around preboot/grid
 variables

---
 bootstrap.css                             | 2 +-
 docs/assets/css/docs.css                  | 3 ++-
 docs/templates/pages/scaffolding.mustache | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 0cc74c8e2..c626cb0f5 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Tue Jan 24 17:04:46 PST 2012
+ * Date: Tue Jan 24 18:24:24 PST 2012
  */
 article,
 aside,
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index d5192ca55..ac48c6e2b 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -168,7 +168,8 @@ section {
 .subhead .subnav-fixed {
   position: fixed;
   top: 40px;
-  z-index:1000;
+  z-index: 1030;
+  width: 938px;
 }
 
 
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 7c0c12e8f..a8638f273 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -157,7 +157,7 @@
     
      
     
      
       
      {{_i}}How to customize{{/i}}
      
-      
      {{_i}}Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.{{/i}}
      
+      
      {{_i}}Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.{{/i}}
      
     
      
     
      
       
      {{_i}}Staying responsive{{/i}}
      
-- 
cgit v1.2.3


From 9ef4171d03e048ee9458fb7a1db83ea61bf845c2 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 18:26:45 -0800
Subject: lighten alert on less page

---
 docs/less.html                     | 2 +-
 docs/scaffolding.html              | 2 +-
 docs/templates/pages/less.mustache | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/less.html b/docs/less.html
index c9e447382..c8c1540b5 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -58,7 +58,7 @@
 
     
      
 
-      
      
+      
      
         Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
       
      
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 2684e32ec..1fd8363ae 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -217,7 +217,7 @@
     
      
     
      
       
      How to customize
      
-      
      Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grids in the preboot.less file and use one of the four ways documented to recompile.
      
+      
      Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.
      
     
      
     
      
       
      Staying responsive
      
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 580fac2f6..b5cff2d11 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -1,4 +1,4 @@
-      
      
+      
      
         Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
       
      
 
-- 
cgit v1.2.3


From d3622235359c08f65d5396ee01523c7f7d8901b1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 18:29:17 -0800
Subject: refine fixed docs bar

---
 docs/assets/css/docs.css | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index ac48c6e2b..dd723800b 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -170,6 +170,12 @@ section {
   top: 40px;
   z-index: 1030;
   width: 938px;
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+  -webkit-box-shadow: 0 1px 5px rgba(0,0,0,.05);
+     -moz-box-shadow: 0 1px 5px rgba(0,0,0,.05);
+          box-shadow: 0 1px 5px rgba(0,0,0,.05);
 }
 
 
@@ -565,6 +571,13 @@ form.well {
   .subhead .nav li + li a {
     border-top: 1px solid #eee;
   }
+  .subhead .subnav-fixed {
+    position: static;
+    top: auto;
+    z-index: auto;
+    width: auto;
+  }
+
 
   /* Don't space out quick links so much */
   .quick-links {
-- 
cgit v1.2.3


From 880486089888fbba04ed12083ad038ae38494fd1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 18:45:23 -0800
Subject: fix typo on js docs

---
 docs/javascript.html                     | 2 +-
 docs/templates/pages/javascript.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index a35c29913..06aba5156 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1166,7 +1166,7 @@ $('#myCollapsible').collapse({
             
             
              
-               show/td>
+               show
                This event fires immediately when the show instance method is called.
              
              
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 763fe8aa1..97e6da9ef 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1106,7 +1106,7 @@ $('#myCollapsible').collapse({
             
             
              
-               {{_i}}show{{/i}}/td>
+               {{_i}}show{{/i}}
                {{_i}}This event fires immediately when the show instance method is called.{{/i}}
              
              
-- 
cgit v1.2.3


From f70895a6059aab44c53048b0294204d2f53dfd65 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 19:01:38 -0800
Subject: remove rogue html elements

---
 docs/javascript.html                     | 6 ++----
 docs/templates/pages/javascript.mustache | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index 06aba5156..472285cc9 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -646,7 +646,6 @@ $('#myModal').on('hidden', function () {
     $('.tabs a:last').tab('show')
   })
 </script>
-          
      
           
      Events
      
           
@@ -753,7 +752,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
      
             
             
           
      
-          
      Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.
      
+          
      Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.
      
           
      Markup
      
           
      For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
      
           
      Methods
      
@@ -853,7 +852,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
             
           
-          
      Notice Individual popover instance options can alternatively be specified through the use of data attributes.
      
+          
      Notice Individual popover instance options can alternatively be specified through the use of data attributes.
      
           
      Markup
      
           
      
           For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
@@ -1310,7 +1309,6 @@ $('.myCarousel').carousel({
                slid
                This event is fired when the carousel has completed it's slide transition.
              
-             
             
           
         
      
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 97e6da9ef..9fd431f2f 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -586,7 +586,6 @@ $('#myModal').on('hidden', function () {
     $('.tabs a:last').tab('show')
   })
 </script>
-          
      
           
      {{_i}}Events{{/i}}
      
           
@@ -693,7 +692,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
      
             
             
           
      
-          
      {{_i}}Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.{{/i}}
      
+          
      {{_i}}Notice Individual tooltip instance options can alternatively be specified through the use of data attributes.{{/i}}
      
           
      {{_i}}Markup{{/i}}
      
           
      {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}
      
           
      {{_i}}Methods{{/i}}
      
@@ -793,7 +792,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
             
           
-          
      {{_i}}Notice Individual popover instance options can alternatively be specified through the use of data attributes.{{/i}}
      
+          
      {{_i}}Notice Individual popover instance options can alternatively be specified through the use of data attributes.{{/i}}
      
           
      {{_i}}Markup{{/i}}
      
           
      
           {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.{{/i}}
@@ -1250,7 +1249,6 @@ $('.myCarousel').carousel({
                {{_i}}slid{{/i}}
                {{_i}}This event is fired when the carousel has completed it's slide transition.{{/i}}
              
-             
             
           
         
      
-- 
cgit v1.2.3


From 672ba4c2fd9a42d4f178e795ebc162cce81bbc2f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 19:19:50 -0800
Subject: update the subnav on all pages

---
 bootstrap.css                             |   2 +-
 docs/assets/css/docs.css                  |  40 +++--
 docs/assets/js/application.js             |   4 +-
 docs/base-css.html                        |  16 +-
 docs/components.html                      | 263 +++++++++++++++---------------
 docs/javascript.html                      |  30 ++--
 docs/less.html                            |  14 +-
 docs/scaffolding.html                     |  12 +-
 docs/templates/pages/base-css.mustache    |  16 +-
 docs/templates/pages/components.mustache  | 263 +++++++++++++++---------------
 docs/templates/pages/javascript.mustache  |  30 ++--
 docs/templates/pages/less.mustache        |  14 +-
 docs/templates/pages/scaffolding.mustache |  12 +-
 13 files changed, 371 insertions(+), 345 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index c626cb0f5..49f31bc1d 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Tue Jan 24 18:24:24 PST 2012
+ * Date: Tue Jan 24 19:19:33 PST 2012
  */
 article,
 aside,
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index dd723800b..776ca58b9 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -125,7 +125,9 @@ section {
 }
 
 /* Subnav */
-.subhead .nav {
+.subnav {
+  width: 100%;
+  height: 36px;
   background-color: #eeeeee; /* Old browsers */
   background-repeat: repeat-x; /* Repeat the gradient */
   background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
@@ -138,23 +140,30 @@ section {
   border: 1px solid #e5e5e5;
   -webkit-border-radius: 4px;
      -moz-border-radius: 4px;
-          border-radius: 4px;
+          border-radius: 4px;  
+}
+.subhead .nav {
 }
 .subhead .nav a {
   margin: 0;
   padding-top: 11px;
   padding-bottom: 11px;
   font-size: 13px;
+  color: #777;
   border-left: 1px solid #f5f5f5;
   border-right: 1px solid #e5e5e5;
   -webkit-border-radius: 0;
      -moz-border-radius: 0;
           border-radius: 0;
 }
+.subhead .nav a:hover,
 .subhead .nav .active a {
-  background-color: #fff;
+  background-color: transparent;
   color: #333;
 }
+.subhead .nav .active a {
+  background-color: #eee;
+}
 .subhead .nav li:first-child a {
   border-left: 0;
   -webkit-border-radius: 4px 0 0 4px;
@@ -165,17 +174,24 @@ section {
   border-right: 0;
 }
 
-.subhead .subnav-fixed {
+.subnav-fixed {
   position: fixed;
   top: 40px;
+  left: 0;
+  right: 0;
   z-index: 1030;
-  width: 938px;
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
-  -webkit-box-shadow: 0 1px 5px rgba(0,0,0,.05);
-     -moz-box-shadow: 0 1px 5px rgba(0,0,0,.05);
-          box-shadow: 0 1px 5px rgba(0,0,0,.05);
+  border-color: #d5d5d5;
+  border-width: 0 0 1px; /* drop the border on the fixed edges */
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+  -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
+     -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
+          box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
+}
+.subnav-fixed .nav {
+  width: 940px;
+  margin: 0 auto;
 }
 
 
@@ -438,7 +454,7 @@ h2 + .row {
 
 /* Example sites showcase */
 .example-sites img {
-  max-width: 290px;
+  max-width: 100%;
 }
 .marketing-byline {
   margin: -18px 0 27px;
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 4b7efe53f..0252d75e9 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -118,8 +118,8 @@ $(function(){
 
   // fix sub nav playa
   var $win = $(window)
-    , $nav = $('.subhead .nav')
-    , navTop = $('.subhead .nav').offset().top - 40
+    , $nav = $('.subnav')
+    , navTop = $('.subnav').offset().top - 40
     , isFixed = 0
 
   processScroll()
diff --git a/docs/base-css.html b/docs/base-css.html
index bcb0c7d21..c849a299e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -63,13 +63,15 @@
 
      
   
      Base CSS
      
   
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
-  
+  
      
+    
+  
      
 
      
 
 
diff --git a/docs/components.html b/docs/components.html
index 9d28b9e06..50c615fb9 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -58,11 +58,12 @@
 
     
      
 
-  
-  
      
-    
      Components
      
-    
      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
      
+
+
      
+  
      Components
      
+  
      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
      
+  
      
     
-  
      
+  
      
+
 
 
 
-  
-  
      
-    
      
-      
      Button groups Join buttons for more toolbar-like functionality
      
-    
      
-    
      
-      
      
-        
      Button groups
      
-        
      Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.
      
-        
      You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.
      
-        
      
+
+
      
+  
      
+    
      Button groups Join buttons for more toolbar-like functionality
      
+  
      
+  
      
+    
      
+      
      Button groups
      
+      
      Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.
      
+      
      You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.
      
+      
      
+        
      
+          Left
+          Middle
+          Right
+        
      
+      
      
+      
      
+        
      
           
      
-            Left
-            Middle
-            Right
+            1
+            2
+            3
+            4
           
      
-        
      
-        
      
-          
      
-            
      
-              1
-              2
-              3
-              4
-            
      
-            
      
-              5
-              6
-              7
-            
      
-            
      
-              8
-            
      
+          
      
+            5
+            6
+            7
+          
      
+          
      
+            8
           
      
         
      
-
       
      
-      
      
-        
      Example markup
      
-        
      Here's how the HTML looks for a standard button group built with anchor tag buttons:
      
+
+    
      
+    
      
+      
      Example markup
      
+      
      Here's how the HTML looks for a standard button group built with anchor tag buttons:
      
 
       <div class="btn-group">
   <a class="btn" href="#">1</a>
@@ -134,95 +136,95 @@
   </div>
 </div>
 
      
-      
      
-      
      
-        
      Checkbox and radio flavors
      
-        
      Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the Javascript docs for that.
      
-        
      Get the javascript »
      
-        
      
-        
      Heads up
      
-        
      CSS for button groups is in a separate file, button-groups.less.
      
-      
      
     
      
-  
      
+    
      
+      
      Checkbox and radio flavors
      
+      
      Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the Javascript docs for that.
      
+      
      Get the javascript »
      
+      
      
+      
      Heads up
      
+      
      CSS for button groups is in a separate file, button-groups.less.
      
+    
      
+  
      
+
      
 
 
 
-  
-  
      
-    
      
-      
      Split button dropdowns Built on button groups to provide contextual menus
      
+
+
      
+  
      
+    
      Split button dropdowns Built on button groups to provide contextual menus
      
+  
      
+  
      
+    
      
+      
      Split button dropdowns
      
+      
      Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.
      
+      
      
+        
      
+          
      
+            Action
+            
+            
+          
      
+          
      
+            Action
+            
+            
+          
      
+          
      
+            Danger
+            
+            
+          
      
+        
      
+        
      
+          
      
+            Success
+            
+            
+          
      
+          
      
+            Info
+            
+            
+          
      
+        
      
+      
       
     
      
-    
      
-      
      
-        
      Split button dropdowns
      
-        
      Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.
      
-        
      
-          
      
-            
      
-              Action
-              
-              
-            
      
-            
      
-              Action
-              
-              
-            
      
-            
      
-              Danger
-              
-              
-            
      
-          
      
-          
      
-            
      
-              Success
-              
-              
-            
      
-            
      
-              Info
-              
-              
-            
      
-          
      
-        
       
-      
      
-      
      
-        
      Example markup
      
-        
      Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.
      
+    
      
+      
      Example markup
      
+      
      Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.
      
 
       <div class="btn-group">
   <a class="btn" href="#">Action</a>
@@ -234,9 +236,9 @@
   </ul>
 </div>
 
      
-      
      
     
      
-  
      
+  
      
+
      
 
 
 
@@ -528,11 +530,6 @@
 
   
      Tabbable in any direction
      
   
      
-
     
      
       
      Tabs on the bottom
      
       
      Flip the order of the HTML and add a class to put tabs on the bottom.
      
diff --git a/docs/javascript.html b/docs/javascript.html
index 472285cc9..396bf15bc 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -63,20 +63,22 @@
       
      
         
      Javascript for Bootstrap
      
         
      Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
-        
      
+        
      
+          
+        
      
       
      
 
 
diff --git a/docs/less.html b/docs/less.html
index c8c1540b5..86a65a6c7 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -67,12 +67,14 @@
       
      
         
      Using LESS with Bootstrap
      
         
      Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.
      
-        
+        
      
+          
+        
      
       
      
 
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 1fd8363ae..bb18b0394 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -63,11 +63,13 @@
       
      
         
      Scaffolding
      
         
      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
      
-        
+        
      
+          
+        
      
       
      
 
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 5552d6735..41722aa71 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -3,13 +3,15 @@
 
      
   
      {{_i}}Base CSS{{/i}}
      
   
      {{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}
      
-  
+  
      
+    
+  
      
 
      
 
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 5282e6178..36fc84281 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1,8 +1,9 @@
-  
-  
      
-    
      {{_i}}Components{{/i}}
      
-    
      {{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}
      
+
+
      
+  
      {{_i}}Components{{/i}}
      
+  
      {{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}
      
+  
      
     
-  
      
+  
      
+
 
 
 
-  
-  
      
-    
      
-      
      {{_i}}Button groups{{/i}} {{_i}}Join buttons for more toolbar-like functionality{{/i}}
      
-    
      
-    
      
-      
      
-        
      {{_i}}Button groups{{/i}}
      
-        
      {{_i}}Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.{{/i}}
      
-        
      {{_i}}You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.{{/i}}
      
-        
      
+
+
      
+  
      
+    
      {{_i}}Button groups{{/i}} {{_i}}Join buttons for more toolbar-like functionality{{/i}}
      
+  
      
+  
      
+    
      
+      
      {{_i}}Button groups{{/i}}
      
+      
      {{_i}}Use button groups to join multiple buttons together as one composite component. Build them with a series of <a> or <button> elements.{{/i}}
      
+      
      {{_i}}You can also combine sets of <div class="btn-group"> into a <div class="btn-toolbar"> for more complex projects.{{/i}}
      
+      
      
+        
      
+          {{_i}}Left{{/i}}
+          {{_i}}Middle{{/i}}
+          {{_i}}Right{{/i}}
+        
      
+      
      
+      
      
+        
      
           
      
-            {{_i}}Left{{/i}}
-            {{_i}}Middle{{/i}}
-            {{_i}}Right{{/i}}
+            1
+            2
+            3
+            4
           
      
-        
      
-        
      
-          
      
-            
      
-              1
-              2
-              3
-              4
-            
      
-            
      
-              5
-              6
-              7
-            
      
-            
      
-              8
-            
      
+          
      
+            5
+            6
+            7
+          
      
+          
      
+            8
           
      
         
      
-
       
      
-      
      
-        
      {{_i}}Example markup{{/i}}
      
-        
      {{_i}}Here's how the HTML looks for a standard button group built with anchor tag buttons:{{/i}}
      
+
+    
      
+    
      
+      
      {{_i}}Example markup{{/i}}
      
+      
      {{_i}}Here's how the HTML looks for a standard button group built with anchor tag buttons:{{/i}}
      
 
       <div class="btn-group">
   <a class="btn" href="#">1</a>
@@ -74,95 +76,95 @@
   </div>
 </div>
 
      
-      
      
-      
      
-        
      {{_i}}Checkbox and radio flavors{{/i}}
      
-        
      {{_i}}Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the Javascript docs for that.{{/i}}
      
-        
      {{_i}}Get the javascript »{{/i}}
      
-        
      
-        
      {{_i}}Heads up{{/i}}
      
-        
      {{_i}}CSS for button groups is in a separate file, button-groups.less.{{/i}}
      
-      
      
     
      
-  
      
+    
      
+      
      {{_i}}Checkbox and radio flavors{{/i}}
      
+      
      {{_i}}Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View the Javascript docs for that.{{/i}}
      
+      
      {{_i}}Get the javascript »{{/i}}
      
+      
      
+      
      {{_i}}Heads up{{/i}}
      
+      
      {{_i}}CSS for button groups is in a separate file, button-groups.less.{{/i}}
      
+    
      
+  
      
+
      
 
 
 
-  
-  
      
-    
      
-      
      {{_i}}Split button dropdowns{{/i}} {{_i}}Built on button groups to provide contextual menus{{/i}}
      
+
+
      
+  
      
+    
      {{_i}}Split button dropdowns{{/i}} {{_i}}Built on button groups to provide contextual menus{{/i}}
      
+  
      
+  
      
+    
      
+      
      {{_i}}Split button dropdowns{{/i}}
      
+      
      {{_i}}Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.{{/i}}
      
+      
      
+        
      
+          
      
+            {{_i}}Action{{/i}}
+            
+            
+          
      
+          
      
+            {{_i}}Action{{/i}}
+            
+            
+          
      
+          
      
+            {{_i}}Danger{{/i}}
+            
+            
+          
      
+        
      
+        
      
+          
      
+            {{_i}}Success{{/i}}
+            
+            
+          
      
+          
      
+            {{_i}}Info{{/i}}
+            
+            
+          
      
+        
      
+      
       
     
      
-    
      
-      
      
-        
      {{_i}}Split button dropdowns{{/i}}
      
-        
      {{_i}}Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.{{/i}}
      
-        
      
-          
      
-            
      
-              {{_i}}Action{{/i}}
-              
-              
-            
      
-            
      
-              {{_i}}Action{{/i}}
-              
-              
-            
      
-            
      
-              {{_i}}Danger{{/i}}
-              
-              
-            
      
-          
      
-          
      
-            
      
-              {{_i}}Success{{/i}}
-              
-              
-            
      
-            
      
-              {{_i}}Info{{/i}}
-              
-              
-            
      
-          
      
-        
       
-      
      
-      
      
-        
      {{_i}}Example markup{{/i}}
      
-        
      {{_i}}Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.{{/i}}
      
+    
      
+      
      {{_i}}Example markup{{/i}}
      
+      
      {{_i}}Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.{{/i}}
      
 
       <div class="btn-group">
   <a class="btn" href="#">{{_i}}Action{{/i}}</a>
@@ -174,9 +176,9 @@
   </ul>
 </div>
 
      
-      
      
     
      
-  
      
+  
      
+
      
 
 
 
@@ -468,11 +470,6 @@
 
   
      {{_i}}Tabbable in any direction{{/i}}
      
   
      
-
     
      
       
      {{_i}}Tabs on the bottom{{/i}}
      
       
      {{_i}}Flip the order of the HTML and add a class to put tabs on the bottom.{{/i}}
      
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 9fd431f2f..b6b16fef2 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -3,20 +3,22 @@
       
      
         
      {{_i}}Javascript for Bootstrap{{/i}}
      
         
      {{_i}}Bring Bootstrap's components to life—now with 12 custom jQuery plugins.{{/i}}
-        
      
+        
      
+          
+        
      
       
      
 
 
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index b5cff2d11..ea7058fd9 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -7,12 +7,14 @@
       
      
         
      {{_i}}Using LESS with Bootstrap{{/i}}
      
         
      {{_i}}Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}
      
-        
+        
      
+          
+        
      
       
      
 
 
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index a8638f273..ed80dabfc 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -3,11 +3,13 @@
       
      
         
      {{_i}}Scaffolding{{/i}}
      
         
      {{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}
      
-        
+        
      
+          
+        
      
       
      
 
 
-- 
cgit v1.2.3


From 4a6d9106b8f92a85a528971c70f132c32b6c43cf Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 19:36:42 -0800
Subject: fix the thumbnails more examples section

---
 bootstrap.css                            | 2 +-
 docs/assets/css/docs.css                 | 8 ++++++--
 docs/components.html                     | 2 +-
 docs/templates/pages/components.mustache | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 49f31bc1d..48f370d51 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Tue Jan 24 19:19:33 PST 2012
+ * Date: Tue Jan 24 19:36:20 PST 2012
  */
 article,
 aside,
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 776ca58b9..d0a5623f4 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -19,7 +19,7 @@ body {
 
 /* Tweak navbar brand link to be super sleek
 -------------------------------------------------- */
-body > .navbar-fixed .brand {
+.navbar-fixed .brand {
   padding-right: 0;
   padding-left: 0;
   margin-left: 20px;
@@ -27,8 +27,12 @@ body > .navbar-fixed .brand {
   font-weight: bold;
   color: #000;
   text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125);
+  -webkit-transition: all .2s linear;
+     -moz-transition: all .2s linear;
+          transition: all .2s linear;
+      
 }
-body > .navbar-fixed .brand:hover {
+.navbar-fixed .brand:hover {
   text-decoration: none;
 }
 
diff --git a/docs/components.html b/docs/components.html
index 50c615fb9..d823998d9 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1038,7 +1038,7 @@
       
        
         
      • 
           
-            
+            
           
         
        • 
         
      • 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 36fc84281..94d72a540 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -978,7 +978,7 @@
       
          
         
        • 
           
-            
+            
           
         
          • 
         
        • 
-- 
cgit v1.2.3


From bacb05608f2d42ef7fdb6fa25241d4268b989387 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 19:43:52 -0800
Subject: redo the form examples to enable better responsive layout

---
 docs/assets/css/docs.css               | 39 +++++++++++++++-------------------
 docs/base-css.html                     | 22 +++++++++++++------
 docs/templates/pages/base-css.mustache | 22 +++++++++++++------
 3 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index d0a5623f4..6cb8720c7 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -146,8 +146,6 @@ section {
      -moz-border-radius: 4px;
           border-radius: 4px;  
 }
-.subhead .nav {
-}
 .subhead .nav a {
   margin: 0;
   padding-top: 11px;
@@ -477,7 +475,7 @@ h2 + .row {
 
 /* Remove bottom margin on example forms in wells */
 form.well {
-  margin-bottom: 0;
+  padding: 14px;
 }
 
 /* Tighten up spacing */
@@ -558,6 +556,14 @@ form.well {
     margin-top: 18px;
   }
 
+  /* Subnav */
+  .subnav {
+    background: none;
+  }
+  .subnav .nav > li {
+    float: none;
+  }
+
   /* Adjust the jumbotron */
   .jumbotron h1,
   .jumbotron p {
@@ -580,25 +586,6 @@ form.well {
     margin: 0 auto 10px;
   }
 
-  /* Subnav */
-  .subhead .nav {
-    padding: 0;
-    background: none;
-  }
-  .subhead .nav > li {
-    float: none;
-  }
-  .subhead .nav li + li a {
-    border-top: 1px solid #eee;
-  }
-  .subhead .subnav-fixed {
-    position: static;
-    top: auto;
-    z-index: auto;
-    width: auto;
-  }
-
-
   /* Don't space out quick links so much */
   .quick-links {
     margin: 40px 0 0;
@@ -632,6 +619,14 @@ form.well {
 
 @media (max-width: 768px) {
 
+  /* Subnav */
+  .subnav-fixed {
+    position: static;
+    top: auto;
+    z-index: auto;
+    width: auto;
+  }
+
   /* Adjust the jumbotron */
   .jumbotron .benefits {
     position: relative;
diff --git a/docs/base-css.html b/docs/base-css.html
index c849a299e..27251d824 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -887,10 +887,12 @@
 
 
   
          Example forms using just form controls, no extra markup
          
+  
          Basic form
          
   
          
-    
          
-      
          Basic form
          
+    
          
       
          With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.
          
+    
          
+    
          
       
          
         
         
@@ -900,17 +902,25 @@
         
       
          
     
          
-    
          
-      
          Search form
          
+  
           
+  
          Search form
          
+  
          
+    
          
       
          Reflecting default WebKit styles, just add .form-search for extra rounded search fields.
          
+    
          
+    
          
       
          
         
         
       
          
     
          
-    
          
-      
          Inline form
          
+  
           
+  
          Inline form
          
+  
          
+    
          
       
          Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.
          
+    
          
+    
          
       
          
         
         
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 41722aa71..225e88d2b 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -827,10 +827,12 @@
 
 
   
          {{_i}}Example forms using just form controls, no extra markup{{/i}}
          
+  
          {{_i}}Basic form{{/i}}
          
   
          
-    
          
-      
          {{_i}}Basic form{{/i}}
          
+    
          
       
          {{_i}}With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.{{/i}}
          
+    
          
+    
          
       
         
         
@@ -840,17 +842,25 @@
         
       
     
          
-    
          
-      
          {{_i}}Search form{{/i}}
          
+  
           
+  
          {{_i}}Search form{{/i}}
          
+  
          
+    
          
       
          {{_i}}Reflecting default WebKit styles, just add .form-search for extra rounded search fields.{{/i}}
          
+    
          
+    
          
       
          
         
         
       
          
     
          
-    
          
-      
          {{_i}}Inline form{{/i}}
          
+  
           
+  
          {{_i}}Inline form{{/i}}
          
+  
          
+    
          
       
          {{_i}}Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.{{/i}}
          
+    
          
+    
          
       
          
         
         
-- 
cgit v1.2.3


From c6d5dcd872dcc3aa16a269cb5b4a434a8960f58c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 19:50:18 -0800
Subject: remove link from transitions on js page

---
 docs/javascript.html                     | 2 +-
 docs/templates/pages/javascript.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index 396bf15bc..cc9c0d9eb 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -162,7 +162,7 @@
         
          
         
          
           
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index b6b16fef2..401e86cbe 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -102,7 +102,7 @@
         
          
         
          
           
-- 
cgit v1.2.3


From 74b5dc8d3bd5ef34bb2cdc590b8a5dcbc43a8f4c Mon Sep 17 00:00:00 2001
From: Roberto Poo 
Date: Wed, 25 Jan 2012 02:06:50 -0200
Subject: Fixed typo

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index c849a299e..8d0ab86f9 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -368,7 +368,7 @@
       
         <pre class="prettyprint">
         
-          
          Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
          
+          
          Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
          
 
          <div>
   <h1>Heading</h1>
   <p>Something right here…</p>
-- 
cgit v1.2.3


From 731821b78f059f78800baa721410341f786698b5 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 20:26:54 -0800
Subject: updated docs css to fix subnav on iOS

---
 docs/assets/css/docs.css | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 6cb8720c7..5fc04b0f9 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -146,7 +146,10 @@ section {
      -moz-border-radius: 4px;
           border-radius: 4px;  
 }
-.subhead .nav a {
+.subnav .nav {
+  margin-bottom: 0;
+}
+.subnav .nav a {
   margin: 0;
   padding-top: 11px;
   padding-bottom: 11px;
@@ -158,24 +161,25 @@ section {
      -moz-border-radius: 0;
           border-radius: 0;
 }
-.subhead .nav a:hover,
-.subhead .nav .active a {
+.subnav .nav a:hover,
+.subnav .nav .active a {
   background-color: transparent;
   color: #333;
 }
-.subhead .nav .active a {
+.subnav .nav .active a {
   background-color: #eee;
 }
-.subhead .nav li:first-child a {
+.subnav .nav li:first-child a {
   border-left: 0;
   -webkit-border-radius: 4px 0 0 4px;
      -moz-border-radius: 4px 0 0 4px;
           border-radius: 4px 0 0 4px;
 }
-.subhead .nav li:last-child a {
+.subnav .nav li:last-child a {
   border-right: 0;
 }
 
+/* Fixed subnav on scroll */
 .subnav-fixed {
   position: fixed;
   top: 40px;
@@ -558,7 +562,7 @@ form.well {
 
   /* Subnav */
   .subnav {
-    background: none;
+    background: #fff; /* whole background property since we use a background-image for gradient */
   }
   .subnav .nav > li {
     float: none;
@@ -620,11 +624,21 @@ form.well {
 @media (max-width: 768px) {
 
   /* Subnav */
-  .subnav-fixed {
+  .subnav {
     position: static;
     top: auto;
     z-index: auto;
     width: auto;
+    height: auto;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+  }
+  .subnav .nav a {
+    border: 0;
+  }
+  .subnav .nav li + li a {
+    border-top: 1px solid #e5e5e5;
   }
 
   /* Adjust the jumbotron */
-- 
cgit v1.2.3


From a03fbc18cb50c7735b80e3ced6a6ebbe2ea05d2b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 20:30:26 -0800
Subject: allow for text in progress bars

---
 bootstrap.css          | 6 +++++-
 bootstrap.min.css      | 2 +-
 lib/progress-bars.less | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 48f370d51..3de652f55 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Tue Jan 24 19:36:20 PST 2012
+ * Date: Tue Jan 24 20:30:11 PST 2012
  */
 article,
 aside,
@@ -2772,6 +2772,10 @@ a.thumbnail:hover {
 .progress .bar {
   width: 0%;
   height: 18px;
+  color: #fff;
+  font-size: 12px;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   background-color: #0480be;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));
   background-image: -moz-linear-gradient(top, #149bdf, #0480be);
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 51d362fa8..9b3bdc74b 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -505,7 +505,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .label.notice{background-color:#62cffc;}
 @-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .progress{height:18px;margin-bottom:18px;background-color:#f9f9f9;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9));background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
-.progress .bar{width:0%;height:18px;background-color:#0480be;background-image:-khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+.progress .bar{width:0%;height:18px;color:#fff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0480be;background-image:-khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
 .progress.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
 .progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
 .progress.danger .bar{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
diff --git a/lib/progress-bars.less b/lib/progress-bars.less
index e8557a99e..c1a3f9792 100644
--- a/lib/progress-bars.less
+++ b/lib/progress-bars.less
@@ -46,6 +46,10 @@
 .progress .bar {
   width: 0%;
   height: 18px;
+  color: #fff;
+  font-size: 12px;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   #gradient > .vertical(#149bdf, #0480be);
   .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
   .box-sizing(border-box);
-- 
cgit v1.2.3


From a5c1d1f1828c333e373cdc5da5da2f6d946ad45e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 20:45:38 -0800
Subject: adding actual images to carousel to ensure you can see things are
 animating; updated styles of carousel controls to work on light and dark
 backgrounds and use opacity for effects

---
 bootstrap.css                               |  27 ++++++++++++++++++---------
 bootstrap.min.css                           |   4 ++--
 docs/assets/img/bootstrap-mdo-sfmoma-01.jpg | Bin 0 -> 59871 bytes
 docs/assets/img/bootstrap-mdo-sfmoma-02.jpg | Bin 0 -> 93456 bytes
 docs/assets/img/bootstrap-mdo-sfmoma-03.jpg | Bin 0 -> 125720 bytes
 docs/base-css.html                          |   2 +-
 docs/javascript.html                        |   6 +++---
 docs/templates/pages/javascript.mustache    |   6 +++---
 lib/carousel.less                           |  13 +++++++------
 9 files changed, 34 insertions(+), 24 deletions(-)
 create mode 100644 docs/assets/img/bootstrap-mdo-sfmoma-01.jpg
 create mode 100644 docs/assets/img/bootstrap-mdo-sfmoma-02.jpg
 create mode 100644 docs/assets/img/bootstrap-mdo-sfmoma-03.jpg

diff --git a/bootstrap.css b/bootstrap.css
index 3de652f55..62690e42f 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Tue Jan 24 20:30:11 PST 2012
+ * Date: Tue Jan 24 20:44:12 PST 2012
  */
 article,
 aside,
@@ -2953,13 +2953,21 @@ a.thumbnail:hover {
   font-size: 60px;
   font-weight: 100;
   line-height: 30px;
-  color: #ccc;
+  color: #fff;
   text-align: center;
-  background: #999999;
-  background: rgba(0, 0, 0, 0.5);
-  -webkit-border-radius: 20px;
-  -moz-border-radius: 20px;
-  border-radius: 20px;
+  background: #222222;
+  border: 3px solid #fff;
+  -webkit-border-radius: 23px;
+  -moz-border-radius: 23px;
+  border-radius: 23px;
+  filter: alpha(opacity=50);
+  -moz-opacity: 0.5;
+  opacity: 0.5;
+  -webkit-transition: all 0.2s linear;
+  -moz-transition: all 0.2s linear;
+  -ms-transition: all 0.2s linear;
+  -o-transition: all 0.2s linear;
+  transition: all 0.2s linear;
 }
 .carousel-control.right {
   left: auto;
@@ -2968,8 +2976,9 @@ a.thumbnail:hover {
 .carousel-control:hover {
   color: #ffffff;
   text-decoration: none;
-  background: #333333;
-  background: rgba(0, 0, 0, 0.75);
+  filter: alpha(opacity=90);
+  -moz-opacity: 0.9;
+  opacity: 0.9;
 }
 .carousel-caption {
   position: absolute;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 9b3bdc74b..15d4f2361 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -530,8 +530,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .carousel .next.left,.carousel .prev.right{left:0;}
 .carousel .active.left{left:-100%;}
 .carousel .active.right{left:100%;}
-.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ccc;text-align:center;background:#999999;background:rgba(0, 0, 0, 0.5);-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px;}.carousel-control.right{left:auto;right:15px;}
-.carousel-control:hover{color:#ffffff;text-decoration:none;background:#333333;background:rgba(0, 0, 0, 0.75);}
+.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;filter:alpha(opacity=50);-moz-opacity:0.5;opacity:0.5;-webkit-transition:all 0.2s linear;-moz-transition:all 0.2s linear;-ms-transition:all 0.2s linear;-o-transition:all 0.2s linear;transition:all 0.2s linear;}.carousel-control.right{left:auto;right:15px;}
+.carousel-control:hover{color:#ffffff;text-decoration:none;filter:alpha(opacity=90);-moz-opacity:0.9;opacity:0.9;}
 .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
 .carousel-caption h4,.carousel-caption p{color:#ffffff;}
 .pull-right{float:right;}
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg
new file mode 100644
index 000000000..a5c7bb900
Binary files /dev/null and b/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg differ
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg
new file mode 100644
index 000000000..2f795e18f
Binary files /dev/null and b/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg differ
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg
new file mode 100644
index 000000000..911e64f89
Binary files /dev/null and b/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 6847c0616..27251d824 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -368,7 +368,7 @@
       
         <pre class="prettyprint">
         
-          
          Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
          
+          
          Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.
          
 
          <div>
   <h1>Heading</h1>
   <p>Something right here…</p>
diff --git a/docs/javascript.html b/docs/javascript.html
index cc9c0d9eb..425d347cb 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1215,21 +1215,21 @@ $('#myCollapsible').on('hidden', function () {
           
          
 
          Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.
          
 
     
          What’s included
          
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 1be32c676..5c480f704 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -135,6 +135,12 @@
       
        • Pills now have dropdown menu support (they share the same markup and styles as tabs)
          • 
     
        
   
        • 
+  
      • Update Less.js
+    
          
+      
        • Make sure to use to the current release of less.js 
          • 
+    
        
+  
        • 
+      
 
      
 
-      
      
-        
      Using LESS with Bootstrap
      
-        
      Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.
      
-        
      
-          
-        
      
-      
      
+
+
      
+  
      Using LESS with Bootstrap
      
+  
      Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.
      
+  
      
+    
+  
      
+
      
 
 
 
-      
-      
      
-        
      
-          
      Built with LESS
      
-        
      
-        
      
-          
      
-            
      Why LESS?
      
-            
      Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
      
-          
      
-          
      
-            
      What's included?
      
-            
      As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.
      
-          
      
-          
      
-            
      Learn more
      
-            LESS CSS
-            
      Visit the official website at http://lesscss.org to learn more.
      
-          
      
-        
      
-        
      
-          
      
-            
      Variables
      
-            
      Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.
      
-          
      
-          
      
-            
      Mixins
      
-            
      Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.
      
-          
      
-          
      
-            
      Operations
      
-            
      Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.
      
+
+
      
+  
      
+    
      Chop Shop Customize your build of Bootstrap
      
+  
      
+
+  
+    
      
+      
+      
      
+        
      
+          
      
+            
      
+              
      Scaffolding
      
+              
+              
+              
+              
      Base CSS
      
+              
+              
+              
+              
+              
+              
+              
+            
      
+            
      
+              
      Components
      
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+            
      
+            
      
+              
      JS Components
      
+              
+              
+              
+              
+              
+              
+              
+            
      
+            
      
+              
      Responsive
      
+              
+              
+              
+              
      Miscellaneous
      
+              
+              
+              
+              
+            
      
           
      
-        
      
-      
      
+          
      
+            Reset variables
+            Next: Customize variables
+          
              
+        
      
+        
      
+          
      
+            
      
+              
      Links
      
+              
+              
+              
+              
+              
      Grid system
      
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+            
      
+            
      
+              
      Typography
      
+              
+              
+              
+              
+              
+              
+              
      Forms
      
+              
+              
+              
+              
+              
      Navbar
      
+              
+              
+              
+              
+              
+              
+            
      
+            
      
+              
      Form states & alerts
      
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+            
      
+          
      
+          
      
+            Next: Build and download
+          
              
+        
      
+        
      
+          
      And you're set!
      
+          
      We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.
      
+          Download CSS Download minified CSS
+          
      
+          
      Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.
      
+        
      
+      
      
+    
      
+  
 
+
 
 
-      
-      
      
-        
      
-          
      Variables from variables.less
      
-        
      
 
-        
      Hyperlinks
      
-        
-          
-            
-              
-              
-              
-            
-          
-          
-            
-              
-              
-              
-            
-            
-              
-              
-              
-            
-          
-        
      VariableValueUsage
      @linkColor#08cDefault link text color
      @linkColorHoverdarken(@linkColor, 15%)Default link text hover color
      
-
-        
      
-          
      
-            
      Grayscale colors
      
-            
-              
-                
-                  
-                  
-                
-              
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      VariableValue
      @black#000
      @grayDarker#222
      @grayDark#333
      @gray#555
      @grayLight#999
      @grayLighter#eee
      @white#fff
      
-          
      
-          
      
-            
      Accent colors
      
-            
-              
-                
-                  
-                  
-                
-              
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      VariableValue
      @blue#049cdb
      @green#46a546
      @red#9d261d
      @yellow#ffc40d
      @orange#f89406
      @pink#c3325f
      @purple#7a43b6
      
-          
      
-        
       
-        
      
-          
      
-            
      Grid system
      
-            
-              
-                
-                  
-                  
-                
-              
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      VariableValue
      @gridColumns12
      @gridColumnWidth60px
      @gridGutterWidth20px
      @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
      
-          
      
-          
      
-            
      Typography
      
-            
-              
-                
-                  
-                  
-                
-              
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      VariableValue
      @baseFontSize13px
      @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
      @baseLineHeight18px
      
-          
      
-        
       
-
-        
      Components
      
-        
      
-          
      
-            
      Buttons
      
-            
-              
-                
-                  
-                  
-                
-              
-            
      @primaryButtonColor@blue
      
-            
      Forms
      
-            
-              
-                
-                  
-                  
-                
-              
-            
      @placeholderText@grayLight
      
-            
      Navbar
      
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      @navbarHeight40px
      @navbarBackground@grayDarker
      @navbarBackgroundHighlight@grayDark
      
-          
      
-          
      
-            
      Form states and alerts
      
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      @warningText#f3edd2
      @warningBackground#c09853
      @warningBorder#f3edd2
      @errorText#b94a48
      @errorBackground#f2dede
      @errorBorder#e9c7c7
      @successText#468847
      @successBackground#dff0d8
      @successBorder#cfe8c4
      @infoText#3a87ad
      @infoBackground#d9edf7
      @infoBorder#bfe1f2
      
-          
      
-        
      
+
+
      
+  
      
+    
      Built with LESS
      
+  
      
+  
      
+    
      
+      
      Why LESS?
      
+      
      Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
      
+    
      
+    
      
+      
      What's included?
      
+      
      As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.
      
+    
      
+    
      
+      
      Learn more
      
+      LESS CSS
+      
      Visit the official website at http://lesscss.org to learn more.
      
+    
      
+  
      
+  
      
+    
      
+      
      Variables
      
+      
      Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.
      
+    
      
+    
      
+      
      Mixins
      
+      
      Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.
      
+    
      
+    
      
+      
      Operations
      
+      
      Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.
      
+    
      
+  
      
+
      
 
-      
      
 
 
+
+
      
+  
      
+    
      Variables from variables.less
      
+  
      
 
-      
-      
      
-        
      Mixins from mixins.less
      
-      
      
+  
      Hyperlinks
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      VariableValueUsage
      @linkColor#08cDefault link text color
      @linkColorHoverdarken(@linkColor, 15%)Default link text hover color
      
+
+  
      
+    
      
+      
      Grayscale colors
      
+      
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      VariableValue
      @black#000
      @grayDarker#222
      @grayDark#333
      @gray#555
      @grayLight#999
      @grayLighter#eee
      @white#fff
      
+    
      
+    
      
+      
      Accent colors
      
+      
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      VariableValue
      @blue#049cdb
      @green#46a546
      @red#9d261d
      @yellow#ffc40d
      @orange#f89406
      @pink#c3325f
      @purple#7a43b6
      
+    
      
+  
       
+  
      
+    
      
+      
      Grid system
      
+      
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      VariableValue
      @gridColumns12
      @gridColumnWidth60px
      @gridGutterWidth20px
      @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
      
+    
      
+    
      
+      
      Typography
      
+      
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+          
+            
+            
+            
+          
+          
+            
+            
+          
+        
+      
      VariableValue
      @baseFontSize13px
      @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
      @baseLineHeight18px
      
+    
      
+  
       
+
+  
      Components
      
+  
      
+    
      
+      
      Buttons
      
+      
+        
+          
+            
+            
+          
+        
+      
      @primaryButtonColor@blue
      
+      
      Forms
      
+      
+        
+          
+            
+            
+          
+        
+      
      @placeholderText@grayLight
      
+      
      Navbar
      
+      
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      @navbarHeight40px
      @navbarBackground@grayDarker
      @navbarBackgroundHighlight@grayDark
      
+    
      
+    
      
+      
      Form states and alerts
      
+      
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      @warningText#f3edd2
      @warningBackground#c09853
      @warningBorder#f3edd2
      @errorText#b94a48
      @errorBackground#f2dede
      @errorBorder#e9c7c7
      @successText#468847
      @successBackground#dff0d8
      @successBorder#cfe8c4
      @infoText#3a87ad
      @infoBackground#d9edf7
      @infoBorder#bfe1f2
      
+    
      
+  
      
 
+
      
 
 
-      
-      
      
-        
      Operations
      
-      
      
 
+
+
      
+  
      Mixins from mixins.less
      
+
      
 
 
-      
-      
      
-        
      Compiling LESS and Bootstrap
      
-      
      
+
+
+
      
+  
      Operations
      
+
      
+
+
+
+
+
      
+  
      Compiling LESS and Bootstrap
      
+
      
 
 
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 225e88d2b..ba864ce9e 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -308,7 +308,7 @@
       
         <pre class="prettyprint">
         
-          
      {{_i}}Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.{{/i}}
      
+          
      {{_i}}Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.{{/i}}
      
 
      <div>
   <h1>{{_i}}Heading{{/i}}</h1>
   <p>{{_i}}Something right here…{{/i}}</p>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index ea7058fd9..ecb39055b 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -1,356 +1,517 @@
-      
      
-        Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
-      
      
-
-      
-      
      
-        
      {{_i}}Using LESS with Bootstrap{{/i}}
      
-        
      {{_i}}Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}
      
-        
      
-          
-        
      
-      
      
-
-
-
-      
-      
      
-        
      
-          
      {{_i}}Built with LESS{{/i}}
      
-        
      
-        
      
-          
      
-            
      {{_i}}Why LESS?{{/i}}
      
-            
      {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}
      
-          
      
-          
      
-            
      {{_i}}What's included?{{/i}}
      
-            
      {{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}
      
-          
      
-          
      
-            
      {{_i}}Learn more{{/i}}
      
-            LESS CSS
-            
      {{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}
      
-          
      
-        
      
-        
      
-          
      
-            
      {{_i}}Variables{{/i}}
      
-            
      {{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}
      
-          
      
-          
      
-            
      {{_i}}Mixins{{/i}}
      
-            
      {{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}
      
-          
      
-          
      
-            
      {{_i}}Operations{{/i}}
      
-            
      {{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}
      
-          
      
-        
      
-      
      
-
-
-
-      
-      
      
-        
      
-          
      {{_i}}Variables from variables.less{{/i}}
      
-        
      
-
-        
      {{_i}}Hyperlinks{{/i}}
      
-        
-          
-            
-              
-              
-              
-            
-          
-          
-            
-              
-              
-              
-            
-            
-              
-              
-              
-            
-          
-        
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
      @linkColor#08c{{_i}}Default link text color{{/i}}
      @linkColorHoverdarken(@linkColor, 15%){{_i}}Default link text hover color{{/i}}
      
-
-        
      
-          
      
-            
      {{_i}}Grayscale colors{{/i}}
      
-            
-              
-                
-                  
-                  
-                
-              
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @black#000
      @grayDarker#222
      @grayDark#333
      @gray#555
      @grayLight#999
      @grayLighter#eee
      @white#fff
      
-          
      
-          
      
-            
      {{_i}}Accent colors{{/i}}
      
-            
-              
-                
-                  
-                  
-                
-              
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @blue#049cdb
      @green#46a546
      @red#9d261d
      @yellow#ffc40d
      @orange#f89406
      @pink#c3325f
      @purple#7a43b6
      
-          
      
-        
       
-        
      
-          
      
-            
      {{_i}}Grid system{{/i}}
      
-            
-              
-                
-                  
-                  
-                
-              
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @gridColumns12
      @gridColumnWidth60px
      @gridGutterWidth20px
      @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
      
-          
      
-          
      
-            
      {{_i}}Typography{{/i}}
      
-            
-              
-                
-                  
-                  
-                
-              
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @baseFontSize13px
      @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
      @baseLineHeight18px
      
-          
      
-        
       
-
-        
      {{_i}}Components{{/i}}
      
-        
      
-          
      
-            
      Buttons
      
-            
-              
-                
-                  
-                  
-                
-              
-            
      @primaryButtonColor@blue
      
-            
      Forms
      
-            
-              
-                
-                  
-                  
-                
-              
-            
      @placeholderText@grayLight
      
-            
      Navbar
      
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      @navbarHeight40px
      @navbarBackground@grayDarker
      @navbarBackgroundHighlight@grayDark
      
-          
      
-          
      
-            
      Form states and alerts
      
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
      @warningText#f3edd2
      @warningBackground#c09853
      @warningBorder#f3edd2
      @errorText#b94a48
      @errorBackground#f2dede
      @errorBorder#e9c7c7
      @successText#468847
      @successBackground#dff0d8
      @successBorder#cfe8c4
      @infoText#3a87ad
      @infoBackground#d9edf7
      @infoBorder#bfe1f2
      
+
      
+  Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
+
      
+
+
+
      
+  
      {{_i}}Using LESS with Bootstrap{{/i}}
      
+  
      {{_i}}Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}
      
+  
      
+    
+  
      
+
      
+
+
+
+
+
      
+  
      
+    
      Chop Shop Customize your build of Bootstrap
      
+  
      
+
+  
      
+    
      
+      
+      
      
+        
      
+          
      
+            
      
+              
      Scaffolding
      
+              
+              
+              
+              
      Base CSS
      
+              
+              
+              
+              
+              
+              
+              
+            
      
+            
      
+              
      Components
      
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+            
      
+            
      
+              
      JS Components
      
+              
+              
+              
+              
+              
+              
+              
+            
      
+            
      
+              
      Responsive
      
+              
+              
+              
+              
      Miscellaneous
      
+              
+              
+              
+              
+            
      
           
      
-        
      
+          
      
+            Reset variables
+            Next: Customize variables
+          
              
+        
      
+        
      
+          
      
+            
      
+              
      Links
      
+              
+              
+              
+              
+              
      Grid system
      
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+            
      
+            
      
+              
      Typography
      
+              
+              
+              
+              
+              
+              
+              
      Forms
      
+              
+              
+              
+              
+              
      Navbar
      
+              
+              
+              
+              
+              
+              
+            
      
+            
      
+              
      Form states & alerts
      
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+            
      
+          
      
+          
      
+            Next: Build and download
+          
              
+        
      
+        
      
+          
      And you're set!
      
+          
      We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.
      
+          Download CSS Download minified CSS
+          
      
+          
      Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.
      
+        
      
+      
      
+    
      
+  
+
+
      
+
+
+
+
+
      
+  
      
+    
      {{_i}}Built with LESS{{/i}}
      
+  
      
+  
      
+    
      
+      
      {{_i}}Why LESS?{{/i}}
      
+      
      {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}
      
+    
      
+    
      
+      
      {{_i}}What's included?{{/i}}
      
+      
      {{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}
      
+    
      
+    
      
+      
      {{_i}}Learn more{{/i}}
      
+      LESS CSS
+      
      {{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}
      
+    
      
+  
      
+  
      
+    
      
+      
      {{_i}}Variables{{/i}}
      
+      
      {{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}
      
+    
      
+    
      
+      
      {{_i}}Mixins{{/i}}
      
+      
      {{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}
      
+    
      
+    
      
+      
      {{_i}}Operations{{/i}}
      
+      
      {{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}
      
+    
      
+  
      
+
      
 
-      
 
 
+
+
      
+  
      
+    
      {{_i}}Variables from variables.less{{/i}}
      
+  
      
 
-      
-      
      
-        
      {{_i}}Mixins from mixins.less{{/i}}
      
-      
      
+  
      {{_i}}Hyperlinks{{/i}}
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
      @linkColor#08c{{_i}}Default link text color{{/i}}
      @linkColorHoverdarken(@linkColor, 15%){{_i}}Default link text hover color{{/i}}
      
+
+  
      
+    
      
+      
      {{_i}}Grayscale colors{{/i}}
      
+      
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @black#000
      @grayDarker#222
      @grayDark#333
      @gray#555
      @grayLight#999
      @grayLighter#eee
      @white#fff
      
+    
      
+    
      
+      
      {{_i}}Accent colors{{/i}}
      
+      
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @blue#049cdb
      @green#46a546
      @red#9d261d
      @yellow#ffc40d
      @orange#f89406
      @pink#c3325f
      @purple#7a43b6
      
+    
      
+  
       
+  
      
+    
      
+      
      {{_i}}Grid system{{/i}}
      
+      
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @gridColumns12
      @gridColumnWidth60px
      @gridGutterWidth20px
      @siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
      
+    
      
+    
      
+      
      {{_i}}Typography{{/i}}
      
+      
+        
+          
+            
+            
+          
+        
+        
+          
+            
+            
+          
+          
+            
+            
+            
+          
+          
+            
+            
+          
+        
+      
      {{_i}}Variable{{/i}}{{_i}}Value{{/i}}
      @baseFontSize13px
      @baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
      @baseLineHeight18px
      
+    
      
+  
       
+
+  
      {{_i}}Components{{/i}}
      
+  
      
+    
      
+      
      Buttons
      
+      
+        
+          
+            
+            
+          
+        
+      
      @primaryButtonColor@blue
      
+      
      Forms
      
+      
+        
+          
+            
+            
+          
+        
+      
      @placeholderText@grayLight
      
+      
      Navbar
      
+      
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      @navbarHeight40px
      @navbarBackground@grayDarker
      @navbarBackgroundHighlight@grayDark
      
+    
      
+    
      
+      
      Form states and alerts
      
+      
+        
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+            
+            
+          
+        
+      
      @warningText#f3edd2
      @warningBackground#c09853
      @warningBorder#f3edd2
      @errorText#b94a48
      @errorBackground#f2dede
      @errorBorder#e9c7c7
      @successText#468847
      @successBackground#dff0d8
      @successBorder#cfe8c4
      @infoText#3a87ad
      @infoBackground#d9edf7
      @infoBorder#bfe1f2
      
+    
      
+  
      
+
+
      
+
+
+
+
+
      
+  
      {{_i}}Mixins from mixins.less{{/i}}
      
+
      
 
 
 
-      
-      
      
-        
      {{_i}}Operations{{/i}}
      
-      
      
+
+
      
+  
      {{_i}}Operations{{/i}}
      
+
      
 
 
 
-      
-      
      
-        
      {{_i}}Compiling LESS and Bootstrap{{/i}}
      
-      
      
+
+
      
+  
      {{_i}}Compiling LESS and Bootstrap{{/i}}
      
+
      
 
 
 
diff --git a/lib/forms.less b/lib/forms.less
index 2b24fb2f0..e35b23da0 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -297,15 +297,15 @@ textarea[readonly] {
 }
 // Warning
 .control-group.warning {
-  .formFieldState(@warningText, @warningBorder, @warningBackground);
+  .formFieldState(@warningText, @warningText, @warningBackground);
 }
 // Error
 .control-group.error {
-  .formFieldState(@errorText, @errorBorder, @errorBackground);
+  .formFieldState(@errorText, @errorText, @errorBackground);
 }
 // Success
 .control-group.success {
-  .formFieldState(@successText, @successBorder, @successBackground);
+  .formFieldState(@successText, @successText, @successBackground);
 }
 
 // HTML5 invalid states
diff --git a/lib/type.less b/lib/type.less
index 211111761..548c222f1 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -16,6 +16,12 @@ p {
     color: @grayLight;
   }
 }
+.lead {
+  margin-bottom: @baseLineHeight;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: @baseLineHeight * 1.5;
+}
 
 // HEADINGS
 // --------
@@ -202,7 +208,6 @@ pre {
 }
 code {
   padding: 3px 4px;
-  background-color: lighten(@orange, 40%);
   color: #d14;
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
-- 
cgit v1.2.3


From ae70d2a8b6db76d0b3a2a2ef4540a270f0f5c257 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 23:44:59 -0800
Subject: refine spacing on fixed subnav

---
 docs/assets/css/docs.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index d9f8e438b..8c30e733d 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -197,8 +197,9 @@ section {
             box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
   }
   .subnav-fixed .nav {
-    width: 940px;
+    width: 938px;
     margin: 0 auto;
+    padding: 0 1px;
   }
 }
 
-- 
cgit v1.2.3


From b0fb31be5eff9cc4d7a1b2aab70643ff4fc82618 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 24 Jan 2012 23:45:48 -0800
Subject: fix js link on chop shop

---
 docs/less.html                     | 2 +-
 docs/templates/pages/less.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/less.html b/docs/less.html
index e5e3baa66..55138c71a 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -230,7 +230,7 @@
           
      We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.
      
           Download CSS Download minified CSS
           
      
-          
      Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.
      
+          
      Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.
      
         
      
       
      
     
      
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index ecb39055b..2633abdf3 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -170,7 +170,7 @@
           
      We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.
      
           Download CSS Download minified CSS
           
      
-          
      Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.
      
+          
      Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.
      
         
      
       
      
     
      
-- 
cgit v1.2.3


From 64f85e037102425062a43ba17b9d5b1f4c4acba7 Mon Sep 17 00:00:00 2001
From: Jason Wieland 
Date: Wed, 25 Jan 2012 00:02:37 -0800
Subject: caught another old reference to 1.1.3

---
 docs/templates/pages/less.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index ea7058fd9..ff52970b2 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -371,7 +371,7 @@
     
      {{_i}}Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.{{/i}}
      
 
       <link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
-<script src="js/less-1.1.3.min.js"></script>
      
+<script src="js/less-1.2.1.min.js"></script>
 
      {{_i}}Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.{{/i}}
      
 
     
      {{_i}}What’s included{{/i}}
      
-- 
cgit v1.2.3


From b8fa6cfacf61a02ab769b9031253c7b06111fa7c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 01:22:29 -0800
Subject: move css builder and downloader to dedicated page, start to update
 remaining sections on LESS docs page

---
 bootstrap.css                                    |  14 +-
 bootstrap.min.css                                |   4 +-
 docs/assets/css/docs.css                         |  94 +++---
 docs/assets/js/google-code-prettify/prettify.css |   4 -
 docs/base-css.html                               |  13 +-
 docs/components.html                             |  21 +-
 docs/download.html                               | 312 ++++++++++++++++++++
 docs/index.html                                  |   3 +
 docs/javascript.html                             |  27 +-
 docs/less.html                                   | 361 ++++-------------------
 docs/scaffolding.html                            |   9 +-
 docs/templates/layout.mustache                   |   3 +
 docs/templates/pages/base-css.mustache           |  10 +-
 docs/templates/pages/components.mustache         |  18 +-
 docs/templates/pages/download.mustache           | 216 ++++++++++++++
 docs/templates/pages/javascript.mustache         |  24 +-
 docs/templates/pages/less.mustache               | 359 ++++------------------
 docs/templates/pages/scaffolding.mustache        |   6 +-
 docs/upgrading.html                              |   3 +
 lib/forms.less                                   |   4 +-
 20 files changed, 783 insertions(+), 722 deletions(-)
 create mode 100644 docs/download.html
 create mode 100644 docs/templates/pages/download.mustache

diff --git a/bootstrap.css b/bootstrap.css
index 33be3d966..3b04dc30e 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Tue Jan 24 23:35:08 PST 2012
+ * Date: Wed Jan 25 01:02:35 PST 2012
  */
 article,
 aside,
@@ -577,9 +577,9 @@ textarea {
   margin-left: 10px;
 }
 input, textarea {
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
   -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
   -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
@@ -588,9 +588,9 @@ input, textarea {
 }
 input:focus, textarea:focus {
   border-color: rgba(82, 168, 236, 0.8);
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   outline: 0;
 }
 input[type=file]:focus, input[type=checkbox]:focus, select:focus {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 3c2b70663..4cbd23502 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -108,8 +108,8 @@ textarea{height:auto;}
 .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;}
 .radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;}
 .radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
-input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
-input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
+input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
+input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
 input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;}
 .input-mini{width:60px;}
 .input-small{width:90px;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 8c30e733d..12c534fb2 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -442,68 +442,78 @@ section {
 }
 
 
-/* CSS Chop Shop
+/* Download page
 -------------------------------------------------- */
-.builder {
+.download .page-header {
+  margin-top: 36px;
 }
-.builder .span2 {
-  width: 160px;
-}
-.builder ul {
-  margin: 0;
-  list-style: none;
-}
-.builder .tabs {
-  margin-right: 0;
-}
-.builder .tabs a {
-  width: 160px;
-  padding: 14px;
-  font-size: 14px;
-}
-.builder .tab-content {
-  padding: 19px;
-  margin-left: 189px;
-  border: 1px solid #e5e5e5;
-  -webkit-border-radius: 0 4px 4px 4px;
-     -moz-border-radius: 0 4px 4px 4px;
-          border-radius: 0 4px 4px 4px;
+.page-header .toggle-all {
+  margin-top: 13px;
 }
 
 /* Space out h3s when following a section */
-.builder input + h3,
-.builder .checkbox + h3 {
+.download h3 {
+  margin-bottom: 5px;
+}
+.download-builder input + h3,
+.download-builder .checkbox + h3 {
   margin-top: 9px;
 }
 
 /* Fields for variables */
-.builder input + h3 {
-  margin-top: 9px;
-}
-.builder #variables label {
-  margin-bottom: 2px;
-  color: #555;
-}
-.builder input[type=text] {
+.download-builder input[type=text] {
   margin-bottom: 9px;
   font-family: Menlo, Monaco, "Courier New", monospace;
   font-size: 12px;
   color: #d14;
   background-color: #f7f7f9;
 }
-.builder input[type=text]:focus {
+.download-builder input[type=text]:focus {
   background-color: #fff;
 }
 
+/* Custom, larger checkbox labels */
+.download .checkbox {
+  padding: 6px 10px 6px 25px;
+  font-size: 14px;
+  color: #555;
+  background-color: #f9f9f9;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+  cursor: pointer;
+}
+.download .checkbox:hover {
+  color: #333;
+  background-color: #f5f5f5;
+}
+.download .checkbox input[type=checkbox] {
+  position: relative;
+  top: 1px;
+}
+.download .checkbox small {
+  font-size: 12px;
+  color: #777;
+}
 
-.builder-actions {
-  margin-top: 18px;
-  padding-top: 18px;
-  border-top: 1px solid #eee;
+/* Giant download button */
+.download-btn {
+  pading: 18px 20px;
+  margin: 45px 0;
+  text-align: center;
+  border: 1px solid #eee;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
 }
-.builder-actions .toggle-all {
-  float: right;
-  line-height: 36px;
+.btn.xlarge {
+  margin: 36px auto;
+  padding: 14px 24px;
+  font-size: 30px;
+  text-align: center;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
 }
 
 
diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css
index 0d54905fb..aedd8d1a9 100644
--- a/docs/assets/js/google-code-prettify/prettify.css
+++ b/docs/assets/js/google-code-prettify/prettify.css
@@ -27,8 +27,4 @@ ol.linenums li {
   color: #bebec5;
   line-height: 18px;
   text-shadow: 0 1px 0 #fff;
-}
-/* Alternate shading for lines */
-li.L1, li.L3, li.L5, li.L7, li.L9 {
-  
 }
\ No newline at end of file
diff --git a/docs/base-css.html b/docs/base-css.html
index 6847c0616..75c7efe5e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -51,6 +51,9 @@
             
    • 
               Using LESS
             
      • 
+            
    • 
+              Download
+            
      • 
           
         
      
       
      
@@ -65,11 +68,11 @@
   
      On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
      
   
      
     
   
      
 
diff --git a/docs/components.html b/docs/components.html
index d823998d9..c1cec739c 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -51,6 +51,9 @@
             
    • 
               Using LESS
             
      • 
+            
    • 
+              Download
+            
      • 
           
         
      
       
      
@@ -65,15 +68,15 @@
   
      Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
      
   
      
     
   
      
 
diff --git a/docs/download.html b/docs/download.html
new file mode 100644
index 000000000..1d74c4f78
--- /dev/null
+++ b/docs/download.html
@@ -0,0 +1,312 @@
+
+
+  
+    
+    Bootstrap, from Twitter
+    
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+  
+
+  
+  
+  
+    
      
+      
      
+        
      
+          Bootstrap
+          
+        
      
+      
      
+    
      
+
+    
      
+
+
      
+  Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
+
      
+
+
+
      
+  
      Download and customize Bootstrap
      
+  
      Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.
      
+
      
+
+
      
+  
      
+    Toggle all
+    
      
+      1. Select components
+      Get just the CSS you need
+    
      
+  
      
+  
      
+    
      
+      
      Scaffolding
      
+      
+      
+      
+      
      Base CSS
      
+      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      Components
      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      JS Components
      
+      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      Miscellaneous
      
+      
+      
+      
+      
+      
      Responsive
      
+      
+      
+      
+    
      
+  
      
+
+  
      
+    Reset to defaults
+    
      
+      2. Modify variables
+      Customize Bootstrap without using a LESS compiler
+    
      
+  
      
+  
      
+    
      
+      
      Links
      
+      
+      
+      
+      
+      
      Grid system
      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      Typography
      
+      
+      
+      
+      
+      
+      
+      
      Forms
      
+      
+      
+      
+      
+      
      Navbar
      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      Form states & alerts
      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
      
+  
      
+
+  
      
+    Toggle all
+    
      
+      3. Select jQuery plugins
+      Quickly add only the necessary javascript
+    
      
+  
      
+  
      
+    
      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      Heads up!
      
+      
      All plugins require the latest version of jQuery to be included.
      
+    
      
+  
      
+
+  
      
+    Build and Download
+  
      
+
      
+
+     
+      
+
+    
      
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
diff --git a/docs/index.html b/docs/index.html
index 2bbcaa78a..83e65c97e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -51,6 +51,9 @@
             
    • 
               Using LESS
             
      • 
+            
    • 
+              Download
+            
      • 
           
         
      
       
      
diff --git a/docs/javascript.html b/docs/javascript.html
index 425d347cb..a7818ff46 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -51,6 +51,9 @@
             
    • 
               Using LESS
             
      • 
+            
    • 
+              Download
+            
      • 
           
         
      
       
      
@@ -65,18 +68,18 @@
         
      Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
         
      
           
         
      
       
diff --git a/docs/less.html b/docs/less.html
index 55138c71a..6bb04e8d8 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -51,6 +51,9 @@
             
    • 
               Using LESS
             
      • 
+            
    • 
+              Download
+            
      • 
           
         
      
       
      
@@ -69,177 +72,16 @@
   
      Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.
      
   
      
     
   
      
 
 
 
 
-
-
      
-  
      
-    
      Chop Shop Customize your build of Bootstrap
      
-  
      
-
-  
      
-    
      
-      
-      
      
-        
      
-          
      
-            
      
-              
      Scaffolding
      
-              
-              
-              
-              
      Base CSS
      
-              
-              
-              
-              
-              
-              
-              
-            
      
-            
      
-              
      Components
      
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-            
      
-            
      
-              
      JS Components
      
-              
-              
-              
-              
-              
-              
-              
-            
      
-            
      
-              
      Responsive
      
-              
-              
-              
-              
      Miscellaneous
      
-              
-              
-              
-              
-            
      
-          
      
-          
      
-            Reset variables
-            Next: Customize variables
-          
              
-        
      
-        
      
-          
      
-            
      
-              
      Links
      
-              
-              
-              
-              
-              
      Grid system
      
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-            
      
-            
      
-              
      Typography
      
-              
-              
-              
-              
-              
-              
-              
      Forms
      
-              
-              
-              
-              
-              
      Navbar
      
-              
-              
-              
-              
-              
-              
-            
      
-            
      
-              
      Form states & alerts
      
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-            
      
-          
      
-          
      
-            Next: Build and download
-          
              
-        
      
-        
      
-          
      And you're set!
      
-          
      We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.
      
-          Download CSS Download minified CSS
-          
      
-          
      Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.
      
-        
      
-      
      
-    
      
-  
      
-
-
      
-
-
-
 
 
      
@@ -249,7 +91,7 @@
   
      
     
      
       
      Why LESS?
      
-      
      Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
      
+      
      Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by our good friend, Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.
      
     
      
     
      
       
      What's included?
      
@@ -283,7 +125,7 @@
 ================================================== -->
 
      
   
      
-    
      Variables from variables.less
      
+    
      Bootstrap variables 
      
   
      
 
   
      Hyperlinks
      
@@ -554,85 +396,8 @@
 
 
      
-  
      Mixins from mixins.less
      
-
      
-
-
-
-
-
      
-  
      Operations
      
-
      
-
-
-
-
-
      
-  
      Compiling LESS and Bootstrap
      
+  
      Bootstrap mixins 
      
 
      
-
-
-
-
-
-
      
-
      
-  
      Using Bootstrap with Less Supercharge your CSS with variables, mixins, and functions
      
-
      
-
      
-  
      
-    
      Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.
      
-    
      Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.
      
-  
      
-  
      
-    
      How to use it
      
-    
      Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.
      
-
      -<link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
-<script src="js/less-1.1.3.min.js"></script>
      
-
      Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.
      
-
-    
      What’s included
      
-    
      Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.
      
-    
      Variables
      
-    
      Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.
      
-
      -// Links
-@linkColor:         #8b59c2;
-@linkColorHover:    darken(@linkColor, 10);
-
-// Grays
-@black:             #000;
-@grayDark:          lighten(@black, 25%);
-@gray:              lighten(@black, 50%);
-@grayLight:         lighten(@black, 70%);
-@grayLighter:       lighten(@black, 90%);
-@white:             #fff;
-
-// Accent Colors
-@blue:              #08b5fb;
-@green:             #46a546;
-@red:               #9d261d;
-@yellow:            #ffc40d;
-@orange:            #f89406;
-@pink:              #c3325f;
-@purple:            #7a43b6;
-
-// Baseline grid
-@basefont:          13px;
-@baseline:          18px;
-
      
-
-
      Commenting
      
-
      Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.
      
-
      -// This is a comment
-/* This is also a comment */
-
      
-
 
      Mixins up the wazoo
      
 
      Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.
      
 
      Font stacks
      
@@ -686,69 +451,59 @@
 }
 
 
-    
      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
      
-    
-      
-        
-          
-          
-        
-      
-      
-        
-          
-          
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-      
-    
      MethodSteps
      Node with makefile
-            
      Install the LESS command line compiler with npm by running the following command:
      
-            
      $ npm install less
      
-            
      Once installed just run make from the root of your bootstrap directory and you're all set.
      
-            
      Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).
      
-          
      Javascript
-            
      Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.
      
+
+
+
      
+  
      
+    
      Compiling Bootstrap with LESS
      
+  
      
+  
      
+    Note: If you're submitting a pull request to GitHub with modified CSS, you must recompile the CSS via any of these methods.
+  
      
+  
      Tools for compiling
      
+  
      
+    
      
+      
      Node with makefile
      
+      
      Install the LESS command line compiler with npm by running the following command:
      
+      
      $ npm install less
      
+      
      Once installed just run make from the root of your bootstrap directory and you're all set.
      
+      
      Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).
      
+    
      
+    
      
+      
      Command line
      
+      
      Install the LESS command line tool via Node and run the following command:
      
+        
      $ lessc ./lib/bootstrap.less > bootstrap.css
      
+      
      Be sure to include --compress in that command if you're trying to save some bytes!
      
+    
      
+    
      
+      
      Javascript
      
+      
      Download the latest Less.js and include the path to it (and Bootstrap) 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
-            
      Install the LESS command line tool via Node and run the following command:
      
-              
      $ lessc ./lib/bootstrap.less > bootstrap.css
      
-            
      Be sure to include --compress in that command if you're trying to save some bytes!
      
-          
      Unofficial 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.
      
-          
      CrunchCrunch is a great looking LESS editor and compiler built on Adobe Air.
      CodeKitCreated by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.
      SimplessMac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.
      
-  
      
-
      
-
+      
      To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.
      
+    
      
+  
      
+  
      
+    
      
+      
      Unofficial 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.
      
+    
      
+    
      
+      
      More Mac apps
      
+      
      Crunch
      
+      
      Crunch is a great looking LESS editor and compiler built on Adobe Air.
      
+      
      CodeKit
      
+      
      Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.
      
+      
      Simpless
      
+      
      Mac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.
      
+    
      
+  
      
 
      
+
      
       
      
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index bb18b0394..3e2ddf077 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -51,6 +51,9 @@
             
    • 
               Using LESS
             
      • 
+            
    • 
+              Download
+            
      • 
           
         
      
       
      
@@ -65,9 +68,9 @@
         
      Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
      
         
      
           
         
      
       
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 919872db2..1fec7788e 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -51,6 +51,9 @@
             
    • 
               Using LESS
             
      • 
+            
    • 
+              Download
+            
      • 
           
         
      
       
      
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index ba864ce9e..630852259 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -5,11 +5,11 @@
   
      {{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}
      
   
      
     
   
      
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 94d72a540..5da0e6989 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -5,15 +5,15 @@
   
      {{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}
      
   
      
     
   
      
 
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
new file mode 100644
index 000000000..453bf1141
--- /dev/null
+++ b/docs/templates/pages/download.mustache
@@ -0,0 +1,216 @@
+
      
+  Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
+
      
+
+
+
      
+  
      {{_i}}Download and customize Bootstrap{{/i}}
      
+  
      {{_i}}Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}
      
+
      
+
+
      
+  
      
+    Toggle all
+    
      
+      1. Select components
+      Get just the CSS you need
+    
      
+  
      
+  
      
+    
      
+      
      Scaffolding
      
+      
+      
+      
+      
      Base CSS
      
+      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      Components
      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      JS Components
      
+      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      Miscellaneous
      
+      
+      
+      
+      
+      
      Responsive
      
+      
+      
+      
+    
      
+  
      
+
+  
      
+    Reset to defaults
+    
      
+      2. Modify variables
+      Customize Bootstrap without using a LESS compiler
+    
      
+  
      
+  
      
+    
      
+      
      Links
      
+      
+      
+      
+      
+      
      Grid system
      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      Typography
      
+      
+      
+      
+      
+      
+      
+      
      Forms
      
+      
+      
+      
+      
+      
      Navbar
      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      Form states & alerts
      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
      
+  
      
+
+  
      
+    Toggle all
+    
      
+      3. Select jQuery plugins
+      Quickly add only the necessary javascript
+    
      
+  
      
+  
      
+    
      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
+      
+      
+      
+      
+      
+    
      
+    
      
+      
      Heads up!
      
+      
      {{_i}}All plugins require the latest version of jQuery to be included.{{/i}}
      
+    
      
+  
      
+
+  
      
+    Build and Download
+  
      
+
      
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 2ac950251..df114841a 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -5,18 +5,18 @@
         
      {{_i}}Bring Bootstrap's components to life—now with 12 custom jQuery plugins.{{/i}}
         
      
           
         
      
       
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 2633abdf3..76ecf70c9 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -9,177 +9,16 @@
   
      {{_i}}Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}
      
   
      
     
   
      
 
 
 
 
-
-
      
-  
      
-    
      Chop Shop Customize your build of Bootstrap
      
-  
      
-
-  
      
-    
      
-      
-      
      
-        
      
-          
      
-            
      
-              
      Scaffolding
      
-              
-              
-              
-              
      Base CSS
      
-              
-              
-              
-              
-              
-              
-              
-            
      
-            
      
-              
      Components
      
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-            
      
-            
      
-              
      JS Components
      
-              
-              
-              
-              
-              
-              
-              
-            
      
-            
      
-              
      Responsive
      
-              
-              
-              
-              
      Miscellaneous
      
-              
-              
-              
-              
-            
      
-          
      
-          
      
-            Reset variables
-            Next: Customize variables
-          
              
-        
      
-        
      
-          
      
-            
      
-              
      Links
      
-              
-              
-              
-              
-              
      Grid system
      
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-            
      
-            
      
-              
      Typography
      
-              
-              
-              
-              
-              
-              
-              
      Forms
      
-              
-              
-              
-              
-              
      Navbar
      
-              
-              
-              
-              
-              
-              
-            
      
-            
      
-              
      Form states & alerts
      
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-              
-            
      
-          
      
-          
      
-            Next: Build and download
-          
              
-        
      
-        
      
-          
      And you're set!
      
-          
      We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.
      
-          Download CSS Download minified CSS
-          
      
-          
      Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.
      
-        
      
-      
      
-    
      
-  
      
-
-
      
-
-
-
 
 
      
@@ -189,7 +28,7 @@
   
      
     
      
       
      {{_i}}Why LESS?{{/i}}
      
-      
      {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}
      
+      
      {{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by our good friend, Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}
      
     
      
     
      
       
      {{_i}}What's included?{{/i}}
      
@@ -223,7 +62,7 @@
 ================================================== -->
 
      
   
      
-    
      {{_i}}Variables from variables.less{{/i}}
      
+    
      {{_i}}Bootstrap variables {{/i}}
      
   
      
 
   
      {{_i}}Hyperlinks{{/i}}
      
@@ -494,85 +333,8 @@
 
 
      
-  
      {{_i}}Mixins from mixins.less{{/i}}
      
+  
      {{_i}}Bootstrap mixins {{/i}}
      
 
      
-
-
-
-
-
      
-  
      {{_i}}Operations{{/i}}
      
-
      
-
-
-
-
-
      
-  
      {{_i}}Compiling LESS and Bootstrap{{/i}}
      
-
      
-
-
-
-
-
-
      
-
      
-  
      {{_i}}Using Bootstrap with Less Supercharge your CSS with variables, mixins, and functions{{/i}}
      
-
      
-
      
-  
      
-    
      {{_i}}Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.{{/i}}
      
-    
      {{_i}}Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.{{/i}}
      
-  
      
-  
      
-    
      {{_i}}How to use it{{/i}}
      
-    
      {{_i}}Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.{{/i}}
      
-
      -<link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
-<script src="js/less-1.1.3.min.js"></script>
      
-
      {{_i}}Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.{{/i}}
      
-
-    
      {{_i}}What’s included{{/i}}
      
-    
      {{_i}}Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.{{/i}}
      
-    
      {{_i}}Variables{{/i}}
      
-    
      {{_i}}Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.{{/i}}
      
-
      -// Links
-@linkColor:         #8b59c2;
-@linkColorHover:    darken(@linkColor, 10);
-
-// Grays
-@black:             #000;
-@grayDark:          lighten(@black, 25%);
-@gray:              lighten(@black, 50%);
-@grayLight:         lighten(@black, 70%);
-@grayLighter:       lighten(@black, 90%);
-@white:             #fff;
-
-// Accent Colors
-@blue:              #08b5fb;
-@green:             #46a546;
-@red:               #9d261d;
-@yellow:            #ffc40d;
-@orange:            #f89406;
-@pink:              #c3325f;
-@purple:            #7a43b6;
-
-// Baseline grid
-@basefont:          13px;
-@baseline:          18px;
-
      
-
-
      {{_i}}Commenting{{/i}}
      
-
      {{_i}}Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.{{/i}}
      
-
      -// This is a comment
-/* This is also a comment */
-
      
-
 
      {{_i}}Mixins up the wazoo{{/i}}
      
 
      {{_i}}Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.{{/i}}
      
 
      {{_i}}Font stacks{{/i}}
      
@@ -626,66 +388,55 @@
 }
 
 
-    
      {{_i}}Compiling Less{{/i}}
      
-    
      {{_i}}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.{{/i}}
      
-    
      {{_i}}Ways to compile{{/i}}
      
-    
-      
-        
-          
-          
-        
-      
-      
-        
-          
-          
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-        
-          
-          
-        
-      
-    
      {{_i}}Method{{/i}}{{_i}}Steps{{/i}}
      {{_i}}Node with makefile{{/i}}
-            
      {{_i}}Install the LESS command line compiler with npm by running the following command:{{/i}}
      
-            
      $ npm install less
      
-            
      {{_i}}Once installed just run make from the root of your bootstrap directory and you're all set.{{/i}}
      
-            
      {{_i}}Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).{{/i}}
      
-          
      {{_i}}Javascript{{/i}}
-            
      {{_i}}Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.{{/i}}
      
+
+
+
      
+  
      
+    
      {{_i}}Compiling Bootstrap with LESS{{/i}}
      
+  
      
+  
      
+    {{_i}}Note: If you're submitting a pull request to GitHub with modified CSS, you must recompile the CSS via any of these methods.{{/i}}
+  
      
+  
      {{_i}}Tools for compiling{{/i}}
      
+  
      
+    
      
+      
      {{_i}}Node with makefile{{/i}}
      
+      
      {{_i}}Install the LESS command line compiler with npm by running the following command:{{/i}}
      
+      
      $ npm install less
      
+      
      {{_i}}Once installed just run make from the root of your bootstrap directory and you're all set.{{/i}}
      
+      
      {{_i}}Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).{{/i}}
      
+    
      
+    
      
+      
      {{_i}}Command line{{/i}}
      
+      
      {{_i}}Install the LESS command line tool via Node and run the following command:{{/i}}
      
+        
      $ lessc ./lib/bootstrap.less > bootstrap.css
      
+      
      {{_i}}Be sure to include --compress in that command if you're trying to save some bytes!{{/i}}
      
+    
      
+    
      
+      
      {{_i}}Javascript{{/i}}
      
+      
      {{_i}}Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.{{/i}}
      
 
       <link rel="stylesheet/less" href="/path/to/bootstrap.less">
 <script src="/path/to/less.js"></script>
 
      
-            
      {{_i}}To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.{{/i}}
      
-          
      {{_i}}Command line{{/i}}
-            
      {{_i}}Install the LESS command line tool via Node and run the following command:{{/i}}
      
-              
      $ lessc ./lib/bootstrap.less > bootstrap.css
      
-            
      {{_i}}Be sure to include --compress in that command if you're trying to save some bytes!{{/i}}
      
-          
      {{_i}}Unofficial Mac app{{/i}}
-            
      {{_i}}The unofficial Mac app watches directories of .less files and compiles the code to local files after every save of a watched .less file.{{/i}}
      
-            
      {{_i}}If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.{{/i}}
      
-          
      Crunch{{_i}}Crunch is a great looking LESS editor and compiler built on Adobe Air.{{/i}}
      CodeKit{{_i}}Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.{{/i}}
      Simpless{{_i}}Mac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.{{/i}}
      
-  
      
-
      
-
-
      
\ No newline at end of file
+      
      {{_i}}To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.{{/i}}
      
+    
      
+  
      
+  
      
+    
      
+      
      {{_i}}Unofficial Mac app{{/i}}
      
+      
      {{_i}}The unofficial Mac app watches directories of .less files and compiles the code to local files after every save of a watched .less file.{{/i}}
      
+      
      {{_i}}If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.{{/i}}
      
+    
      
+    
      
+      
      {{_i}}More Mac apps{{/i}}
      
+      
      Crunch
      
+      
      {{_i}}Crunch is a great looking LESS editor and compiler built on Adobe Air.{{/i}}
      
+      
      CodeKit
      
+      
      {{_i}}Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.{{/i}}
      
+      
      Simpless
      
+      
      {{_i}}Mac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.{{/i}}
      
+    
      
+  
      
+
      
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index ed80dabfc..981c60706 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -5,9 +5,9 @@
         
      {{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}
      
         
      
           
         
      
       
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 7dab4c000..75b8e7327 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -51,6 +51,9 @@
             
    • 
               Using LESS
             
      • 
+            
    • 
+              Download
+            
      • 
           
         
      
       
      
diff --git a/lib/forms.less b/lib/forms.less
index e35b23da0..100b0ab91 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -166,14 +166,14 @@ textarea {
 
 input,
 textarea {
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.1));
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
   @transition: border linear .2s, box-shadow linear .2s;
   .transition(@transition);
 }
 input:focus,
 textarea:focus {
   border-color: rgba(82,168,236,.8);
-  @shadow: inset 0 1px 1px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
+  @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
   .box-shadow(@shadow);
   outline: 0;
 }
-- 
cgit v1.2.3


From bd36e2a1633ea66fee2bcfdd1123bd70f41b43f2 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 01:25:15 -0800
Subject: remove checkboxes from js docs page overview, they'll be on the
 download page instead

---
 docs/javascript.html                     | 41 ++++++++++----------------------
 docs/templates/pages/javascript.mustache | 41 ++++++++++----------------------
 2 files changed, 24 insertions(+), 58 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index a7818ff46..5977006ff 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -94,25 +94,25 @@
       
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
@@ -120,26 +120,26 @@
       
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
@@ -147,47 +147,30 @@
       
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
       
       
-      
      
-        
      
-          
-        
      
-      
      
-      
      
-      Select/Unselect All Plugins
-      
      Note: All plugins require the latest version of jQuery to be included.
      
     
 
 
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index df114841a..7671bc99a 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -31,25 +31,25 @@
       
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
@@ -57,26 +57,26 @@
       
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
@@ -84,47 +84,30 @@
       
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
         
      
           
         
      
       
       
-      
      
-        
      
-          
-        
      
-      
      
-      
      
-      {{_i}}Select/Unselect All Plugins{{/i}}
-      
      {{_i}}Note: All plugins require the latest version of jQuery to be included.{{/i}}
      
     
 
 
-- 
cgit v1.2.3


From de4ada3b88d7514d0320540e5a298fbe878778e1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 01:45:15 -0800
Subject: spec out all mixins on less page

---
 docs/less.html                     | 356 +++++++++++++++++++++++++++++++------
 docs/templates/pages/less.mustache | 356 +++++++++++++++++++++++++++++++------
 2 files changed, 606 insertions(+), 106 deletions(-)

diff --git a/docs/less.html b/docs/less.html
index ac75dd346..e10c8899b 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -105,11 +105,11 @@
   
      
   
      
     
      
-      
      Variables
      
+      
      Variables
      
       
      Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.
      
     
      
     
      
-      
      Mixins
      
+      
      Mixins
      
       
      Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.
      
     
      
     
      
@@ -395,62 +395,312 @@
 
 
-
      
-  
      Bootstrap mixins 
      
-
      
-
-
      Mixins up the wazoo
      
-
      Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.
      
-
      Font stacks
      
+
      
+  
      
+    
      Bootstrap mixins 
      
+  
      
+  
      About mixins
      
+  
      
+    
      
+      
      Basic mixins
      
+      
      A basic mixin is essentially an include or a partial for a snippet of CSS. They're written just like a CSS class and can be called anywhere.
      
 
      -#font {
-  .shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) {
-    font-size: @size;
-    font-weight: @weight;
-    line-height: @lineHeight;
-  }
-  .sans-serif(@weight: normal, @size: 14px, @lineHeight: 20px) {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-size: @size;
-    font-weight: @weight;
-    line-height: @lineHeight;
-  }
-  ...
-}
+  Coming soon!
 
      
-
      Gradients
      
+    
      
+    
      
+      
      Parametric mixins
      
+      
      A parametric mixin is just like a basic mixin, but it also accepts optional paramaters (hence the name).
      
 
      -#gradient {
-  ...
-  .vertical (@startColor: #555, @endColor: #333) {
-    background-color: @endColor;
-    background-repeat: repeat-x;
-    background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror
-    background-image: -moz-linear-gradient(@startColor, @endColor); // FF 3.6+
-    background-image: -ms-linear-gradient(@startColor, @endColor); // IE10
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(@startColor, @endColor); // The standard
-  }
-  ...
-}
+  Coming soon!
 
      
+    
      
+    
      
+      
      Easily add your own
      
+      
      Nearly all of Bootstrap's mixins are stored in mixins.less, a wonderful utility .less file that enables you to use a mixin in any of the .less files in the toolkit.
      
+      
      So, go ahead and use the existing ones or feel free to add your own as you need.
      
+    
      
+  
      
+  
      Included mixins
      
+  
      Utilities
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      .clearfix()
      .center-block()
      .ie7-inline-block()
      .size()
      .square()
      .opacity()
      .reset-filter()
      
+  
      Forms
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      .placeholder()
      
+  
      Typography
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      #font > #family > .serif()
      #font > #family > .sans-serif()
      #font > #family > .monospace()
      #font > .shorthand()
      #font > .serif()
      #font > .sans-serif()
      #font > .monospace()
      
+  
      Grid system
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      .fixed-container()
      .columns()
      .offset()
      .gridColumn()
      
+  
      CSS3 properties
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      .border-radius()
      .border-radius-custom()
      .box-shadow()
      .transition()
      .rotate()
      .scale()
      .translate()
      .background-clip()
      .background-size()
      .box-sizing()
      .user-select()
      .resizable()
      .content-columns()
      
+  
      Backgrounds and gradients
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      .#translucent > .background()
      .#translucent > .border()
      .#gradient > .vertical()
      .#gradient > .horizontal()
      .#gradient > .directional()
      .#gradient > .vertical-three-colors()
      .#gradient > .radial()
      .#gradient > .striped()
      .#gradientBar()
      
+
      
 
-
      Operations
      
-
      Get fancy and perform some math to generate flexible and powerful mixins like the one below.
      
-
      -// Griditude
-@gridColumns:       16;
-@gridColumnWidth:   40px;
-@gridGutterWidth:   20px;
-@siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-
-// Make some columns
-.columns(@columnSpan: 1) {
-  width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
-}
-
      
 
 
 
-
      
-  
      {{_i}}Bootstrap mixins {{/i}}
      
-
      
-
-
      {{_i}}Mixins up the wazoo{{/i}}
      
-
      {{_i}}Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.{{/i}}
      
-
      {{_i}}Font stacks{{/i}}
      
+
      
+  
      
+    
      {{_i}}Bootstrap mixins {{/i}}
      
+  
      
+  
      About mixins
      
+  
      
+    
      
+      
      Basic mixins
      
+      
      A basic mixin is essentially an include or a partial for a snippet of CSS. They're written just like a CSS class and can be called anywhere.
      
 
      -#font {
-  .shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) {
-    font-size: @size;
-    font-weight: @weight;
-    line-height: @lineHeight;
-  }
-  .sans-serif(@weight: normal, @size: 14px, @lineHeight: 20px) {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-size: @size;
-    font-weight: @weight;
-    line-height: @lineHeight;
-  }
-  ...
-}
+  Coming soon!
 
      
-
      {{_i}}Gradients{{/i}}
      
+    
      
+    
      
+      
      Parametric mixins
      
+      
      A parametric mixin is just like a basic mixin, but it also accepts optional paramaters (hence the name).
      
 
      -#gradient {
-  ...
-  .vertical (@startColor: #555, @endColor: #333) {
-    background-color: @endColor;
-    background-repeat: repeat-x;
-    background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror
-    background-image: -moz-linear-gradient(@startColor, @endColor); // FF 3.6+
-    background-image: -ms-linear-gradient(@startColor, @endColor); // IE10
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(@startColor, @endColor); // The standard
-  }
-  ...
-}
+  Coming soon!
 
      
+    
      
+    
      
+      
      Easily add your own
      
+      
      Nearly all of Bootstrap's mixins are stored in mixins.less, a wonderful utility .less file that enables you to use a mixin in any of the .less files in the toolkit.
      
+      
      So, go ahead and use the existing ones or feel free to add your own as you need.
      
+    
      
+  
      
+  
      Included mixins
      
+  
      Utilities
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      .clearfix()
      .center-block()
      .ie7-inline-block()
      .size()
      .square()
      .opacity()
      .reset-filter()
      
+  
      Forms
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      .placeholder()
      
+  
      Typography
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      #font > #family > .serif()
      #font > #family > .sans-serif()
      #font > #family > .monospace()
      #font > .shorthand()
      #font > .serif()
      #font > .sans-serif()
      #font > .monospace()
      
+  
      Grid system
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      .fixed-container()
      .columns()
      .offset()
      .gridColumn()
      
+  
      CSS3 properties
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      .border-radius()
      .border-radius-custom()
      .box-shadow()
      .transition()
      .rotate()
      .scale()
      .translate()
      .background-clip()
      .background-size()
      .box-sizing()
      .user-select()
      .resizable()
      .content-columns()
      
+  
      Backgrounds and gradients
      
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
      MixinParamatersUsage
      .#translucent > .background()
      .#translucent > .border()
      .#gradient > .vertical()
      .#gradient > .horizontal()
      .#gradient > .directional()
      .#gradient > .vertical-three-colors()
      .#gradient > .radial()
      .#gradient > .striped()
      .#gradientBar()
      
+
      
 
-
      {{_i}}Operations{{/i}}
      
-
      {{_i}}Get fancy and perform some math to generate flexible and powerful mixins like the one below.{{/i}}
      
-
      -// Griditude
-@gridColumns:       16;
-@gridColumnWidth:   40px;
-@gridGutterWidth:   20px;
-@siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-
-// Make some columns
-.columns(@columnSpan: 1) {
-  width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
-}
-
      
 
 
 
           
@@ -304,7 +304,7 @@
   @media (max-width: 480px) { ... }
 
   // {{_i}}Landscape phone to portrait tablet{{/i}}
-  @media (min-width: 480px) and (max-width: 768px) { ... }
+  @media (max-width: 768px) { ... }
 
   // {{_i}}Portrait tablet to landscape and desktop{{/i}}
   @media (min-width: 768px) and (max-width: 940px) { ... }
-- 
cgit v1.2.3


From 9553b1e3e9457a48b6da3724c906a36f935aa526 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 10:02:52 -0800
Subject: update docs to include separate responsive css, update docs to
 highlight proper file name, updated makefile to build responsive separately

---
 Makefile                                  |   7 +
 bootstrap-responsive.css                  | 245 +++++++++++++++++++++++++++++
 bootstrap-responsive.min.css              |   3 +
 bootstrap.css                             | 247 +-----------------------------
 bootstrap.min.css                         |   2 -
 docs/base-css.html                        |   1 +
 docs/components.html                      |   1 +
 docs/download.html                        |   1 +
 docs/index.html                           |   1 +
 docs/javascript.html                      |   1 +
 docs/less.html                            |   1 +
 docs/scaffolding.html                     |   3 +-
 docs/templates/layout.mustache            |   1 +
 docs/templates/pages/scaffolding.mustache |   2 +-
 docs/upgrading.html                       |   1 +
 lib/bootstrap.less                        |   3 -
 lib/responsive.less                       |   8 +
 17 files changed, 275 insertions(+), 253 deletions(-)
 create mode 100644 bootstrap-responsive.css
 create mode 100644 bootstrap-responsive.min.css

diff --git a/Makefile b/Makefile
index f4324e566..612f77fdf 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ VERSION=2.0.0
 BOOTSTRAP = ./bootstrap.css
 BOOTSTRAP_MIN = ./bootstrap.min.css
 BOOTSTRAP_LESS = ./lib/bootstrap.less
+BOOTSTRAP_RESPONSIVE = ./bootstrap-responsive.css
+BOOTSTRAP_RESPONSIVE_MIN = ./bootstrap-responsive.min.css
+BOOTSTRAP_RESPONSIVE_LESS = ./lib/responsive.less
 LESS_COMPRESSOR ?= `which lessc`
 UGLIFY_JS ?= `which uglifyjs`
 WATCHR ?= `which watchr`
@@ -16,6 +19,10 @@ build:
 		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
 		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
 		rm -f ${BOOTSTRAP_LESS}.tmp; \
+		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_RESPONSIVE_LESS} >${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
+		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \
+		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE_MIN} --compress; \
+		rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
 		echo "Bootstrap successfully built! - `date`"; \
 	else \
 		echo "You must have the LESS compiler installed in order to build Bootstrap."; \
diff --git a/bootstrap-responsive.css b/bootstrap-responsive.css
new file mode 100644
index 000000000..4a924da68
--- /dev/null
+++ b/bootstrap-responsive.css
@@ -0,0 +1,245 @@
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+@media (max-width: 480px) {
+  .navbar .nav {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 180px;
+    padding-top: 40px;
+    list-style: none;
+  }
+  .navbar .nav, .navbar .nav > li:last-child a {
+    -webkit-border-radius: 0 0 4px 0;
+    -moz-border-radius: 0 0 4px 0;
+    border-radius: 0 0 4px 0;
+  }
+  .navbar .nav > li {
+    float: none;
+    display: none;
+  }
+  .navbar .nav > li > a {
+    float: none;
+    background-color: #222;
+  }
+  .navbar .nav > .active {
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
+  .navbar .nav > .active > a {
+    background-color: transparent;
+  }
+  .navbar .nav > .active > a:hover {
+    background-color: #333;
+  }
+  .navbar .nav > .active > a:after {
+    display: inline-block;
+    width: 0;
+    height: 0;
+    margin-top: 8px;
+    margin-left: 6px;
+    text-indent: -99999px;
+    vertical-align: top;
+    border-left: 4px solid transparent;
+    border-right: 4px solid transparent;
+    border-top: 4px solid #ffffff;
+    filter: alpha(opacity=100);
+    -moz-opacity: 1;
+    opacity: 1;
+    content: "↓";
+  }
+  .navbar .nav:hover > li {
+    display: block;
+  }
+  .navbar .nav:hover > li > a:hover {
+    background-color: #333;
+  }
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-left: 0;
+  }
+  .modal {
+    position: absolute;
+    top: 20px;
+    left: 20px;
+    right: 20px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade.in {
+    top: auto;
+  }
+  .modal-header .close {
+    padding: 10px;
+  }
+}
+@media (max-width: 768px) {
+  .navbar-fixed {
+    position: absolute;
+  }
+  .navbar-fixed .nav {
+    float: none;
+  }
+  .container {
+    width: auto;
+    padding: 0 20px;
+  }
+  .row {
+    margin-left: 0;
+  }
+  .row > [class*="span"] {
+    float: none;
+    display: block;
+    width: auto;
+    margin: 0;
+  }
+}
+@media (min-width: 768px) and (max-width: 940px) {
+  .container {
+    width: 748px;
+  }
+  .span1 {
+    width: 44px;
+  }
+  .span2 {
+    width: 108px;
+  }
+  .span3 {
+    width: 172px;
+  }
+  .span4 {
+    width: 236px;
+  }
+  .span5 {
+    width: 300px;
+  }
+  .span6 {
+    width: 364px;
+  }
+  .span7 {
+    width: 428px;
+  }
+  .span8 {
+    width: 492px;
+  }
+  .span9 {
+    width: 556px;
+  }
+  .span10 {
+    width: 620px;
+  }
+  .span11 {
+    width: 684px;
+  }
+  .span12 {
+    width: 748px;
+  }
+  .offset1 {
+    margin-left: 64px;
+  }
+  .offset2 {
+    margin-left: 128px;
+  }
+  .offset3 {
+    margin-left: 192px;
+  }
+  .offset4 {
+    margin-left: 256px;
+  }
+  .offset5 {
+    margin-left: 320px;
+  }
+  .offset6 {
+    margin-left: 384px;
+  }
+  .offset7 {
+    margin-left: 448px;
+  }
+  .offset8 {
+    margin-left: 512px;
+  }
+  .offset9 {
+    margin-left: 576px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset11 {
+    margin-left: 704px;
+  }
+  .offset12 {
+    margin-left: 768px;
+  }
+}
+/*
+@media (min-width: 1210px) {
+
+  // Reset grid variables
+  @gridColumns:       12;
+  @gridColumnWidth:   70px;
+  @gridGutterWidth:   30px;
+  @siteWidth:         1170px;
+
+  // Bring grid mixins to recalculate widths
+  .columns(@columnSpan: 1) {
+    width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
+  }
+  .offset(@columnOffset: 1) {
+    margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth;
+  }
+
+  .container {
+    width: @siteWidth;
+  }
+  .row {
+    margin-left: @gridGutterWidth * -1;
+  }
+  [class*="span"] {
+    margin-left: @gridGutterWidth;
+  }
+
+  // Default columns
+  .span1     { .columns(1); }
+  .span2     { .columns(2); }
+  .span3     { .columns(3); }
+  .span4     { .columns(4); }
+  .span5     { .columns(5); }
+  .span6     { .columns(6); }
+  .span7     { .columns(7); }
+  .span8     { .columns(8); }
+  .span9     { .columns(9); }
+  .span10    { .columns(10); }
+  .span11    { .columns(11); }
+  .span12    { .columns(12); }
+
+  // Offset column options
+  .offset1   { .offset(1); }
+  .offset2   { .offset(2); }
+  .offset3   { .offset(3); }
+  .offset4   { .offset(4); }
+  .offset5   { .offset(5); }
+  .offset6   { .offset(6); }
+  .offset7   { .offset(7); }
+  .offset8   { .offset(8); }
+  .offset9   { .offset(9); }
+  .offset10  { .offset(10); }
+  .offset11  { .offset(11); }
+  .offset12  { .offset(12); }
+
+}
+*/
diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
new file mode 100644
index 000000000..5c45bd12b
--- /dev/null
+++ b/bootstrap-responsive.min.css
@@ -0,0 +1,3 @@
+
+.hidden{display:none;visibility:hidden;}
+@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/bootstrap.css b/bootstrap.css
index 85b515ecc..d90ec9188 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 09:53:40 PST 2012
+ * Date: Wed Jan 25 10:01:08 PST 2012
  */
 article,
 aside,
@@ -3011,248 +3011,3 @@ a.thumbnail:hover {
 .invisible {
   visibility: hidden;
 }
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-@media (max-width: 480px) {
-  .navbar .nav {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 180px;
-    padding-top: 40px;
-    list-style: none;
-  }
-  .navbar .nav, .navbar .nav > li:last-child a {
-    -webkit-border-radius: 0 0 4px 0;
-    -moz-border-radius: 0 0 4px 0;
-    border-radius: 0 0 4px 0;
-  }
-  .navbar .nav > li {
-    float: none;
-    display: none;
-  }
-  .navbar .nav > li > a {
-    float: none;
-    background-color: #222;
-  }
-  .navbar .nav > .active {
-    display: block;
-    position: absolute;
-    top: 0;
-    left: 0;
-  }
-  .navbar .nav > .active > a {
-    background-color: transparent;
-  }
-  .navbar .nav > .active > a:hover {
-    background-color: #333;
-  }
-  .navbar .nav > .active > a:after {
-    display: inline-block;
-    width: 0;
-    height: 0;
-    margin-top: 8px;
-    margin-left: 6px;
-    text-indent: -99999px;
-    vertical-align: top;
-    border-left: 4px solid transparent;
-    border-right: 4px solid transparent;
-    border-top: 4px solid #ffffff;
-    filter: alpha(opacity=100);
-    -moz-opacity: 1;
-    opacity: 1;
-    content: "↓";
-  }
-  .navbar .nav:hover > li {
-    display: block;
-  }
-  .navbar .nav:hover > li > a:hover {
-    background-color: #333;
-  }
-  .form-horizontal .control-group > label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-left: 0;
-  }
-  .modal {
-    position: absolute;
-    top: 20px;
-    left: 20px;
-    right: 20px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade.in {
-    top: auto;
-  }
-  .modal-header .close {
-    padding: 10px;
-  }
-}
-@media (max-width: 768px) {
-  .navbar-fixed {
-    position: absolute;
-  }
-  .navbar-fixed .nav {
-    float: none;
-  }
-  .container {
-    width: auto;
-    padding: 0 20px;
-  }
-  .row {
-    margin-left: 0;
-  }
-  .row > [class*="span"] {
-    float: none;
-    display: block;
-    width: auto;
-    margin: 0;
-  }
-}
-@media (min-width: 768px) and (max-width: 940px) {
-  .container {
-    width: 748px;
-  }
-  .span1 {
-    width: 44px;
-  }
-  .span2 {
-    width: 108px;
-  }
-  .span3 {
-    width: 172px;
-  }
-  .span4 {
-    width: 236px;
-  }
-  .span5 {
-    width: 300px;
-  }
-  .span6 {
-    width: 364px;
-  }
-  .span7 {
-    width: 428px;
-  }
-  .span8 {
-    width: 492px;
-  }
-  .span9 {
-    width: 556px;
-  }
-  .span10 {
-    width: 620px;
-  }
-  .span11 {
-    width: 684px;
-  }
-  .span12 {
-    width: 748px;
-  }
-  .offset1 {
-    margin-left: 64px;
-  }
-  .offset2 {
-    margin-left: 128px;
-  }
-  .offset3 {
-    margin-left: 192px;
-  }
-  .offset4 {
-    margin-left: 256px;
-  }
-  .offset5 {
-    margin-left: 320px;
-  }
-  .offset6 {
-    margin-left: 384px;
-  }
-  .offset7 {
-    margin-left: 448px;
-  }
-  .offset8 {
-    margin-left: 512px;
-  }
-  .offset9 {
-    margin-left: 576px;
-  }
-  .offset10 {
-    margin-left: 640px;
-  }
-  .offset11 {
-    margin-left: 704px;
-  }
-  .offset12 {
-    margin-left: 768px;
-  }
-}
-/*
-@media (min-width: 1210px) {
-
-  // Reset grid variables
-  @gridColumns:       12;
-  @gridColumnWidth:   70px;
-  @gridGutterWidth:   30px;
-  @siteWidth:         1170px;
-
-  // Bring grid mixins to recalculate widths
-  .columns(@columnSpan: 1) {
-    width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
-  }
-  .offset(@columnOffset: 1) {
-    margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth;
-  }
-
-  .container {
-    width: @siteWidth;
-  }
-  .row {
-    margin-left: @gridGutterWidth * -1;
-  }
-  [class*="span"] {
-    margin-left: @gridGutterWidth;
-  }
-
-  // Default columns
-  .span1     { .columns(1); }
-  .span2     { .columns(2); }
-  .span3     { .columns(3); }
-  .span4     { .columns(4); }
-  .span5     { .columns(5); }
-  .span6     { .columns(6); }
-  .span7     { .columns(7); }
-  .span8     { .columns(8); }
-  .span9     { .columns(9); }
-  .span10    { .columns(10); }
-  .span11    { .columns(11); }
-  .span12    { .columns(12); }
-
-  // Offset column options
-  .offset1   { .offset(1); }
-  .offset2   { .offset(2); }
-  .offset3   { .offset(3); }
-  .offset4   { .offset(4); }
-  .offset5   { .offset(5); }
-  .offset6   { .offset(6); }
-  .offset7   { .offset(7); }
-  .offset8   { .offset(8); }
-  .offset9   { .offset(9); }
-  .offset10  { .offset(10); }
-  .offset11  { .offset(11); }
-  .offset12  { .offset(12); }
-
-}
-*/
\ No newline at end of file
diff --git a/bootstrap.min.css b/bootstrap.min.css
index cd155d561..01342ea84 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -540,5 +540,3 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .hide{display:none;}
 .show{display:block;}
 .invisible{visibility:hidden;}
-.hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/docs/base-css.html b/docs/base-css.html
index 6b6bd5c51..790243426 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -14,6 +14,7 @@
 
     
     
+    
     
     
 
diff --git a/docs/components.html b/docs/components.html
index c1cec739c..e52780183 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -14,6 +14,7 @@
 
     
     
+    
     
     
 
diff --git a/docs/download.html b/docs/download.html
index 1d74c4f78..7c0367519 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,6 +14,7 @@
 
     
     
+    
     
     
 
diff --git a/docs/index.html b/docs/index.html
index 83e65c97e..4e3ecd038 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -14,6 +14,7 @@
 
     
     
+    
     
     
 
diff --git a/docs/javascript.html b/docs/javascript.html
index c6682660f..9ef609138 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -14,6 +14,7 @@
 
     
     
+    
     
     
 
diff --git a/docs/less.html b/docs/less.html
index e10c8899b..1e6c48253 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -14,6 +14,7 @@
 
     
     
+    
     
     
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 3a903cf57..7f2bbc09f 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -14,6 +14,7 @@
 
     
     
+    
     
     
 
@@ -355,7 +356,7 @@
     
      
       
      Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:
      
       
        
-        
      1. Use the compiled responsive version, bootstrap.reponsive.css
        2. 
+        
      2. Use the compiled responsive version, bootstrap-reponsive.css
        3. 
         
      3. Add @import "responsive.less" and recompile Bootstrap
        4. 
         
      4. Modify and recompile responsive.less as a separate
        5. 
       
      
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 1fec7788e..0bcfaeb63 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -14,6 +14,7 @@
 
     
     
+    
     
     
 
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index aea8002ad..a89f93d8e 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -292,7 +292,7 @@
     
      
       
      {{_i}}Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:{{/i}}
      
       
        
-        
      1. {{_i}}Use the compiled responsive version, bootstrap.reponsive.css{{/i}}
        2. 
+        
      2. {{_i}}Use the compiled responsive version, bootstrap-reponsive.css{{/i}}
        3. 
         
      3. {{_i}}Add @import "responsive.less" and recompile Bootstrap{{/i}}
        4. 
         
      4. {{_i}}Modify and recompile responsive.less as a separate{{/i}}
        5. 
       
      
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 75b8e7327..33b4d939a 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -14,6 +14,7 @@
 
     
     
+    
     
     
 
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 67642d1c4..8d307d427 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -57,6 +57,3 @@
 
 // Utility classes
 @import "utilities.less"; // Has to be last to override when necessary
-
-// Responsive
-@import "responsive.less";
\ No newline at end of file
diff --git a/lib/responsive.less b/lib/responsive.less
index 416a8da7b..452116ea0 100644
--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -3,6 +3,14 @@
 // -------------------------------------------------------------
 
 
+// REPEAT VARIABLES & MIXINS
+// -------------------------
+// Required since we compile the responsive stuff separately
+
+@import "variables.less"; // Modify this for custom colors, font-sizes, etc
+@import "mixins.less";
+
+
 // RESPONSIVE CLASSES
 // ------------------
 
-- 
cgit v1.2.3


From 9380ff8a06197de3f7a3f27a66284da540192f0c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 10:09:26 -0800
Subject: clean up the updated container app layout a bit

---
 examples/container-app.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/examples/container-app.html b/examples/container-app.html
index 79764356b..9bf651753 100644
--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -32,7 +32,7 @@
       .content {
         background-color: #fff;
         padding: 20px;
-        margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */
+        margin: 0 -20px 18px; /* negative indent the amount of the padding to maintain the grid system */
         -webkit-border-radius: 0 0 6px 6px;
            -moz-border-radius: 0 0 6px 6px;
                 border-radius: 0 0 6px 6px;
@@ -59,11 +59,6 @@
         padding-left: 19px;
         border-left: 1px solid #eee;
       }
-
-      .topbar .btn {
-        border: 0;
-      }
-
     
 
     
-- 
cgit v1.2.3


From 1fa3eab20c827d0300cd4a4bb50e2c28e16a2872 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 10:19:29 -0800
Subject: fix location of favicon

---
 docs/base-css.html             | 2 +-
 docs/components.html           | 2 +-
 docs/download.html             | 2 +-
 docs/index.html                | 2 +-
 docs/javascript.html           | 2 +-
 docs/less.html                 | 2 +-
 docs/scaffolding.html          | 2 +-
 docs/templates/layout.mustache | 2 +-
 docs/upgrading.html            | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 790243426..8013ee8aa 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -19,7 +19,7 @@
     
 
     
-    
+    
     
     
     
diff --git a/docs/components.html b/docs/components.html
index e52780183..0833cbf6b 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -19,7 +19,7 @@
     
 
     
-    
+    
     
     
     
diff --git a/docs/download.html b/docs/download.html
index 7c0367519..cdc129049 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -19,7 +19,7 @@
     
 
     
-    
+    
     
     
     
diff --git a/docs/index.html b/docs/index.html
index 4e3ecd038..958f17bf8 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
     
 
     
-    
+    
     
     
     
diff --git a/docs/javascript.html b/docs/javascript.html
index 9ef609138..9d6b2812d 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -19,7 +19,7 @@
     
 
     
-    
+    
     
     
     
diff --git a/docs/less.html b/docs/less.html
index 1e6c48253..f920a80a8 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -19,7 +19,7 @@
     
 
     
-    
+    
     
     
     
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 7f2bbc09f..77aeea5a3 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -19,7 +19,7 @@
     
 
     
-    
+    
     
     
     
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 0bcfaeb63..3435e3579 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -19,7 +19,7 @@
     
 
     
-    
+    
     
     
     
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 33b4d939a..c7e6c815f 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -19,7 +19,7 @@
     
 
     
-    
+    
     
     
     
-- 
cgit v1.2.3


From 324ebb59900fd69411aec323a85953aec8c55bb6 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 10:47:08 -0800
Subject: spec'ed out an examples overview page with links to current examples;
 examples still need work themselves though

---
 bootstrap.css                          |   2 +-
 docs/examples.html                     | 123 +++++++++++++++++++++++++++++++++
 docs/index.html                        |   2 +-
 docs/templates/pages/examples.mustache |  26 +++++++
 docs/templates/pages/index.mustache    |   2 +-
 5 files changed, 152 insertions(+), 3 deletions(-)
 create mode 100644 docs/examples.html
 create mode 100644 docs/templates/pages/examples.mustache

diff --git a/bootstrap.css b/bootstrap.css
index d90ec9188..d028d2b3e 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 10:01:08 PST 2012
+ * Date: Wed Jan 25 10:46:38 PST 2012
  */
 article,
 aside,
diff --git a/docs/examples.html b/docs/examples.html
new file mode 100644
index 000000000..04ca7fd68
--- /dev/null
+++ b/docs/examples.html
@@ -0,0 +1,123 @@
+
+
+  
+    
+    Bootstrap, from Twitter
+    
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+  
+
+  
+  
+  
+    
      
+      
      
+        
      
+          Bootstrap
+          
+        
      
+      
      
+    
      
+
+    
      
+
+
      
+  Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
+
      
+
+
+
      
+  
      Bootstrap examples
      
+  
      Use these examples as starting points for your work with Bootstrap. We encourage everyone to iterate on these examples and not simply use them as an end result.
      
+
      
+
+
+
+
+
      
+  
      
+    
      Examples from 1.x
      
+  
      
+
+
      Container app
      
+
      Fluid layout
      
+
      Reversed fluid layout
      
+
      Hero marketing site
      
+
+
      
+
+     
+      
+
+    
      
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
diff --git a/docs/index.html b/docs/index.html
index 958f17bf8..2a6078cbe 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -115,7 +115,7 @@
 
         
      
           
      Built with Bootstrap.
      
-          
      For even more sites built with Bootstrap, visit the unofficial Tumblr.
      
+          
      For even more sites built with Bootstrap, visit the unofficial Tumblr or browse the examples.
      
           
      
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 5da0e6989..2566eb05e 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -388,13 +388,13 @@
       
      
         
       
       
 
      -- 
cgit v1.2.3


From e49e49ff9557676d9018b410cea14a7f9f399733 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 10:51:26 -0800
Subject: fix mention of old vertical forms class'

---
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 5d6772701..1a9c4e15a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -868,7 +868,7 @@
     
       
         Vertical (default)
-        .vertical-form (not required)
+        .form-vertical (not required)
         Stacked, left-aligned labels over controls
       
       
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4c7051078..4263bead3 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -804,7 +804,7 @@
     
       
         {{_i}}Vertical (default){{/i}}
-        .vertical-form ({{_i}}not required{{/i}})
+        .form-vertical ({{_i}}not required{{/i}})
         {{_i}}Stacked, left-aligned labels over controls{{/i}}
       
       
-- 
cgit v1.2.3


From 6cbf2f402432187f79aea1a938a08f1ce876fd2d Mon Sep 17 00:00:00 2001
From: Jon Stevens 
Date: Wed, 25 Jan 2012 10:59:45 -0800
Subject: s/#fff/@white/

---
 lib/carousel.less      | 2 +-
 lib/progress-bars.less | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/carousel.less b/lib/carousel.less
index 27c1ba660..8ada01f20 100644
--- a/lib/carousel.less
+++ b/lib/carousel.less
@@ -71,7 +71,7 @@
   color: #fff;
   text-align: center;
   background: @grayDarker;
-  border: 3px solid #fff;
+  border: 3px solid @white;
   .border-radius(23px);
   .opacity(50);
   .transition(all .2s linear);
diff --git a/lib/progress-bars.less b/lib/progress-bars.less
index c1a3f9792..ff754b817 100644
--- a/lib/progress-bars.less
+++ b/lib/progress-bars.less
@@ -46,7 +46,7 @@
 .progress .bar {
   width: 0%;
   height: 18px;
-  color: #fff;
+  color: @white;
   font-size: 12px;
   text-align: center;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-- 
cgit v1.2.3


From 0b2dd16e7293fa11f453abf67395493cbfe18935 Mon Sep 17 00:00:00 2001
From: Jon Stevens 
Date: Wed, 25 Jan 2012 11:02:28 -0800
Subject: missed a white

---
 lib/carousel.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/carousel.less b/lib/carousel.less
index 8ada01f20..b0e95bfe9 100644
--- a/lib/carousel.less
+++ b/lib/carousel.less
@@ -68,7 +68,7 @@
   font-size: 60px;
   font-weight: 100;
   line-height: 30px;
-  color: #fff;
+  color: @white;
   text-align: center;
   background: @grayDarker;
   border: 3px solid @white;
-- 
cgit v1.2.3


From 603aaa01ef487d912569459adc69bc06eb0ade52 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 11:05:23 -0800
Subject: remake after updating variables from @lookfirst

---
 bootstrap.css     | 8 ++++----
 bootstrap.min.css | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 767624b14..33260da9e 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 10:47:55 PST 2012
+ * Date: Wed Jan 25 11:05:15 PST 2012
  */
 article,
 aside,
@@ -2776,7 +2776,7 @@ a.thumbnail:hover {
 .progress .bar {
   width: 0%;
   height: 18px;
-  color: #fff;
+  color: #ffffff;
   font-size: 12px;
   text-align: center;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -2957,10 +2957,10 @@ a.thumbnail:hover {
   font-size: 60px;
   font-weight: 100;
   line-height: 30px;
-  color: #fff;
+  color: #ffffff;
   text-align: center;
   background: #222222;
-  border: 3px solid #fff;
+  border: 3px solid #ffffff;
   -webkit-border-radius: 23px;
   -moz-border-radius: 23px;
   border-radius: 23px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 01342ea84..f9f4d074d 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -506,7 +506,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .label.notice{background-color:#62cffc;}
 @-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .progress{height:18px;margin-bottom:18px;background-color:#f9f9f9;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9));background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
-.progress .bar{width:0%;height:18px;color:#fff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0480be;background-image:-khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0480be;background-image:-khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
 .progress.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
 .progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
 .progress.danger .bar{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
@@ -531,7 +531,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .carousel .next.left,.carousel .prev.right{left:0;}
 .carousel .active.left{left:-100%;}
 .carousel .active.right{left:100%;}
-.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;filter:alpha(opacity=50);-moz-opacity:0.5;opacity:0.5;-webkit-transition:all 0.2s linear;-moz-transition:all 0.2s linear;-ms-transition:all 0.2s linear;-o-transition:all 0.2s linear;transition:all 0.2s linear;}.carousel-control.right{left:auto;right:15px;}
+.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;filter:alpha(opacity=50);-moz-opacity:0.5;opacity:0.5;-webkit-transition:all 0.2s linear;-moz-transition:all 0.2s linear;-ms-transition:all 0.2s linear;-o-transition:all 0.2s linear;transition:all 0.2s linear;}.carousel-control.right{left:auto;right:15px;}
 .carousel-control:hover{color:#ffffff;text-decoration:none;filter:alpha(opacity=90);-moz-opacity:0.9;opacity:0.9;}
 .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
 .carousel-caption h4,.carousel-caption p{color:#ffffff;}
-- 
cgit v1.2.3


From fd3c6733a2d7b8f3afa3fc8511162e23ad1ac412 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 11:11:22 -0800
Subject: missing icon class in code example

---
 docs/components.html                     | 2 +-
 docs/templates/pages/components.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/components.html b/docs/components.html
index 5991cba36..a7a447084 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -466,7 +466,7 @@
   ...
   <li>
     <a href="#">
-      <i class="book"></i>
+      <i class="icon book"></i>
       Library
     </a>
   </li>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 2566eb05e..effa10762 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -402,7 +402,7 @@
   ...
   <li>
     <a href="#">
-      <i class="book"></i>
+      <i class="icon book"></i>
       {{_i}}Library{{/i}}
     </a>
   </li>
-- 
cgit v1.2.3


From cfa925cab6dbb10af28ddca6d38e76aed97bb1ef Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 11:15:48 -0800
Subject: remake after merging large button group fix

---
 bootstrap.css     | 5 +----
 bootstrap.min.css | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 33260da9e..8069c5d25 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 11:05:15 PST 2012
+ * Date: Wed Jan 25 11:15:41 PST 2012
  */
 article,
 aside,
@@ -2597,9 +2597,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -moz-border-radius: 5px;
   border-radius: 5px;
 }
-.btn-group.open .dropdown-menu.large {
-  top: 40px;
-}
 .btn-group.open .dropdown-toggle {
   background-image: none;
   -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
diff --git a/bootstrap.min.css b/bootstrap.min.css
index f9f4d074d..216af09ce 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -477,7 +477,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
 .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;}
 .btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);}
-.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}.btn-group.open .dropdown-menu.large{top:40px;}
+.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
 .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
 .btn .caret{margin-top:6px;margin-left:0;}
 .primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;filter:alpha(opacity=75);-moz-opacity:0.75;opacity:0.75;}
-- 
cgit v1.2.3


From d3c5dd4e6acc421e06ef72680e794cfd9d52a04a Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 11:21:44 -0800
Subject: updated comments in forms.less and added uneditable-textarea class to
 extend uneditable-input

---
 bootstrap.css     | 10 ++++++++--
 bootstrap.min.css |  1 +
 lib/forms.less    |  8 ++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 8069c5d25..0166a3201 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 11:15:41 PST 2012
+ * Date: Wed Jan 25 11:21:22 PST 2012
  */
 article,
 aside,
@@ -510,13 +510,17 @@ select,
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
 input[type=image], input[type=checkbox], input[type=radio] {
   width: auto;
   height: auto;
   padding: 0;
   margin: 3px 0;
   *margin-top: 0;
-  /* IE6-7 */
+  /* IE7 */
 
   line-height: normal;
   border: none;
@@ -538,6 +542,8 @@ input[type=button], input[type=reset], input[type=submit] {
 }
 select, input[type=file] {
   height: 27px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
   *margin-top: 4px;
   /* For IE7, add top margin to align select with labels */
 
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 216af09ce..438305f71 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -95,6 +95,7 @@ legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;li
 label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
 input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.uneditable-textarea{width:auto;height:auto;}
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
 input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
diff --git a/lib/forms.less b/lib/forms.less
index 100b0ab91..178c21018 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -63,6 +63,10 @@ select,
   border: 1px solid #ccc;
   .border-radius(3px);
 }
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
 
 // Mini reset for unique input types
 input[type=image],
@@ -72,7 +76,7 @@ input[type=radio] {
   height: auto;
   padding: 0;
   margin: 3px 0;
-  *margin-top: 0; /* IE6-7 */
+  *margin-top: 0; /* IE7 */
   line-height: normal;
   border: none;
   cursor: pointer;
@@ -99,7 +103,7 @@ input[type=submit] {
 // Set the height of select and file controls to match text inputs
 select,
 input[type=file] {
-  height: @baseLineHeight * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
+  height: @baseLineHeight * 1.5; /* In IE7, the height of the select element cannot be changed by height, only font-size */
   *margin-top: 4px; /* For IE7, add top margin to align select with labels */
   line-height: @baseLineHeight * 1.5;
 }
-- 
cgit v1.2.3


From 25519bacd56ee2507cdde727d85458e5e5ef7949 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Wed, 25 Jan 2012 11:25:35 -0800
Subject: rebuild + add spy to template

---
 bootstrap-responsive.min.css   | 2 +-
 bootstrap.css                  | 4 ++--
 bootstrap.min.css              | 2 +-
 docs/base-css.html             | 2 +-
 docs/components.html           | 2 +-
 docs/download.html             | 2 +-
 docs/examples.html             | 2 +-
 docs/index.html                | 2 +-
 docs/javascript.html           | 2 +-
 docs/less.html                 | 2 +-
 docs/scaffolding.html          | 2 +-
 docs/templates/layout.mustache | 2 +-
 docs/upgrading.html            | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
index 6a97d792b..31c1fdbef 100644
--- a/bootstrap-responsive.min.css
+++ b/bootstrap-responsive.min.css
@@ -1,3 +1,3 @@
 
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
+@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
diff --git a/bootstrap.css b/bootstrap.css
index 0166a3201..e548f5afc 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 11:21:22 PST 2012
+ * Date: Wed Jan 25 11:23:36 PST 2012
  */
 article,
 aside,
@@ -1864,7 +1864,7 @@ table .headerSortUp:after {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 438305f71..a9caab69b 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -379,7 +379,7 @@ table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;b
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
diff --git a/docs/base-css.html b/docs/base-css.html
index 1a9c4e15a..b0a6743f3 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -25,7 +25,7 @@
     
   
 
-  
+  
   
   
diff --git a/docs/components.html b/docs/components.html
index a7a447084..56c5280db 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -25,7 +25,7 @@
     
   
 
-  
+  
   
   
diff --git a/docs/download.html b/docs/download.html
index cdc129049..e873b5e74 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -25,7 +25,7 @@
     
   
 
-  
+  
   
   
diff --git a/docs/examples.html b/docs/examples.html
index 04ca7fd68..bc52bea55 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -25,7 +25,7 @@
     
   
 
-  
+  
   
   
diff --git a/docs/index.html b/docs/index.html
index 2a6078cbe..0835c4647 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -25,7 +25,7 @@
     
   
 
-  
+  
   
   
diff --git a/docs/javascript.html b/docs/javascript.html
index 9d6b2812d..eb291a1a3 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -25,7 +25,7 @@
     
   
 
-  
+  
   
   
diff --git a/docs/less.html b/docs/less.html
index f920a80a8..c77ba9706 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -25,7 +25,7 @@
     
   
 
-  
+  
   
   
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 77aeea5a3..8245f860c 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -25,7 +25,7 @@
     
   
 
-  
+  
   
   
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 3435e3579..addcb224f 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -25,7 +25,7 @@
     
   
 
-  
+  
   
   
diff --git a/docs/upgrading.html b/docs/upgrading.html
index c7e6c815f..fb1fbfcfe 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -25,7 +25,7 @@
     
   
 
-  
+  
   
   
-- 
cgit v1.2.3


From b8511568637dfa4decb3f0475436a3dfa637a57d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 11:26:45 -0800
Subject: change form fields back to inline-block to allow for inline-help text
 in default form markup

---
 bootstrap.css                          | 4 ++--
 bootstrap.min.css                      | 2 +-
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 lib/forms.less                         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 0166a3201..39add8696 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 11:21:22 PST 2012
+ * Date: Wed Jan 25 11:24:56 PST 2012
  */
 article,
 aside,
@@ -497,7 +497,7 @@ input,
 textarea,
 select,
 .uneditable-input {
-  display: block;
+  display: inline-block;
   width: 210px;
   height: 18px;
   padding: 4px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 438305f71..20614ea73 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -94,7 +94,7 @@ fieldset{padding:0;margin:0;border:0;}
 legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
 label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
-input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 .uneditable-textarea{width:auto;height:auto;}
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
 input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
diff --git a/docs/base-css.html b/docs/base-css.html
index 1a9c4e15a..057c98b85 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -899,7 +899,7 @@
     
      
       
      
         
-        
+         Associated help text!
         
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4263bead3..4daa98309 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -835,7 +835,7 @@
     
      
       
         
-        
+         Associated help text!
         
diff --git a/lib/forms.less b/lib/forms.less
index 178c21018..70a065bdb 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -52,7 +52,7 @@ input,
 textarea,
 select,
 .uneditable-input {
-  display: block;
+  display: inline-block;
   width: 210px;
   height: @baseLineHeight;
   padding: 4px;
-- 
cgit v1.2.3


From a4b8cc2a9c8c7f16c4a93e64d2a187d839bfbb40 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 11:30:30 -0800
Subject: darken active state on subnav with scrollspy added

---
 docs/assets/css/docs.css | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 0fe480ecb..600894f38 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -132,6 +132,7 @@ section {
 .subnav {
   width: 100%;
   height: 36px;
+  overflow: hidden;
   background-color: #eeeeee; /* Old browsers */
   background-repeat: repeat-x; /* Repeat the gradient */
   background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
@@ -167,13 +168,10 @@ section {
   color: #333;
 }
 .subnav .nav .active a {
-  background-color: #eee;
+  background-color: #e5e5e5;
 }
 .subnav .nav li:first-child a {
   border-left: 0;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
 }
 .subnav .nav li:last-child a {
   border-right: 0;
-- 
cgit v1.2.3


From 58d08a2db3e2ed1b789a5290ced2f0327c9c163b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 11:35:08 -0800
Subject: enable support for form states on select elements

---
 bootstrap.css                          | 14 +++++++-------
 bootstrap.min.css                      |  6 +++---
 docs/base-css.html                     | 13 +++++++++++++
 docs/templates/pages/base-css.mustache | 13 +++++++++++++
 lib/forms.less                         |  1 +
 5 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 730167f51..4bffde24d 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 11:27:15 PST 2012
+ * Date: Wed Jan 25 11:31:57 PST 2012
  */
 article,
 aside,
@@ -715,11 +715,11 @@ textarea[readonly] {
 .control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline {
   color: #c09853;
 }
-.control-group.warning input, .control-group.warning textarea {
+.control-group.warning input, .control-group.warning select, .control-group.warning textarea {
   color: #c09853;
   border-color: #c09853;
 }
-.control-group.warning input:focus, .control-group.warning textarea:focus {
+.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
   border-color: #a47e3c;
   -webkit-box-shadow: 0 0 6px #dbc59e;
   -moz-box-shadow: 0 0 6px #dbc59e;
@@ -733,11 +733,11 @@ textarea[readonly] {
 .control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline {
   color: #b94a48;
 }
-.control-group.error input, .control-group.error textarea {
+.control-group.error input, .control-group.error select, .control-group.error textarea {
   color: #b94a48;
   border-color: #b94a48;
 }
-.control-group.error input:focus, .control-group.error textarea:focus {
+.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
   border-color: #953b39;
   -webkit-box-shadow: 0 0 6px #d59392;
   -moz-box-shadow: 0 0 6px #d59392;
@@ -751,11 +751,11 @@ textarea[readonly] {
 .control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline {
   color: #468847;
 }
-.control-group.success input, .control-group.success textarea {
+.control-group.success input, .control-group.success select, .control-group.success textarea {
   color: #468847;
   border-color: #468847;
 }
-.control-group.success input:focus, .control-group.success textarea:focus {
+.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
   border-color: #356635;
   -webkit-box-shadow: 0 0 6px #7aba7b;
   -moz-box-shadow: 0 0 6px #7aba7b;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 20614ea73..c800de5e0 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -145,13 +145,13 @@ select.span11{width:870px;}
 select.span12{width:950px;}
 input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
 .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
-.control-group.warning input,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
+.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
 .control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
 .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
-.control-group.error input,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
+.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
 .control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
 .control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
-.control-group.success input,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
+.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
 .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
 input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
 .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
diff --git a/docs/base-css.html b/docs/base-css.html
index a8a87da42..1e9a3d942 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1066,6 +1066,19 @@
             Woohoo!
           
      
         
+        
      
+          
+          
      
+            
+            Woohoo!
+          
      
+        
      
         
      
           
           
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4daa98309..913eea31a 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1002,6 +1002,19 @@
             {{_i}}Woohoo!{{/i}}
           
      
         
+        
      
+          
+          
      
+            
+            {{_i}}Woohoo!{{/i}}
+          
      
+        
      
         
      
           
           
diff --git a/lib/forms.less b/lib/forms.less
index 70a065bdb..3b35a172c 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -283,6 +283,7 @@ textarea[readonly] {
   }
   // Style inputs accordingly
   input,
+  select,
   textarea {
     color: @textColor;
     border-color: @borderColor;
-- 
cgit v1.2.3


From 06017b26ca5a9c835edb9d42188431fa30c7e499 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 11:47:36 -0800
Subject: fix bottom visual bug on carousel images

---
 bootstrap.css     | 6 +++++-
 bootstrap.min.css | 1 +
 lib/carousel.less | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/bootstrap.css b/bootstrap.css
index 4bffde24d..7a538c717 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 11:31:57 PST 2012
+ * Date: Wed Jan 25 11:47:25 PST 2012
  */
 article,
 aside,
@@ -2924,6 +2924,10 @@ a.thumbnail:hover {
   -o-transition: 0.6s ease-in-out left;
   transition: 0.6s ease-in-out left;
 }
+.carousel .item > img {
+  display: block;
+  line-height: 1;
+}
 .carousel .active, .carousel .next, .carousel .prev {
   display: block;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index c800de5e0..87ea670e0 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -524,6 +524,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .carousel{position:relative;line-height:1;}
 .carousel-inner{overflow:hidden;width:100%;position:relative;}
 .carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}
+.carousel .item>img{display:block;line-height:1;}
 .carousel .active,.carousel .next,.carousel .prev{display:block;}
 .carousel .active{left:0;}
 .carousel .next,.carousel .prev{position:absolute;top:0;width:100%;}
diff --git a/lib/carousel.less b/lib/carousel.less
index b0e95bfe9..254a9f60c 100644
--- a/lib/carousel.less
+++ b/lib/carousel.less
@@ -20,6 +20,12 @@
     .transition(.6s ease-in-out left);
   }
 
+  // Account for jankitude on images
+  .item > img {
+    display: block;
+    line-height: 1;
+  }
+
   .active, 
   .next, 
   .prev { display: block; }
-- 
cgit v1.2.3


From 319b65e64b6882ad2184f398f1763543cfa48a16 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Wed, 25 Jan 2012 11:49:00 -0800
Subject: prevent default

---
 js/bootstrap-carousel.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index 3262f0cab..500c7da7f 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -147,6 +147,7 @@
         , $target = $($this.attr('data-target') || $this.attr('href'))
         , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
       $target.carousel(options)
+      e.preventDefault()
     })
   })
 
-- 
cgit v1.2.3


From 04f84997c18f2f132c8173f728f72b6b7aef52d1 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Wed, 25 Jan 2012 11:49:34 -0800
Subject: rebuil

---
 bootstrap-responsive.min.css | 2 +-
 bootstrap.css                | 4 ++--
 bootstrap.min.css            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
index 6a97d792b..31c1fdbef 100644
--- a/bootstrap-responsive.min.css
+++ b/bootstrap-responsive.min.css
@@ -1,3 +1,3 @@
 
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
+@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
diff --git a/bootstrap.css b/bootstrap.css
index 7a538c717..b9cd608ae 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 11:47:25 PST 2012
+ * Date: Wed Jan 25 11:49:21 PST 2012
  */
 article,
 aside,
@@ -1864,7 +1864,7 @@ table .headerSortUp:after {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 87ea670e0..eeb88b285 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -379,7 +379,7 @@ table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;b
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
-- 
cgit v1.2.3


From 86191d898b2520611b537892e33be3b179f83199 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 11:51:13 -0800
Subject: height auto on mutli select

---
 bootstrap.css     | 4 ++--
 bootstrap.min.css | 2 +-
 lib/forms.less    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 7a538c717..1556d7704 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 11:47:25 PST 2012
+ * Date: Wed Jan 25 11:50:14 PST 2012
  */
 article,
 aside,
@@ -555,7 +555,7 @@ select {
   background-color: #ffffff;
 }
 select[multiple], select[size] {
-  height: inherit;
+  height: auto;
 }
 input[type=image] {
   -webkit-box-shadow: none;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 87ea670e0..817482950 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -101,7 +101,7 @@ input[type=file]{padding:initial;line-height:initial;border:initial;background-c
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
 select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;}
 select{width:220px;vertical-align:middle;background-color:#ffffff;}
-select[multiple],select[size]{height:inherit;}
+select[multiple],select[size]{height:auto;}
 input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 textarea{height:auto;}
 .radio,.checkbox{padding-left:18px;}
diff --git a/lib/forms.less b/lib/forms.less
index 3b35a172c..355a33a30 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -118,7 +118,7 @@ select {
 // Make multiple select elements height not fixed
 select[multiple],
 select[size] {
-  height: inherit;
+  height: auto;
 }
 
 // Remove shadow from image inputs
-- 
cgit v1.2.3


From 2b2c72b9aae6db9505d0fdb3abc1832de8e0ce7f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 12:04:19 -0800
Subject: fix select alignment and height

---
 bootstrap.css     | 8 ++++----
 bootstrap.min.css | 4 ++--
 lib/forms.less    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 1556d7704..c53264a2d 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 11:50:14 PST 2012
+ * Date: Wed Jan 25 12:03:47 PST 2012
  */
 article,
 aside,
@@ -541,17 +541,17 @@ input[type=button], input[type=reset], input[type=submit] {
   height: auto;
 }
 select, input[type=file] {
-  height: 27px;
+  height: 28px;
   /* In IE7, the height of the select element cannot be changed by height, only font-size */
 
   *margin-top: 4px;
   /* For IE7, add top margin to align select with labels */
 
-  line-height: 27px;
+  line-height: 28px;
 }
 select {
   width: 220px;
-  vertical-align: middle;
+  vertical-align: baseline;
   background-color: #ffffff;
 }
 select[multiple], select[size] {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 817482950..447ecbb2d 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -99,8 +99,8 @@ input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
 input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
-select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;}
-select{width:220px;vertical-align:middle;background-color:#ffffff;}
+select,input[type=file]{height:28px;*margin-top:4px;line-height:28px;}
+select{width:220px;vertical-align:baseline;background-color:#ffffff;}
 select[multiple],select[size]{height:auto;}
 input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 textarea{height:auto;}
diff --git a/lib/forms.less b/lib/forms.less
index 355a33a30..7451f36ef 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -103,15 +103,15 @@ input[type=submit] {
 // Set the height of select and file controls to match text inputs
 select,
 input[type=file] {
-  height: @baseLineHeight * 1.5; /* In IE7, the height of the select element cannot be changed by height, only font-size */
+  height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
   *margin-top: 4px; /* For IE7, add top margin to align select with labels */
-  line-height: @baseLineHeight * 1.5;
+  line-height: 28px;
 }
 
 // Chrome on Linux and Mobile Safari need background-color
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
-  vertical-align: middle;
+  vertical-align: baseline;
   background-color: @white;
 }
 
-- 
cgit v1.2.3


From 9c4a70c597a35f772bb21cb60dd7812146fc29ee Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 12:43:38 -0800
Subject: swap fieldsets for divs

---
 docs/base-css.html                     | 88 +++++++++++++++++-----------------
 docs/templates/pages/base-css.mustache | 88 +++++++++++++++++-----------------
 2 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 1e9a3d942..60b5640df 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -940,14 +940,14 @@
     
      
       
         Controls Bootstrap supports
-        
      
+        
      
           
           
      
             
             
      In addition to freeform text, any HTML5 text-based input appears like so.
      
           
      
-        
      
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
      
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
-        
+        
      
       
     
      
     
      
@@ -1024,19 +1024,19 @@
     
      
       
      
         Form control states
-        
      
+        
      
           
           
      
             
           
      
-        
      
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             Something may have gone wrong
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             Please correct the error
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             Woohoo!
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             Woohoo!
           
      
-        
-        
      
+        
      
+        
      
           
           
-        
+        
      
       
     
      
     
      
@@ -1108,7 +1108,7 @@
     
      
       
      
         Extending form controls
-        
      
+        
      
           
           
      
             
@@ -1116,8 +1116,8 @@
             
             
      Use the same .span* classes from the grid system for input sizes.
      
           
      
-        
      
-        
      
+        
      
+        
      
           
           
      
             
      
@@ -1126,8 +1126,8 @@
             
      
             
      Here's some help text
      
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
      
@@ -1136,8 +1136,8 @@
             
      
             
      Here's more help text
      
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
-        
+        
      
       
     
      
     
      
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 913eea31a..7a85d1138 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -876,14 +876,14 @@
     
      
       
      
         {{_i}}Controls Bootstrap supports{{/i}}
-        
      
+        
      
           
           
      
             
             
      {{_i}}In addition to freeform text, any HTML5 text-based input appears like so.{{/i}}
      
           
      
-        
      
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
-        
+        
      
       
     
      
     
      
@@ -960,19 +960,19 @@
     
      
       
      
         {{_i}}Form control states{{/i}}
-        
      
+        
      
           
           
      
             
           
      
-        
      
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             {{_i}}Something may have gone wrong{{/i}}
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             {{_i}}Please correct the error{{/i}}
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             {{_i}}Woohoo!{{/i}}
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             {{_i}}Woohoo!{{/i}}
           
      
-        
-        
      
+        
      
+        
      
           
           
-        
+        
      
       
     
      
     
      
@@ -1044,7 +1044,7 @@
     
      
       
      
         {{_i}}Extending form controls{{/i}}
-        
      
+        
      
           
           
      
             
@@ -1052,8 +1052,8 @@
             
             
      {{_i}}Use the same .span* classes from the grid system for input sizes.{{/i}}
      
           
      
-        
      
-        
      
+        
      
+        
      
           
           
      
             
      
@@ -1062,8 +1062,8 @@
             
      
             
      {{_i}}Here's some help text{{/i}}
      
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
      
@@ -1072,8 +1072,8 @@
             
      
             
      {{_i}}Here's more help text{{/i}}
      
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
             
      {{_i}}Note: Labels surround all the options for much larger click areas and a more usable form.{{/i}}
      
           
      
-        
-        
      
+        
      
+        
      
           
           
      
             
           
      
-        
-        
      
+        
      
+        
      
           
           
-        
+        
      
       
     
      
     
      
-- 
cgit v1.2.3


From 4ea63e5261ba0c10e2b729e2216105896108733b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 13:33:55 -0800
Subject: finish off the static stuff for build and download page

---
 docs/assets/css/docs.css                 |  39 +++--
 docs/assets/img/twitter-logo-no-bird.png | Bin 1509 -> 0 bytes
 docs/base-css.html                       | 252 ++++++++++++++++---------------
 docs/download.html                       |  28 +++-
 docs/templates/pages/base-css.mustache   | 252 ++++++++++++++++---------------
 docs/templates/pages/download.mustache   |  28 +++-
 6 files changed, 329 insertions(+), 270 deletions(-)
 delete mode 100644 docs/assets/img/twitter-logo-no-bird.png

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 600894f38..739ae1fc4 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -125,7 +125,7 @@ section {
   margin-right: 0;
 }
 .subhead h1 {
-  font-size: 45px;
+  font-size: 54px;
 }
 
 /* Subnav */
@@ -168,10 +168,17 @@ section {
   color: #333;
 }
 .subnav .nav .active a {
-  background-color: #e5e5e5;
+  background-color: #e9e9e9;
+  border-right-color: #ddd;
+  border-left: 0;
+  padding-left: 13px;
+  -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.075);
+     -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.075);
+          box-shadow: inset 0 3px 5px rgba(0,0,0,.075);
 }
 .subnav .nav li:first-child a {
   border-left: 0;
+  padding-left: 12px;
 }
 .subnav .nav li:last-child a {
   border-right: 0;
@@ -464,7 +471,6 @@ section {
   font-family: Menlo, Monaco, "Courier New", monospace;
   font-size: 12px;
   color: #d14;
-  background-color: #f7f7f9;
 }
 .download-builder input[type=text]:focus {
   background-color: #fff;
@@ -473,7 +479,6 @@ section {
 /* Custom, larger checkbox labels */
 .download .checkbox {
   padding: 6px 10px 6px 25px;
-  font-size: 14px;
   color: #555;
   background-color: #f9f9f9;
   -webkit-border-radius: 3px;
@@ -485,10 +490,6 @@ section {
   color: #333;
   background-color: #f5f5f5;
 }
-.download .checkbox input[type=checkbox] {
-  position: relative;
-  top: 1px;
-}
 .download .checkbox small {
   font-size: 12px;
   color: #777;
@@ -496,17 +497,23 @@ section {
 
 /* Giant download button */
 .download-btn {
-  pading: 18px 20px;
-  margin: 45px 0;
+  margin: 36px 0 108px;
+}
+.download p,
+.download h4 {
+  max-width: 50%;
+  margin: 0 auto 18px;
+  color: #999;
   text-align: center;
-  border: 1px solid #eee;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
+}
+.download-btn h4 {
+  margin-bottom: 0;
 }
 .btn.xlarge {
-  margin: 36px auto;
-  padding: 14px 24px;
+  display: block;
+  width: auto;
+  padding: 19px 24px;
+  margin-bottom: 27px;
   font-size: 30px;
   text-align: center;
   -webkit-border-radius: 6px;
diff --git a/docs/assets/img/twitter-logo-no-bird.png b/docs/assets/img/twitter-logo-no-bird.png
deleted file mode 100644
index 70b6573d7..000000000
Binary files a/docs/assets/img/twitter-logo-no-bird.png and /dev/null differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 60b5640df..8340e0f60 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1023,66 +1023,68 @@
   
      
     
      
       
      
-        Form control states
-        
      
-          
-          
      
-            
+        
      
+          Form control states
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            Something may have gone wrong
+          
      
+            
+            
      
+              
+              Something may have gone wrong
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            Please correct the error
+          
      
+            
+            
      
+              
+              Please correct the error
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            Woohoo!
+          
      
+            
+            
      
+              
+              Woohoo!
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            Woohoo!
+          
      
+            
+            
      
+              
+              Woohoo!
+            
      
           
      
-        
      
-        
      
-          
-          
-        
      
+          
      
+            
+            
+          
      
+        
       
     
      
     
      
@@ -1107,85 +1109,87 @@
   
      
     
      
       
      
-        Extending form controls
-        
      
-          
-          
      
-            
-            
-            
-            
      Use the same .span* classes from the grid system for input sizes.
      
+        
      
+          Extending form controls
+          
      
+            
+            
      
+              
+              
+              
+              
      Use the same .span* classes from the grid system for input sizes.
      
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
      
-              @
-              
+          
      
+            
+            
      
+              
      
+                @
+                
+              
      
+              
      Here's some help text
      
             
      
-            
      Here's some help text
      
           
      
-        
      
-        
      
-          
-          
      
-            
      
-              
-              .00
+          
      
+            
+            
      
+              
      
+                
+                .00
+              
      
+              
      Here's more help text
      
             
      
-            
      Here's more help text
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            
-            
+          
      
+            
+            
      
+              
+              
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            
-            
-            
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
+          
      
+            
+            
      
+              
+              
+              
+              
      Note: Labels surround all the options for much larger click areas and a more usable form.
      
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            
+          
      
+            
+            
      
+              
+              
+            
      
           
      
-        
      
-        
      
-          
-          
-        
      
+          
      
+            
+            
+          
      
+        
       
     
      
     
      
diff --git a/docs/download.html b/docs/download.html
index e873b5e74..d4c31ed4d 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -69,11 +69,19 @@
 
 
      
-  
      Download and customize Bootstrap
      
+  
      Download and customize
      
   
      Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.
      
+  
      
+    
+  
      
 
      
 
-
      
+
      
   
      
     Toggle all
     
      
@@ -131,7 +139,9 @@
       
     
      
   
      
+
 
+
      
   
      
     Reset to defaults
     
      
@@ -207,7 +217,9 @@
       
     
      
   
      
+
 
+
      
   
      
     Toggle all
     
      
@@ -273,11 +285,21 @@
       
      All plugins require the latest version of jQuery to be included.
      
     
      
   
      
+
 
+
      
+  
      
+    
      
+      4. Download
+      
+    
      
+  
      
   
      
     Build and Download
+    
      What's included?
      
+    
      Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.
      
   
      
-
      
+
 
      
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 7a85d1138..cbc0519e5 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -959,66 +959,68 @@
   
      
     
      
       
      
-        {{_i}}Form control states{{/i}}
-        
      
-          
-          
      
-            
+        
      
+          {{_i}}Form control states{{/i}}
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
+          
      
+            
+            
      
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            {{_i}}Something may have gone wrong{{/i}}
+          
      
+            
+            
      
+              
+              {{_i}}Something may have gone wrong{{/i}}
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            {{_i}}Please correct the error{{/i}}
+          
      
+            
+            
      
+              
+              {{_i}}Please correct the error{{/i}}
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            {{_i}}Woohoo!{{/i}}
+          
      
+            
+            
      
+              
+              {{_i}}Woohoo!{{/i}}
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            {{_i}}Woohoo!{{/i}}
+          
      
+            
+            
      
+              
+              {{_i}}Woohoo!{{/i}}
+            
      
           
      
-        
      
-        
      
-          
-          
-        
      
+          
      
+            
+            
+          
      
+        
       
     
      
     
      
@@ -1043,85 +1045,87 @@
   
      
     
      
       
      
-        {{_i}}Extending form controls{{/i}}
-        
      
-          
-          
      
-            
-            
-            
-            
      {{_i}}Use the same .span* classes from the grid system for input sizes.{{/i}}
      
+        
      
+          {{_i}}Extending form controls{{/i}}
+          
      
+            
+            
      
+              
+              
+              
+              
      {{_i}}Use the same .span* classes from the grid system for input sizes.{{/i}}
      
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
      
-              @
-              
+          
      
+            
+            
      
+              
      
+                @
+                
+              
      
+              
      {{_i}}Here's some help text{{/i}}
      
             
      
-            
      {{_i}}Here's some help text{{/i}}
      
           
      
-        
      
-        
      
-          
-          
      
-            
      
-              
-              .00
+          
      
+            
+            
      
+              
      
+                
+                .00
+              
      
+              
      {{_i}}Here's more help text{{/i}}
      
             
      
-            
      {{_i}}Here's more help text{{/i}}
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            
-            
+          
      
+            
+            
      
+              
+              
+              
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            
-            
-            
      {{_i}}Note: Labels surround all the options for much larger click areas and a more usable form.{{/i}}
      
+          
      
+            
+            
      
+              
+              
+              
+              
      {{_i}}Note: Labels surround all the options for much larger click areas and a more usable form.{{/i}}
      
+            
      
           
      
-        
      
-        
      
-          
-          
      
-            
-            
+          
      
+            
+            
      
+              
+              
+            
      
           
      
-        
      
-        
      
-          
-          
-        
      
+          
      
+            
+            
+          
      
+        
       
     
      
     
      
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 453bf1141..216098bad 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -5,11 +5,19 @@
 
 
      
-  
      {{_i}}Download and customize Bootstrap{{/i}}
      
+  
      {{_i}}Download and customize{{/i}}
      
   
      {{_i}}Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}
      
+  
      
+    
+  
      
 
      
 
-
      
+
      
   
      
     Toggle all
     
      
@@ -67,7 +75,9 @@
       
     
      
   
      
+
 
+
      
   
      
     Reset to defaults
     
      
@@ -143,7 +153,9 @@
       
     
      
   
      
+
 
+
      
   
      
     Toggle all
     
      
@@ -209,8 +221,18 @@
       
      {{_i}}All plugins require the latest version of jQuery to be included.{{/i}}
      
     
      
   
      
+
 
+
      
+  
      
+    
      
+      4. Download
+      
+    
      
+  
      
   
      
     Build and Download
+    
      What's included?
      
+    
      Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.
      
   
      
-
      
+
-- 
cgit v1.2.3


From 7ca3b98d885071bc032ca28e20452ad879cea422 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 13:56:44 -0800
Subject: docs fixes

---
 docs/assets/css/docs.css               |  6 +++---
 docs/download.html                     |  4 ++--
 docs/index.html                        | 30 +++++++++++++++---------------
 docs/templates/pages/download.mustache |  4 ++--
 docs/templates/pages/index.mustache    | 30 +++++++++++++++---------------
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 739ae1fc4..b70b039f2 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -266,12 +266,12 @@ section {
 .marketing p {
   margin-right: 10px;
 }
-.marketing .icon {
+.marketing .bs-icon {
   float: left;
   margin: 7px 10px 0 0;
   opacity: .8;
 }
-.marketing .small-icon {
+.marketing .small-bs-icon {
   float: left;
   margin: 4px 5px 0 0;
 }
@@ -497,7 +497,7 @@ section {
 
 /* Giant download button */
 .download-btn {
-  margin: 36px 0 108px;
+  margin: 36px 0 108px.i;
 }
 .download p,
 .download h4 {
diff --git a/docs/download.html b/docs/download.html
index d4c31ed4d..7b045ae8e 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -76,7 +76,7 @@
       
    • 1. Select components
      • 
       
    • 2. Modify variables
      • 
       
    • 3. Select jQuery plugins
      • 
-      
    • 4. Build and download
      • 
+      
    • 4. Customize and download
      • 
     
   
      
 
@@ -295,7 +295,7 @@
     
   
      
   
      
-    Build and Download
+    Customize and Download
     
      What's included?
      
     
      Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.
      
   
      
diff --git a/docs/index.html b/docs/index.html
index 0835c4647..b866da87c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -71,8 +71,8 @@
             
      Bootstrap,
       from Twitter
      
             
      Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.
      
             
      
-              Download on GitHub
-              Get started →
+              View on GitHub
+              Customize and Download
             
      
 
             
      
@@ -138,73 +138,73 @@
           
      Need reasons to love Bootstrap? Look no further.
      
           
      
             
      
-              
+              
               
      Built for and by nerds
      
               
      Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.
      
             
      
             
      
-              
+              
               
      For all skill levels
      
               
      Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.
      
             
      
             
      
-              
+              
               
      Cross-everything
      
               
      Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.
      
             
      
           
      
           
      
             
      
-              
+              
               
      12-column grid
      
               
      Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.
      
             
      
             
      
-              
+              
               
      Responsive design
      
               
      With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.
      
             
      
             
      
-              
+              
               
      Styleguide docs
      
               
      Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.
      
             
      
           
      
           
      
             
      
-              
+              
               
      Growing library
      
               
      Despite being only 10kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.
      
             
      
             
      
-              
+              
               
      Custom jQuery plugins
      
               
      What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.
      
             
      
             
      
-              
+              
               
      Built on LESS
      
               
      Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.
      
             
      
           
      
           
      
             
      
-              
+              
               
      HTML5
      
               
      Built to support new HTML5 elements and syntax.
      
             
      
             
      
-              
+              
               
      CSS3
      
               
      Progressively enhanced components for ultimate style.
      
             
      
             
      
-              
+              
               
      Open-source
      
               
      Built for and maintained by the community via GitHub.
      
             
      
             
      
-              
+              
               
      Made at Twitter
      
               
      Brought to you by an experienced engineer and designer.
      
             
      
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 216098bad..f5964dc35 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -12,7 +12,7 @@
       
    • {{_i}}1. Select components{{/i}}
      • 
       
    • {{_i}}2. Modify variables{{/i}}
      • 
       
    • {{_i}}3. Select jQuery plugins{{/i}}
      • 
-      
    • {{_i}}4. Build and download{{/i}}
      • 
+      
    • {{_i}}4. Customize and download{{/i}}
      • 
     
   
      
 
@@ -231,7 +231,7 @@
     
   
      
   
      
-    Build and Download
+    Customize and Download
     
      What's included?
      
     
      Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.
      
   
      
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index c3f725a05..ff486bc7b 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -7,8 +7,8 @@
             
      {{_i}}Bootstrap,
       from Twitter{{/i}}
      
             
      {{_i}}Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.{{/i}}
      
             
      
-              {{_i}}Download on GitHub{{/i}}
-              {{_i}}Get started →{{/i}}
+              {{_i}}View on GitHub{{/i}}
+              {{_i}}Customize and Download{{/i}}
             
      
 
             
      
@@ -74,73 +74,73 @@
           
      {{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}
      
           
      
             
      
-              
+              
               
      {{_i}}Built for and by nerds{{/i}}
      
               
      {{_i}}Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.{{/i}}
      
             
      
             
      
-              
+              
               
      {{_i}}For all skill levels{{/i}}
      
               
      {{_i}}Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.{{/i}}
      
             
      
             
      
-              
+              
               
      {{_i}}Cross-everything{{/i}}
      
               
      {{_i}}Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.{{/i}}
      
             
      
           
      
           
      
             
      
-              
+              
               
      {{_i}}12-column grid{{/i}}
      
               
      {{_i}}Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.{{/i}}
      
             
      
             
      
-              
+              
               
      {{_i}}Responsive design{{/i}}
      
               
      {{_i}}With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.{{/i}}
      
             
      
             
      
-              
+              
               
      {{_i}}Styleguide docs{{/i}}
      
               
      {{_i}}Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.{{/i}}
      
             
      
           
      
           
      
             
      
-              
+              
               
      {{_i}}Growing library{{/i}}
      
               
      {{_i}}Despite being only 10kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.{{/i}}
      
             
      
             
      
-              
+              
               
      {{_i}}Custom jQuery plugins{{/i}}
      
               
      {{_i}}What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.{{/i}}
      
             
      
             
      
-              
+              
               
      {{_i}}Built on LESS{{/i}}
      
               
      {{_i}}Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.{{/i}}
      
             
      
           
      
           
      
             
      
-              
+              
               
      HTML5
      
               
      {{_i}}Built to support new HTML5 elements and syntax.{{/i}}
      
             
      
             
      
-              
+              
               
      CSS3
      
               
      {{_i}}Progressively enhanced components for ultimate style.{{/i}}
      
             
      
             
      
-              
+              
               
      {{_i}}Open-source{{/i}}
      
               
      {{_i}}Built for and maintained by the community via GitHub.{{/i}}
      
             
      
             
      
-              
+              
               
      {{_i}}Made at Twitter{{/i}}
      
               
      {{_i}}Brought to you by an experienced engineer and designer.{{/i}}
      
             
      
-- 
cgit v1.2.3


From 7d83f45ebbadf7d100b56f944718763a6ce3e55c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 14:08:51 -0800
Subject: start filling out mixins tables

---
 docs/less.html                     | 46 +++++++++++++++++++-------------------
 docs/templates/pages/less.mustache | 46 +++++++++++++++++++-------------------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/docs/less.html b/docs/less.html
index c77ba9706..23c2c53c6 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -411,7 +411,7 @@
     
      
     
      
       
      Parametric mixins
      
-      
      A parametric mixin is just like a basic mixin, but it also accepts optional paramaters (hence the name).
      
+      
      A parametric mixin is just like a basic mixin, but it also accepts optional Parameters (hence the name).
      
 
         Coming soon!
 
      
@@ -428,45 +428,45 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
     
       
         .clearfix()
-        
-        
+        none
+        Add to any parent to clear floats within
       
       
         .center-block()
-        
-        
+        none
+        Auto center a block-level element using margin: auto
       
       
         .ie7-inline-block()
-        
-        
+        none
+        Use in addition to regular display: inline-block to get IE7 support
       
       
         .size()
-        
-        
+        @height: 5px, @width: 5px
+        Quickly set the height and width on one line
       
       
         .square()
-        
-        
+        @size: 5px
+        Builds on .size() to set the width and height as same value
       
       
         .opacity()
-        
-        
+        @opacity: 100
+        Set, in whole numbers, the opacity percentage (e.g., "50" or "75")
       
       
         .reset-filter()
-        
-        
+        none
+        Resets any IE filter
       
     
   
@@ -475,15 +475,15 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
     
       
         .placeholder()
-        
-        
+        @color: @placeholderText
+        Set the placeholder text color for inputs
       
     
   
@@ -492,7 +492,7 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
@@ -539,7 +539,7 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
@@ -571,7 +571,7 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
@@ -648,7 +648,7 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 0889592eb..51d2295de 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -347,7 +347,7 @@
     
      
     
      
       
      Parametric mixins
      
-      
      A parametric mixin is just like a basic mixin, but it also accepts optional paramaters (hence the name).
      
+      
      A parametric mixin is just like a basic mixin, but it also accepts optional Parameters (hence the name).
      
 
         Coming soon!
 
      
@@ -364,45 +364,45 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
     
       
         .clearfix()
-        
-        
+        none
+        Add to any parent to clear floats within
       
       
         .center-block()
-        
-        
+        none
+        Auto center a block-level element using margin: auto
       
       
         .ie7-inline-block()
-        
-        
+        none
+        Use in addition to regular display: inline-block to get IE7 support
       
       
         .size()
-        
-        
+        @height: 5px, @width: 5px
+        Quickly set the height and width on one line
       
       
         .square()
-        
-        
+        @size: 5px
+        Builds on .size() to set the width and height as same value
       
       
         .opacity()
-        
-        
+        @opacity: 100
+        Set, in whole numbers, the opacity percentage (e.g., "50" or "75")
       
       
         .reset-filter()
-        
-        
+        none
+        Resets any IE filter
       
     
   
@@ -411,15 +411,15 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
     
       
         .placeholder()
-        
-        
+        @color: @placeholderText
+        Set the placeholder text color for inputs
       
     
   
@@ -428,7 +428,7 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
@@ -475,7 +475,7 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
@@ -507,7 +507,7 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
@@ -584,7 +584,7 @@
     
       
         Mixin
-        Paramaters
+        Parameters
         Usage
       
     
-- 
cgit v1.2.3


From 0777e391ee19cbc3bda7637dcbb17b5b171afac5 Mon Sep 17 00:00:00 2001
From: Krister Kari 
Date: Thu, 26 Jan 2012 01:03:36 +0200
Subject: Drop khtml gradient, shorten old webkit gradient

---
 lib/mixins.less | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/mixins.less b/lib/mixins.less
index e64b80ad3..793c000ab 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -279,10 +279,9 @@
 #gradient {
   .horizontal(@startColor: #555, @endColor: #333) {
     background-color: @endColor;
-    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-gradient(linear, 0 0, 100% 0, from(@startColor), to(@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
@@ -291,10 +290,9 @@
   }
   .vertical(@startColor: #555, @endColor: #333) {
     background-color: @endColor;
-    background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror
     background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
     background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
     background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
     background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
     background-image: linear-gradient(top, @startColor, @endColor); // The standard
-- 
cgit v1.2.3


From b6b7d1343b74713a60e86401d8b625f097a7b8dc Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 15:03:44 -0800
Subject: finish the rest of the less page mixins docs

---
 docs/less.html                            | 147 ++++++++++----------
 docs/scaffolding.html                     |   2 +-
 docs/templates/pages/less.mustache        | 217 +++++++++++++++---------------
 docs/templates/pages/scaffolding.mustache |   2 +-
 lib/mixins.less                           |  35 ++---
 lib/scaffolding.less                      |   2 +-
 6 files changed, 193 insertions(+), 212 deletions(-)

diff --git a/docs/less.html b/docs/less.html
index 23c2c53c6..f6321fc69 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -406,14 +406,18 @@
       
      Basic mixins
      
       
      A basic mixin is essentially an include or a partial for a snippet of CSS. They're written just like a CSS class and can be called anywhere.
      
 
      -  Coming soon!
+.element {
+  .clearfix();
+}
 
      
     
      
     
      
       
      Parametric mixins
      
-      
      A parametric mixin is just like a basic mixin, but it also accepts optional Parameters (hence the name).
      
+      
      A parametric mixin is just like a basic mixin, but it also accepts parameters (hence the name) with optional default values.
      
 
      -  Coming soon!
+.element {
+  .border-radius(4px);
+}
 
      
     
      
     
      
@@ -499,38 +503,38 @@
     
       
         #font > #family > .serif()
-        
-        
+        none
+        Make an element use a serif font stack
       
       
         #font > #family > .sans-serif()
-        
-        
+        none
+        Make an element use a sans-serif font stack
       
       
         #font > #family > .monospace()
-        
-        
+        none
+        Make an element use a monospace font stack
       
       
         #font > .shorthand()
-        
-        
+        @size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight
+        Easily set font size, weight, and leading
       
       
         #font > .serif()
-        
-        
+        @size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight
+        Set font family to serif, and control size, weight, and leading
       
       
         #font > .sans-serif()
-        
-        
+        @size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight
+        Set font family to sans-serif, and control size, weight, and leading
       
       
         #font > .monospace()
-        
-        
+        @size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight
+        Set font family to monospace, and control size, weight, and leading
       
     
   
@@ -545,24 +549,24 @@
     
     
       
-        .fixed-container()
-        
-        
+        .container-fixed()
+        none
+        Provide a fixed-width (set with @siteWidth) container for holding your content
       
       
         .columns()
-        
-        
+        @columns: 1
+        Build a grid column that spans any number of columns (defaults to 1 column)
       
       
         .offset()
-        
-        
+        @columns: 1
+        Offset a grid column with left margin that spans any number of columns
       
       
         .gridColumn()
-        
-        
+        none
+        Make an element float like a grid column
       
     
   
@@ -570,7 +574,7 @@
   
-        
+        
@@ -578,68 +582,63 @@
     
-        
-        
-      
-      
-        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
      
     
       
      MixinMixin
         Parameters
         Usage
       
      
       
      
         .border-radius()
      .border-radius-custom()@radius: 5pxRound the corners of an element. Can be a single value or four space-separated values
       
      
       
      
         .box-shadow()@shadow: 0 1px 3px rgba(0,0,0,.25)Add a drop shadow to an element
       
      
       
      
         .transition()@transitionAdd CSS3 transition effect (e.g., all .2s linear)
       
      
       
      
         .rotate()@degreesRotate an element n degrees
       
      
       
      
         .scale()@ratioScale an element to n times it's original size
       
      
       
      
         .translate()@x: 0, @y: 0Move an element on the x and y planes
       
      
       
      
         .background-clip()@clipCrop the backgroud of an element (useful for border-radius)
       
      
       
      
         .background-size()@sizeControl the size of background images via CSS3
       
      
       
      
         .box-sizing()@boxmodelChange the box model for an element (e.g., border-box for a full-width input)
       
      
       
      
         .user-select()@selectControl cursor selection of text on a page
       
      
       
      
         .resizable()@direction: bothMake any element resizable on the right and bottom
       
      
       
      
         .content-columns()@columnCount, @columnGap: @gridColumnGutterMake the content of any element use CSS3 columns
       
      
           
   
      
@@ -655,48 +654,48 @@
     
       
         .#translucent > .background()
-        
-        
+        @color: @white, @alpha: 1
+        Give an element a translucent background color
       
       
         .#translucent > .border()
-        
-        
+        @color: @white, @alpha: 1
+        Give an element a translucent border color
       
       
         .#gradient > .vertical()
-        
-        
+        @startColor, @endColor
+        Create a cross-browser vertical background gradient
       
       
         .#gradient > .horizontal()
-        
-        
+        @startColor, @endColor
+        Create a cross-browser horizontal background gradient
       
       
         .#gradient > .directional()
-        
-        
+        @startColor, @endColor, @deg
+        Create a cross-browser directional background gradient
       
       
         .#gradient > .vertical-three-colors()
-        
-        
+        @startColor, @midColor, @colorStop, @endColor
+        Create a cross-browser three-color background gradient
       
       
         .#gradient > .radial()
-        
-        
+        @innerColor, @outerColor
+        Create a cross-browser radial background gradient
       
       
         .#gradient > .striped()
-        
-        
+        @color, @angle
+        Create a cross-browser striped background gradient
       
       
         .#gradientBar()
-        
-        
+        @primaryColor, @secondaryColor
+        Used for buttons to assign a gradient and slightly darker border
       
     
   
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 8245f860c..2ba8d5d7a 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -212,7 +212,7 @@
       
         @siteWidth
         Computed sum of all columns and gutters
-        Counts number of columns and gutters to set width of the .fixed-container() mixin
+        Counts number of columns and gutters to set width of the .container-fixed() mixin
       
     
   
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 51d2295de..f2c266842 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -270,7 +270,7 @@
       
     
      
     
      
-      
      Form states and alerts
      
+      
      {{_i}}Form states and alerts{{/i}}
      
       
@@ -336,73 +336,77 @@
   
      
     
      {{_i}}Bootstrap mixins {{/i}}
      
   
      
-  
      About mixins
      
+  
      {{_i}}About mixins{{/i}}
      
     
      
-      
      Basic mixins
      
-      
      A basic mixin is essentially an include or a partial for a snippet of CSS. They're written just like a CSS class and can be called anywhere.
      
+      
      {{_i}}Basic mixins{{/i}}
      
+      
      {{_i}}A basic mixin is essentially an include or a partial for a snippet of CSS. They're written just like a CSS class and can be called anywhere.{{/i}}
      
 
      -  Coming soon!
+.element {
+  .clearfix();
+}
 
      
     
      
     
      
-      
      Parametric mixins
      
-      
      A parametric mixin is just like a basic mixin, but it also accepts optional Parameters (hence the name).
      
+      
      {{_i}}Parametric mixins{{/i}}
      
+      
      {{_i}}A parametric mixin is just like a basic mixin, but it also accepts parameters (hence the name) with optional default values.{{/i}}
      
 
      -  Coming soon!
+.element {
+  .border-radius(4px);
+}
 
      
     
      
     
      
-      
      Easily add your own
      
-      
      Nearly all of Bootstrap's mixins are stored in mixins.less, a wonderful utility .less file that enables you to use a mixin in any of the .less files in the toolkit.
      
-      
      So, go ahead and use the existing ones or feel free to add your own as you need.
      
+      
      {{_i}}Easily add your own{{/i}}
      
+      
      {{_i}}Nearly all of Bootstrap's mixins are stored in mixins.less, a wonderful utility .less file that enables you to use a mixin in any of the .less files in the toolkit.{{/i}}
      
+      
      {{_i}}So, go ahead and use the existing ones or feel free to add your own as you need.{{/i}}
      
     
      
   
      
-  
      Included mixins
      
-  
      Utilities
      
+  
      {{_i}}Included mixins{{/i}}
      
+  
      {{_i}}Utilities{{/i}}
      
         
           
      
   
   
      
-        
-        
-        
+        
+        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
      
     
       
      MixinParametersUsage{{_i}}Mixin{{/i}}{{_i}}Parameters{{/i}}{{_i}}Usage{{/i}}
       
      
           
     
       
      
         .clearfix()
         noneAdd to any parent to clear floats within{{_i}}Add to any parent to clear floats within{{/i}}
       
      
       
      
         .center-block()
         noneAuto center a block-level element using margin: auto{{_i}}Auto center a block-level element using margin: auto{{/i}}
       
      
       
      
         .ie7-inline-block()
         noneUse in addition to regular display: inline-block to get IE7 support{{_i}}Use in addition to regular display: inline-block to get IE7 support{{/i}}
       
      
       
      
         .size()
         @height: 5px, @width: 5pxQuickly set the height and width on one line{{_i}}Quickly set the height and width on one line{{/i}}
       
      
       
      
         .square()
         @size: 5pxBuilds on .size() to set the width and height as same value{{_i}}Builds on .size() to set the width and height as same value{{/i}}
       
      
       
      
         .opacity()
         @opacity: 100Set, in whole numbers, the opacity percentage (e.g., "50" or "75"){{_i}}Set, in whole numbers, the opacity percentage (e.g., "50" or "75"){{/i}}
       
      
       
      
         .reset-filter()
         noneResets any IE filter{{_i}}Resets any IE filter{{/i}}
       
      
           
   
      
@@ -410,16 +414,16 @@
   
-        
-        
-        
+        
+        
+        
-        
+        
      
     
       
      MixinParametersUsage{{_i}}Mixin{{/i}}{{_i}}Parameters{{/i}}{{_i}}Usage{{/i}}
       
      
           
     
       
      
         .placeholder()
         @color: @placeholderTextSet the placeholder text color for inputs{{_i}}Set the placeholder text color for inputs{{/i}}
       
      
           
   
      
@@ -427,46 +431,46 @@
   
-        
-        
-        
+        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
      
     
       
      MixinParametersUsage{{_i}}Mixin{{/i}}{{_i}}Parameters{{/i}}{{_i}}Usage{{/i}}
       
      
           
     
       
      
         #font > #family > .serif()none{{_i}}Make an element use a serif font stack{{/i}}
       
      
       
      
         #font > #family > .sans-serif()none{{_i}}Make an element use a sans-serif font stack{{/i}}
       
      
       
      
         #font > #family > .monospace()none{{_i}}Make an element use a monospace font stack{{/i}}
       
      
       
      
         #font > .shorthand()@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight{{_i}}Easily set font size, weight, and leading{{/i}}
       
      
       
      
         #font > .serif()@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight{{_i}}Set font family to serif, and control size, weight, and leading{{/i}}
       
      
       
      
         #font > .sans-serif()@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight{{_i}}Set font family to sans-serif, and control size, weight, and leading{{/i}}
       
      
       
      
         #font > .monospace()@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight{{_i}}Set font family to monospace, and control size, weight, and leading{{/i}}
       
      
           
   
      
@@ -474,31 +478,31 @@
   
-        
-        
-        
+        
+        
+        
-        
-        
-        
+        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
      
     
       
      MixinParametersUsage{{_i}}Mixin{{/i}}{{_i}}Parameters{{/i}}{{_i}}Usage{{/i}}
       
      
           
     
       
      .fixed-container().container-fixed()none{{_i}}Provide a fixed-width (set with @siteWidth) container for holding your content{{/i}}
       
      
       
      
         .columns()@columns: 1{{_i}}Build a grid column that spans any number of columns (defaults to 1 column){{/i}}
       
      
       
      
         .offset()@columns: 1{{_i}}Offset a grid column with left margin that spans any number of columns{{/i}}
       
      
       
      
         .gridColumn()none{{_i}}Make an element float like a grid column{{/i}}
       
      
           
   
      
@@ -506,76 +510,71 @@
   
-        
-        
-        
+        
+        
+        
-        
-        
-      
-      
-        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
      
     
       
      MixinParametersUsage{{_i}}Mixin{{/i}}{{_i}}Parameters{{/i}}{{_i}}Usage{{/i}}
       
      
           
     
       
      
         .border-radius()
      .border-radius-custom()@radius: 5px{{_i}}Round the corners of an element. Can be a single value or four space-separated values{{/i}}
       
      
       
      
         .box-shadow()@shadow: 0 1px 3px rgba(0,0,0,.25){{_i}}Add a drop shadow to an element{{/i}}
       
      
       
      
         .transition()@transition{{_i}}Add CSS3 transition effect (e.g., all .2s linear){{/i}}
       
      
       
      
         .rotate()@degrees{{_i}}Rotate an element n degrees{{/i}}
       
      
       
      
         .scale()@ratio{{_i}}Scale an element to n times it's original size{{/i}}
       
      
       
      
         .translate()@x: 0, @y: 0{{_i}}Move an element on the x and y planes{{/i}}
       
      
       
      
         .background-clip()@clip{{_i}}Crop the backgroud of an element (useful for border-radius){{/i}}
       
      
       
      
         .background-size()@size{{_i}}Control the size of background images via CSS3{{/i}}
       
      
       
      
         .box-sizing()@boxmodel{{_i}}Change the box model for an element (e.g., border-box for a full-width input){{/i}}
       
      
       
      
         .user-select()@select{{_i}}Control cursor selection of text on a page{{/i}}
       
      
       
      
         .resizable()@direction: both{{_i}}Make any element resizable on the right and bottom{{/i}}
       
      
       
      
         .content-columns()@columnCount, @columnGap: @gridColumnGutter{{_i}}Make the content of any element use CSS3 columns{{/i}}
       
      
           
   
      
@@ -583,56 +582,56 @@
   
-        
-        
-        
+        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
      
     
       
      MixinParametersUsage{{_i}}Mixin{{/i}}{{_i}}Parameters{{/i}}{{_i}}Usage{{/i}}
       
      
           
     
       
      
         .#translucent > .background()@color: @white, @alpha: 1{{_i}}Give an element a translucent background color{{/i}}
       
      
       
      
         .#translucent > .border()@color: @white, @alpha: 1{{_i}}Give an element a translucent border color{{/i}}
       
      
       
      
         .#gradient > .vertical()@startColor, @endColor{{_i}}Create a cross-browser vertical background gradient{{/i}}
       
      
       
      
         .#gradient > .horizontal()@startColor, @endColor{{_i}}Create a cross-browser horizontal background gradient{{/i}}
       
      
       
      
         .#gradient > .directional()@startColor, @endColor, @deg{{_i}}Create a cross-browser directional background gradient{{/i}}
       
      
       
      
         .#gradient > .vertical-three-colors()@startColor, @midColor, @colorStop, @endColor{{_i}}Create a cross-browser three-color background gradient{{/i}}
       
      
       
      
         .#gradient > .radial()@innerColor, @outerColor{{_i}}Create a cross-browser radial background gradient{{/i}}
       
      
       
      
         .#gradient > .striped()@color, @angle{{_i}}Create a cross-browser striped background gradient{{/i}}
       
      
       
      
         .#gradientBar()@primaryColor, @secondaryColor{{_i}}Used for buttons to assign a gradient and slightly darker border{{/i}}
       
      
           
   
      
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index a89f93d8e..bc924e3ef 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -148,7 +148,7 @@
       
         @siteWidth
         {{_i}}Computed sum of all columns and gutters{{/i}}
-        {{_i}}Counts number of columns and gutters to set width of the .fixed-container() mixin{{/i}}
+        {{_i}}Counts number of columns and gutters to set width of the .container-fixed() mixin{{/i}}
       
     
   
diff --git a/lib/mixins.less b/lib/mixins.less
index e64b80ad3..4ebb94cfc 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -100,7 +100,7 @@
 
 // Site container
 // -------------------------
-.fixed-container() {
+.container-fixed() {
   width: @siteWidth;
   margin-left: auto;
   margin-right: auto;
@@ -137,23 +137,6 @@
      -moz-border-radius: @radius;
           border-radius: @radius;
 }
-.border-radius-custom(@topLeft: 0, @topRight: 0, @bottomRight: 0, @bottomLeft: 0) {
-  -webkit-border-top-left-radius: @topLeft;
-      -moz-border-radius-topleft: @topLeft;
-          border-top-left-radius: @topLeft;
-  -webkit-border-top-right-radius: @topRight;
-      -moz-border-radius-topright: @topRight;
-          border-top-right-radius: @topRight;
-  -webkit-border-bottom-right-radius: @bottomRight;
-      -moz-border-radius-bottomright: @bottomRight;
-          border-bottom-right-radius: @bottomRight;
-  -webkit-border-bottom-left-radius: @bottomLeft;
-      -moz-border-radius-bottomleft: @bottomLeft;
-          border-bottom-left-radius: @bottomLeft;
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-}
 
 // Drop shadows
 .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
@@ -172,19 +155,19 @@
 }
 
 // Transformations
-.rotate(@degrees: 5deg) {
+.rotate(@degrees) {
   -webkit-transform: rotate(@degrees);
      -moz-transform: rotate(@degrees);
       -ms-transform: rotate(@degrees);
        -o-transform: rotate(@degrees);
           transform: rotate(@degrees);
 }
-.scale(@value: 1.5) {
-  -webkit-transform: scale(@value);
-     -moz-transform: scale(@value);
-      -ms-transform: scale(@value);
-       -o-transform: scale(@value);
-          transform: scale(@value);
+.scale(@ratio) {
+  -webkit-transform: scale(@ratio);
+     -moz-transform: scale(@ratio);
+      -ms-transform: scale(@ratio);
+       -o-transform: scale(@ratio);
+          transform: scale(@ratio);
 }
 .translate(@x: 0, @y: 0) {
   -webkit-transform: translate(@x, @y);
@@ -234,7 +217,7 @@
 }
 
 // CSS3 Content Columns
-.content-columns(@columnCount, @columnGap: 20px) {
+.content-columns(@columnCount, @columnGap: @gridColumnGutter) {
   -webkit-column-count: @columnCount;
      -moz-column-count: @columnCount;
           column-count: @columnCount;
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index ff029e841..7002b0408 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -18,7 +18,7 @@ body {
 
 // Container (centered, fixed-width layouts)
 .container {
-  .fixed-container();
+  .container-fixed();
 }
 
 // Fluid layouts (left aligned, with sidebar, min- & max-width content)
-- 
cgit v1.2.3


From 0db2d45350a67bc1a98c0f2d1c4706e3bd25ca50 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 15:04:41 -0800
Subject: update mixins to use slightly diff variables within some parametric
 mixins

---
 bootstrap-responsive.min.css | 2 +-
 bootstrap.css                | 8 ++------
 bootstrap.min.css            | 2 +-
 lib/mixins.less              | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
index 31c1fdbef..6a97d792b 100644
--- a/bootstrap-responsive.min.css
+++ b/bootstrap-responsive.min.css
@@ -1,3 +1,3 @@
 
 .hidden{display:none;visibility:hidden;}
-@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
+@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
diff --git a/bootstrap.css b/bootstrap.css
index 931d0c017..0d81b9b03 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,11 +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.
-<<<<<<< HEAD
- * Date: Wed Jan 25 12:03:47 PST 2012
-=======
- * Date: Wed Jan 25 11:49:21 PST 2012
->>>>>>> 04f84997c18f2f132c8173f728f72b6b7aef52d1
+ * Date: Wed Jan 25 15:04:24 PST 2012
  */
 article,
 aside,
@@ -1868,7 +1864,7 @@ table .headerSortUp:after {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query::-webkit-input-placeholder {
+.navbar-search .search-query ::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index f8266b49b..447ecbb2d 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -379,7 +379,7 @@ table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;b
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
diff --git a/lib/mixins.less b/lib/mixins.less
index 4ebb94cfc..327e21813 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -304,7 +304,7 @@
     background-repeat: no-repeat;
     filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback
   }
-  .radial(@centerColor: #555, @outsideColor: #333)  {
+  .radial(@innerColor: #555, @outerColor: #333)  {
     background-color: @outsideColor;
     background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@centerColor), to(@outsideColor));
     background-image: -webkit-radial-gradient(circle, @centerColor, @outsideColor);
@@ -313,7 +313,7 @@
     background-repeat: no-repeat;
     // Opera cannot do radial gradients yet
   }
-  .striped(@color,@angle: -45deg) {
+  .striped(@color, @angle: -45deg) {
     background-color: @color;
     background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
     background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-- 
cgit v1.2.3


From e877d125d7a2c673fec4e63600c2d8544c3128f6 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 20:02:32 -0800
Subject: fix button group shadows, update js docs to fix alert js file link

---
 bootstrap.css                            | 8 ++++----
 bootstrap.min.css                        | 2 +-
 docs/assets/css/docs.css                 | 6 +++---
 docs/components.html                     | 6 +++---
 docs/javascript.html                     | 2 +-
 docs/templates/pages/components.mustache | 6 +++---
 docs/templates/pages/javascript.mustache | 2 +-
 lib/button-groups.less                   | 2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 0d81b9b03..4ece30d20 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 15:04:24 PST 2012
+ * Date: Wed Jan 25 15:27:50 PST 2012
  */
 article,
 aside,
@@ -2592,9 +2592,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 .btn-group .dropdown-toggle {
   padding-left: 8px;
   padding-right: 8px;
-  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 .btn-group.open .dropdown-menu {
   display: block;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 447ecbb2d..50b328682 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -477,7 +477,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
 .btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
 .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;}
-.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}
 .btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
 .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
 .btn .caret{margin-top:6px;margin-left:0;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index b70b039f2..3265e324f 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -172,9 +172,9 @@ section {
   border-right-color: #ddd;
   border-left: 0;
   padding-left: 13px;
-  -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.075);
-     -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.075);
-          box-shadow: inset 0 3px 5px rgba(0,0,0,.075);
+  -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
+     -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
+          box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
 }
 .subnav .nav li:first-child a {
   border-left: 0;
diff --git a/docs/components.html b/docs/components.html
index 56c5280db..2ccfd26e6 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -70,7 +70,7 @@
   
      
     
        
       
      • Button groups
        • 
-      
      • Button dropdowns
        • 
+      
      • Combo buttons
        • 
       
      • Nav, tabs, pills
        • 
       
      • Navbar
        • 
       
      • Breadcrumbs
        • 
@@ -156,9 +156,9 @@
 
 
-
        
+
        
   
        
-    
        Split button dropdowns Built on button groups to provide contextual menus
        
+    
        Combo buttons Built on button groups to provide contextual dropdown menus
        
   
        
   
        
     
        
diff --git a/docs/javascript.html b/docs/javascript.html
index eb291a1a3..34d61ef9c 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -871,7 +871,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
         
        
           
        About alerts
        
           
        The alert plugin is a tiny class for adding close functionality to alerts.
        
-          Download
+          Download
         
        
         
        
           
        Example alerts
        
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index effa10762..aaee36410 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -6,7 +6,7 @@
   
        
     
          
       
        • {{_i}}Button groups{{/i}}
          • 
-      
        • {{_i}}Button dropdowns{{/i}}
          • 
+      
        • {{_i}}Combo buttons{{/i}}
          • 
       
        • {{_i}}Nav, tabs, pills{{/i}}
          • 
       
        • {{_i}}Navbar{{/i}}
          • 
       
        • {{_i}}Breadcrumbs{{/i}}
          • 
@@ -92,9 +92,9 @@
 
 
-
          
+
          
   
          
-    
          {{_i}}Split button dropdowns{{/i}} {{_i}}Built on button groups to provide contextual menus{{/i}}
          
+    
          {{_i}}Combo buttons{{/i}} {{_i}}Built on button groups to provide contextual dropdown menus{{/i}}
          
   
          
   
          
     
          
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 1c6aa4705..6b2a3693d 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -807,7 +807,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
         
          
           
          {{_i}}About alerts{{/i}}
          
           
          {{_i}}The alert plugin is a tiny class for adding close functionality to alerts.{{/i}}
          
-          {{_i}}Download{{/i}}
+          {{_i}}Download{{/i}}
         
          
         
          
           
          {{_i}}Example alerts{{/i}}
          
diff --git a/lib/button-groups.less b/lib/button-groups.less
index 4be4aca71..17957f1d6 100644
--- a/lib/button-groups.less
+++ b/lib/button-groups.less
@@ -81,7 +81,7 @@
 .btn-group .dropdown-toggle {
   padding-left: 8px;
   padding-right: 8px;
-  @shadow: inset 1px 0 0 rgba(255,255,255,.125), 0 1px 2px rgba(0,0,0,.05);
+  @shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   .box-shadow(@shadow);
 }
 
-- 
cgit v1.2.3


From f62c9379fb60bfb70435517b4569f586ec729d5b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 20:07:27 -0800
Subject: remove all tablesorter assets and css

---
 bootstrap.css                        | 40 +-------------------------
 bootstrap.min.css                    |  5 ----
 docs/assets/js/jquery.tablesorter.js |  3 --
 lib/tables.less                      | 54 ------------------------------------
 4 files changed, 1 insertion(+), 101 deletions(-)
 delete mode 100644 docs/assets/js/jquery.tablesorter.js

diff --git a/bootstrap.css b/bootstrap.css
index 4ece30d20..921cd18c0 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 15:27:50 PST 2012
+ * Date: Wed Jan 25 20:07:19 PST 2012
  */
 article,
 aside,
@@ -1056,44 +1056,6 @@ table .span12 {
   width: 924px;
   margin-left: 0;
 }
-table .header {
-  cursor: pointer;
-}
-table .header:after {
-  content: "";
-  float: right;
-  margin-top: 7px;
-  border-width: 0 4px 4px;
-  border-style: solid;
-  border-color: #000000 transparent;
-  visibility: hidden;
-}
-table .headerSortUp, table .headerSortDown {
-  background-color: #f7f7f9;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-}
-table .header:hover:after {
-  visibility: visible;
-}
-table .headerSortDown:after, table .headerSortDown:hover:after {
-  visibility: visible;
-  filter: alpha(opacity=60);
-  -moz-opacity: 0.6;
-  opacity: 0.6;
-}
-table .headerSortUp:after {
-  border-bottom: none;
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top: 4px solid #000000;
-  visibility: visible;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-  filter: alpha(opacity=60);
-  -moz-opacity: 0.6;
-  opacity: 0.6;
-}
 .icon {
   background-image: url(docs/assets/img/glyphicons-halflings-sprite.png);
   background-position: 0 0;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 50b328682..ae0d9a587 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -204,11 +204,6 @@ table .span9{float:none;width:684px;margin-left:0;}
 table .span10{float:none;width:764px;margin-left:0;}
 table .span11{float:none;width:844px;margin-left:0;}
 table .span12{float:none;width:924px;margin-left:0;}
-table .header{cursor:pointer;}table .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000000 transparent;visibility:hidden;}
-table .headerSortUp,table .headerSortDown{background-color:#f7f7f9;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);}
-table .header:hover:after{visibility:visible;}
-table .headerSortDown:after,table .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;}
-table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;}
 .icon{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
 .glass{background-position:0 0;}
 .music{background-position:-24px 0;}
diff --git a/docs/assets/js/jquery.tablesorter.js b/docs/assets/js/jquery.tablesorter.js
deleted file mode 100644
index 8ca383e39..000000000
--- a/docs/assets/js/jquery.tablesorter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-(function($){$.extend({tablesorter:new
-function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((ab)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((ba)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i
Date: Wed, 25 Jan 2012 20:11:13 -0800
Subject: consistency in download page heading

---
 docs/assets/css/docs.css               | 1 -
 docs/download.html                     | 2 +-
 docs/templates/pages/download.mustache | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 3265e324f..9f21f901f 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -30,7 +30,6 @@ body {
   -webkit-transition: all .2s linear;
      -moz-transition: all .2s linear;
           transition: all .2s linear;
-      
 }
 .navbar-fixed .brand:hover {
   text-decoration: none;
diff --git a/docs/download.html b/docs/download.html
index 7b045ae8e..58fdd5659 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -69,7 +69,7 @@
 
 
          
-  
          Download and customize
          
+  
          Customize and download
          
   
          Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.
          
   
          
     
            
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index f5964dc35..4478a006a 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -5,7 +5,7 @@
 
 
            
-  
            {{_i}}Download and customize{{/i}}
            
+  
            {{_i}}Customize and download{{/i}}
            
   
            {{_i}}Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}
            
   
            
     
              
-- 
cgit v1.2.3


From b6b19866ac82089b9d3964f7fe9bbb3457306495 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 20:32:19 -0800
Subject: remove some old -moz- prefixes from mixins while we're at it,
 dropping FF3.6 support

---
 bootstrap-responsive.css     |   4 +-
 bootstrap-responsive.min.css |   2 +-
 bootstrap.css                | 157 +++++++--------------------------------
 bootstrap.min.css            | 170 +++++++++++++++++++++----------------------
 lib/mixins.less              |  14 +---
 5 files changed, 117 insertions(+), 230 deletions(-)

diff --git a/bootstrap-responsive.css b/bootstrap-responsive.css
index 9f50081d3..7907c0e08 100644
--- a/bootstrap-responsive.css
+++ b/bootstrap-responsive.css
@@ -13,7 +13,6 @@
   }
   .navbar .nav, .navbar .nav > li:last-child a {
     -webkit-border-radius: 0 0 4px 0;
-    -moz-border-radius: 0 0 4px 0;
     border-radius: 0 0 4px 0;
   }
   .navbar .nav > li {
@@ -47,9 +46,8 @@
     border-left: 4px solid transparent;
     border-right: 4px solid transparent;
     border-top: 4px solid #ffffff;
-    filter: alpha(opacity=100);
-    -moz-opacity: 1;
     opacity: 1;
+    filter: alpha(opacity=100);
     content: "↓";
   }
   .navbar .nav:hover > li {
diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
index 6a97d792b..fb736a12b 100644
--- a/bootstrap-responsive.min.css
+++ b/bootstrap-responsive.min.css
@@ -1,3 +1,3 @@
 
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
+@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
diff --git a/bootstrap.css b/bootstrap.css
index 921cd18c0..6068875fd 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 20:07:19 PST 2012
+ * Date: Wed Jan 25 20:31:53 PST 2012
  */
 article,
 aside,
@@ -420,7 +420,6 @@ code, pre {
   font-size: 12px;
   color: #333333;
   -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
   border-radius: 3px;
 }
 code {
@@ -439,7 +438,6 @@ pre {
   border: 1px solid #ccc;
   border: 1px solid rgba(0, 0, 0, 0.15);
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
   white-space: pre;
   white-space: pre-wrap;
@@ -507,7 +505,6 @@ select,
   color: #555555;
   border: 1px solid #ccc;
   -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
   border-radius: 3px;
 }
 .uneditable-textarea {
@@ -533,7 +530,6 @@ input[type=file] {
   background-color: #ffffff;
   background-color: initial;
   -webkit-box-shadow: none;
-  -moz-box-shadow: none;
   box-shadow: none;
 }
 input[type=button], input[type=reset], input[type=submit] {
@@ -559,7 +555,6 @@ select[multiple], select[size] {
 }
 input[type=image] {
   -webkit-box-shadow: none;
-  -moz-box-shadow: none;
   box-shadow: none;
 }
 textarea {
@@ -584,7 +579,6 @@ textarea {
 }
 input, textarea {
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
   -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
@@ -595,13 +589,11 @@ input, textarea {
 input:focus, textarea:focus {
   border-color: rgba(82, 168, 236, 0.8);
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   outline: 0;
 }
 input[type=file]:focus, input[type=checkbox]:focus, select:focus {
   -webkit-box-shadow: none;
-  -moz-box-shadow: none;
   box-shadow: none;
   outline: 1px dotted #666;
 }
@@ -722,7 +714,6 @@ textarea[readonly] {
 .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
   border-color: #a47e3c;
   -webkit-box-shadow: 0 0 6px #dbc59e;
-  -moz-box-shadow: 0 0 6px #dbc59e;
   box-shadow: 0 0 6px #dbc59e;
 }
 .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on {
@@ -740,7 +731,6 @@ textarea[readonly] {
 .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
   border-color: #953b39;
   -webkit-box-shadow: 0 0 6px #d59392;
-  -moz-box-shadow: 0 0 6px #d59392;
   box-shadow: 0 0 6px #d59392;
 }
 .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on {
@@ -758,7 +748,6 @@ textarea[readonly] {
 .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
   border-color: #356635;
   -webkit-box-shadow: 0 0 6px #7aba7b;
-  -moz-box-shadow: 0 0 6px #7aba7b;
   box-shadow: 0 0 6px #7aba7b;
 }
 .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on {
@@ -773,7 +762,6 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
 input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus {
   border-color: #e9322d;
   -webkit-box-shadow: 0 0 6px #f8b9b7;
-  -moz-box-shadow: 0 0 6px #f8b9b7;
   box-shadow: 0 0 6px #f8b9b7;
 }
 .form-actions {
@@ -788,7 +776,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   background-color: #ffffff;
   border-color: #eee;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
   cursor: not-allowed;
 }
@@ -832,7 +819,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .input-prepend .uneditable-input,
 .input-append .uneditable-input {
   -webkit-border-radius: 0 3px 3px 0;
-  -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
 .input-prepend .uneditable-input, .input-append .uneditable-input {
@@ -854,7 +840,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   background-color: #f5f5f5;
   border: 1px solid #ccc;
   -webkit-border-radius: 3px 0 0 3px;
-  -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
 }
 .input-prepend .active, .input-append .active {
@@ -869,7 +854,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .input-append input, .input-append .uneditable-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 .uneditable-input {
@@ -879,7 +863,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   margin-right: 0;
   margin-left: -1px;
   -webkit-border-radius: 0 3px 3px 0;
-  -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
 .search-query {
@@ -887,7 +870,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   padding-right: 14px;
   margin-bottom: 0;
   -webkit-border-radius: 14px;
-  -moz-border-radius: 14px;
   border-radius: 14px;
 }
 .form-search input,
@@ -961,7 +943,6 @@ table {
   border: 1px solid #ddd;
   border-collapse: separate;
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .table-bordered th + th,
@@ -975,22 +956,18 @@ table {
 }
 .table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child {
   -webkit-border-radius: 4px 0 0 0;
-  -moz-border-radius: 4px 0 0 0;
   border-radius: 4px 0 0 0;
 }
 .table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child {
   -webkit-border-radius: 0 4px 0 0;
-  -moz-border-radius: 0 4px 0 0;
   border-radius: 0 4px 0 0;
 }
 .table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child {
   -webkit-border-radius: 0 0 0 4px;
-  -moz-border-radius: 0 0 0 4px;
   border-radius: 0 0 0 4px;
 }
 .table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child {
   -webkit-border-radius: 0 0 4px 0;
-  -moz-border-radius: 0 0 4px 0;
   border-radius: 0 0 4px 0;
 }
 .table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th {
@@ -1347,9 +1324,8 @@ table .span12 {
   border-left: 4px solid transparent;
   border-right: 4px solid transparent;
   border-top: 4px solid #000000;
-  filter: alpha(opacity=30);
-  -moz-opacity: 0.3;
   opacity: 0.3;
+  filter: alpha(opacity=30);
   content: "\2193";
 }
 .dropdown .caret {
@@ -1358,9 +1334,8 @@ table .span12 {
   *margin-top: 7px;
 }
 .dropdown:hover .caret, .open.dropdown .caret {
-  filter: alpha(opacity=100);
-  -moz-opacity: 1;
   opacity: 1;
+  filter: alpha(opacity=100);
 }
 .dropdown-menu {
   position: absolute;
@@ -1380,10 +1355,8 @@ table .span12 {
   border-style: solid;
   border-width: 1px;
   -webkit-border-radius: 0 0 5px 5px;
-  -moz-border-radius: 0 0 5px 5px;
   border-radius: 0 0 5px 5px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
   -webkit-background-clip: padding-box;
   -moz-background-clip: padding;
@@ -1429,7 +1402,6 @@ table .span12 {
 .typeahead {
   margin-top: 2px;
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .well {
@@ -1440,10 +1412,8 @@ table .span12 {
   border: 1px solid #eee;
   border: 1px solid rgba(0, 0, 0, 0.05);
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
   -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);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
 }
 .well blockquote {
@@ -1481,16 +1451,14 @@ table .span12 {
   line-height: 18px;
   color: #000000;
   text-shadow: 0 1px 0 #ffffff;
-  filter: alpha(opacity=20);
-  -moz-opacity: 0.2;
   opacity: 0.2;
+  filter: alpha(opacity=20);
 }
 .close:hover {
   color: #000000;
   text-decoration: none;
-  filter: alpha(opacity=40);
-  -moz-opacity: 0.4;
   opacity: 0.4;
+  filter: alpha(opacity=40);
   cursor: pointer;
 }
 .nav {
@@ -1565,7 +1533,6 @@ table .span12 {
   padding-bottom: 9px;
   border: 1px solid transparent;
   -webkit-border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
 .tabs > li > a:hover {
@@ -1584,7 +1551,6 @@ table .span12 {
   margin-top: 2px;
   margin-bottom: 2px;
   -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
   border-radius: 5px;
 }
 .pills .active > a, .pills .active > a:hover {
@@ -1603,17 +1569,14 @@ table .span12 {
 .tabs.stacked > li > a {
   border: 1px solid #ddd;
   -webkit-border-radius: 0;
-  -moz-border-radius: 0;
   border-radius: 0;
 }
 .tabs.stacked > li:first-child > a {
   -webkit-border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
 .tabs.stacked > li:last-child > a {
   -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius: 0 0 4px 4px;
   border-radius: 0 0 4px 4px;
 }
 .tabs.stacked > li > a:hover {
@@ -1632,7 +1595,6 @@ table .span12 {
 }
 .pills .dropdown-menu {
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
@@ -1656,9 +1618,8 @@ table .span12 {
 }
 .nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
   border-top-color: #ffffff;
-  filter: alpha(opacity=100);
-  -moz-opacity: 1;
   opacity: 1;
+  filter: alpha(opacity=100);
 }
 .tabs.stacked .open > a:hover {
   border-color: #999999;
@@ -1691,7 +1652,6 @@ table .span12 {
 }
 .tabs-below .tabs > li > a {
   -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius: 0 0 4px 4px;
   border-radius: 0 0 4px 4px;
 }
 .tabs-below .tabs > li > a:hover {
@@ -1717,7 +1677,6 @@ table .span12 {
 .tabs-left .tabs > li > a {
   margin-right: -1px;
   -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius: 4px 0 0 4px;
   border-radius: 4px 0 0 4px;
 }
 .tabs-left .tabs > li > a:hover {
@@ -1734,7 +1693,6 @@ table .span12 {
 .tabs-right .tabs > li > a {
   margin-left: -1px;
   -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius: 0 4px 4px 0;
   border-radius: 0 4px 4px 0;
 }
 .tabs-right .tabs > li > a:hover {
@@ -1749,17 +1707,15 @@ table .span12 {
 .navbar-inner {
   background-color: #222222;
   background-color: #222222;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
   background-image: -moz-linear-gradient(top, #333333, #222222);
   background-image: -ms-linear-gradient(top, #333333, #222222);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
   background-image: -webkit-linear-gradient(top, #333333, #222222);
   background-image: -o-linear-gradient(top, #333333, #222222);
   background-image: linear-gradient(top, #333333, #222222);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
   -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }
 .navbar .brand:hover {
@@ -1815,7 +1771,6 @@ table .span12 {
   background: rgba(255, 255, 255, 0.3);
   border: 1px solid #111;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
   -webkit-transition: none;
   -moz-transition: none;
@@ -1841,7 +1796,6 @@ table .span12 {
   background-color: #ffffff;
   border: 0;
   -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
   box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
   outline: 0;
 }
@@ -1852,7 +1806,6 @@ table .span12 {
   padding-left: 20px;
   padding-right: 20px;
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .navbar-fixed {
@@ -1910,7 +1863,6 @@ table .span12 {
 .navbar .dropdown-menu {
   margin-top: 1px;
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .navbar .dropdown-menu:before {
@@ -1938,9 +1890,8 @@ table .span12 {
   border-top-color: #ffffff;
 }
 .navbar .nav .active .caret {
-  filter: alpha(opacity=100);
-  -moz-opacity: 1;
   opacity: 1;
+  filter: alpha(opacity=100);
 }
 .navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
   background-color: transparent;
@@ -1963,10 +1914,9 @@ table .span12 {
   padding: 7px 14px;
   margin: 0 0 18px;
   background-color: #f5f5f5;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));
   background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
   background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
   background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
   background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
   background-image: linear-gradient(top, #ffffff, #f5f5f5);
@@ -1974,10 +1924,8 @@ table .span12 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
   border: 1px solid #ddd;
   -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
   border-radius: 3px;
   -webkit-box-shadow: inset 0 1px 0 #ffffff;
-  -moz-box-shadow: inset 0 1px 0 #ffffff;
   box-shadow: inset 0 1px 0 #ffffff;
 }
 .breadcrumb li {
@@ -2004,10 +1952,8 @@ table .span12 {
   margin-left: 0;
   margin-bottom: 0;
   -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
   border-radius: 3px;
   -webkit-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);
 }
 .pagination li {
@@ -2035,12 +1981,10 @@ table .span12 {
 .pagination li:first-child a {
   border-left-width: 1px;
   -webkit-border-radius: 3px 0 0 3px;
-  -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
 }
 .pagination li:last-child a {
   -webkit-border-radius: 0 3px 3px 0;
-  -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
 .pagination-centered {
@@ -2071,7 +2015,6 @@ table .span12 {
   padding: 6px 15px;
   background-color: #f5f5f5;
   -webkit-border-radius: 15px;
-  -moz-border-radius: 15px;
   border-radius: 15px;
 }
 .pager .next a {
@@ -2093,9 +2036,8 @@ table .span12 {
   opacity: 0;
 }
 .modal-backdrop, .modal-backdrop.fade.in {
-  filter: alpha(opacity=80);
-  -moz-opacity: 0.8;
   opacity: 0.8;
+  filter: alpha(opacity=80);
 }
 .modal {
   position: fixed;
@@ -2113,13 +2055,10 @@ table .span12 {
   /* IE6-7 */
 
   -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
   border-radius: 6px;
   -webkit-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);
   -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
 .modal.fade {
@@ -2149,10 +2088,8 @@ table .span12 {
   background-color: #f5f5f5;
   border-top: 1px solid #ddd;
   -webkit-border-radius: 0 0 6px 6px;
-  -moz-border-radius: 0 0 6px 6px;
   border-radius: 0 0 6px 6px;
   -webkit-box-shadow: inset 0 1px 0 #ffffff;
-  -moz-box-shadow: inset 0 1px 0 #ffffff;
   box-shadow: inset 0 1px 0 #ffffff;
   *zoom: 1;
 }
@@ -2175,14 +2112,12 @@ table .span12 {
   visibility: visible;
   padding: 5px;
   font-size: 11px;
-  filter: alpha(opacity=0);
-  -moz-opacity: 0;
   opacity: 0;
+  filter: alpha(opacity=0);
 }
 .tooltip.in {
-  filter: alpha(opacity=80);
-  -moz-opacity: 0.8;
   opacity: 0.8;
+  filter: alpha(opacity=80);
 }
 .tooltip.top {
   margin-top: -2px;
@@ -2236,7 +2171,6 @@ table .span12 {
   text-decoration: none;
   background-color: #000000;
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .tooltip-arrow {
@@ -2308,10 +2242,8 @@ table .span12 {
   background: #000000;
   background: rgba(0, 0, 0, 0.8);
   -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
   border-radius: 6px;
   -webkit-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);
 }
 .popover .title {
@@ -2320,17 +2252,14 @@ table .span12 {
   background-color: #f5f5f5;
   border-bottom: 1px solid #eee;
   -webkit-border-radius: 3px 3px 0 0;
-  -moz-border-radius: 3px 3px 0 0;
   border-radius: 3px 3px 0 0;
 }
 .popover .content {
   padding: 14px;
   background-color: #ffffff;
   -webkit-border-radius: 0 0 3px 3px;
-  -moz-border-radius: 0 0 3px 3px;
   border-radius: 0 0 3px 3px;
   -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
 .popover .content p, .popover .content ul, .popover .content ol {
@@ -2347,10 +2276,9 @@ table .span12 {
 }
 .btn.danger {
   background-color: #c43c35;
-  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-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
   background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: linear-gradient(top, #ee5f5b, #c43c35);
@@ -2361,10 +2289,9 @@ table .span12 {
 }
 .btn.success {
   background-color: #57a957;
-  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-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
   background-image: -webkit-linear-gradient(top, #62c462, #57a957);
   background-image: -o-linear-gradient(top, #62c462, #57a957);
   background-image: linear-gradient(top, #62c462, #57a957);
@@ -2375,10 +2302,9 @@ table .span12 {
 }
 .btn.info {
   background-color: #339bb9;
-  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-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
   background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
   background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
   background-image: linear-gradient(top, #5bc0de, #339bb9);
@@ -2406,10 +2332,8 @@ table .span12 {
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
   -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);
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   cursor: pointer;
   -webkit-transition: 0.1s linear all;
@@ -2430,10 +2354,9 @@ table .span12 {
   color: #ffffff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   background-color: #0064cd;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
   background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
   background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#049cdb), to(#0064cd));
   background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
   background-image: -o-linear-gradient(top, #049cdb, #0064cd);
   background-image: linear-gradient(top, #049cdb, #0064cd);
@@ -2445,29 +2368,24 @@ table .span12 {
 .btn.active, .btn:active {
   background-image: none;
   -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 .btn.disabled {
   cursor: default;
   background-image: none;
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  filter: alpha(opacity=65);
-  -moz-opacity: 0.65;
   opacity: 0.65;
+  filter: alpha(opacity=65);
   -webkit-box-shadow: none;
-  -moz-box-shadow: none;
   box-shadow: none;
 }
 .btn[disabled] {
   cursor: default;
   background-image: none;
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  filter: alpha(opacity=65);
-  -moz-opacity: 0.65;
   opacity: 0.65;
+  filter: alpha(opacity=65);
   -webkit-box-shadow: none;
-  -moz-box-shadow: none;
   box-shadow: none;
 }
 .btn.large {
@@ -2475,7 +2393,6 @@ table .span12 {
   font-size: 15px;
   line-height: normal;
   -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
   border-radius: 5px;
 }
 .btn.small {
@@ -2511,7 +2428,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   float: left;
   margin-left: -1px;
   -webkit-border-radius: 0;
-  -moz-border-radius: 0;
   border-radius: 0;
 }
 .btn-group .btn:first-child {
@@ -2555,20 +2471,17 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   padding-left: 8px;
   padding-right: 8px;
   -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 .btn-group.open .dropdown-menu {
   display: block;
   margin-top: 1px;
   -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
   border-radius: 5px;
 }
 .btn-group.open .dropdown-toggle {
   background-image: none;
   -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 .btn .caret {
@@ -2580,9 +2493,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 .info .caret,
 .success .caret {
   border-top-color: #ffffff;
-  filter: alpha(opacity=75);
-  -moz-opacity: 0.75;
   opacity: 0.75;
+  filter: alpha(opacity=75);
 }
 .alert {
   padding: 8px 35px 8px 14px;
@@ -2591,7 +2503,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   background-color: #fcf8e3;
   border: 1px solid #f3edd2;
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .alert, .alert-heading {
@@ -2658,16 +2569,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   line-height: 1;
   border: 1px solid #ddd;
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
   -webkit-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);
 }
 a.thumbnail:hover {
   border-color: #0088cc;
   -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
   box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
 }
 .thumbnail > img {
@@ -2685,7 +2593,6 @@ a.thumbnail:hover {
   text-transform: uppercase;
   background-color: #999999;
   -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
   border-radius: 3px;
 }
 .label.important {
@@ -2718,24 +2625,21 @@ a.thumbnail:hover {
 }
 .progress, .progress .bar {
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .progress {
   height: 18px;
   margin-bottom: 18px;
   background-color: #f9f9f9;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9));
   background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
   background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9));
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
   background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
   background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
   background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
 }
 .progress .bar {
@@ -2746,17 +2650,15 @@ a.thumbnail:hover {
   text-align: center;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   background-color: #0480be;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));
   background-image: -moz-linear-gradient(top, #149bdf, #0480be);
   background-image: -ms-linear-gradient(top, #149bdf, #0480be);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
   background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
   background-image: -o-linear-gradient(top, #149bdf, #0480be);
   background-image: linear-gradient(top, #149bdf, #0480be);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -2787,10 +2689,9 @@ a.thumbnail:hover {
 }
 .progress.danger .bar {
   background-color: #c43c35;
-  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-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
   background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: linear-gradient(top, #ee5f5b, #c43c35);
@@ -2808,10 +2709,9 @@ a.thumbnail:hover {
 }
 .progress.success .bar {
   background-color: #57a957;
-  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-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
   background-image: -webkit-linear-gradient(top, #62c462, #57a957);
   background-image: -o-linear-gradient(top, #62c462, #57a957);
   background-image: linear-gradient(top, #62c462, #57a957);
@@ -2829,10 +2729,9 @@ a.thumbnail:hover {
 }
 .progress.info .bar {
   background-color: #339bb9;
-  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-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
   background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
   background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
   background-image: linear-gradient(top, #5bc0de, #339bb9);
@@ -2854,7 +2753,6 @@ a.thumbnail:hover {
 .accordion-group {
   background-color: #f5f5f5;
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .accordion-heading {
@@ -2931,11 +2829,9 @@ a.thumbnail:hover {
   background: #222222;
   border: 3px solid #ffffff;
   -webkit-border-radius: 23px;
-  -moz-border-radius: 23px;
   border-radius: 23px;
-  filter: alpha(opacity=50);
-  -moz-opacity: 0.5;
   opacity: 0.5;
+  filter: alpha(opacity=50);
   -webkit-transition: all 0.2s linear;
   -moz-transition: all 0.2s linear;
   -ms-transition: all 0.2s linear;
@@ -2949,9 +2845,8 @@ a.thumbnail:hover {
 .carousel-control:hover {
   color: #ffffff;
   text-decoration: none;
-  filter: alpha(opacity=90);
-  -moz-opacity: 0.9;
   opacity: 0.9;
+  filter: alpha(opacity=90);
 }
 .carousel-caption {
   position: absolute;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index ae0d9a587..ba5e29549 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -83,9 +83,9 @@ blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:
 blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
 q:before,q:after,blockquote:before,blockquote:after{content:"";}
 address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
-code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;border-radius:3px;}
 code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}
-pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
+pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
 pre code{padding:0;background-color:transparent;}
 small{font-size:100%;}
 cite{font-style:normal;}
@@ -94,24 +94,24 @@ fieldset{padding:0;margin:0;border:0;}
 legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
 label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
-input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;}
 .uneditable-textarea{width:auto;height:auto;}
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
-input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
 select,input[type=file]{height:28px;*margin-top:4px;line-height:28px;}
 select{width:220px;vertical-align:baseline;background-color:#ffffff;}
 select[multiple],select[size]{height:auto;}
-input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+input[type=image]{-webkit-box-shadow:none;box-shadow:none;}
 textarea{height:auto;}
 .radio,.checkbox{padding-left:18px;}
 .radio input[type=radio],.checkbox input[type=checkbox]{float:left;margin-left:-18px;}
 .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;}
 .radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;}
 .radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
-input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
-input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
-input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;}
+input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
+input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
+input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;box-shadow:none;outline:1px dotted #666;}
 .input-mini{width:60px;}
 .input-small{width:90px;}
 .input-medium{width:150px;}
@@ -145,32 +145,32 @@ select.span11{width:870px;}
 select.span12{width:950px;}
 input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
 .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
-.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
+.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
 .control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
 .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
-.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
+.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
 .control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
 .control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
-.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
+.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
 .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
-input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
+input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
 .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
-.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
+.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
 :-moz-placeholder{color:#999999;}
 ::-webkit-input-placeholder{color:#999999;}
 .help-block{margin-top:5px;margin-bottom:0;color:#999999;}
 .help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;}
 .input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";}
 .input-prepend:after,.input-append:after{clear:both;}
-.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 .input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;}
-.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
 .input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;}
 .input-prepend .add-on{*margin-top:1px;}
-.input-append input,.input-append .uneditable-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 input,.input-append .uneditable-input{float:left;-webkit-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
 .input-append .uneditable-input{border-right-color:#ccc;}
-.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
-.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
+.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;border-radius:14px;}
 .form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
 .form-search label,.form-inline label{display:inline-block;}
 .control-group{margin-bottom:9px;}
@@ -185,12 +185,12 @@ table{max-width:100%;border-collapse:collapse;border-spacing:0;}
 .table thead:first-child tr th,.table thead:first-child tr td{border-top:0;}
 .table tbody+tbody{border-top:2px solid #ddd;}
 .table-condensed th,.table-condensed td{padding:4px 5px;}
-.table-bordered{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;}
+.table-bordered{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;}
 .table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
-.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
-.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
-.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
-.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
+.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
+.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
+.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
+.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
 .table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;}
 table .span1{float:none;width:44px;margin-left:0;}
 table .span2{float:none;width:124px;margin-left:0;}
@@ -296,20 +296,20 @@ table .span12{float:none;width:924px;margin-left:0;}
 .minus{background-position:-432px -96px;}
 .asterisk{background-position:-456px -96px;}
 .dropdown{position:relative;}
-.caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;content:"\2193";}
+.caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";}
 .dropdown .caret{margin-top:8px;margin-left:2px;*margin-top:7px;}
-.dropdown:hover .caret,.open.dropdown .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
-.dropdown-menu{position:absolute;top:100%;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.bottom-up{top:auto;bottom:100%;margin-bottom:2px;}
+.dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);}
+.dropdown-menu{position:absolute;top:100%;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.bottom-up{top:auto;bottom:100%;margin-bottom:2px;}
 .dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
 .dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
 .dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;}
 .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
 .dropdown.open .dropdown-menu{display:block;}
-.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
+.typeahead{margin-top:2px;-webkit-border-radius:4px;border-radius:4px;}
+.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
 .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
 .collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
-.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;cursor:pointer;}
+.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;}
 .nav{margin-left:0;margin-bottom:18px;list-style:none;}
 .nav>li>a{display:block;}
 .nav>li>a:hover{text-decoration:none;background-color:#eeeeee;}
@@ -324,27 +324,27 @@ table .span12{float:none;width:924px;margin-left:0;}
 .tabs>li>a,.pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
 .tabs{border-bottom:1px solid #ddd;}
 .tabs>li{margin-bottom:-1px;}
-.tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
+.tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
 .tabs>.active>a,.tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
-.pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;border-radius:5px;}
 .pills .active>a,.pills .active>a:hover{color:#ffffff;background-color:#0088cc;}
 .nav.stacked>li{float:none;}
 .nav.stacked>li>a{margin-right:0;}
 .tabs.stacked{border-bottom:0;}
-.tabs.stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.tabs.stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
-.tabs.stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
+.tabs.stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;border-radius:0;}
+.tabs.stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
+.tabs.stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
 .tabs.stacked>li>a:hover{border-color:#ddd;z-index:2;}
 .pills.stacked>li>a{margin-bottom:3px;}
 .pills.stacked>li:last-child>a{margin-bottom:1px;}
 .pills .dropdown-menu,.tabs .dropdown-menu{margin-top:1px;border-width:1px;}
-.pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.pills .dropdown-menu{-webkit-border-radius:4px;border-radius:4px;}
 .tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;}
 .tabs .dropdown-toggle:hover .caret,.pills .dropdown-toggle:hover .caret{border-top-color:#005580;}
 .tabs .active .dropdown-toggle .caret,.pills .active .dropdown-toggle .caret{border-top-color:#333333;}
 .nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;}
 .tabs .open .dropdown-toggle,.pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;}
-.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
+.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;opacity:1;filter:alpha(opacity=100);}
 .tabs.stacked .open>a:hover{border-color:#999999;}
 .tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";}
 .tabbable:after{clear:both;}
@@ -353,32 +353,32 @@ table .span12{float:none;width:924px;margin-left:0;}
 .tab-content>.active,.pill-content>.active{display:block;}
 .tabs-below .tabs{border-top:1px solid #ddd;}
 .tabs-below .tabs>li{margin-top:-1px;margin-bottom:0;}
-.tabs-below .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
+.tabs-below .tabs>li>a{-webkit-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
 .tabs-below .tabs .active>a,.tabs-below .tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;}
 .tabs-left .tabs>li,.tabs-right .tabs>li{float:none;}
 .tabs-left .tabs>li>a,.tabs-right .tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;}
 .tabs-left .tabs{float:left;margin-right:19px;border-right:1px solid #ddd;}
-.tabs-left .tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
+.tabs-left .tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
 .tabs-left .tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;}
 .tabs-left .tabs .active>a,.tabs-left .tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;}
 .tabs-right .tabs{float:right;margin-left:19px;border-left:1px solid #ddd;}
-.tabs-right .tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.tabs-right .tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
 .tabs-right .tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
 .tabs-right .tabs .active>a,.tabs-right .tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;}
 .navbar{overflow:visible;}
-.navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
+.navbar-inner{background-color:#222222;background-color:#222222;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
 .navbar .brand:hover{color:#ffffff;text-decoration:none;}
 .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
 .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
 .navbar .btn,.navbar .btn-group{margin-top:5px;}
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
-.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
+.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
 .navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
-.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
+.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
-.navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;border-radius:4px;}
 .navbar-fixed{position:fixed;top:0;right:0;left:0;z-index:1030;}
 .navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
 .navbar .nav.pull-right{float:right;}
@@ -388,44 +388,44 @@ table .span12{float:none;width:924px;margin-left:0;}
 .navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#222222;background-color:rgba(0, 0, 0, 0.5);}
 .navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222222;border-right:1px solid #444;}
 .navbar .nav.pull-right{margin-left:10px;margin-right:0;}
-.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
 .navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
 .navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;}
-.navbar .nav .active .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
+.navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);}
 .navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
 .navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;}
 .navbar .nav.pull-right .dropdown-menu{right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
 .navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
-.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
+.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
 .breadcrumb .divider{padding:0 5px;color:#999999;}
 .breadcrumb .active a{color:#333333;}
 .pagination{height:36px;margin:18px 0;}
-.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);}
+.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}
 .pagination li{display:inline;}
 .pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;}
 .pagination a:hover,.pagination .active a{background-color:#f5f5f5;}
 .pagination .active a{color:#999999;}
 .pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;}
-.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
-.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 .pagination-centered{text-align:center;}
 .pagination-right{text-align:right;}
 .pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";}
 .pager:after{clear:both;}
 .pager li{display:inline;}
-.pager a{display:inline-block;padding:6px 15px;background-color:#f5f5f5;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
+.pager a{display:inline-block;padding:6px 15px;background-color:#f5f5f5;-webkit-border-radius:15px;border-radius:15px;}
 .pager .next a{float:right;}
 .pager .previous a{float:left;}
 .modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;}
-.modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;}
-.modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
+.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);}
+.modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
 .modal.fade.in{top:50%;}
 .modal-header{padding:5px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;}
 .modal-body{padding:15px;}
-.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
+.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
 .modal-footer:after{clear:both;}
 .modal-footer .btn{float:right;margin-left:5px;margin-bottom:0;}
-.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;}.tooltip.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;}
+.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);}
 .tooltip.top{margin-top:-2px;}
 .tooltip.right{margin-left:2px;}
 .tooltip.bottom{margin-top:2px;}
@@ -434,7 +434,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
 .tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
 .tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
-.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;border-radius:4px;}
 .tooltip-arrow{position:absolute;width:0;height:0;}
 .popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
 .popover.right{margin-left:5px;}
@@ -445,20 +445,20 @@ table .span12{float:none;width:924px;margin-left:0;}
 .popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
 .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
 .popover .arrow{position:absolute;width:0;height:0;}
-.popover .inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);}
-.popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
-.popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
+.popover .inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
+.popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
+.popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
 .btn.danger,.btn.danger:hover,.btn.success,.btn.success:hover,.btn.info,.btn.info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
-.btn.danger{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);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{background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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{background-color:#339bb9;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);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);}
-.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;}
+.btn.danger{background-color:#c43c35;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);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{background-color:#57a957;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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{background-color:#339bb9;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);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);}
+.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;border-radius:4px;-webkit-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);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;}
 .btn:focus{outline:1px dotted #666;}
-.btn.primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
-.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
-.btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn.primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#049cdb), to(#0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
+.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;}
+.btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;}
+.btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;border-radius:5px;}
 .btn.small{padding:7px 9px 7px;font-size:11px;}
 :root .btn{border-radius:0 \0;}
 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
@@ -466,18 +466,18 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .btn-group:after{clear:both;}
 .btn-group+.btn-group{margin-left:5px;}
 .btn-toolbar .btn-group{display:inline-block;}
-.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;border-radius:0;}
 .btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
 .btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
 .btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
 .btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
 .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;}
-.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}
-.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
-.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;border-radius:5px;}
+.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
 .btn .caret{margin-top:6px;margin-left:0;}
-.primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;filter:alpha(opacity=75);-moz-opacity:0.75;opacity:0.75;}
-.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
+.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;border-radius:4px;}
 .alert,.alert-heading{color:#c09853;}
 .alert .close{position:relative;right:-21px;line-height:18px;}
 .alert-success{background-color:#dff0d8;border-color:#cfe8c4;}
@@ -492,27 +492,27 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
 .thumbnails:after{clear:both;}
 .thumbnails>li{float:left;margin:0 0 18px 20px;}
-.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}
-a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
+.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}
+a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
 .thumbnail>img{display:block;max-width:100%;}
 .thumbnail .caption{padding:9px;}
-.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;}
+.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;}
 .label.warning{background-color:#f89406;}
 .label.success{background-color:#46a546;}
 .label.notice{background-color:#62cffc;}
-@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.progress{height:18px;margin-bottom:18px;background-color:#f9f9f9;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#f9f9f9));background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
-.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0480be;background-image:-khtml-gradient(linear, left top, left bottom, from(#149bdf), to(#0480be));background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #149bdf), color-stop(100%, #0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;border-radius:4px;}
+.progress{height:18px;margin-bottom:18px;background-color:#f9f9f9;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
+.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0480be;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
 .progress.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
 .progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
-.progress.danger .bar{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
+.progress.danger .bar{background-color:#c43c35;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
 .progress.danger.striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.progress.success .bar{background-color:#57a957;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
+.progress.success .bar{background-color:#57a957;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
 .progress.success.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.progress.info .bar{background-color:#339bb9;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
+.progress.info .bar{background-color:#339bb9;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
 .progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
 .accordion{margin-bottom:18px;}
-.accordion-group{background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.accordion-group{background-color:#f5f5f5;-webkit-border-radius:4px;border-radius:4px;}
 .accordion-heading{padding:8px 15px;border-bottom:0;}
 .accordion-body{margin-bottom:2px;}
 .accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
@@ -528,8 +528,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .carousel .next.left,.carousel .prev.right{left:0;}
 .carousel .active.left{left:-100%;}
 .carousel .active.right{left:100%;}
-.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;filter:alpha(opacity=50);-moz-opacity:0.5;opacity:0.5;-webkit-transition:all 0.2s linear;-moz-transition:all 0.2s linear;-ms-transition:all 0.2s linear;-o-transition:all 0.2s linear;transition:all 0.2s linear;}.carousel-control.right{left:auto;right:15px;}
-.carousel-control:hover{color:#ffffff;text-decoration:none;filter:alpha(opacity=90);-moz-opacity:0.9;opacity:0.9;}
+.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.2s linear;-moz-transition:all 0.2s linear;-ms-transition:all 0.2s linear;-o-transition:all 0.2s linear;transition:all 0.2s linear;}.carousel-control.right{left:auto;right:15px;}
+.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
 .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
 .carousel-caption h4,.carousel-caption p{color:#ffffff;}
 .pull-right{float:right;}
diff --git a/lib/mixins.less b/lib/mixins.less
index a1dc94626..2eab8f36e 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -134,14 +134,12 @@
 // Border Radius
 .border-radius(@radius: 5px) {
   -webkit-border-radius: @radius;
-     -moz-border-radius: @radius;
           border-radius: @radius;
 }
 
 // Drop shadows
 .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
   -webkit-box-shadow: @shadow;
-     -moz-box-shadow: @shadow;
           box-shadow: @shadow;
 }
 
@@ -178,10 +176,9 @@
 }
 
 // Background clipping
-// Heads up: FF 3.6 and under need padding instead of padding-box
+// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
 .background-clip(@clip) {
   -webkit-background-clip: @clip;
-     -moz-background-clip: @clip;
           background-clip: @clip;
 }
 
@@ -228,9 +225,8 @@
 
 // Opacity
 .opacity(@opacity: 100) {
-  filter: e(%("alpha(opacity=%d)", @opacity));
-    -moz-opacity: @opacity / 100;
-         opacity: @opacity / 100;
+  opacity: @opacity / 100;
+   filter: e(%("alpha(opacity=%d)", @opacity));
 }
 
 
@@ -245,9 +241,7 @@
   }
   .border(@color: @white, @alpha: 1) {
     border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
-    -webkit-background-clip: padding-box;
-       -moz-background-clip: padding;
-            background-clip: padding-box;
+    .background-clip(padding-box);
   }
 }
 
-- 
cgit v1.2.3


From 94ea3b62f09c840db5efe5e48815d011ca7e43d1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Wed, 25 Jan 2012 21:28:24 -0800
Subject: fix forms examples and allow for inputs in labels

---
 bootstrap.css                          |   8 ++-
 bootstrap.min.css                      |   2 +
 docs/base-css.html                     | 104 +++++++++++++++++----------------
 docs/templates/pages/base-css.mustache | 104 +++++++++++++++++----------------
 lib/forms.less                         |  11 ++++
 5 files changed, 126 insertions(+), 103 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 6068875fd..7de580162 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 20:31:53 PST 2012
+ * Date: Wed Jan 25 21:28:14 PST 2012
  */
 article,
 aside,
@@ -511,6 +511,9 @@ select,
   width: auto;
   height: auto;
 }
+label input, label textarea, label select {
+  display: block;
+}
 input[type=image], input[type=checkbox], input[type=radio] {
   width: auto;
   height: auto;
@@ -893,6 +896,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .control-group {
   margin-bottom: 9px;
 }
+.form-horizontal legend + .control-group {
+  padding-top: 27px;
+}
 .form-horizontal .control-group {
   margin-bottom: 18px;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index ba5e29549..06f511b14 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -96,6 +96,7 @@ label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,
 label{display:block;margin-bottom:5px;color:#333333;}
 input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;}
 .uneditable-textarea{width:auto;height:auto;}
+label input,label textarea,label select{display:block;}
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
 input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
@@ -174,6 +175,7 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir
 .form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
 .form-search label,.form-inline label{display:inline-block;}
 .control-group{margin-bottom:9px;}
+.form-horizontal legend+.control-group{padding-top:27px;}
 .form-horizontal .control-group{margin-bottom:18px;}
 .form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
 .form-horizontal .controls{margin-left:160px;}
diff --git a/docs/base-css.html b/docs/base-css.html
index 8340e0f60..a2eff98ee 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -939,63 +939,65 @@
   
              
     
              
       
              
-        Controls Bootstrap supports
-        
              
-          
-          
              
-            
-            
              In addition to freeform text, any HTML5 text-based input appears like so.
              
+        
              
+          Controls Bootstrap supports
+          
              
+            
+            
              
+              
+              
              In addition to freeform text, any HTML5 text-based input appears like so.
              
+            
              
           
              
-        
              
-        
              
-          
-          
              
-            
+          
              
+            
+            
              
+              
+            
              
           
              
-        
              
-        
              
-          
-          
              
-            
+          
              
+            
+            
              
+              
+            
              
           
              
-        
              
-        
              
-          
-          
              
-            
+          
              
+            
+            
              
+              
+            
              
           
              
-        
              
-        
              
-          
-          
              
-            
+          
              
+            
+            
              
+              
+            
              
           
              
-        
              
-        
              
-          
-          
              
-            
+          
              
+            
+            
              
+              
+            
              
           
              
-        
              
-        
              
-          
-          
-        
              
+          
              
+            
+            
+          
              
+        
       
     
              
     
              
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index cbc0519e5..c2dd661ae 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -875,63 +875,65 @@
   
              
     
              
       
              
-        {{_i}}Controls Bootstrap supports{{/i}}
-        
              
-          
-          
              
-            
-            
              {{_i}}In addition to freeform text, any HTML5 text-based input appears like so.{{/i}}
              
+        
              
+          {{_i}}Controls Bootstrap supports{{/i}}
+          
              
+            
+            
              
+              
+              
              {{_i}}In addition to freeform text, any HTML5 text-based input appears like so.{{/i}}
              
+            
              
           
              
-        
              
-        
              
-          
-          
              
-            
+          
              
+            
+            
              
+              
+            
              
           
              
-        
              
-        
              
-          
-          
              
-            
+          
              
+            
+            
              
+              
+            
              
           
              
-        
              
-        
              
-          
-          
              
-            
+          
              
+            
+            
              
+              
+            
              
           
              
-        
              
-        
              
-          
-          
              
-            
+          
              
+            
+            
              
+              
+            
              
           
              
-        
              
-        
              
-          
-          
              
-            
+          
              
+            
+            
              
+              
+            
              
           
              
-        
              
-        
              
-          
-          
-        
              
+          
              
+            
+            
+          
              
+        
       
     
              
     
              
diff --git a/lib/forms.less b/lib/forms.less
index 7451f36ef..3acb8c5dc 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -68,6 +68,13 @@ select,
   height: auto;
 }
 
+// Inputs within a label
+label input,
+label textarea,
+label select {
+  display: block;
+}
+
 // Mini reset for unique input types
 input[type=image],
 input[type=checkbox],
@@ -474,6 +481,10 @@ select:focus:required:invalid {
 // --------------------------
 
 .form-horizontal {
+  // Legend collapses margin, so we're relegated to padding
+  legend + .control-group {
+    padding-top: @baseLineHeight * 1.5;
+  }
   // Increase spacing between groups
   .control-group {
     margin-bottom: @baseLineHeight;
-- 
cgit v1.2.3


From 106625a2ece84fd5e1e68144411c8d00db05c23f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 00:36:40 -0800
Subject: fix small icons on homepage

---
 docs/index.html                     | 8 ++++----
 docs/templates/pages/index.mustache | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index b866da87c..f3738e837 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -189,22 +189,22 @@
           
              
           
              
             
              
-              
+              
               
              HTML5
              
               
              Built to support new HTML5 elements and syntax.
              
             
              
             
              
-              
+              
               
              CSS3
              
               
              Progressively enhanced components for ultimate style.
              
             
              
             
              
-              
+              
               
              Open-source
              
               
              Built for and maintained by the community via GitHub.
              
             
              
             
              
-              
+              
               
              Made at Twitter
              
               
              Brought to you by an experienced engineer and designer.
              
             
              
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index ff486bc7b..33bfd035f 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -125,22 +125,22 @@
           
              
           
              
             
              
-              
+              
               
              HTML5
              
               
              {{_i}}Built to support new HTML5 elements and syntax.{{/i}}
              
             
              
             
              
-              
+              
               
              CSS3
              
               
              {{_i}}Progressively enhanced components for ultimate style.{{/i}}
              
             
              
             
              
-              
+              
               
              {{_i}}Open-source{{/i}}
              
               
              {{_i}}Built for and maintained by the community via GitHub.{{/i}}
              
             
              
             
              
-              
+              
               
              {{_i}}Made at Twitter{{/i}}
              
               
              {{_i}}Brought to you by an experienced engineer and designer.{{/i}}
              
             
              
-- 
cgit v1.2.3


From 0ef4b6419fd83170dd62049a2850c5e8466635c9 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 10:00:09 -0800
Subject: overhaul frontpage jumbotron, add js for twitter buttons back in, fix
 up some form ids and classes, straighten out the use of primary button
 variable

---
 bootstrap-responsive.css               |   1 +
 bootstrap-responsive.min.css           |   2 +-
 bootstrap.css                          | 103 +++++++++++++++++++++---
 bootstrap.min.css                      | 141 +++++++++++++++++----------------
 docs/assets/css/docs.css               |  50 ++++++++----
 docs/base-css.html                     |  66 +++++++--------
 docs/components.html                   |   8 +-
 docs/download.html                     |   8 +-
 docs/examples.html                     |   8 +-
 docs/index.html                        |  66 ++++++++-------
 docs/javascript.html                   |   8 +-
 docs/less.html                         |  12 ++-
 docs/scaffolding.html                  |   8 +-
 docs/templates/layout.mustache         |   8 +-
 docs/templates/pages/base-css.mustache |  58 +++++++-------
 docs/templates/pages/index.mustache    |  58 +++++++-------
 docs/templates/pages/less.mustache     |   4 +-
 docs/upgrading.html                    |   8 +-
 lib/buttons.less                       |   2 +-
 lib/forms.less                         |   6 ++
 lib/mixins.less                        |   3 +
 lib/variables.less                     |   2 +-
 22 files changed, 394 insertions(+), 236 deletions(-)

diff --git a/bootstrap-responsive.css b/bootstrap-responsive.css
index 7907c0e08..02b5c099e 100644
--- a/bootstrap-responsive.css
+++ b/bootstrap-responsive.css
@@ -13,6 +13,7 @@
   }
   .navbar .nav, .navbar .nav > li:last-child a {
     -webkit-border-radius: 0 0 4px 0;
+    -moz-border-radius: 0 0 4px 0;
     border-radius: 0 0 4px 0;
   }
   .navbar .nav > li {
diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
index fb736a12b..8ed8745bb 100644
--- a/bootstrap-responsive.min.css
+++ b/bootstrap-responsive.min.css
@@ -1,3 +1,3 @@
 
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
+@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
diff --git a/bootstrap.css b/bootstrap.css
index 7de580162..787211a75 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 21:28:14 PST 2012
+ * Date: Thu Jan 26 09:49:45 PST 2012
  */
 article,
 aside,
@@ -420,6 +420,7 @@ code, pre {
   font-size: 12px;
   color: #333333;
   -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
   border-radius: 3px;
 }
 code {
@@ -438,6 +439,7 @@ pre {
   border: 1px solid #ccc;
   border: 1px solid rgba(0, 0, 0, 0.15);
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
   white-space: pre;
   white-space: pre-wrap;
@@ -505,6 +507,7 @@ select,
   color: #555555;
   border: 1px solid #ccc;
   -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
   border-radius: 3px;
 }
 .uneditable-textarea {
@@ -533,6 +536,7 @@ input[type=file] {
   background-color: #ffffff;
   background-color: initial;
   -webkit-box-shadow: none;
+  -moz-box-shadow: none;
   box-shadow: none;
 }
 input[type=button], input[type=reset], input[type=submit] {
@@ -558,11 +562,15 @@ select[multiple], select[size] {
 }
 input[type=image] {
   -webkit-box-shadow: none;
+  -moz-box-shadow: none;
   box-shadow: none;
 }
 textarea {
   height: auto;
 }
+input[type=hidden] {
+  display: none;
+}
 .radio, .checkbox {
   padding-left: 18px;
 }
@@ -582,6 +590,7 @@ textarea {
 }
 input, textarea {
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
   -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
@@ -592,11 +601,13 @@ input, textarea {
 input:focus, textarea:focus {
   border-color: rgba(82, 168, 236, 0.8);
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   outline: 0;
 }
 input[type=file]:focus, input[type=checkbox]:focus, select:focus {
   -webkit-box-shadow: none;
+  -moz-box-shadow: none;
   box-shadow: none;
   outline: 1px dotted #666;
 }
@@ -717,6 +728,7 @@ textarea[readonly] {
 .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
   border-color: #a47e3c;
   -webkit-box-shadow: 0 0 6px #dbc59e;
+  -moz-box-shadow: 0 0 6px #dbc59e;
   box-shadow: 0 0 6px #dbc59e;
 }
 .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on {
@@ -734,6 +746,7 @@ textarea[readonly] {
 .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
   border-color: #953b39;
   -webkit-box-shadow: 0 0 6px #d59392;
+  -moz-box-shadow: 0 0 6px #d59392;
   box-shadow: 0 0 6px #d59392;
 }
 .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on {
@@ -751,6 +764,7 @@ textarea[readonly] {
 .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
   border-color: #356635;
   -webkit-box-shadow: 0 0 6px #7aba7b;
+  -moz-box-shadow: 0 0 6px #7aba7b;
   box-shadow: 0 0 6px #7aba7b;
 }
 .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on {
@@ -765,6 +779,7 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
 input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus {
   border-color: #e9322d;
   -webkit-box-shadow: 0 0 6px #f8b9b7;
+  -moz-box-shadow: 0 0 6px #f8b9b7;
   box-shadow: 0 0 6px #f8b9b7;
 }
 .form-actions {
@@ -779,6 +794,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   background-color: #ffffff;
   border-color: #eee;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
   cursor: not-allowed;
 }
@@ -822,6 +838,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .input-prepend .uneditable-input,
 .input-append .uneditable-input {
   -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
 .input-prepend .uneditable-input, .input-append .uneditable-input {
@@ -843,6 +860,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   background-color: #f5f5f5;
   border: 1px solid #ccc;
   -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
 }
 .input-prepend .active, .input-append .active {
@@ -857,6 +875,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .input-append input, .input-append .uneditable-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 .uneditable-input {
@@ -866,6 +885,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   margin-right: 0;
   margin-left: -1px;
   -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
 .search-query {
@@ -873,6 +893,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   padding-right: 14px;
   margin-bottom: 0;
   -webkit-border-radius: 14px;
+  -moz-border-radius: 14px;
   border-radius: 14px;
 }
 .form-search input,
@@ -949,6 +970,7 @@ table {
   border: 1px solid #ddd;
   border-collapse: separate;
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .table-bordered th + th,
@@ -962,18 +984,22 @@ table {
 }
 .table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child {
   -webkit-border-radius: 4px 0 0 0;
+  -moz-border-radius: 4px 0 0 0;
   border-radius: 4px 0 0 0;
 }
 .table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child {
   -webkit-border-radius: 0 4px 0 0;
+  -moz-border-radius: 0 4px 0 0;
   border-radius: 0 4px 0 0;
 }
 .table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child {
   -webkit-border-radius: 0 0 0 4px;
+  -moz-border-radius: 0 0 0 4px;
   border-radius: 0 0 0 4px;
 }
 .table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child {
   -webkit-border-radius: 0 0 4px 0;
+  -moz-border-radius: 0 0 4px 0;
   border-radius: 0 0 4px 0;
 }
 .table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th {
@@ -1361,8 +1387,10 @@ table .span12 {
   border-style: solid;
   border-width: 1px;
   -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
   border-radius: 0 0 5px 5px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
   -webkit-background-clip: padding-box;
   -moz-background-clip: padding;
@@ -1408,6 +1436,7 @@ table .span12 {
 .typeahead {
   margin-top: 2px;
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .well {
@@ -1418,8 +1447,10 @@ table .span12 {
   border: 1px solid #eee;
   border: 1px solid rgba(0, 0, 0, 0.05);
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
   -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);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
 }
 .well blockquote {
@@ -1539,6 +1570,7 @@ table .span12 {
   padding-bottom: 9px;
   border: 1px solid transparent;
   -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
 .tabs > li > a:hover {
@@ -1557,6 +1589,7 @@ table .span12 {
   margin-top: 2px;
   margin-bottom: 2px;
   -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
   border-radius: 5px;
 }
 .pills .active > a, .pills .active > a:hover {
@@ -1575,14 +1608,17 @@ table .span12 {
 .tabs.stacked > li > a {
   border: 1px solid #ddd;
   -webkit-border-radius: 0;
+  -moz-border-radius: 0;
   border-radius: 0;
 }
 .tabs.stacked > li:first-child > a {
   -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
 .tabs.stacked > li:last-child > a {
   -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
   border-radius: 0 0 4px 4px;
 }
 .tabs.stacked > li > a:hover {
@@ -1601,6 +1637,7 @@ table .span12 {
 }
 .pills .dropdown-menu {
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
@@ -1658,6 +1695,7 @@ table .span12 {
 }
 .tabs-below .tabs > li > a {
   -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
   border-radius: 0 0 4px 4px;
 }
 .tabs-below .tabs > li > a:hover {
@@ -1683,6 +1721,7 @@ table .span12 {
 .tabs-left .tabs > li > a {
   margin-right: -1px;
   -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
   border-radius: 4px 0 0 4px;
 }
 .tabs-left .tabs > li > a:hover {
@@ -1699,6 +1738,7 @@ table .span12 {
 .tabs-right .tabs > li > a {
   margin-left: -1px;
   -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
   border-radius: 0 4px 4px 0;
 }
 .tabs-right .tabs > li > a:hover {
@@ -1722,6 +1762,7 @@ table .span12 {
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
   -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }
 .navbar .brand:hover {
@@ -1777,6 +1818,7 @@ table .span12 {
   background: rgba(255, 255, 255, 0.3);
   border: 1px solid #111;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
   -webkit-transition: none;
   -moz-transition: none;
@@ -1802,6 +1844,7 @@ table .span12 {
   background-color: #ffffff;
   border: 0;
   -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
   box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
   outline: 0;
 }
@@ -1812,6 +1855,7 @@ table .span12 {
   padding-left: 20px;
   padding-right: 20px;
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .navbar-fixed {
@@ -1869,6 +1913,7 @@ table .span12 {
 .navbar .dropdown-menu {
   margin-top: 1px;
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .navbar .dropdown-menu:before {
@@ -1930,8 +1975,10 @@ table .span12 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
   border: 1px solid #ddd;
   -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
   border-radius: 3px;
   -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
   box-shadow: inset 0 1px 0 #ffffff;
 }
 .breadcrumb li {
@@ -1958,8 +2005,10 @@ table .span12 {
   margin-left: 0;
   margin-bottom: 0;
   -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
   border-radius: 3px;
   -webkit-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);
 }
 .pagination li {
@@ -1987,10 +2036,12 @@ table .span12 {
 .pagination li:first-child a {
   border-left-width: 1px;
   -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
 }
 .pagination li:last-child a {
   -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
 .pagination-centered {
@@ -2021,6 +2072,7 @@ table .span12 {
   padding: 6px 15px;
   background-color: #f5f5f5;
   -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
   border-radius: 15px;
 }
 .pager .next a {
@@ -2061,10 +2113,13 @@ table .span12 {
   /* IE6-7 */
 
   -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
   border-radius: 6px;
   -webkit-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);
   -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
 .modal.fade {
@@ -2094,8 +2149,10 @@ table .span12 {
   background-color: #f5f5f5;
   border-top: 1px solid #ddd;
   -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
   border-radius: 0 0 6px 6px;
   -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
   box-shadow: inset 0 1px 0 #ffffff;
   *zoom: 1;
 }
@@ -2177,6 +2234,7 @@ table .span12 {
   text-decoration: none;
   background-color: #000000;
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .tooltip-arrow {
@@ -2248,8 +2306,10 @@ table .span12 {
   background: #000000;
   background: rgba(0, 0, 0, 0.8);
   -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
   border-radius: 6px;
   -webkit-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);
 }
 .popover .title {
@@ -2258,14 +2318,17 @@ table .span12 {
   background-color: #f5f5f5;
   border-bottom: 1px solid #eee;
   -webkit-border-radius: 3px 3px 0 0;
+  -moz-border-radius: 3px 3px 0 0;
   border-radius: 3px 3px 0 0;
 }
 .popover .content {
   padding: 14px;
   background-color: #ffffff;
   -webkit-border-radius: 0 0 3px 3px;
+  -moz-border-radius: 0 0 3px 3px;
   border-radius: 0 0 3px 3px;
   -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
 .popover .content p, .popover .content ul, .popover .content ol {
@@ -2338,8 +2401,10 @@ table .span12 {
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
   -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);
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   cursor: pointer;
   -webkit-transition: 0.1s linear all;
@@ -2359,21 +2424,22 @@ table .span12 {
 .btn.primary {
   color: #ffffff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0064cd;
-  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
-  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#049cdb), to(#0064cd));
-  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
-  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
-  background-image: linear-gradient(top, #049cdb, #0064cd);
+  background-color: #0055cc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0055cc);
+  background-image: linear-gradient(top, #0088cc, #0055cc);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
-  border-color: #0064cd #0064cd #003f81;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);
+  border-color: #0055cc #0055cc #003580;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
 }
 .btn.active, .btn:active {
   background-image: none;
   -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 .btn.disabled {
@@ -2383,6 +2449,7 @@ table .span12 {
   opacity: 0.65;
   filter: alpha(opacity=65);
   -webkit-box-shadow: none;
+  -moz-box-shadow: none;
   box-shadow: none;
 }
 .btn[disabled] {
@@ -2392,6 +2459,7 @@ table .span12 {
   opacity: 0.65;
   filter: alpha(opacity=65);
   -webkit-box-shadow: none;
+  -moz-box-shadow: none;
   box-shadow: none;
 }
 .btn.large {
@@ -2399,6 +2467,7 @@ table .span12 {
   font-size: 15px;
   line-height: normal;
   -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
   border-radius: 5px;
 }
 .btn.small {
@@ -2434,6 +2503,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   float: left;
   margin-left: -1px;
   -webkit-border-radius: 0;
+  -moz-border-radius: 0;
   border-radius: 0;
 }
 .btn-group .btn:first-child {
@@ -2477,17 +2547,20 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   padding-left: 8px;
   padding-right: 8px;
   -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 .btn-group.open .dropdown-menu {
   display: block;
   margin-top: 1px;
   -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
   border-radius: 5px;
 }
 .btn-group.open .dropdown-toggle {
   background-image: none;
   -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 .btn .caret {
@@ -2509,6 +2582,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   background-color: #fcf8e3;
   border: 1px solid #f3edd2;
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .alert, .alert-heading {
@@ -2575,13 +2649,16 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   line-height: 1;
   border: 1px solid #ddd;
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
   -webkit-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);
 }
 a.thumbnail:hover {
   border-color: #0088cc;
   -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
   box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
 }
 .thumbnail > img {
@@ -2599,6 +2676,7 @@ a.thumbnail:hover {
   text-transform: uppercase;
   background-color: #999999;
   -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
   border-radius: 3px;
 }
 .label.important {
@@ -2631,6 +2709,7 @@ a.thumbnail:hover {
 }
 .progress, .progress .bar {
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .progress {
@@ -2646,6 +2725,7 @@ a.thumbnail:hover {
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
 }
 .progress .bar {
@@ -2665,6 +2745,7 @@ a.thumbnail:hover {
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -2759,6 +2840,7 @@ a.thumbnail:hover {
 .accordion-group {
   background-color: #f5f5f5;
   -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .accordion-heading {
@@ -2835,6 +2917,7 @@ a.thumbnail:hover {
   background: #222222;
   border: 3px solid #ffffff;
   -webkit-border-radius: 23px;
+  -moz-border-radius: 23px;
   border-radius: 23px;
   opacity: 0.5;
   filter: alpha(opacity=50);
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 06f511b14..94bde2d36 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -83,9 +83,9 @@ blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:
 blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
 q:before,q:after,blockquote:before,blockquote:after{content:"";}
 address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
-code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;border-radius:3px;}
+code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}
-pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
+pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
 pre code{padding:0;background-color:transparent;}
 small{font-size:100%;}
 cite{font-style:normal;}
@@ -94,25 +94,26 @@ fieldset{padding:0;margin:0;border:0;}
 legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
 label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
-input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;}
+input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 .uneditable-textarea{width:auto;height:auto;}
 label input,label textarea,label select{display:block;}
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
-input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;box-shadow:none;}
+input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
 select,input[type=file]{height:28px;*margin-top:4px;line-height:28px;}
 select{width:220px;vertical-align:baseline;background-color:#ffffff;}
 select[multiple],select[size]{height:auto;}
-input[type=image]{-webkit-box-shadow:none;box-shadow:none;}
+input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 textarea{height:auto;}
+input[type=hidden]{display:none;}
 .radio,.checkbox{padding-left:18px;}
 .radio input[type=radio],.checkbox input[type=checkbox]{float:left;margin-left:-18px;}
 .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;}
 .radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;}
 .radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
-input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
-input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
-input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;box-shadow:none;outline:1px dotted #666;}
+input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
+input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
+input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;}
 .input-mini{width:60px;}
 .input-small{width:90px;}
 .input-medium{width:150px;}
@@ -146,32 +147,32 @@ select.span11{width:870px;}
 select.span12{width:950px;}
 input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
 .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
-.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
+.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
 .control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
 .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
-.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
+.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
 .control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
 .control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
-.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
+.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
 .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
-input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
+input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
 .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
-.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
+.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
 :-moz-placeholder{color:#999999;}
 ::-webkit-input-placeholder{color:#999999;}
 .help-block{margin-top:5px;margin-bottom:0;color:#999999;}
 .help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;}
 .input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";}
 .input-prepend:after,.input-append:after{clear:both;}
-.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 .input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;}
-.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
 .input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;}
 .input-prepend .add-on{*margin-top:1px;}
-.input-append input,.input-append .uneditable-input{float:left;-webkit-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-append input,.input-append .uneditable-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 .uneditable-input{border-right-color:#ccc;}
-.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
-.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;border-radius:14px;}
+.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
 .form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
 .form-search label,.form-inline label{display:inline-block;}
 .control-group{margin-bottom:9px;}
@@ -187,12 +188,12 @@ table{max-width:100%;border-collapse:collapse;border-spacing:0;}
 .table thead:first-child tr th,.table thead:first-child tr td{border-top:0;}
 .table tbody+tbody{border-top:2px solid #ddd;}
 .table-condensed th,.table-condensed td{padding:4px 5px;}
-.table-bordered{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;}
+.table-bordered{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;}
 .table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
-.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
-.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
-.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
-.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
+.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
+.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
+.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
+.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
 .table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;}
 table .span1{float:none;width:44px;margin-left:0;}
 table .span2{float:none;width:124px;margin-left:0;}
@@ -301,14 +302,14 @@ table .span12{float:none;width:924px;margin-left:0;}
 .caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";}
 .dropdown .caret{margin-top:8px;margin-left:2px;*margin-top:7px;}
 .dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);}
-.dropdown-menu{position:absolute;top:100%;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.bottom-up{top:auto;bottom:100%;margin-bottom:2px;}
+.dropdown-menu{position:absolute;top:100%;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.bottom-up{top:auto;bottom:100%;margin-bottom:2px;}
 .dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
 .dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
 .dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;}
 .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
 .dropdown.open .dropdown-menu{display:block;}
-.typeahead{margin-top:2px;-webkit-border-radius:4px;border-radius:4px;}
-.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
+.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
 .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
 .collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
 .close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;}
@@ -326,21 +327,21 @@ table .span12{float:none;width:924px;margin-left:0;}
 .tabs>li>a,.pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
 .tabs{border-bottom:1px solid #ddd;}
 .tabs>li{margin-bottom:-1px;}
-.tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
+.tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
 .tabs>.active>a,.tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
-.pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;border-radius:5px;}
+.pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
 .pills .active>a,.pills .active>a:hover{color:#ffffff;background-color:#0088cc;}
 .nav.stacked>li{float:none;}
 .nav.stacked>li>a{margin-right:0;}
 .tabs.stacked{border-bottom:0;}
-.tabs.stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;border-radius:0;}
-.tabs.stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
-.tabs.stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
+.tabs.stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.tabs.stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
+.tabs.stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
 .tabs.stacked>li>a:hover{border-color:#ddd;z-index:2;}
 .pills.stacked>li>a{margin-bottom:3px;}
 .pills.stacked>li:last-child>a{margin-bottom:1px;}
 .pills .dropdown-menu,.tabs .dropdown-menu{margin-top:1px;border-width:1px;}
-.pills .dropdown-menu{-webkit-border-radius:4px;border-radius:4px;}
+.pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;}
 .tabs .dropdown-toggle:hover .caret,.pills .dropdown-toggle:hover .caret{border-top-color:#005580;}
 .tabs .active .dropdown-toggle .caret,.pills .active .dropdown-toggle .caret{border-top-color:#333333;}
@@ -355,32 +356,32 @@ table .span12{float:none;width:924px;margin-left:0;}
 .tab-content>.active,.pill-content>.active{display:block;}
 .tabs-below .tabs{border-top:1px solid #ddd;}
 .tabs-below .tabs>li{margin-top:-1px;margin-bottom:0;}
-.tabs-below .tabs>li>a{-webkit-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
+.tabs-below .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
 .tabs-below .tabs .active>a,.tabs-below .tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;}
 .tabs-left .tabs>li,.tabs-right .tabs>li{float:none;}
 .tabs-left .tabs>li>a,.tabs-right .tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;}
 .tabs-left .tabs{float:left;margin-right:19px;border-right:1px solid #ddd;}
-.tabs-left .tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
+.tabs-left .tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
 .tabs-left .tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;}
 .tabs-left .tabs .active>a,.tabs-left .tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;}
 .tabs-right .tabs{float:right;margin-left:19px;border-left:1px solid #ddd;}
-.tabs-right .tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.tabs-right .tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
 .tabs-right .tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
 .tabs-right .tabs .active>a,.tabs-right .tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;}
 .navbar{overflow:visible;}
-.navbar-inner{background-color:#222222;background-color:#222222;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
+.navbar-inner{background-color:#222222;background-color:#222222;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
 .navbar .brand:hover{color:#ffffff;text-decoration:none;}
 .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
 .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
 .navbar .btn,.navbar .btn-group{margin-top:5px;}
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
-.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
+.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
 .navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
-.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
+.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
-.navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;border-radius:4px;}
+.navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .navbar-fixed{position:fixed;top:0;right:0;left:0;z-index:1030;}
 .navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
 .navbar .nav.pull-right{float:right;}
@@ -390,7 +391,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#222222;background-color:rgba(0, 0, 0, 0.5);}
 .navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222222;border-right:1px solid #444;}
 .navbar .nav.pull-right{margin-left:10px;margin-right:0;}
-.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
 .navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
 .navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;}
 .navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);}
@@ -398,33 +399,33 @@ table .span12{float:none;width:924px;margin-left:0;}
 .navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;}
 .navbar .nav.pull-right .dropdown-menu{right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
 .navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
-.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
+.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
 .breadcrumb .divider{padding:0 5px;color:#999999;}
 .breadcrumb .active a{color:#333333;}
 .pagination{height:36px;margin:18px 0;}
-.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}
+.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);}
 .pagination li{display:inline;}
 .pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;}
 .pagination a:hover,.pagination .active a{background-color:#f5f5f5;}
 .pagination .active a{color:#999999;}
 .pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;}
-.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
-.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 .pagination-centered{text-align:center;}
 .pagination-right{text-align:right;}
 .pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";}
 .pager:after{clear:both;}
 .pager li{display:inline;}
-.pager a{display:inline-block;padding:6px 15px;background-color:#f5f5f5;-webkit-border-radius:15px;border-radius:15px;}
+.pager a{display:inline-block;padding:6px 15px;background-color:#f5f5f5;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
 .pager .next a{float:right;}
 .pager .previous a{float:left;}
 .modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;}
 .modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);}
-.modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
+.modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
 .modal.fade.in{top:50%;}
 .modal-header{padding:5px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;}
 .modal-body{padding:15px;}
-.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
+.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
 .modal-footer:after{clear:both;}
 .modal-footer .btn{float:right;margin-left:5px;margin-bottom:0;}
 .tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);}
@@ -436,7 +437,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
 .tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
 .tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
-.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;border-radius:4px;}
+.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .tooltip-arrow{position:absolute;width:0;height:0;}
 .popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
 .popover.right{margin-left:5px;}
@@ -447,20 +448,20 @@ table .span12{float:none;width:924px;margin-left:0;}
 .popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
 .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
 .popover .arrow{position:absolute;width:0;height:0;}
-.popover .inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
-.popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
-.popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
+.popover .inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);}
+.popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
+.popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
 .btn.danger,.btn.danger:hover,.btn.success,.btn.success:hover,.btn.info,.btn.info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
 .btn.danger{background-color:#c43c35;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);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{background-color:#57a957;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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{background-color:#339bb9;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);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);}
-.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;border-radius:4px;-webkit-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);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;}
+.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;}
 .btn:focus{outline:1px dotted #666;}
-.btn.primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#049cdb), to(#0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
-.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
-.btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;}
-.btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;}
-.btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;border-radius:5px;}
+.btn.primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0055cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
+.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
 .btn.small{padding:7px 9px 7px;font-size:11px;}
 :root .btn{border-radius:0 \0;}
 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
@@ -468,18 +469,18 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .btn-group:after{clear:both;}
 .btn-group+.btn-group{margin-left:5px;}
 .btn-toolbar .btn-group{display:inline-block;}
-.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;border-radius:0;}
+.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 .btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
 .btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
 .btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
 .btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
 .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;}
-.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}
-.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;border-radius:5px;}
-.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
 .btn .caret{margin-top:6px;margin-left:0;}
 .primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
-.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;border-radius:4px;}
+.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .alert,.alert-heading{color:#c09853;}
 .alert .close{position:relative;right:-21px;line-height:18px;}
 .alert-success{background-color:#dff0d8;border-color:#cfe8c4;}
@@ -494,17 +495,17 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
 .thumbnails:after{clear:both;}
 .thumbnails>li{float:left;margin:0 0 18px 20px;}
-.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}
-a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
+.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}
+a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
 .thumbnail>img{display:block;max-width:100%;}
 .thumbnail .caption{padding:9px;}
-.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;}
+.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;}
 .label.warning{background-color:#f89406;}
 .label.success{background-color:#46a546;}
 .label.notice{background-color:#62cffc;}
-@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;border-radius:4px;}
-.progress{height:18px;margin-bottom:18px;background-color:#f9f9f9;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
-.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0480be;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.progress{height:18px;margin-bottom:18px;background-color:#f9f9f9;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
+.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0480be;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
 .progress.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
 .progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
 .progress.danger .bar{background-color:#c43c35;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
@@ -514,7 +515,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .progress.info .bar{background-color:#339bb9;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
 .progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
 .accordion{margin-bottom:18px;}
-.accordion-group{background-color:#f5f5f5;-webkit-border-radius:4px;border-radius:4px;}
+.accordion-group{background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .accordion-heading{padding:8px 15px;border-bottom:0;}
 .accordion-body{margin-bottom:2px;}
 .accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
@@ -530,7 +531,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .carousel .next.left,.carousel .prev.right{left:0;}
 .carousel .active.left{left:-100%;}
 .carousel .active.right{left:100%;}
-.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.2s linear;-moz-transition:all 0.2s linear;-ms-transition:all 0.2s linear;-o-transition:all 0.2s linear;transition:all 0.2s linear;}.carousel-control.right{left:auto;right:15px;}
+.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.2s linear;-moz-transition:all 0.2s linear;-ms-transition:all 0.2s linear;-o-transition:all 0.2s linear;transition:all 0.2s linear;}.carousel-control.right{left:auto;right:15px;}
 .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
 .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
 .carousel-caption h4,.carousel-caption p{color:#ffffff;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 9f21f901f..d266dd92e 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -50,31 +50,41 @@ section {
   line-height: 1;
 }
 
+/* Faded out hr */
+hr.soften {
+  height: 1px;
+  margin: 54px 0;
+  background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); 
+  background-image:    -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); 
+  background-image:     -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); 
+  background-image:      -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); 
+  border: 0;
+}
+
 
 /* Jumbotrons
 -------------------------------------------------- */
 .jumbotron {
   position: relative;
-  text-shadow: 0 1px 0 #fff;
 }
 .jumbotron h1 {
-  margin-right: 40%;
   margin-bottom: 9px;
-  font-size: 90px;
+  font-size: 108px;
   letter-spacing: -1px;
   line-height: 1;
 }
 .jumbotron p {
-  margin-right: 32%;
-  margin-bottom: 20px;
+  margin-bottom: 18px;
   font-size: 25px;
   font-weight: 300;
   line-height: 36px;
+  color: #333;
 }
 .jumbotron .btn-large {
   font-size: 20px;
+  font-weight: normal;
   padding: 14px 24px;
-  margin-right: 5px;
+  margin-right: 10px;
   -webkit-border-radius: 6px;
      -moz-border-radius: 6px;
           border-radius: 6px;
@@ -84,9 +94,26 @@ section {
   color: #999;
 }
 
+/* Masthead (docs home) */
+.masthead {
+  padding: 36px 0 0;
+}
+.masthead h1,
+.masthead p {
+  text-align: center;
+}
+.masthead h1 {
+  margin-bottom: 18px;
+}
+.masthead p {
+  margin: 0 5% 27px;
+}
+
+
 /* Benefits list in masthead */
 .benefits {
-  width: 280px;
+  display: none;
+  width: 260px;
   position: absolute;
   right: 0;
   bottom: 0;
@@ -213,16 +240,9 @@ section {
 .quick-links {
   min-height: 30px;
   padding: 5px 20px;
-  margin: 45px 0;
+  margin: 36px 0;
   list-style: none;
   text-align: center;
-  background-color: #eee;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
-     -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
-          box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
   overflow: hidden;
 }
 .quick-links li {
diff --git a/docs/base-css.html b/docs/base-css.html
index a2eff98ee..bbe7ecd88 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -27,6 +27,7 @@
 
   
   
+  
   
     
              
@@ -944,7 +945,7 @@
           
              
             
             
              
-              
+              
               
              In addition to freeform text, any HTML5 text-based input appears like so.
              
             
              
           
              
@@ -952,7 +953,7 @@
             
             
              
               
             
              
@@ -960,7 +961,7 @@
           
              
             
             
              
-              
                 
                 
                 
@@ -972,7 +973,7 @@
           
              
             
             
              
-              
                 
                 
                 
@@ -984,13 +985,13 @@
           
              
             
             
              
-              
+              
             
              
           
              
           
              
             
             
              
-              
+              
             
              
           
              
           
              
@@ -1030,20 +1031,20 @@
           
              
             
             
              
-              
+              
             
              
           
              
           
              
             
             
              
-              
+              
             
              
           
              
           
              
-            
+            
             
              
               
             
              
@@ -1051,28 +1052,28 @@
           
              
             
             
              
-              
+              
               Something may have gone wrong
             
              
           
              
           
              
             
             
              
-              
+              
               Please correct the error
             
              
           
              
           
              
             
             
              
-              
+              
               Woohoo!
             
              
           
              
           
              
             
             
              
-              
                 
                 
                 
@@ -1116,9 +1117,9 @@
           
              
             
             
              
-              
-              
-              
+              
+              
+              
               
              Use the same .span* classes from the grid system for input sizes.
              
             
              
           
              
@@ -1127,7 +1128,7 @@
             
              
               
              
                 @
-                
+                
               
              
               
              Here's some help text
              
             
              
@@ -1136,7 +1137,7 @@
             
             
              
               
              
-                
+                
                 .00
               
              
               
              Here's more help text
              
@@ -1146,43 +1147,43 @@
             
             
              
               
               
               
             
              
           
              
           
              
-            
+            
             
              
               
               
               
               
              Note: Labels surround all the options for much larger click areas and a more usable form.
              
             
              
           
              
           
              
-            
+            
             
              
               
               
             
              
@@ -1482,6 +1483,7 @@
     
              
   
              
 
          
+
      
       
          
@@ -1494,9 +1496,11 @@
     
        
 
 
-    
+
+    
     
-    
+    
     
     
     
diff --git a/docs/components.html b/docs/components.html
index 2ccfd26e6..49f3f8369 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -27,6 +27,7 @@
 
   
   
+  
   
     
        
@@ -1248,6 +1249,7 @@
 
       
        
 
+
      
       
        
@@ -1260,9 +1262,11 @@
     
      
 
 
-    
+
+    
     
-    
+    
     
     
     
diff --git a/docs/download.html b/docs/download.html
index 58fdd5659..3ad6ec921 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -27,6 +27,7 @@
 
   
   
+  
   
     
      
@@ -301,6 +302,7 @@
   
      
 
 
+
      
       
      
@@ -313,9 +315,11 @@
     
      
 
 
-    
+
+    
     
-    
+    
     
     
     
diff --git a/docs/examples.html b/docs/examples.html
index bc52bea55..0d3e11f5a 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -27,6 +27,7 @@
 
   
   
+  
   
     
      
@@ -89,6 +90,7 @@
 
 
 
+
      
       
      
@@ -101,9 +103,11 @@
     
      
 
 
-    
+
+    
     
-    
+    
     
     
     
diff --git a/docs/index.html b/docs/index.html
index f3738e837..333077601 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -27,6 +27,7 @@
 
   
   
+  
   
     
      
@@ -68,18 +69,17 @@
         ================================================== -->
         
      
           
      
-            
      Bootstrap,
       from Twitter
      
-            
      Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.
      
+            
      Twitter Bootstrap
      
+            
      Bootstrap is a comprehensive front-end toolkit from Twitter designed to kickstart web development. It features HTML, CSS, and JS for dozens of base elements, commonly used design components, and more.
      
             
      
-              View on GitHub
-              Customize and Download
+              View project on GitHub
+              Customize and download
             
      
-
             
      
               
      Feature highlights
      
               
        
                 
      • ✔ Built on LESS
        • 
-                
      • ✔ Complete styleguide docs
        • 
+                
      • ✔ Complete style guide docs
        • 
                 
      • ✔ Fully responsive design
        • 
                 
      • ✔ Small footprint (10kb gzipped)
        • 
                 
      • ✔ Support for IE7 and up
        • 
@@ -88,30 +88,30 @@
               
      
             
      
           
      
-        
      
 
-        
+          
+        
 
+        
      
 
         
      
           
      Built with Bootstrap.
      
@@ -134,6 +134,8 @@
             
           
 
+        
      
+
           
      Designed for everyone, everywhere.
      
           
      Need reasons to love Bootstrap? Look no further.
      
           
      
@@ -210,6 +212,7 @@
             
      
           
      
 
+        
      
 
           
@@ -243,6 +246,7 @@
 
         
      
       
      
+
      
       
      
@@ -255,9 +259,11 @@
     
      
 
 
-    
+
+    
     
-    
+    
     
     
     
diff --git a/docs/javascript.html b/docs/javascript.html
index 34d61ef9c..400a93dd2 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -27,6 +27,7 @@
 
   
   
+  
   
     
      
@@ -1356,6 +1357,7 @@ $('.myCarousel').carousel({
         
      
       
      
     
+
      
       
      
@@ -1368,9 +1370,11 @@ $('.myCarousel').carousel({
     
      
 
 
-    
+
+    
     
-    
+    
     
     
     
diff --git a/docs/less.html b/docs/less.html
index f6321fc69..d2e083c2e 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -27,6 +27,7 @@
 
   
   
+  
   
     
      
@@ -301,8 +302,8 @@
       
-            
-            
+            
+            
      
         
           
      @primaryButtonColor@blue@primaryButtonBackground@linkColor
           
      
               
       
      
@@ -755,6 +756,7 @@
   
      
 
 
+
      
       
      
@@ -767,9 +769,11 @@
     
      
 
 
-    
+
+    
     
-    
+    
     
     
     
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 2ba8d5d7a..2c8d873e7 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -27,6 +27,7 @@
 
   
   
+  
   
     
      
@@ -379,6 +380,7 @@
     
      
   
      
 
+
      
       
      
@@ -391,9 +393,11 @@
     
      
 
 
-    
+
+    
     
-    
+    
     
     
     
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index addcb224f..547b99bb4 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -27,6 +27,7 @@
 
   
   
+  
   
     
      
@@ -64,6 +65,7 @@
 
 {{>body}}
 
+
      
       
      
@@ -76,9 +78,11 @@
     
      
 
 
-    
+
+    
     
-    
+    
     
     
     
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c2dd661ae..325883872 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -880,7 +880,7 @@
           
      
             
             
      
-              
+              
               
      {{_i}}In addition to freeform text, any HTML5 text-based input appears like so.{{/i}}
      
             
      
           
      
@@ -888,7 +888,7 @@
             
             
      
               
             
      
@@ -896,7 +896,7 @@
           
      
             
             
      
-              
                 
                 
                 
@@ -908,7 +908,7 @@
           
      
             
             
      
-              
                 
                 
                 
@@ -920,13 +920,13 @@
           
      
             
             
      
-              
+              
             
      
           
      
           
      
             
             
      
-              
+              
             
      
           
      
           
      
@@ -966,20 +966,20 @@
           
      
             
             
      
-              
+              
             
      
           
      
           
      
             
             
      
-              
+              
             
      
           
      
           
      
-            
+            
             
      
               
             
      
@@ -987,28 +987,28 @@
           
      
             
             
      
-              
+              
               {{_i}}Something may have gone wrong{{/i}}
             
      
           
      
           
      
             
             
      
-              
+              
               {{_i}}Please correct the error{{/i}}
             
      
           
      
           
      
             
             
      
-              
+              
               {{_i}}Woohoo!{{/i}}
             
      
           
      
           
      
             
             
      
-              
                 
                 
                 
@@ -1052,9 +1052,9 @@
           
      
             
             
      
-              
-              
-              
+              
+              
+              
               
      {{_i}}Use the same .span* classes from the grid system for input sizes.{{/i}}
      
             
      
           
      
@@ -1063,7 +1063,7 @@
             
      
               
      
                 @
-                
+                
               
      
               
      {{_i}}Here's some help text{{/i}}
      
             
      
@@ -1072,7 +1072,7 @@
             
             
      
               
      
-                
+                
                 .00
               
      
               
      {{_i}}Here's more help text{{/i}}
      
@@ -1082,43 +1082,43 @@
             
             
      
               
               
               
             
      
           
      
           
      
-            
+            
             
      
               
               
               
               
      {{_i}}Note: Labels surround all the options for much larger click areas and a more usable form.{{/i}}
      
             
      
           
      
           
      
-            
+            
             
      
               
               
             
      
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 33bfd035f..5bc52644d 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -4,18 +4,17 @@
         ================================================== -->
         
      
           
      
-            
      {{_i}}Bootstrap,
       from Twitter{{/i}}
      
-            
      {{_i}}Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.{{/i}}
      
+            
      {{_i}}Twitter Bootstrap{{/i}}
      
+            
      {{_i}}Bootstrap is a comprehensive front-end toolkit from Twitter designed to kickstart web development. It features HTML, CSS, and JS for dozens of base elements, commonly used design components, and more.{{/i}}
      
             
      
-              {{_i}}View on GitHub{{/i}}
-              {{_i}}Customize and Download{{/i}}
+              {{_i}}View project on GitHub{{/i}}
+              {{_i}}Customize and download{{/i}}
             
      
-
             
      
               
      {{_i}}Feature highlights{{/i}}
      
               
        
                 
      • ✔ {{_i}}Built on LESS{{/i}}
        • 
-                
      • ✔ {{_i}}Complete styleguide docs{{/i}}
        • 
+                
      • ✔ {{_i}}Complete style guide docs{{/i}}
        • 
                 
      • ✔ {{_i}}Fully responsive design{{/i}}
        • 
                 
      • ✔ {{_i}}Small footprint (10kb gzipped){{/i}}
        • 
                 
      • ✔ {{_i}}Support for IE7 and up{{/i}}
        • 
@@ -24,30 +23,30 @@
               
      
             
      
           
      
-        
      
 
-        
+          
+        
 
+        
      
 
         
      
           
      {{_i}}Built with Bootstrap.{{/i}}
      
@@ -70,6 +69,8 @@
             
           
 
+        
      
+
           
      {{_i}}Designed for everyone, everywhere.{{/i}}
      
           
      {{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}
      
           
      
@@ -146,6 +147,7 @@
             
      
           
      
 
+        
      
 
           
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index f2c266842..6478e3b2f 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -237,8 +237,8 @@
       
-            
-            
+            
+            
      
         
           
      @primaryButtonColor@blue@primaryButtonBackground@linkColor
           
      
               
       
      
diff --git a/docs/upgrading.html b/docs/upgrading.html
index fb1fbfcfe..e80fac2d6 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -27,6 +27,7 @@
 
   
   
+  
   
     
      
@@ -148,6 +149,7 @@
   
 -->
 
+
      
       
      
@@ -160,9 +162,11 @@
     
      
 
 
-    
+
+    
     
-    
+    
     
     
     
diff --git a/lib/buttons.less b/lib/buttons.less
index f13a9acbf..d97f044cf 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -59,7 +59,7 @@
   &.primary {
     color: @white;
     text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-    .gradientBar(@blue, @blueDark)
+    .gradientBar(@primaryButtonBackground, spin(@primaryButtonBackground, 15));
   }
 
    // Transitions
diff --git a/lib/forms.less b/lib/forms.less
index 3acb8c5dc..744649f90 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -133,10 +133,16 @@ input[type=image] {
   .box-shadow(none);
 }
 
+// Make textarea height behave
 textarea {
   height: auto;
 }
 
+// Hidden inputs
+input[type=hidden] {
+  display: none;
+}
+
 
 
 // CHECKBOXES & RADIOS
diff --git a/lib/mixins.less b/lib/mixins.less
index 2eab8f36e..b58571e6a 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -134,12 +134,14 @@
 // Border Radius
 .border-radius(@radius: 5px) {
   -webkit-border-radius: @radius;
+     -moz-border-radius: @radius;
           border-radius: @radius;
 }
 
 // Drop shadows
 .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
   -webkit-box-shadow: @shadow;
+     -moz-box-shadow: @shadow;
           box-shadow: @shadow;
 }
 
@@ -179,6 +181,7 @@
 // Heads up: FF 3.6 and under need "padding" instead of "padding-box"
 .background-clip(@clip) {
   -webkit-background-clip: @clip;
+     -moz-background-clip: @clip;
           background-clip: @clip;
 }
 
diff --git a/lib/variables.less b/lib/variables.less
index 3c4f562ca..5ed896cc0 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -45,7 +45,7 @@
 @baseLineHeight:        18px;
 
 // Buttons
-@primaryButtonColor:    @blue;
+@primaryButtonBackground:    @linkColor;
 
 
 
-- 
cgit v1.2.3


From 29f0e4c28b56e684a9be9931dcf77b418cb63ae0 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 13:01:03 -0500
Subject: Removes filters as a way to provide gradients for IE<=9  - Lets us
 use rounded corners in IE9  - Makes hover / active states work correctly in
 IE<=9

Only change for non-IE is that moving from hover -> not hovering
no longer animates (was a subtle blend) due to mismatch between the
bottom of the gradient and the background color.

Refactor: moves the primary button background to match the others.
---
 docs/less.html                     |  5 ----
 docs/templates/pages/less.mustache |  5 ----
 lib/buttons.less                   | 53 +++++++++++++++++++++++---------------
 lib/mixins.less                    | 12 ++-------
 4 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/docs/less.html b/docs/less.html
index d2e083c2e..dc0e83443 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -468,11 +468,6 @@
         @opacity: 100
         Set, in whole numbers, the opacity percentage (e.g., "50" or "75")
       
-      
-        .reset-filter()
-        none
-        Resets any IE filter
-      
     
   
   
      Forms
      
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 6478e3b2f..1aec06c2c 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -403,11 +403,6 @@
         @opacity: 100
         {{_i}}Set, in whole numbers, the opacity percentage (e.g., "50" or "75"){{/i}}
       
-      
-        .reset-filter()
-        none
-        {{_i}}Resets any IE filter{{/i}}
-      
     
   
   
      Forms
      
diff --git a/lib/buttons.less b/lib/buttons.less
index d97f044cf..7f5a91b99 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -1,9 +1,10 @@
 // BUTTON STYLES
 // -------------
 
-// Shared colors for buttons and alerts
 .btn {
   // Set text color
+  &.primary,
+  &.primary:hover,
   &.danger,
   &.danger:hover,
   &.success,
@@ -13,17 +14,36 @@
     text-shadow: 0 -1px 0 rgba(0,0,0,.25);
     color: @white
   }
+  &.primary {
+    .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 15));
+  }
   // Danger and error appear as red
   &.danger {
-    .gradientBar(#ee5f5b, #c43c35);
+    .buttonBackground(#ee5f5b, #c43c35);
   }
   // Success appears as green
   &.success {
-    .gradientBar(#62c462, #57a957);
+    .buttonBackground(#62c462, #57a957);
   }
   // Info appears as a neutral blue
   &.info {
-    .gradientBar(#5bc0de, #339bb9);
+    .buttonBackground(#5bc0de, #339bb9);
+  }
+}
+
+.buttonBackground(@startColor, @endColor) {
+  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
+  .gradientBar(@startColor, @endColor);
+
+  // in these cases the gradient won't cover the background, so we override
+  &:hover, &:active, &.active {
+    background-color: @endColor;
+  }
+
+  &:active,
+  &.active {
+    // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
+    background-color: darken(@endColor, 10%) e("\9");
   }
 }
 
@@ -47,7 +67,12 @@
   &:hover {
     color: @grayDark;
     text-decoration: none;
+    background-color: darken(@white, 10%);
     background-position: 0 -15px;
+
+    // transition is only when going to hover, otherwise the background
+    // behind the gradient (there for IE<=9 fallback) gets mismatched
+    .transition(background-position .1s linear);
   }
 
   // Focus state for keyboard and accessibility
@@ -55,27 +80,18 @@
     outline: 1px dotted #666;
   }
 
-  // Primary Button Type
-  &.primary {
-    color: @white;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-    .gradientBar(@primaryButtonBackground, spin(@primaryButtonBackground, 15));
-  }
-
-   // Transitions
-  .transition(.1s linear all);
-
   // Active and Disabled states
   &.active,
   &:active {
     background-image: none;
     @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
     .box-shadow(@shadow);
+    background-color: darken(@white, 10%);
+    background-color: darken(@white, 15%) e("\9");
   }
   &.disabled {
     cursor: default;
     background-image: none;
-    .reset-filter();
     .opacity(65);
     .box-shadow(none);
   }
@@ -84,7 +100,6 @@
     // def because IE8 and below will drop it ;_;
     cursor: default;
     background-image: none;
-    .reset-filter();
     .opacity(65);
     .box-shadow(none);
   }
@@ -101,10 +116,6 @@
     font-size: @baseFontSize - 2px;
   }
 }
-// Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
-:root .btn {
-  border-radius: 0 \0;
-}
 
 // Help Firefox not be a jerk about adding extra padding to buttons
 button.btn,
@@ -113,4 +124,4 @@ input[type=submit].btn {
   	padding: 0;
   	border: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/lib/mixins.less b/lib/mixins.less
index b58571e6a..b8c969ea8 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -266,10 +266,9 @@
     background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
     background-image: linear-gradient(left, @startColor, @endColor); // Le standard
     background-repeat: repeat-x;
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE9 and down
   }
   .vertical(@startColor: #555, @endColor: #333) {
-    background-color: @endColor;
+    background-color: mix(@startColor, @endColor, 60%);
     background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
     background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
@@ -277,7 +276,6 @@
     background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
     background-image: linear-gradient(top, @startColor, @endColor); // The standard
     background-repeat: repeat-x;
-   filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down
   }
   .directional(@startColor: #555, @endColor: #333, @deg: 45deg) {
     background-color: @endColor;
@@ -289,7 +287,7 @@
     background-image: linear-gradient(@deg, @startColor, @endColor); // The standard
   }
   .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
-    background-color: @endColor;
+    background-color: @midColor;
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
     background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
@@ -297,7 +295,6 @@
     background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-repeat: no-repeat;
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback
   }
   .radial(@innerColor: #555, @outerColor: #333)  {
     background-color: @outsideColor;
@@ -319,11 +316,6 @@
   }
 }
 
-// Reset filters for IE
-.reset-filter() {
-  filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
-}
-
 
 
 // COMPONENT MIXINS
-- 
cgit v1.2.3


From 2c2f8ebe3a090bff0254aba10b745dae10bf242d Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 13:04:30 -0500
Subject: Rebuild of *.css

---
 bootstrap-responsive.min.css |   2 +-
 bootstrap.css                | 108 +++++++++++++++++++++++--------------------
 bootstrap.min.css            |  39 ++++++++--------
 3 files changed, 81 insertions(+), 68 deletions(-)

diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
index 8ed8745bb..dcf17dce9 100644
--- a/bootstrap-responsive.min.css
+++ b/bootstrap-responsive.min.css
@@ -1,3 +1,3 @@
 
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
+@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
diff --git a/bootstrap.css b/bootstrap.css
index 787211a75..6462eb5a8 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 09:49:45 PST 2012
+ * Date: Thu Jan 26 13:07:59 EST 2012
  */
 article,
 aside,
@@ -1752,7 +1752,7 @@ table .span12 {
 }
 .navbar-inner {
   background-color: #222222;
-  background-color: #222222;
+  background-color: #2c2c2c;
   background-image: -moz-linear-gradient(top, #333333, #222222);
   background-image: -ms-linear-gradient(top, #333333, #222222);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
@@ -1760,7 +1760,6 @@ table .span12 {
   background-image: -o-linear-gradient(top, #333333, #222222);
   background-image: linear-gradient(top, #333333, #222222);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
   -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
@@ -1829,7 +1828,7 @@ table .span12 {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
@@ -1964,7 +1963,7 @@ table .span12 {
 .breadcrumb {
   padding: 7px 14px;
   margin: 0 0 18px;
-  background-color: #f5f5f5;
+  background-color: #fbfbfb;
   background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
   background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
@@ -1972,7 +1971,6 @@ table .span12 {
   background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
   background-image: linear-gradient(top, #ffffff, #f5f5f5);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
   border: 1px solid #ddd;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
@@ -2334,6 +2332,8 @@ table .span12 {
 .popover .content p, .popover .content ul, .popover .content ol {
   margin-bottom: 0;
 }
+.btn.primary,
+.btn.primary:hover,
 .btn.danger,
 .btn.danger:hover,
 .btn.success,
@@ -2343,8 +2343,26 @@ table .span12 {
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   color: #ffffff;
 }
+.btn.primary {
+  background-color: #0074cc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0055cc);
+  background-image: linear-gradient(top, #0088cc, #0055cc);
+  background-repeat: repeat-x;
+  border-color: #0055cc #0055cc #003580;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.btn.primary:hover, .btn.primary:active, .btn.primary.active {
+  background-color: #0055cc;
+}
+.btn.primary:active, .btn.primary.active {
+  background-color: #004099 \9;
+}
 .btn.danger {
-  background-color: #c43c35;
+  background-color: #dd514c;
   background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
@@ -2352,12 +2370,17 @@ table .span12 {
   background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: linear-gradient(top, #ee5f5b, #c43c35);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
   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.danger:hover, .btn.danger:active, .btn.danger.active {
+  background-color: #c43c35;
+}
+.btn.danger:active, .btn.danger.active {
+  background-color: #9c302a \9;
+}
 .btn.success {
-  background-color: #57a957;
+  background-color: #5eb95e;
   background-image: -moz-linear-gradient(top, #62c462, #57a957);
   background-image: -ms-linear-gradient(top, #62c462, #57a957);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
@@ -2365,12 +2388,17 @@ table .span12 {
   background-image: -o-linear-gradient(top, #62c462, #57a957);
   background-image: linear-gradient(top, #62c462, #57a957);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
   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.success:hover, .btn.success:active, .btn.success.active {
+  background-color: #57a957;
+}
+.btn.success:active, .btn.success.active {
+  background-color: #458845 \9;
+}
 .btn.info {
-  background-color: #339bb9;
+  background-color: #4bb1cf;
   background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
   background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
@@ -2378,10 +2406,15 @@ table .span12 {
   background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
   background-image: linear-gradient(top, #5bc0de, #339bb9);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
   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);
 }
+.btn.info:hover, .btn.info:active, .btn.info.active {
+  background-color: #339bb9;
+}
+.btn.info:active, .btn.info.active {
+  background-color: #287a91 \9;
+}
 .btn {
   display: inline-block;
   padding: 5px 10px 6px;
@@ -2389,7 +2422,7 @@ table .span12 {
   line-height: normal;
   color: #333333;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  background-color: #e6e6e6;
+  background-color: #ffffff;
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
   background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
   background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
@@ -2397,7 +2430,6 @@ table .span12 {
   background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
   background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
   background-repeat: no-repeat;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
   -webkit-border-radius: 4px;
@@ -2407,45 +2439,32 @@ table .span12 {
   -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);
   cursor: pointer;
-  -webkit-transition: 0.1s linear all;
-  -moz-transition: 0.1s linear all;
-  -ms-transition: 0.1s linear all;
-  -o-transition: 0.1s linear all;
-  transition: 0.1s linear all;
 }
 .btn:hover {
   color: #333333;
   text-decoration: none;
+  background-color: #e6e6e6;
   background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+  -moz-transition: background-position 0.1s linear;
+  -ms-transition: background-position 0.1s linear;
+  -o-transition: background-position 0.1s linear;
+  transition: background-position 0.1s linear;
 }
 .btn:focus {
   outline: 1px dotted #666;
 }
-.btn.primary {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0055cc;
-  background-image: -moz-linear-gradient(top, #0088cc, #0055cc);
-  background-image: -ms-linear-gradient(top, #0088cc, #0055cc);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0055cc);
-  background-image: -o-linear-gradient(top, #0088cc, #0055cc);
-  background-image: linear-gradient(top, #0088cc, #0055cc);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);
-  border-color: #0055cc #0055cc #003580;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
 .btn.active, .btn:active {
   background-image: none;
   -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  background-color: #e6e6e6;
+  background-color: #d9d9d9 \9;
 }
 .btn.disabled {
   cursor: default;
   background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   opacity: 0.65;
   filter: alpha(opacity=65);
   -webkit-box-shadow: none;
@@ -2455,7 +2474,6 @@ table .span12 {
 .btn[disabled] {
   cursor: default;
   background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   opacity: 0.65;
   filter: alpha(opacity=65);
   -webkit-box-shadow: none;
@@ -2474,9 +2492,6 @@ table .span12 {
   padding: 7px 9px 7px;
   font-size: 11px;
 }
-:root .btn {
-  border-radius: 0 \0;
-}
 button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   padding: 0;
   border: 0;
@@ -2715,7 +2730,7 @@ a.thumbnail:hover {
 .progress {
   height: 18px;
   margin-bottom: 18px;
-  background-color: #f9f9f9;
+  background-color: #f7f7f7;
   background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
   background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
@@ -2723,7 +2738,6 @@ a.thumbnail:hover {
   background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
   background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
@@ -2735,7 +2749,7 @@ a.thumbnail:hover {
   font-size: 12px;
   text-align: center;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0480be;
+  background-color: #0e90d2;
   background-image: -moz-linear-gradient(top, #149bdf, #0480be);
   background-image: -ms-linear-gradient(top, #149bdf, #0480be);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
@@ -2743,7 +2757,6 @@ a.thumbnail:hover {
   background-image: -o-linear-gradient(top, #149bdf, #0480be);
   background-image: linear-gradient(top, #149bdf, #0480be);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
@@ -2775,7 +2788,7 @@ a.thumbnail:hover {
   animation: progress-bar-stripes 2s linear infinite;
 }
 .progress.danger .bar {
-  background-color: #c43c35;
+  background-color: #dd514c;
   background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
@@ -2783,7 +2796,6 @@ a.thumbnail:hover {
   background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: linear-gradient(top, #ee5f5b, #c43c35);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
 }
 .progress.danger.striped .bar {
   background-color: #ee5f5b;
@@ -2795,7 +2807,7 @@ a.thumbnail:hover {
   background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 .progress.success .bar {
-  background-color: #57a957;
+  background-color: #5eb95e;
   background-image: -moz-linear-gradient(top, #62c462, #57a957);
   background-image: -ms-linear-gradient(top, #62c462, #57a957);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
@@ -2803,7 +2815,6 @@ a.thumbnail:hover {
   background-image: -o-linear-gradient(top, #62c462, #57a957);
   background-image: linear-gradient(top, #62c462, #57a957);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
 }
 .progress.success.striped .bar {
   background-color: #62c462;
@@ -2815,7 +2826,7 @@ a.thumbnail:hover {
   background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 .progress.info .bar {
-  background-color: #339bb9;
+  background-color: #4bb1cf;
   background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
   background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
@@ -2823,7 +2834,6 @@ a.thumbnail:hover {
   background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
   background-image: linear-gradient(top, #5bc0de, #339bb9);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
 }
 .progress.info.striped .bar {
   background-color: #5bc0de;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 94bde2d36..be9c1f260 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -369,7 +369,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .tabs-right .tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
 .tabs-right .tabs .active>a,.tabs-right .tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;}
 .navbar{overflow:visible;}
-.navbar-inner{background-color:#222222;background-color:#222222;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
+.navbar-inner{background-color:#222222;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
 .navbar .brand:hover{color:#ffffff;text-decoration:none;}
 .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
 .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
@@ -377,7 +377,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
@@ -399,7 +399,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;}
 .navbar .nav.pull-right .dropdown-menu{right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
 .navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
-.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
+.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
 .breadcrumb .divider{padding:0 5px;color:#999999;}
 .breadcrumb .active a{color:#333333;}
 .pagination{height:36px;margin:18px 0;}
@@ -451,19 +451,22 @@ table .span12{float:none;width:924px;margin-left:0;}
 .popover .inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);}
 .popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
 .popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
-.btn.danger,.btn.danger:hover,.btn.success,.btn.success:hover,.btn.info,.btn.info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
-.btn.danger{background-color:#c43c35;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);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{background-color:#57a957;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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{background-color:#339bb9;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);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);}
-.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;}
+.btn.primary,.btn.primary:hover,.btn.danger,.btn.danger:hover,.btn.success,.btn.success:hover,.btn.info,.btn.info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
+.btn.primary{background-color:#0074cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover,.btn.primary:active,.btn.primary.active{background-color:#0055cc;}
+.btn.primary:active,.btn.primary.active{background-color:#004099 \9;}
+.btn.danger{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;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.danger:hover,.btn.danger:active,.btn.danger.active{background-color:#c43c35;}
+.btn.danger:active,.btn.danger.active{background-color:#9c302a \9;}
+.btn.success{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;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.success:hover,.btn.success:active,.btn.success.active{background-color:#57a957;}
+.btn.success:active,.btn.success.active{background-color:#458845 \9;}
+.btn.info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;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);}.btn.info:hover,.btn.info:active,.btn.info.active{background-color:#339bb9;}
+.btn.info:active,.btn.info.active{background-color:#287a91 \9;}
+.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#ffffff;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;}.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
 .btn:focus{outline:1px dotted #666;}
-.btn.primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0055cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
-.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
-.btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;}
+.btn.disabled{cursor:default;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn[disabled]{cursor:default;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
 .btn.small{padding:7px 9px 7px;font-size:11px;}
-:root .btn{border-radius:0 \0;}
 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
 .btn-group{position:relative;*zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";}
 .btn-group:after{clear:both;}
@@ -504,15 +507,15 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .label.success{background-color:#46a546;}
 .label.notice{background-color:#62cffc;}
 @-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.progress{height:18px;margin-bottom:18px;background-color:#f9f9f9;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
-.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0480be;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+.progress{height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
+.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
 .progress.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
 .progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
-.progress.danger .bar{background-color:#c43c35;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
+.progress.danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;}
 .progress.danger.striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.progress.success .bar{background-color:#57a957;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
+.progress.success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;}
 .progress.success.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.progress.info .bar{background-color:#339bb9;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
+.progress.info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;}
 .progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
 .accordion{margin-bottom:18px;}
 .accordion-group{background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-- 
cgit v1.2.3


From ef4d0dd7dbd959f830d4cb7976d6a4b061784ec6 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 10:12:25 -0800
Subject: space out masthead a git more

---
 docs/assets/css/docs.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index d266dd92e..27c446d23 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -96,7 +96,8 @@ hr.soften {
 
 /* Masthead (docs home) */
 .masthead {
-  padding: 36px 0 0;
+  padding-top: 36px;
+  margin-bottom: 72px;
 }
 .masthead h1,
 .masthead p {
-- 
cgit v1.2.3


From 7117db499f0b02da32a8d08f6371cab1f6b53338 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 13:26:14 -0500
Subject: Makes default button the tiniest bit of gray for IE<=9

---
 lib/mixins.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mixins.less b/lib/mixins.less
index b8c969ea8..dd331ebf2 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -287,7 +287,7 @@
     background-image: linear-gradient(@deg, @startColor, @endColor); // The standard
   }
   .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
-    background-color: @midColor;
+    background-color: mix(@midColor, @endColor, 80%);
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
     background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
-- 
cgit v1.2.3


From 86e0e89ee81d4a2a1daef6b68aa269419ee7d644 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 13:26:28 -0500
Subject: More *.css building

---
 bootstrap.css     | 4 ++--
 bootstrap.min.css | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 6462eb5a8..f4af5ede9 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 13:07:59 EST 2012
+ * Date: Thu Jan 26 13:26:16 EST 2012
  */
 article,
 aside,
@@ -2422,7 +2422,7 @@ table .span12 {
   line-height: normal;
   color: #333333;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  background-color: #ffffff;
+  background-color: #fafafa;
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
   background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
   background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
diff --git a/bootstrap.min.css b/bootstrap.min.css
index be9c1f260..bada2d6ad 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -460,7 +460,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .btn.success:active,.btn.success.active{background-color:#458845 \9;}
 .btn.info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;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);}.btn.info:hover,.btn.info:active,.btn.info.active{background-color:#339bb9;}
 .btn.info:active,.btn.info.active{background-color:#287a91 \9;}
-.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#ffffff;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;}.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
+.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;}.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
 .btn:focus{outline:1px dotted #666;}
 .btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;}
 .btn.disabled{cursor:default;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-- 
cgit v1.2.3


From 34488a450081422037e84d269ddb289aa709e9fb Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 10:39:07 -0800
Subject: fix tabs example on js docs page

---
 docs/javascript.html                     | 8 ++++----
 docs/templates/pages/javascript.mustache | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index 400a93dd2..e589c4670 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -625,10 +625,10 @@ $('#myModal').on('hidden', function () {
 </ul>
 
 <div class="tab-content">
-  <div class="active" id="home">...</div>
-  <div id="profile">...</div>
-  <div id="messages">...</div>
-  <div id="settings">...</div>
+  <div class="tab-pane active" id="home">...</div>
+  <div class="tab-pane" id="profile">...</div>
+  <div class="tab-pane" id="messages">...</div>
+  <div class="tab-pane" id="settings">...</div>
 </div>
 
 <script>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 6b2a3693d..66493dc0c 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -560,10 +560,10 @@ $('#myModal').on('hidden', function () {
 </ul>
 
 <div class="tab-content">
-  <div class="active" id="home">...</div>
-  <div id="profile">...</div>
-  <div id="messages">...</div>
-  <div id="settings">...</div>
+  <div class="tab-pane active" id="home">...</div>
+  <div class="tab-pane" id="profile">...</div>
+  <div class="tab-pane" id="messages">...</div>
+  <div class="tab-pane" id="settings">...</div>
 </div>
 
 <script>
-- 
cgit v1.2.3


From b8c1950cbfbb48d49f79b1e36f8c8294b19ed57d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 10:43:08 -0800
Subject: change label fo first subnav link on js docs

---
 docs/javascript.html                     | 2 +-
 docs/templates/pages/javascript.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index e589c4670..63881d2c9 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -70,7 +70,7 @@
         
      Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
         
      
           
        
-            
      • Overview
        • 
+            
      • All plugins
        • 
             
      • Modal
        • 
             
      • Dropdown
        • 
             
      • Scrollspy
        • 
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 66493dc0c..941c6b485 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -5,7 +5,7 @@
         
        {{_i}}Bring Bootstrap's components to life—now with 12 custom jQuery plugins.{{/i}}
         
        
           
          
-            
        • {{_i}}Overview{{/i}}
          • 
+            
        • {{_i}}All plugins{{/i}}
          • 
             
        • {{_i}}Modal{{/i}}
          • 
             
        • {{_i}}Dropdown{{/i}}
          • 
             
        • {{_i}}Scrollspy{{/i}}
          • 
-- 
cgit v1.2.3


From cd907067b81eb5b46cd416a3e65fb2858c4603f9 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 13:51:03 -0500
Subject: Fixes background color for disabled buttons to match pre-IE fix
 (which prevents hover effects)

---
 lib/buttons.less | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/buttons.less b/lib/buttons.less
index 7f5a91b99..228b6c06d 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -36,7 +36,11 @@
   .gradientBar(@startColor, @endColor);
 
   // in these cases the gradient won't cover the background, so we override
-  &:hover, &:active, &.active {
+  &:hover, &:active, &.active, &.disabled {
+    background-color: @endColor;
+  }
+
+  &[disabled] {
     background-color: @endColor;
   }
 
@@ -92,6 +96,7 @@
   &.disabled {
     cursor: default;
     background-image: none;
+    background-color: darken(@white, 10%);
     .opacity(65);
     .box-shadow(none);
   }
@@ -100,6 +105,7 @@
     // def because IE8 and below will drop it ;_;
     cursor: default;
     background-image: none;
+    background-color: darken(@white, 10%);
     .opacity(65);
     .box-shadow(none);
   }
-- 
cgit v1.2.3


From 62b2fdc4de2abe56a0366c5e46861ce4837aca56 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 13:51:29 -0500
Subject: Rebuild *.css

---
 bootstrap.css     | 36 +++++++++++++++++++++++++++++++-----
 bootstrap.min.css | 16 ++++++++++------
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index f4af5ede9..2432c74db 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 13:26:16 EST 2012
+ * Date: Thu Jan 26 13:51:07 EST 2012
  */
 article,
 aside,
@@ -2355,7 +2355,13 @@ table .span12 {
   border-color: #0055cc #0055cc #003580;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
 }
-.btn.primary:hover, .btn.primary:active, .btn.primary.active {
+.btn.primary:hover,
+.btn.primary:active,
+.btn.primary.active,
+.btn.primary.disabled {
+  background-color: #0055cc;
+}
+.btn.primary[disabled] {
   background-color: #0055cc;
 }
 .btn.primary:active, .btn.primary.active {
@@ -2373,7 +2379,13 @@ table .span12 {
   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.danger:hover, .btn.danger:active, .btn.danger.active {
+.btn.danger:hover,
+.btn.danger:active,
+.btn.danger.active,
+.btn.danger.disabled {
+  background-color: #c43c35;
+}
+.btn.danger[disabled] {
   background-color: #c43c35;
 }
 .btn.danger:active, .btn.danger.active {
@@ -2391,7 +2403,13 @@ table .span12 {
   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.success:hover, .btn.success:active, .btn.success.active {
+.btn.success:hover,
+.btn.success:active,
+.btn.success.active,
+.btn.success.disabled {
+  background-color: #57a957;
+}
+.btn.success[disabled] {
   background-color: #57a957;
 }
 .btn.success:active, .btn.success.active {
@@ -2409,7 +2427,13 @@ table .span12 {
   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);
 }
-.btn.info:hover, .btn.info:active, .btn.info.active {
+.btn.info:hover,
+.btn.info:active,
+.btn.info.active,
+.btn.info.disabled {
+  background-color: #339bb9;
+}
+.btn.info[disabled] {
   background-color: #339bb9;
 }
 .btn.info:active, .btn.info.active {
@@ -2465,6 +2489,7 @@ table .span12 {
 .btn.disabled {
   cursor: default;
   background-image: none;
+  background-color: #e6e6e6;
   opacity: 0.65;
   filter: alpha(opacity=65);
   -webkit-box-shadow: none;
@@ -2474,6 +2499,7 @@ table .span12 {
 .btn[disabled] {
   cursor: default;
   background-image: none;
+  background-color: #e6e6e6;
   opacity: 0.65;
   filter: alpha(opacity=65);
   -webkit-box-shadow: none;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index bada2d6ad..e025ab93b 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -452,19 +452,23 @@ table .span12{float:none;width:924px;margin-left:0;}
 .popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
 .popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
 .btn.primary,.btn.primary:hover,.btn.danger,.btn.danger:hover,.btn.success,.btn.success:hover,.btn.info,.btn.info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
-.btn.primary{background-color:#0074cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover,.btn.primary:active,.btn.primary.active{background-color:#0055cc;}
+.btn.primary{background-color:#0074cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover,.btn.primary:active,.btn.primary.active,.btn.primary.disabled{background-color:#0055cc;}
+.btn.primary[disabled]{background-color:#0055cc;}
 .btn.primary:active,.btn.primary.active{background-color:#004099 \9;}
-.btn.danger{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;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.danger:hover,.btn.danger:active,.btn.danger.active{background-color:#c43c35;}
+.btn.danger{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;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.danger:hover,.btn.danger:active,.btn.danger.active,.btn.danger.disabled{background-color:#c43c35;}
+.btn.danger[disabled]{background-color:#c43c35;}
 .btn.danger:active,.btn.danger.active{background-color:#9c302a \9;}
-.btn.success{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;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.success:hover,.btn.success:active,.btn.success.active{background-color:#57a957;}
+.btn.success{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;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.success:hover,.btn.success:active,.btn.success.active,.btn.success.disabled{background-color:#57a957;}
+.btn.success[disabled]{background-color:#57a957;}
 .btn.success:active,.btn.success.active{background-color:#458845 \9;}
-.btn.info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;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);}.btn.info:hover,.btn.info:active,.btn.info.active{background-color:#339bb9;}
+.btn.info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;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);}.btn.info:hover,.btn.info:active,.btn.info.active,.btn.info.disabled{background-color:#339bb9;}
+.btn.info[disabled]{background-color:#339bb9;}
 .btn.info:active,.btn.info.active{background-color:#287a91 \9;}
 .btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;}.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
 .btn:focus{outline:1px dotted #666;}
 .btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;}
-.btn.disabled{cursor:default;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.btn[disabled]{cursor:default;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn.disabled{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
 .btn.small{padding:7px 9px 7px;font-size:11px;}
 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
-- 
cgit v1.2.3


From edef89f30efd73e5fca9952eef48136f8264aa93 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 11:10:07 -0800
Subject: move around some comments in buttons.less, update labels to use
 correct variables, add snippet to docs about IE9

---
 bootstrap-responsive.min.css           |  2 +-
 bootstrap.css                          | 12 ++++++------
 bootstrap.min.css                      |  8 ++++----
 docs/base-css.html                     | 15 +++++++++++----
 docs/templates/pages/base-css.mustache | 15 +++++++++++----
 lib/buttons.less                       | 15 +++++++++++++--
 lib/labels.less                        |  6 +++---
 7 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
index dcf17dce9..8ed8745bb 100644
--- a/bootstrap-responsive.min.css
+++ b/bootstrap-responsive.min.css
@@ -1,3 +1,3 @@
 
 .hidden{display:none;visibility:hidden;}
-@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
+@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
diff --git a/bootstrap.css b/bootstrap.css
index 2432c74db..4e7316558 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 13:51:07 EST 2012
+ * Date: Thu Jan 26 11:09:38 PST 2012
  */
 article,
 aside,
@@ -1828,7 +1828,7 @@ table .span12 {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query::-webkit-input-placeholder {
+.navbar-search .search-query ::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
@@ -2721,16 +2721,16 @@ a.thumbnail:hover {
   border-radius: 3px;
 }
 .label.important {
-  background-color: #c43c35;
+  background-color: #b94a48;
 }
 .label.warning {
   background-color: #f89406;
 }
 .label.success {
-  background-color: #46a546;
+  background-color: #468847;
 }
-.label.notice {
-  background-color: #62cffc;
+.label.info {
+  background-color: #3a87ad;
 }
 @-webkit-keyframes progress-bar-stripes {
   from {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index e025ab93b..6f22405e6 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -377,7 +377,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
@@ -506,10 +506,10 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
 .thumbnail>img{display:block;max-width:100%;}
 .thumbnail .caption{padding:9px;}
-.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;}
+.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#b94a48;}
 .label.warning{background-color:#f89406;}
-.label.success{background-color:#46a546;}
-.label.notice{background-color:#62cffc;}
+.label.success{background-color:#468847;}
+.label.info{background-color:#3a87ad;}
 @-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .progress{height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
 .progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
diff --git a/docs/base-css.html b/docs/base-css.html
index bbe7ecd88..ebc6285dc 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -432,10 +432,10 @@
       
       
         
-          Notice
+          Info
         
         
-          <span class="label notice">Notice</span>
+          <span class="label info">Info</span>
         
       
     
@@ -1210,6 +1210,8 @@
 
 
 
+
 
          
   
          
     
          Buttons
          
@@ -1278,9 +1280,9 @@
         Action
       
          
     
          
-    
          
+    
          
       
          Disabled state
          
-      
          For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.
          
+      
          For disabled buttons, use .disabled for links and :disabled for <button> elements.
          
       
          
         Primary action
         Action
@@ -1290,6 +1292,11 @@
         
       
          
     
          
+    
          
+      
          Cross browser compatibility
          
+      
          In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.
          
+      
          Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow—unfortunately we can't fix this.
          
+    
          
   
          
 
   
          
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 325883872..27386d47f 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -367,10 +367,10 @@
       
       
         
-          {{_i}}Notice{{/i}}
+          {{_i}}Info{{/i}}
         
         
-          <span class="label notice">{{_i}}Notice{{/i}}</span>
+          <span class="label info">{{_i}}Info{{/i}}</span>
         
       
     
@@ -1145,6 +1145,8 @@
 
 
 
+
 
          
   
          
     
          {{_i}}Buttons{{/i}}
          
@@ -1213,9 +1215,9 @@
         {{_i}}Action{{/i}}
       
          
     
          
-    
          
+    
          
       
          {{_i}}Disabled state{{/i}}
          
-      
          {{_i}}For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.{{/i}}
          
+      
          {{_i}}For disabled buttons, use .disabled for links and :disabled for <button> elements.{{/i}}
          
       
          
         {{_i}}Primary action{{/i}}
         {{_i}}Action{{/i}}
@@ -1225,6 +1227,11 @@
         
       
          
     
          
+    
          
+      
          Cross browser compatibility
          
+      
          In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.
          
+      
          Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow—unfortunately we can't fix this.
          
+    
          
   
          
 
   
          
diff --git a/lib/buttons.less b/lib/buttons.less
index 228b6c06d..cebacd049 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -1,6 +1,10 @@
 // BUTTON STYLES
 // -------------
 
+
+// Colors
+// ------
+
 .btn {
   // Set text color
   &.primary,
@@ -31,6 +35,9 @@
   }
 }
 
+
+// Mixin for generating button backgrounds
+// ---------------------------------------
 .buttonBackground(@startColor, @endColor) {
   // gradientBar will set the background to a pleasing blend of these, to support IE<=9
   .gradientBar(@startColor, @endColor);
@@ -40,18 +47,22 @@
     background-color: @endColor;
   }
 
+  // called out separately because IE8 would ignore otherwise
   &[disabled] {
     background-color: @endColor;
   }
 
+  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
   &:active,
   &.active {
-    // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
     background-color: darken(@endColor, 10%) e("\9");
   }
 }
 
-// Base .btn styles
+
+// Base styles
+// -----------
+
 .btn {
   // Button Base
   display: inline-block;
diff --git a/lib/labels.less b/lib/labels.less
index 114bc85b5..06dc7f3c0 100644
--- a/lib/labels.less
+++ b/lib/labels.less
@@ -9,8 +9,8 @@
   text-transform: uppercase;
   background-color: @grayLight;
   .border-radius(3px);
-  &.important { background-color: #c43c35; }
+  &.important { background-color: @errorText; }
   &.warning   { background-color: @orange; }
-  &.success   { background-color: @green; }
-  &.notice    { background-color: lighten(@blue, 25%); }
+  &.success   { background-color: @successText; }
+  &.info      { background-color: @infoText; }
 }
-- 
cgit v1.2.3


From 9c1ec6fb98efb72dbf9618e6c332702082dcd622 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 11:40:29 -0800
Subject: updated homepage docs to distill strapline

---
 docs/assets/css/docs.css            | 4 +++-
 docs/index.html                     | 3 ++-
 docs/templates/pages/index.mustache | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 27c446d23..8745d9985 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -69,7 +69,7 @@ hr.soften {
 }
 .jumbotron h1 {
   margin-bottom: 9px;
-  font-size: 108px;
+  font-size: 90px;
   letter-spacing: -1px;
   line-height: 1;
 }
@@ -108,6 +108,8 @@ hr.soften {
 }
 .masthead p {
   margin: 0 5% 27px;
+  font-size: 30px;
+  line-height: 36px;
 }
 
 
diff --git a/docs/index.html b/docs/index.html
index 333077601..72295d0b3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -70,7 +70,8 @@
         
          
           
          
             
          Twitter Bootstrap
          
-            
          Bootstrap is a comprehensive front-end toolkit from Twitter designed to kickstart web development. It features HTML, CSS, and JS for dozens of base elements, commonly used design components, and more.
          
+            
          Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
          
             
          
               View project on GitHub
               Customize and download
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 5bc52644d..2831babe4 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -5,7 +5,7 @@
         
          
           
          
             
          {{_i}}Twitter Bootstrap{{/i}}
          
-            
          {{_i}}Bootstrap is a comprehensive front-end toolkit from Twitter designed to kickstart web development. It features HTML, CSS, and JS for dozens of base elements, commonly used design components, and more.{{/i}}
          
+            
          Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
          
             
          
               {{_i}}View project on GitHub{{/i}}
               {{_i}}Customize and download{{/i}}
-- 
cgit v1.2.3


From b7f22e27ec89049f4347ae5249e97c08eb8d6a2f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 11:47:40 -0800
Subject: more docs homepage adjustments

---
 docs/assets/css/docs.css            | 4 ++--
 docs/index.html                     | 5 ++---
 docs/templates/pages/index.mustache | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 8745d9985..449199ca0 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -69,7 +69,7 @@ hr.soften {
 }
 .jumbotron h1 {
   margin-bottom: 9px;
-  font-size: 90px;
+  font-size: 81px;
   letter-spacing: -1px;
   line-height: 1;
 }
@@ -107,7 +107,7 @@ hr.soften {
   margin-bottom: 18px;
 }
 .masthead p {
-  margin: 0 5% 27px;
+  margin: 0 5% 18px;
   font-size: 30px;
   line-height: 36px;
 }
diff --git a/docs/index.html b/docs/index.html
index 72295d0b3..8d66e3568 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -69,9 +69,8 @@
         ================================================== -->
         
          
           
          
-            
          Twitter Bootstrap
          
-            
          Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
          
+            
          Bootstrap, from Twitter
          
+            
          Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
          
             
          
               View project on GitHub
               Customize and download
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 2831babe4..b045cc579 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -4,7 +4,7 @@
         ================================================== -->
         
          
           
          
-            
          {{_i}}Twitter Bootstrap{{/i}}
          
+            
          {{_i}}Bootstrap, from Twitter{{/i}}
          
             
          Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
          
             
          
               {{_i}}View project on GitHub{{/i}}
-- 
cgit v1.2.3


From c13de3db607dad06ce992e78ffdb8c2fa6871e70 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 13:56:18 -0500
Subject: Fixes off-by-1px between checkbox and form label (all browsers)

---
 lib/forms.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/forms.less b/lib/forms.less
index 744649f90..4aec1ec1a 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -162,7 +162,7 @@ input[type=hidden] {
 // Move the options list down to align with labels
 .controls > .radio:first-child,
 .controls > .checkbox:first-child {
-  padding-top: 6px; // has to be padding because margin collaspes
+  padding-top: 5px; // has to be padding because margin collaspes
 }
 
 // Radios and checkboxes on same line
-- 
cgit v1.2.3


From f76444c8585f3a720e0af2cedd33acddc718b962 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 14:11:05 -0500
Subject: Clears border-radius on checkboxes because they look bad on IE

---
 lib/forms.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/forms.less b/lib/forms.less
index 4aec1ec1a..b2bd7b8cc 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -87,6 +87,7 @@ input[type=radio] {
   line-height: normal;
   border: none;
   cursor: pointer;
+  .border-radius(0);
 }
 
 // Reset the file input to browser defaults
-- 
cgit v1.2.3


From b9413460afe2bdfac18889953447622d13eb1968 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 16:02:27 -0500
Subject: Makes inputs and buttons align middle so they line up in all browsers

---
 lib/buttons.less | 7 ++++---
 lib/forms.less   | 8 ++++----
 lib/reset.less   | 3 +--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/buttons.less b/lib/buttons.less
index cebacd049..240e117e2 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -66,9 +66,9 @@
 .btn {
   // Button Base
   display: inline-block;
-  padding: 5px 10px 6px;
+  padding: 4px 10px 4px;
   font-size: @baseFontSize;
-  line-height: normal;
+  line-height: @baseLineHeight;
   color: @grayDark;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
@@ -129,8 +129,9 @@
     .border-radius(5px);
   }
   &.small {
-    padding: 7px 9px 7px;
+    padding: 5px 9px 5px;
     font-size: @baseFontSize - 2px;
+    line-height: @baseLineHeight - 2px;
   }
 }
 
diff --git a/lib/forms.less b/lib/forms.less
index b2bd7b8cc..4ee636683 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -119,7 +119,6 @@ input[type=file] {
 // Chrome on Linux and Mobile Safari need background-color
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
-  vertical-align: baseline;
   background-color: @white;
 }
 
@@ -377,9 +376,9 @@ select:focus:required:invalid {
 }
 
 .help-inline {
-  *position: relative; /* IE6-7 */
-  *top: -5px; /* IE6-7 */
-  display: inline;
+  display: inline-block;
+  margin-bottom: 9px;
+  vertical-align: middle;
   padding-left: 5px;
 }
 
@@ -469,6 +468,7 @@ select:focus:required:invalid {
   input,
   textarea,
   select,
+  .help-inline,
   .uneditable-input {
     display: inline-block;
     margin-bottom: 0;
diff --git a/lib/reset.less b/lib/reset.less
index 31e7160f2..ef4dc8af6 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -91,8 +91,7 @@ select,
 textarea {
   margin: 0;
   font-size: 100%;
-  vertical-align: baseline;
-  *vertical-align: middle;
+  vertical-align: middle;
 }
 button,
 input {
-- 
cgit v1.2.3


From 721b8a10785c548fa6a1cb26ccd698ceabc43e36 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 16:15:09 -0500
Subject: rebuild *.css

---
 bootstrap-responsive.min.css |  2 +-
 bootstrap.css                | 33 +++++++++++++++++----------------
 bootstrap.min.css            | 18 +++++++++---------
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
index 8ed8745bb..dcf17dce9 100644
--- a/bootstrap-responsive.min.css
+++ b/bootstrap-responsive.min.css
@@ -1,3 +1,3 @@
 
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
+@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
diff --git a/bootstrap.css b/bootstrap.css
index 4e7316558..58757683c 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 11:09:38 PST 2012
+ * Date: Thu Jan 26 16:14:59 EST 2012
  */
 article,
 aside,
@@ -63,8 +63,7 @@ select,
 textarea {
   margin: 0;
   font-size: 100%;
-  vertical-align: baseline;
-  *vertical-align: middle;
+  vertical-align: middle;
 }
 button, input {
   *overflow: visible;
@@ -528,6 +527,9 @@ input[type=image], input[type=checkbox], input[type=radio] {
   line-height: normal;
   border: none;
   cursor: pointer;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
 }
 input[type=file] {
   padding: initial;
@@ -554,7 +556,6 @@ select, input[type=file] {
 }
 select {
   width: 220px;
-  vertical-align: baseline;
   background-color: #ffffff;
 }
 select[multiple], select[size] {
@@ -579,7 +580,7 @@ input[type=hidden] {
   margin-left: -18px;
 }
 .controls > .radio:first-child, .controls > .checkbox:first-child {
-  padding-top: 6px;
+  padding-top: 5px;
 }
 .radio.inline, .checkbox.inline {
   display: inline-block;
@@ -810,13 +811,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   color: #999999;
 }
 .help-inline {
-  *position: relative;
-  /* IE6-7 */
-
-  *top: -5px;
-  /* IE6-7 */
-
-  display: inline;
+  display: inline-block;
+  margin-bottom: 9px;
+  vertical-align: middle;
   padding-left: 5px;
 }
 .input-prepend, .input-append {
@@ -905,6 +902,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .form-search select,
 .form-inline select,
 .form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
 .form-search .uneditable-input,
 .form-inline .uneditable-input,
 .form-horizontal .uneditable-input {
@@ -1828,7 +1828,7 @@ table .span12 {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
@@ -2441,9 +2441,9 @@ table .span12 {
 }
 .btn {
   display: inline-block;
-  padding: 5px 10px 6px;
+  padding: 4px 10px 4px;
   font-size: 13px;
-  line-height: normal;
+  line-height: 18px;
   color: #333333;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
   background-color: #fafafa;
@@ -2515,8 +2515,9 @@ table .span12 {
   border-radius: 5px;
 }
 .btn.small {
-  padding: 7px 9px 7px;
+  padding: 5px 9px 5px;
   font-size: 11px;
+  line-height: 16px;
 }
 button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   padding: 0;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 6f22405e6..26c3dfe94 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -8,7 +8,7 @@ sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
 sup{top:-0.5em;}
 sub{bottom:-0.25em;}
 img{max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;}
-button,input,select,textarea{margin:0;font-size:100%;vertical-align:baseline;*vertical-align:middle;}
+button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}
 button,input{*overflow:visible;line-height:normal;}
 button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
 button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
@@ -97,18 +97,18 @@ label{display:block;margin-bottom:5px;color:#333333;}
 input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 .uneditable-textarea{width:auto;height:auto;}
 label input,label textarea,label select{display:block;}
-input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
+input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
 select,input[type=file]{height:28px;*margin-top:4px;line-height:28px;}
-select{width:220px;vertical-align:baseline;background-color:#ffffff;}
+select{width:220px;background-color:#ffffff;}
 select[multiple],select[size]{height:auto;}
 input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 textarea{height:auto;}
 input[type=hidden]{display:none;}
 .radio,.checkbox{padding-left:18px;}
 .radio input[type=radio],.checkbox input[type=checkbox]{float:left;margin-left:-18px;}
-.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;}
+.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;}
 .radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;}
 .radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
 input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
@@ -161,7 +161,7 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir
 :-moz-placeholder{color:#999999;}
 ::-webkit-input-placeholder{color:#999999;}
 .help-block{margin-top:5px;margin-bottom:0;color:#999999;}
-.help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;}
+.help-inline{display:inline-block;margin-bottom:9px;vertical-align:middle;padding-left:5px;}
 .input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";}
 .input-prepend:after,.input-append:after{clear:both;}
 .input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
@@ -173,7 +173,7 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir
 .input-append .uneditable-input{border-right-color:#ccc;}
 .input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 .search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
-.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
+.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
 .form-search label,.form-inline label{display:inline-block;}
 .control-group{margin-bottom:9px;}
 .form-horizontal legend+.control-group{padding-top:27px;}
@@ -377,7 +377,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
@@ -464,13 +464,13 @@ table .span12{float:none;width:924px;margin-left:0;}
 .btn.info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;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);}.btn.info:hover,.btn.info:active,.btn.info.active,.btn.info.disabled{background-color:#339bb9;}
 .btn.info[disabled]{background-color:#339bb9;}
 .btn.info:active,.btn.info.active{background-color:#287a91 \9;}
-.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;}.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
+.btn{display:inline-block;padding:4px 10px 4px;font-size:13px;line-height:18px;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;}.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
 .btn:focus{outline:1px dotted #666;}
 .btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;}
 .btn.disabled{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
-.btn.small{padding:7px 9px 7px;font-size:11px;}
+.btn.small{padding:5px 9px 5px;font-size:11px;line-height:16px;}
 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
 .btn-group{position:relative;*zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";}
 .btn-group:after{clear:both;}
-- 
cgit v1.2.3


From 78652a707f8ae2d98b1cd434b4bca546d2948236 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 13:51:12 -0800
Subject: allow icons in small buttons

---
 lib/button-groups.less | 5 +++++
 lib/buttons.less       | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/lib/button-groups.less b/lib/button-groups.less
index 17957f1d6..5fb0a8e97 100644
--- a/lib/button-groups.less
+++ b/lib/button-groups.less
@@ -114,3 +114,8 @@
   }
 }
 
+// Small button dropdowns
+.btn.small .caret {
+  margin-top: 4px;
+}
+
diff --git a/lib/buttons.less b/lib/buttons.less
index cebacd049..118af568a 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -132,6 +132,9 @@
     padding: 7px 9px 7px;
     font-size: @baseFontSize - 2px;
   }
+  &.small .icon {
+    margin-top: -2px;
+  }
 }
 
 // Help Firefox not be a jerk about adding extra padding to buttons
-- 
cgit v1.2.3


From 1f04481092f6021c721f48465b57f7a829f186f5 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 17:07:06 -0500
Subject: Switches from Array#filter to jQuery.grep for IE<=8 support

---
 js/bootstrap-typeahead.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index f64fcca01..1205a99ca 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -79,7 +79,7 @@
 
       q = this.query.toLowerCase()
 
-      items = this.data.filter(function (item) {
+      items = jQuery.grep(this.data, function (item) {
         if (that.matcher(item, q)) return item
       })
 
@@ -249,4 +249,4 @@
     })
   })
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
-- 
cgit v1.2.3


From 2aa99d17d52cffe7fd4a1aad18a46cfc2ba91185 Mon Sep 17 00:00:00 2001
From: Linmiao Xu 
Date: Thu, 26 Jan 2012 14:36:30 -0800
Subject: Fix icon margin in large buttons.

---
 lib/buttons.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/buttons.less b/lib/buttons.less
index 118af568a..2cbcc1d4f 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -128,6 +128,9 @@
     line-height: normal;
     .border-radius(5px);
   }
+  &.large .icon {
+    margin-top: 1px;
+  }
   &.small {
     padding: 7px 9px 7px;
     font-size: @baseFontSize - 2px;
-- 
cgit v1.2.3


From 43c8f41895cded171185f4f7ddac9d917f9912d2 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 14:40:09 -0800
Subject: add values to inputs for grid variables on download page

---
 docs/download.html                     | 10 +++++-----
 docs/templates/pages/download.mustache | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/download.html b/docs/download.html
index 3ad6ec921..3ac59b00e 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -159,15 +159,15 @@
       
       
          Grid system
          
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
     
          
     
          
       
          Typography
          
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 4478a006a..1401011f5 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -94,15 +94,15 @@
       
       
          Grid system
          
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
     
          
     
          
       
          Typography
          
-- 
cgit v1.2.3


From 8a6be6601dfb826e32a5004b7b0f09756ebb975b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 14:40:19 -0800
Subject: make accordion links block level

---
 bootstrap.css                            | 13 +++++++++++--
 bootstrap.min.css                        |  5 ++++-
 docs/javascript.html                     |  6 +++---
 docs/templates/pages/javascript.mustache |  6 +++---
 lib/accordion.less                       |  5 ++++-
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 4e7316558..8db6a82e6 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 11:09:38 PST 2012
+ * Date: Thu Jan 26 13:56:25 PST 2012
  */
 article,
 aside,
@@ -2518,6 +2518,9 @@ table .span12 {
   padding: 7px 9px 7px;
   font-size: 11px;
 }
+.btn.small .icon {
+  margin-top: -2px;
+}
 button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   padding: 0;
   border: 0;
@@ -2616,6 +2619,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   opacity: 0.75;
   filter: alpha(opacity=75);
 }
+.btn.small .caret {
+  margin-top: 4px;
+}
 .alert {
   padding: 8px 35px 8px 14px;
   margin-bottom: 18px;
@@ -2880,9 +2886,12 @@ a.thumbnail:hover {
   border-radius: 4px;
 }
 .accordion-heading {
-  padding: 8px 15px;
   border-bottom: 0;
 }
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
 .accordion-body {
   margin-bottom: 2px;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 6f22405e6..191784b43 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -471,6 +471,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
 .btn.small{padding:7px 9px 7px;font-size:11px;}
+.btn.small .icon{margin-top:-2px;}
 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
 .btn-group{position:relative;*zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";}
 .btn-group:after{clear:both;}
@@ -487,6 +488,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
 .btn .caret{margin-top:6px;margin-left:0;}
 .primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
+.btn.small .caret{margin-top:4px;}
 .alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .alert,.alert-heading{color:#c09853;}
 .alert .close{position:relative;right:-21px;line-height:18px;}
@@ -523,7 +525,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
 .accordion{margin-bottom:18px;}
 .accordion-group{background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.accordion-heading{padding:8px 15px;border-bottom:0;}
+.accordion-heading{border-bottom:0;}
+.accordion-heading .accordion-toggle{display:block;padding:8px 15px;}
 .accordion-body{margin-bottom:2px;}
 .accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
 .carousel{position:relative;line-height:1;}
diff --git a/docs/javascript.html b/docs/javascript.html
index 63881d2c9..2bd5bbd05 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1054,7 +1054,7 @@ $('#my-alert').bind('closed', function () {
           
          
             
          
               
          
-                
+                
                   Collapsible Group Item #1
                 
               
          
@@ -1066,7 +1066,7 @@ $('#my-alert').bind('closed', function () {
             
          
             
          
               
          
-                
+                
                   Collapsible Group Item #2
                 
               
          
@@ -1078,7 +1078,7 @@ $('#my-alert').bind('closed', function () {
             
          
             
          
               
          
-                
+                
                   Collapsible Group Item #3
                 
               
          
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 941c6b485..59b8a03d6 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -989,7 +989,7 @@ $('#my-alert').bind('closed', function () {
           
          
             
          
               
          
-                
+                
                   {{_i}}Collapsible Group Item #1{{/i}}
                 
               
          
@@ -1001,7 +1001,7 @@ $('#my-alert').bind('closed', function () {
             
          
             
          
               
          
-                
+                
                   {{_i}}Collapsible Group Item #2{{/i}}
                 
               
          
@@ -1013,7 +1013,7 @@ $('#my-alert').bind('closed', function () {
             
          
             
          
               
          
-                
+                
                   {{_i}}Collapsible Group Item #3{{/i}}
                 
               
          
diff --git a/lib/accordion.less b/lib/accordion.less
index a57683e7b..1ebd5b1a1 100644
--- a/lib/accordion.less
+++ b/lib/accordion.less
@@ -13,9 +13,12 @@
   .border-radius(4px);
 }
 .accordion-heading {
-  padding: 8px 15px;
   border-bottom: 0;
 }
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
 .accordion-body {
   margin-bottom: 2px;
 }
-- 
cgit v1.2.3


From 7a6737512a18f56bb95a0024fdbd4a8823034b76 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 14:50:55 -0800
Subject: break scaffolding down into smaller less files

---
 bootstrap.css        | 100 +++++++++++++++++++++++++--------------------------
 bootstrap.min.css    |  20 +++++------
 lib/bootstrap.less   |   2 ++
 lib/grid.less        |  41 +++++++++++++++++++++
 lib/layouts.less     |  43 ++++++++++++++++++++++
 lib/scaffolding.less |  86 ++------------------------------------------
 6 files changed, 148 insertions(+), 144 deletions(-)
 create mode 100644 lib/grid.less
 create mode 100644 lib/layouts.less

diff --git a/bootstrap.css b/bootstrap.css
index 8db6a82e6..6970487e0 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 13:56:25 PST 2012
+ * Date: Thu Jan 26 14:50:34 PST 2012
  */
 article,
 aside,
@@ -102,55 +102,6 @@ body {
   color: #555555;
   background-color: #ffffff;
 }
-.container {
-  width: 940px;
-  margin-left: auto;
-  margin-right: auto;
-  *zoom: 1;
-}
-.container:before, .container:after {
-  display: table;
-  content: "";
-}
-.container:after {
-  clear: both;
-}
-.fluid-container {
-  position: relative;
-  min-width: 940px;
-  padding-left: 20px;
-  padding-right: 20px;
-  *zoom: 1;
-}
-.fluid-container:before, .fluid-container:after {
-  display: table;
-  content: "";
-}
-.fluid-container: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%;
-}
 a {
   color: #0088cc;
   text-decoration: none;
@@ -243,6 +194,55 @@ a:hover {
 .offset11 {
   margin-left: 900px;
 }
+.container {
+  width: 940px;
+  margin-left: auto;
+  margin-right: auto;
+  *zoom: 1;
+}
+.container:before, .container:after {
+  display: table;
+  content: "";
+}
+.container:after {
+  clear: both;
+}
+.fluid-container {
+  position: relative;
+  min-width: 940px;
+  padding-left: 20px;
+  padding-right: 20px;
+  *zoom: 1;
+}
+.fluid-container:before, .fluid-container:after {
+  display: table;
+  content: "";
+}
+.fluid-container: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;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 191784b43..dc158adcf 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -16,16 +16,6 @@ input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box
 input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
 textarea{overflow:auto;vertical-align:top;}
 body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#555555;background-color:#ffffff;}
-.container{width:940px;margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
-.container:after{clear:both;}
-.fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;*zoom:1;}.fluid-container:before,.fluid-container:after{display:table;content:"";}
-.fluid-container: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%;}
 a{color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
 .row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
 .row:after{clear:both;}
@@ -53,6 +43,16 @@ a{color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:unde
 .offset9{margin-left:740px;}
 .offset10{margin-left:820px;}
 .offset11{margin-left:900px;}
+.container{width:940px;margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
+.container:after{clear:both;}
+.fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;*zoom:1;}.fluid-container:before,.fluid-container:after{display:table;content:"";}
+.fluid-container: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;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
 .lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;}
 h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;}
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 8d307d427..40ebd7f2f 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -18,6 +18,8 @@
 
 // Grid system and page structure
 @import "scaffolding.less";
+@import "grid.less";
+@import "layouts.less";
 
 // Base CSS
 @import "type.less";
diff --git a/lib/grid.less b/lib/grid.less
new file mode 100644
index 000000000..d5b5f487d
--- /dev/null
+++ b/lib/grid.less
@@ -0,0 +1,41 @@
+// GRID SYSTEM
+// -----------
+// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
+.row {
+  margin-left: @gridGutterWidth * -1;
+  .clearfix();
+}
+
+// Find all .span# classes within .row and give them the necessary properties for grid columns 
+// (supported by all browsers back to IE7)
+// Credit to @dhg for the idea
+[class*="span"] {
+  .gridColumn();
+}
+
+// Default columns
+.span1     { .columns(1); }
+.span2     { .columns(2); }
+.span3     { .columns(3); }
+.span4     { .columns(4); }
+.span5     { .columns(5); }
+.span6     { .columns(6); }
+.span7     { .columns(7); }
+.span8     { .columns(8); }
+.span9     { .columns(9); }
+.span10    { .columns(10); }
+.span11    { .columns(11); }
+.span12    { .columns(12); }
+
+// Offset column options
+.offset1   { .offset(1); }
+.offset2   { .offset(2); }
+.offset3   { .offset(3); }
+.offset4   { .offset(4); }
+.offset5   { .offset(5); }
+.offset6   { .offset(6); }
+.offset7   { .offset(7); }
+.offset8   { .offset(8); }
+.offset9   { .offset(9); }
+.offset10  { .offset(10); }
+.offset11  { .offset(11); }
diff --git a/lib/layouts.less b/lib/layouts.less
new file mode 100644
index 000000000..14435c9d1
--- /dev/null
+++ b/lib/layouts.less
@@ -0,0 +1,43 @@
+//
+// Layouts
+// Fixed-width and fluid (with sidebar) layouts
+// --------------------------------------------
+
+
+// Container (centered, fixed-width layouts)
+.container {
+  .container-fixed();
+}
+
+// Fluid layouts (left aligned, with sidebar, min- & max-width content)
+.fluid-container {
+  position: relative;
+  min-width: @siteWidth;
+  padding-left: @gridGutterWidth;
+  padding-right: @gridGutterWidth;
+  .clearfix();
+}
+
+// Sidebars (left and right options)
+.fluid-sidebar {
+  width: @fluidSidebarWidth;
+  margin: 0 20px 18px;
+}
+.sidebar-left   { padding-left: @fluidSidebarWidth + @gridGutterWidth * 2; }
+.sidebar-right  { padding-right: @fluidSidebarWidth + @gridGutterWidth * 2; }
+
+// Float the sidebars accordingly
+.sidebar-left .fluid-sidebar {
+  float: left;
+  margin-left: (@fluidSidebarWidth + @gridGutterWidth) * -1;
+}
+.sidebar-right .fluid-sidebar {
+  float: right;
+  margin-right: (@fluidSidebarWidth + @gridGutterWidth) * -1;
+}
+
+// The main content area
+.fluid-content {
+  float: left;
+  width: 100%;
+}
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 7002b0408..3eced0ef0 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -16,49 +16,10 @@ body {
   background-color: @white;
 }
 
-// Container (centered, fixed-width layouts)
-.container {
-  .container-fixed();
-}
-
-// Fluid layouts (left aligned, with sidebar, min- & max-width content)
-.fluid-container {
-  position: relative;
-  min-width: @siteWidth;
-  padding-left: @gridGutterWidth;
-  padding-right: @gridGutterWidth;
-  .clearfix();
-}
-
-// Sidebars (left and right options)
-.fluid-sidebar {
-  width: @fluidSidebarWidth;
-  margin: 0 20px 18px;
-}
-.sidebar-left   { padding-left: @fluidSidebarWidth + @gridGutterWidth * 2; }
-.sidebar-right  { padding-right: @fluidSidebarWidth + @gridGutterWidth * 2; }
-
-// Float the sidebars accordingly
-.sidebar-left .fluid-sidebar {
-  float: left;
-  margin-left: (@fluidSidebarWidth + @gridGutterWidth) * -1;
-}
-.sidebar-right .fluid-sidebar {
-  float: right;
-  margin-right: (@fluidSidebarWidth + @gridGutterWidth) * -1;
-}
-
-// The main content area
-.fluid-content {
-  float: left;
-  width: 100%;
-}
-
 
-// BASE STYLES
-// -----------
+// LINKS
+// -----
 
-// Links
 a {
   color: @linkColor;
   text-decoration: none;
@@ -67,46 +28,3 @@ a {
     text-decoration: underline;
   }
 }
-
-
-// GRID SYSTEM
-// -----------
-// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
-.row {
-  margin-left: @gridGutterWidth * -1;
-  .clearfix();
-}
-
-// Find all .span# classes within .row and give them the necessary properties for grid columns 
-// (supported by all browsers back to IE7)
-// Credit to @dhg for the idea
-[class*="span"] {
-  .gridColumn();
-}
-
-// Default columns
-.span1     { .columns(1); }
-.span2     { .columns(2); }
-.span3     { .columns(3); }
-.span4     { .columns(4); }
-.span5     { .columns(5); }
-.span6     { .columns(6); }
-.span7     { .columns(7); }
-.span8     { .columns(8); }
-.span9     { .columns(9); }
-.span10    { .columns(10); }
-.span11    { .columns(11); }
-.span12    { .columns(12); }
-
-// Offset column options
-.offset1   { .offset(1); }
-.offset2   { .offset(2); }
-.offset3   { .offset(3); }
-.offset4   { .offset(4); }
-.offset5   { .offset(5); }
-.offset6   { .offset(6); }
-.offset7   { .offset(7); }
-.offset8   { .offset(8); }
-.offset9   { .offset(9); }
-.offset10  { .offset(10); }
-.offset11  { .offset(11); }
-- 
cgit v1.2.3


From f82db4b95bf12bc6c04a5ecc3d4a649ba9800db0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 14:53:35 -0800
Subject: separate code from type css files

---
 bootstrap.css        | 14 +++++++-------
 bootstrap.min.css    |  4 ++--
 lib/bootstrap.less   |  1 +
 lib/code.less        | 44 ++++++++++++++++++++++++++++++++++++++++++++
 lib/scaffolding.less |  1 -
 lib/type.less        | 43 +------------------------------------------
 6 files changed, 55 insertions(+), 52 deletions(-)
 create mode 100644 lib/code.less

diff --git a/bootstrap.css b/bootstrap.css
index 6970487e0..f3ea6d0b9 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 14:50:34 PST 2012
+ * Date: Thu Jan 26 14:52:24 PST 2012
  */
 article,
 aside,
@@ -414,6 +414,12 @@ address {
   line-height: 18px;
   font-style: normal;
 }
+small {
+  font-size: 100%;
+}
+cite {
+  font-style: normal;
+}
 code, pre {
   padding: 0 3px 2px;
   font-family: Menlo, Monaco, "Courier New", monospace;
@@ -452,12 +458,6 @@ pre code {
   padding: 0;
   background-color: transparent;
 }
-small {
-  font-size: 100%;
-}
-cite {
-  font-style: normal;
-}
 form {
   margin: 0 0 18px;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index dc158adcf..711e5c01e 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -83,12 +83,12 @@ blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:
 blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
 q:before,q:after,blockquote:before,blockquote:after{content:"";}
 address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
+small{font-size:100%;}
+cite{font-style:normal;}
 code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}
 pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
 pre code{padding:0;background-color:transparent;}
-small{font-size:100%;}
-cite{font-style:normal;}
 form{margin:0 0 18px;}
 fieldset{padding:0;margin:0;border:0;}
 legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 40ebd7f2f..ede31c035 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -23,6 +23,7 @@
 
 // Base CSS
 @import "type.less";
+@import "code.less";
 @import "forms.less";
 @import "tables.less";
 
diff --git a/lib/code.less b/lib/code.less
new file mode 100644
index 000000000..0cc3db857
--- /dev/null
+++ b/lib/code.less
@@ -0,0 +1,44 @@
+// Code.less
+// Code typography styles for the  and 
           elements
+// --------------------------------------------------------
+
+// Inline and block code styles
+code,
+pre {
+  padding: 0 3px 2px;
+  #font > #family > .monospace;
+  font-size: @baseFontSize - 1;
+  color: @grayDark;
+  .border-radius(3px);
+}
+code {
+  padding: 3px 4px;
+  color: #d14;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+pre {
+  display: block;
+  padding: (@baseLineHeight - 1) / 2;
+  margin: 0 0 @baseLineHeight / 2;
+  font-size: 12px;
+  line-height: @baseLineHeight;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc; // fallback for IE7-8
+  border: 1px solid rgba(0,0,0,.15);
+  .border-radius(4px);
+  white-space: pre;
+  white-space: pre-wrap;
+  word-break: break-all;
+
+  // Make prettyprint styles more spaced out for readability
+  &.prettyprint {
+    margin-bottom: @baseLineHeight;
+  }
+
+  // Account for some code outputs that place code tags in pre tags
+  code {
+    padding: 0;
+    background-color: transparent;
+  }
+}
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 3eced0ef0..3c1826830 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -1,4 +1,3 @@
-//
 // Scaffolding
 // Basic and global styles for generating a grid system, structural layout, and page templates
 // -------------------------------------------------------------------------------------------
diff --git a/lib/type.less b/lib/type.less
index 548c222f1..087224fd0 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -197,51 +197,10 @@ address {
   font-style: normal;
 }
 
-// Inline and block code styles
-code,
-pre {
-  padding: 0 3px 2px;
-  #font > #family > .monospace;
-  font-size: @baseFontSize - 1;
-  color: @grayDark;
-  .border-radius(3px);
-}
-code {
-  padding: 3px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-pre {
-  display: block;
-  padding: (@baseLineHeight - 1) / 2;
-  margin: 0 0 @baseLineHeight / 2;
-  font-size: 12px;
-  line-height: @baseLineHeight;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc; // fallback for IE7-8
-  border: 1px solid rgba(0,0,0,.15);
-  .border-radius(4px);
-  white-space: pre;
-  white-space: pre-wrap;
-  word-break: break-all;
-
-  // Make prettyprint styles more spaced out for readability
-  &.prettyprint {
-    margin-bottom: @baseLineHeight;
-  }
-
-  // Account for some code outputs that place code tags in pre tags
-  code {
-    padding: 0;
-    background-color: transparent;
-  }
-}
-
+// Misc
 small {
   font-size: 100%;
 }
-
 cite {
   font-style: normal;
 }
-- 
cgit v1.2.3


From 945870d7785fcda985241582e15c53fab5ae6f64 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 14:54:24 -0800
Subject: small text change on downloads page

---
 docs/download.html                     | 2 +-
 docs/templates/pages/download.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/download.html b/docs/download.html
index 3ac59b00e..89077d247 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -97,7 +97,7 @@
       
       
       
          Base CSS
          
-      
+      
       
       
       
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 1401011f5..673bed912 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -32,7 +32,7 @@
       
       
       
          Base CSS
          
-      
+      
       
       
       
-- 
cgit v1.2.3


From 5844aa550d5a2d22d527d80cfa42443914d28c1f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 15:00:59 -0800
Subject: consistent new lines at ends of files

---
 js/bootstrap-alert.js      | 2 +-
 js/bootstrap-button.js     | 2 +-
 js/bootstrap-carousel.js   | 2 +-
 js/bootstrap-collapse.js   | 2 +-
 js/bootstrap-dropdown.js   | 2 +-
 js/bootstrap-modal.js      | 2 +-
 js/bootstrap-scrollspy.js  | 2 +-
 js/bootstrap-tab.js        | 2 +-
 js/bootstrap-transition.js | 2 +-
 js/bootstrap-typeahead.js  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js
index d6d2108f9..2df64c6e1 100644
--- a/js/bootstrap-alert.js
+++ b/js/bootstrap-alert.js
@@ -82,4 +82,4 @@
     $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
   })
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js
index 2461ffec6..d85c82947 100644
--- a/js/bootstrap-button.js
+++ b/js/bootstrap-button.js
@@ -95,4 +95,4 @@
     })
   })
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index 500c7da7f..47d832c82 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -151,4 +151,4 @@
     })
   })
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index ac434dcf3..e33dadedf 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -131,4 +131,4 @@
     })
   })
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index f9d93fc72..1ae317b44 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -80,4 +80,4 @@
     $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
   })
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index ecb7b5add..eea1938d0 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -202,4 +202,4 @@
     })
   })
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js
index 91c49f32e..dcb52456e 100644
--- a/js/bootstrap-scrollspy.js
+++ b/js/bootstrap-scrollspy.js
@@ -121,4 +121,4 @@
     })
   })
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js
index d52be872f..95698d23e 100644
--- a/js/bootstrap-tab.js
+++ b/js/bootstrap-tab.js
@@ -122,4 +122,4 @@
     })
   })
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js
index 94f1dbdf8..956350bd0 100644
--- a/js/bootstrap-transition.js
+++ b/js/bootstrap-transition.js
@@ -48,4 +48,4 @@
 
   })
   
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index f64fcca01..fad28ea46 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -249,4 +249,4 @@
     })
   })
 
-}( window.jQuery )
\ No newline at end of file
+}( window.jQuery )
-- 
cgit v1.2.3


From 95356ee0622561b67327b3880bcdc3c5df97cf40 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 15:04:36 -0800
Subject: make css after merge

---
 bootstrap.css     | 5 ++++-
 bootstrap.min.css | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bootstrap.css b/bootstrap.css
index f3ea6d0b9..89a9303eb 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 14:52:24 PST 2012
+ * Date: Thu Jan 26 15:04:19 PST 2012
  */
 article,
 aside,
@@ -2514,6 +2514,9 @@ table .span12 {
   -moz-border-radius: 5px;
   border-radius: 5px;
 }
+.btn.large .icon {
+  margin-top: 1px;
+}
 .btn.small {
   padding: 7px 9px 7px;
   font-size: 11px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 711e5c01e..f2af57a44 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -470,6 +470,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .btn.disabled{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn.large .icon{margin-top:1px;}
 .btn.small{padding:7px 9px 7px;font-size:11px;}
 .btn.small .icon{margin-top:-2px;}
 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
-- 
cgit v1.2.3


From f398926e4647df1e7e5a2abdbc9e2e9e775eeb34 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 15:22:52 -0800
Subject: move down background iamge

---
 docs/assets/css/docs.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 449199ca0..2ef413906 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -14,6 +14,7 @@ body {
   background-color: #fff;
   background-image: url(../img/grid-18px-masked.png);
   background-repeat: repeat-x;
+  background-position: 0 40px;
 }
 
 
-- 
cgit v1.2.3


From b9589fcb8076aa6b2559553c56d7e65808568a86 Mon Sep 17 00:00:00 2001
From: David N 
Date: Thu, 26 Jan 2012 17:23:09 -0600
Subject: Enable default browser key behaviour when typeahead isn't showing.

---
 js/bootstrap-typeahead.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index fad28ea46..82188f592 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -157,6 +157,7 @@
 
         case 9: // tab
         case 13: // enter
+          if (!this.shown) return
           this.select()
           break
 
@@ -172,6 +173,7 @@
 
   , keypress: function (e) {
       e.stopPropagation()
+      if (!this.shown) return
 
       switch(e.keyCode) {
         case 9: // tab
@@ -181,13 +183,11 @@
           break
 
         case 38: // up arrow
-          if (!this.shown) return
           e.preventDefault()
           this.prev()
           break
 
         case 40: // down arrow
-          if (!this.shown) return
           e.preventDefault()
           this.next()
           break
-- 
cgit v1.2.3


From d8e1001836f869436df2de2905411b2236c8cbad Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 15:39:37 -0800
Subject: fix legend margin collapse

---
 bootstrap.css     | 6 +++---
 bootstrap.min.css | 4 ++--
 lib/forms.less    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 862b4c5b6..cc5d7f019 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 15:25:02 PST 2012
+ * Date: Thu Jan 26 15:39:24 PST 2012
  */
 article,
 aside,
@@ -475,7 +475,6 @@ legend {
   color: #333333;
   border: 0;
   border-bottom: 1px solid #eee;
-  -webkit-margin-collapse: separate;
 }
 label,
 input,
@@ -918,7 +917,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   margin-bottom: 9px;
 }
 .form-horizontal legend + .control-group {
-  padding-top: 27px;
+  margin-top: 18px;
+  -webkit-margin-top-collapse: separate;
 }
 .form-horizontal .control-group {
   margin-bottom: 18px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index c4b048f74..1e41bf911 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -91,7 +91,7 @@ pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;b
 pre code{padding:0;background-color:transparent;}
 form{margin:0 0 18px;}
 fieldset{padding:0;margin:0;border:0;}
-legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
+legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;}
 label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
 input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
@@ -176,7 +176,7 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir
 .form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
 .form-search label,.form-inline label{display:inline-block;}
 .control-group{margin-bottom:9px;}
-.form-horizontal legend+.control-group{padding-top:27px;}
+.form-horizontal legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;}
 .form-horizontal .control-group{margin-bottom:18px;}
 .form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
 .form-horizontal .controls{margin-left:160px;}
diff --git a/lib/forms.less b/lib/forms.less
index 4ee636683..9e2e1dc1b 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -28,7 +28,6 @@ legend {
   color: @grayDark;
   border: 0;
   border-bottom: 1px solid #eee;
-  -webkit-margin-collapse: separate;
 }
 
 // Set font for forms
@@ -490,7 +489,8 @@ select:focus:required:invalid {
 .form-horizontal {
   // Legend collapses margin, so we're relegated to padding
   legend + .control-group {
-    padding-top: @baseLineHeight * 1.5;
+    margin-top: @baseLineHeight;
+    -webkit-margin-top-collapse: separate;
   }
   // Increase spacing between groups
   .control-group {
-- 
cgit v1.2.3


From ef4e3bc0f7549e327c45792884a264faab402400 Mon Sep 17 00:00:00 2001
From: Linmiao Xu 
Date: Thu, 26 Jan 2012 15:51:11 -0800
Subject: Move hero-unit css out of pattern.less and include it. Fixes #1185.

---
 bootstrap-responsive.min.css |  2 +-
 bootstrap.css                | 23 +++++++++++++++++++++--
 bootstrap.min.css            |  4 +++-
 lib/bootstrap.less           |  1 +
 lib/hero-unit.less           | 20 ++++++++++++++++++++
 lib/patterns.less            | 17 -----------------
 6 files changed, 46 insertions(+), 21 deletions(-)
 create mode 100644 lib/hero-unit.less

diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
index 8ed8745bb..dcf17dce9 100644
--- a/bootstrap-responsive.min.css
+++ b/bootstrap-responsive.min.css
@@ -1,3 +1,3 @@
 
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
+@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
diff --git a/bootstrap.css b/bootstrap.css
index cc5d7f019..b71432eb4 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 15:39:24 PST 2012
+ * Date: Thu Jan 26 15:50:30 PST 2012
  */
 article,
 aside,
@@ -1828,7 +1828,7 @@ table .span12 {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
@@ -2998,6 +2998,25 @@ a.thumbnail:hover {
 .carousel-caption h4, .carousel-caption p {
   color: #ffffff;
 }
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+}
+.hero-unit p {
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 27px;
+}
 .pull-right {
   float: right;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 1e41bf911..88f8968fc 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -377,7 +377,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
@@ -546,6 +546,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
 .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
 .carousel-caption h4,.carousel-caption p{color:#ffffff;}
+.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
+.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
 .pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index ede31c035..bc9f84373 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -57,6 +57,7 @@
 @import "progress-bars.less";
 @import "accordion.less";
 @import "carousel.less";
+@import "hero-unit.less";
 
 // Utility classes
 @import "utilities.less"; // Has to be last to override when necessary
diff --git a/lib/hero-unit.less b/lib/hero-unit.less
new file mode 100644
index 000000000..cba1cc46c
--- /dev/null
+++ b/lib/hero-unit.less
@@ -0,0 +1,20 @@
+// HERO UNIT
+// ---------
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  background-color: #f5f5f5;
+  .border-radius(6px);
+  h1 {
+    margin-bottom: 0;
+    font-size: 60px;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+  p {
+    font-size: 18px;
+    font-weight: 200;
+    line-height: @baseLineHeight * 1.5;
+  }
+}
diff --git a/lib/patterns.less b/lib/patterns.less
index 7a039ce26..d94b921e4 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -6,23 +6,6 @@
 // PAGE HEADERS
 // ------------
 
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  background-color: #f5f5f5;
-  .border-radius(6px);
-  h1 {
-    margin-bottom: 0;
-    font-size: 60px;
-    line-height: 1;
-    letter-spacing: -1px;
-  }
-  p {
-    font-size: 18px;
-    font-weight: 200;
-    line-height: @baseLineHeight * 1.5;
-  }
-}
 footer {
   padding-top: @baseLineHeight - 1;
   margin-top: @baseLineHeight - 1;
-- 
cgit v1.2.3


From b260544de02788bc921c4c713df0f754d96c5a27 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 15:54:04 -0800
Subject: fix links to apple touch icons

---
 docs/base-css.html                     | 8 ++++----
 docs/components.html                   | 6 +++---
 docs/download.html                     | 6 +++---
 docs/examples.html                     | 6 +++---
 docs/index.html                        | 6 +++---
 docs/javascript.html                   | 6 +++---
 docs/less.html                         | 6 +++---
 docs/scaffolding.html                  | 6 +++---
 docs/templates/layout.mustache         | 6 +++---
 docs/templates/pages/base-css.mustache | 2 +-
 docs/upgrading.html                    | 6 +++---
 11 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index ebc6285dc..239b963c4 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -20,9 +20,9 @@
 
     
     
-    
-    
-    
+    
+    
+    
   
 
   
@@ -962,7 +962,7 @@
             
             
          
               
-                
+                
                 
                 
                 
diff --git a/docs/upgrading.html b/docs/upgrading.html
index e80fac2d6..d0234a8ba 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -20,9 +20,9 @@
 
     
     
-    
-    
-    
+    
+    
+    
   
 
   
-- 
cgit v1.2.3


From d531f72645b72d648d52bd56698a80fcfff38043 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 26 Jan 2012 16:12:34 -0800
Subject: some js for javascript for builder (stil incomplete)

---
 docs/assets/js/application.js          | 89 ++++++++++++++++++----------------
 docs/download.html                     | 12 ++---
 docs/templates/pages/download.mustache | 12 ++---
 3 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 84227f555..898a49d9a 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -76,46 +76,7 @@ $(function(){
     }
   }
 
-  // javascript build logic
-
-  var inputs = $("#javascript input")
-
-  // toggle all plugin checkboxes
-  $('#selectAll').on('click', function (e) {
-    e.preventDefault()
-    inputs.attr('checked', !inputs.is(':checked'))
-  })
-
-  // handle build button dropdown
-  var buildTypes = $('#javascriptBuilder .dropdown-menu li').on('click', function () {
-    buildTypes.removeClass('active')
-    $(this).addClass('active')
-  })
-
-  // request built javascript
-  $('#javascriptBuild').on('click', function () {
-
-    var names = $("#javascript input:checked")
-      .map(function () { return this.value })
-      .toArray()
-
-    if (names[names.length - 1] == 'bootstrap-transition.js') {
-      names.unshift(names.pop())
-    }
-
-    $.ajax({
-      type: 'POST'
-    , dataType: 'jsonpi'
-    , params: {
-        branch: '2.0-wip'
-      , dir: 'js'
-      , filenames: names
-      , compress: buildTypes.first().hasClass('active')
-      }
-    , url: "http://bootstrap.herokuapp.com"
-    })
-  })
-
+ 
   // fix sub nav playa
   var $win = $(window)
     , $nav = $('.subnav')
@@ -201,4 +162,50 @@ $(function () {
       }
     }
   })
-}(jQuery);
\ No newline at end of file
+}(jQuery);
+
+ // javascript build logic
+
+$(function () {
+
+  var inputsComponent = $("#components.download input")
+    , inputsPlugin = $("#plugins.download input")
+
+  // toggle all plugin checkboxes
+  $('#components.download .toggle-all').on('click', function (e) {
+    e.preventDefault()
+    inputsComponent.attr('checked', !inputsComponent.is(':checked'))
+  })
+
+  $('#plugins.download .toggle-all').on('click', function (e) {
+    e.preventDefault()
+    inputsPlugin.attr('checked', !inputsPlugin.is(':checked'))
+  })
+
+  // request built javascript
+  $('.download-btn').on('click', function () {
+
+    var comp = $("#components.download input:checked")
+          .map(function () { return this.value })
+          .toArray()
+      , plug = $("#plugins.download input:checked")
+          .map(function () { return this.value })
+          .toArray()
+
+    
+
+    $.ajax({
+      type: 'POST'
+    , dataType: 'jsonpi'
+    , params: {
+        branch: '2.0-wip'
+      , dir: 'js'
+      , filenames: names
+      , compress: buildTypes.first().hasClass('active')
+      }
+    , url: "http://bootstrap.herokuapp.com"
+    })
+  })
+
+})
+
diff --git a/docs/download.html b/docs/download.html
index 89077d247..afc189fb3 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -230,6 +230,10 @@
   
          
   
          
     
          
+      
       
+    
          
+    
          
       
-    
          
-    
          
       
-      
     
          
     
          
       
          Heads up!
          
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 673bed912..037690e73 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -165,6 +165,10 @@
   
          
   
          
     
          
+      
       
+    
          
+    
          
       
-    
          
-    
          
       
-      
     
          
     
          
       
          Heads up!
          
-- 
cgit v1.2.3


From af96da6e895974dd4bd6fb19cf0c6d7e16bf050d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 16:27:37 -0800
Subject: adding white sprites

---
 bootstrap.css                                        |   5 ++++-
 bootstrap.min.css                                    |   1 +
 .../assets/img/glyphicons-halflings-sprite-white.png | Bin 0 -> 13566 bytes
 docs/assets/img/glyphicons-halflings-sprite.png      | Bin 5249 -> 14152 bytes
 docs/base-css.html                                   |   2 +-
 docs/templates/pages/base-css.mustache               |   2 +-
 lib/sprites.less                                     |   3 +++
 7 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 docs/assets/img/glyphicons-halflings-sprite-white.png

diff --git a/bootstrap.css b/bootstrap.css
index cc5d7f019..cadc4d243 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 15:39:24 PST 2012
+ * Date: Thu Jan 26 16:26:33 PST 2012
  */
 article,
 aside,
@@ -1074,6 +1074,9 @@ table .span12 {
   width: 14px;
   height: 14px;
 }
+.icon.white {
+  background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
+}
 .glass {
   background-position: 0      0;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 1e41bf911..cf78031f2 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -208,6 +208,7 @@ table .span10{float:none;width:764px;margin-left:0;}
 table .span11{float:none;width:844px;margin-left:0;}
 table .span12{float:none;width:924px;margin-left:0;}
 .icon{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
+.icon.white{background-image:url(docs/assets/img/glyphicons-halflings-sprite-white.png);}
 .glass{background-position:0 0;}
 .music{background-position:-24px 0;}
 .search{background-position:-48px 0;}
diff --git a/docs/assets/img/glyphicons-halflings-sprite-white.png b/docs/assets/img/glyphicons-halflings-sprite-white.png
new file mode 100644
index 000000000..a92b1913a
Binary files /dev/null and b/docs/assets/img/glyphicons-halflings-sprite-white.png differ
diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png
index 2d783eefe..b4e0acfbc 100644
Binary files a/docs/assets/img/glyphicons-halflings-sprite.png and b/docs/assets/img/glyphicons-halflings-sprite.png differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 239b963c4..a30e0c1f3 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1482,7 +1482,7 @@
       
          Or, use them in navigation.
          
       
          
         
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 6f928dfa3..c3d10eb08 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1417,7 +1417,7 @@
       
          {{_i}}Or, use them in navigation.{{/i}}
          
       
          
         
diff --git a/lib/sprites.less b/lib/sprites.less
index 0d51125c2..c85d63e8f 100644
--- a/lib/sprites.less
+++ b/lib/sprites.less
@@ -20,6 +20,9 @@
   width: 14px;
   height: 14px;
 }
+.icon.white {
+  background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
+}
 
 .glass              { background-position: 0      0; }
 .music              { background-position: -24px  0; }
-- 
cgit v1.2.3


From 12484a7471513f38be02e8420db3b09842968562 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 26 Jan 2012 16:41:28 -0800
Subject: more builder crap

---
 docs/assets/js/application.js          | 21 +++++++----
 docs/download.html                     | 68 +++++++++++++++++-----------------
 docs/templates/pages/download.mustache | 68 +++++++++++++++++-----------------
 3 files changed, 81 insertions(+), 76 deletions(-)

diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 898a49d9a..de2382b2e 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -185,25 +185,30 @@ $(function () {
   // request built javascript
   $('.download-btn').on('click', function () {
 
-    var comp = $("#components.download input:checked")
+    var css = $("#components.download input:checked")
           .map(function () { return this.value })
           .toArray()
-      , plug = $("#plugins.download input:checked")
+      , js = $("#plugins.download input:checked")
           .map(function () { return this.value })
           .toArray()
+      , vars = {}
 
-    
+    $("#variables.download input")
+      .each(function () {
+        return $(this).val() 
+      })
 
     $.ajax({
       type: 'POST'
+    , url: 'localhost:3000'
+   // , url: "http://bootstrap.herokuapp.com"
     , dataType: 'jsonpi'
     , params: {
         branch: '2.0-wip'
-      , dir: 'js'
-      , filenames: names
-      , compress: buildTypes.first().hasClass('active')
-      }
-    , url: "http://bootstrap.herokuapp.com"
+      , js: js
+      , css: css
+      , vars: vars
+    }
     })
   })
 
diff --git a/docs/download.html b/docs/download.html
index a81f31ceb..5b2b716d7 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -93,51 +93,51 @@
   
          
     
          
       
          Scaffolding
          
-      
-      
-      
+      
+      
+      
       
          Base CSS
          
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
     
          
     
          
       
          Components
          
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
     
          
     
          
       
          JS Components
          
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
     
          
     
          
       
          Miscellaneous
          
-      
-      
-      
-      
+      
+      
+      
+      
       
          Responsive
          
-      
-      
-      
+      
+      
+      
     
          
   
          
 
          
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 037690e73..4707e60a9 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -28,51 +28,51 @@
   
          
     
          
       
          Scaffolding
          
-      
-      
-      
+      
+      
+      
       
          Base CSS
          
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
     
          
     
          
       
          Components
          
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
     
          
     
          
       
          JS Components
          
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
     
          
     
          
       
          Miscellaneous
          
-      
-      
-      
-      
+      
+      
+      
+      
       
          Responsive
          
-      
-      
-      
+      
+      
+      
     
          
   
          
 
          
-- 
cgit v1.2.3


From c8d2c4e44297d52339216f7e6664d9105ff554a1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 16:45:01 -0800
Subject: fix height of download button

---
 docs/assets/css/docs.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 2ef413906..6fa20cf4d 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -538,6 +538,7 @@ hr.soften {
   padding: 19px 24px;
   margin-bottom: 27px;
   font-size: 30px;
+  line-height: 1;
   text-align: center;
   -webkit-border-radius: 6px;
      -moz-border-radius: 6px;
-- 
cgit v1.2.3


From 6886022fe6c35d151888ae4a57e91e9e34da3f5d Mon Sep 17 00:00:00 2001
From: Marco Wise 
Date: Thu, 26 Jan 2012 18:10:36 -0800
Subject: fix typo in docs/scaffolding.html

---
 docs/scaffolding.html                     | 2 +-
 docs/templates/pages/scaffolding.mustache | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 11f3b4486..df6ea9f00 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -357,7 +357,7 @@
     
          
       
          Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:
          
       
            
-        
          1. Use the compiled responsive version, bootstrap-reponsive.css
            2. 
+        
          2. Use the compiled responsive version, bootstrap-responsive.css
            3. 
         
          3. Add @import "responsive.less" and recompile Bootstrap
            4. 
         
          4. Modify and recompile responsive.less as a separate
            5. 
       
          
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index bc924e3ef..7781e86f6 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -292,7 +292,7 @@
     
          
       
          {{_i}}Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:{{/i}}
          
       
            
-        
          1. {{_i}}Use the compiled responsive version, bootstrap-reponsive.css{{/i}}
            2. 
+        
          2. {{_i}}Use the compiled responsive version, bootstrap-responsive.css{{/i}}
            3. 
         
          3. {{_i}}Add @import "responsive.less" and recompile Bootstrap{{/i}}
            4. 
         
          4. {{_i}}Modify and recompile responsive.less as a separate{{/i}}
            5. 
       
          
@@ -314,4 +314,4 @@
 
     
          
   
          
-
\ No newline at end of file
+
-- 
cgit v1.2.3


From a4a8ea2328f163fad43f250f6b3311fe0b670946 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 19:09:59 -0800
Subject: flip order of content on home page

---
 docs/index.html                     | 46 ++++++++++++++++++-------------------
 docs/templates/pages/index.mustache | 46 ++++++++++++++++++-------------------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index d7a870e8d..e60e9d711 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -114,28 +114,6 @@
         
          
 
         
          
-          
          Built with Bootstrap.
          
-          
          For even more sites built with Bootstrap, visit the unofficial Tumblr or browse the examples.
          
-          
-
-        
          
-
           
          Designed for everyone, everywhere.
          
           
          Need reasons to love Bootstrap? Look no further.
          
           
          
@@ -212,7 +190,29 @@
             
          
           
          
 
-        
          
+          
          
+
+          
          Built with Bootstrap.
          
+          
          For even more sites built with Bootstrap, visit the unofficial Tumblr or browse the examples.
          
+          
+
+          
          
 
           
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index b045cc579..9a5421bd3 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -49,28 +49,6 @@
         
          
 
         
          
-          
          {{_i}}Built with Bootstrap.{{/i}}
          
-          
          {{_i}}For even more sites built with Bootstrap, visit the unofficial Tumblr or browse the examples.{{/i}}
          
-          
-
-        
          
-
           
          {{_i}}Designed for everyone, everywhere.{{/i}}
          
           
          {{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}
          
           
          
@@ -147,7 +125,29 @@
             
          
           
          
 
-        
          
+          
          
+
+          
          {{_i}}Built with Bootstrap.{{/i}}
          
+          
          {{_i}}For even more sites built with Bootstrap, visit the unofficial Tumblr or browse the examples.{{/i}}
          
+          
+
+          
          
 
           
-- 
cgit v1.2.3


From 7a3d04d5bed9b9ddf5a3c78466b7115a0260b75e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 26 Jan 2012 19:10:09 -0800
Subject: scope icons to .icon

---
 bootstrap.css     | 182 +++++++++++++++++++++++++++---------------------------
 bootstrap.min.css | 180 ++++++++++++++++++++++++++---------------------------
 lib/sprites.less  | 180 ++++++++++++++++++++++++++---------------------------
 3 files changed, 271 insertions(+), 271 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 086537f5f..c7d457d6e 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 16:30:52 PST 2012
+ * Date: Thu Jan 26 19:09:35 PST 2012
  */
 article,
 aside,
@@ -1077,274 +1077,274 @@ table .span12 {
 .icon.white {
   background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
 }
-.glass {
+.icon.glass {
   background-position: 0      0;
 }
-.music {
+.icon.music {
   background-position: -24px 0;
 }
-.search {
+.icon.search {
   background-position: -48px 0;
 }
-.envelope {
+.icon.envelope {
   background-position: -72px 0;
 }
-.heart {
+.icon.heart {
   background-position: -96px 0;
 }
-.star {
+.icon.star {
   background-position: -120px 0;
 }
-.star-empty {
+.icon.star-empty {
   background-position: -144px 0;
 }
-.user {
+.icon.user {
   background-position: -168px 0;
 }
-.film {
+.icon.film {
   background-position: -192px 0;
 }
-.th-large {
+.icon.th-large {
   background-position: -216px 0;
 }
-.th {
+.icon.th {
   background-position: -240px 0;
 }
-.th-list {
+.icon.th-list {
   background-position: -264px 0;
 }
-.ok {
+.icon.ok {
   background-position: -288px 0;
 }
-.remove {
+.icon.remove {
   background-position: -312px 0;
 }
-.zoom-in {
+.icon.zoom-in {
   background-position: -336px 0;
 }
-.zoom-out {
+.icon.zoom-out {
   background-position: -360px 0;
 }
-.off {
+.icon.off {
   background-position: -384px 0;
 }
-.signal {
+.icon.signal {
   background-position: -408px 0;
 }
-.cog {
+.icon.cog {
   background-position: -432px 0;
 }
-.trash {
+.icon.trash {
   background-position: -456px 0;
 }
-.home {
+.icon.home {
   background-position: 0 -24px;
 }
-.file {
+.icon.file {
   background-position: -24px -24px;
 }
-.time {
+.icon.time {
   background-position: -48px -24px;
 }
-.road {
+.icon.road {
   background-position: -72px -24px;
 }
-.download-alt {
+.icon.download-alt {
   background-position: -96px -24px;
 }
-.download {
+.icon.download {
   background-position: -120px -24px;
 }
-.upload {
+.icon.upload {
   background-position: -144px -24px;
 }
-.inbox {
+.icon.inbox {
   background-position: -168px -24px;
 }
-.play-circle {
+.icon.play-circle {
   background-position: -192px -24px;
 }
-.repeat {
+.icon.repeat {
   background-position: -216px -24px;
 }
-.refresh {
+.icon.refresh {
   background-position: -240px -24px;
 }
-.calendar {
+.icon.calendar {
   background-position: -264px -24px;
 }
-.lock {
+.icon.lock {
   background-position: -288px -24px;
 }
-.flag {
+.icon.flag {
   background-position: -312px -24px;
 }
-.headphones {
+.icon.headphones {
   background-position: -336px -24px;
 }
-.volume-off {
+.icon.volume-off {
   background-position: -360px -24px;
 }
-.volume-down {
+.icon.volume-down {
   background-position: -384px -24px;
 }
-.volume-up {
+.icon.volume-up {
   background-position: -408px -24px;
 }
-.qrcode {
+.icon.qrcode {
   background-position: -432px -24px;
 }
-.barcode {
+.icon.barcode {
   background-position: -456px -24px;
 }
-.tag {
+.icon.tag {
   background-position: 0 -48px;
 }
-.tags {
+.icon.tags {
   background-position: -24px -48px;
 }
-.book {
+.icon.book {
   background-position: -48px -48px;
 }
-.bookmark {
+.icon.bookmark {
   background-position: -72px -48px;
 }
-.print {
+.icon.print {
   background-position: -96px -48px;
 }
-.camera {
+.icon.camera {
   background-position: -120px -48px;
 }
-.font {
+.icon.font {
   background-position: -144px -48px;
 }
-.bold {
+.icon.bold {
   background-position: -168px -48px;
 }
-.italic {
+.icon.italic {
   background-position: -192px -48px;
 }
-.text-height {
+.icon.text-height {
   background-position: -216px -48px;
 }
-.text-width {
+.icon.text-width {
   background-position: -240px -48px;
 }
-.align-left {
+.icon.align-left {
   background-position: -264px -48px;
 }
-.align-center {
+.icon.align-center {
   background-position: -288px -48px;
 }
-.align-right {
+.icon.align-right {
   background-position: -312px -48px;
 }
-.align-justify {
+.icon.align-justify {
   background-position: -336px -48px;
 }
-.list {
+.icon.list {
   background-position: -360px -48px;
 }
-.indent-left {
+.icon.indent-left {
   background-position: -384px -48px;
 }
-.indent-right {
+.icon.indent-right {
   background-position: -408px -48px;
 }
-.facetime-video {
+.icon.facetime-video {
   background-position: -432px -48px;
 }
-.picture {
+.icon.picture {
   background-position: -456px -48px;
 }
-.pencil {
+.icon.pencil {
   background-position: 0 -72px;
 }
-.map-marker {
+.icon.map-marker {
   background-position: -24px -72px;
 }
-.adjust {
+.icon.adjust {
   background-position: -48px -72px;
 }
-.tint {
+.icon.tint {
   background-position: -72px -72px;
 }
-.edit {
+.icon.edit {
   background-position: -96px -72px;
 }
-.share {
+.icon.share {
   background-position: -120px -72px;
 }
-.check {
+.icon.check {
   background-position: -144px -72px;
 }
-.move {
+.icon.move {
   background-position: -168px -72px;
 }
-.step-backward {
+.icon.step-backward {
   background-position: -192px -72px;
 }
-.fast-backward {
+.icon.fast-backward {
   background-position: -216px -72px;
 }
-.backward {
+.icon.backward {
   background-position: -240px -72px;
 }
-.play {
+.icon.play {
   background-position: -264px -72px;
 }
-.pause {
+.icon.pause {
   background-position: -288px -72px;
 }
-.stop {
+.icon.stop {
   background-position: -312px -72px;
 }
-.forward {
+.icon.forward {
   background-position: -336px -72px;
 }
-.fast-forward {
+.icon.fast-forward {
   background-position: -360px -72px;
 }
-.step-forward {
+.icon.step-forward {
   background-position: -384px -72px;
 }
-.eject {
+.icon.eject {
   background-position: -408px -72px;
 }
-.chevron-left {
+.icon.chevron-left {
   background-position: -432px -72px;
 }
-.chevron-right {
+.icon.chevron-right {
   background-position: -456px -72px;
 }
-.arrow-left {
+.icon.arrow-left {
   background-position: -240px -96px;
 }
-.arrow-right {
+.icon.arrow-right {
   background-position: -264px -96px;
 }
-.arrow-up {
+.icon.arrow-up {
   background-position: -288px -96px;
 }
-.arrow-down {
+.icon.arrow-down {
   background-position: -312px -96px;
 }
-.share-alt {
+.icon.share-alt {
   background-position: -336px -96px;
 }
-.resize-full {
+.icon.resize-full {
   background-position: -360px -96px;
 }
-.resize-small {
+.icon.resize-small {
   background-position: -384px -96px;
 }
-.plus {
+.icon.plus {
   background-position: -408px -96px;
 }
-.minus {
+.icon.minus {
   background-position: -432px -96px;
 }
-.asterisk {
+.icon.asterisk {
   background-position: -456px -96px;
 }
 .dropdown {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 55ee17624..846a935b8 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -209,96 +209,96 @@ table .span11{float:none;width:844px;margin-left:0;}
 table .span12{float:none;width:924px;margin-left:0;}
 .icon{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
 .icon.white{background-image:url(docs/assets/img/glyphicons-halflings-sprite-white.png);}
-.glass{background-position:0 0;}
-.music{background-position:-24px 0;}
-.search{background-position:-48px 0;}
-.envelope{background-position:-72px 0;}
-.heart{background-position:-96px 0;}
-.star{background-position:-120px 0;}
-.star-empty{background-position:-144px 0;}
-.user{background-position:-168px 0;}
-.film{background-position:-192px 0;}
-.th-large{background-position:-216px 0;}
-.th{background-position:-240px 0;}
-.th-list{background-position:-264px 0;}
-.ok{background-position:-288px 0;}
-.remove{background-position:-312px 0;}
-.zoom-in{background-position:-336px 0;}
-.zoom-out{background-position:-360px 0;}
-.off{background-position:-384px 0;}
-.signal{background-position:-408px 0;}
-.cog{background-position:-432px 0;}
-.trash{background-position:-456px 0;}
-.home{background-position:0 -24px;}
-.file{background-position:-24px -24px;}
-.time{background-position:-48px -24px;}
-.road{background-position:-72px -24px;}
-.download-alt{background-position:-96px -24px;}
-.download{background-position:-120px -24px;}
-.upload{background-position:-144px -24px;}
-.inbox{background-position:-168px -24px;}
-.play-circle{background-position:-192px -24px;}
-.repeat{background-position:-216px -24px;}
-.refresh{background-position:-240px -24px;}
-.calendar{background-position:-264px -24px;}
-.lock{background-position:-288px -24px;}
-.flag{background-position:-312px -24px;}
-.headphones{background-position:-336px -24px;}
-.volume-off{background-position:-360px -24px;}
-.volume-down{background-position:-384px -24px;}
-.volume-up{background-position:-408px -24px;}
-.qrcode{background-position:-432px -24px;}
-.barcode{background-position:-456px -24px;}
-.tag{background-position:0 -48px;}
-.tags{background-position:-24px -48px;}
-.book{background-position:-48px -48px;}
-.bookmark{background-position:-72px -48px;}
-.print{background-position:-96px -48px;}
-.camera{background-position:-120px -48px;}
-.font{background-position:-144px -48px;}
-.bold{background-position:-168px -48px;}
-.italic{background-position:-192px -48px;}
-.text-height{background-position:-216px -48px;}
-.text-width{background-position:-240px -48px;}
-.align-left{background-position:-264px -48px;}
-.align-center{background-position:-288px -48px;}
-.align-right{background-position:-312px -48px;}
-.align-justify{background-position:-336px -48px;}
-.list{background-position:-360px -48px;}
-.indent-left{background-position:-384px -48px;}
-.indent-right{background-position:-408px -48px;}
-.facetime-video{background-position:-432px -48px;}
-.picture{background-position:-456px -48px;}
-.pencil{background-position:0 -72px;}
-.map-marker{background-position:-24px -72px;}
-.adjust{background-position:-48px -72px;}
-.tint{background-position:-72px -72px;}
-.edit{background-position:-96px -72px;}
-.share{background-position:-120px -72px;}
-.check{background-position:-144px -72px;}
-.move{background-position:-168px -72px;}
-.step-backward{background-position:-192px -72px;}
-.fast-backward{background-position:-216px -72px;}
-.backward{background-position:-240px -72px;}
-.play{background-position:-264px -72px;}
-.pause{background-position:-288px -72px;}
-.stop{background-position:-312px -72px;}
-.forward{background-position:-336px -72px;}
-.fast-forward{background-position:-360px -72px;}
-.step-forward{background-position:-384px -72px;}
-.eject{background-position:-408px -72px;}
-.chevron-left{background-position:-432px -72px;}
-.chevron-right{background-position:-456px -72px;}
-.arrow-left{background-position:-240px -96px;}
-.arrow-right{background-position:-264px -96px;}
-.arrow-up{background-position:-288px -96px;}
-.arrow-down{background-position:-312px -96px;}
-.share-alt{background-position:-336px -96px;}
-.resize-full{background-position:-360px -96px;}
-.resize-small{background-position:-384px -96px;}
-.plus{background-position:-408px -96px;}
-.minus{background-position:-432px -96px;}
-.asterisk{background-position:-456px -96px;}
+.icon.glass{background-position:0 0;}
+.icon.music{background-position:-24px 0;}
+.icon.search{background-position:-48px 0;}
+.icon.envelope{background-position:-72px 0;}
+.icon.heart{background-position:-96px 0;}
+.icon.star{background-position:-120px 0;}
+.icon.star-empty{background-position:-144px 0;}
+.icon.user{background-position:-168px 0;}
+.icon.film{background-position:-192px 0;}
+.icon.th-large{background-position:-216px 0;}
+.icon.th{background-position:-240px 0;}
+.icon.th-list{background-position:-264px 0;}
+.icon.ok{background-position:-288px 0;}
+.icon.remove{background-position:-312px 0;}
+.icon.zoom-in{background-position:-336px 0;}
+.icon.zoom-out{background-position:-360px 0;}
+.icon.off{background-position:-384px 0;}
+.icon.signal{background-position:-408px 0;}
+.icon.cog{background-position:-432px 0;}
+.icon.trash{background-position:-456px 0;}
+.icon.home{background-position:0 -24px;}
+.icon.file{background-position:-24px -24px;}
+.icon.time{background-position:-48px -24px;}
+.icon.road{background-position:-72px -24px;}
+.icon.download-alt{background-position:-96px -24px;}
+.icon.download{background-position:-120px -24px;}
+.icon.upload{background-position:-144px -24px;}
+.icon.inbox{background-position:-168px -24px;}
+.icon.play-circle{background-position:-192px -24px;}
+.icon.repeat{background-position:-216px -24px;}
+.icon.refresh{background-position:-240px -24px;}
+.icon.calendar{background-position:-264px -24px;}
+.icon.lock{background-position:-288px -24px;}
+.icon.flag{background-position:-312px -24px;}
+.icon.headphones{background-position:-336px -24px;}
+.icon.volume-off{background-position:-360px -24px;}
+.icon.volume-down{background-position:-384px -24px;}
+.icon.volume-up{background-position:-408px -24px;}
+.icon.qrcode{background-position:-432px -24px;}
+.icon.barcode{background-position:-456px -24px;}
+.icon.tag{background-position:0 -48px;}
+.icon.tags{background-position:-24px -48px;}
+.icon.book{background-position:-48px -48px;}
+.icon.bookmark{background-position:-72px -48px;}
+.icon.print{background-position:-96px -48px;}
+.icon.camera{background-position:-120px -48px;}
+.icon.font{background-position:-144px -48px;}
+.icon.bold{background-position:-168px -48px;}
+.icon.italic{background-position:-192px -48px;}
+.icon.text-height{background-position:-216px -48px;}
+.icon.text-width{background-position:-240px -48px;}
+.icon.align-left{background-position:-264px -48px;}
+.icon.align-center{background-position:-288px -48px;}
+.icon.align-right{background-position:-312px -48px;}
+.icon.align-justify{background-position:-336px -48px;}
+.icon.list{background-position:-360px -48px;}
+.icon.indent-left{background-position:-384px -48px;}
+.icon.indent-right{background-position:-408px -48px;}
+.icon.facetime-video{background-position:-432px -48px;}
+.icon.picture{background-position:-456px -48px;}
+.icon.pencil{background-position:0 -72px;}
+.icon.map-marker{background-position:-24px -72px;}
+.icon.adjust{background-position:-48px -72px;}
+.icon.tint{background-position:-72px -72px;}
+.icon.edit{background-position:-96px -72px;}
+.icon.share{background-position:-120px -72px;}
+.icon.check{background-position:-144px -72px;}
+.icon.move{background-position:-168px -72px;}
+.icon.step-backward{background-position:-192px -72px;}
+.icon.fast-backward{background-position:-216px -72px;}
+.icon.backward{background-position:-240px -72px;}
+.icon.play{background-position:-264px -72px;}
+.icon.pause{background-position:-288px -72px;}
+.icon.stop{background-position:-312px -72px;}
+.icon.forward{background-position:-336px -72px;}
+.icon.fast-forward{background-position:-360px -72px;}
+.icon.step-forward{background-position:-384px -72px;}
+.icon.eject{background-position:-408px -72px;}
+.icon.chevron-left{background-position:-432px -72px;}
+.icon.chevron-right{background-position:-456px -72px;}
+.icon.arrow-left{background-position:-240px -96px;}
+.icon.arrow-right{background-position:-264px -96px;}
+.icon.arrow-up{background-position:-288px -96px;}
+.icon.arrow-down{background-position:-312px -96px;}
+.icon.share-alt{background-position:-336px -96px;}
+.icon.resize-full{background-position:-360px -96px;}
+.icon.resize-small{background-position:-384px -96px;}
+.icon.plus{background-position:-408px -96px;}
+.icon.minus{background-position:-432px -96px;}
+.icon.asterisk{background-position:-456px -96px;}
 .dropdown{position:relative;}
 .caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";}
 .dropdown .caret{margin-top:8px;margin-left:2px;*margin-top:7px;}
diff --git a/lib/sprites.less b/lib/sprites.less
index c85d63e8f..ef9295288 100644
--- a/lib/sprites.less
+++ b/lib/sprites.less
@@ -24,98 +24,98 @@
   background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
 }
 
-.glass              { background-position: 0      0; }
-.music              { background-position: -24px  0; }
-.search             { background-position: -48px  0; }
-.envelope           { background-position: -72px  0; }
-.heart              { background-position: -96px  0; }
-.star               { background-position: -120px 0; }
-.star-empty         { background-position: -144px 0; }
-.user               { background-position: -168px 0; }
-.film               { background-position: -192px 0; }
-.th-large           { background-position: -216px 0; }
-.th                 { background-position: -240px 0; }
-.th-list            { background-position: -264px 0; }
-.ok                 { background-position: -288px 0; }
-.remove             { background-position: -312px 0; }
-.zoom-in            { background-position: -336px 0; }
-.zoom-out           { background-position: -360px 0; }
-.off                { background-position: -384px 0; }
-.signal             { background-position: -408px 0; }
-.cog                { background-position: -432px 0; }
-.trash              { background-position: -456px 0; }
+.icon.glass              { background-position: 0      0; }
+.icon.music              { background-position: -24px  0; }
+.icon.search             { background-position: -48px  0; }
+.icon.envelope           { background-position: -72px  0; }
+.icon.heart              { background-position: -96px  0; }
+.icon.star               { background-position: -120px 0; }
+.icon.star-empty         { background-position: -144px 0; }
+.icon.user               { background-position: -168px 0; }
+.icon.film               { background-position: -192px 0; }
+.icon.th-large           { background-position: -216px 0; }
+.icon.th                 { background-position: -240px 0; }
+.icon.th-list            { background-position: -264px 0; }
+.icon.ok                 { background-position: -288px 0; }
+.icon.remove             { background-position: -312px 0; }
+.icon.zoom-in            { background-position: -336px 0; }
+.icon.zoom-out           { background-position: -360px 0; }
+.icon.off                { background-position: -384px 0; }
+.icon.signal             { background-position: -408px 0; }
+.icon.cog                { background-position: -432px 0; }
+.icon.trash              { background-position: -456px 0; }
 
-.home               { background-position: 0      -24px; }
-.file               { background-position: -24px  -24px; }
-.time               { background-position: -48px  -24px; }
-.road               { background-position: -72px  -24px; }
-.download-alt       { background-position: -96px  -24px; }
-.download           { background-position: -120px -24px; }
-.upload             { background-position: -144px -24px; }
-.inbox              { background-position: -168px -24px; }
-.play-circle        { background-position: -192px -24px; }
-.repeat             { background-position: -216px -24px; }
-.refresh            { background-position: -240px -24px; }
-.calendar           { background-position: -264px -24px; }
-.lock               { background-position: -288px -24px; }
-.flag               { background-position: -312px -24px; }
-.headphones         { background-position: -336px -24px; }
-.volume-off         { background-position: -360px -24px; }
-.volume-down        { background-position: -384px -24px; }
-.volume-up          { background-position: -408px -24px; }
-.qrcode             { background-position: -432px -24px; }
-.barcode            { background-position: -456px -24px; }
+.icon.home               { background-position: 0      -24px; }
+.icon.file               { background-position: -24px  -24px; }
+.icon.time               { background-position: -48px  -24px; }
+.icon.road               { background-position: -72px  -24px; }
+.icon.download-alt       { background-position: -96px  -24px; }
+.icon.download           { background-position: -120px -24px; }
+.icon.upload             { background-position: -144px -24px; }
+.icon.inbox              { background-position: -168px -24px; }
+.icon.play-circle        { background-position: -192px -24px; }
+.icon.repeat             { background-position: -216px -24px; }
+.icon.refresh            { background-position: -240px -24px; }
+.icon.calendar           { background-position: -264px -24px; }
+.icon.lock               { background-position: -288px -24px; }
+.icon.flag               { background-position: -312px -24px; }
+.icon.headphones         { background-position: -336px -24px; }
+.icon.volume-off         { background-position: -360px -24px; }
+.icon.volume-down        { background-position: -384px -24px; }
+.icon.volume-up          { background-position: -408px -24px; }
+.icon.qrcode             { background-position: -432px -24px; }
+.icon.barcode            { background-position: -456px -24px; }
 
-.tag                { background-position: 0      -48px; }
-.tags               { background-position: -24px  -48px; }
-.book               { background-position: -48px  -48px; }
-.bookmark           { background-position: -72px  -48px; }
-.print              { background-position: -96px  -48px; }
-.camera             { background-position: -120px -48px; }
-.font               { background-position: -144px -48px; }
-.bold               { background-position: -168px -48px; }
-.italic             { background-position: -192px -48px; }
-.text-height        { background-position: -216px -48px; }
-.text-width         { background-position: -240px -48px; }
-.align-left         { background-position: -264px -48px; }
-.align-center       { background-position: -288px -48px; }
-.align-right        { background-position: -312px -48px; }
-.align-justify      { background-position: -336px -48px; }
-.list               { background-position: -360px -48px; }
-.indent-left        { background-position: -384px -48px; }
-.indent-right       { background-position: -408px -48px; }
-.facetime-video     { background-position: -432px -48px; }
-.picture            { background-position: -456px -48px; }
+.icon.tag                { background-position: 0      -48px; }
+.icon.tags               { background-position: -24px  -48px; }
+.icon.book               { background-position: -48px  -48px; }
+.icon.bookmark           { background-position: -72px  -48px; }
+.icon.print              { background-position: -96px  -48px; }
+.icon.camera             { background-position: -120px -48px; }
+.icon.font               { background-position: -144px -48px; }
+.icon.bold               { background-position: -168px -48px; }
+.icon.italic             { background-position: -192px -48px; }
+.icon.text-height        { background-position: -216px -48px; }
+.icon.text-width         { background-position: -240px -48px; }
+.icon.align-left         { background-position: -264px -48px; }
+.icon.align-center       { background-position: -288px -48px; }
+.icon.align-right        { background-position: -312px -48px; }
+.icon.align-justify      { background-position: -336px -48px; }
+.icon.list               { background-position: -360px -48px; }
+.icon.indent-left        { background-position: -384px -48px; }
+.icon.indent-right       { background-position: -408px -48px; }
+.icon.facetime-video     { background-position: -432px -48px; }
+.icon.picture            { background-position: -456px -48px; }
 
-.pencil             { background-position: 0      -72px; }
-.map-marker         { background-position: -24px  -72px; }
-.adjust             { background-position: -48px  -72px; }
-.tint               { background-position: -72px  -72px; }
-.edit               { background-position: -96px  -72px; }
-.share              { background-position: -120px -72px; }
-.check              { background-position: -144px -72px; }
-.move               { background-position: -168px -72px; }
-.step-backward      { background-position: -192px -72px; }
-.fast-backward      { background-position: -216px -72px; }
-.backward           { background-position: -240px -72px; }
-.play               { background-position: -264px -72px; }
-.pause              { background-position: -288px -72px; }
-.stop               { background-position: -312px -72px; }
-.forward            { background-position: -336px -72px; }
-.fast-forward       { background-position: -360px -72px; }
-.step-forward       { background-position: -384px -72px; }
-.eject              { background-position: -408px -72px; }
-.chevron-left       { background-position: -432px -72px; }
-.chevron-right      { background-position: -456px -72px; }
+.icon.pencil             { background-position: 0      -72px; }
+.icon.map-marker         { background-position: -24px  -72px; }
+.icon.adjust             { background-position: -48px  -72px; }
+.icon.tint               { background-position: -72px  -72px; }
+.icon.edit               { background-position: -96px  -72px; }
+.icon.share              { background-position: -120px -72px; }
+.icon.check              { background-position: -144px -72px; }
+.icon.move               { background-position: -168px -72px; }
+.icon.step-backward      { background-position: -192px -72px; }
+.icon.fast-backward      { background-position: -216px -72px; }
+.icon.backward           { background-position: -240px -72px; }
+.icon.play               { background-position: -264px -72px; }
+.icon.pause              { background-position: -288px -72px; }
+.icon.stop               { background-position: -312px -72px; }
+.icon.forward            { background-position: -336px -72px; }
+.icon.fast-forward       { background-position: -360px -72px; }
+.icon.step-forward       { background-position: -384px -72px; }
+.icon.eject              { background-position: -408px -72px; }
+.icon.chevron-left       { background-position: -432px -72px; }
+.icon.chevron-right      { background-position: -456px -72px; }
 
-.arrow-left         { background-position: -240px -96px; }
-.arrow-right        { background-position: -264px -96px; }
-.arrow-up           { background-position: -288px -96px; }
-.arrow-down         { background-position: -312px -96px; }
-.share-alt          { background-position: -336px -96px; }
-.resize-full        { background-position: -360px -96px; }
-.resize-small       { background-position: -384px -96px; }
-.plus               { background-position: -408px -96px; }
-.minus              { background-position: -432px -96px; }
-.asterisk           { background-position: -456px -96px; }
+.icon.arrow-left         { background-position: -240px -96px; }
+.icon.arrow-right        { background-position: -264px -96px; }
+.icon.arrow-up           { background-position: -288px -96px; }
+.icon.arrow-down         { background-position: -312px -96px; }
+.icon.share-alt          { background-position: -336px -96px; }
+.icon.resize-full        { background-position: -360px -96px; }
+.icon.resize-small       { background-position: -384px -96px; }
+.icon.plus               { background-position: -408px -96px; }
+.icon.minus              { background-position: -432px -96px; }
+.icon.asterisk           { background-position: -456px -96px; }
 
-- 
cgit v1.2.3


From 1e9c2fb9d4a033304b5aa71d269af9f68eb72670 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 26 Jan 2012 20:23:15 -0800
Subject: getting closer....

---
 docs/assets/js/application.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index de2382b2e..2315cdaa8 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -151,12 +151,13 @@ $(function () {
           .attr('target', name)
 
         $.each(opts.params, function(k, v) {
+
           $('')
             .attr('type', 'hidden')
             .attr('name', k)
-            .attr('value', v)
+            .attr('value', typeof v == 'string' ? v : JSON.stringify(v))
             .appendTo(form)
-        });
+        })
 
         form.appendTo('body').submit()
       }
@@ -195,13 +196,13 @@ $(function () {
 
     $("#variables.download input")
       .each(function () {
-        return $(this).val() 
+        return vars[ $(this).prev().text() ] = $(this).val()
       })
 
+// , url: "http://bootstrap.herokuapp.com"
     $.ajax({
       type: 'POST'
-    , url: 'localhost:3000'
-   // , url: "http://bootstrap.herokuapp.com"
+    , url: 'http://localhost:3000'
     , dataType: 'jsonpi'
     , params: {
         branch: '2.0-wip'
-- 
cgit v1.2.3


From dc2deb9a1b1995bbabee91bfd579d9b466fe78f2 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 26 Jan 2012 21:48:46 -0800
Subject: moving structure around + more work on builder...

---
 Makefile                                           |   6 +-
 bootstrap-responsive.min.css                       |   2 +-
 bootstrap.css                                      |   8 +-
 bootstrap.min.css                                  |   6 +-
 .../img/glyphicons-halflings-sprite-white.png      | Bin 13566 -> 0 bytes
 docs/assets/img/glyphicons-halflings-sprite.png    | Bin 14152 -> 0 bytes
 docs/assets/js/application.js                      |  16 +-
 docs/download.html                                 |  74 +--
 docs/scaffolding.html                              |   1 +
 docs/templates/pages/download.mustache             |  74 +--
 img/glyphicons-halflings-sprite-white.png          | Bin 0 -> 13566 bytes
 img/glyphicons-halflings-sprite.png                | Bin 0 -> 14152 bytes
 less/accordion.less                                |  30 ++
 less/alerts.less                                   |  69 +++
 less/bootstrap.less                                |  63 +++
 less/breadcrumbs.less                              |  22 +
 less/button-groups.less                            | 121 +++++
 less/buttons.less                                  | 151 ++++++
 less/carousel.less                                 | 114 +++++
 less/close.less                                    |  18 +
 less/code.less                                     |  44 ++
 less/component-animations.less                     |  18 +
 less/dropdowns.less                                | 110 +++++
 less/forms.less                                    | 514 +++++++++++++++++++++
 less/grid.less                                     |  41 ++
 less/hero-unit.less                                |  20 +
 less/labels.less                                   |  16 +
 less/layouts.less                                  |  43 ++
 less/mixins.less                                   | 360 +++++++++++++++
 less/modals.less                                   |  65 +++
 less/navbar.less                                   | 251 ++++++++++
 less/navs.less                                     | 338 ++++++++++++++
 less/pager.less                                    |  25 +
 less/pagination.less                               |  54 +++
 less/patterns.less                                 |  13 +
 less/popovers.less                                 |  49 ++
 less/print.less                                    |  18 +
 less/progress-bars.less                            |  99 ++++
 less/reset.less                                    | 126 +++++
 less/responsive.less                               | 268 +++++++++++
 less/scaffolding.less                              |  29 ++
 less/sprites.less                                  | 121 +++++
 less/tables.less                                   | 138 ++++++
 less/thumbnails.less                               |  33 ++
 less/tooltip.less                                  |  35 ++
 less/type.less                                     | 206 +++++++++
 less/utilities.less                                |  23 +
 less/variables.less                                |  90 ++++
 less/wells.less                                    |  17 +
 lib/accordion.less                                 |  30 --
 lib/alerts.less                                    |  69 ---
 lib/bootstrap.less                                 |  63 ---
 lib/breadcrumbs.less                               |  22 -
 lib/button-groups.less                             | 121 -----
 lib/buttons.less                                   | 151 ------
 lib/carousel.less                                  | 114 -----
 lib/close.less                                     |  18 -
 lib/code.less                                      |  44 --
 lib/component-animations.less                      |  18 -
 lib/dropdowns.less                                 | 110 -----
 lib/forms.less                                     | 514 ---------------------
 lib/grid.less                                      |  41 --
 lib/hero-unit.less                                 |  20 -
 lib/labels.less                                    |  16 -
 lib/layouts.less                                   |  43 --
 lib/mixins.less                                    | 360 ---------------
 lib/modals.less                                    |  65 ---
 lib/navbar.less                                    | 251 ----------
 lib/navs.less                                      | 338 --------------
 lib/pager.less                                     |  25 -
 lib/pagination.less                                |  54 ---
 lib/patterns.less                                  |  13 -
 lib/popovers.less                                  |  49 --
 lib/print.less                                     |  18 -
 lib/progress-bars.less                             |  99 ----
 lib/reset.less                                     | 126 -----
 lib/responsive.less                                | 268 -----------
 lib/scaffolding.less                               |  29 --
 lib/sprites.less                                   | 121 -----
 lib/tables.less                                    | 138 ------
 lib/thumbnails.less                                |  33 --
 lib/tooltip.less                                   |  35 --
 lib/type.less                                      | 206 ---------
 lib/utilities.less                                 |  23 -
 lib/variables.less                                 |  90 ----
 lib/wells.less                                     |  17 -
 86 files changed, 3850 insertions(+), 3841 deletions(-)
 delete mode 100644 docs/assets/img/glyphicons-halflings-sprite-white.png
 delete mode 100644 docs/assets/img/glyphicons-halflings-sprite.png
 create mode 100644 img/glyphicons-halflings-sprite-white.png
 create mode 100644 img/glyphicons-halflings-sprite.png
 create mode 100644 less/accordion.less
 create mode 100644 less/alerts.less
 create mode 100644 less/bootstrap.less
 create mode 100644 less/breadcrumbs.less
 create mode 100644 less/button-groups.less
 create mode 100644 less/buttons.less
 create mode 100644 less/carousel.less
 create mode 100644 less/close.less
 create mode 100644 less/code.less
 create mode 100644 less/component-animations.less
 create mode 100644 less/dropdowns.less
 create mode 100644 less/forms.less
 create mode 100644 less/grid.less
 create mode 100644 less/hero-unit.less
 create mode 100644 less/labels.less
 create mode 100644 less/layouts.less
 create mode 100644 less/mixins.less
 create mode 100644 less/modals.less
 create mode 100644 less/navbar.less
 create mode 100644 less/navs.less
 create mode 100644 less/pager.less
 create mode 100644 less/pagination.less
 create mode 100644 less/patterns.less
 create mode 100644 less/popovers.less
 create mode 100644 less/print.less
 create mode 100644 less/progress-bars.less
 create mode 100644 less/reset.less
 create mode 100644 less/responsive.less
 create mode 100644 less/scaffolding.less
 create mode 100644 less/sprites.less
 create mode 100644 less/tables.less
 create mode 100644 less/thumbnails.less
 create mode 100644 less/tooltip.less
 create mode 100644 less/type.less
 create mode 100644 less/utilities.less
 create mode 100644 less/variables.less
 create mode 100644 less/wells.less
 delete mode 100644 lib/accordion.less
 delete mode 100644 lib/alerts.less
 delete mode 100644 lib/bootstrap.less
 delete mode 100644 lib/breadcrumbs.less
 delete mode 100644 lib/button-groups.less
 delete mode 100644 lib/buttons.less
 delete mode 100644 lib/carousel.less
 delete mode 100644 lib/close.less
 delete mode 100644 lib/code.less
 delete mode 100644 lib/component-animations.less
 delete mode 100644 lib/dropdowns.less
 delete mode 100644 lib/forms.less
 delete mode 100644 lib/grid.less
 delete mode 100644 lib/hero-unit.less
 delete mode 100644 lib/labels.less
 delete mode 100644 lib/layouts.less
 delete mode 100644 lib/mixins.less
 delete mode 100644 lib/modals.less
 delete mode 100644 lib/navbar.less
 delete mode 100644 lib/navs.less
 delete mode 100644 lib/pager.less
 delete mode 100644 lib/pagination.less
 delete mode 100644 lib/patterns.less
 delete mode 100644 lib/popovers.less
 delete mode 100644 lib/print.less
 delete mode 100644 lib/progress-bars.less
 delete mode 100644 lib/reset.less
 delete mode 100644 lib/responsive.less
 delete mode 100644 lib/scaffolding.less
 delete mode 100644 lib/sprites.less
 delete mode 100644 lib/tables.less
 delete mode 100644 lib/thumbnails.less
 delete mode 100644 lib/tooltip.less
 delete mode 100644 lib/type.less
 delete mode 100644 lib/utilities.less
 delete mode 100644 lib/variables.less
 delete mode 100644 lib/wells.less

diff --git a/Makefile b/Makefile
index 612f77fdf..337baf03f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 VERSION=2.0.0
 BOOTSTRAP = ./bootstrap.css
 BOOTSTRAP_MIN = ./bootstrap.min.css
-BOOTSTRAP_LESS = ./lib/bootstrap.less
+BOOTSTRAP_LESS = ./less/bootstrap.less
 BOOTSTRAP_RESPONSIVE = ./bootstrap-responsive.css
 BOOTSTRAP_RESPONSIVE_MIN = ./bootstrap-responsive.min.css
-BOOTSTRAP_RESPONSIVE_LESS = ./lib/responsive.less
+BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
 LESS_COMPRESSOR ?= `which lessc`
 UGLIFY_JS ?= `which uglifyjs`
 WATCHR ?= `which watchr`
@@ -36,7 +36,7 @@ build:
 watch:
 	@@if test ! -z ${WATCHR}; then \
 	  echo "Watching less files..."; \
-	  watchr -e "watch('lib/.*\.less') { system 'make' }"; \
+	  watchr -e "watch('less/.*\.less') { system 'make' }"; \
 	else \
 		echo "You must have the watchr installed in order to watch Bootstrap Less files."; \
 		echo "You can install it by running: gem install watchr"; \
diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
index 8ed8745bb..dcf17dce9 100644
--- a/bootstrap-responsive.min.css
+++ b/bootstrap-responsive.min.css
@@ -1,3 +1,3 @@
 
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
+@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
diff --git a/bootstrap.css b/bootstrap.css
index c7d457d6e..9d26b41c8 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Thu Jan 26 19:09:35 PST 2012
+ * Date: Thu Jan 26 21:48:03 PST 2012
  */
 article,
 aside,
@@ -1066,7 +1066,7 @@ table .span12 {
   margin-left: 0;
 }
 .icon {
-  background-image: url(docs/assets/img/glyphicons-halflings-sprite.png);
+  background-image: url(img/glyphicons-halflings-sprite.png);
   background-position: 0 0;
   background-repeat: no-repeat;
   display: inline-block;
@@ -1075,7 +1075,7 @@ table .span12 {
   height: 14px;
 }
 .icon.white {
-  background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
+  background-image: url(img/glyphicons-halflings-sprite-white.png);
 }
 .icon.glass {
   background-position: 0      0;
@@ -1831,7 +1831,7 @@ table .span12 {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 846a935b8..e7e5d16be 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -207,8 +207,8 @@ table .span9{float:none;width:684px;margin-left:0;}
 table .span10{float:none;width:764px;margin-left:0;}
 table .span11{float:none;width:844px;margin-left:0;}
 table .span12{float:none;width:924px;margin-left:0;}
-.icon{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
-.icon.white{background-image:url(docs/assets/img/glyphicons-halflings-sprite-white.png);}
+.icon{background-image:url(img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
+.icon.white{background-image:url(img/glyphicons-halflings-sprite-white.png);}
 .icon.glass{background-position:0 0;}
 .icon.music{background-position:-24px 0;}
 .icon.search{background-position:-48px 0;}
@@ -378,7 +378,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
diff --git a/docs/assets/img/glyphicons-halflings-sprite-white.png b/docs/assets/img/glyphicons-halflings-sprite-white.png
deleted file mode 100644
index a92b1913a..000000000
Binary files a/docs/assets/img/glyphicons-halflings-sprite-white.png and /dev/null differ
diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png
deleted file mode 100644
index b4e0acfbc..000000000
Binary files a/docs/assets/img/glyphicons-halflings-sprite.png and /dev/null differ
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 2315cdaa8..8c86ff028 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -171,6 +171,7 @@ $(function () {
 
   var inputsComponent = $("#components.download input")
     , inputsPlugin = $("#plugins.download input")
+    , inputsVariables = $("#variables.download input")
 
   // toggle all plugin checkboxes
   $('#components.download .toggle-all').on('click', function (e) {
@@ -183,6 +184,11 @@ $(function () {
     inputsPlugin.attr('checked', !inputsPlugin.is(':checked'))
   })
 
+  $('#variables.download .toggle-all').on('click', function (e) {
+    e.preventDefault()
+    inputsVariables.val('')
+  })
+
   // request built javascript
   $('.download-btn').on('click', function () {
 
@@ -193,11 +199,12 @@ $(function () {
           .map(function () { return this.value })
           .toArray()
       , vars = {}
+      , img = ['glyphicons-halflings-sprite.png', 'glyphicons-halflings-sprite-white.png']
 
-    $("#variables.download input")
-      .each(function () {
-        return vars[ $(this).prev().text() ] = $(this).val()
-      })
+  $("#variables.download input")
+    .each(function () {
+      $(this).val() && (vars[ $(this).prev().text() ] = $(this).val())
+    })
 
 // , url: "http://bootstrap.herokuapp.com"
     $.ajax({
@@ -209,6 +216,7 @@ $(function () {
       , js: js
       , css: css
       , vars: vars
+      , img: img
     }
     })
   })
diff --git a/docs/download.html b/docs/download.html
index 5b2b716d7..99564576f 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -108,24 +108,24 @@
     
          
       
          Components
          
       
-      
+      
       
       
       
       
-      
+      
       
       
-      
+      
     
          
     
          
       
          JS Components
          
-      
-      
+      
+      
       
       
-      
-      
+      
+      
       
     
          
     
          
@@ -135,9 +135,9 @@
       
       
       
          Responsive
          
-      
-      
-      
+      
+      
+      
     
          
   
        
 
@@ -154,68 +154,68 @@
     
        
       
        Links
        
       
-      
+      
       
-      
+      
       
        Grid system
        
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
     
        
     
        
       
        Typography
        
       
-      
+      
       
-      
+      
       
-      
+      
       
        Forms
        
       
-      
+      
       
-      
+      
       
        Navbar
        
       
-      
+      
       
-      
+      
       
-      
+      
     
        
     
        
       
        Form states & alerts
        
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
     
        
   
      
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index df6ea9f00..02b9721d3 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -381,6 +381,7 @@
   
      
 
 
+
      
       
      
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 4707e60a9..0f997d368 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -43,24 +43,24 @@
     
      
       
      Components
      
       
-      
+      
       
       
       
       
-      
+      
       
       
-      
+      
     
      
     
      
       
      JS Components
      
-      
-      
+      
+      
       
       
-      
-      
+      
+      
       
     
      
     
      
@@ -70,9 +70,9 @@
       
       
       
      Responsive
      
-      
-      
-      
+      
+      
+      
     
      
   
      
 
@@ -89,68 +89,68 @@
     
      
       
      Links
      
       
-      
+      
       
-      
+      
       
      Grid system
      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
     
      
     
      
       
      Typography
      
       
-      
+      
       
-      
+      
       
-      
+      
       
      Forms
      
       
-      
+      
       
-      
+      
       
      Navbar
      
       
-      
+      
       
-      
+      
       
-      
+      
     
      
     
      
       
      Form states & alerts
      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
       
-      
+      
     
      
   
      
 
diff --git a/img/glyphicons-halflings-sprite-white.png b/img/glyphicons-halflings-sprite-white.png
new file mode 100644
index 000000000..a92b1913a
Binary files /dev/null and b/img/glyphicons-halflings-sprite-white.png differ
diff --git a/img/glyphicons-halflings-sprite.png b/img/glyphicons-halflings-sprite.png
new file mode 100644
index 000000000..b4e0acfbc
Binary files /dev/null and b/img/glyphicons-halflings-sprite.png differ
diff --git a/less/accordion.less b/less/accordion.less
new file mode 100644
index 000000000..1ebd5b1a1
--- /dev/null
+++ b/less/accordion.less
@@ -0,0 +1,30 @@
+// ACCORDION
+// ---------
+
+
+// Parent container
+.accordion {
+  margin-bottom: @baseLineHeight;
+}
+
+// Group == heading + body
+.accordion-group {
+  background-color: #f5f5f5;
+  .border-radius(4px);
+}
+.accordion-heading {
+  border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+.accordion-body {
+  margin-bottom: 2px;
+}
+
+// Inner needs the styles because you can't animate properly with any styles on the element
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
diff --git a/less/alerts.less b/less/alerts.less
new file mode 100644
index 000000000..23c17e704
--- /dev/null
+++ b/less/alerts.less
@@ -0,0 +1,69 @@
+// ALERT STYLES
+// ------------
+
+// Base alert styles
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: @baseLineHeight;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+  background-color: @warningBackground;
+  border: 1px solid @warningBorder;
+  .border-radius(4px);
+}
+.alert,
+.alert-heading {
+  color: @warningText;
+}
+
+// Adjust close link position
+.alert .close {
+  position: relative;
+  right: -21px;
+  line-height: 18px;
+}
+
+// Alternate styles
+// ----------------
+
+.alert-success {
+  background-color: @successBackground;
+  border-color: @successBorder;  
+}
+.alert-success,
+.alert-success .alert-heading {
+  color: @successText;
+}
+.alert-danger,
+.alert-error {
+  background-color: @errorBackground;
+  border-color: @errorBorder;
+}
+.alert-danger,
+.alert-error,
+.alert-danger .alert-heading,
+.alert-error .alert-heading {
+  color: @errorText;
+}
+.alert-info {
+  background-color: @infoBackground;
+  border-color: @infoBorder;
+}
+.alert-info,
+.alert-info .alert-heading {
+  color: @infoText;
+}
+
+
+// Block alerts
+// ------------------------
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+.alert-block > p,
+.alert-block > ul {
+  margin-bottom: 0;
+}
+.alert-block p + p {
+  margin-top: 5px;
+}
diff --git a/less/bootstrap.less b/less/bootstrap.less
new file mode 100644
index 000000000..bc9f84373
--- /dev/null
+++ b/less/bootstrap.less
@@ -0,0 +1,63 @@
+/*!
+ * Bootstrap @VERSION
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ * Date: @DATE
+ */
+
+// CSS Reset
+@import "reset.less";
+
+// Core variables and mixins
+@import "variables.less"; // Modify this for custom colors, font-sizes, etc
+@import "mixins.less";
+
+// Grid system and page structure
+@import "scaffolding.less";
+@import "grid.less";
+@import "layouts.less";
+
+// Base CSS
+@import "type.less";
+@import "code.less";
+@import "forms.less";
+@import "tables.less";
+
+// Components: common
+@import "sprites.less";
+@import "dropdowns.less";
+@import "wells.less";
+@import "component-animations.less";
+@import "close.less";
+
+// Components: Nav
+@import "navs.less";
+@import "navbar.less";
+@import "breadcrumbs.less";
+@import "pagination.less";
+@import "pager.less";
+
+// Components: Popovers
+@import "modals.less";
+@import "tooltip.less";
+@import "popovers.less";
+
+// Components: Buttons & Alerts
+@import "buttons.less";
+@import "button-groups.less";
+@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
+// Components: Misc
+@import "thumbnails.less";
+@import "labels.less";
+@import "progress-bars.less";
+@import "accordion.less";
+@import "carousel.less";
+@import "hero-unit.less";
+
+// Utility classes
+@import "utilities.less"; // Has to be last to override when necessary
diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less
new file mode 100644
index 000000000..19b8081e1
--- /dev/null
+++ b/less/breadcrumbs.less
@@ -0,0 +1,22 @@
+// BREADCRUMBS
+// -----------
+
+.breadcrumb {
+  padding: 7px 14px;
+  margin: 0 0 @baseLineHeight;
+  #gradient > .vertical(@white, #f5f5f5);
+  border: 1px solid #ddd;
+  .border-radius(3px);
+  .box-shadow(inset 0 1px 0 @white);
+  li {
+    display: inline;
+    text-shadow: 0 1px 0 @white;
+  }
+  .divider {
+    padding: 0 5px;
+    color: @grayLight;
+  }
+  .active a {
+    color: @grayDark;
+  }
+}
diff --git a/less/button-groups.less b/less/button-groups.less
new file mode 100644
index 000000000..5fb0a8e97
--- /dev/null
+++ b/less/button-groups.less
@@ -0,0 +1,121 @@
+// BUTTON GROUPS
+// -------------
+
+
+// Make the div behave like a button
+.btn-group {
+  position: relative;
+  .clearfix(); // clears the floated buttons
+}
+
+// Space out series of button groups
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+// Optional: Group multiple button groups together for a toolbar
+.btn-toolbar {
+  .btn-group {
+    display: inline-block;
+  }
+}
+
+// Float them, remove border radius, then re-add to first and last elements
+.btn-group .btn {
+  position: relative;
+  float: left;
+  margin-left: -1px;
+  .border-radius(0);
+}
+// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
+.btn-group .btn:first-child {
+  margin-left: 0;
+     -webkit-border-top-left-radius: 4px;
+         -moz-border-radius-topleft: 4px;
+             border-top-left-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+      -moz-border-radius-bottomleft: 4px;
+          border-bottom-left-radius: 4px;
+}
+.btn-group .btn:last-child,
+.btn-group .dropdown-toggle {
+     -webkit-border-top-right-radius: 4px;
+         -moz-border-radius-topright: 4px;
+             border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+      -moz-border-radius-bottomright: 4px;
+          border-bottom-right-radius: 4px;
+}
+// Reset corners for large buttons
+.btn-group .btn.large:first-child {
+  margin-left: 0;
+     -webkit-border-top-left-radius: 6px;
+         -moz-border-radius-topleft: 6px;
+             border-top-left-radius: 6px;
+  -webkit-border-bottom-left-radius: 6px;
+      -moz-border-radius-bottomleft: 6px;
+          border-bottom-left-radius: 6px;
+}
+.btn-group .btn.large:last-child,
+.btn-group .large.dropdown-toggle {
+     -webkit-border-top-right-radius: 6px;
+         -moz-border-radius-topright: 6px;
+             border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+      -moz-border-radius-bottomright: 6px;
+          border-bottom-right-radius: 6px;
+}
+
+// On hover/focus/active, bring the proper btn to front
+.btn-group .btn:hover,
+.btn-group .btn:focus,
+.btn-group .btn:active {
+  z-index: 2;
+}
+
+
+// Split button dropdowns
+// ----------------------
+
+// Give the line between buttons some depth
+.btn-group .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+  @shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  .box-shadow(@shadow);
+}
+
+// Reposition menu on open and round all corners
+.btn-group.open .dropdown-menu {
+  display: block;
+  margin-top: 1px;
+  .border-radius(5px);
+}
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  .box-shadow(@shadow);
+}
+
+// Reposition the caret
+.btn .caret {
+  margin-top: 6px;
+  margin-left: 0;
+}
+
+// Account for other colors
+.primary,
+.danger,
+.info,
+.success {
+  .caret {
+    border-top-color: @white;
+    .opacity(75);
+  }
+}
+
+// Small button dropdowns
+.btn.small .caret {
+  margin-top: 4px;
+}
+
diff --git a/less/buttons.less b/less/buttons.less
new file mode 100644
index 000000000..d7f533783
--- /dev/null
+++ b/less/buttons.less
@@ -0,0 +1,151 @@
+// BUTTON STYLES
+// -------------
+
+
+// Colors
+// ------
+
+.btn {
+  // Set text color
+  &.primary,
+  &.primary:hover,
+  &.danger,
+  &.danger:hover,
+  &.success,
+  &.success:hover,
+  &.info,
+  &.info:hover {
+    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+    color: @white
+  }
+  &.primary {
+    .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 15));
+  }
+  // Danger and error appear as red
+  &.danger {
+    .buttonBackground(#ee5f5b, #c43c35);
+  }
+  // Success appears as green
+  &.success {
+    .buttonBackground(#62c462, #57a957);
+  }
+  // Info appears as a neutral blue
+  &.info {
+    .buttonBackground(#5bc0de, #339bb9);
+  }
+}
+
+
+// Mixin for generating button backgrounds
+// ---------------------------------------
+.buttonBackground(@startColor, @endColor) {
+  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
+  .gradientBar(@startColor, @endColor);
+
+  // in these cases the gradient won't cover the background, so we override
+  &:hover, &:active, &.active, &.disabled {
+    background-color: @endColor;
+  }
+
+  // called out separately because IE8 would ignore otherwise
+  &[disabled] {
+    background-color: @endColor;
+  }
+
+  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
+  &:active,
+  &.active {
+    background-color: darken(@endColor, 10%) e("\9");
+  }
+}
+
+
+// Base styles
+// -----------
+
+.btn {
+  // Button Base
+  display: inline-block;
+  padding: 4px 10px 4px;
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  color: @grayDark;
+  text-shadow: 0 1px 1px rgba(255,255,255,.75);
+  #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  .border-radius(4px);
+  @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  .box-shadow(@shadow);
+  cursor: pointer;
+
+  &:hover {
+    color: @grayDark;
+    text-decoration: none;
+    background-color: darken(@white, 10%);
+    background-position: 0 -15px;
+
+    // transition is only when going to hover, otherwise the background
+    // behind the gradient (there for IE<=9 fallback) gets mismatched
+    .transition(background-position .1s linear);
+  }
+
+  // Focus state for keyboard and accessibility
+  &:focus {
+    outline: 1px dotted #666;
+  }
+
+  // Active and Disabled states
+  &.active,
+  &:active {
+    background-image: none;
+    @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+    .box-shadow(@shadow);
+    background-color: darken(@white, 10%);
+    background-color: darken(@white, 15%) e("\9");
+  }
+  &.disabled {
+    cursor: default;
+    background-image: none;
+    background-color: darken(@white, 10%);
+    .opacity(65);
+    .box-shadow(none);
+  }
+  &[disabled] {
+    // disabled pseudo can't be included with .disabled
+    // def because IE8 and below will drop it ;_;
+    cursor: default;
+    background-image: none;
+    background-color: darken(@white, 10%);
+    .opacity(65);
+    .box-shadow(none);
+  }
+
+  // Button Sizes
+  &.large {
+    padding: 9px 14px 9px;
+    font-size: @baseFontSize + 2px;
+    line-height: normal;
+    .border-radius(5px);
+  }
+  &.large .icon {
+    margin-top: 1px;
+  }
+  &.small {
+    padding: 5px 9px 5px;
+    font-size: @baseFontSize - 2px;
+    line-height: @baseLineHeight - 2px;
+  }
+  &.small .icon {
+    margin-top: -2px;
+  }
+}
+
+// Help Firefox not be a jerk about adding extra padding to buttons
+button.btn,
+input[type=submit].btn {
+  &::-moz-focus-inner {
+  	padding: 0;
+  	border: 0;
+  }
+}
diff --git a/less/carousel.less b/less/carousel.less
new file mode 100644
index 000000000..254a9f60c
--- /dev/null
+++ b/less/carousel.less
@@ -0,0 +1,114 @@
+// CAROUSEL
+// --------
+
+.carousel {
+  position: relative;
+  line-height: 1;
+}
+
+.carousel-inner {
+  overflow: hidden;
+  width: 100%;
+  position: relative;
+}
+
+.carousel {
+
+  .item {
+    display: none;
+    position: relative;
+    .transition(.6s ease-in-out left);
+  }
+
+  // Account for jankitude on images
+  .item > img {
+    display: block;
+    line-height: 1;
+  }
+
+  .active, 
+  .next, 
+  .prev { display: block; }
+
+  .active {
+    left: 0;
+  }
+
+  .next, 
+  .prev {
+    position: absolute;
+    top: 0;
+    width: 100%;
+  }
+
+  .next {
+    left: 100%;
+  }
+  .prev {
+    left: -100%;
+  }
+  .next.left, 
+  .prev.right {
+    left: 0;
+  }
+
+  .active.left {
+    left: -100%;
+  }
+  .active.right {
+    left: 100%;
+  }
+
+}
+
+// Left/right controls for nav
+// ---------------------------
+
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: @white;
+  text-align: center;
+  background: @grayDarker;
+  border: 3px solid @white;
+  .border-radius(23px);
+  .opacity(50);
+  .transition(all .2s linear);
+
+  // Reposition the right one
+  &.right {
+    left: auto;
+    right: 15px;
+  }
+
+  // Hover state
+  &:hover {
+    color: @white;
+    text-decoration: none;
+    .opacity(90);
+  }
+}
+
+// Caption for text below images
+// -----------------------------
+
+.carousel-caption {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 10px 15px 5px;
+  background: @grayDark;
+  background: rgba(0,0,0,.75);
+}
+.carousel-caption h4,
+.carousel-caption p {
+  color: @white;
+}
diff --git a/less/close.less b/less/close.less
new file mode 100644
index 000000000..a0e5edba1
--- /dev/null
+++ b/less/close.less
@@ -0,0 +1,18 @@
+// CLOSE ICONS
+// -----------
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: @baseLineHeight;
+  color: @black;
+  text-shadow: 0 1px 0 rgba(255,255,255,1);
+  .opacity(20);
+  &:hover {
+    color: @black;
+    text-decoration: none;
+    .opacity(40);
+    cursor: pointer;
+  }
+}
diff --git a/less/code.less b/less/code.less
new file mode 100644
index 000000000..0cc3db857
--- /dev/null
+++ b/less/code.less
@@ -0,0 +1,44 @@
+// Code.less
+// Code typography styles for the  and 
       elements
+// --------------------------------------------------------
+
+// Inline and block code styles
+code,
+pre {
+  padding: 0 3px 2px;
+  #font > #family > .monospace;
+  font-size: @baseFontSize - 1;
+  color: @grayDark;
+  .border-radius(3px);
+}
+code {
+  padding: 3px 4px;
+  color: #d14;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+pre {
+  display: block;
+  padding: (@baseLineHeight - 1) / 2;
+  margin: 0 0 @baseLineHeight / 2;
+  font-size: 12px;
+  line-height: @baseLineHeight;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc; // fallback for IE7-8
+  border: 1px solid rgba(0,0,0,.15);
+  .border-radius(4px);
+  white-space: pre;
+  white-space: pre-wrap;
+  word-break: break-all;
+
+  // Make prettyprint styles more spaced out for readability
+  &.prettyprint {
+    margin-bottom: @baseLineHeight;
+  }
+
+  // Account for some code outputs that place code tags in pre tags
+  code {
+    padding: 0;
+    background-color: transparent;
+  }
+}
diff --git a/less/component-animations.less b/less/component-animations.less
new file mode 100644
index 000000000..4f2a4fd11
--- /dev/null
+++ b/less/component-animations.less
@@ -0,0 +1,18 @@
+// COMPONENT ANIMATIONS
+// --------------------
+
+.fade {
+  .transition(opacity .15s linear);
+  opacity: 0;
+  &.in {
+    opacity: 1;
+  }
+}
+
+.collapse {
+  .transition(height .35s ease);
+  position:relative;
+  overflow:hidden;
+  height: 0;
+  &.in { height: auto; }
+}
diff --git a/less/dropdowns.less b/less/dropdowns.less
new file mode 100644
index 000000000..06114b254
--- /dev/null
+++ b/less/dropdowns.less
@@ -0,0 +1,110 @@
+// DROPDOWN MENUS
+// --------------
+
+// Use the .menu class on any 
    •  element within the topbar or ul.tabs and you'll get some superfancy dropdowns
+.dropdown {
+  position: relative;
+}
+// Dropdown arrow/caret
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  text-indent: -99999px;
+  vertical-align: top;
+  border-left:  4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top:   4px solid @black;
+  .opacity(30);
+  content: "\2193";
+}
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+  *margin-top: 7px;
+}
+.dropdown:hover .caret,
+.open.dropdown .caret {
+  .opacity(100);
+}
+// The dropdown menu (ul)
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  z-index: @zindexDropdown;
+  float: left;
+  display: none; // none by default, but block on "open" of the menu
+  min-width: 160px;
+  max-width: 220px;
+  _width: 160px;
+  padding: 4px 0;
+  margin: 0; // override default ul
+  list-style: none;
+  background-color: @white;
+  border-color: #ccc;
+  border-color: rgba(0,0,0,.2);
+  border-style: solid;
+  border-width: 1px;
+  .border-radius(0 0 5px 5px);
+  .box-shadow(0 5px 10px rgba(0,0,0,.2));
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+  zoom: 1; // do we need this?
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+
+  // Allow for dropdowns to go bottom up (aka, dropup-menu)
+  &.bottom-up {
+    top: auto;
+    bottom: 100%;
+    margin-bottom: 2px;
+  }
+
+  // Dividers (basically an hr) within the dropdown
+  .divider {
+    height: 1px;
+    margin: 5px 1px;
+    overflow: hidden;
+    background-color: #e5e5e5;
+    border-bottom: 1px solid @white;
+  }
+
+  // Links within the dropdown menu
+  a {
+    display: block;
+    padding: 3px 15px;
+    clear: both;
+    font-weight: normal;
+    line-height: 18px;
+    color: @gray;
+    white-space: nowrap;
+  }
+}
+
+// Hover state
+.dropdown-menu li > a:hover,
+.dropdown-menu .active > a,
+.dropdown-menu .active > a:hover {
+  color: @white;
+  text-decoration: none;
+  background-color: @linkColor;
+}
+
+// Open state for the dropdown
+.dropdown.open {
+  .dropdown-toggle {
+    color: @white;
+    background: #ccc;
+    background: rgba(0,0,0,.3);
+  }
+  .dropdown-menu {
+    display: block;
+  }
+}
+
+// Typeahead
+.typeahead {
+  margin-top: 2px; // give it some space to breathe
+  .border-radius(4px);
+}
diff --git a/less/forms.less b/less/forms.less
new file mode 100644
index 000000000..9e2e1dc1b
--- /dev/null
+++ b/less/forms.less
@@ -0,0 +1,514 @@
+// Forms.less
+// Base styles for various input types, form layouts, and states
+// -------------------------------------------------------------
+
+
+// GENERAL STYLES
+// --------------
+
+// Make all forms have space below them
+form {
+  margin: 0 0 @baseLineHeight;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+// Groups of fields with labels on top (legends)
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: @baseLineHeight * 1.5;
+  font-size: @baseFontSize * 1.5;
+  line-height: @baseLineHeight * 2;
+  color: @grayDark;
+  border: 0;
+  border-bottom: 1px solid #eee;
+}
+
+// Set font for forms
+label,
+input,
+button,
+select,
+textarea {
+  #font > .sans-serif(@baseFontSize,normal,@baseLineHeight);
+}
+
+// Identify controls by their labels
+label {
+  display: block;
+  margin-bottom: 5px;
+  color: @grayDark;
+}
+
+// Inputs, Textareas, Selects
+input,
+textarea,
+select,
+.uneditable-input {
+  display: inline-block;
+  width: 210px;
+  height: @baseLineHeight;
+  padding: 4px;
+  margin-bottom: 9px;
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  color: @gray;
+  border: 1px solid #ccc;
+  .border-radius(3px);
+}
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+// Inputs within a label
+label input,
+label textarea,
+label select {
+  display: block;
+}
+
+// Mini reset for unique input types
+input[type=image],
+input[type=checkbox],
+input[type=radio] {
+  width: auto;
+  height: auto;
+  padding: 0;
+  margin: 3px 0;
+  *margin-top: 0; /* IE7 */
+  line-height: normal;
+  border: none;
+  cursor: pointer;
+  .border-radius(0);
+}
+
+// Reset the file input to browser defaults
+input[type=file] {
+  padding: initial;
+  line-height: initial;
+  border: initial;
+  background-color: @white;
+  background-color: initial;
+  .box-shadow(none);
+}
+
+// Help out input buttons
+input[type=button],
+input[type=reset],
+input[type=submit] {
+  width: auto;
+  height: auto;
+}
+
+// Set the height of select and file controls to match text inputs
+select,
+input[type=file] {
+  height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
+  *margin-top: 4px; /* For IE7, add top margin to align select with labels */
+  line-height: 28px;
+}
+
+// Chrome on Linux and Mobile Safari need background-color
+select {
+  width: 220px; // default input width + 10px of padding that doesn't get applied
+  background-color: @white;
+}
+
+// Make multiple select elements height not fixed
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+// Remove shadow from image inputs
+input[type=image] {
+  .box-shadow(none);
+}
+
+// Make textarea height behave
+textarea {
+  height: auto;
+}
+
+// Hidden inputs
+input[type=hidden] {
+  display: none;
+}
+
+
+
+// CHECKBOXES & RADIOS
+// -------------------
+
+// Indent the labels to position radios/checkboxes as hanging
+.radio,
+.checkbox {
+  padding-left: 18px;
+}
+.radio input[type=radio],
+.checkbox input[type=checkbox] {
+  float: left;
+  margin-left: -18px;
+}
+
+// Move the options list down to align with labels
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px; // has to be padding because margin collaspes
+}
+
+// Radios and checkboxes on same line
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  margin-bottom: 0;
+}
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px; // space out consecutive inline controls
+}
+
+
+
+// FOCUS STATE
+// -----------
+
+input,
+textarea {
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+  @transition: border linear .2s, box-shadow linear .2s;
+  .transition(@transition);
+}
+input:focus,
+textarea:focus {
+  border-color: rgba(82,168,236,.8);
+  @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+  .box-shadow(@shadow);
+  outline: 0;
+}
+input[type=file]:focus,
+input[type=checkbox]:focus,
+select:focus {
+  .box-shadow(none); // override for file inputs
+  outline: 1px dotted #666; // Selet elements don't get box-shadow styles, so instead we do outline
+}
+
+
+
+// INPUT SIZES
+// -----------
+
+// General classes for quick sizes
+.input-mini       { width: 60px; }
+.input-small      { width: 90px; }
+.input-medium     { width: 150px; }
+.input-large      { width: 210px; }
+.input-xlarge     { width: 270px; }
+.input-xxlarge    { width: 530px; }
+
+// Grid style input sizes
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input {
+  float: none;
+  margin-left: 0;
+}
+
+// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
+.inputColumns(@columnSpan: 1) {
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
+}
+input,
+textarea,
+.uneditable-input {
+  // Default columns
+  &.span1     { .inputColumns(1); }
+  &.span2     { .inputColumns(2); }
+  &.span3     { .inputColumns(3); }
+  &.span4     { .inputColumns(4); }
+  &.span5     { .inputColumns(5); }
+  &.span6     { .inputColumns(6); }
+  &.span7     { .inputColumns(7); }
+  &.span8     { .inputColumns(8); }
+  &.span9     { .inputColumns(9); }
+  &.span10    { .inputColumns(10); }
+  &.span11    { .inputColumns(11); }
+  &.span12    { .inputColumns(12); }
+}
+
+.selectColumns(@columnSpan: 1) {
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) + 10;
+}
+select {
+  &.span1     { .selectColumns(1); }
+  &.span2     { .selectColumns(2); }
+  &.span3     { .selectColumns(3); }
+  &.span4     { .selectColumns(4); }
+  &.span5     { .selectColumns(5); }
+  &.span6     { .selectColumns(6); }
+  &.span7     { .selectColumns(7); }
+  &.span8     { .selectColumns(8); }
+  &.span9     { .selectColumns(9); }
+  &.span10    { .selectColumns(10); }
+  &.span11    { .selectColumns(11); }
+  &.span12    { .selectColumns(12); }
+}
+
+
+
+// DISABLED STATE
+// --------------
+
+// Disabled and read-only inputs
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  background-color: #f5f5f5;
+  border-color: #ddd;
+  cursor: not-allowed;
+}
+
+
+
+
+// FORM FIELD FEEDBACK STATES
+// --------------------------
+
+// Mixin for form field states
+.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
+  // Set the text color
+  > label,
+  .help-block,
+  .help-inline {
+    color: @textColor;
+  }
+  // Style inputs accordingly
+  input,
+  select,
+  textarea {
+    color: @textColor;
+    border-color: @borderColor;
+    &:focus {
+      border-color: darken(@borderColor, 10%);
+      .box-shadow(0 0 6px lighten(@borderColor, 20%));
+    }
+  }
+  // Give a small background color for input-prepend/-append
+  .input-prepend .add-on,
+  .input-append .add-on {
+    color: @textColor;
+    background-color: @backgroundColor;
+    border-color: @textColor;
+  }
+}
+// Warning
+.control-group.warning {
+  .formFieldState(@warningText, @warningText, @warningBackground);
+}
+// Error
+.control-group.error {
+  .formFieldState(@errorText, @errorText, @errorBackground);
+}
+// Success
+.control-group.success {
+  .formFieldState(@successText, @successText, @successBackground);
+}
+
+// HTML5 invalid states
+// Shares styles with the .control-group.error above
+input:focus:required:invalid,
+textarea:focus:required:invalid,
+select:focus:required:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+  &:focus {
+    border-color: darken(#ee5f5b, 10%);
+    .box-shadow(0 0 6px lighten(#ee5f5b, 20%));    
+  }
+}
+
+
+
+// FORM ACTIONS
+// ------------
+
+.form-actions {
+  padding: (@baseLineHeight - 1) 20px @baseLineHeight;
+  margin-top: @baseLineHeight;
+  margin-bottom: @baseLineHeight;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+}
+
+// For text that needs to appear as an input but should not be an input
+.uneditable-input {
+  display: block;
+  background-color: @white;
+  border-color: #eee;
+  .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+  cursor: not-allowed;
+}
+
+// Placeholder text gets special styles; can't be bundled together though for some reason
+.placeholder(@grayLight);
+
+
+
+// HELP TEXT
+// ---------
+
+.help-block {
+  margin-top: 5px;
+  margin-bottom: 0;
+  color: @grayLight;
+}
+
+.help-inline {
+  display: inline-block;
+  margin-bottom: 9px;
+  vertical-align: middle;
+  padding-left: 5px;
+}
+
+
+
+// INPUT GROUPS
+// ------------
+
+// Allow us to put symbols and text within the input field for a cleaner look
+.input-prepend,
+.input-append {
+  margin-bottom: 5px;
+  .clearfix(); // Clear the float to prevent wrapping
+  input,
+  .uneditable-input {
+    .border-radius(0 3px 3px 0);
+  }
+  .uneditable-input {
+    border-left-color: #ccc;
+  }
+  .add-on {
+    float: left;
+    display: block;
+    width: auto;
+    min-width: 16px;
+    height: @baseLineHeight;
+    margin-right: -1px;
+    padding: 4px 4px 4px 5px;
+    font-weight: normal;
+    line-height: @baseLineHeight;
+    color: @grayLight;
+    text-align: center;
+    text-shadow: 0 1px 0 @white;
+    background-color: #f5f5f5;
+    border: 1px solid #ccc;
+    .border-radius(3px 0 0 3px);
+  }
+  .active {
+    background-color: lighten(@green, 30);
+    border-color: @green;
+  }
+}
+.input-prepend {
+  .add-on {
+    *margin-top: 1px; /* IE6-7 */
+  }
+}
+.input-append {
+  input,
+  .uneditable-input {
+    float: left;
+    .border-radius(3px 0 0 3px);
+  }
+  .uneditable-input {
+    border-right-color: #ccc;    
+  }
+  .add-on {
+    margin-right: 0;
+    margin-left: -1px;
+    .border-radius(0 3px 3px 0);
+  }
+}
+
+
+
+// SEARCH FORM
+// -----------
+
+.search-query {
+  padding-left: 14px;
+  padding-right: 14px;
+  margin-bottom: 0; // remove the default margin on all inputs
+  .border-radius(14px);
+}
+
+
+
+// HORIZONTAL & VERTICAL FORMS
+// ---------------------------
+
+// Common properties
+// -----------------
+
+.form-search,
+.form-inline,
+.form-horizontal {
+  input,
+  textarea,
+  select,
+  .help-inline,
+  .uneditable-input {
+    display: inline-block;
+    margin-bottom: 0;
+  }
+}
+.form-search label,
+.form-inline label {
+  display: inline-block;
+}
+
+// Margin to space out fieldsets
+.control-group {
+  margin-bottom: @baseLineHeight / 2;
+}
+
+// Horizontal-specific styles
+// --------------------------
+
+.form-horizontal {
+  // Legend collapses margin, so we're relegated to padding
+  legend + .control-group {
+    margin-top: @baseLineHeight;
+    -webkit-margin-top-collapse: separate;
+  }
+  // Increase spacing between groups
+  .control-group {
+    margin-bottom: @baseLineHeight;
+  }
+  // Float the labels left
+  .control-group > label {
+    float: left;
+    width: 140px;
+    padding-top: 5px;
+    text-align: right;
+  }
+  // Move over all input controls and content
+  .controls {
+    margin-left: 160px;
+  }
+  // Move over buttons in .form-actions to align with .controls
+  .form-actions {
+    padding-left: 160px;
+  }
+}
diff --git a/less/grid.less b/less/grid.less
new file mode 100644
index 000000000..d5b5f487d
--- /dev/null
+++ b/less/grid.less
@@ -0,0 +1,41 @@
+// GRID SYSTEM
+// -----------
+// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
+.row {
+  margin-left: @gridGutterWidth * -1;
+  .clearfix();
+}
+
+// Find all .span# classes within .row and give them the necessary properties for grid columns 
+// (supported by all browsers back to IE7)
+// Credit to @dhg for the idea
+[class*="span"] {
+  .gridColumn();
+}
+
+// Default columns
+.span1     { .columns(1); }
+.span2     { .columns(2); }
+.span3     { .columns(3); }
+.span4     { .columns(4); }
+.span5     { .columns(5); }
+.span6     { .columns(6); }
+.span7     { .columns(7); }
+.span8     { .columns(8); }
+.span9     { .columns(9); }
+.span10    { .columns(10); }
+.span11    { .columns(11); }
+.span12    { .columns(12); }
+
+// Offset column options
+.offset1   { .offset(1); }
+.offset2   { .offset(2); }
+.offset3   { .offset(3); }
+.offset4   { .offset(4); }
+.offset5   { .offset(5); }
+.offset6   { .offset(6); }
+.offset7   { .offset(7); }
+.offset8   { .offset(8); }
+.offset9   { .offset(9); }
+.offset10  { .offset(10); }
+.offset11  { .offset(11); }
diff --git a/less/hero-unit.less b/less/hero-unit.less
new file mode 100644
index 000000000..cba1cc46c
--- /dev/null
+++ b/less/hero-unit.less
@@ -0,0 +1,20 @@
+// HERO UNIT
+// ---------
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  background-color: #f5f5f5;
+  .border-radius(6px);
+  h1 {
+    margin-bottom: 0;
+    font-size: 60px;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+  p {
+    font-size: 18px;
+    font-weight: 200;
+    line-height: @baseLineHeight * 1.5;
+  }
+}
diff --git a/less/labels.less b/less/labels.less
new file mode 100644
index 000000000..06dc7f3c0
--- /dev/null
+++ b/less/labels.less
@@ -0,0 +1,16 @@
+// LABELS
+// ------
+
+.label {
+  padding: 1px 3px 2px;
+  font-size: @baseFontSize * .75;
+  font-weight: bold;
+  color: @white;
+  text-transform: uppercase;
+  background-color: @grayLight;
+  .border-radius(3px);
+  &.important { background-color: @errorText; }
+  &.warning   { background-color: @orange; }
+  &.success   { background-color: @successText; }
+  &.info      { background-color: @infoText; }
+}
diff --git a/less/layouts.less b/less/layouts.less
new file mode 100644
index 000000000..14435c9d1
--- /dev/null
+++ b/less/layouts.less
@@ -0,0 +1,43 @@
+//
+// Layouts
+// Fixed-width and fluid (with sidebar) layouts
+// --------------------------------------------
+
+
+// Container (centered, fixed-width layouts)
+.container {
+  .container-fixed();
+}
+
+// Fluid layouts (left aligned, with sidebar, min- & max-width content)
+.fluid-container {
+  position: relative;
+  min-width: @siteWidth;
+  padding-left: @gridGutterWidth;
+  padding-right: @gridGutterWidth;
+  .clearfix();
+}
+
+// Sidebars (left and right options)
+.fluid-sidebar {
+  width: @fluidSidebarWidth;
+  margin: 0 20px 18px;
+}
+.sidebar-left   { padding-left: @fluidSidebarWidth + @gridGutterWidth * 2; }
+.sidebar-right  { padding-right: @fluidSidebarWidth + @gridGutterWidth * 2; }
+
+// Float the sidebars accordingly
+.sidebar-left .fluid-sidebar {
+  float: left;
+  margin-left: (@fluidSidebarWidth + @gridGutterWidth) * -1;
+}
+.sidebar-right .fluid-sidebar {
+  float: right;
+  margin-right: (@fluidSidebarWidth + @gridGutterWidth) * -1;
+}
+
+// The main content area
+.fluid-content {
+  float: left;
+  width: 100%;
+}
diff --git a/less/mixins.less b/less/mixins.less
new file mode 100644
index 000000000..dd331ebf2
--- /dev/null
+++ b/less/mixins.less
@@ -0,0 +1,360 @@
+// Mixins.less
+// Snippets of reusable CSS to develop faster and keep code readable
+// -----------------------------------------------------------------
+
+
+// UTILITY MIXINS
+// --------------------------------------------------
+
+// Clearfix
+// -------------------------
+// For clearing floats like a boss h5bp.com/q
+.clearfix() {
+  *zoom: 1;
+  &:before,
+  &:after {
+    display: table;
+    content: "";
+  }
+  &:after {
+    clear: both;
+  }
+}
+
+// Center-align a block level element
+// -------------------------
+.center-block() {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+// IE7 inline-block
+// -------------------------
+.ie7-inline-block() {
+  *display: inline; /* IE7 inline-block hack */
+  *zoom: 1;
+}
+
+// Sizing shortcuts
+// -------------------------
+.size(@height: 5px, @width: 5px) {
+  width: @width;
+  height: @height;
+}
+.square(@size: 5px) {
+  .size(@size, @size);
+}
+
+// Placeholder text
+// -------------------------
+.placeholder(@color: @placeholderText) {
+  :-moz-placeholder {
+    color: @color;
+  }
+  ::-webkit-input-placeholder {
+    color: @color;
+  }
+}
+
+
+
+// FONTS
+// --------------------------------------------------
+
+#font {
+  #family {
+    .serif() {
+      font-family: Georgia, "Times New Roman", Times, serif;
+    }
+    .sans-serif() {
+      font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    }
+    .monospace() {
+      font-family: Menlo, Monaco, "Courier New", monospace;
+    }
+  }
+  .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    font-size: @size;
+    font-weight: @weight;
+    line-height: @lineHeight;
+  }
+  .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .serif;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+  .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .sans-serif;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+  .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .monospace;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+}
+
+
+
+// GRID SYSTEM
+// --------------------------------------------------
+
+// Site container
+// -------------------------
+.container-fixed() {
+  width: @siteWidth;
+  margin-left: auto;
+  margin-right: auto;
+  .clearfix();
+}
+
+// Columns and offseting
+// -------------------------
+.columns(@columns: 1) {
+  width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+}
+.offset(@columns: 1) {
+  margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+}
+// Necessary grid styles for every column to make them appear next to each other horizontally
+.gridColumn() {
+  float: left;
+  margin-left: @gridGutterWidth;
+}
+// makeColumn can be used to mark any element (e.g., .content-primary) as a column without changing markup to .span something
+.makeColumn(@columnSpan: 1) {
+  .gridColumn();
+  .columns(@columnSpan);
+}
+
+
+
+// CSS3 PROPERTIES
+// --------------------------------------------------
+
+// Border Radius
+.border-radius(@radius: 5px) {
+  -webkit-border-radius: @radius;
+     -moz-border-radius: @radius;
+          border-radius: @radius;
+}
+
+// Drop shadows
+.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
+  -webkit-box-shadow: @shadow;
+     -moz-box-shadow: @shadow;
+          box-shadow: @shadow;
+}
+
+// Transitions
+.transition(@transition) {
+  -webkit-transition: @transition;
+     -moz-transition: @transition;
+      -ms-transition: @transition;
+       -o-transition: @transition;
+          transition: @transition;
+}
+
+// Transformations
+.rotate(@degrees) {
+  -webkit-transform: rotate(@degrees);
+     -moz-transform: rotate(@degrees);
+      -ms-transform: rotate(@degrees);
+       -o-transform: rotate(@degrees);
+          transform: rotate(@degrees);
+}
+.scale(@ratio) {
+  -webkit-transform: scale(@ratio);
+     -moz-transform: scale(@ratio);
+      -ms-transform: scale(@ratio);
+       -o-transform: scale(@ratio);
+          transform: scale(@ratio);
+}
+.translate(@x: 0, @y: 0) {
+  -webkit-transform: translate(@x, @y);
+     -moz-transform: translate(@x, @y);
+      -ms-transform: translate(@x, @y);
+       -o-transform: translate(@x, @y);
+          transform: translate(@x, @y);
+}
+
+// Background clipping
+// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
+.background-clip(@clip) {
+  -webkit-background-clip: @clip;
+     -moz-background-clip: @clip;
+          background-clip: @clip;
+}
+
+// Background sizing
+.background-size(@size){
+  -webkit-background-size: @size;
+     -moz-background-size: @size;
+       -o-background-size: @size;
+          background-size: @size;
+}
+
+
+// Box sizing
+.box-sizing(@boxmodel) {
+  -webkit-box-sizing: @boxmodel;
+     -moz-box-sizing: @boxmodel;
+          box-sizing: @boxmodel;
+}
+
+// User select
+// For selecting text on the page
+.user-select(@select) {
+  -webkit-user-select: @select;
+     -moz-user-select: @select;
+       -o-user-select: @select;
+          user-select: @select;
+}
+
+// Resize anything
+.resizable(@direction: both) {
+  resize: @direction; // Options: horizontal, vertical, both
+  overflow: auto; // Safari fix
+}
+
+// CSS3 Content Columns
+.content-columns(@columnCount, @columnGap: @gridColumnGutter) {
+  -webkit-column-count: @columnCount;
+     -moz-column-count: @columnCount;
+          column-count: @columnCount;
+  -webkit-column-gap: @columnGap;
+     -moz-column-gap: @columnGap;
+          column-gap: @columnGap;
+}
+
+// Opacity
+.opacity(@opacity: 100) {
+  opacity: @opacity / 100;
+   filter: e(%("alpha(opacity=%d)", @opacity));
+}
+
+
+
+// BACKGROUNDS
+// --------------------------------------------------
+
+// Add an alphatransparency value to any background or border color (via Elyse Holladay)
+#translucent {
+  .background(@color: @white, @alpha: 1) {
+    background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
+  }
+  .border(@color: @white, @alpha: 1) {
+    border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
+    .background-clip(padding-box);
+  }
+}
+
+// Gradient Bar Colors for buttons and alerts
+.gradientBar(@primaryColor, @secondaryColor) {
+  #gradient > .vertical(@primaryColor, @secondaryColor);
+  border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
+  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
+}
+
+// Gradients
+#gradient {
+  .horizontal(@startColor: #555, @endColor: #333) {
+    background-color: @endColor;
+    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, 0 0, 100% 0, from(@startColor), to(@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
+    background-repeat: repeat-x;
+  }
+  .vertical(@startColor: #555, @endColor: #333) {
+    background-color: mix(@startColor, @endColor, 60%);
+    background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
+    background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(top, @startColor, @endColor); // The standard
+    background-repeat: repeat-x;
+  }
+  .directional(@startColor: #555, @endColor: #333, @deg: 45deg) {
+    background-color: @endColor;
+    background-repeat: repeat-x;
+    background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+
+    background-image: -ms-linear-gradient(@deg, @startColor, @endColor); // IE10
+    background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(@deg, @startColor, @endColor); // The standard
+  }
+  .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
+    background-color: mix(@midColor, @endColor, 80%);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
+    background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
+    background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-repeat: no-repeat;
+  }
+  .radial(@innerColor: #555, @outerColor: #333)  {
+    background-color: @outsideColor;
+    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@centerColor), to(@outsideColor));
+    background-image: -webkit-radial-gradient(circle, @centerColor, @outsideColor);
+    background-image: -moz-radial-gradient(circle, @centerColor, @outsideColor);
+    background-image: -ms-radial-gradient(circle, @centerColor, @outsideColor);
+    background-repeat: no-repeat;
+    // Opera cannot do radial gradients yet
+  }
+  .striped(@color, @angle: -45deg) {
+    background-color: @color;
+    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
+    background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -ms-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+  }
+}
+
+
+
+// COMPONENT MIXINS
+// --------------------------------------------------
+
+// POPOVER ARROWS
+// -------------------------
+// For tipsies and popovers
+#popoverArrow {
+  .top(@arrowWidth: 5px) {
+    bottom: 0;
+    left: 50%;
+    margin-left: -@arrowWidth;
+    border-left: @arrowWidth solid transparent;
+    border-right: @arrowWidth solid transparent;
+    border-top: @arrowWidth solid @black;
+  }
+  .left(@arrowWidth: 5px) {
+    top: 50%;
+    right: 0;
+    margin-top: -@arrowWidth;
+    border-top: @arrowWidth solid transparent;
+    border-bottom: @arrowWidth solid transparent;
+    border-left: @arrowWidth solid @black;
+  }
+  .bottom(@arrowWidth: 5px) {
+    top: 0;
+    left: 50%;
+    margin-left: -@arrowWidth;
+    border-left: @arrowWidth solid transparent;
+    border-right: @arrowWidth solid transparent;
+    border-bottom: @arrowWidth solid @black;
+  }
+  .right(@arrowWidth: 5px) {
+    top: 50%;
+    left: 0;
+    margin-top: -@arrowWidth;
+    border-top: @arrowWidth solid transparent;
+    border-bottom: @arrowWidth solid transparent;
+    border-right: @arrowWidth solid @black;
+  }
+}
diff --git a/less/modals.less b/less/modals.less
new file mode 100644
index 000000000..0368e01e1
--- /dev/null
+++ b/less/modals.less
@@ -0,0 +1,65 @@
+// MODALS
+// ------
+
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: @zindexModalBackdrop;
+  background-color: @black;
+  // Fade for backdrop
+  &.fade { opacity: 0; }
+}
+
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  .opacity(80);
+}
+
+.modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  z-index: @zindexModal;
+  max-height: 500px;
+  overflow: auto;
+  width: 560px;
+  margin: -250px 0 0 -280px;
+  background-color: @white;
+  border: 1px solid #999;
+  border: 1px solid rgba(0,0,0,.3);
+  *border: 1px solid #999; /* IE6-7 */
+  .border-radius(6px);
+  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+  .background-clip(padding-box);
+  &.fade {
+    .transition(e('opacity .3s linear, top .3s ease-out'));
+    top: -25%;
+  }
+  &.fade.in { top: 50%; }
+}
+.modal-header {
+  padding: 5px 15px;
+  border-bottom: 1px solid #eee;
+  // Close icon
+  .close { margin-top: 2px; }
+}
+.modal-body {
+  padding: 15px;
+}
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  .border-radius(0 0 6px 6px);
+  .box-shadow(inset 0 1px 0 @white);
+  .clearfix();
+  .btn {
+    float: right;
+    margin-left: 5px;
+    margin-bottom: 0; // account for input[type=submit] which gets the bottom margin like all other inputs
+  }
+}
diff --git a/less/navbar.less b/less/navbar.less
new file mode 100644
index 000000000..dba95e5cd
--- /dev/null
+++ b/less/navbar.less
@@ -0,0 +1,251 @@
+// NAVBAR (FIXED AND STATIC)
+// -------------------------
+
+
+// COMMON STYLES
+// -------------
+
+.navbar {
+  overflow: visible;
+}
+// gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
+.navbar-inner {
+  background-color: @navbarBackground;
+  #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
+  @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
+  .box-shadow(@shadow);
+}
+
+// Text and links
+.navbar {
+  // Hover and active states
+  .brand:hover {
+    color: @white;
+    text-decoration: none;
+  }
+  // Website or project name
+  .brand {
+    float: left;
+    display: block;
+    padding: 8px 20px 12px;
+    margin-left: -20px; // negative indent to left-align the text down the page
+    font-size: 20px;
+    font-weight: 200;
+    line-height: 1;
+    color: @white;
+  }
+  // Plain text in topbar
+  p {
+    margin: 0;
+    line-height: 40px;
+    a:hover {
+      color: @white;
+      background-color: transparent;
+    }
+  }
+  // Buttons in navbar
+  .btn,
+  .btn-group {
+    margin-top: 5px; // make buttons vertically centered in navbar
+  }
+  .btn-group .btn {
+    margin-top: 0;
+  }
+}
+
+// Navbar forms
+.navbar-form {
+  margin-bottom: 0; // remove default bottom margin
+  input,
+  select {
+    display: inline-block;
+    margin-bottom: 0;
+  }
+}
+
+// Navbar search
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 6px;
+  margin-bottom: 0;
+  .search-query {
+    padding: 4px 9px;
+    #font > .sans-serif(13px, normal, 1);
+    color: @white;
+    color: rgba(255,255,255,.75);
+    background: #444;
+    background: rgba(255,255,255,.3);
+    border: 1px solid #111;
+    @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
+    .box-shadow(@shadow);
+    .transition(none);
+
+    // Placeholder text gets special styles; can't be bundled together though for some reason
+    .placeholder(@grayLighter);
+
+    // Hover states
+    &:hover {
+      color: @white;
+      background-color: @grayLight;
+      background-color: rgba(255,255,255,.5);
+    }
+    // Focus states (we use .focused since IE8 and down doesn't support :focus)
+    &:focus,
+    &.focused {
+      padding: 5px 10px;
+      color: @grayDark;
+      text-shadow: 0 1px 0 @white;
+      background-color: @white;
+      border: 0;
+      .box-shadow(0 0 3px rgba(0,0,0,.15));
+      outline: 0;
+    }
+  }
+}
+
+
+// Static navbar
+.navbar-static {
+  margin-bottom: @baseLineHeight;
+}
+.navbar-static .navbar-inner {
+  padding-left:  20px;
+  padding-right: 20px;
+  .border-radius(4px);
+}
+
+// Fixed navbar
+.navbar-fixed {
+  position: fixed;
+  top: 0;
+  right: 0;
+  left: 0;
+  z-index: @zindexFixedNavbar;
+}
+
+
+
+// NAVIGATION
+// ----------
+
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+  float: right; // redeclare due to specificity
+}
+.navbar .nav > li {
+  display: block;
+  float: left;
+}
+
+// Links
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 10px 11px;
+  line-height: 19px;
+  color: @grayLight;
+  text-decoration: none;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+}
+// Hover
+.navbar .nav > li > a:hover {
+  background-color: transparent;
+  color: @white;
+  text-decoration: none;
+}
+
+// Active nav items
+.navbar .nav .active > a {
+  color: @white;
+  text-decoration: none;
+  background-color: @grayDarker;
+  background-color: rgba(0,0,0,.5);
+}
+
+// Dividers (basically a vertical hr)
+.navbar .vertical-divider {
+  height: 40px;
+  width: 1px;
+  margin: 0 5px;
+  overflow: hidden;
+  background-color: @grayDarker;
+  border-right: 1px solid #444;
+}
+
+// Secondary (floated right) nav in topbar
+.navbar .nav.pull-right {
+  margin-left: 10px;
+  margin-right: 0;
+}
+
+
+
+// Dropdown menus
+// --------------
+
+// Menu position and menu carets
+.navbar .dropdown-menu {
+  margin-top: 1px;
+  .border-radius(4px);
+  &:before {
+    content: '';
+    display: inline-block;
+    border-left:   7px solid transparent;
+    border-right:  7px solid transparent;
+    border-bottom: 7px solid #ccc;
+    border-bottom-color: rgba(0,0,0,.2);
+    position: absolute;
+    top: -7px;
+    left: 9px;
+  }
+  &:after {
+    content: '';
+    display: inline-block;
+    border-left:   6px solid transparent;
+    border-right:  6px solid transparent;
+    border-bottom: 6px solid @white;
+    position: absolute;
+    top: -6px;
+    left: 10px;
+  }
+}
+
+// Dropdown toggle caret
+.navbar .nav .dropdown-toggle .caret,
+.navbar .nav .open.dropdown .caret {
+  border-top-color: @white;
+}
+.navbar .nav .active .caret {
+  .opacity(100);
+}
+
+// Remove background color from open dropdown
+.navbar .nav .open > .dropdown-toggle,
+.navbar .nav .active > .dropdown-toggle,
+.navbar .nav .open.active > .dropdown-toggle {
+  background-color: transparent;
+}
+
+// Dropdown link on hover
+.navbar .nav .active > .dropdown-toggle:hover {
+  color: @white;
+}
+
+// Right aligned menus need alt position
+.navbar .nav.pull-right .dropdown-menu {
+  right: 0;
+  &:before {
+    left: auto;
+    right: 12px;
+  }
+  &:after {
+    left: auto;
+    right: 13px;
+  }
+}
diff --git a/less/navs.less b/less/navs.less
new file mode 100644
index 000000000..cd356d9bb
--- /dev/null
+++ b/less/navs.less
@@ -0,0 +1,338 @@
+// NAVIGATIONS
+// -----------
+
+
+
+// BASE CLASS
+// ----------
+
+.nav {
+  margin-left: 0;
+  margin-bottom: @baseLineHeight;
+  list-style: none;
+}
+
+// Make links block level
+.nav > li > a {
+  display: block;
+}
+.nav > li > a:hover {
+  text-decoration: none;
+  background-color: @grayLighter;
+}
+
+
+
+// NAV LIST
+// --------
+
+.nav.list {
+  padding-left: 14px;
+  padding-right: 14px;
+  margin-bottom: 0;
+}
+.nav.list > li > a,
+.nav.list .nav-header {
+  display: block;
+  padding: 3px 15px;
+  margin-left:  -15px;
+  margin-right: -15px;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+}
+.nav.list .nav-header {
+  font-size: 11px;
+  font-weight: bold;
+  line-height: @baseLineHeight;
+  color: @grayLight;
+  text-transform: uppercase;
+}
+.nav.list > li + .nav-header {
+  margin-top: 9px;
+}
+.nav.list .active > a {
+  color: @white;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
+  background-color: @linkColor;
+}
+
+
+
+// TABS AND PILLS
+// -------------
+
+// Common styles
+.tabs,
+.pills {
+  .clearfix();
+}
+.tabs > li,
+.pills > li {
+  float: left;
+}
+.tabs > li > a,
+.pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px; // keeps the overall height an even number
+}
+
+// TABS
+// ----
+
+// Give the tabs something to sit on
+.tabs {
+  border-bottom: 1px solid #ddd;
+}
+
+// Make the list-items overlay the bottom border
+.tabs > li {
+  margin-bottom: -1px;
+}
+
+// Actual tabs (as links)
+.tabs > li > a {
+  padding-top: 9px;
+  padding-bottom: 9px;
+  border: 1px solid transparent;
+  .border-radius(4px 4px 0 0);
+  &:hover {
+    border-color: @grayLighter @grayLighter #ddd;
+  }
+}
+// Active state, and it's :hover to override normal :hover
+.tabs > .active > a,
+.tabs > .active > a:hover {
+  color: @gray;
+  background-color: @white;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+  cursor: default;
+}
+
+// PILLS
+// -----
+
+// Links rendered as pills
+.pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  .border-radius(5px);
+}
+
+// Active state
+.pills .active > a,
+.pills .active > a:hover {
+  color: @white;
+  background-color: @linkColor;
+}
+
+
+
+// STACKED NAV
+// -----------
+
+// Stacked tabs and pills
+.nav.stacked > li {
+  float: none;
+}
+.nav.stacked > li > a {
+  margin-right: 0; // no need for the gap between nav items
+}
+
+// Tabs
+.tabs.stacked {
+  border-bottom: 0;
+}
+.tabs.stacked > li > a {
+  border: 1px solid #ddd;
+  .border-radius(0);
+}
+.tabs.stacked > li:first-child > a {
+  .border-radius(4px 4px 0 0);
+}
+.tabs.stacked > li:last-child > a {
+  .border-radius(0 0 4px 4px);
+}
+.tabs.stacked > li > a:hover {
+  border-color: #ddd;
+  z-index: 2;
+}
+
+// Pills
+.pills.stacked > li > a {
+  margin-bottom: 3px;
+}
+.pills.stacked > li:last-child > a {
+  margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
+}
+
+
+
+// DROPDOWNS
+// ---------
+
+// Position the menu
+.pills .dropdown-menu,
+.tabs .dropdown-menu {
+  margin-top: 1px;
+  border-width: 1px;
+}
+.pills .dropdown-menu {
+  .border-radius(4px);
+}
+
+// Default dropdown links
+// -------------------------
+// Make carets use linkColor to start
+.tabs .dropdown-toggle .caret,
+.pills .dropdown-toggle .caret {
+  border-top-color: @linkColor;
+  margin-top: 6px;
+}
+.tabs .dropdown-toggle:hover .caret,
+.pills .dropdown-toggle:hover .caret {
+  border-top-color: @linkColorHover;
+}
+
+// Active dropdown links
+// -------------------------
+.tabs .active .dropdown-toggle .caret,
+.pills .active .dropdown-toggle .caret {
+  border-top-color: @grayDark;
+}
+
+// Active:hover dropdown links
+// -------------------------
+.nav > .dropdown.active > a:hover {
+  color: @black;
+  cursor: pointer;
+}
+
+// Open dropdowns
+// -------------------------
+.tabs .open .dropdown-toggle,
+.pills .open .dropdown-toggle,
+.nav > .open.active > a:hover {
+  color: @white;
+  background-color: @grayLight;
+  border-color: @grayLight;
+}
+.nav .open .caret,
+.nav .open.active .caret,
+.nav .open a:hover .caret {
+  border-top-color: @white;
+  .opacity(100);
+}
+
+// Dropdowns in stacked tabs
+.tabs.stacked .open > a:hover {
+  border-color: @grayLight;
+}
+
+
+
+// TABBABLE
+// --------
+
+
+// COMMON STYLES
+// -------------
+
+// Clear any floats
+.tabbable {
+  .clearfix();
+}
+
+// Remove border on bottom, left, right
+.tabs-below .tabs,
+.tabs-right .tabs,
+.tabs-left .tabs {
+  border-bottom: 0;
+}
+
+// Show/hide tabbable areas
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+
+// BOTTOM
+// ------
+
+.tabs-below .tabs {
+  border-top: 1px solid #ddd;
+}
+.tabs-below .tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+.tabs-below .tabs > li > a {
+  .border-radius(0 0 4px 4px);
+  &:hover {
+    border-bottom-color: transparent;
+    border-top-color: #ddd;
+  }
+}
+.tabs-below .tabs .active > a,
+.tabs-below .tabs .active > a:hover {
+  border-color: transparent #ddd #ddd #ddd;
+}
+
+// LEFT & RIGHT
+// ------------
+
+// Common styles
+.tabs-left .tabs > li,
+.tabs-right .tabs > li {
+  float: none;
+}
+.tabs-left .tabs > li > a,
+.tabs-right .tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+
+// Tabs on the left
+.tabs-left .tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+.tabs-left .tabs > li > a {
+  margin-right: -1px;
+  .border-radius(4px 0 0 4px);
+}
+.tabs-left .tabs > li > a:hover {
+  border-color: @grayLighter #ddd @grayLighter @grayLighter;
+}
+.tabs-left .tabs .active > a,
+.tabs-left .tabs .active > a:hover {
+  border-color: #ddd transparent #ddd #ddd;
+}
+
+// Tabs on the right
+.tabs-right .tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+.tabs-right .tabs > li > a {
+  margin-left: -1px;
+  .border-radius(0 4px 4px 0);
+}
+.tabs-right .tabs > li > a:hover {
+  border-color: @grayLighter @grayLighter @grayLighter #ddd;
+}
+.tabs-right .tabs .active > a,
+.tabs-right .tabs .active > a:hover {
+  border-color: #ddd #ddd #ddd transparent;
+}
diff --git a/less/pager.less b/less/pager.less
new file mode 100644
index 000000000..de009afda
--- /dev/null
+++ b/less/pager.less
@@ -0,0 +1,25 @@
+// PAGER
+// -----
+
+.pager {
+  margin-left: 0;
+  margin-bottom: @baseLineHeight;
+  list-style: none;
+  text-align: center;
+  .clearfix();
+}
+.pager li {
+  display: inline;
+}
+.pager a {
+  display: inline-block;
+  padding: 6px 15px;
+  background-color: #f5f5f5;
+  .border-radius(15px);
+}
+.pager .next a {
+  float: right;
+}
+.pager .previous a {
+  float: left;
+}
diff --git a/less/pagination.less b/less/pagination.less
new file mode 100644
index 000000000..8ecb2a401
--- /dev/null
+++ b/less/pagination.less
@@ -0,0 +1,54 @@
+// PAGINATION
+// ----------
+
+.pagination {
+  height: @baseLineHeight * 2;
+  margin: @baseLineHeight 0;
+ }
+.pagination ul {
+  display: inline-block;
+  .ie7-inline-block();
+  margin-left: 0;
+  margin-bottom: 0;
+  .border-radius(3px);
+  .box-shadow(0 1px 2px rgba(0,0,0,.05));
+}
+.pagination li {
+    display: inline;
+  }
+.pagination a {
+  float: left;
+  padding: 0 14px;
+  line-height: (@baseLineHeight * 2) - 2;
+  text-decoration: none;
+  border: 1px solid #ddd;
+  border-left-width: 0;
+}
+.pagination a:hover,
+.pagination .active a {
+  background-color: #f5f5f5;
+}
+.pagination .active a {
+  color: @grayLight;
+}
+.pagination .disabled a,
+.pagination .disabled a:hover {
+  color: @grayLight;
+  background-color: transparent;
+  cursor: default;
+}
+.pagination li:first-child a {
+  border-left-width: 1px;
+  .border-radius(3px 0 0 3px);
+}
+.pagination li:last-child a {
+  .border-radius(0 3px 3px 0);
+}
+
+// Centered
+.pagination-centered {
+  text-align: center;
+}
+.pagination-right {
+  text-align: right;
+}
diff --git a/less/patterns.less b/less/patterns.less
new file mode 100644
index 000000000..d94b921e4
--- /dev/null
+++ b/less/patterns.less
@@ -0,0 +1,13 @@
+// Patterns.less
+// Repeatable UI elements outside the base styles provided from the scaffolding
+// ----------------------------------------------------------------------------
+
+
+// PAGE HEADERS
+// ------------
+
+footer {
+  padding-top: @baseLineHeight - 1;
+  margin-top: @baseLineHeight - 1;
+  border-top: 1px solid #eee;
+}
diff --git a/less/popovers.less b/less/popovers.less
new file mode 100644
index 000000000..6de314d86
--- /dev/null
+++ b/less/popovers.less
@@ -0,0 +1,49 @@
+// POPOVERS
+// --------
+
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: @zindexPopover;
+  display: none;
+  padding: 5px;
+  &.top    { margin-top:  -5px; }
+  &.right  { margin-left:  5px; }
+  &.bottom { margin-top:   5px; }
+  &.left   { margin-left: -5px; }
+  &.top .arrow    { #popoverArrow > .top(); }
+  &.right .arrow  { #popoverArrow > .right(); }
+  &.bottom .arrow { #popoverArrow > .bottom(); }
+  &.left .arrow   { #popoverArrow > .left();  }
+  .arrow {
+    position: absolute;
+    width: 0;
+    height: 0;
+  }
+  .inner {
+    padding: 3px;
+    width: 280px;
+    overflow: hidden;
+    background: @black; // has to be full background declaration for IE fallback
+    background: rgba(0,0,0,.8);
+    .border-radius(6px);
+    .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+  }
+  .title {
+    padding: 9px 15px;
+    line-height: 1;
+    background-color: #f5f5f5;
+    border-bottom:1px solid #eee;
+    .border-radius(3px 3px 0 0);
+  }
+  .content {
+    padding: 14px;
+    background-color: @white;
+    .border-radius(0 0 3px 3px);
+    .background-clip(padding-box);
+    p, ul, ol {
+      margin-bottom: 0;
+    }
+  }
+}
\ No newline at end of file
diff --git a/less/print.less b/less/print.less
new file mode 100644
index 000000000..4fd45e282
--- /dev/null
+++ b/less/print.less
@@ -0,0 +1,18 @@
+/*!
+ * Bootstrap @VERSION for Print
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ * Date: @DATE
+ */
+
+
+// HIDE UNECESSARY COMPONENTS
+// --------------------------
+
+.navbar-fixed {
+  display: none;
+}
\ No newline at end of file
diff --git a/less/progress-bars.less b/less/progress-bars.less
new file mode 100644
index 000000000..ff754b817
--- /dev/null
+++ b/less/progress-bars.less
@@ -0,0 +1,99 @@
+// PROGRESS BARS
+// -------------
+
+
+// ANIMATIONS
+// ----------
+
+// Webkit
+@-webkit-keyframes progress-bar-stripes {
+  from  { background-position: 0 0; }
+  to    { background-position: 40px 0; }
+}
+
+// Temporarily commented out since LESS won't compile with this
+// @-moz-keyframes progress-bar-stripes {
+//   from  { background-position: 0 0; }
+//   to    { background-position: 40px 0; }
+// }
+
+// Spec
+@keyframes progress-bar-stripes {
+  from  { background-position: 0 0; }
+  to    { background-position: 40px 0; }
+}
+
+
+
+// THE BARS
+// --------
+
+// Common styles
+.progress,
+.progress .bar {
+  .border-radius(4px);
+}
+
+// Outer container
+.progress {
+  height: 18px;
+  margin-bottom: 18px;
+  #gradient > .vertical(#f5f5f5, #f9f9f9);
+  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
+}
+
+// Bar of progress
+.progress .bar {
+  width: 0%;
+  height: 18px;
+  color: @white;
+  font-size: 12px;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  #gradient > .vertical(#149bdf, #0480be);
+  .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
+  .box-sizing(border-box);
+  .transition(width .6s ease);
+}
+
+// Striped bars
+.progress.striped .bar {
+  #gradient > .striped(#62c462);
+  .background-size(40px 40px);
+}
+
+// Call animation for the active one
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+     -moz-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+
+
+
+// COLORS
+// ------
+
+// Danger (red)
+.progress.danger .bar {
+  #gradient > .vertical(#ee5f5b, #c43c35);
+}
+.progress.danger.striped .bar {
+  #gradient > .striped(#ee5f5b);
+}
+
+// Success (green)
+.progress.success .bar {
+  #gradient > .vertical(#62c462, #57a957);
+}
+.progress.success.striped .bar {
+  #gradient > .striped(#62c462);
+}
+
+// Info (teal)
+.progress.info .bar {
+  #gradient > .vertical(#5bc0de, #339bb9);
+}
+.progress.info.striped .bar {
+  #gradient > .striped(#5bc0de);
+}
diff --git a/less/reset.less b/less/reset.less
new file mode 100644
index 000000000..ef4dc8af6
--- /dev/null
+++ b/less/reset.less
@@ -0,0 +1,126 @@
+// Reset.less
+// Adapted from Normalize.css http://github.com/necolas/normalize.css
+// ------------------------------------------------------------------------
+
+// Display in IE6-9 and FF3
+// -------------------------
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+
+// Display block in IE6-9 and FF3
+// -------------------------
+
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+// Prevents modern browsers from displaying 'audio' without controls
+// -------------------------
+
+audio:not([controls]) {
+    display: none;
+}
+
+// Base settings
+// -------------------------
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+// Focus states
+a:focus {
+  outline: thin dotted;
+}
+// Hover & Active
+a:hover,
+a:active {
+  outline: 0;
+}
+
+// Prevents sub and sup affecting line-height in all browsers
+// -------------------------
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+sup {
+  top: -0.5em;
+}
+sub {
+  bottom: -0.25em;
+}
+
+// Img border in a's and image quality
+// -------------------------
+
+img {
+  max-width: 100%;
+  height: auto;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+// Forms
+// -------------------------
+
+// Font size in all browsers, margin changes, misc consistency
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+button,
+input {
+  *overflow: visible; // Inner spacing ie IE6/7
+  line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
+  padding: 0;
+  border: 0;
+}
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer; // Cursors on all buttons applied consistently
+  -webkit-appearance: button; // Style clicable inputs in iOS
+}
+input[type="search"] { // Appearance in Safari/Chrome
+  -webkit-appearance: textfield;
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+}
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
+}
+textarea {
+  overflow: auto; // Remove vertical scrollbar in IE6-9
+  vertical-align: top; // Readability and alignment cross-browser
+}
diff --git a/less/responsive.less b/less/responsive.less
new file mode 100644
index 000000000..2999eef4d
--- /dev/null
+++ b/less/responsive.less
@@ -0,0 +1,268 @@
+// Responsive.less
+// For phone and tablet devices
+// -------------------------------------------------------------
+
+
+// REPEAT VARIABLES & MIXINS
+// -------------------------
+// Required since we compile the responsive stuff separately
+
+@import "variables.less"; // Modify this for custom colors, font-sizes, etc
+@import "mixins.less";
+
+
+// RESPONSIVE CLASSES
+// ------------------
+
+// Hide from screenreaders and browsers
+// Credit: HTML5BP
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
+@media (max-width: 480px) {
+
+  // Make the nav work for small devices
+  .navbar {
+    .nav {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 180px;
+      padding-top: 40px;
+      list-style: none;
+    }
+    .nav,
+    .nav > li:last-child a {
+      .border-radius(0 0 4px 0);
+    }
+    .nav > li {
+      float: none;
+      display: none;
+    }
+    .nav > li > a {
+      float: none;
+      background-color: #222;
+    }
+    .nav > .active {
+      display: block;
+      position: absolute;
+      top: 0;
+      left: 0;
+    }
+    .nav > .active > a {
+      background-color: transparent;
+    }
+    .nav > .active > a:hover {
+      background-color: #333;
+    }
+    .nav > .active > a:after {
+      display: inline-block;
+      width: 0;
+      height: 0;
+      margin-top: 8px;
+      margin-left: 6px;
+      text-indent: -99999px;
+      vertical-align: top;
+      border-left: 4px solid transparent;
+      border-right: 4px solid transparent;
+      border-top: 4px solid @white;
+      .opacity(100);
+      content: "↓";
+    }
+    .nav:hover > li {
+      display: block;
+    }
+    .nav:hover > li > a:hover {
+      background-color: #333;
+    }
+  }
+
+  // Remove the horizontal form styles
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  // Move over all input controls and content
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  // Move the options list down to align with labels
+  .form-horizontal .control-list {
+    padding-top: 0; // has to be padding because margin collaspes
+  }
+  // Move over buttons in .form-actions to align with .controls
+  .form-horizontal .form-actions {
+    padding-left: 0;
+  }
+
+  // Modals
+  .modal {
+    position: absolute;
+    top: 20px;
+    left: 20px;
+    right: 20px;
+    width: auto;
+    margin: 0;
+    &.fade.in { top: auto; }
+  }
+  .modal-header .close {
+    padding: 10px;
+  }
+
+}
+
+
+// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
+// --------------------------------------------------
+
+@media (max-width: 768px) {
+  
+  // Unfix the navbar
+  .navbar-fixed {
+    position: absolute;
+  }
+  .navbar-fixed .nav {
+    float: none;
+  }
+
+  // Remove width from containers
+  .container {
+    width: auto;
+    padding: 0 20px;
+  }
+  // Undo negative margin on rows
+  .row {
+    margin-left: 0;
+  }
+  // Make all columns even
+  .row > [class*="span"] {
+    float: none;
+    display: block;
+    width: auto;
+    margin: 0;
+  }
+
+}
+
+
+// PORTRAIT TABLET TO DEFAULT DESKTOP
+// ----------------------------------
+
+@media (min-width: 768px) and (max-width: 940px) {
+
+  // Reset grid variables
+  @gridColumns:       16;
+  @gridColumnWidth:   44px;
+  @gridGutterWidth:   20px;
+  @siteWidth:         748px;
+
+  // Bring grid mixins to recalculate widths
+  .columns(@columns: 1) {
+    width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+  }
+  .offset(@columns: 1) {
+    margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+  }
+
+  // 16cols at 30px wide with 16px gutters
+  .container {
+    width: @siteWidth;
+  }
+
+  // Default columns
+  .span1     { .columns(1); }
+  .span2     { .columns(2); }
+  .span3     { .columns(3); }
+  .span4     { .columns(4); }
+  .span5     { .columns(5); }
+  .span6     { .columns(6); }
+  .span7     { .columns(7); }
+  .span8     { .columns(8); }
+  .span9     { .columns(9); }
+  .span10    { .columns(10); }
+  .span11    { .columns(11); }
+  .span12    { .columns(12); }
+
+  // Offset column options
+  .offset1   { .offset(1); }
+  .offset2   { .offset(2); }
+  .offset3   { .offset(3); }
+  .offset4   { .offset(4); }
+  .offset5   { .offset(5); }
+  .offset6   { .offset(6); }
+  .offset7   { .offset(7); }
+  .offset8   { .offset(8); }
+  .offset9   { .offset(9); }
+  .offset10  { .offset(10); }
+  .offset11  { .offset(11); }
+  .offset12  { .offset(12); }
+
+}
+
+// LARGE DESKTOP & UP
+// ------------------
+/*
+@media (min-width: 1210px) {
+
+  // Reset grid variables
+  @gridColumns:       12;
+  @gridColumnWidth:   70px;
+  @gridGutterWidth:   30px;
+  @siteWidth:         1170px;
+
+  // Bring grid mixins to recalculate widths
+  .columns(@columns: 1) {
+    width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+  }
+  .offset(@columns: 1) {
+    margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+  }
+
+  .container {
+    width: @siteWidth;
+  }
+  .row {
+    margin-left: @gridGutterWidth * -1;
+  }
+  [class*="span"] {
+    margin-left: @gridGutterWidth;
+  }
+
+  // Default columns
+  .span1     { .columns(1); }
+  .span2     { .columns(2); }
+  .span3     { .columns(3); }
+  .span4     { .columns(4); }
+  .span5     { .columns(5); }
+  .span6     { .columns(6); }
+  .span7     { .columns(7); }
+  .span8     { .columns(8); }
+  .span9     { .columns(9); }
+  .span10    { .columns(10); }
+  .span11    { .columns(11); }
+  .span12    { .columns(12); }
+
+  // Offset column options
+  .offset1   { .offset(1); }
+  .offset2   { .offset(2); }
+  .offset3   { .offset(3); }
+  .offset4   { .offset(4); }
+  .offset5   { .offset(5); }
+  .offset6   { .offset(6); }
+  .offset7   { .offset(7); }
+  .offset8   { .offset(8); }
+  .offset9   { .offset(9); }
+  .offset10  { .offset(10); }
+  .offset11  { .offset(11); }
+  .offset12  { .offset(12); }
+
+}
+*/
\ No newline at end of file
diff --git a/less/scaffolding.less b/less/scaffolding.less
new file mode 100644
index 000000000..3c1826830
--- /dev/null
+++ b/less/scaffolding.less
@@ -0,0 +1,29 @@
+// Scaffolding
+// Basic and global styles for generating a grid system, structural layout, and page templates
+// -------------------------------------------------------------------------------------------
+
+
+// STRUCTURAL LAYOUT
+// -----------------
+
+body {
+  margin: 0;
+  font-family: @baseFontFamily;
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  color: @gray;
+  background-color: @white;
+}
+
+
+// LINKS
+// -----
+
+a {
+  color: @linkColor;
+  text-decoration: none;
+  &:hover {
+    color: @linkColorHover;
+    text-decoration: underline;
+  }
+}
diff --git a/less/sprites.less b/less/sprites.less
new file mode 100644
index 000000000..c3b420665
--- /dev/null
+++ b/less/sprites.less
@@ -0,0 +1,121 @@
+// SPRITES
+// Glyphs and icons for buttons, nav, and more
+// -------------------------------------------
+
+
+// ICONS
+// -----
+
+// As of v2.0.0, the  tag is reserved for icons from the Glyphicons set.
+// All icons receive the styles of the  tag and are then given a unique
+// class to add width, height, and background-position. Your resulting HTML
+// will look like .
+
+.icon {
+  background-image: url(img/glyphicons-halflings-sprite.png);
+  background-position: 0 0;
+  background-repeat: no-repeat;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 14px;
+  height: 14px;
+}
+.icon.white {
+  background-image: url(img/glyphicons-halflings-sprite-white.png);
+}
+
+.icon.glass              { background-position: 0      0; }
+.icon.music              { background-position: -24px  0; }
+.icon.search             { background-position: -48px  0; }
+.icon.envelope           { background-position: -72px  0; }
+.icon.heart              { background-position: -96px  0; }
+.icon.star               { background-position: -120px 0; }
+.icon.star-empty         { background-position: -144px 0; }
+.icon.user               { background-position: -168px 0; }
+.icon.film               { background-position: -192px 0; }
+.icon.th-large           { background-position: -216px 0; }
+.icon.th                 { background-position: -240px 0; }
+.icon.th-list            { background-position: -264px 0; }
+.icon.ok                 { background-position: -288px 0; }
+.icon.remove             { background-position: -312px 0; }
+.icon.zoom-in            { background-position: -336px 0; }
+.icon.zoom-out           { background-position: -360px 0; }
+.icon.off                { background-position: -384px 0; }
+.icon.signal             { background-position: -408px 0; }
+.icon.cog                { background-position: -432px 0; }
+.icon.trash              { background-position: -456px 0; }
+
+.icon.home               { background-position: 0      -24px; }
+.icon.file               { background-position: -24px  -24px; }
+.icon.time               { background-position: -48px  -24px; }
+.icon.road               { background-position: -72px  -24px; }
+.icon.download-alt       { background-position: -96px  -24px; }
+.icon.download           { background-position: -120px -24px; }
+.icon.upload             { background-position: -144px -24px; }
+.icon.inbox              { background-position: -168px -24px; }
+.icon.play-circle        { background-position: -192px -24px; }
+.icon.repeat             { background-position: -216px -24px; }
+.icon.refresh            { background-position: -240px -24px; }
+.icon.calendar           { background-position: -264px -24px; }
+.icon.lock               { background-position: -288px -24px; }
+.icon.flag               { background-position: -312px -24px; }
+.icon.headphones         { background-position: -336px -24px; }
+.icon.volume-off         { background-position: -360px -24px; }
+.icon.volume-down        { background-position: -384px -24px; }
+.icon.volume-up          { background-position: -408px -24px; }
+.icon.qrcode             { background-position: -432px -24px; }
+.icon.barcode            { background-position: -456px -24px; }
+
+.icon.tag                { background-position: 0      -48px; }
+.icon.tags               { background-position: -24px  -48px; }
+.icon.book               { background-position: -48px  -48px; }
+.icon.bookmark           { background-position: -72px  -48px; }
+.icon.print              { background-position: -96px  -48px; }
+.icon.camera             { background-position: -120px -48px; }
+.icon.font               { background-position: -144px -48px; }
+.icon.bold               { background-position: -168px -48px; }
+.icon.italic             { background-position: -192px -48px; }
+.icon.text-height        { background-position: -216px -48px; }
+.icon.text-width         { background-position: -240px -48px; }
+.icon.align-left         { background-position: -264px -48px; }
+.icon.align-center       { background-position: -288px -48px; }
+.icon.align-right        { background-position: -312px -48px; }
+.icon.align-justify      { background-position: -336px -48px; }
+.icon.list               { background-position: -360px -48px; }
+.icon.indent-left        { background-position: -384px -48px; }
+.icon.indent-right       { background-position: -408px -48px; }
+.icon.facetime-video     { background-position: -432px -48px; }
+.icon.picture            { background-position: -456px -48px; }
+
+.icon.pencil             { background-position: 0      -72px; }
+.icon.map-marker         { background-position: -24px  -72px; }
+.icon.adjust             { background-position: -48px  -72px; }
+.icon.tint               { background-position: -72px  -72px; }
+.icon.edit               { background-position: -96px  -72px; }
+.icon.share              { background-position: -120px -72px; }
+.icon.check              { background-position: -144px -72px; }
+.icon.move               { background-position: -168px -72px; }
+.icon.step-backward      { background-position: -192px -72px; }
+.icon.fast-backward      { background-position: -216px -72px; }
+.icon.backward           { background-position: -240px -72px; }
+.icon.play               { background-position: -264px -72px; }
+.icon.pause              { background-position: -288px -72px; }
+.icon.stop               { background-position: -312px -72px; }
+.icon.forward            { background-position: -336px -72px; }
+.icon.fast-forward       { background-position: -360px -72px; }
+.icon.step-forward       { background-position: -384px -72px; }
+.icon.eject              { background-position: -408px -72px; }
+.icon.chevron-left       { background-position: -432px -72px; }
+.icon.chevron-right      { background-position: -456px -72px; }
+
+.icon.arrow-left         { background-position: -240px -96px; }
+.icon.arrow-right        { background-position: -264px -96px; }
+.icon.arrow-up           { background-position: -288px -96px; }
+.icon.arrow-down         { background-position: -312px -96px; }
+.icon.share-alt          { background-position: -336px -96px; }
+.icon.resize-full        { background-position: -360px -96px; }
+.icon.resize-small       { background-position: -384px -96px; }
+.icon.plus               { background-position: -408px -96px; }
+.icon.minus              { background-position: -432px -96px; }
+.icon.asterisk           { background-position: -456px -96px; }
+
diff --git a/less/tables.less b/less/tables.less
new file mode 100644
index 000000000..809c2f60e
--- /dev/null
+++ b/less/tables.less
@@ -0,0 +1,138 @@
+//
+// Tables.less
+// Tables for, you guessed it, tabular data
+// ----------------------------------------
+
+
+// BASE TABLES
+// -----------------
+
+table {
+  max-width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+// BASELINE STYLES
+// ---------------
+
+.table {
+  width: 100%;
+  margin-bottom: @baseLineHeight;
+  // Cells
+  th,
+  td {
+    padding: 8px;
+    line-height: @baseLineHeight;
+    text-align: left;
+    border-top: 1px solid #ddd;
+  }
+  th {
+    font-weight: bold;
+    vertical-align: bottom;
+  }
+  td {
+    vertical-align: top;
+  }
+  // Remove top border from thead by default
+  thead:first-child tr th,
+  thead:first-child tr td {
+    border-top: 0;
+  }
+  // Account for multiple tbody instances
+  tbody + tbody {
+    border-top: 2px solid #ddd;
+  }
+}
+
+
+
+// CONDENSED TABLE W/ HALF PADDING
+// -------------------------------
+
+.table-condensed {
+  th,
+  td {
+    padding: 4px 5px;
+  }
+}
+
+
+// BORDERED VERSION
+// ----------------
+
+.table-bordered {
+  border: 1px solid #ddd;
+  border-collapse: separate; // Done so we can round those corners!
+  .border-radius(4px);
+  th + th,
+  td + td,
+  th + td,
+  td + th {
+    border-left: 1px solid #ddd;
+  }
+  // Prevent a double border
+  thead:first-child tr:first-child th,
+  tbody:first-child tr:first-child th,
+  tbody:first-child tr:first-child td {
+    border-top: 0;
+  }
+  // For first th or td in the first row in the first thead or tbody
+  thead:first-child tr:first-child th:first-child,
+  tbody:first-child tr:first-child td:first-child {
+    .border-radius(4px 0 0 0);
+  }
+  thead:first-child tr:first-child th:last-child,
+  tbody:first-child tr:first-child td:last-child {
+    .border-radius(0 4px 0 0);
+  }
+  // For first th or td in the first row in the first thead or tbody
+  thead:last-child tr:last-child th:first-child,
+  tbody:last-child tr:last-child td:first-child {
+    .border-radius(0 0 0 4px);
+  }
+  thead:last-child tr:last-child th:last-child,
+  tbody:last-child tr:last-child td:last-child {
+    .border-radius(0 0 4px 0);
+  }
+}
+
+
+// ZEBRA-STRIPING
+// --------------
+
+// Default zebra-stripe styles (alternating gray and transparent backgrounds)
+.table-striped {
+  tbody {
+    tr:nth-child(odd) td,
+    tr:nth-child(odd) th {
+      background-color: #f9f9f9;
+    }
+  }
+}
+
+
+
+// TABLE CELL SIZING
+// -----------------
+
+// Change the columns
+.tableColumns(@columnSpan: 1) {
+  float: none;
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16;
+  margin-left: 0;
+}
+table {
+  .span1     { .tableColumns(1); }
+  .span2     { .tableColumns(2); }
+  .span3     { .tableColumns(3); }
+  .span4     { .tableColumns(4); }
+  .span5     { .tableColumns(5); }
+  .span6     { .tableColumns(6); }
+  .span7     { .tableColumns(7); }
+  .span8     { .tableColumns(8); }
+  .span9     { .tableColumns(9); }
+  .span10    { .tableColumns(10); }
+  .span11    { .tableColumns(11); }
+  .span12    { .tableColumns(12); }
+}
diff --git a/less/thumbnails.less b/less/thumbnails.less
new file mode 100644
index 000000000..0ba749059
--- /dev/null
+++ b/less/thumbnails.less
@@ -0,0 +1,33 @@
+// THUMBNAILS
+// ----------
+
+.thumbnails {
+  margin-left: -20px;
+  list-style: none;
+  .clearfix();
+}
+.thumbnails > li {
+  float: left;
+  margin: 0 0 @baseLineHeight 20px;
+}
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 1;
+  border: 1px solid #ddd;
+  .border-radius(4px);
+  .box-shadow(0 1px 1px rgba(0,0,0,.075));
+}
+// Add a hover state for linked versions only
+a.thumbnail:hover {
+  border-color: @linkColor;
+  .box-shadow(0 1px 4px rgba(0,105,214,.25));
+}
+// Images and captions
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+}
+.thumbnail .caption {
+  padding: 9px;
+}
diff --git a/less/tooltip.less b/less/tooltip.less
new file mode 100644
index 000000000..5111a193f
--- /dev/null
+++ b/less/tooltip.less
@@ -0,0 +1,35 @@
+// TOOLTIP
+// ------=
+
+.tooltip {
+  position: absolute;
+  z-index: @zindexTooltip;
+  display: block;
+  visibility: visible;
+  padding: 5px;
+  font-size: 11px;
+  .opacity(0);
+  &.in     { .opacity(80); }
+  &.top    { margin-top:  -2px; }
+  &.right  { margin-left:  2px; }
+  &.bottom { margin-top:   2px; }
+  &.left   { margin-left: -2px; }
+  &.top .tooltip-arrow    { #popoverArrow > .top(); }
+  &.left .tooltip-arrow   { #popoverArrow > .left(); }
+  &.bottom .tooltip-arrow { #popoverArrow > .bottom(); }
+  &.right .tooltip-arrow  { #popoverArrow > .right(); }
+}
+.tooltip-inner {
+  max-width: 200px;
+  padding: 3px 8px;
+  color: @white;
+  text-align: center;
+  text-decoration: none;
+  background-color: @black;
+  .border-radius(4px);
+}
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
diff --git a/less/type.less b/less/type.less
new file mode 100644
index 000000000..087224fd0
--- /dev/null
+++ b/less/type.less
@@ -0,0 +1,206 @@
+// Typography.less
+// Headings, body text, lists, code, and more for a versatile and durable typography system
+// ----------------------------------------------------------------------------------------
+
+
+// BODY TEXT
+// ---------
+
+p {
+  margin: 0 0 @baseLineHeight / 2;
+  font-family: @baseFontFamily;
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  small {
+    font-size: @baseFontSize - 2;
+    color: @grayLight;
+  }
+}
+.lead {
+  margin-bottom: @baseLineHeight;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: @baseLineHeight * 1.5;
+}
+
+// HEADINGS
+// --------
+
+h1, h2, h3, h4, h5, h6 {
+  margin: 0;
+  font-weight: bold;
+  color: @grayDark;
+  text-rendering: optimizelegibility; // Fix the character spacing for headings
+  small {
+    font-weight: normal;
+    color: @grayLight;
+  }
+}
+h1 {
+  font-size: 30px;
+  line-height: @baseLineHeight * 2;
+  small {
+    font-size: 18px;
+  }
+}
+h2 {
+  font-size: 24px;
+  line-height: @baseLineHeight * 2;
+  small {
+    font-size: 18px;
+  }
+}
+h3 {
+  line-height: @baseLineHeight * 1.5;
+  font-size: 18px;
+  small {
+    font-size: 14px;
+  }
+}
+h4, h5, h6 {
+  line-height: @baseLineHeight;
+}
+h4 {
+  font-size: 14px;
+  small {
+    font-size: 12px;
+  }
+}
+h5 {
+  font-size: 12px;
+}
+h6 {
+  font-size: 11px;
+  color: @grayLight;
+  text-transform: uppercase;
+}
+
+
+// LISTS
+// -----
+
+// Unordered and Ordered lists
+ul, ol {
+  padding: 0;
+  margin: 0 0 @baseLineHeight / 2 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+ul {
+  list-style: disc;
+}
+ol {
+  list-style: decimal;
+}
+li {
+  line-height: @baseLineHeight;
+}
+ul.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
+// Description Lists
+dl {
+  margin-bottom: @baseLineHeight;
+}
+dt,
+dd {
+  line-height: @baseLineHeight;
+}
+dt {
+  font-weight: bold;
+}
+dd {
+  margin-left: @baseLineHeight / 2;
+}
+
+// MISC
+// ----
+
+// Horizontal rules
+hr {
+  margin: @baseLineHeight 0;
+  border: 0;
+  border-top: 1px solid #e5e5e5;
+  border-bottom: 1px solid @white;
+}
+
+// Emphasis
+strong {
+  font-weight: bold;
+}
+em {
+  font-style: italic;
+}
+.muted {
+  color: @grayLight;
+}
+
+// Abbreviations and acronyms
+abbr {
+  font-size: 90%;
+  text-transform: uppercase;
+  border-bottom: 1px dotted #ddd;
+  cursor: help;
+}
+
+// Blockquotes
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 @baseLineHeight;
+  border-left: 5px solid @grayLighter;
+  p {
+    margin-bottom: 0;
+    #font > .shorthand(16px,300,@baseLineHeight * 1.25);
+  }
+  small {
+    display: block;
+    line-height: @baseLineHeight;
+    color: @grayLight;
+    &:before {
+      content: '\2014 \00A0';
+    }
+  }
+
+  // Float right with text-align: right
+  &.pull-right {
+    float: right;
+    padding-left: 0;
+    padding-right: 15px;
+    border-left: 0;
+    border-right: 5px solid @grayLighter;
+    p,
+    small {
+      text-align: right;
+    }
+  }
+}
+
+// Quotes
+q:before,
+q:after,
+blockquote:before, 
+blockquote:after {
+  content: "";
+}
+
+// Addresses
+address {
+  display: block;
+  margin-bottom: @baseLineHeight;
+  line-height: @baseLineHeight;
+  font-style: normal;
+}
+
+// Misc
+small {
+  font-size: 100%;
+}
+cite {
+  font-style: normal;
+}
diff --git a/less/utilities.less b/less/utilities.less
new file mode 100644
index 000000000..d60d22031
--- /dev/null
+++ b/less/utilities.less
@@ -0,0 +1,23 @@
+// UTILITY CLASSES
+// ---------------
+
+// Quick floats
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+
+// Toggling content
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+
+// Visibility
+.invisible {
+  visibility: hidden;
+}
diff --git a/less/variables.less b/less/variables.less
new file mode 100644
index 000000000..5ed896cc0
--- /dev/null
+++ b/less/variables.less
@@ -0,0 +1,90 @@
+// Variables.less
+// Variables to customize the look and feel of Bootstrap
+// -----------------------------------------------------
+
+
+
+// GLOBAL VALUES
+// --------------------------------------------------
+
+// Links
+@linkColor:             #08c;
+@linkColorHover:        darken(@linkColor, 15%);
+
+// Grays
+@black:                 #000;
+@grayDarker:            #222;
+@grayDark:              #333;
+@gray:                  #555;
+@grayLight:             #999;
+@grayLighter:           #eee;
+@white:                 #fff;
+
+// Accent colors
+@blue:                  #049cdb;
+@blueDark:              #0064cd;
+@green:                 #46a546;
+@red:                   #9d261d;
+@yellow:                #ffc40d;
+@orange:                #f89406;
+@pink:                  #c3325f;
+@purple:                #7a43b6;
+
+// Grid system
+// Modify the grid styles in mixins.less
+@gridColumns:           12;
+@gridColumnWidth:       60px;
+@gridGutterWidth:       20px;
+@siteWidth:             (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+// Fluid width sidebar
+@fluidSidebarWidth:     220px;
+
+// Typography
+@baseFontSize:          13px;
+@baseFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@baseLineHeight:        18px;
+
+// Buttons
+@primaryButtonBackground:    @linkColor;
+
+
+
+// COMPONENT VARIABLES
+// --------------------------------------------------
+
+// Z-index master list
+// Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
+@zindexDropdown:        1000;
+@zindexPopover:         1010;
+@zindexTooltip:         1020;
+@zindexFixedNavbar:     1030;
+@zindexModalBackdrop:   1040;
+@zindexModal:           1050;
+
+// Input placeholder text color
+@placeholderText:       @grayLight;
+
+// Navbar
+@navbarHeight:                    40px;
+@navbarBackground:                @grayDarker;
+@navbarBackgroundHighlight:       @grayDark;
+
+// Form states and alerts
+@warningText:             #c09853;
+@warningBackground:       #fcf8e3;
+@warningBorder:           #f3edd2;
+
+@errorText:               #b94a48;
+@errorBackground:         #f2dede;
+@errorBorder:             #e9c7c7;
+
+@successText:             #468847;
+@successBackground:       #dff0d8;
+@successBorder:           #cfe8c4;
+
+@infoText:                #3a87ad;
+@infoBackground:          #d9edf7;
+@infoBorder:              #bfe1f2;
+
+
diff --git a/less/wells.less b/less/wells.less
new file mode 100644
index 000000000..244b8ca10
--- /dev/null
+++ b/less/wells.less
@@ -0,0 +1,17 @@
+// WELLS
+// -----
+
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #eee;
+  border: 1px solid rgba(0,0,0,.05);
+  .border-radius(4px);
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  blockquote {
+    border-color: #ddd;
+    border-color: rgba(0,0,0,.15);
+  }
+}
diff --git a/lib/accordion.less b/lib/accordion.less
deleted file mode 100644
index 1ebd5b1a1..000000000
--- a/lib/accordion.less
+++ /dev/null
@@ -1,30 +0,0 @@
-// ACCORDION
-// ---------
-
-
-// Parent container
-.accordion {
-  margin-bottom: @baseLineHeight;
-}
-
-// Group == heading + body
-.accordion-group {
-  background-color: #f5f5f5;
-  .border-radius(4px);
-}
-.accordion-heading {
-  border-bottom: 0;
-}
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
-.accordion-body {
-  margin-bottom: 2px;
-}
-
-// Inner needs the styles because you can't animate properly with any styles on the element
-.accordion-inner {
-  padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
-}
diff --git a/lib/alerts.less b/lib/alerts.less
deleted file mode 100644
index 23c17e704..000000000
--- a/lib/alerts.less
+++ /dev/null
@@ -1,69 +0,0 @@
-// ALERT STYLES
-// ------------
-
-// Base alert styles
-.alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: @baseLineHeight;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  background-color: @warningBackground;
-  border: 1px solid @warningBorder;
-  .border-radius(4px);
-}
-.alert,
-.alert-heading {
-  color: @warningText;
-}
-
-// Adjust close link position
-.alert .close {
-  position: relative;
-  right: -21px;
-  line-height: 18px;
-}
-
-// Alternate styles
-// ----------------
-
-.alert-success {
-  background-color: @successBackground;
-  border-color: @successBorder;  
-}
-.alert-success,
-.alert-success .alert-heading {
-  color: @successText;
-}
-.alert-danger,
-.alert-error {
-  background-color: @errorBackground;
-  border-color: @errorBorder;
-}
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
-  color: @errorText;
-}
-.alert-info {
-  background-color: @infoBackground;
-  border-color: @infoBorder;
-}
-.alert-info,
-.alert-info .alert-heading {
-  color: @infoText;
-}
-
-
-// Block alerts
-// ------------------------
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-.alert-block p + p {
-  margin-top: 5px;
-}
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
deleted file mode 100644
index bc9f84373..000000000
--- a/lib/bootstrap.less
+++ /dev/null
@@ -1,63 +0,0 @@
-/*!
- * Bootstrap @VERSION
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: @DATE
- */
-
-// CSS Reset
-@import "reset.less";
-
-// Core variables and mixins
-@import "variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "mixins.less";
-
-// Grid system and page structure
-@import "scaffolding.less";
-@import "grid.less";
-@import "layouts.less";
-
-// Base CSS
-@import "type.less";
-@import "code.less";
-@import "forms.less";
-@import "tables.less";
-
-// Components: common
-@import "sprites.less";
-@import "dropdowns.less";
-@import "wells.less";
-@import "component-animations.less";
-@import "close.less";
-
-// Components: Nav
-@import "navs.less";
-@import "navbar.less";
-@import "breadcrumbs.less";
-@import "pagination.less";
-@import "pager.less";
-
-// Components: Popovers
-@import "modals.less";
-@import "tooltip.less";
-@import "popovers.less";
-
-// Components: Buttons & Alerts
-@import "buttons.less";
-@import "button-groups.less";
-@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
-
-// Components: Misc
-@import "thumbnails.less";
-@import "labels.less";
-@import "progress-bars.less";
-@import "accordion.less";
-@import "carousel.less";
-@import "hero-unit.less";
-
-// Utility classes
-@import "utilities.less"; // Has to be last to override when necessary
diff --git a/lib/breadcrumbs.less b/lib/breadcrumbs.less
deleted file mode 100644
index 19b8081e1..000000000
--- a/lib/breadcrumbs.less
+++ /dev/null
@@ -1,22 +0,0 @@
-// BREADCRUMBS
-// -----------
-
-.breadcrumb {
-  padding: 7px 14px;
-  margin: 0 0 @baseLineHeight;
-  #gradient > .vertical(@white, #f5f5f5);
-  border: 1px solid #ddd;
-  .border-radius(3px);
-  .box-shadow(inset 0 1px 0 @white);
-  li {
-    display: inline;
-    text-shadow: 0 1px 0 @white;
-  }
-  .divider {
-    padding: 0 5px;
-    color: @grayLight;
-  }
-  .active a {
-    color: @grayDark;
-  }
-}
diff --git a/lib/button-groups.less b/lib/button-groups.less
deleted file mode 100644
index 5fb0a8e97..000000000
--- a/lib/button-groups.less
+++ /dev/null
@@ -1,121 +0,0 @@
-// BUTTON GROUPS
-// -------------
-
-
-// Make the div behave like a button
-.btn-group {
-  position: relative;
-  .clearfix(); // clears the floated buttons
-}
-
-// Space out series of button groups
-.btn-group + .btn-group {
-  margin-left: 5px;
-}
-
-// Optional: Group multiple button groups together for a toolbar
-.btn-toolbar {
-  .btn-group {
-    display: inline-block;
-  }
-}
-
-// Float them, remove border radius, then re-add to first and last elements
-.btn-group .btn {
-  position: relative;
-  float: left;
-  margin-left: -1px;
-  .border-radius(0);
-}
-// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
-.btn-group .btn:first-child {
-  margin-left: 0;
-     -webkit-border-top-left-radius: 4px;
-         -moz-border-radius-topleft: 4px;
-             border-top-left-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-      -moz-border-radius-bottomleft: 4px;
-          border-bottom-left-radius: 4px;
-}
-.btn-group .btn:last-child,
-.btn-group .dropdown-toggle {
-     -webkit-border-top-right-radius: 4px;
-         -moz-border-radius-topright: 4px;
-             border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-      -moz-border-radius-bottomright: 4px;
-          border-bottom-right-radius: 4px;
-}
-// Reset corners for large buttons
-.btn-group .btn.large:first-child {
-  margin-left: 0;
-     -webkit-border-top-left-radius: 6px;
-         -moz-border-radius-topleft: 6px;
-             border-top-left-radius: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-      -moz-border-radius-bottomleft: 6px;
-          border-bottom-left-radius: 6px;
-}
-.btn-group .btn.large:last-child,
-.btn-group .large.dropdown-toggle {
-     -webkit-border-top-right-radius: 6px;
-         -moz-border-radius-topright: 6px;
-             border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-      -moz-border-radius-bottomright: 6px;
-          border-bottom-right-radius: 6px;
-}
-
-// On hover/focus/active, bring the proper btn to front
-.btn-group .btn:hover,
-.btn-group .btn:focus,
-.btn-group .btn:active {
-  z-index: 2;
-}
-
-
-// Split button dropdowns
-// ----------------------
-
-// Give the line between buttons some depth
-.btn-group .dropdown-toggle {
-  padding-left: 8px;
-  padding-right: 8px;
-  @shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
-}
-
-// Reposition menu on open and round all corners
-.btn-group.open .dropdown-menu {
-  display: block;
-  margin-top: 1px;
-  .border-radius(5px);
-}
-.btn-group.open .dropdown-toggle {
-  background-image: none;
-  @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
-}
-
-// Reposition the caret
-.btn .caret {
-  margin-top: 6px;
-  margin-left: 0;
-}
-
-// Account for other colors
-.primary,
-.danger,
-.info,
-.success {
-  .caret {
-    border-top-color: @white;
-    .opacity(75);
-  }
-}
-
-// Small button dropdowns
-.btn.small .caret {
-  margin-top: 4px;
-}
-
diff --git a/lib/buttons.less b/lib/buttons.less
deleted file mode 100644
index d7f533783..000000000
--- a/lib/buttons.less
+++ /dev/null
@@ -1,151 +0,0 @@
-// BUTTON STYLES
-// -------------
-
-
-// Colors
-// ------
-
-.btn {
-  // Set text color
-  &.primary,
-  &.primary:hover,
-  &.danger,
-  &.danger:hover,
-  &.success,
-  &.success:hover,
-  &.info,
-  &.info:hover {
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-    color: @white
-  }
-  &.primary {
-    .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 15));
-  }
-  // Danger and error appear as red
-  &.danger {
-    .buttonBackground(#ee5f5b, #c43c35);
-  }
-  // Success appears as green
-  &.success {
-    .buttonBackground(#62c462, #57a957);
-  }
-  // Info appears as a neutral blue
-  &.info {
-    .buttonBackground(#5bc0de, #339bb9);
-  }
-}
-
-
-// Mixin for generating button backgrounds
-// ---------------------------------------
-.buttonBackground(@startColor, @endColor) {
-  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
-  .gradientBar(@startColor, @endColor);
-
-  // in these cases the gradient won't cover the background, so we override
-  &:hover, &:active, &.active, &.disabled {
-    background-color: @endColor;
-  }
-
-  // called out separately because IE8 would ignore otherwise
-  &[disabled] {
-    background-color: @endColor;
-  }
-
-  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
-  &:active,
-  &.active {
-    background-color: darken(@endColor, 10%) e("\9");
-  }
-}
-
-
-// Base styles
-// -----------
-
-.btn {
-  // Button Base
-  display: inline-block;
-  padding: 4px 10px 4px;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  color: @grayDark;
-  text-shadow: 0 1px 1px rgba(255,255,255,.75);
-  #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
-  border: 1px solid #ccc;
-  border-bottom-color: #bbb;
-  .border-radius(4px);
-  @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
-  cursor: pointer;
-
-  &:hover {
-    color: @grayDark;
-    text-decoration: none;
-    background-color: darken(@white, 10%);
-    background-position: 0 -15px;
-
-    // transition is only when going to hover, otherwise the background
-    // behind the gradient (there for IE<=9 fallback) gets mismatched
-    .transition(background-position .1s linear);
-  }
-
-  // Focus state for keyboard and accessibility
-  &:focus {
-    outline: 1px dotted #666;
-  }
-
-  // Active and Disabled states
-  &.active,
-  &:active {
-    background-image: none;
-    @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-    .box-shadow(@shadow);
-    background-color: darken(@white, 10%);
-    background-color: darken(@white, 15%) e("\9");
-  }
-  &.disabled {
-    cursor: default;
-    background-image: none;
-    background-color: darken(@white, 10%);
-    .opacity(65);
-    .box-shadow(none);
-  }
-  &[disabled] {
-    // disabled pseudo can't be included with .disabled
-    // def because IE8 and below will drop it ;_;
-    cursor: default;
-    background-image: none;
-    background-color: darken(@white, 10%);
-    .opacity(65);
-    .box-shadow(none);
-  }
-
-  // Button Sizes
-  &.large {
-    padding: 9px 14px 9px;
-    font-size: @baseFontSize + 2px;
-    line-height: normal;
-    .border-radius(5px);
-  }
-  &.large .icon {
-    margin-top: 1px;
-  }
-  &.small {
-    padding: 5px 9px 5px;
-    font-size: @baseFontSize - 2px;
-    line-height: @baseLineHeight - 2px;
-  }
-  &.small .icon {
-    margin-top: -2px;
-  }
-}
-
-// Help Firefox not be a jerk about adding extra padding to buttons
-button.btn,
-input[type=submit].btn {
-  &::-moz-focus-inner {
-  	padding: 0;
-  	border: 0;
-  }
-}
diff --git a/lib/carousel.less b/lib/carousel.less
deleted file mode 100644
index 254a9f60c..000000000
--- a/lib/carousel.less
+++ /dev/null
@@ -1,114 +0,0 @@
-// CAROUSEL
-// --------
-
-.carousel {
-  position: relative;
-  line-height: 1;
-}
-
-.carousel-inner {
-  overflow: hidden;
-  width: 100%;
-  position: relative;
-}
-
-.carousel {
-
-  .item {
-    display: none;
-    position: relative;
-    .transition(.6s ease-in-out left);
-  }
-
-  // Account for jankitude on images
-  .item > img {
-    display: block;
-    line-height: 1;
-  }
-
-  .active, 
-  .next, 
-  .prev { display: block; }
-
-  .active {
-    left: 0;
-  }
-
-  .next, 
-  .prev {
-    position: absolute;
-    top: 0;
-    width: 100%;
-  }
-
-  .next {
-    left: 100%;
-  }
-  .prev {
-    left: -100%;
-  }
-  .next.left, 
-  .prev.right {
-    left: 0;
-  }
-
-  .active.left {
-    left: -100%;
-  }
-  .active.right {
-    left: 100%;
-  }
-
-}
-
-// Left/right controls for nav
-// ---------------------------
-
-.carousel-control {
-  position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: @white;
-  text-align: center;
-  background: @grayDarker;
-  border: 3px solid @white;
-  .border-radius(23px);
-  .opacity(50);
-  .transition(all .2s linear);
-
-  // Reposition the right one
-  &.right {
-    left: auto;
-    right: 15px;
-  }
-
-  // Hover state
-  &:hover {
-    color: @white;
-    text-decoration: none;
-    .opacity(90);
-  }
-}
-
-// Caption for text below images
-// -----------------------------
-
-.carousel-caption {
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding: 10px 15px 5px;
-  background: @grayDark;
-  background: rgba(0,0,0,.75);
-}
-.carousel-caption h4,
-.carousel-caption p {
-  color: @white;
-}
diff --git a/lib/close.less b/lib/close.less
deleted file mode 100644
index a0e5edba1..000000000
--- a/lib/close.less
+++ /dev/null
@@ -1,18 +0,0 @@
-// CLOSE ICONS
-// -----------
-
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: @baseLineHeight;
-  color: @black;
-  text-shadow: 0 1px 0 rgba(255,255,255,1);
-  .opacity(20);
-  &:hover {
-    color: @black;
-    text-decoration: none;
-    .opacity(40);
-    cursor: pointer;
-  }
-}
diff --git a/lib/code.less b/lib/code.less
deleted file mode 100644
index 0cc3db857..000000000
--- a/lib/code.less
+++ /dev/null
@@ -1,44 +0,0 @@
-// Code.less
-// Code typography styles for the  and 
       elements
-// --------------------------------------------------------
-
-// Inline and block code styles
-code,
-pre {
-  padding: 0 3px 2px;
-  #font > #family > .monospace;
-  font-size: @baseFontSize - 1;
-  color: @grayDark;
-  .border-radius(3px);
-}
-code {
-  padding: 3px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-pre {
-  display: block;
-  padding: (@baseLineHeight - 1) / 2;
-  margin: 0 0 @baseLineHeight / 2;
-  font-size: 12px;
-  line-height: @baseLineHeight;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc; // fallback for IE7-8
-  border: 1px solid rgba(0,0,0,.15);
-  .border-radius(4px);
-  white-space: pre;
-  white-space: pre-wrap;
-  word-break: break-all;
-
-  // Make prettyprint styles more spaced out for readability
-  &.prettyprint {
-    margin-bottom: @baseLineHeight;
-  }
-
-  // Account for some code outputs that place code tags in pre tags
-  code {
-    padding: 0;
-    background-color: transparent;
-  }
-}
diff --git a/lib/component-animations.less b/lib/component-animations.less
deleted file mode 100644
index 4f2a4fd11..000000000
--- a/lib/component-animations.less
+++ /dev/null
@@ -1,18 +0,0 @@
-// COMPONENT ANIMATIONS
-// --------------------
-
-.fade {
-  .transition(opacity .15s linear);
-  opacity: 0;
-  &.in {
-    opacity: 1;
-  }
-}
-
-.collapse {
-  .transition(height .35s ease);
-  position:relative;
-  overflow:hidden;
-  height: 0;
-  &.in { height: auto; }
-}
diff --git a/lib/dropdowns.less b/lib/dropdowns.less
deleted file mode 100644
index 06114b254..000000000
--- a/lib/dropdowns.less
+++ /dev/null
@@ -1,110 +0,0 @@
-// DROPDOWN MENUS
-// --------------
-
-// Use the .menu class on any 
    •  element within the topbar or ul.tabs and you'll get some superfancy dropdowns
-.dropdown {
-  position: relative;
-}
-// Dropdown arrow/caret
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  text-indent: -99999px;
-  vertical-align: top;
-  border-left:  4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top:   4px solid @black;
-  .opacity(30);
-  content: "\2193";
-}
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
-  *margin-top: 7px;
-}
-.dropdown:hover .caret,
-.open.dropdown .caret {
-  .opacity(100);
-}
-// The dropdown menu (ul)
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  z-index: @zindexDropdown;
-  float: left;
-  display: none; // none by default, but block on "open" of the menu
-  min-width: 160px;
-  max-width: 220px;
-  _width: 160px;
-  padding: 4px 0;
-  margin: 0; // override default ul
-  list-style: none;
-  background-color: @white;
-  border-color: #ccc;
-  border-color: rgba(0,0,0,.2);
-  border-style: solid;
-  border-width: 1px;
-  .border-radius(0 0 5px 5px);
-  .box-shadow(0 5px 10px rgba(0,0,0,.2));
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-  zoom: 1; // do we need this?
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-
-  // Allow for dropdowns to go bottom up (aka, dropup-menu)
-  &.bottom-up {
-    top: auto;
-    bottom: 100%;
-    margin-bottom: 2px;
-  }
-
-  // Dividers (basically an hr) within the dropdown
-  .divider {
-    height: 1px;
-    margin: 5px 1px;
-    overflow: hidden;
-    background-color: #e5e5e5;
-    border-bottom: 1px solid @white;
-  }
-
-  // Links within the dropdown menu
-  a {
-    display: block;
-    padding: 3px 15px;
-    clear: both;
-    font-weight: normal;
-    line-height: 18px;
-    color: @gray;
-    white-space: nowrap;
-  }
-}
-
-// Hover state
-.dropdown-menu li > a:hover,
-.dropdown-menu .active > a,
-.dropdown-menu .active > a:hover {
-  color: @white;
-  text-decoration: none;
-  background-color: @linkColor;
-}
-
-// Open state for the dropdown
-.dropdown.open {
-  .dropdown-toggle {
-    color: @white;
-    background: #ccc;
-    background: rgba(0,0,0,.3);
-  }
-  .dropdown-menu {
-    display: block;
-  }
-}
-
-// Typeahead
-.typeahead {
-  margin-top: 2px; // give it some space to breathe
-  .border-radius(4px);
-}
diff --git a/lib/forms.less b/lib/forms.less
deleted file mode 100644
index 9e2e1dc1b..000000000
--- a/lib/forms.less
+++ /dev/null
@@ -1,514 +0,0 @@
-// Forms.less
-// Base styles for various input types, form layouts, and states
-// -------------------------------------------------------------
-
-
-// GENERAL STYLES
-// --------------
-
-// Make all forms have space below them
-form {
-  margin: 0 0 @baseLineHeight;
-}
-
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-// Groups of fields with labels on top (legends)
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: @baseLineHeight * 1.5;
-  font-size: @baseFontSize * 1.5;
-  line-height: @baseLineHeight * 2;
-  color: @grayDark;
-  border: 0;
-  border-bottom: 1px solid #eee;
-}
-
-// Set font for forms
-label,
-input,
-button,
-select,
-textarea {
-  #font > .sans-serif(@baseFontSize,normal,@baseLineHeight);
-}
-
-// Identify controls by their labels
-label {
-  display: block;
-  margin-bottom: 5px;
-  color: @grayDark;
-}
-
-// Inputs, Textareas, Selects
-input,
-textarea,
-select,
-.uneditable-input {
-  display: inline-block;
-  width: 210px;
-  height: @baseLineHeight;
-  padding: 4px;
-  margin-bottom: 9px;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  color: @gray;
-  border: 1px solid #ccc;
-  .border-radius(3px);
-}
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-
-// Inputs within a label
-label input,
-label textarea,
-label select {
-  display: block;
-}
-
-// Mini reset for unique input types
-input[type=image],
-input[type=checkbox],
-input[type=radio] {
-  width: auto;
-  height: auto;
-  padding: 0;
-  margin: 3px 0;
-  *margin-top: 0; /* IE7 */
-  line-height: normal;
-  border: none;
-  cursor: pointer;
-  .border-radius(0);
-}
-
-// Reset the file input to browser defaults
-input[type=file] {
-  padding: initial;
-  line-height: initial;
-  border: initial;
-  background-color: @white;
-  background-color: initial;
-  .box-shadow(none);
-}
-
-// Help out input buttons
-input[type=button],
-input[type=reset],
-input[type=submit] {
-  width: auto;
-  height: auto;
-}
-
-// Set the height of select and file controls to match text inputs
-select,
-input[type=file] {
-  height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
-  *margin-top: 4px; /* For IE7, add top margin to align select with labels */
-  line-height: 28px;
-}
-
-// Chrome on Linux and Mobile Safari need background-color
-select {
-  width: 220px; // default input width + 10px of padding that doesn't get applied
-  background-color: @white;
-}
-
-// Make multiple select elements height not fixed
-select[multiple],
-select[size] {
-  height: auto;
-}
-
-// Remove shadow from image inputs
-input[type=image] {
-  .box-shadow(none);
-}
-
-// Make textarea height behave
-textarea {
-  height: auto;
-}
-
-// Hidden inputs
-input[type=hidden] {
-  display: none;
-}
-
-
-
-// CHECKBOXES & RADIOS
-// -------------------
-
-// Indent the labels to position radios/checkboxes as hanging
-.radio,
-.checkbox {
-  padding-left: 18px;
-}
-.radio input[type=radio],
-.checkbox input[type=checkbox] {
-  float: left;
-  margin-left: -18px;
-}
-
-// Move the options list down to align with labels
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px; // has to be padding because margin collaspes
-}
-
-// Radios and checkboxes on same line
-.radio.inline,
-.checkbox.inline {
-  display: inline-block;
-  margin-bottom: 0;
-}
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
-  margin-left: 10px; // space out consecutive inline controls
-}
-
-
-
-// FOCUS STATE
-// -----------
-
-input,
-textarea {
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
-  @transition: border linear .2s, box-shadow linear .2s;
-  .transition(@transition);
-}
-input:focus,
-textarea:focus {
-  border-color: rgba(82,168,236,.8);
-  @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-  .box-shadow(@shadow);
-  outline: 0;
-}
-input[type=file]:focus,
-input[type=checkbox]:focus,
-select:focus {
-  .box-shadow(none); // override for file inputs
-  outline: 1px dotted #666; // Selet elements don't get box-shadow styles, so instead we do outline
-}
-
-
-
-// INPUT SIZES
-// -----------
-
-// General classes for quick sizes
-.input-mini       { width: 60px; }
-.input-small      { width: 90px; }
-.input-medium     { width: 150px; }
-.input-large      { width: 210px; }
-.input-xlarge     { width: 270px; }
-.input-xxlarge    { width: 530px; }
-
-// Grid style input sizes
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input {
-  float: none;
-  margin-left: 0;
-}
-
-// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
-.inputColumns(@columnSpan: 1) {
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
-}
-input,
-textarea,
-.uneditable-input {
-  // Default columns
-  &.span1     { .inputColumns(1); }
-  &.span2     { .inputColumns(2); }
-  &.span3     { .inputColumns(3); }
-  &.span4     { .inputColumns(4); }
-  &.span5     { .inputColumns(5); }
-  &.span6     { .inputColumns(6); }
-  &.span7     { .inputColumns(7); }
-  &.span8     { .inputColumns(8); }
-  &.span9     { .inputColumns(9); }
-  &.span10    { .inputColumns(10); }
-  &.span11    { .inputColumns(11); }
-  &.span12    { .inputColumns(12); }
-}
-
-.selectColumns(@columnSpan: 1) {
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) + 10;
-}
-select {
-  &.span1     { .selectColumns(1); }
-  &.span2     { .selectColumns(2); }
-  &.span3     { .selectColumns(3); }
-  &.span4     { .selectColumns(4); }
-  &.span5     { .selectColumns(5); }
-  &.span6     { .selectColumns(6); }
-  &.span7     { .selectColumns(7); }
-  &.span8     { .selectColumns(8); }
-  &.span9     { .selectColumns(9); }
-  &.span10    { .selectColumns(10); }
-  &.span11    { .selectColumns(11); }
-  &.span12    { .selectColumns(12); }
-}
-
-
-
-// DISABLED STATE
-// --------------
-
-// Disabled and read-only inputs
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  background-color: #f5f5f5;
-  border-color: #ddd;
-  cursor: not-allowed;
-}
-
-
-
-
-// FORM FIELD FEEDBACK STATES
-// --------------------------
-
-// Mixin for form field states
-.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
-  // Set the text color
-  > label,
-  .help-block,
-  .help-inline {
-    color: @textColor;
-  }
-  // Style inputs accordingly
-  input,
-  select,
-  textarea {
-    color: @textColor;
-    border-color: @borderColor;
-    &:focus {
-      border-color: darken(@borderColor, 10%);
-      .box-shadow(0 0 6px lighten(@borderColor, 20%));
-    }
-  }
-  // Give a small background color for input-prepend/-append
-  .input-prepend .add-on,
-  .input-append .add-on {
-    color: @textColor;
-    background-color: @backgroundColor;
-    border-color: @textColor;
-  }
-}
-// Warning
-.control-group.warning {
-  .formFieldState(@warningText, @warningText, @warningBackground);
-}
-// Error
-.control-group.error {
-  .formFieldState(@errorText, @errorText, @errorBackground);
-}
-// Success
-.control-group.success {
-  .formFieldState(@successText, @successText, @successBackground);
-}
-
-// HTML5 invalid states
-// Shares styles with the .control-group.error above
-input:focus:required:invalid,
-textarea:focus:required:invalid,
-select:focus:required:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-  &:focus {
-    border-color: darken(#ee5f5b, 10%);
-    .box-shadow(0 0 6px lighten(#ee5f5b, 20%));    
-  }
-}
-
-
-
-// FORM ACTIONS
-// ------------
-
-.form-actions {
-  padding: (@baseLineHeight - 1) 20px @baseLineHeight;
-  margin-top: @baseLineHeight;
-  margin-bottom: @baseLineHeight;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-}
-
-// For text that needs to appear as an input but should not be an input
-.uneditable-input {
-  display: block;
-  background-color: @white;
-  border-color: #eee;
-  .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-  cursor: not-allowed;
-}
-
-// Placeholder text gets special styles; can't be bundled together though for some reason
-.placeholder(@grayLight);
-
-
-
-// HELP TEXT
-// ---------
-
-.help-block {
-  margin-top: 5px;
-  margin-bottom: 0;
-  color: @grayLight;
-}
-
-.help-inline {
-  display: inline-block;
-  margin-bottom: 9px;
-  vertical-align: middle;
-  padding-left: 5px;
-}
-
-
-
-// INPUT GROUPS
-// ------------
-
-// Allow us to put symbols and text within the input field for a cleaner look
-.input-prepend,
-.input-append {
-  margin-bottom: 5px;
-  .clearfix(); // Clear the float to prevent wrapping
-  input,
-  .uneditable-input {
-    .border-radius(0 3px 3px 0);
-  }
-  .uneditable-input {
-    border-left-color: #ccc;
-  }
-  .add-on {
-    float: left;
-    display: block;
-    width: auto;
-    min-width: 16px;
-    height: @baseLineHeight;
-    margin-right: -1px;
-    padding: 4px 4px 4px 5px;
-    font-weight: normal;
-    line-height: @baseLineHeight;
-    color: @grayLight;
-    text-align: center;
-    text-shadow: 0 1px 0 @white;
-    background-color: #f5f5f5;
-    border: 1px solid #ccc;
-    .border-radius(3px 0 0 3px);
-  }
-  .active {
-    background-color: lighten(@green, 30);
-    border-color: @green;
-  }
-}
-.input-prepend {
-  .add-on {
-    *margin-top: 1px; /* IE6-7 */
-  }
-}
-.input-append {
-  input,
-  .uneditable-input {
-    float: left;
-    .border-radius(3px 0 0 3px);
-  }
-  .uneditable-input {
-    border-right-color: #ccc;    
-  }
-  .add-on {
-    margin-right: 0;
-    margin-left: -1px;
-    .border-radius(0 3px 3px 0);
-  }
-}
-
-
-
-// SEARCH FORM
-// -----------
-
-.search-query {
-  padding-left: 14px;
-  padding-right: 14px;
-  margin-bottom: 0; // remove the default margin on all inputs
-  .border-radius(14px);
-}
-
-
-
-// HORIZONTAL & VERTICAL FORMS
-// ---------------------------
-
-// Common properties
-// -----------------
-
-.form-search,
-.form-inline,
-.form-horizontal {
-  input,
-  textarea,
-  select,
-  .help-inline,
-  .uneditable-input {
-    display: inline-block;
-    margin-bottom: 0;
-  }
-}
-.form-search label,
-.form-inline label {
-  display: inline-block;
-}
-
-// Margin to space out fieldsets
-.control-group {
-  margin-bottom: @baseLineHeight / 2;
-}
-
-// Horizontal-specific styles
-// --------------------------
-
-.form-horizontal {
-  // Legend collapses margin, so we're relegated to padding
-  legend + .control-group {
-    margin-top: @baseLineHeight;
-    -webkit-margin-top-collapse: separate;
-  }
-  // Increase spacing between groups
-  .control-group {
-    margin-bottom: @baseLineHeight;
-  }
-  // Float the labels left
-  .control-group > label {
-    float: left;
-    width: 140px;
-    padding-top: 5px;
-    text-align: right;
-  }
-  // Move over all input controls and content
-  .controls {
-    margin-left: 160px;
-  }
-  // Move over buttons in .form-actions to align with .controls
-  .form-actions {
-    padding-left: 160px;
-  }
-}
diff --git a/lib/grid.less b/lib/grid.less
deleted file mode 100644
index d5b5f487d..000000000
--- a/lib/grid.less
+++ /dev/null
@@ -1,41 +0,0 @@
-// GRID SYSTEM
-// -----------
-// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
-.row {
-  margin-left: @gridGutterWidth * -1;
-  .clearfix();
-}
-
-// Find all .span# classes within .row and give them the necessary properties for grid columns 
-// (supported by all browsers back to IE7)
-// Credit to @dhg for the idea
-[class*="span"] {
-  .gridColumn();
-}
-
-// Default columns
-.span1     { .columns(1); }
-.span2     { .columns(2); }
-.span3     { .columns(3); }
-.span4     { .columns(4); }
-.span5     { .columns(5); }
-.span6     { .columns(6); }
-.span7     { .columns(7); }
-.span8     { .columns(8); }
-.span9     { .columns(9); }
-.span10    { .columns(10); }
-.span11    { .columns(11); }
-.span12    { .columns(12); }
-
-// Offset column options
-.offset1   { .offset(1); }
-.offset2   { .offset(2); }
-.offset3   { .offset(3); }
-.offset4   { .offset(4); }
-.offset5   { .offset(5); }
-.offset6   { .offset(6); }
-.offset7   { .offset(7); }
-.offset8   { .offset(8); }
-.offset9   { .offset(9); }
-.offset10  { .offset(10); }
-.offset11  { .offset(11); }
diff --git a/lib/hero-unit.less b/lib/hero-unit.less
deleted file mode 100644
index cba1cc46c..000000000
--- a/lib/hero-unit.less
+++ /dev/null
@@ -1,20 +0,0 @@
-// HERO UNIT
-// ---------
-
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  background-color: #f5f5f5;
-  .border-radius(6px);
-  h1 {
-    margin-bottom: 0;
-    font-size: 60px;
-    line-height: 1;
-    letter-spacing: -1px;
-  }
-  p {
-    font-size: 18px;
-    font-weight: 200;
-    line-height: @baseLineHeight * 1.5;
-  }
-}
diff --git a/lib/labels.less b/lib/labels.less
deleted file mode 100644
index 06dc7f3c0..000000000
--- a/lib/labels.less
+++ /dev/null
@@ -1,16 +0,0 @@
-// LABELS
-// ------
-
-.label {
-  padding: 1px 3px 2px;
-  font-size: @baseFontSize * .75;
-  font-weight: bold;
-  color: @white;
-  text-transform: uppercase;
-  background-color: @grayLight;
-  .border-radius(3px);
-  &.important { background-color: @errorText; }
-  &.warning   { background-color: @orange; }
-  &.success   { background-color: @successText; }
-  &.info      { background-color: @infoText; }
-}
diff --git a/lib/layouts.less b/lib/layouts.less
deleted file mode 100644
index 14435c9d1..000000000
--- a/lib/layouts.less
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Layouts
-// Fixed-width and fluid (with sidebar) layouts
-// --------------------------------------------
-
-
-// Container (centered, fixed-width layouts)
-.container {
-  .container-fixed();
-}
-
-// Fluid layouts (left aligned, with sidebar, min- & max-width content)
-.fluid-container {
-  position: relative;
-  min-width: @siteWidth;
-  padding-left: @gridGutterWidth;
-  padding-right: @gridGutterWidth;
-  .clearfix();
-}
-
-// Sidebars (left and right options)
-.fluid-sidebar {
-  width: @fluidSidebarWidth;
-  margin: 0 20px 18px;
-}
-.sidebar-left   { padding-left: @fluidSidebarWidth + @gridGutterWidth * 2; }
-.sidebar-right  { padding-right: @fluidSidebarWidth + @gridGutterWidth * 2; }
-
-// Float the sidebars accordingly
-.sidebar-left .fluid-sidebar {
-  float: left;
-  margin-left: (@fluidSidebarWidth + @gridGutterWidth) * -1;
-}
-.sidebar-right .fluid-sidebar {
-  float: right;
-  margin-right: (@fluidSidebarWidth + @gridGutterWidth) * -1;
-}
-
-// The main content area
-.fluid-content {
-  float: left;
-  width: 100%;
-}
diff --git a/lib/mixins.less b/lib/mixins.less
deleted file mode 100644
index dd331ebf2..000000000
--- a/lib/mixins.less
+++ /dev/null
@@ -1,360 +0,0 @@
-// Mixins.less
-// Snippets of reusable CSS to develop faster and keep code readable
-// -----------------------------------------------------------------
-
-
-// UTILITY MIXINS
-// --------------------------------------------------
-
-// Clearfix
-// -------------------------
-// For clearing floats like a boss h5bp.com/q
-.clearfix() {
-  *zoom: 1;
-  &:before,
-  &:after {
-    display: table;
-    content: "";
-  }
-  &:after {
-    clear: both;
-  }
-}
-
-// Center-align a block level element
-// -------------------------
-.center-block() {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-// IE7 inline-block
-// -------------------------
-.ie7-inline-block() {
-  *display: inline; /* IE7 inline-block hack */
-  *zoom: 1;
-}
-
-// Sizing shortcuts
-// -------------------------
-.size(@height: 5px, @width: 5px) {
-  width: @width;
-  height: @height;
-}
-.square(@size: 5px) {
-  .size(@size, @size);
-}
-
-// Placeholder text
-// -------------------------
-.placeholder(@color: @placeholderText) {
-  :-moz-placeholder {
-    color: @color;
-  }
-  ::-webkit-input-placeholder {
-    color: @color;
-  }
-}
-
-
-
-// FONTS
-// --------------------------------------------------
-
-#font {
-  #family {
-    .serif() {
-      font-family: Georgia, "Times New Roman", Times, serif;
-    }
-    .sans-serif() {
-      font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    }
-    .monospace() {
-      font-family: Menlo, Monaco, "Courier New", monospace;
-    }
-  }
-  .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    font-size: @size;
-    font-weight: @weight;
-    line-height: @lineHeight;
-  }
-  .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .serif;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-  .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .sans-serif;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-  .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .monospace;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-}
-
-
-
-// GRID SYSTEM
-// --------------------------------------------------
-
-// Site container
-// -------------------------
-.container-fixed() {
-  width: @siteWidth;
-  margin-left: auto;
-  margin-right: auto;
-  .clearfix();
-}
-
-// Columns and offseting
-// -------------------------
-.columns(@columns: 1) {
-  width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-}
-.offset(@columns: 1) {
-  margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
-}
-// Necessary grid styles for every column to make them appear next to each other horizontally
-.gridColumn() {
-  float: left;
-  margin-left: @gridGutterWidth;
-}
-// makeColumn can be used to mark any element (e.g., .content-primary) as a column without changing markup to .span something
-.makeColumn(@columnSpan: 1) {
-  .gridColumn();
-  .columns(@columnSpan);
-}
-
-
-
-// CSS3 PROPERTIES
-// --------------------------------------------------
-
-// Border Radius
-.border-radius(@radius: 5px) {
-  -webkit-border-radius: @radius;
-     -moz-border-radius: @radius;
-          border-radius: @radius;
-}
-
-// Drop shadows
-.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
-  -webkit-box-shadow: @shadow;
-     -moz-box-shadow: @shadow;
-          box-shadow: @shadow;
-}
-
-// Transitions
-.transition(@transition) {
-  -webkit-transition: @transition;
-     -moz-transition: @transition;
-      -ms-transition: @transition;
-       -o-transition: @transition;
-          transition: @transition;
-}
-
-// Transformations
-.rotate(@degrees) {
-  -webkit-transform: rotate(@degrees);
-     -moz-transform: rotate(@degrees);
-      -ms-transform: rotate(@degrees);
-       -o-transform: rotate(@degrees);
-          transform: rotate(@degrees);
-}
-.scale(@ratio) {
-  -webkit-transform: scale(@ratio);
-     -moz-transform: scale(@ratio);
-      -ms-transform: scale(@ratio);
-       -o-transform: scale(@ratio);
-          transform: scale(@ratio);
-}
-.translate(@x: 0, @y: 0) {
-  -webkit-transform: translate(@x, @y);
-     -moz-transform: translate(@x, @y);
-      -ms-transform: translate(@x, @y);
-       -o-transform: translate(@x, @y);
-          transform: translate(@x, @y);
-}
-
-// Background clipping
-// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
-.background-clip(@clip) {
-  -webkit-background-clip: @clip;
-     -moz-background-clip: @clip;
-          background-clip: @clip;
-}
-
-// Background sizing
-.background-size(@size){
-  -webkit-background-size: @size;
-     -moz-background-size: @size;
-       -o-background-size: @size;
-          background-size: @size;
-}
-
-
-// Box sizing
-.box-sizing(@boxmodel) {
-  -webkit-box-sizing: @boxmodel;
-     -moz-box-sizing: @boxmodel;
-          box-sizing: @boxmodel;
-}
-
-// User select
-// For selecting text on the page
-.user-select(@select) {
-  -webkit-user-select: @select;
-     -moz-user-select: @select;
-       -o-user-select: @select;
-          user-select: @select;
-}
-
-// Resize anything
-.resizable(@direction: both) {
-  resize: @direction; // Options: horizontal, vertical, both
-  overflow: auto; // Safari fix
-}
-
-// CSS3 Content Columns
-.content-columns(@columnCount, @columnGap: @gridColumnGutter) {
-  -webkit-column-count: @columnCount;
-     -moz-column-count: @columnCount;
-          column-count: @columnCount;
-  -webkit-column-gap: @columnGap;
-     -moz-column-gap: @columnGap;
-          column-gap: @columnGap;
-}
-
-// Opacity
-.opacity(@opacity: 100) {
-  opacity: @opacity / 100;
-   filter: e(%("alpha(opacity=%d)", @opacity));
-}
-
-
-
-// BACKGROUNDS
-// --------------------------------------------------
-
-// Add an alphatransparency value to any background or border color (via Elyse Holladay)
-#translucent {
-  .background(@color: @white, @alpha: 1) {
-    background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
-  }
-  .border(@color: @white, @alpha: 1) {
-    border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
-    .background-clip(padding-box);
-  }
-}
-
-// Gradient Bar Colors for buttons and alerts
-.gradientBar(@primaryColor, @secondaryColor) {
-  #gradient > .vertical(@primaryColor, @secondaryColor);
-  border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
-}
-
-// Gradients
-#gradient {
-  .horizontal(@startColor: #555, @endColor: #333) {
-    background-color: @endColor;
-    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, 0 0, 100% 0, from(@startColor), to(@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
-    background-repeat: repeat-x;
-  }
-  .vertical(@startColor: #555, @endColor: #333) {
-    background-color: mix(@startColor, @endColor, 60%);
-    background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
-    background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(top, @startColor, @endColor); // The standard
-    background-repeat: repeat-x;
-  }
-  .directional(@startColor: #555, @endColor: #333, @deg: 45deg) {
-    background-color: @endColor;
-    background-repeat: repeat-x;
-    background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+
-    background-image: -ms-linear-gradient(@deg, @startColor, @endColor); // IE10
-    background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(@deg, @startColor, @endColor); // The standard
-  }
-  .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
-    background-color: mix(@midColor, @endColor, 80%);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
-    background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
-    background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-repeat: no-repeat;
-  }
-  .radial(@innerColor: #555, @outerColor: #333)  {
-    background-color: @outsideColor;
-    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@centerColor), to(@outsideColor));
-    background-image: -webkit-radial-gradient(circle, @centerColor, @outsideColor);
-    background-image: -moz-radial-gradient(circle, @centerColor, @outsideColor);
-    background-image: -ms-radial-gradient(circle, @centerColor, @outsideColor);
-    background-repeat: no-repeat;
-    // Opera cannot do radial gradients yet
-  }
-  .striped(@color, @angle: -45deg) {
-    background-color: @color;
-    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
-    background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: -ms-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-  }
-}
-
-
-
-// COMPONENT MIXINS
-// --------------------------------------------------
-
-// POPOVER ARROWS
-// -------------------------
-// For tipsies and popovers
-#popoverArrow {
-  .top(@arrowWidth: 5px) {
-    bottom: 0;
-    left: 50%;
-    margin-left: -@arrowWidth;
-    border-left: @arrowWidth solid transparent;
-    border-right: @arrowWidth solid transparent;
-    border-top: @arrowWidth solid @black;
-  }
-  .left(@arrowWidth: 5px) {
-    top: 50%;
-    right: 0;
-    margin-top: -@arrowWidth;
-    border-top: @arrowWidth solid transparent;
-    border-bottom: @arrowWidth solid transparent;
-    border-left: @arrowWidth solid @black;
-  }
-  .bottom(@arrowWidth: 5px) {
-    top: 0;
-    left: 50%;
-    margin-left: -@arrowWidth;
-    border-left: @arrowWidth solid transparent;
-    border-right: @arrowWidth solid transparent;
-    border-bottom: @arrowWidth solid @black;
-  }
-  .right(@arrowWidth: 5px) {
-    top: 50%;
-    left: 0;
-    margin-top: -@arrowWidth;
-    border-top: @arrowWidth solid transparent;
-    border-bottom: @arrowWidth solid transparent;
-    border-right: @arrowWidth solid @black;
-  }
-}
diff --git a/lib/modals.less b/lib/modals.less
deleted file mode 100644
index 0368e01e1..000000000
--- a/lib/modals.less
+++ /dev/null
@@ -1,65 +0,0 @@
-// MODALS
-// ------
-
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: @zindexModalBackdrop;
-  background-color: @black;
-  // Fade for backdrop
-  &.fade { opacity: 0; }
-}
-
-.modal-backdrop,
-.modal-backdrop.fade.in {
-  .opacity(80);
-}
-
-.modal {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  z-index: @zindexModal;
-  max-height: 500px;
-  overflow: auto;
-  width: 560px;
-  margin: -250px 0 0 -280px;
-  background-color: @white;
-  border: 1px solid #999;
-  border: 1px solid rgba(0,0,0,.3);
-  *border: 1px solid #999; /* IE6-7 */
-  .border-radius(6px);
-  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
-  .background-clip(padding-box);
-  &.fade {
-    .transition(e('opacity .3s linear, top .3s ease-out'));
-    top: -25%;
-  }
-  &.fade.in { top: 50%; }
-}
-.modal-header {
-  padding: 5px 15px;
-  border-bottom: 1px solid #eee;
-  // Close icon
-  .close { margin-top: 2px; }
-}
-.modal-body {
-  padding: 15px;
-}
-.modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  .border-radius(0 0 6px 6px);
-  .box-shadow(inset 0 1px 0 @white);
-  .clearfix();
-  .btn {
-    float: right;
-    margin-left: 5px;
-    margin-bottom: 0; // account for input[type=submit] which gets the bottom margin like all other inputs
-  }
-}
diff --git a/lib/navbar.less b/lib/navbar.less
deleted file mode 100644
index dba95e5cd..000000000
--- a/lib/navbar.less
+++ /dev/null
@@ -1,251 +0,0 @@
-// NAVBAR (FIXED AND STATIC)
-// -------------------------
-
-
-// COMMON STYLES
-// -------------
-
-.navbar {
-  overflow: visible;
-}
-// gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
-.navbar-inner {
-  background-color: @navbarBackground;
-  #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
-  @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
-  .box-shadow(@shadow);
-}
-
-// Text and links
-.navbar {
-  // Hover and active states
-  .brand:hover {
-    color: @white;
-    text-decoration: none;
-  }
-  // Website or project name
-  .brand {
-    float: left;
-    display: block;
-    padding: 8px 20px 12px;
-    margin-left: -20px; // negative indent to left-align the text down the page
-    font-size: 20px;
-    font-weight: 200;
-    line-height: 1;
-    color: @white;
-  }
-  // Plain text in topbar
-  p {
-    margin: 0;
-    line-height: 40px;
-    a:hover {
-      color: @white;
-      background-color: transparent;
-    }
-  }
-  // Buttons in navbar
-  .btn,
-  .btn-group {
-    margin-top: 5px; // make buttons vertically centered in navbar
-  }
-  .btn-group .btn {
-    margin-top: 0;
-  }
-}
-
-// Navbar forms
-.navbar-form {
-  margin-bottom: 0; // remove default bottom margin
-  input,
-  select {
-    display: inline-block;
-    margin-bottom: 0;
-  }
-}
-
-// Navbar search
-.navbar-search {
-  position: relative;
-  float: left;
-  margin-top: 6px;
-  margin-bottom: 0;
-  .search-query {
-    padding: 4px 9px;
-    #font > .sans-serif(13px, normal, 1);
-    color: @white;
-    color: rgba(255,255,255,.75);
-    background: #444;
-    background: rgba(255,255,255,.3);
-    border: 1px solid #111;
-    @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
-    .box-shadow(@shadow);
-    .transition(none);
-
-    // Placeholder text gets special styles; can't be bundled together though for some reason
-    .placeholder(@grayLighter);
-
-    // Hover states
-    &:hover {
-      color: @white;
-      background-color: @grayLight;
-      background-color: rgba(255,255,255,.5);
-    }
-    // Focus states (we use .focused since IE8 and down doesn't support :focus)
-    &:focus,
-    &.focused {
-      padding: 5px 10px;
-      color: @grayDark;
-      text-shadow: 0 1px 0 @white;
-      background-color: @white;
-      border: 0;
-      .box-shadow(0 0 3px rgba(0,0,0,.15));
-      outline: 0;
-    }
-  }
-}
-
-
-// Static navbar
-.navbar-static {
-  margin-bottom: @baseLineHeight;
-}
-.navbar-static .navbar-inner {
-  padding-left:  20px;
-  padding-right: 20px;
-  .border-radius(4px);
-}
-
-// Fixed navbar
-.navbar-fixed {
-  position: fixed;
-  top: 0;
-  right: 0;
-  left: 0;
-  z-index: @zindexFixedNavbar;
-}
-
-
-
-// NAVIGATION
-// ----------
-
-.navbar .nav {
-  position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.navbar .nav.pull-right {
-  float: right; // redeclare due to specificity
-}
-.navbar .nav > li {
-  display: block;
-  float: left;
-}
-
-// Links
-.navbar .nav > li > a {
-  float: none;
-  padding: 10px 10px 11px;
-  line-height: 19px;
-  color: @grayLight;
-  text-decoration: none;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-}
-// Hover
-.navbar .nav > li > a:hover {
-  background-color: transparent;
-  color: @white;
-  text-decoration: none;
-}
-
-// Active nav items
-.navbar .nav .active > a {
-  color: @white;
-  text-decoration: none;
-  background-color: @grayDarker;
-  background-color: rgba(0,0,0,.5);
-}
-
-// Dividers (basically a vertical hr)
-.navbar .vertical-divider {
-  height: 40px;
-  width: 1px;
-  margin: 0 5px;
-  overflow: hidden;
-  background-color: @grayDarker;
-  border-right: 1px solid #444;
-}
-
-// Secondary (floated right) nav in topbar
-.navbar .nav.pull-right {
-  margin-left: 10px;
-  margin-right: 0;
-}
-
-
-
-// Dropdown menus
-// --------------
-
-// Menu position and menu carets
-.navbar .dropdown-menu {
-  margin-top: 1px;
-  .border-radius(4px);
-  &:before {
-    content: '';
-    display: inline-block;
-    border-left:   7px solid transparent;
-    border-right:  7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-bottom-color: rgba(0,0,0,.2);
-    position: absolute;
-    top: -7px;
-    left: 9px;
-  }
-  &:after {
-    content: '';
-    display: inline-block;
-    border-left:   6px solid transparent;
-    border-right:  6px solid transparent;
-    border-bottom: 6px solid @white;
-    position: absolute;
-    top: -6px;
-    left: 10px;
-  }
-}
-
-// Dropdown toggle caret
-.navbar .nav .dropdown-toggle .caret,
-.navbar .nav .open.dropdown .caret {
-  border-top-color: @white;
-}
-.navbar .nav .active .caret {
-  .opacity(100);
-}
-
-// Remove background color from open dropdown
-.navbar .nav .open > .dropdown-toggle,
-.navbar .nav .active > .dropdown-toggle,
-.navbar .nav .open.active > .dropdown-toggle {
-  background-color: transparent;
-}
-
-// Dropdown link on hover
-.navbar .nav .active > .dropdown-toggle:hover {
-  color: @white;
-}
-
-// Right aligned menus need alt position
-.navbar .nav.pull-right .dropdown-menu {
-  right: 0;
-  &:before {
-    left: auto;
-    right: 12px;
-  }
-  &:after {
-    left: auto;
-    right: 13px;
-  }
-}
diff --git a/lib/navs.less b/lib/navs.less
deleted file mode 100644
index cd356d9bb..000000000
--- a/lib/navs.less
+++ /dev/null
@@ -1,338 +0,0 @@
-// NAVIGATIONS
-// -----------
-
-
-
-// BASE CLASS
-// ----------
-
-.nav {
-  margin-left: 0;
-  margin-bottom: @baseLineHeight;
-  list-style: none;
-}
-
-// Make links block level
-.nav > li > a {
-  display: block;
-}
-.nav > li > a:hover {
-  text-decoration: none;
-  background-color: @grayLighter;
-}
-
-
-
-// NAV LIST
-// --------
-
-.nav.list {
-  padding-left: 14px;
-  padding-right: 14px;
-  margin-bottom: 0;
-}
-.nav.list > li > a,
-.nav.list .nav-header {
-  display: block;
-  padding: 3px 15px;
-  margin-left:  -15px;
-  margin-right: -15px;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-}
-.nav.list .nav-header {
-  font-size: 11px;
-  font-weight: bold;
-  line-height: @baseLineHeight;
-  color: @grayLight;
-  text-transform: uppercase;
-}
-.nav.list > li + .nav-header {
-  margin-top: 9px;
-}
-.nav.list .active > a {
-  color: @white;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
-  background-color: @linkColor;
-}
-
-
-
-// TABS AND PILLS
-// -------------
-
-// Common styles
-.tabs,
-.pills {
-  .clearfix();
-}
-.tabs > li,
-.pills > li {
-  float: left;
-}
-.tabs > li > a,
-.pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px; // keeps the overall height an even number
-}
-
-// TABS
-// ----
-
-// Give the tabs something to sit on
-.tabs {
-  border-bottom: 1px solid #ddd;
-}
-
-// Make the list-items overlay the bottom border
-.tabs > li {
-  margin-bottom: -1px;
-}
-
-// Actual tabs (as links)
-.tabs > li > a {
-  padding-top: 9px;
-  padding-bottom: 9px;
-  border: 1px solid transparent;
-  .border-radius(4px 4px 0 0);
-  &:hover {
-    border-color: @grayLighter @grayLighter #ddd;
-  }
-}
-// Active state, and it's :hover to override normal :hover
-.tabs > .active > a,
-.tabs > .active > a:hover {
-  color: @gray;
-  background-color: @white;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-  cursor: default;
-}
-
-// PILLS
-// -----
-
-// Links rendered as pills
-.pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  .border-radius(5px);
-}
-
-// Active state
-.pills .active > a,
-.pills .active > a:hover {
-  color: @white;
-  background-color: @linkColor;
-}
-
-
-
-// STACKED NAV
-// -----------
-
-// Stacked tabs and pills
-.nav.stacked > li {
-  float: none;
-}
-.nav.stacked > li > a {
-  margin-right: 0; // no need for the gap between nav items
-}
-
-// Tabs
-.tabs.stacked {
-  border-bottom: 0;
-}
-.tabs.stacked > li > a {
-  border: 1px solid #ddd;
-  .border-radius(0);
-}
-.tabs.stacked > li:first-child > a {
-  .border-radius(4px 4px 0 0);
-}
-.tabs.stacked > li:last-child > a {
-  .border-radius(0 0 4px 4px);
-}
-.tabs.stacked > li > a:hover {
-  border-color: #ddd;
-  z-index: 2;
-}
-
-// Pills
-.pills.stacked > li > a {
-  margin-bottom: 3px;
-}
-.pills.stacked > li:last-child > a {
-  margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
-}
-
-
-
-// DROPDOWNS
-// ---------
-
-// Position the menu
-.pills .dropdown-menu,
-.tabs .dropdown-menu {
-  margin-top: 1px;
-  border-width: 1px;
-}
-.pills .dropdown-menu {
-  .border-radius(4px);
-}
-
-// Default dropdown links
-// -------------------------
-// Make carets use linkColor to start
-.tabs .dropdown-toggle .caret,
-.pills .dropdown-toggle .caret {
-  border-top-color: @linkColor;
-  margin-top: 6px;
-}
-.tabs .dropdown-toggle:hover .caret,
-.pills .dropdown-toggle:hover .caret {
-  border-top-color: @linkColorHover;
-}
-
-// Active dropdown links
-// -------------------------
-.tabs .active .dropdown-toggle .caret,
-.pills .active .dropdown-toggle .caret {
-  border-top-color: @grayDark;
-}
-
-// Active:hover dropdown links
-// -------------------------
-.nav > .dropdown.active > a:hover {
-  color: @black;
-  cursor: pointer;
-}
-
-// Open dropdowns
-// -------------------------
-.tabs .open .dropdown-toggle,
-.pills .open .dropdown-toggle,
-.nav > .open.active > a:hover {
-  color: @white;
-  background-color: @grayLight;
-  border-color: @grayLight;
-}
-.nav .open .caret,
-.nav .open.active .caret,
-.nav .open a:hover .caret {
-  border-top-color: @white;
-  .opacity(100);
-}
-
-// Dropdowns in stacked tabs
-.tabs.stacked .open > a:hover {
-  border-color: @grayLight;
-}
-
-
-
-// TABBABLE
-// --------
-
-
-// COMMON STYLES
-// -------------
-
-// Clear any floats
-.tabbable {
-  .clearfix();
-}
-
-// Remove border on bottom, left, right
-.tabs-below .tabs,
-.tabs-right .tabs,
-.tabs-left .tabs {
-  border-bottom: 0;
-}
-
-// Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
-
-// BOTTOM
-// ------
-
-.tabs-below .tabs {
-  border-top: 1px solid #ddd;
-}
-.tabs-below .tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-.tabs-below .tabs > li > a {
-  .border-radius(0 0 4px 4px);
-  &:hover {
-    border-bottom-color: transparent;
-    border-top-color: #ddd;
-  }
-}
-.tabs-below .tabs .active > a,
-.tabs-below .tabs .active > a:hover {
-  border-color: transparent #ddd #ddd #ddd;
-}
-
-// LEFT & RIGHT
-// ------------
-
-// Common styles
-.tabs-left .tabs > li,
-.tabs-right .tabs > li {
-  float: none;
-}
-.tabs-left .tabs > li > a,
-.tabs-right .tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-
-// Tabs on the left
-.tabs-left .tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
-}
-.tabs-left .tabs > li > a {
-  margin-right: -1px;
-  .border-radius(4px 0 0 4px);
-}
-.tabs-left .tabs > li > a:hover {
-  border-color: @grayLighter #ddd @grayLighter @grayLighter;
-}
-.tabs-left .tabs .active > a,
-.tabs-left .tabs .active > a:hover {
-  border-color: #ddd transparent #ddd #ddd;
-}
-
-// Tabs on the right
-.tabs-right .tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
-}
-.tabs-right .tabs > li > a {
-  margin-left: -1px;
-  .border-radius(0 4px 4px 0);
-}
-.tabs-right .tabs > li > a:hover {
-  border-color: @grayLighter @grayLighter @grayLighter #ddd;
-}
-.tabs-right .tabs .active > a,
-.tabs-right .tabs .active > a:hover {
-  border-color: #ddd #ddd #ddd transparent;
-}
diff --git a/lib/pager.less b/lib/pager.less
deleted file mode 100644
index de009afda..000000000
--- a/lib/pager.less
+++ /dev/null
@@ -1,25 +0,0 @@
-// PAGER
-// -----
-
-.pager {
-  margin-left: 0;
-  margin-bottom: @baseLineHeight;
-  list-style: none;
-  text-align: center;
-  .clearfix();
-}
-.pager li {
-  display: inline;
-}
-.pager a {
-  display: inline-block;
-  padding: 6px 15px;
-  background-color: #f5f5f5;
-  .border-radius(15px);
-}
-.pager .next a {
-  float: right;
-}
-.pager .previous a {
-  float: left;
-}
diff --git a/lib/pagination.less b/lib/pagination.less
deleted file mode 100644
index 8ecb2a401..000000000
--- a/lib/pagination.less
+++ /dev/null
@@ -1,54 +0,0 @@
-// PAGINATION
-// ----------
-
-.pagination {
-  height: @baseLineHeight * 2;
-  margin: @baseLineHeight 0;
- }
-.pagination ul {
-  display: inline-block;
-  .ie7-inline-block();
-  margin-left: 0;
-  margin-bottom: 0;
-  .border-radius(3px);
-  .box-shadow(0 1px 2px rgba(0,0,0,.05));
-}
-.pagination li {
-    display: inline;
-  }
-.pagination a {
-  float: left;
-  padding: 0 14px;
-  line-height: (@baseLineHeight * 2) - 2;
-  text-decoration: none;
-  border: 1px solid #ddd;
-  border-left-width: 0;
-}
-.pagination a:hover,
-.pagination .active a {
-  background-color: #f5f5f5;
-}
-.pagination .active a {
-  color: @grayLight;
-}
-.pagination .disabled a,
-.pagination .disabled a:hover {
-  color: @grayLight;
-  background-color: transparent;
-  cursor: default;
-}
-.pagination li:first-child a {
-  border-left-width: 1px;
-  .border-radius(3px 0 0 3px);
-}
-.pagination li:last-child a {
-  .border-radius(0 3px 3px 0);
-}
-
-// Centered
-.pagination-centered {
-  text-align: center;
-}
-.pagination-right {
-  text-align: right;
-}
diff --git a/lib/patterns.less b/lib/patterns.less
deleted file mode 100644
index d94b921e4..000000000
--- a/lib/patterns.less
+++ /dev/null
@@ -1,13 +0,0 @@
-// Patterns.less
-// Repeatable UI elements outside the base styles provided from the scaffolding
-// ----------------------------------------------------------------------------
-
-
-// PAGE HEADERS
-// ------------
-
-footer {
-  padding-top: @baseLineHeight - 1;
-  margin-top: @baseLineHeight - 1;
-  border-top: 1px solid #eee;
-}
diff --git a/lib/popovers.less b/lib/popovers.less
deleted file mode 100644
index 6de314d86..000000000
--- a/lib/popovers.less
+++ /dev/null
@@ -1,49 +0,0 @@
-// POPOVERS
-// --------
-
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: @zindexPopover;
-  display: none;
-  padding: 5px;
-  &.top    { margin-top:  -5px; }
-  &.right  { margin-left:  5px; }
-  &.bottom { margin-top:   5px; }
-  &.left   { margin-left: -5px; }
-  &.top .arrow    { #popoverArrow > .top(); }
-  &.right .arrow  { #popoverArrow > .right(); }
-  &.bottom .arrow { #popoverArrow > .bottom(); }
-  &.left .arrow   { #popoverArrow > .left();  }
-  .arrow {
-    position: absolute;
-    width: 0;
-    height: 0;
-  }
-  .inner {
-    padding: 3px;
-    width: 280px;
-    overflow: hidden;
-    background: @black; // has to be full background declaration for IE fallback
-    background: rgba(0,0,0,.8);
-    .border-radius(6px);
-    .box-shadow(0 3px 7px rgba(0,0,0,0.3));
-  }
-  .title {
-    padding: 9px 15px;
-    line-height: 1;
-    background-color: #f5f5f5;
-    border-bottom:1px solid #eee;
-    .border-radius(3px 3px 0 0);
-  }
-  .content {
-    padding: 14px;
-    background-color: @white;
-    .border-radius(0 0 3px 3px);
-    .background-clip(padding-box);
-    p, ul, ol {
-      margin-bottom: 0;
-    }
-  }
-}
\ No newline at end of file
diff --git a/lib/print.less b/lib/print.less
deleted file mode 100644
index 4fd45e282..000000000
--- a/lib/print.less
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!
- * Bootstrap @VERSION for Print
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: @DATE
- */
-
-
-// HIDE UNECESSARY COMPONENTS
-// --------------------------
-
-.navbar-fixed {
-  display: none;
-}
\ No newline at end of file
diff --git a/lib/progress-bars.less b/lib/progress-bars.less
deleted file mode 100644
index ff754b817..000000000
--- a/lib/progress-bars.less
+++ /dev/null
@@ -1,99 +0,0 @@
-// PROGRESS BARS
-// -------------
-
-
-// ANIMATIONS
-// ----------
-
-// Webkit
-@-webkit-keyframes progress-bar-stripes {
-  from  { background-position: 0 0; }
-  to    { background-position: 40px 0; }
-}
-
-// Temporarily commented out since LESS won't compile with this
-// @-moz-keyframes progress-bar-stripes {
-//   from  { background-position: 0 0; }
-//   to    { background-position: 40px 0; }
-// }
-
-// Spec
-@keyframes progress-bar-stripes {
-  from  { background-position: 0 0; }
-  to    { background-position: 40px 0; }
-}
-
-
-
-// THE BARS
-// --------
-
-// Common styles
-.progress,
-.progress .bar {
-  .border-radius(4px);
-}
-
-// Outer container
-.progress {
-  height: 18px;
-  margin-bottom: 18px;
-  #gradient > .vertical(#f5f5f5, #f9f9f9);
-  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
-}
-
-// Bar of progress
-.progress .bar {
-  width: 0%;
-  height: 18px;
-  color: @white;
-  font-size: 12px;
-  text-align: center;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  #gradient > .vertical(#149bdf, #0480be);
-  .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
-  .box-sizing(border-box);
-  .transition(width .6s ease);
-}
-
-// Striped bars
-.progress.striped .bar {
-  #gradient > .striped(#62c462);
-  .background-size(40px 40px);
-}
-
-// Call animation for the active one
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-     -moz-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
-}
-
-
-
-// COLORS
-// ------
-
-// Danger (red)
-.progress.danger .bar {
-  #gradient > .vertical(#ee5f5b, #c43c35);
-}
-.progress.danger.striped .bar {
-  #gradient > .striped(#ee5f5b);
-}
-
-// Success (green)
-.progress.success .bar {
-  #gradient > .vertical(#62c462, #57a957);
-}
-.progress.success.striped .bar {
-  #gradient > .striped(#62c462);
-}
-
-// Info (teal)
-.progress.info .bar {
-  #gradient > .vertical(#5bc0de, #339bb9);
-}
-.progress.info.striped .bar {
-  #gradient > .striped(#5bc0de);
-}
diff --git a/lib/reset.less b/lib/reset.less
deleted file mode 100644
index ef4dc8af6..000000000
--- a/lib/reset.less
+++ /dev/null
@@ -1,126 +0,0 @@
-// Reset.less
-// Adapted from Normalize.css http://github.com/necolas/normalize.css
-// ------------------------------------------------------------------------
-
-// Display in IE6-9 and FF3
-// -------------------------
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-  display: block;
-}
-
-// Display block in IE6-9 and FF3
-// -------------------------
-
-audio,
-canvas,
-video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-
-// Prevents modern browsers from displaying 'audio' without controls
-// -------------------------
-
-audio:not([controls]) {
-    display: none;
-}
-
-// Base settings
-// -------------------------
-
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-// Focus states
-a:focus {
-  outline: thin dotted;
-}
-// Hover & Active
-a:hover,
-a:active {
-  outline: 0;
-}
-
-// Prevents sub and sup affecting line-height in all browsers
-// -------------------------
-
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-sup {
-  top: -0.5em;
-}
-sub {
-  bottom: -0.25em;
-}
-
-// Img border in a's and image quality
-// -------------------------
-
-img {
-  max-width: 100%;
-  height: auto;
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-
-// Forms
-// -------------------------
-
-// Font size in all browsers, margin changes, misc consistency
-button,
-input,
-select,
-textarea {
-  margin: 0;
-  font-size: 100%;
-  vertical-align: middle;
-}
-button,
-input {
-  *overflow: visible; // Inner spacing ie IE6/7
-  line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
-  padding: 0;
-  border: 0;
-}
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  cursor: pointer; // Cursors on all buttons applied consistently
-  -webkit-appearance: button; // Style clicable inputs in iOS
-}
-input[type="search"] { // Appearance in Safari/Chrome
-  -webkit-appearance: textfield;
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-}
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
-}
-textarea {
-  overflow: auto; // Remove vertical scrollbar in IE6-9
-  vertical-align: top; // Readability and alignment cross-browser
-}
diff --git a/lib/responsive.less b/lib/responsive.less
deleted file mode 100644
index 2999eef4d..000000000
--- a/lib/responsive.less
+++ /dev/null
@@ -1,268 +0,0 @@
-// Responsive.less
-// For phone and tablet devices
-// -------------------------------------------------------------
-
-
-// REPEAT VARIABLES & MIXINS
-// -------------------------
-// Required since we compile the responsive stuff separately
-
-@import "variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "mixins.less";
-
-
-// RESPONSIVE CLASSES
-// ------------------
-
-// Hide from screenreaders and browsers
-// Credit: HTML5BP
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-
-// UP TO LANDSCAPE PHONE
-// ---------------------
-
-@media (max-width: 480px) {
-
-  // Make the nav work for small devices
-  .navbar {
-    .nav {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 180px;
-      padding-top: 40px;
-      list-style: none;
-    }
-    .nav,
-    .nav > li:last-child a {
-      .border-radius(0 0 4px 0);
-    }
-    .nav > li {
-      float: none;
-      display: none;
-    }
-    .nav > li > a {
-      float: none;
-      background-color: #222;
-    }
-    .nav > .active {
-      display: block;
-      position: absolute;
-      top: 0;
-      left: 0;
-    }
-    .nav > .active > a {
-      background-color: transparent;
-    }
-    .nav > .active > a:hover {
-      background-color: #333;
-    }
-    .nav > .active > a:after {
-      display: inline-block;
-      width: 0;
-      height: 0;
-      margin-top: 8px;
-      margin-left: 6px;
-      text-indent: -99999px;
-      vertical-align: top;
-      border-left: 4px solid transparent;
-      border-right: 4px solid transparent;
-      border-top: 4px solid @white;
-      .opacity(100);
-      content: "↓";
-    }
-    .nav:hover > li {
-      display: block;
-    }
-    .nav:hover > li > a:hover {
-      background-color: #333;
-    }
-  }
-
-  // Remove the horizontal form styles
-  .form-horizontal .control-group > label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  // Move over all input controls and content
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  // Move the options list down to align with labels
-  .form-horizontal .control-list {
-    padding-top: 0; // has to be padding because margin collaspes
-  }
-  // Move over buttons in .form-actions to align with .controls
-  .form-horizontal .form-actions {
-    padding-left: 0;
-  }
-
-  // Modals
-  .modal {
-    position: absolute;
-    top: 20px;
-    left: 20px;
-    right: 20px;
-    width: auto;
-    margin: 0;
-    &.fade.in { top: auto; }
-  }
-  .modal-header .close {
-    padding: 10px;
-  }
-
-}
-
-
-// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
-// --------------------------------------------------
-
-@media (max-width: 768px) {
-  
-  // Unfix the navbar
-  .navbar-fixed {
-    position: absolute;
-  }
-  .navbar-fixed .nav {
-    float: none;
-  }
-
-  // Remove width from containers
-  .container {
-    width: auto;
-    padding: 0 20px;
-  }
-  // Undo negative margin on rows
-  .row {
-    margin-left: 0;
-  }
-  // Make all columns even
-  .row > [class*="span"] {
-    float: none;
-    display: block;
-    width: auto;
-    margin: 0;
-  }
-
-}
-
-
-// PORTRAIT TABLET TO DEFAULT DESKTOP
-// ----------------------------------
-
-@media (min-width: 768px) and (max-width: 940px) {
-
-  // Reset grid variables
-  @gridColumns:       16;
-  @gridColumnWidth:   44px;
-  @gridGutterWidth:   20px;
-  @siteWidth:         748px;
-
-  // Bring grid mixins to recalculate widths
-  .columns(@columns: 1) {
-    width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-  }
-  .offset(@columns: 1) {
-    margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
-  }
-
-  // 16cols at 30px wide with 16px gutters
-  .container {
-    width: @siteWidth;
-  }
-
-  // Default columns
-  .span1     { .columns(1); }
-  .span2     { .columns(2); }
-  .span3     { .columns(3); }
-  .span4     { .columns(4); }
-  .span5     { .columns(5); }
-  .span6     { .columns(6); }
-  .span7     { .columns(7); }
-  .span8     { .columns(8); }
-  .span9     { .columns(9); }
-  .span10    { .columns(10); }
-  .span11    { .columns(11); }
-  .span12    { .columns(12); }
-
-  // Offset column options
-  .offset1   { .offset(1); }
-  .offset2   { .offset(2); }
-  .offset3   { .offset(3); }
-  .offset4   { .offset(4); }
-  .offset5   { .offset(5); }
-  .offset6   { .offset(6); }
-  .offset7   { .offset(7); }
-  .offset8   { .offset(8); }
-  .offset9   { .offset(9); }
-  .offset10  { .offset(10); }
-  .offset11  { .offset(11); }
-  .offset12  { .offset(12); }
-
-}
-
-// LARGE DESKTOP & UP
-// ------------------
-/*
-@media (min-width: 1210px) {
-
-  // Reset grid variables
-  @gridColumns:       12;
-  @gridColumnWidth:   70px;
-  @gridGutterWidth:   30px;
-  @siteWidth:         1170px;
-
-  // Bring grid mixins to recalculate widths
-  .columns(@columns: 1) {
-    width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-  }
-  .offset(@columns: 1) {
-    margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
-  }
-
-  .container {
-    width: @siteWidth;
-  }
-  .row {
-    margin-left: @gridGutterWidth * -1;
-  }
-  [class*="span"] {
-    margin-left: @gridGutterWidth;
-  }
-
-  // Default columns
-  .span1     { .columns(1); }
-  .span2     { .columns(2); }
-  .span3     { .columns(3); }
-  .span4     { .columns(4); }
-  .span5     { .columns(5); }
-  .span6     { .columns(6); }
-  .span7     { .columns(7); }
-  .span8     { .columns(8); }
-  .span9     { .columns(9); }
-  .span10    { .columns(10); }
-  .span11    { .columns(11); }
-  .span12    { .columns(12); }
-
-  // Offset column options
-  .offset1   { .offset(1); }
-  .offset2   { .offset(2); }
-  .offset3   { .offset(3); }
-  .offset4   { .offset(4); }
-  .offset5   { .offset(5); }
-  .offset6   { .offset(6); }
-  .offset7   { .offset(7); }
-  .offset8   { .offset(8); }
-  .offset9   { .offset(9); }
-  .offset10  { .offset(10); }
-  .offset11  { .offset(11); }
-  .offset12  { .offset(12); }
-
-}
-*/
\ No newline at end of file
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
deleted file mode 100644
index 3c1826830..000000000
--- a/lib/scaffolding.less
+++ /dev/null
@@ -1,29 +0,0 @@
-// Scaffolding
-// Basic and global styles for generating a grid system, structural layout, and page templates
-// -------------------------------------------------------------------------------------------
-
-
-// STRUCTURAL LAYOUT
-// -----------------
-
-body {
-  margin: 0;
-  font-family: @baseFontFamily;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  color: @gray;
-  background-color: @white;
-}
-
-
-// LINKS
-// -----
-
-a {
-  color: @linkColor;
-  text-decoration: none;
-  &:hover {
-    color: @linkColorHover;
-    text-decoration: underline;
-  }
-}
diff --git a/lib/sprites.less b/lib/sprites.less
deleted file mode 100644
index ef9295288..000000000
--- a/lib/sprites.less
+++ /dev/null
@@ -1,121 +0,0 @@
-// SPRITES
-// Glyphs and icons for buttons, nav, and more
-// -------------------------------------------
-
-
-// ICONS
-// -----
-
-// As of v2.0.0, the  tag is reserved for icons from the Glyphicons set.
-// All icons receive the styles of the  tag and are then given a unique
-// class to add width, height, and background-position. Your resulting HTML
-// will look like .
-
-.icon {
-  background-image: url(docs/assets/img/glyphicons-halflings-sprite.png);
-  background-position: 0 0;
-  background-repeat: no-repeat;
-  display: inline-block;
-  vertical-align: text-top;
-  width: 14px;
-  height: 14px;
-}
-.icon.white {
-  background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
-}
-
-.icon.glass              { background-position: 0      0; }
-.icon.music              { background-position: -24px  0; }
-.icon.search             { background-position: -48px  0; }
-.icon.envelope           { background-position: -72px  0; }
-.icon.heart              { background-position: -96px  0; }
-.icon.star               { background-position: -120px 0; }
-.icon.star-empty         { background-position: -144px 0; }
-.icon.user               { background-position: -168px 0; }
-.icon.film               { background-position: -192px 0; }
-.icon.th-large           { background-position: -216px 0; }
-.icon.th                 { background-position: -240px 0; }
-.icon.th-list            { background-position: -264px 0; }
-.icon.ok                 { background-position: -288px 0; }
-.icon.remove             { background-position: -312px 0; }
-.icon.zoom-in            { background-position: -336px 0; }
-.icon.zoom-out           { background-position: -360px 0; }
-.icon.off                { background-position: -384px 0; }
-.icon.signal             { background-position: -408px 0; }
-.icon.cog                { background-position: -432px 0; }
-.icon.trash              { background-position: -456px 0; }
-
-.icon.home               { background-position: 0      -24px; }
-.icon.file               { background-position: -24px  -24px; }
-.icon.time               { background-position: -48px  -24px; }
-.icon.road               { background-position: -72px  -24px; }
-.icon.download-alt       { background-position: -96px  -24px; }
-.icon.download           { background-position: -120px -24px; }
-.icon.upload             { background-position: -144px -24px; }
-.icon.inbox              { background-position: -168px -24px; }
-.icon.play-circle        { background-position: -192px -24px; }
-.icon.repeat             { background-position: -216px -24px; }
-.icon.refresh            { background-position: -240px -24px; }
-.icon.calendar           { background-position: -264px -24px; }
-.icon.lock               { background-position: -288px -24px; }
-.icon.flag               { background-position: -312px -24px; }
-.icon.headphones         { background-position: -336px -24px; }
-.icon.volume-off         { background-position: -360px -24px; }
-.icon.volume-down        { background-position: -384px -24px; }
-.icon.volume-up          { background-position: -408px -24px; }
-.icon.qrcode             { background-position: -432px -24px; }
-.icon.barcode            { background-position: -456px -24px; }
-
-.icon.tag                { background-position: 0      -48px; }
-.icon.tags               { background-position: -24px  -48px; }
-.icon.book               { background-position: -48px  -48px; }
-.icon.bookmark           { background-position: -72px  -48px; }
-.icon.print              { background-position: -96px  -48px; }
-.icon.camera             { background-position: -120px -48px; }
-.icon.font               { background-position: -144px -48px; }
-.icon.bold               { background-position: -168px -48px; }
-.icon.italic             { background-position: -192px -48px; }
-.icon.text-height        { background-position: -216px -48px; }
-.icon.text-width         { background-position: -240px -48px; }
-.icon.align-left         { background-position: -264px -48px; }
-.icon.align-center       { background-position: -288px -48px; }
-.icon.align-right        { background-position: -312px -48px; }
-.icon.align-justify      { background-position: -336px -48px; }
-.icon.list               { background-position: -360px -48px; }
-.icon.indent-left        { background-position: -384px -48px; }
-.icon.indent-right       { background-position: -408px -48px; }
-.icon.facetime-video     { background-position: -432px -48px; }
-.icon.picture            { background-position: -456px -48px; }
-
-.icon.pencil             { background-position: 0      -72px; }
-.icon.map-marker         { background-position: -24px  -72px; }
-.icon.adjust             { background-position: -48px  -72px; }
-.icon.tint               { background-position: -72px  -72px; }
-.icon.edit               { background-position: -96px  -72px; }
-.icon.share              { background-position: -120px -72px; }
-.icon.check              { background-position: -144px -72px; }
-.icon.move               { background-position: -168px -72px; }
-.icon.step-backward      { background-position: -192px -72px; }
-.icon.fast-backward      { background-position: -216px -72px; }
-.icon.backward           { background-position: -240px -72px; }
-.icon.play               { background-position: -264px -72px; }
-.icon.pause              { background-position: -288px -72px; }
-.icon.stop               { background-position: -312px -72px; }
-.icon.forward            { background-position: -336px -72px; }
-.icon.fast-forward       { background-position: -360px -72px; }
-.icon.step-forward       { background-position: -384px -72px; }
-.icon.eject              { background-position: -408px -72px; }
-.icon.chevron-left       { background-position: -432px -72px; }
-.icon.chevron-right      { background-position: -456px -72px; }
-
-.icon.arrow-left         { background-position: -240px -96px; }
-.icon.arrow-right        { background-position: -264px -96px; }
-.icon.arrow-up           { background-position: -288px -96px; }
-.icon.arrow-down         { background-position: -312px -96px; }
-.icon.share-alt          { background-position: -336px -96px; }
-.icon.resize-full        { background-position: -360px -96px; }
-.icon.resize-small       { background-position: -384px -96px; }
-.icon.plus               { background-position: -408px -96px; }
-.icon.minus              { background-position: -432px -96px; }
-.icon.asterisk           { background-position: -456px -96px; }
-
diff --git a/lib/tables.less b/lib/tables.less
deleted file mode 100644
index 809c2f60e..000000000
--- a/lib/tables.less
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Tables.less
-// Tables for, you guessed it, tabular data
-// ----------------------------------------
-
-
-// BASE TABLES
-// -----------------
-
-table {
-  max-width: 100%;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-// BASELINE STYLES
-// ---------------
-
-.table {
-  width: 100%;
-  margin-bottom: @baseLineHeight;
-  // Cells
-  th,
-  td {
-    padding: 8px;
-    line-height: @baseLineHeight;
-    text-align: left;
-    border-top: 1px solid #ddd;
-  }
-  th {
-    font-weight: bold;
-    vertical-align: bottom;
-  }
-  td {
-    vertical-align: top;
-  }
-  // Remove top border from thead by default
-  thead:first-child tr th,
-  thead:first-child tr td {
-    border-top: 0;
-  }
-  // Account for multiple tbody instances
-  tbody + tbody {
-    border-top: 2px solid #ddd;
-  }
-}
-
-
-
-// CONDENSED TABLE W/ HALF PADDING
-// -------------------------------
-
-.table-condensed {
-  th,
-  td {
-    padding: 4px 5px;
-  }
-}
-
-
-// BORDERED VERSION
-// ----------------
-
-.table-bordered {
-  border: 1px solid #ddd;
-  border-collapse: separate; // Done so we can round those corners!
-  .border-radius(4px);
-  th + th,
-  td + td,
-  th + td,
-  td + th {
-    border-left: 1px solid #ddd;
-  }
-  // Prevent a double border
-  thead:first-child tr:first-child th,
-  tbody:first-child tr:first-child th,
-  tbody:first-child tr:first-child td {
-    border-top: 0;
-  }
-  // For first th or td in the first row in the first thead or tbody
-  thead:first-child tr:first-child th:first-child,
-  tbody:first-child tr:first-child td:first-child {
-    .border-radius(4px 0 0 0);
-  }
-  thead:first-child tr:first-child th:last-child,
-  tbody:first-child tr:first-child td:last-child {
-    .border-radius(0 4px 0 0);
-  }
-  // For first th or td in the first row in the first thead or tbody
-  thead:last-child tr:last-child th:first-child,
-  tbody:last-child tr:last-child td:first-child {
-    .border-radius(0 0 0 4px);
-  }
-  thead:last-child tr:last-child th:last-child,
-  tbody:last-child tr:last-child td:last-child {
-    .border-radius(0 0 4px 0);
-  }
-}
-
-
-// ZEBRA-STRIPING
-// --------------
-
-// Default zebra-stripe styles (alternating gray and transparent backgrounds)
-.table-striped {
-  tbody {
-    tr:nth-child(odd) td,
-    tr:nth-child(odd) th {
-      background-color: #f9f9f9;
-    }
-  }
-}
-
-
-
-// TABLE CELL SIZING
-// -----------------
-
-// Change the columns
-.tableColumns(@columnSpan: 1) {
-  float: none;
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16;
-  margin-left: 0;
-}
-table {
-  .span1     { .tableColumns(1); }
-  .span2     { .tableColumns(2); }
-  .span3     { .tableColumns(3); }
-  .span4     { .tableColumns(4); }
-  .span5     { .tableColumns(5); }
-  .span6     { .tableColumns(6); }
-  .span7     { .tableColumns(7); }
-  .span8     { .tableColumns(8); }
-  .span9     { .tableColumns(9); }
-  .span10    { .tableColumns(10); }
-  .span11    { .tableColumns(11); }
-  .span12    { .tableColumns(12); }
-}
diff --git a/lib/thumbnails.less b/lib/thumbnails.less
deleted file mode 100644
index 0ba749059..000000000
--- a/lib/thumbnails.less
+++ /dev/null
@@ -1,33 +0,0 @@
-// THUMBNAILS
-// ----------
-
-.thumbnails {
-  margin-left: -20px;
-  list-style: none;
-  .clearfix();
-}
-.thumbnails > li {
-  float: left;
-  margin: 0 0 @baseLineHeight 20px;
-}
-.thumbnail {
-  display: block;
-  padding: 4px;
-  line-height: 1;
-  border: 1px solid #ddd;
-  .border-radius(4px);
-  .box-shadow(0 1px 1px rgba(0,0,0,.075));
-}
-// Add a hover state for linked versions only
-a.thumbnail:hover {
-  border-color: @linkColor;
-  .box-shadow(0 1px 4px rgba(0,105,214,.25));
-}
-// Images and captions
-.thumbnail > img {
-  display: block;
-  max-width: 100%;
-}
-.thumbnail .caption {
-  padding: 9px;
-}
diff --git a/lib/tooltip.less b/lib/tooltip.less
deleted file mode 100644
index 5111a193f..000000000
--- a/lib/tooltip.less
+++ /dev/null
@@ -1,35 +0,0 @@
-// TOOLTIP
-// ------=
-
-.tooltip {
-  position: absolute;
-  z-index: @zindexTooltip;
-  display: block;
-  visibility: visible;
-  padding: 5px;
-  font-size: 11px;
-  .opacity(0);
-  &.in     { .opacity(80); }
-  &.top    { margin-top:  -2px; }
-  &.right  { margin-left:  2px; }
-  &.bottom { margin-top:   2px; }
-  &.left   { margin-left: -2px; }
-  &.top .tooltip-arrow    { #popoverArrow > .top(); }
-  &.left .tooltip-arrow   { #popoverArrow > .left(); }
-  &.bottom .tooltip-arrow { #popoverArrow > .bottom(); }
-  &.right .tooltip-arrow  { #popoverArrow > .right(); }
-}
-.tooltip-inner {
-  max-width: 200px;
-  padding: 3px 8px;
-  color: @white;
-  text-align: center;
-  text-decoration: none;
-  background-color: @black;
-  .border-radius(4px);
-}
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-}
diff --git a/lib/type.less b/lib/type.less
deleted file mode 100644
index 087224fd0..000000000
--- a/lib/type.less
+++ /dev/null
@@ -1,206 +0,0 @@
-// Typography.less
-// Headings, body text, lists, code, and more for a versatile and durable typography system
-// ----------------------------------------------------------------------------------------
-
-
-// BODY TEXT
-// ---------
-
-p {
-  margin: 0 0 @baseLineHeight / 2;
-  font-family: @baseFontFamily;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  small {
-    font-size: @baseFontSize - 2;
-    color: @grayLight;
-  }
-}
-.lead {
-  margin-bottom: @baseLineHeight;
-  font-size: 20px;
-  font-weight: 200;
-  line-height: @baseLineHeight * 1.5;
-}
-
-// HEADINGS
-// --------
-
-h1, h2, h3, h4, h5, h6 {
-  margin: 0;
-  font-weight: bold;
-  color: @grayDark;
-  text-rendering: optimizelegibility; // Fix the character spacing for headings
-  small {
-    font-weight: normal;
-    color: @grayLight;
-  }
-}
-h1 {
-  font-size: 30px;
-  line-height: @baseLineHeight * 2;
-  small {
-    font-size: 18px;
-  }
-}
-h2 {
-  font-size: 24px;
-  line-height: @baseLineHeight * 2;
-  small {
-    font-size: 18px;
-  }
-}
-h3 {
-  line-height: @baseLineHeight * 1.5;
-  font-size: 18px;
-  small {
-    font-size: 14px;
-  }
-}
-h4, h5, h6 {
-  line-height: @baseLineHeight;
-}
-h4 {
-  font-size: 14px;
-  small {
-    font-size: 12px;
-  }
-}
-h5 {
-  font-size: 12px;
-}
-h6 {
-  font-size: 11px;
-  color: @grayLight;
-  text-transform: uppercase;
-}
-
-
-// LISTS
-// -----
-
-// Unordered and Ordered lists
-ul, ol {
-  padding: 0;
-  margin: 0 0 @baseLineHeight / 2 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-ul {
-  list-style: disc;
-}
-ol {
-  list-style: decimal;
-}
-li {
-  line-height: @baseLineHeight;
-}
-ul.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-
-// Description Lists
-dl {
-  margin-bottom: @baseLineHeight;
-}
-dt,
-dd {
-  line-height: @baseLineHeight;
-}
-dt {
-  font-weight: bold;
-}
-dd {
-  margin-left: @baseLineHeight / 2;
-}
-
-// MISC
-// ----
-
-// Horizontal rules
-hr {
-  margin: @baseLineHeight 0;
-  border: 0;
-  border-top: 1px solid #e5e5e5;
-  border-bottom: 1px solid @white;
-}
-
-// Emphasis
-strong {
-  font-weight: bold;
-}
-em {
-  font-style: italic;
-}
-.muted {
-  color: @grayLight;
-}
-
-// Abbreviations and acronyms
-abbr {
-  font-size: 90%;
-  text-transform: uppercase;
-  border-bottom: 1px dotted #ddd;
-  cursor: help;
-}
-
-// Blockquotes
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 @baseLineHeight;
-  border-left: 5px solid @grayLighter;
-  p {
-    margin-bottom: 0;
-    #font > .shorthand(16px,300,@baseLineHeight * 1.25);
-  }
-  small {
-    display: block;
-    line-height: @baseLineHeight;
-    color: @grayLight;
-    &:before {
-      content: '\2014 \00A0';
-    }
-  }
-
-  // Float right with text-align: right
-  &.pull-right {
-    float: right;
-    padding-left: 0;
-    padding-right: 15px;
-    border-left: 0;
-    border-right: 5px solid @grayLighter;
-    p,
-    small {
-      text-align: right;
-    }
-  }
-}
-
-// Quotes
-q:before,
-q:after,
-blockquote:before, 
-blockquote:after {
-  content: "";
-}
-
-// Addresses
-address {
-  display: block;
-  margin-bottom: @baseLineHeight;
-  line-height: @baseLineHeight;
-  font-style: normal;
-}
-
-// Misc
-small {
-  font-size: 100%;
-}
-cite {
-  font-style: normal;
-}
diff --git a/lib/utilities.less b/lib/utilities.less
deleted file mode 100644
index d60d22031..000000000
--- a/lib/utilities.less
+++ /dev/null
@@ -1,23 +0,0 @@
-// UTILITY CLASSES
-// ---------------
-
-// Quick floats
-.pull-right {
-  float: right;
-}
-.pull-left {
-  float: left;
-}
-
-// Toggling content
-.hide {
-  display: none;
-}
-.show {
-  display: block;
-}
-
-// Visibility
-.invisible {
-  visibility: hidden;
-}
diff --git a/lib/variables.less b/lib/variables.less
deleted file mode 100644
index 5ed896cc0..000000000
--- a/lib/variables.less
+++ /dev/null
@@ -1,90 +0,0 @@
-// Variables.less
-// Variables to customize the look and feel of Bootstrap
-// -----------------------------------------------------
-
-
-
-// GLOBAL VALUES
-// --------------------------------------------------
-
-// Links
-@linkColor:             #08c;
-@linkColorHover:        darken(@linkColor, 15%);
-
-// Grays
-@black:                 #000;
-@grayDarker:            #222;
-@grayDark:              #333;
-@gray:                  #555;
-@grayLight:             #999;
-@grayLighter:           #eee;
-@white:                 #fff;
-
-// Accent colors
-@blue:                  #049cdb;
-@blueDark:              #0064cd;
-@green:                 #46a546;
-@red:                   #9d261d;
-@yellow:                #ffc40d;
-@orange:                #f89406;
-@pink:                  #c3325f;
-@purple:                #7a43b6;
-
-// Grid system
-// Modify the grid styles in mixins.less
-@gridColumns:           12;
-@gridColumnWidth:       60px;
-@gridGutterWidth:       20px;
-@siteWidth:             (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-// Fluid width sidebar
-@fluidSidebarWidth:     220px;
-
-// Typography
-@baseFontSize:          13px;
-@baseFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
-@baseLineHeight:        18px;
-
-// Buttons
-@primaryButtonBackground:    @linkColor;
-
-
-
-// COMPONENT VARIABLES
-// --------------------------------------------------
-
-// Z-index master list
-// Used for a bird's eye view of components dependent on the z-axis
-// Try to avoid customizing these :)
-@zindexDropdown:        1000;
-@zindexPopover:         1010;
-@zindexTooltip:         1020;
-@zindexFixedNavbar:     1030;
-@zindexModalBackdrop:   1040;
-@zindexModal:           1050;
-
-// Input placeholder text color
-@placeholderText:       @grayLight;
-
-// Navbar
-@navbarHeight:                    40px;
-@navbarBackground:                @grayDarker;
-@navbarBackgroundHighlight:       @grayDark;
-
-// Form states and alerts
-@warningText:             #c09853;
-@warningBackground:       #fcf8e3;
-@warningBorder:           #f3edd2;
-
-@errorText:               #b94a48;
-@errorBackground:         #f2dede;
-@errorBorder:             #e9c7c7;
-
-@successText:             #468847;
-@successBackground:       #dff0d8;
-@successBorder:           #cfe8c4;
-
-@infoText:                #3a87ad;
-@infoBackground:          #d9edf7;
-@infoBorder:              #bfe1f2;
-
-
diff --git a/lib/wells.less b/lib/wells.less
deleted file mode 100644
index 244b8ca10..000000000
--- a/lib/wells.less
+++ /dev/null
@@ -1,17 +0,0 @@
-// WELLS
-// -----
-
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #eee;
-  border: 1px solid rgba(0,0,0,.05);
-  .border-radius(4px);
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
-  blockquote {
-    border-color: #ddd;
-    border-color: rgba(0,0,0,.15);
-  }
-}
-- 
cgit v1.2.3


From ed64276e5be1bbf808f2ab1451aa02522cc3aff0 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 26 Jan 2012 22:05:45 -0800
Subject: move doc building into base make method + build bootstrap to doc
 assets

---
 Makefile                                 |   20 +-
 bootstrap-responsive.css                 |  244 ---
 bootstrap-responsive.min.css             |    3 -
 bootstrap.css                            | 3037 ------------------------------
 bootstrap.min.css                        |  556 ------
 docs/assets/css/bootstrap-responsive.css |  244 +++
 docs/assets/css/bootstrap.css            | 3037 ++++++++++++++++++++++++++++++
 docs/base-css.html                       |    4 +-
 docs/components.html                     |    4 +-
 docs/download.html                       |    4 +-
 docs/examples.html                       |    4 +-
 docs/index.html                          |    4 +-
 docs/javascript.html                     |    4 +-
 docs/less.html                           |    4 +-
 docs/scaffolding.html                    |    4 +-
 docs/templates/layout.mustache           |    4 +-
 docs/upgrading.html                      |    4 +-
 17 files changed, 3306 insertions(+), 3875 deletions(-)
 delete mode 100644 bootstrap-responsive.css
 delete mode 100644 bootstrap-responsive.min.css
 delete mode 100644 bootstrap.css
 delete mode 100644 bootstrap.min.css
 create mode 100644 docs/assets/css/bootstrap-responsive.css
 create mode 100644 docs/assets/css/bootstrap.css

diff --git a/Makefile b/Makefile
index 337baf03f..127d6affe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,25 @@
 VERSION=2.0.0
-BOOTSTRAP = ./bootstrap.css
-BOOTSTRAP_MIN = ./bootstrap.min.css
+BOOTSTRAP = ./docs/assets/css/bootstrap.css
 BOOTSTRAP_LESS = ./less/bootstrap.less
-BOOTSTRAP_RESPONSIVE = ./bootstrap-responsive.css
-BOOTSTRAP_RESPONSIVE_MIN = ./bootstrap-responsive.min.css
+BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
 BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
 LESS_COMPRESSOR ?= `which lessc`
 UGLIFY_JS ?= `which uglifyjs`
 WATCHR ?= `which watchr`
 
 #
-# Build less files
+# Build less files + docs
 #
 
 build:
 	@@if test ! -z ${LESS_COMPRESSOR}; then \
 		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
 		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
-		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
 		rm -f ${BOOTSTRAP_LESS}.tmp; \
 		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_RESPONSIVE_LESS} >${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
 		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \
-		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE_MIN} --compress; \
 		rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
+		node docs/build; \
 		echo "Bootstrap successfully built! - `date`"; \
 	else \
 		echo "You must have the LESS compiler installed in order to build Bootstrap."; \
@@ -42,12 +39,5 @@ watch:
 		echo "You can install it by running: gem install watchr"; \
 	fi
 
-#
-# Build docs from templates
-#
-
-docs:
-	@ node docs/build
-
 
-.PHONY: build watch docs
\ No newline at end of file
+.PHONY: build watch
\ No newline at end of file
diff --git a/bootstrap-responsive.css b/bootstrap-responsive.css
deleted file mode 100644
index 02b5c099e..000000000
--- a/bootstrap-responsive.css
+++ /dev/null
@@ -1,244 +0,0 @@
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-@media (max-width: 480px) {
-  .navbar .nav {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 180px;
-    padding-top: 40px;
-    list-style: none;
-  }
-  .navbar .nav, .navbar .nav > li:last-child a {
-    -webkit-border-radius: 0 0 4px 0;
-    -moz-border-radius: 0 0 4px 0;
-    border-radius: 0 0 4px 0;
-  }
-  .navbar .nav > li {
-    float: none;
-    display: none;
-  }
-  .navbar .nav > li > a {
-    float: none;
-    background-color: #222;
-  }
-  .navbar .nav > .active {
-    display: block;
-    position: absolute;
-    top: 0;
-    left: 0;
-  }
-  .navbar .nav > .active > a {
-    background-color: transparent;
-  }
-  .navbar .nav > .active > a:hover {
-    background-color: #333;
-  }
-  .navbar .nav > .active > a:after {
-    display: inline-block;
-    width: 0;
-    height: 0;
-    margin-top: 8px;
-    margin-left: 6px;
-    text-indent: -99999px;
-    vertical-align: top;
-    border-left: 4px solid transparent;
-    border-right: 4px solid transparent;
-    border-top: 4px solid #ffffff;
-    opacity: 1;
-    filter: alpha(opacity=100);
-    content: "↓";
-  }
-  .navbar .nav:hover > li {
-    display: block;
-  }
-  .navbar .nav:hover > li > a:hover {
-    background-color: #333;
-  }
-  .form-horizontal .control-group > label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-left: 0;
-  }
-  .modal {
-    position: absolute;
-    top: 20px;
-    left: 20px;
-    right: 20px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade.in {
-    top: auto;
-  }
-  .modal-header .close {
-    padding: 10px;
-  }
-}
-@media (max-width: 768px) {
-  .navbar-fixed {
-    position: absolute;
-  }
-  .navbar-fixed .nav {
-    float: none;
-  }
-  .container {
-    width: auto;
-    padding: 0 20px;
-  }
-  .row {
-    margin-left: 0;
-  }
-  .row > [class*="span"] {
-    float: none;
-    display: block;
-    width: auto;
-    margin: 0;
-  }
-}
-@media (min-width: 768px) and (max-width: 940px) {
-  .container {
-    width: 748px;
-  }
-  .span1 {
-    width: 44px;
-  }
-  .span2 {
-    width: 108px;
-  }
-  .span3 {
-    width: 172px;
-  }
-  .span4 {
-    width: 236px;
-  }
-  .span5 {
-    width: 300px;
-  }
-  .span6 {
-    width: 364px;
-  }
-  .span7 {
-    width: 428px;
-  }
-  .span8 {
-    width: 492px;
-  }
-  .span9 {
-    width: 556px;
-  }
-  .span10 {
-    width: 620px;
-  }
-  .span11 {
-    width: 684px;
-  }
-  .span12 {
-    width: 748px;
-  }
-  .offset1 {
-    margin-left: 84px;
-  }
-  .offset2 {
-    margin-left: 148px;
-  }
-  .offset3 {
-    margin-left: 212px;
-  }
-  .offset4 {
-    margin-left: 276px;
-  }
-  .offset5 {
-    margin-left: 340px;
-  }
-  .offset6 {
-    margin-left: 404px;
-  }
-  .offset7 {
-    margin-left: 468px;
-  }
-  .offset8 {
-    margin-left: 532px;
-  }
-  .offset9 {
-    margin-left: 596px;
-  }
-  .offset10 {
-    margin-left: 660px;
-  }
-  .offset11 {
-    margin-left: 724px;
-  }
-  .offset12 {
-    margin-left: 788px;
-  }
-}
-/*
-@media (min-width: 1210px) {
-
-  // Reset grid variables
-  @gridColumns:       12;
-  @gridColumnWidth:   70px;
-  @gridGutterWidth:   30px;
-  @siteWidth:         1170px;
-
-  // Bring grid mixins to recalculate widths
-  .columns(@columns: 1) {
-    width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-  }
-  .offset(@columns: 1) {
-    margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
-  }
-
-  .container {
-    width: @siteWidth;
-  }
-  .row {
-    margin-left: @gridGutterWidth * -1;
-  }
-  [class*="span"] {
-    margin-left: @gridGutterWidth;
-  }
-
-  // Default columns
-  .span1     { .columns(1); }
-  .span2     { .columns(2); }
-  .span3     { .columns(3); }
-  .span4     { .columns(4); }
-  .span5     { .columns(5); }
-  .span6     { .columns(6); }
-  .span7     { .columns(7); }
-  .span8     { .columns(8); }
-  .span9     { .columns(9); }
-  .span10    { .columns(10); }
-  .span11    { .columns(11); }
-  .span12    { .columns(12); }
-
-  // Offset column options
-  .offset1   { .offset(1); }
-  .offset2   { .offset(2); }
-  .offset3   { .offset(3); }
-  .offset4   { .offset(4); }
-  .offset5   { .offset(5); }
-  .offset6   { .offset(6); }
-  .offset7   { .offset(7); }
-  .offset8   { .offset(8); }
-  .offset9   { .offset(9); }
-  .offset10  { .offset(10); }
-  .offset11  { .offset(11); }
-  .offset12  { .offset(12); }
-
-}
-*/
diff --git a/bootstrap-responsive.min.css b/bootstrap-responsive.min.css
deleted file mode 100644
index dcf17dce9..000000000
--- a/bootstrap-responsive.min.css
+++ /dev/null
@@ -1,3 +0,0 @@
-
-.hidden{display:none;visibility:hidden;}
-@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
diff --git a/bootstrap.css b/bootstrap.css
deleted file mode 100644
index 9d26b41c8..000000000
--- a/bootstrap.css
+++ /dev/null
@@ -1,3037 +0,0 @@
-/*!
- * Bootstrap v2.0.0
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu Jan 26 21:48:03 PST 2012
- */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-  display: block;
-}
-audio, canvas, video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-audio:not([controls]) {
-  display: none;
-}
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-a:focus {
-  outline: thin dotted;
-}
-a:hover, a:active {
-  outline: 0;
-}
-sub, sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-sup {
-  top: -0.5em;
-}
-sub {
-  bottom: -0.25em;
-}
-img {
-  max-width: 100%;
-  height: auto;
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-button,
-input,
-select,
-textarea {
-  margin: 0;
-  font-size: 100%;
-  vertical-align: middle;
-}
-button, input {
-  *overflow: visible;
-  line-height: normal;
-}
-button::-moz-focus-inner, input::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  cursor: pointer;
-  -webkit-appearance: button;
-}
-input[type="search"] {
-  -webkit-appearance: textfield;
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-}
-input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none;
-}
-textarea {
-  overflow: auto;
-  vertical-align: top;
-}
-body {
-  margin: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-  color: #555555;
-  background-color: #ffffff;
-}
-a {
-  color: #0088cc;
-  text-decoration: none;
-}
-a:hover {
-  color: #005580;
-  text-decoration: underline;
-}
-.row {
-  margin-left: -20px;
-  *zoom: 1;
-}
-.row:before, .row:after {
-  display: table;
-  content: "";
-}
-.row:after {
-  clear: both;
-}
-[class*="span"] {
-  float: left;
-  margin-left: 20px;
-}
-.span1 {
-  width: 60px;
-}
-.span2 {
-  width: 140px;
-}
-.span3 {
-  width: 220px;
-}
-.span4 {
-  width: 300px;
-}
-.span5 {
-  width: 380px;
-}
-.span6 {
-  width: 460px;
-}
-.span7 {
-  width: 540px;
-}
-.span8 {
-  width: 620px;
-}
-.span9 {
-  width: 700px;
-}
-.span10 {
-  width: 780px;
-}
-.span11 {
-  width: 860px;
-}
-.span12 {
-  width: 940px;
-}
-.offset1 {
-  margin-left: 100px;
-}
-.offset2 {
-  margin-left: 180px;
-}
-.offset3 {
-  margin-left: 260px;
-}
-.offset4 {
-  margin-left: 340px;
-}
-.offset5 {
-  margin-left: 420px;
-}
-.offset6 {
-  margin-left: 500px;
-}
-.offset7 {
-  margin-left: 580px;
-}
-.offset8 {
-  margin-left: 660px;
-}
-.offset9 {
-  margin-left: 740px;
-}
-.offset10 {
-  margin-left: 820px;
-}
-.offset11 {
-  margin-left: 900px;
-}
-.container {
-  width: 940px;
-  margin-left: auto;
-  margin-right: auto;
-  *zoom: 1;
-}
-.container:before, .container:after {
-  display: table;
-  content: "";
-}
-.container:after {
-  clear: both;
-}
-.fluid-container {
-  position: relative;
-  min-width: 940px;
-  padding-left: 20px;
-  padding-right: 20px;
-  *zoom: 1;
-}
-.fluid-container:before, .fluid-container:after {
-  display: table;
-  content: "";
-}
-.fluid-container: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;
-  font-size: 13px;
-  line-height: 18px;
-}
-p small {
-  font-size: 11px;
-  color: #999999;
-}
-.lead {
-  margin-bottom: 18px;
-  font-size: 20px;
-  font-weight: 200;
-  line-height: 27px;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 0;
-  font-weight: bold;
-  color: #333333;
-  text-rendering: optimizelegibility;
-}
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
-  font-weight: normal;
-  color: #999999;
-}
-h1 {
-  font-size: 30px;
-  line-height: 36px;
-}
-h1 small {
-  font-size: 18px;
-}
-h2 {
-  font-size: 24px;
-  line-height: 36px;
-}
-h2 small {
-  font-size: 18px;
-}
-h3 {
-  line-height: 27px;
-  font-size: 18px;
-}
-h3 small {
-  font-size: 14px;
-}
-h4, h5, h6 {
-  line-height: 18px;
-}
-h4 {
-  font-size: 14px;
-}
-h4 small {
-  font-size: 12px;
-}
-h5 {
-  font-size: 12px;
-}
-h6 {
-  font-size: 11px;
-  color: #999999;
-  text-transform: uppercase;
-}
-ul, ol {
-  padding: 0;
-  margin: 0 0 9px 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-ul {
-  list-style: disc;
-}
-ol {
-  list-style: decimal;
-}
-li {
-  line-height: 18px;
-}
-ul.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-dl {
-  margin-bottom: 18px;
-}
-dt, dd {
-  line-height: 18px;
-}
-dt {
-  font-weight: bold;
-}
-dd {
-  margin-left: 9px;
-}
-hr {
-  margin: 18px 0;
-  border: 0;
-  border-top: 1px solid #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-strong {
-  font-weight: bold;
-}
-em {
-  font-style: italic;
-}
-.muted {
-  color: #999999;
-}
-abbr {
-  font-size: 90%;
-  text-transform: uppercase;
-  border-bottom: 1px dotted #ddd;
-  cursor: help;
-}
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 18px;
-  border-left: 5px solid #eeeeee;
-}
-blockquote p {
-  margin-bottom: 0;
-  font-size: 16px;
-  font-weight: 300;
-  line-height: 22.5px;
-}
-blockquote small {
-  display: block;
-  line-height: 18px;
-  color: #999999;
-}
-blockquote small:before {
-  content: '\2014 \00A0';
-}
-blockquote.pull-right {
-  float: right;
-  padding-left: 0;
-  padding-right: 15px;
-  border-left: 0;
-  border-right: 5px solid #eeeeee;
-}
-blockquote.pull-right p, blockquote.pull-right small {
-  text-align: right;
-}
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-address {
-  display: block;
-  margin-bottom: 18px;
-  line-height: 18px;
-  font-style: normal;
-}
-small {
-  font-size: 100%;
-}
-cite {
-  font-style: normal;
-}
-code, pre {
-  padding: 0 3px 2px;
-  font-family: Menlo, Monaco, "Courier New", monospace;
-  font-size: 12px;
-  color: #333333;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-code {
-  padding: 3px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-pre {
-  display: block;
-  padding: 8.5px;
-  margin: 0 0 9px;
-  font-size: 12px;
-  line-height: 18px;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  white-space: pre;
-  white-space: pre-wrap;
-  word-break: break-all;
-}
-pre.prettyprint {
-  margin-bottom: 18px;
-}
-pre code {
-  padding: 0;
-  background-color: transparent;
-}
-form {
-  margin: 0 0 18px;
-}
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 27px;
-  font-size: 19.5px;
-  line-height: 36px;
-  color: #333333;
-  border: 0;
-  border-bottom: 1px solid #eee;
-}
-label,
-input,
-button,
-select,
-textarea {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  font-weight: normal;
-  line-height: 18px;
-}
-label {
-  display: block;
-  margin-bottom: 5px;
-  color: #333333;
-}
-input,
-textarea,
-select,
-.uneditable-input {
-  display: inline-block;
-  width: 210px;
-  height: 18px;
-  padding: 4px;
-  margin-bottom: 9px;
-  font-size: 13px;
-  line-height: 18px;
-  color: #555555;
-  border: 1px solid #ccc;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-label input, label textarea, label select {
-  display: block;
-}
-input[type=image], input[type=checkbox], input[type=radio] {
-  width: auto;
-  height: auto;
-  padding: 0;
-  margin: 3px 0;
-  *margin-top: 0;
-  /* IE7 */
-
-  line-height: normal;
-  border: none;
-  cursor: pointer;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-input[type=file] {
-  padding: initial;
-  line-height: initial;
-  border: initial;
-  background-color: #ffffff;
-  background-color: initial;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-input[type=button], input[type=reset], input[type=submit] {
-  width: auto;
-  height: auto;
-}
-select, input[type=file] {
-  height: 28px;
-  /* In IE7, the height of the select element cannot be changed by height, only font-size */
-
-  *margin-top: 4px;
-  /* For IE7, add top margin to align select with labels */
-
-  line-height: 28px;
-}
-select {
-  width: 220px;
-  background-color: #ffffff;
-}
-select[multiple], select[size] {
-  height: auto;
-}
-input[type=image] {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-textarea {
-  height: auto;
-}
-input[type=hidden] {
-  display: none;
-}
-.radio, .checkbox {
-  padding-left: 18px;
-}
-.radio input[type=radio], .checkbox input[type=checkbox] {
-  float: left;
-  margin-left: -18px;
-}
-.controls > .radio:first-child, .controls > .checkbox:first-child {
-  padding-top: 5px;
-}
-.radio.inline, .checkbox.inline {
-  display: inline-block;
-  margin-bottom: 0;
-}
-.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
-  margin-left: 10px;
-}
-input, textarea {
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
-  transition: border linear 0.2s, box-shadow linear 0.2s;
-}
-input:focus, textarea:focus {
-  border-color: rgba(82, 168, 236, 0.8);
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  outline: 0;
-}
-input[type=file]:focus, input[type=checkbox]:focus, select:focus {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-  outline: 1px dotted #666;
-}
-.input-mini {
-  width: 60px;
-}
-.input-small {
-  width: 90px;
-}
-.input-medium {
-  width: 150px;
-}
-.input-large {
-  width: 210px;
-}
-.input-xlarge {
-  width: 270px;
-}
-.input-xxlarge {
-  width: 530px;
-}
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input {
-  float: none;
-  margin-left: 0;
-}
-input.span1, textarea.span1, .uneditable-input.span1 {
-  width: 50px;
-}
-input.span2, textarea.span2, .uneditable-input.span2 {
-  width: 130px;
-}
-input.span3, textarea.span3, .uneditable-input.span3 {
-  width: 210px;
-}
-input.span4, textarea.span4, .uneditable-input.span4 {
-  width: 290px;
-}
-input.span5, textarea.span5, .uneditable-input.span5 {
-  width: 370px;
-}
-input.span6, textarea.span6, .uneditable-input.span6 {
-  width: 450px;
-}
-input.span7, textarea.span7, .uneditable-input.span7 {
-  width: 530px;
-}
-input.span8, textarea.span8, .uneditable-input.span8 {
-  width: 610px;
-}
-input.span9, textarea.span9, .uneditable-input.span9 {
-  width: 690px;
-}
-input.span10, textarea.span10, .uneditable-input.span10 {
-  width: 770px;
-}
-input.span11, textarea.span11, .uneditable-input.span11 {
-  width: 850px;
-}
-input.span12, textarea.span12, .uneditable-input.span12 {
-  width: 930px;
-}
-select.span1 {
-  width: 70px;
-}
-select.span2 {
-  width: 150px;
-}
-select.span3 {
-  width: 230px;
-}
-select.span4 {
-  width: 310px;
-}
-select.span5 {
-  width: 390px;
-}
-select.span6 {
-  width: 470px;
-}
-select.span7 {
-  width: 550px;
-}
-select.span8 {
-  width: 630px;
-}
-select.span9 {
-  width: 710px;
-}
-select.span10 {
-  width: 790px;
-}
-select.span11 {
-  width: 870px;
-}
-select.span12 {
-  width: 950px;
-}
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  background-color: #f5f5f5;
-  border-color: #ddd;
-  cursor: not-allowed;
-}
-.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline {
-  color: #c09853;
-}
-.control-group.warning input, .control-group.warning select, .control-group.warning textarea {
-  color: #c09853;
-  border-color: #c09853;
-}
-.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
-  border-color: #a47e3c;
-  -webkit-box-shadow: 0 0 6px #dbc59e;
-  -moz-box-shadow: 0 0 6px #dbc59e;
-  box-shadow: 0 0 6px #dbc59e;
-}
-.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #c09853;
-}
-.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline {
-  color: #b94a48;
-}
-.control-group.error input, .control-group.error select, .control-group.error textarea {
-  color: #b94a48;
-  border-color: #b94a48;
-}
-.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
-  border-color: #953b39;
-  -webkit-box-shadow: 0 0 6px #d59392;
-  -moz-box-shadow: 0 0 6px #d59392;
-  box-shadow: 0 0 6px #d59392;
-}
-.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #b94a48;
-}
-.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline {
-  color: #468847;
-}
-.control-group.success input, .control-group.success select, .control-group.success textarea {
-  color: #468847;
-  border-color: #468847;
-}
-.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
-  border-color: #356635;
-  -webkit-box-shadow: 0 0 6px #7aba7b;
-  -moz-box-shadow: 0 0 6px #7aba7b;
-  box-shadow: 0 0 6px #7aba7b;
-}
-.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #468847;
-}
-input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-}
-input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus {
-  border-color: #e9322d;
-  -webkit-box-shadow: 0 0 6px #f8b9b7;
-  -moz-box-shadow: 0 0 6px #f8b9b7;
-  box-shadow: 0 0 6px #f8b9b7;
-}
-.form-actions {
-  padding: 17px 20px 18px;
-  margin-top: 18px;
-  margin-bottom: 18px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-}
-.uneditable-input {
-  display: block;
-  background-color: #ffffff;
-  border-color: #eee;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  cursor: not-allowed;
-}
-:-moz-placeholder {
-  color: #999999;
-}
-::-webkit-input-placeholder {
-  color: #999999;
-}
-.help-block {
-  margin-top: 5px;
-  margin-bottom: 0;
-  color: #999999;
-}
-.help-inline {
-  display: inline-block;
-  margin-bottom: 9px;
-  vertical-align: middle;
-  padding-left: 5px;
-}
-.input-prepend, .input-append {
-  margin-bottom: 5px;
-  *zoom: 1;
-}
-.input-prepend:before,
-.input-append:before,
-.input-prepend:after,
-.input-append:after {
-  display: table;
-  content: "";
-}
-.input-prepend:after, .input-append:after {
-  clear: both;
-}
-.input-prepend input,
-.input-append input,
-.input-prepend .uneditable-input,
-.input-append .uneditable-input {
-  -webkit-border-radius: 0 3px 3px 0;
-  -moz-border-radius: 0 3px 3px 0;
-  border-radius: 0 3px 3px 0;
-}
-.input-prepend .uneditable-input, .input-append .uneditable-input {
-  border-left-color: #ccc;
-}
-.input-prepend .add-on, .input-append .add-on {
-  float: left;
-  display: block;
-  width: auto;
-  min-width: 16px;
-  height: 18px;
-  margin-right: -1px;
-  padding: 4px 4px 4px 5px;
-  font-weight: normal;
-  line-height: 18px;
-  color: #999999;
-  text-align: center;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  -webkit-border-radius: 3px 0 0 3px;
-  -moz-border-radius: 3px 0 0 3px;
-  border-radius: 3px 0 0 3px;
-}
-.input-prepend .active, .input-append .active {
-  background-color: #a9dba9;
-  border-color: #46a546;
-}
-.input-prepend .add-on {
-  *margin-top: 1px;
-  /* IE6-7 */
-
-}
-.input-append input, .input-append .uneditable-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 .uneditable-input {
-  border-right-color: #ccc;
-}
-.input-append .add-on {
-  margin-right: 0;
-  margin-left: -1px;
-  -webkit-border-radius: 0 3px 3px 0;
-  -moz-border-radius: 0 3px 3px 0;
-  border-radius: 0 3px 3px 0;
-}
-.search-query {
-  padding-left: 14px;
-  padding-right: 14px;
-  margin-bottom: 0;
-  -webkit-border-radius: 14px;
-  -moz-border-radius: 14px;
-  border-radius: 14px;
-}
-.form-search input,
-.form-inline input,
-.form-horizontal input,
-.form-search textarea,
-.form-inline textarea,
-.form-horizontal textarea,
-.form-search select,
-.form-inline select,
-.form-horizontal select,
-.form-search .help-inline,
-.form-inline .help-inline,
-.form-horizontal .help-inline,
-.form-search .uneditable-input,
-.form-inline .uneditable-input,
-.form-horizontal .uneditable-input {
-  display: inline-block;
-  margin-bottom: 0;
-}
-.form-search label, .form-inline label {
-  display: inline-block;
-}
-.control-group {
-  margin-bottom: 9px;
-}
-.form-horizontal legend + .control-group {
-  margin-top: 18px;
-  -webkit-margin-top-collapse: separate;
-}
-.form-horizontal .control-group {
-  margin-bottom: 18px;
-}
-.form-horizontal .control-group > label {
-  float: left;
-  width: 140px;
-  padding-top: 5px;
-  text-align: right;
-}
-.form-horizontal .controls {
-  margin-left: 160px;
-}
-.form-horizontal .form-actions {
-  padding-left: 160px;
-}
-table {
-  max-width: 100%;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.table {
-  width: 100%;
-  margin-bottom: 18px;
-}
-.table th, .table td {
-  padding: 8px;
-  line-height: 18px;
-  text-align: left;
-  border-top: 1px solid #ddd;
-}
-.table th {
-  font-weight: bold;
-  vertical-align: bottom;
-}
-.table td {
-  vertical-align: top;
-}
-.table thead:first-child tr th, .table thead:first-child tr td {
-  border-top: 0;
-}
-.table tbody + tbody {
-  border-top: 2px solid #ddd;
-}
-.table-condensed th, .table-condensed td {
-  padding: 4px 5px;
-}
-.table-bordered {
-  border: 1px solid #ddd;
-  border-collapse: separate;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.table-bordered th + th,
-.table-bordered td + td,
-.table-bordered th + td,
-.table-bordered td + th {
-  border-left: 1px solid #ddd;
-}
-.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td {
-  border-top: 0;
-}
-.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child {
-  -webkit-border-radius: 4px 0 0 0;
-  -moz-border-radius: 4px 0 0 0;
-  border-radius: 4px 0 0 0;
-}
-.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child {
-  -webkit-border-radius: 0 4px 0 0;
-  -moz-border-radius: 0 4px 0 0;
-  border-radius: 0 4px 0 0;
-}
-.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child {
-  -webkit-border-radius: 0 0 0 4px;
-  -moz-border-radius: 0 0 0 4px;
-  border-radius: 0 0 0 4px;
-}
-.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child {
-  -webkit-border-radius: 0 0 4px 0;
-  -moz-border-radius: 0 0 4px 0;
-  border-radius: 0 0 4px 0;
-}
-.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th {
-  background-color: #f9f9f9;
-}
-table .span1 {
-  float: none;
-  width: 44px;
-  margin-left: 0;
-}
-table .span2 {
-  float: none;
-  width: 124px;
-  margin-left: 0;
-}
-table .span3 {
-  float: none;
-  width: 204px;
-  margin-left: 0;
-}
-table .span4 {
-  float: none;
-  width: 284px;
-  margin-left: 0;
-}
-table .span5 {
-  float: none;
-  width: 364px;
-  margin-left: 0;
-}
-table .span6 {
-  float: none;
-  width: 444px;
-  margin-left: 0;
-}
-table .span7 {
-  float: none;
-  width: 524px;
-  margin-left: 0;
-}
-table .span8 {
-  float: none;
-  width: 604px;
-  margin-left: 0;
-}
-table .span9 {
-  float: none;
-  width: 684px;
-  margin-left: 0;
-}
-table .span10 {
-  float: none;
-  width: 764px;
-  margin-left: 0;
-}
-table .span11 {
-  float: none;
-  width: 844px;
-  margin-left: 0;
-}
-table .span12 {
-  float: none;
-  width: 924px;
-  margin-left: 0;
-}
-.icon {
-  background-image: url(img/glyphicons-halflings-sprite.png);
-  background-position: 0 0;
-  background-repeat: no-repeat;
-  display: inline-block;
-  vertical-align: text-top;
-  width: 14px;
-  height: 14px;
-}
-.icon.white {
-  background-image: url(img/glyphicons-halflings-sprite-white.png);
-}
-.icon.glass {
-  background-position: 0      0;
-}
-.icon.music {
-  background-position: -24px 0;
-}
-.icon.search {
-  background-position: -48px 0;
-}
-.icon.envelope {
-  background-position: -72px 0;
-}
-.icon.heart {
-  background-position: -96px 0;
-}
-.icon.star {
-  background-position: -120px 0;
-}
-.icon.star-empty {
-  background-position: -144px 0;
-}
-.icon.user {
-  background-position: -168px 0;
-}
-.icon.film {
-  background-position: -192px 0;
-}
-.icon.th-large {
-  background-position: -216px 0;
-}
-.icon.th {
-  background-position: -240px 0;
-}
-.icon.th-list {
-  background-position: -264px 0;
-}
-.icon.ok {
-  background-position: -288px 0;
-}
-.icon.remove {
-  background-position: -312px 0;
-}
-.icon.zoom-in {
-  background-position: -336px 0;
-}
-.icon.zoom-out {
-  background-position: -360px 0;
-}
-.icon.off {
-  background-position: -384px 0;
-}
-.icon.signal {
-  background-position: -408px 0;
-}
-.icon.cog {
-  background-position: -432px 0;
-}
-.icon.trash {
-  background-position: -456px 0;
-}
-.icon.home {
-  background-position: 0 -24px;
-}
-.icon.file {
-  background-position: -24px -24px;
-}
-.icon.time {
-  background-position: -48px -24px;
-}
-.icon.road {
-  background-position: -72px -24px;
-}
-.icon.download-alt {
-  background-position: -96px -24px;
-}
-.icon.download {
-  background-position: -120px -24px;
-}
-.icon.upload {
-  background-position: -144px -24px;
-}
-.icon.inbox {
-  background-position: -168px -24px;
-}
-.icon.play-circle {
-  background-position: -192px -24px;
-}
-.icon.repeat {
-  background-position: -216px -24px;
-}
-.icon.refresh {
-  background-position: -240px -24px;
-}
-.icon.calendar {
-  background-position: -264px -24px;
-}
-.icon.lock {
-  background-position: -288px -24px;
-}
-.icon.flag {
-  background-position: -312px -24px;
-}
-.icon.headphones {
-  background-position: -336px -24px;
-}
-.icon.volume-off {
-  background-position: -360px -24px;
-}
-.icon.volume-down {
-  background-position: -384px -24px;
-}
-.icon.volume-up {
-  background-position: -408px -24px;
-}
-.icon.qrcode {
-  background-position: -432px -24px;
-}
-.icon.barcode {
-  background-position: -456px -24px;
-}
-.icon.tag {
-  background-position: 0 -48px;
-}
-.icon.tags {
-  background-position: -24px -48px;
-}
-.icon.book {
-  background-position: -48px -48px;
-}
-.icon.bookmark {
-  background-position: -72px -48px;
-}
-.icon.print {
-  background-position: -96px -48px;
-}
-.icon.camera {
-  background-position: -120px -48px;
-}
-.icon.font {
-  background-position: -144px -48px;
-}
-.icon.bold {
-  background-position: -168px -48px;
-}
-.icon.italic {
-  background-position: -192px -48px;
-}
-.icon.text-height {
-  background-position: -216px -48px;
-}
-.icon.text-width {
-  background-position: -240px -48px;
-}
-.icon.align-left {
-  background-position: -264px -48px;
-}
-.icon.align-center {
-  background-position: -288px -48px;
-}
-.icon.align-right {
-  background-position: -312px -48px;
-}
-.icon.align-justify {
-  background-position: -336px -48px;
-}
-.icon.list {
-  background-position: -360px -48px;
-}
-.icon.indent-left {
-  background-position: -384px -48px;
-}
-.icon.indent-right {
-  background-position: -408px -48px;
-}
-.icon.facetime-video {
-  background-position: -432px -48px;
-}
-.icon.picture {
-  background-position: -456px -48px;
-}
-.icon.pencil {
-  background-position: 0 -72px;
-}
-.icon.map-marker {
-  background-position: -24px -72px;
-}
-.icon.adjust {
-  background-position: -48px -72px;
-}
-.icon.tint {
-  background-position: -72px -72px;
-}
-.icon.edit {
-  background-position: -96px -72px;
-}
-.icon.share {
-  background-position: -120px -72px;
-}
-.icon.check {
-  background-position: -144px -72px;
-}
-.icon.move {
-  background-position: -168px -72px;
-}
-.icon.step-backward {
-  background-position: -192px -72px;
-}
-.icon.fast-backward {
-  background-position: -216px -72px;
-}
-.icon.backward {
-  background-position: -240px -72px;
-}
-.icon.play {
-  background-position: -264px -72px;
-}
-.icon.pause {
-  background-position: -288px -72px;
-}
-.icon.stop {
-  background-position: -312px -72px;
-}
-.icon.forward {
-  background-position: -336px -72px;
-}
-.icon.fast-forward {
-  background-position: -360px -72px;
-}
-.icon.step-forward {
-  background-position: -384px -72px;
-}
-.icon.eject {
-  background-position: -408px -72px;
-}
-.icon.chevron-left {
-  background-position: -432px -72px;
-}
-.icon.chevron-right {
-  background-position: -456px -72px;
-}
-.icon.arrow-left {
-  background-position: -240px -96px;
-}
-.icon.arrow-right {
-  background-position: -264px -96px;
-}
-.icon.arrow-up {
-  background-position: -288px -96px;
-}
-.icon.arrow-down {
-  background-position: -312px -96px;
-}
-.icon.share-alt {
-  background-position: -336px -96px;
-}
-.icon.resize-full {
-  background-position: -360px -96px;
-}
-.icon.resize-small {
-  background-position: -384px -96px;
-}
-.icon.plus {
-  background-position: -408px -96px;
-}
-.icon.minus {
-  background-position: -432px -96px;
-}
-.icon.asterisk {
-  background-position: -456px -96px;
-}
-.dropdown {
-  position: relative;
-}
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  text-indent: -99999px;
-  vertical-align: top;
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top: 4px solid #000000;
-  opacity: 0.3;
-  filter: alpha(opacity=30);
-  content: "\2193";
-}
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
-  *margin-top: 7px;
-}
-.dropdown:hover .caret, .open.dropdown .caret {
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  z-index: 1000;
-  float: left;
-  display: none;
-  min-width: 160px;
-  max-width: 220px;
-  _width: 160px;
-  padding: 4px 0;
-  margin: 0;
-  list-style: none;
-  background-color: #ffffff;
-  border-color: #ccc;
-  border-color: rgba(0, 0, 0, 0.2);
-  border-style: solid;
-  border-width: 1px;
-  -webkit-border-radius: 0 0 5px 5px;
-  -moz-border-radius: 0 0 5px 5px;
-  border-radius: 0 0 5px 5px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding;
-  background-clip: padding-box;
-  zoom: 1;
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-}
-.dropdown-menu.bottom-up {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 2px;
-}
-.dropdown-menu .divider {
-  height: 1px;
-  margin: 5px 1px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-.dropdown-menu a {
-  display: block;
-  padding: 3px 15px;
-  clear: both;
-  font-weight: normal;
-  line-height: 18px;
-  color: #555555;
-  white-space: nowrap;
-}
-.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #0088cc;
-}
-.dropdown.open .dropdown-toggle {
-  color: #ffffff;
-  background: #ccc;
-  background: rgba(0, 0, 0, 0.3);
-}
-.dropdown.open .dropdown-menu {
-  display: block;
-}
-.typeahead {
-  margin-top: 2px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #eee;
-  border: 1px solid rgba(0, 0, 0, 0.05);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -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);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-}
-.well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, 0.15);
-}
-.fade {
-  -webkit-transition: opacity 0.15s linear;
-  -moz-transition: opacity 0.15s linear;
-  -ms-transition: opacity 0.15s linear;
-  -o-transition: opacity 0.15s linear;
-  transition: opacity 0.15s linear;
-  opacity: 0;
-}
-.fade.in {
-  opacity: 1;
-}
-.collapse {
-  -webkit-transition: height 0.35s ease;
-  -moz-transition: height 0.35s ease;
-  -ms-transition: height 0.35s ease;
-  -o-transition: height 0.35s ease;
-  transition: height 0.35s ease;
-  position: relative;
-  overflow: hidden;
-  height: 0;
-}
-.collapse.in {
-  height: auto;
-}
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: 18px;
-  color: #000000;
-  text-shadow: 0 1px 0 #ffffff;
-  opacity: 0.2;
-  filter: alpha(opacity=20);
-}
-.close:hover {
-  color: #000000;
-  text-decoration: none;
-  opacity: 0.4;
-  filter: alpha(opacity=40);
-  cursor: pointer;
-}
-.nav {
-  margin-left: 0;
-  margin-bottom: 18px;
-  list-style: none;
-}
-.nav > li > a {
-  display: block;
-}
-.nav > li > a:hover {
-  text-decoration: none;
-  background-color: #eeeeee;
-}
-.nav.list {
-  padding-left: 14px;
-  padding-right: 14px;
-  margin-bottom: 0;
-}
-.nav.list > li > a, .nav.list .nav-header {
-  display: block;
-  padding: 3px 15px;
-  margin-left: -15px;
-  margin-right: -15px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
-.nav.list .nav-header {
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 18px;
-  color: #999999;
-  text-transform: uppercase;
-}
-.nav.list > li + .nav-header {
-  margin-top: 9px;
-}
-.nav.list .active > a {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  background-color: #0088cc;
-}
-.tabs, .pills {
-  *zoom: 1;
-}
-.tabs:before,
-.pills:before,
-.tabs:after,
-.pills:after {
-  display: table;
-  content: "";
-}
-.tabs:after, .pills:after {
-  clear: both;
-}
-.tabs > li, .pills > li {
-  float: left;
-}
-.tabs > li > a, .pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px;
-}
-.tabs {
-  border-bottom: 1px solid #ddd;
-}
-.tabs > li {
-  margin-bottom: -1px;
-}
-.tabs > li > a {
-  padding-top: 9px;
-  padding-bottom: 9px;
-  border: 1px solid transparent;
-  -webkit-border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
-  border-radius: 4px 4px 0 0;
-}
-.tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #dddddd;
-}
-.tabs > .active > a, .tabs > .active > a:hover {
-  color: #555555;
-  background-color: #ffffff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-  cursor: default;
-}
-.pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-}
-.pills .active > a, .pills .active > a:hover {
-  color: #ffffff;
-  background-color: #0088cc;
-}
-.nav.stacked > li {
-  float: none;
-}
-.nav.stacked > li > a {
-  margin-right: 0;
-}
-.tabs.stacked {
-  border-bottom: 0;
-}
-.tabs.stacked > li > a {
-  border: 1px solid #ddd;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.tabs.stacked > li:first-child > a {
-  -webkit-border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
-  border-radius: 4px 4px 0 0;
-}
-.tabs.stacked > li:last-child > a {
-  -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius: 0 0 4px 4px;
-  border-radius: 0 0 4px 4px;
-}
-.tabs.stacked > li > a:hover {
-  border-color: #ddd;
-  z-index: 2;
-}
-.pills.stacked > li > a {
-  margin-bottom: 3px;
-}
-.pills.stacked > li:last-child > a {
-  margin-bottom: 1px;
-}
-.pills .dropdown-menu, .tabs .dropdown-menu {
-  margin-top: 1px;
-  border-width: 1px;
-}
-.pills .dropdown-menu {
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
-  border-top-color: #0088cc;
-  margin-top: 6px;
-}
-.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret {
-  border-top-color: #005580;
-}
-.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret {
-  border-top-color: #333333;
-}
-.nav > .dropdown.active > a:hover {
-  color: #000000;
-  cursor: pointer;
-}
-.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover {
-  color: #ffffff;
-  background-color: #999999;
-  border-color: #999999;
-}
-.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
-  border-top-color: #ffffff;
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-.tabs.stacked .open > a:hover {
-  border-color: #999999;
-}
-.tabbable {
-  *zoom: 1;
-}
-.tabbable:before, .tabbable:after {
-  display: table;
-  content: "";
-}
-.tabbable:after {
-  clear: both;
-}
-.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs {
-  border-bottom: 0;
-}
-.tab-content > .tab-pane, .pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active, .pill-content > .active {
-  display: block;
-}
-.tabs-below .tabs {
-  border-top: 1px solid #ddd;
-}
-.tabs-below .tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-.tabs-below .tabs > li > a {
-  -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius: 0 0 4px 4px;
-  border-radius: 0 0 4px 4px;
-}
-.tabs-below .tabs > li > a:hover {
-  border-bottom-color: transparent;
-  border-top-color: #ddd;
-}
-.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover {
-  border-color: transparent #ddd #ddd #ddd;
-}
-.tabs-left .tabs > li, .tabs-right .tabs > li {
-  float: none;
-}
-.tabs-left .tabs > li > a, .tabs-right .tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-.tabs-left .tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
-}
-.tabs-left .tabs > li > a {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius: 4px 0 0 4px;
-  border-radius: 4px 0 0 4px;
-}
-.tabs-left .tabs > li > a:hover {
-  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
-}
-.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover {
-  border-color: #ddd transparent #ddd #ddd;
-}
-.tabs-right .tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
-}
-.tabs-right .tabs > li > a {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius: 0 4px 4px 0;
-  border-radius: 0 4px 4px 0;
-}
-.tabs-right .tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
-}
-.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
-  border-color: #ddd #ddd #ddd transparent;
-}
-.navbar {
-  overflow: visible;
-}
-.navbar-inner {
-  background-color: #222222;
-  background-color: #2c2c2c;
-  background-image: -moz-linear-gradient(top, #333333, #222222);
-  background-image: -ms-linear-gradient(top, #333333, #222222);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
-  background-image: -webkit-linear-gradient(top, #333333, #222222);
-  background-image: -o-linear-gradient(top, #333333, #222222);
-  background-image: linear-gradient(top, #333333, #222222);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-}
-.navbar .brand:hover {
-  color: #ffffff;
-  text-decoration: none;
-}
-.navbar .brand {
-  float: left;
-  display: block;
-  padding: 8px 20px 12px;
-  margin-left: -20px;
-  font-size: 20px;
-  font-weight: 200;
-  line-height: 1;
-  color: #ffffff;
-}
-.navbar p {
-  margin: 0;
-  line-height: 40px;
-}
-.navbar p a:hover {
-  color: #ffffff;
-  background-color: transparent;
-}
-.navbar .btn, .navbar .btn-group {
-  margin-top: 5px;
-}
-.navbar .btn-group .btn {
-  margin-top: 0;
-}
-.navbar-form {
-  margin-bottom: 0;
-}
-.navbar-form input, .navbar-form select {
-  display: inline-block;
-  margin-bottom: 0;
-}
-.navbar-search {
-  position: relative;
-  float: left;
-  margin-top: 6px;
-  margin-bottom: 0;
-}
-.navbar-search .search-query {
-  padding: 4px 9px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  font-weight: normal;
-  line-height: 1;
-  color: #ffffff;
-  color: rgba(255, 255, 255, 0.75);
-  background: #444;
-  background: rgba(255, 255, 255, 0.3);
-  border: 1px solid #111;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-  -webkit-transition: none;
-  -moz-transition: none;
-  -ms-transition: none;
-  -o-transition: none;
-  transition: none;
-}
-.navbar-search .search-query :-moz-placeholder {
-  color: #eeeeee;
-}
-.navbar-search .search-query::-webkit-input-placeholder {
-  color: #eeeeee;
-}
-.navbar-search .search-query:hover {
-  color: #ffffff;
-  background-color: #999999;
-  background-color: rgba(255, 255, 255, 0.5);
-}
-.navbar-search .search-query:focus, .navbar-search .search-query.focused {
-  padding: 5px 10px;
-  color: #333333;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #ffffff;
-  border: 0;
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  outline: 0;
-}
-.navbar-static {
-  margin-bottom: 18px;
-}
-.navbar-static .navbar-inner {
-  padding-left: 20px;
-  padding-right: 20px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.navbar-fixed {
-  position: fixed;
-  top: 0;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-}
-.navbar .nav {
-  position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.navbar .nav.pull-right {
-  float: right;
-}
-.navbar .nav > li {
-  display: block;
-  float: left;
-}
-.navbar .nav > li > a {
-  float: none;
-  padding: 10px 10px 11px;
-  line-height: 19px;
-  color: #999999;
-  text-decoration: none;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.navbar .nav > li > a:hover {
-  background-color: transparent;
-  color: #ffffff;
-  text-decoration: none;
-}
-.navbar .nav .active > a {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #222222;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-.navbar .vertical-divider {
-  height: 40px;
-  width: 1px;
-  margin: 0 5px;
-  overflow: hidden;
-  background-color: #222222;
-  border-right: 1px solid #444;
-}
-.navbar .nav.pull-right {
-  margin-left: 10px;
-  margin-right: 0;
-}
-.navbar .dropdown-menu {
-  margin-top: 1px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.navbar .dropdown-menu:before {
-  content: '';
-  display: inline-block;
-  border-left: 7px solid transparent;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  position: absolute;
-  top: -7px;
-  left: 9px;
-}
-.navbar .dropdown-menu:after {
-  content: '';
-  display: inline-block;
-  border-left: 6px solid transparent;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
-  position: absolute;
-  top: -6px;
-  left: 10px;
-}
-.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
-  border-top-color: #ffffff;
-}
-.navbar .nav .active .caret {
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
-  background-color: transparent;
-}
-.navbar .nav .active > .dropdown-toggle:hover {
-  color: #ffffff;
-}
-.navbar .nav.pull-right .dropdown-menu {
-  right: 0;
-}
-.navbar .nav.pull-right .dropdown-menu:before {
-  left: auto;
-  right: 12px;
-}
-.navbar .nav.pull-right .dropdown-menu:after {
-  left: auto;
-  right: 13px;
-}
-.breadcrumb {
-  padding: 7px 14px;
-  margin: 0 0 18px;
-  background-color: #fbfbfb;
-  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
-  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: linear-gradient(top, #ffffff, #f5f5f5);
-  background-repeat: repeat-x;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 0 #ffffff;
-  -moz-box-shadow: inset 0 1px 0 #ffffff;
-  box-shadow: inset 0 1px 0 #ffffff;
-}
-.breadcrumb li {
-  display: inline;
-  text-shadow: 0 1px 0 #ffffff;
-}
-.breadcrumb .divider {
-  padding: 0 5px;
-  color: #999999;
-}
-.breadcrumb .active a {
-  color: #333333;
-}
-.pagination {
-  height: 36px;
-  margin: 18px 0;
-}
-.pagination ul {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-  margin-left: 0;
-  margin-bottom: 0;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  -webkit-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);
-}
-.pagination li {
-  display: inline;
-}
-.pagination a {
-  float: left;
-  padding: 0 14px;
-  line-height: 34px;
-  text-decoration: none;
-  border: 1px solid #ddd;
-  border-left-width: 0;
-}
-.pagination a:hover, .pagination .active a {
-  background-color: #f5f5f5;
-}
-.pagination .active a {
-  color: #999999;
-}
-.pagination .disabled a, .pagination .disabled a:hover {
-  color: #999999;
-  background-color: transparent;
-  cursor: default;
-}
-.pagination li:first-child a {
-  border-left-width: 1px;
-  -webkit-border-radius: 3px 0 0 3px;
-  -moz-border-radius: 3px 0 0 3px;
-  border-radius: 3px 0 0 3px;
-}
-.pagination li:last-child a {
-  -webkit-border-radius: 0 3px 3px 0;
-  -moz-border-radius: 0 3px 3px 0;
-  border-radius: 0 3px 3px 0;
-}
-.pagination-centered {
-  text-align: center;
-}
-.pagination-right {
-  text-align: right;
-}
-.pager {
-  margin-left: 0;
-  margin-bottom: 18px;
-  list-style: none;
-  text-align: center;
-  *zoom: 1;
-}
-.pager:before, .pager:after {
-  display: table;
-  content: "";
-}
-.pager:after {
-  clear: both;
-}
-.pager li {
-  display: inline;
-}
-.pager a {
-  display: inline-block;
-  padding: 6px 15px;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 15px;
-  -moz-border-radius: 15px;
-  border-radius: 15px;
-}
-.pager .next a {
-  float: right;
-}
-.pager .previous a {
-  float: left;
-}
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  background-color: #000000;
-}
-.modal-backdrop.fade {
-  opacity: 0;
-}
-.modal-backdrop, .modal-backdrop.fade.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-.modal {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  z-index: 1050;
-  max-height: 500px;
-  overflow: auto;
-  width: 560px;
-  margin: -250px 0 0 -280px;
-  background-color: #ffffff;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-  *border: 1px solid #999;
-  /* IE6-7 */
-
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-  -webkit-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);
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
-  background-clip: padding-box;
-}
-.modal.fade {
-  -webkit-transition: opacity .3s linear, top .3s ease-out;
-  -moz-transition: opacity .3s linear, top .3s ease-out;
-  -ms-transition: opacity .3s linear, top .3s ease-out;
-  -o-transition: opacity .3s linear, top .3s ease-out;
-  transition: opacity .3s linear, top .3s ease-out;
-  top: -25%;
-}
-.modal.fade.in {
-  top: 50%;
-}
-.modal-header {
-  padding: 5px 15px;
-  border-bottom: 1px solid #eee;
-}
-.modal-header .close {
-  margin-top: 2px;
-}
-.modal-body {
-  padding: 15px;
-}
-.modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  -webkit-border-radius: 0 0 6px 6px;
-  -moz-border-radius: 0 0 6px 6px;
-  border-radius: 0 0 6px 6px;
-  -webkit-box-shadow: inset 0 1px 0 #ffffff;
-  -moz-box-shadow: inset 0 1px 0 #ffffff;
-  box-shadow: inset 0 1px 0 #ffffff;
-  *zoom: 1;
-}
-.modal-footer:before, .modal-footer:after {
-  display: table;
-  content: "";
-}
-.modal-footer:after {
-  clear: both;
-}
-.modal-footer .btn {
-  float: right;
-  margin-left: 5px;
-  margin-bottom: 0;
-}
-.tooltip {
-  position: absolute;
-  z-index: 1020;
-  display: block;
-  visibility: visible;
-  padding: 5px;
-  font-size: 11px;
-  opacity: 0;
-  filter: alpha(opacity=0);
-}
-.tooltip.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-.tooltip.top {
-  margin-top: -2px;
-}
-.tooltip.right {
-  margin-left: 2px;
-}
-.tooltip.bottom {
-  margin-top: 2px;
-}
-.tooltip.left {
-  margin-left: -2px;
-}
-.tooltip.top .tooltip-arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-top: 5px solid #000000;
-}
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid #000000;
-}
-.tooltip.bottom .tooltip-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-bottom: 5px solid #000000;
-}
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-right: 5px solid #000000;
-}
-.tooltip-inner {
-  max-width: 200px;
-  padding: 3px 8px;
-  color: #ffffff;
-  text-align: center;
-  text-decoration: none;
-  background-color: #000000;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-}
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1010;
-  display: none;
-  padding: 5px;
-}
-.popover.top {
-  margin-top: -5px;
-}
-.popover.right {
-  margin-left: 5px;
-}
-.popover.bottom {
-  margin-top: 5px;
-}
-.popover.left {
-  margin-left: -5px;
-}
-.popover.top .arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-top: 5px solid #000000;
-}
-.popover.right .arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-right: 5px solid #000000;
-}
-.popover.bottom .arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-bottom: 5px solid #000000;
-}
-.popover.left .arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid #000000;
-}
-.popover .arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-}
-.popover .inner {
-  padding: 3px;
-  width: 280px;
-  overflow: hidden;
-  background: #000000;
-  background: rgba(0, 0, 0, 0.8);
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-  -webkit-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);
-}
-.popover .title {
-  padding: 9px 15px;
-  line-height: 1;
-  background-color: #f5f5f5;
-  border-bottom: 1px solid #eee;
-  -webkit-border-radius: 3px 3px 0 0;
-  -moz-border-radius: 3px 3px 0 0;
-  border-radius: 3px 3px 0 0;
-}
-.popover .content {
-  padding: 14px;
-  background-color: #ffffff;
-  -webkit-border-radius: 0 0 3px 3px;
-  -moz-border-radius: 0 0 3px 3px;
-  border-radius: 0 0 3px 3px;
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
-  background-clip: padding-box;
-}
-.popover .content p, .popover .content ul, .popover .content ol {
-  margin-bottom: 0;
-}
-.btn.primary,
-.btn.primary:hover,
-.btn.danger,
-.btn.danger:hover,
-.btn.success,
-.btn.success:hover,
-.btn.info,
-.btn.info:hover {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  color: #ffffff;
-}
-.btn.primary {
-  background-color: #0074cc;
-  background-image: -moz-linear-gradient(top, #0088cc, #0055cc);
-  background-image: -ms-linear-gradient(top, #0088cc, #0055cc);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0055cc);
-  background-image: -o-linear-gradient(top, #0088cc, #0055cc);
-  background-image: linear-gradient(top, #0088cc, #0055cc);
-  background-repeat: repeat-x;
-  border-color: #0055cc #0055cc #003580;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.btn.primary:hover,
-.btn.primary:active,
-.btn.primary.active,
-.btn.primary.disabled {
-  background-color: #0055cc;
-}
-.btn.primary[disabled] {
-  background-color: #0055cc;
-}
-.btn.primary:active, .btn.primary.active {
-  background-color: #004099 \9;
-}
-.btn.danger {
-  background-color: #dd514c;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(top, #ee5f5b, #c43c35);
-  background-repeat: repeat-x;
-  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.danger:hover,
-.btn.danger:active,
-.btn.danger.active,
-.btn.danger.disabled {
-  background-color: #c43c35;
-}
-.btn.danger[disabled] {
-  background-color: #c43c35;
-}
-.btn.danger:active, .btn.danger.active {
-  background-color: #9c302a \9;
-}
-.btn.success {
-  background-color: #5eb95e;
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -ms-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(top, #62c462, #57a957);
-  background-repeat: repeat-x;
-  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.success:hover,
-.btn.success:active,
-.btn.success.active,
-.btn.success.disabled {
-  background-color: #57a957;
-}
-.btn.success[disabled] {
-  background-color: #57a957;
-}
-.btn.success:active, .btn.success.active {
-  background-color: #458845 \9;
-}
-.btn.info {
-  background-color: #4bb1cf;
-  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: linear-gradient(top, #5bc0de, #339bb9);
-  background-repeat: repeat-x;
-  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);
-}
-.btn.info:hover,
-.btn.info:active,
-.btn.info.active,
-.btn.info.disabled {
-  background-color: #339bb9;
-}
-.btn.info[disabled] {
-  background-color: #339bb9;
-}
-.btn.info:active, .btn.info.active {
-  background-color: #287a91 \9;
-}
-.btn {
-  display: inline-block;
-  padding: 4px 10px 4px;
-  font-size: 13px;
-  line-height: 18px;
-  color: #333333;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  background-color: #fafafa;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-repeat: no-repeat;
-  border: 1px solid #ccc;
-  border-bottom-color: #bbb;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -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);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  cursor: pointer;
-}
-.btn:hover {
-  color: #333333;
-  text-decoration: none;
-  background-color: #e6e6e6;
-  background-position: 0 -15px;
-  -webkit-transition: background-position 0.1s linear;
-  -moz-transition: background-position 0.1s linear;
-  -ms-transition: background-position 0.1s linear;
-  -o-transition: background-position 0.1s linear;
-  transition: background-position 0.1s linear;
-}
-.btn:focus {
-  outline: 1px dotted #666;
-}
-.btn.active, .btn:active {
-  background-image: none;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  background-color: #e6e6e6;
-  background-color: #d9d9d9 \9;
-}
-.btn.disabled {
-  cursor: default;
-  background-image: none;
-  background-color: #e6e6e6;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-.btn[disabled] {
-  cursor: default;
-  background-image: none;
-  background-color: #e6e6e6;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-.btn.large {
-  padding: 9px 14px 9px;
-  font-size: 15px;
-  line-height: normal;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-}
-.btn.large .icon {
-  margin-top: 1px;
-}
-.btn.small {
-  padding: 5px 9px 5px;
-  font-size: 11px;
-  line-height: 16px;
-}
-.btn.small .icon {
-  margin-top: -2px;
-}
-button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-.btn-group {
-  position: relative;
-  *zoom: 1;
-}
-.btn-group:before, .btn-group:after {
-  display: table;
-  content: "";
-}
-.btn-group:after {
-  clear: both;
-}
-.btn-group + .btn-group {
-  margin-left: 5px;
-}
-.btn-toolbar .btn-group {
-  display: inline-block;
-}
-.btn-group .btn {
-  position: relative;
-  float: left;
-  margin-left: -1px;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.btn-group .btn:first-child {
-  margin-left: 0;
-  -webkit-border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-  border-top-left-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  border-bottom-left-radius: 4px;
-}
-.btn-group .btn:last-child, .btn-group .dropdown-toggle {
-  -webkit-border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  border-bottom-right-radius: 4px;
-}
-.btn-group .btn.large:first-child {
-  margin-left: 0;
-  -webkit-border-top-left-radius: 6px;
-  -moz-border-radius-topleft: 6px;
-  border-top-left-radius: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-  -moz-border-radius-bottomleft: 6px;
-  border-bottom-left-radius: 6px;
-}
-.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle {
-  -webkit-border-top-right-radius: 6px;
-  -moz-border-radius-topright: 6px;
-  border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-  -moz-border-radius-bottomright: 6px;
-  border-bottom-right-radius: 6px;
-}
-.btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active {
-  z-index: 2;
-}
-.btn-group .dropdown-toggle {
-  padding-left: 8px;
-  padding-right: 8px;
-  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-.btn-group.open .dropdown-menu {
-  display: block;
-  margin-top: 1px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-}
-.btn-group.open .dropdown-toggle {
-  background-image: none;
-  -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-.btn .caret {
-  margin-top: 6px;
-  margin-left: 0;
-}
-.primary .caret,
-.danger .caret,
-.info .caret,
-.success .caret {
-  border-top-color: #ffffff;
-  opacity: 0.75;
-  filter: alpha(opacity=75);
-}
-.btn.small .caret {
-  margin-top: 4px;
-}
-.alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: 18px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  background-color: #fcf8e3;
-  border: 1px solid #f3edd2;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.alert, .alert-heading {
-  color: #c09853;
-}
-.alert .close {
-  position: relative;
-  right: -21px;
-  line-height: 18px;
-}
-.alert-success {
-  background-color: #dff0d8;
-  border-color: #cfe8c4;
-}
-.alert-success, .alert-success .alert-heading {
-  color: #468847;
-}
-.alert-danger, .alert-error {
-  background-color: #f2dede;
-  border-color: #e9c7c7;
-}
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
-  color: #b94a48;
-}
-.alert-info {
-  background-color: #d9edf7;
-  border-color: #bfe1f2;
-}
-.alert-info, .alert-info .alert-heading {
-  color: #3a87ad;
-}
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-.alert-block > p, .alert-block > ul {
-  margin-bottom: 0;
-}
-.alert-block p + p {
-  margin-top: 5px;
-}
-.thumbnails {
-  margin-left: -20px;
-  list-style: none;
-  *zoom: 1;
-}
-.thumbnails:before, .thumbnails:after {
-  display: table;
-  content: "";
-}
-.thumbnails:after {
-  clear: both;
-}
-.thumbnails > li {
-  float: left;
-  margin: 0 0 18px 20px;
-}
-.thumbnail {
-  display: block;
-  padding: 4px;
-  line-height: 1;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-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);
-}
-a.thumbnail:hover {
-  border-color: #0088cc;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-  box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-}
-.thumbnail > img {
-  display: block;
-  max-width: 100%;
-}
-.thumbnail .caption {
-  padding: 9px;
-}
-.label {
-  padding: 1px 3px 2px;
-  font-size: 9.75px;
-  font-weight: bold;
-  color: #ffffff;
-  text-transform: uppercase;
-  background-color: #999999;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.label.important {
-  background-color: #b94a48;
-}
-.label.warning {
-  background-color: #f89406;
-}
-.label.success {
-  background-color: #468847;
-}
-.label.info {
-  background-color: #3a87ad;
-}
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-.progress, .progress .bar {
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.progress {
-  height: 18px;
-  margin-bottom: 18px;
-  background-color: #f7f7f7;
-  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-}
-.progress .bar {
-  width: 0%;
-  height: 18px;
-  color: #ffffff;
-  font-size: 12px;
-  text-align: center;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e90d2;
-  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
-  background-image: -ms-linear-gradient(top, #149bdf, #0480be);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
-  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
-  background-image: -o-linear-gradient(top, #149bdf, #0480be);
-  background-image: linear-gradient(top, #149bdf, #0480be);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  -webkit-transition: width 0.6s ease;
-  -moz-transition: width 0.6s ease;
-  -ms-transition: width 0.6s ease;
-  -o-transition: width 0.6s ease;
-  transition: width 0.6s ease;
-}
-.progress.striped .bar {
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  -webkit-background-size: 40px 40px;
-  -moz-background-size: 40px 40px;
-  -o-background-size: 40px 40px;
-  background-size: 40px 40px;
-}
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-  -moz-animation: progress-bar-stripes 2s linear infinite;
-  animation: progress-bar-stripes 2s linear infinite;
-}
-.progress.danger .bar {
-  background-color: #dd514c;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(top, #ee5f5b, #c43c35);
-  background-repeat: repeat-x;
-}
-.progress.danger.striped .bar {
-  background-color: #ee5f5b;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-.progress.success .bar {
-  background-color: #5eb95e;
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -ms-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(top, #62c462, #57a957);
-  background-repeat: repeat-x;
-}
-.progress.success.striped .bar {
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-.progress.info .bar {
-  background-color: #4bb1cf;
-  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: linear-gradient(top, #5bc0de, #339bb9);
-  background-repeat: repeat-x;
-}
-.progress.info.striped .bar {
-  background-color: #5bc0de;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-.accordion {
-  margin-bottom: 18px;
-}
-.accordion-group {
-  background-color: #f5f5f5;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.accordion-heading {
-  border-bottom: 0;
-}
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
-.accordion-body {
-  margin-bottom: 2px;
-}
-.accordion-inner {
-  padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
-}
-.carousel {
-  position: relative;
-  line-height: 1;
-}
-.carousel-inner {
-  overflow: hidden;
-  width: 100%;
-  position: relative;
-}
-.carousel .item {
-  display: none;
-  position: relative;
-  -webkit-transition: 0.6s ease-in-out left;
-  -moz-transition: 0.6s ease-in-out left;
-  -ms-transition: 0.6s ease-in-out left;
-  -o-transition: 0.6s ease-in-out left;
-  transition: 0.6s ease-in-out left;
-}
-.carousel .item > img {
-  display: block;
-  line-height: 1;
-}
-.carousel .active, .carousel .next, .carousel .prev {
-  display: block;
-}
-.carousel .active {
-  left: 0;
-}
-.carousel .next, .carousel .prev {
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.carousel .next {
-  left: 100%;
-}
-.carousel .prev {
-  left: -100%;
-}
-.carousel .next.left, .carousel .prev.right {
-  left: 0;
-}
-.carousel .active.left {
-  left: -100%;
-}
-.carousel .active.right {
-  left: 100%;
-}
-.carousel-control {
-  position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: #ffffff;
-  text-align: center;
-  background: #222222;
-  border: 3px solid #ffffff;
-  -webkit-border-radius: 23px;
-  -moz-border-radius: 23px;
-  border-radius: 23px;
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-  -webkit-transition: all 0.2s linear;
-  -moz-transition: all 0.2s linear;
-  -ms-transition: all 0.2s linear;
-  -o-transition: all 0.2s linear;
-  transition: all 0.2s linear;
-}
-.carousel-control.right {
-  left: auto;
-  right: 15px;
-}
-.carousel-control:hover {
-  color: #ffffff;
-  text-decoration: none;
-  opacity: 0.9;
-  filter: alpha(opacity=90);
-}
-.carousel-caption {
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding: 10px 15px 5px;
-  background: #333333;
-  background: rgba(0, 0, 0, 0.75);
-}
-.carousel-caption h4, .carousel-caption p {
-  color: #ffffff;
-}
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-}
-.hero-unit h1 {
-  margin-bottom: 0;
-  font-size: 60px;
-  line-height: 1;
-  letter-spacing: -1px;
-}
-.hero-unit p {
-  font-size: 18px;
-  font-weight: 200;
-  line-height: 27px;
-}
-.pull-right {
-  float: right;
-}
-.pull-left {
-  float: left;
-}
-.hide {
-  display: none;
-}
-.show {
-  display: block;
-}
-.invisible {
-  visibility: hidden;
-}
diff --git a/bootstrap.min.css b/bootstrap.min.css
deleted file mode 100644
index e7e5d16be..000000000
--- a/bootstrap.min.css
+++ /dev/null
@@ -1,556 +0,0 @@
-article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
-audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
-audio:not([controls]){display:none;}
-html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
-a:focus{outline:thin dotted;}
-a:hover,a:active{outline:0;}
-sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
-sup{top:-0.5em;}
-sub{bottom:-0.25em;}
-img{max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;}
-button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}
-button,input{*overflow:visible;line-height:normal;}
-button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
-button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
-input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
-input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
-textarea{overflow:auto;vertical-align:top;}
-body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#555555;background-color:#ffffff;}
-a{color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
-.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
-.row:after{clear:both;}
-[class*="span"]{float:left;margin-left:20px;}
-.span1{width:60px;}
-.span2{width:140px;}
-.span3{width:220px;}
-.span4{width:300px;}
-.span5{width:380px;}
-.span6{width:460px;}
-.span7{width:540px;}
-.span8{width:620px;}
-.span9{width:700px;}
-.span10{width:780px;}
-.span11{width:860px;}
-.span12{width:940px;}
-.offset1{margin-left:100px;}
-.offset2{margin-left:180px;}
-.offset3{margin-left:260px;}
-.offset4{margin-left:340px;}
-.offset5{margin-left:420px;}
-.offset6{margin-left:500px;}
-.offset7{margin-left:580px;}
-.offset8{margin-left:660px;}
-.offset9{margin-left:740px;}
-.offset10{margin-left:820px;}
-.offset11{margin-left:900px;}
-.container{width:940px;margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
-.container:after{clear:both;}
-.fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;*zoom:1;}.fluid-container:before,.fluid-container:after{display:table;content:"";}
-.fluid-container: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;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
-.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;}
-h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;}
-h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}
-h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}
-h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
-h4,h5,h6{line-height:18px;}
-h4{font-size:14px;}h4 small{font-size:12px;}
-h5{font-size:12px;}
-h6{font-size:11px;color:#999999;text-transform:uppercase;}
-ul,ol{padding:0;margin:0 0 9px 25px;}
-ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
-ul{list-style:disc;}
-ol{list-style:decimal;}
-li{line-height:18px;}
-ul.unstyled{margin-left:0;list-style:none;}
-dl{margin-bottom:18px;}
-dt,dd{line-height:18px;}
-dt{font-weight:bold;}
-dd{margin-left:9px;}
-hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;}
-strong{font-weight:bold;}
-em{font-style:italic;}
-.muted{color:#999999;}
-abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;}
-blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
-blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
-blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
-q:before,q:after,blockquote:before,blockquote:after{content:"";}
-address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
-small{font-size:100%;}
-cite{font-style:normal;}
-code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}
-pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
-pre code{padding:0;background-color:transparent;}
-form{margin:0 0 18px;}
-fieldset{padding:0;margin:0;border:0;}
-legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;}
-label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
-label{display:block;margin-bottom:5px;color:#333333;}
-input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-.uneditable-textarea{width:auto;height:auto;}
-label input,label textarea,label select{display:block;}
-input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
-select,input[type=file]{height:28px;*margin-top:4px;line-height:28px;}
-select{width:220px;background-color:#ffffff;}
-select[multiple],select[size]{height:auto;}
-input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-textarea{height:auto;}
-input[type=hidden]{display:none;}
-.radio,.checkbox{padding-left:18px;}
-.radio input[type=radio],.checkbox input[type=checkbox]{float:left;margin-left:-18px;}
-.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;}
-.radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;}
-.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
-input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
-input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;}
-input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;}
-.input-mini{width:60px;}
-.input-small{width:90px;}
-.input-medium{width:150px;}
-.input-large{width:210px;}
-.input-xlarge{width:270px;}
-.input-xxlarge{width:530px;}
-input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;}
-input.span1,textarea.span1,.uneditable-input.span1{width:50px;}
-input.span2,textarea.span2,.uneditable-input.span2{width:130px;}
-input.span3,textarea.span3,.uneditable-input.span3{width:210px;}
-input.span4,textarea.span4,.uneditable-input.span4{width:290px;}
-input.span5,textarea.span5,.uneditable-input.span5{width:370px;}
-input.span6,textarea.span6,.uneditable-input.span6{width:450px;}
-input.span7,textarea.span7,.uneditable-input.span7{width:530px;}
-input.span8,textarea.span8,.uneditable-input.span8{width:610px;}
-input.span9,textarea.span9,.uneditable-input.span9{width:690px;}
-input.span10,textarea.span10,.uneditable-input.span10{width:770px;}
-input.span11,textarea.span11,.uneditable-input.span11{width:850px;}
-input.span12,textarea.span12,.uneditable-input.span12{width:930px;}
-select.span1{width:70px;}
-select.span2{width:150px;}
-select.span3{width:230px;}
-select.span4{width:310px;}
-select.span5{width:390px;}
-select.span6{width:470px;}
-select.span7{width:550px;}
-select.span8{width:630px;}
-select.span9{width:710px;}
-select.span10{width:790px;}
-select.span11{width:870px;}
-select.span12{width:950px;}
-input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
-.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
-.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
-.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
-.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
-.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
-.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
-.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
-.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
-.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
-input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
-.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
-.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
-:-moz-placeholder{color:#999999;}
-::-webkit-input-placeholder{color:#999999;}
-.help-block{margin-top:5px;margin-bottom:0;color:#999999;}
-.help-inline{display:inline-block;margin-bottom:9px;vertical-align:middle;padding-left:5px;}
-.input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";}
-.input-prepend:after,.input-append:after{clear:both;}
-.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
-.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;}
-.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
-.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;}
-.input-prepend .add-on{*margin-top:1px;}
-.input-append input,.input-append .uneditable-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 .uneditable-input{border-right-color:#ccc;}
-.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
-.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
-.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
-.form-search label,.form-inline label{display:inline-block;}
-.control-group{margin-bottom:9px;}
-.form-horizontal legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;}
-.form-horizontal .control-group{margin-bottom:18px;}
-.form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
-.form-horizontal .controls{margin-left:160px;}
-.form-horizontal .form-actions{padding-left:160px;}
-table{max-width:100%;border-collapse:collapse;border-spacing:0;}
-.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;}
-.table th{font-weight:bold;vertical-align:bottom;}
-.table td{vertical-align:top;}
-.table thead:first-child tr th,.table thead:first-child tr td{border-top:0;}
-.table tbody+tbody{border-top:2px solid #ddd;}
-.table-condensed th,.table-condensed td{padding:4px 5px;}
-.table-bordered{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;}
-.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
-.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
-.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
-.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
-.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
-.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;}
-table .span1{float:none;width:44px;margin-left:0;}
-table .span2{float:none;width:124px;margin-left:0;}
-table .span3{float:none;width:204px;margin-left:0;}
-table .span4{float:none;width:284px;margin-left:0;}
-table .span5{float:none;width:364px;margin-left:0;}
-table .span6{float:none;width:444px;margin-left:0;}
-table .span7{float:none;width:524px;margin-left:0;}
-table .span8{float:none;width:604px;margin-left:0;}
-table .span9{float:none;width:684px;margin-left:0;}
-table .span10{float:none;width:764px;margin-left:0;}
-table .span11{float:none;width:844px;margin-left:0;}
-table .span12{float:none;width:924px;margin-left:0;}
-.icon{background-image:url(img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
-.icon.white{background-image:url(img/glyphicons-halflings-sprite-white.png);}
-.icon.glass{background-position:0 0;}
-.icon.music{background-position:-24px 0;}
-.icon.search{background-position:-48px 0;}
-.icon.envelope{background-position:-72px 0;}
-.icon.heart{background-position:-96px 0;}
-.icon.star{background-position:-120px 0;}
-.icon.star-empty{background-position:-144px 0;}
-.icon.user{background-position:-168px 0;}
-.icon.film{background-position:-192px 0;}
-.icon.th-large{background-position:-216px 0;}
-.icon.th{background-position:-240px 0;}
-.icon.th-list{background-position:-264px 0;}
-.icon.ok{background-position:-288px 0;}
-.icon.remove{background-position:-312px 0;}
-.icon.zoom-in{background-position:-336px 0;}
-.icon.zoom-out{background-position:-360px 0;}
-.icon.off{background-position:-384px 0;}
-.icon.signal{background-position:-408px 0;}
-.icon.cog{background-position:-432px 0;}
-.icon.trash{background-position:-456px 0;}
-.icon.home{background-position:0 -24px;}
-.icon.file{background-position:-24px -24px;}
-.icon.time{background-position:-48px -24px;}
-.icon.road{background-position:-72px -24px;}
-.icon.download-alt{background-position:-96px -24px;}
-.icon.download{background-position:-120px -24px;}
-.icon.upload{background-position:-144px -24px;}
-.icon.inbox{background-position:-168px -24px;}
-.icon.play-circle{background-position:-192px -24px;}
-.icon.repeat{background-position:-216px -24px;}
-.icon.refresh{background-position:-240px -24px;}
-.icon.calendar{background-position:-264px -24px;}
-.icon.lock{background-position:-288px -24px;}
-.icon.flag{background-position:-312px -24px;}
-.icon.headphones{background-position:-336px -24px;}
-.icon.volume-off{background-position:-360px -24px;}
-.icon.volume-down{background-position:-384px -24px;}
-.icon.volume-up{background-position:-408px -24px;}
-.icon.qrcode{background-position:-432px -24px;}
-.icon.barcode{background-position:-456px -24px;}
-.icon.tag{background-position:0 -48px;}
-.icon.tags{background-position:-24px -48px;}
-.icon.book{background-position:-48px -48px;}
-.icon.bookmark{background-position:-72px -48px;}
-.icon.print{background-position:-96px -48px;}
-.icon.camera{background-position:-120px -48px;}
-.icon.font{background-position:-144px -48px;}
-.icon.bold{background-position:-168px -48px;}
-.icon.italic{background-position:-192px -48px;}
-.icon.text-height{background-position:-216px -48px;}
-.icon.text-width{background-position:-240px -48px;}
-.icon.align-left{background-position:-264px -48px;}
-.icon.align-center{background-position:-288px -48px;}
-.icon.align-right{background-position:-312px -48px;}
-.icon.align-justify{background-position:-336px -48px;}
-.icon.list{background-position:-360px -48px;}
-.icon.indent-left{background-position:-384px -48px;}
-.icon.indent-right{background-position:-408px -48px;}
-.icon.facetime-video{background-position:-432px -48px;}
-.icon.picture{background-position:-456px -48px;}
-.icon.pencil{background-position:0 -72px;}
-.icon.map-marker{background-position:-24px -72px;}
-.icon.adjust{background-position:-48px -72px;}
-.icon.tint{background-position:-72px -72px;}
-.icon.edit{background-position:-96px -72px;}
-.icon.share{background-position:-120px -72px;}
-.icon.check{background-position:-144px -72px;}
-.icon.move{background-position:-168px -72px;}
-.icon.step-backward{background-position:-192px -72px;}
-.icon.fast-backward{background-position:-216px -72px;}
-.icon.backward{background-position:-240px -72px;}
-.icon.play{background-position:-264px -72px;}
-.icon.pause{background-position:-288px -72px;}
-.icon.stop{background-position:-312px -72px;}
-.icon.forward{background-position:-336px -72px;}
-.icon.fast-forward{background-position:-360px -72px;}
-.icon.step-forward{background-position:-384px -72px;}
-.icon.eject{background-position:-408px -72px;}
-.icon.chevron-left{background-position:-432px -72px;}
-.icon.chevron-right{background-position:-456px -72px;}
-.icon.arrow-left{background-position:-240px -96px;}
-.icon.arrow-right{background-position:-264px -96px;}
-.icon.arrow-up{background-position:-288px -96px;}
-.icon.arrow-down{background-position:-312px -96px;}
-.icon.share-alt{background-position:-336px -96px;}
-.icon.resize-full{background-position:-360px -96px;}
-.icon.resize-small{background-position:-384px -96px;}
-.icon.plus{background-position:-408px -96px;}
-.icon.minus{background-position:-432px -96px;}
-.icon.asterisk{background-position:-456px -96px;}
-.dropdown{position:relative;}
-.caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";}
-.dropdown .caret{margin-top:8px;margin-left:2px;*margin-top:7px;}
-.dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);}
-.dropdown-menu{position:absolute;top:100%;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.bottom-up{top:auto;bottom:100%;margin-bottom:2px;}
-.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
-.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
-.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;}
-.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
-.dropdown.open .dropdown-menu{display:block;}
-.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
-.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
-.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
-.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;}
-.nav{margin-left:0;margin-bottom:18px;list-style:none;}
-.nav>li>a{display:block;}
-.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;}
-.nav.list{padding-left:14px;padding-right:14px;margin-bottom:0;}
-.nav.list>li>a,.nav.list .nav-header{display:block;padding:3px 15px;margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
-.nav.list .nav-header{font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-transform:uppercase;}
-.nav.list>li+.nav-header{margin-top:9px;}
-.nav.list .active>a{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;}
-.tabs,.pills{*zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
-.tabs:after,.pills:after{clear:both;}
-.tabs>li,.pills>li{float:left;}
-.tabs>li>a,.pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
-.tabs{border-bottom:1px solid #ddd;}
-.tabs>li{margin-bottom:-1px;}
-.tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
-.tabs>.active>a,.tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
-.pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
-.pills .active>a,.pills .active>a:hover{color:#ffffff;background-color:#0088cc;}
-.nav.stacked>li{float:none;}
-.nav.stacked>li>a{margin-right:0;}
-.tabs.stacked{border-bottom:0;}
-.tabs.stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.tabs.stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
-.tabs.stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
-.tabs.stacked>li>a:hover{border-color:#ddd;z-index:2;}
-.pills.stacked>li>a{margin-bottom:3px;}
-.pills.stacked>li:last-child>a{margin-bottom:1px;}
-.pills .dropdown-menu,.tabs .dropdown-menu{margin-top:1px;border-width:1px;}
-.pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;}
-.tabs .dropdown-toggle:hover .caret,.pills .dropdown-toggle:hover .caret{border-top-color:#005580;}
-.tabs .active .dropdown-toggle .caret,.pills .active .dropdown-toggle .caret{border-top-color:#333333;}
-.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;}
-.tabs .open .dropdown-toggle,.pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;}
-.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;opacity:1;filter:alpha(opacity=100);}
-.tabs.stacked .open>a:hover{border-color:#999999;}
-.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";}
-.tabbable:after{clear:both;}
-.tabs-below .tabs,.tabs-right .tabs,.tabs-left .tabs{border-bottom:0;}
-.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
-.tab-content>.active,.pill-content>.active{display:block;}
-.tabs-below .tabs{border-top:1px solid #ddd;}
-.tabs-below .tabs>li{margin-top:-1px;margin-bottom:0;}
-.tabs-below .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
-.tabs-below .tabs .active>a,.tabs-below .tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;}
-.tabs-left .tabs>li,.tabs-right .tabs>li{float:none;}
-.tabs-left .tabs>li>a,.tabs-right .tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;}
-.tabs-left .tabs{float:left;margin-right:19px;border-right:1px solid #ddd;}
-.tabs-left .tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
-.tabs-left .tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;}
-.tabs-left .tabs .active>a,.tabs-left .tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;}
-.tabs-right .tabs{float:right;margin-left:19px;border-left:1px solid #ddd;}
-.tabs-right .tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
-.tabs-right .tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
-.tabs-right .tabs .active>a,.tabs-right .tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;}
-.navbar{overflow:visible;}
-.navbar-inner{background-color:#222222;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
-.navbar .brand:hover{color:#ffffff;text-decoration:none;}
-.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
-.navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
-.navbar .btn,.navbar .btn-group{margin-top:5px;}
-.navbar .btn-group .btn{margin-top:0;}
-.navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
-.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
-.navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
-.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
-.navbar-static{margin-bottom:18px;}
-.navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.navbar-fixed{position:fixed;top:0;right:0;left:0;z-index:1030;}
-.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
-.navbar .nav.pull-right{float:right;}
-.navbar .nav>li{display:block;float:left;}
-.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
-.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;}
-.navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#222222;background-color:rgba(0, 0, 0, 0.5);}
-.navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222222;border-right:1px solid #444;}
-.navbar .nav.pull-right{margin-left:10px;margin-right:0;}
-.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
-.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
-.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;}
-.navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);}
-.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
-.navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;}
-.navbar .nav.pull-right .dropdown-menu{right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
-.navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
-.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
-.breadcrumb .divider{padding:0 5px;color:#999999;}
-.breadcrumb .active a{color:#333333;}
-.pagination{height:36px;margin:18px 0;}
-.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);}
-.pagination li{display:inline;}
-.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;}
-.pagination a:hover,.pagination .active a{background-color:#f5f5f5;}
-.pagination .active a{color:#999999;}
-.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;}
-.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
-.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
-.pagination-centered{text-align:center;}
-.pagination-right{text-align:right;}
-.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";}
-.pager:after{clear:both;}
-.pager li{display:inline;}
-.pager a{display:inline-block;padding:6px 15px;background-color:#f5f5f5;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
-.pager .next a{float:right;}
-.pager .previous a{float:left;}
-.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;}
-.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);}
-.modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
-.modal.fade.in{top:50%;}
-.modal-header{padding:5px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;}
-.modal-body{padding:15px;}
-.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
-.modal-footer:after{clear:both;}
-.modal-footer .btn{float:right;margin-left:5px;margin-bottom:0;}
-.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);}
-.tooltip.top{margin-top:-2px;}
-.tooltip.right{margin-left:2px;}
-.tooltip.bottom{margin-top:2px;}
-.tooltip.left{margin-left:-2px;}
-.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
-.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
-.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
-.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
-.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.tooltip-arrow{position:absolute;width:0;height:0;}
-.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
-.popover.right{margin-left:5px;}
-.popover.bottom{margin-top:5px;}
-.popover.left{margin-left:-5px;}
-.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
-.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
-.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
-.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
-.popover .arrow{position:absolute;width:0;height:0;}
-.popover .inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);}
-.popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
-.popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
-.btn.primary,.btn.primary:hover,.btn.danger,.btn.danger:hover,.btn.success,.btn.success:hover,.btn.info,.btn.info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
-.btn.primary{background-color:#0074cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover,.btn.primary:active,.btn.primary.active,.btn.primary.disabled{background-color:#0055cc;}
-.btn.primary[disabled]{background-color:#0055cc;}
-.btn.primary:active,.btn.primary.active{background-color:#004099 \9;}
-.btn.danger{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;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.danger:hover,.btn.danger:active,.btn.danger.active,.btn.danger.disabled{background-color:#c43c35;}
-.btn.danger[disabled]{background-color:#c43c35;}
-.btn.danger:active,.btn.danger.active{background-color:#9c302a \9;}
-.btn.success{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;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.success:hover,.btn.success:active,.btn.success.active,.btn.success.disabled{background-color:#57a957;}
-.btn.success[disabled]{background-color:#57a957;}
-.btn.success:active,.btn.success.active{background-color:#458845 \9;}
-.btn.info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;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);}.btn.info:hover,.btn.info:active,.btn.info.active,.btn.info.disabled{background-color:#339bb9;}
-.btn.info[disabled]{background-color:#339bb9;}
-.btn.info:active,.btn.info.active{background-color:#287a91 \9;}
-.btn{display:inline-block;padding:4px 10px 4px;font-size:13px;line-height:18px;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;}.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
-.btn:focus{outline:1px dotted #666;}
-.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;}
-.btn.disabled{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
-.btn.large .icon{margin-top:1px;}
-.btn.small{padding:5px 9px 5px;font-size:11px;line-height:16px;}
-.btn.small .icon{margin-top:-2px;}
-button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
-.btn-group{position:relative;*zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";}
-.btn-group:after{clear:both;}
-.btn-group+.btn-group{margin-left:5px;}
-.btn-toolbar .btn-group{display:inline-block;}
-.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
-.btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
-.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
-.btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
-.btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;}
-.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}
-.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
-.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
-.btn .caret{margin-top:6px;margin-left:0;}
-.primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
-.btn.small .caret{margin-top:4px;}
-.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.alert,.alert-heading{color:#c09853;}
-.alert .close{position:relative;right:-21px;line-height:18px;}
-.alert-success{background-color:#dff0d8;border-color:#cfe8c4;}
-.alert-success,.alert-success .alert-heading{color:#468847;}
-.alert-danger,.alert-error{background-color:#f2dede;border-color:#e9c7c7;}
-.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading{color:#b94a48;}
-.alert-info{background-color:#d9edf7;border-color:#bfe1f2;}
-.alert-info,.alert-info .alert-heading{color:#3a87ad;}
-.alert-block{padding-top:14px;padding-bottom:14px;}
-.alert-block>p,.alert-block>ul{margin-bottom:0;}
-.alert-block p+p{margin-top:5px;}
-.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
-.thumbnails:after{clear:both;}
-.thumbnails>li{float:left;margin:0 0 18px 20px;}
-.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}
-a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
-.thumbnail>img{display:block;max-width:100%;}
-.thumbnail .caption{padding:9px;}
-.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#b94a48;}
-.label.warning{background-color:#f89406;}
-.label.success{background-color:#468847;}
-.label.info{background-color:#3a87ad;}
-@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress,.progress .bar{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.progress{height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);}
-.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
-.progress.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
-.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
-.progress.danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;}
-.progress.danger.striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.progress.success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;}
-.progress.success.striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.progress.info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;}
-.progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.accordion{margin-bottom:18px;}
-.accordion-group{background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.accordion-heading{border-bottom:0;}
-.accordion-heading .accordion-toggle{display:block;padding:8px 15px;}
-.accordion-body{margin-bottom:2px;}
-.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
-.carousel{position:relative;line-height:1;}
-.carousel-inner{overflow:hidden;width:100%;position:relative;}
-.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}
-.carousel .item>img{display:block;line-height:1;}
-.carousel .active,.carousel .next,.carousel .prev{display:block;}
-.carousel .active{left:0;}
-.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;}
-.carousel .next{left:100%;}
-.carousel .prev{left:-100%;}
-.carousel .next.left,.carousel .prev.right{left:0;}
-.carousel .active.left{left:-100%;}
-.carousel .active.right{left:100%;}
-.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.2s linear;-moz-transition:all 0.2s linear;-ms-transition:all 0.2s linear;-o-transition:all 0.2s linear;transition:all 0.2s linear;}.carousel-control.right{left:auto;right:15px;}
-.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
-.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
-.carousel-caption h4,.carousel-caption p{color:#ffffff;}
-.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
-.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
-.pull-right{float:right;}
-.pull-left{float:left;}
-.hide{display:none;}
-.show{display:block;}
-.invisible{visibility:hidden;}
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
new file mode 100644
index 000000000..02b5c099e
--- /dev/null
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -0,0 +1,244 @@
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+@media (max-width: 480px) {
+  .navbar .nav {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 180px;
+    padding-top: 40px;
+    list-style: none;
+  }
+  .navbar .nav, .navbar .nav > li:last-child a {
+    -webkit-border-radius: 0 0 4px 0;
+    -moz-border-radius: 0 0 4px 0;
+    border-radius: 0 0 4px 0;
+  }
+  .navbar .nav > li {
+    float: none;
+    display: none;
+  }
+  .navbar .nav > li > a {
+    float: none;
+    background-color: #222;
+  }
+  .navbar .nav > .active {
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
+  .navbar .nav > .active > a {
+    background-color: transparent;
+  }
+  .navbar .nav > .active > a:hover {
+    background-color: #333;
+  }
+  .navbar .nav > .active > a:after {
+    display: inline-block;
+    width: 0;
+    height: 0;
+    margin-top: 8px;
+    margin-left: 6px;
+    text-indent: -99999px;
+    vertical-align: top;
+    border-left: 4px solid transparent;
+    border-right: 4px solid transparent;
+    border-top: 4px solid #ffffff;
+    opacity: 1;
+    filter: alpha(opacity=100);
+    content: "↓";
+  }
+  .navbar .nav:hover > li {
+    display: block;
+  }
+  .navbar .nav:hover > li > a:hover {
+    background-color: #333;
+  }
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-left: 0;
+  }
+  .modal {
+    position: absolute;
+    top: 20px;
+    left: 20px;
+    right: 20px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade.in {
+    top: auto;
+  }
+  .modal-header .close {
+    padding: 10px;
+  }
+}
+@media (max-width: 768px) {
+  .navbar-fixed {
+    position: absolute;
+  }
+  .navbar-fixed .nav {
+    float: none;
+  }
+  .container {
+    width: auto;
+    padding: 0 20px;
+  }
+  .row {
+    margin-left: 0;
+  }
+  .row > [class*="span"] {
+    float: none;
+    display: block;
+    width: auto;
+    margin: 0;
+  }
+}
+@media (min-width: 768px) and (max-width: 940px) {
+  .container {
+    width: 748px;
+  }
+  .span1 {
+    width: 44px;
+  }
+  .span2 {
+    width: 108px;
+  }
+  .span3 {
+    width: 172px;
+  }
+  .span4 {
+    width: 236px;
+  }
+  .span5 {
+    width: 300px;
+  }
+  .span6 {
+    width: 364px;
+  }
+  .span7 {
+    width: 428px;
+  }
+  .span8 {
+    width: 492px;
+  }
+  .span9 {
+    width: 556px;
+  }
+  .span10 {
+    width: 620px;
+  }
+  .span11 {
+    width: 684px;
+  }
+  .span12 {
+    width: 748px;
+  }
+  .offset1 {
+    margin-left: 84px;
+  }
+  .offset2 {
+    margin-left: 148px;
+  }
+  .offset3 {
+    margin-left: 212px;
+  }
+  .offset4 {
+    margin-left: 276px;
+  }
+  .offset5 {
+    margin-left: 340px;
+  }
+  .offset6 {
+    margin-left: 404px;
+  }
+  .offset7 {
+    margin-left: 468px;
+  }
+  .offset8 {
+    margin-left: 532px;
+  }
+  .offset9 {
+    margin-left: 596px;
+  }
+  .offset10 {
+    margin-left: 660px;
+  }
+  .offset11 {
+    margin-left: 724px;
+  }
+  .offset12 {
+    margin-left: 788px;
+  }
+}
+/*
+@media (min-width: 1210px) {
+
+  // Reset grid variables
+  @gridColumns:       12;
+  @gridColumnWidth:   70px;
+  @gridGutterWidth:   30px;
+  @siteWidth:         1170px;
+
+  // Bring grid mixins to recalculate widths
+  .columns(@columns: 1) {
+    width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+  }
+  .offset(@columns: 1) {
+    margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+  }
+
+  .container {
+    width: @siteWidth;
+  }
+  .row {
+    margin-left: @gridGutterWidth * -1;
+  }
+  [class*="span"] {
+    margin-left: @gridGutterWidth;
+  }
+
+  // Default columns
+  .span1     { .columns(1); }
+  .span2     { .columns(2); }
+  .span3     { .columns(3); }
+  .span4     { .columns(4); }
+  .span5     { .columns(5); }
+  .span6     { .columns(6); }
+  .span7     { .columns(7); }
+  .span8     { .columns(8); }
+  .span9     { .columns(9); }
+  .span10    { .columns(10); }
+  .span11    { .columns(11); }
+  .span12    { .columns(12); }
+
+  // Offset column options
+  .offset1   { .offset(1); }
+  .offset2   { .offset(2); }
+  .offset3   { .offset(3); }
+  .offset4   { .offset(4); }
+  .offset5   { .offset(5); }
+  .offset6   { .offset(6); }
+  .offset7   { .offset(7); }
+  .offset8   { .offset(8); }
+  .offset9   { .offset(9); }
+  .offset10  { .offset(10); }
+  .offset11  { .offset(11); }
+  .offset12  { .offset(12); }
+
+}
+*/
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
new file mode 100644
index 000000000..cd7268bb7
--- /dev/null
+++ b/docs/assets/css/bootstrap.css
@@ -0,0 +1,3037 @@
+/*!
+ * Bootstrap v2.0.0
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ * Date: Thu Jan 26 22:05:04 PST 2012
+ */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+audio, canvas, video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+audio:not([controls]) {
+  display: none;
+}
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+}
+a:focus {
+  outline: thin dotted;
+}
+a:hover, a:active {
+  outline: 0;
+}
+sub, sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+sup {
+  top: -0.5em;
+}
+sub {
+  bottom: -0.25em;
+}
+img {
+  max-width: 100%;
+  height: auto;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+button, input {
+  *overflow: visible;
+  line-height: normal;
+}
+button::-moz-focus-inner, input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+input[type="search"] {
+  -webkit-appearance: textfield;
+  -webkit-box-sizing: content-box;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  color: #555555;
+  background-color: #ffffff;
+}
+a {
+  color: #0088cc;
+  text-decoration: none;
+}
+a:hover {
+  color: #005580;
+  text-decoration: underline;
+}
+.row {
+  margin-left: -20px;
+  *zoom: 1;
+}
+.row:before, .row:after {
+  display: table;
+  content: "";
+}
+.row:after {
+  clear: both;
+}
+[class*="span"] {
+  float: left;
+  margin-left: 20px;
+}
+.span1 {
+  width: 60px;
+}
+.span2 {
+  width: 140px;
+}
+.span3 {
+  width: 220px;
+}
+.span4 {
+  width: 300px;
+}
+.span5 {
+  width: 380px;
+}
+.span6 {
+  width: 460px;
+}
+.span7 {
+  width: 540px;
+}
+.span8 {
+  width: 620px;
+}
+.span9 {
+  width: 700px;
+}
+.span10 {
+  width: 780px;
+}
+.span11 {
+  width: 860px;
+}
+.span12 {
+  width: 940px;
+}
+.offset1 {
+  margin-left: 100px;
+}
+.offset2 {
+  margin-left: 180px;
+}
+.offset3 {
+  margin-left: 260px;
+}
+.offset4 {
+  margin-left: 340px;
+}
+.offset5 {
+  margin-left: 420px;
+}
+.offset6 {
+  margin-left: 500px;
+}
+.offset7 {
+  margin-left: 580px;
+}
+.offset8 {
+  margin-left: 660px;
+}
+.offset9 {
+  margin-left: 740px;
+}
+.offset10 {
+  margin-left: 820px;
+}
+.offset11 {
+  margin-left: 900px;
+}
+.container {
+  width: 940px;
+  margin-left: auto;
+  margin-right: auto;
+  *zoom: 1;
+}
+.container:before, .container:after {
+  display: table;
+  content: "";
+}
+.container:after {
+  clear: both;
+}
+.fluid-container {
+  position: relative;
+  min-width: 940px;
+  padding-left: 20px;
+  padding-right: 20px;
+  *zoom: 1;
+}
+.fluid-container:before, .fluid-container:after {
+  display: table;
+  content: "";
+}
+.fluid-container: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;
+  font-size: 13px;
+  line-height: 18px;
+}
+p small {
+  font-size: 11px;
+  color: #999999;
+}
+.lead {
+  margin-bottom: 18px;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 27px;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 0;
+  font-weight: bold;
+  color: #333333;
+  text-rendering: optimizelegibility;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  font-weight: normal;
+  color: #999999;
+}
+h1 {
+  font-size: 30px;
+  line-height: 36px;
+}
+h1 small {
+  font-size: 18px;
+}
+h2 {
+  font-size: 24px;
+  line-height: 36px;
+}
+h2 small {
+  font-size: 18px;
+}
+h3 {
+  line-height: 27px;
+  font-size: 18px;
+}
+h3 small {
+  font-size: 14px;
+}
+h4, h5, h6 {
+  line-height: 18px;
+}
+h4 {
+  font-size: 14px;
+}
+h4 small {
+  font-size: 12px;
+}
+h5 {
+  font-size: 12px;
+}
+h6 {
+  font-size: 11px;
+  color: #999999;
+  text-transform: uppercase;
+}
+ul, ol {
+  padding: 0;
+  margin: 0 0 9px 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+ul {
+  list-style: disc;
+}
+ol {
+  list-style: decimal;
+}
+li {
+  line-height: 18px;
+}
+ul.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+dl {
+  margin-bottom: 18px;
+}
+dt, dd {
+  line-height: 18px;
+}
+dt {
+  font-weight: bold;
+}
+dd {
+  margin-left: 9px;
+}
+hr {
+  margin: 18px 0;
+  border: 0;
+  border-top: 1px solid #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+strong {
+  font-weight: bold;
+}
+em {
+  font-style: italic;
+}
+.muted {
+  color: #999999;
+}
+abbr {
+  font-size: 90%;
+  text-transform: uppercase;
+  border-bottom: 1px dotted #ddd;
+  cursor: help;
+}
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 18px;
+  border-left: 5px solid #eeeeee;
+}
+blockquote p {
+  margin-bottom: 0;
+  font-size: 16px;
+  font-weight: 300;
+  line-height: 22.5px;
+}
+blockquote small {
+  display: block;
+  line-height: 18px;
+  color: #999999;
+}
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+blockquote.pull-right {
+  float: right;
+  padding-left: 0;
+  padding-right: 15px;
+  border-left: 0;
+  border-right: 5px solid #eeeeee;
+}
+blockquote.pull-right p, blockquote.pull-right small {
+  text-align: right;
+}
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+address {
+  display: block;
+  margin-bottom: 18px;
+  line-height: 18px;
+  font-style: normal;
+}
+small {
+  font-size: 100%;
+}
+cite {
+  font-style: normal;
+}
+code, pre {
+  padding: 0 3px 2px;
+  font-family: Menlo, Monaco, "Courier New", monospace;
+  font-size: 12px;
+  color: #333333;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+code {
+  padding: 3px 4px;
+  color: #d14;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+pre {
+  display: block;
+  padding: 8.5px;
+  margin: 0 0 9px;
+  font-size: 12px;
+  line-height: 18px;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  white-space: pre;
+  white-space: pre-wrap;
+  word-break: break-all;
+}
+pre.prettyprint {
+  margin-bottom: 18px;
+}
+pre code {
+  padding: 0;
+  background-color: transparent;
+}
+form {
+  margin: 0 0 18px;
+}
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 27px;
+  font-size: 19.5px;
+  line-height: 36px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #eee;
+}
+label,
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 18px;
+}
+label {
+  display: block;
+  margin-bottom: 5px;
+  color: #333333;
+}
+input,
+textarea,
+select,
+.uneditable-input {
+  display: inline-block;
+  width: 210px;
+  height: 18px;
+  padding: 4px;
+  margin-bottom: 9px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #555555;
+  border: 1px solid #ccc;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+label input, label textarea, label select {
+  display: block;
+}
+input[type=image], input[type=checkbox], input[type=radio] {
+  width: auto;
+  height: auto;
+  padding: 0;
+  margin: 3px 0;
+  *margin-top: 0;
+  /* IE7 */
+
+  line-height: normal;
+  border: none;
+  cursor: pointer;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+input[type=file] {
+  padding: initial;
+  line-height: initial;
+  border: initial;
+  background-color: #ffffff;
+  background-color: initial;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+input[type=button], input[type=reset], input[type=submit] {
+  width: auto;
+  height: auto;
+}
+select, input[type=file] {
+  height: 28px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
+  line-height: 28px;
+}
+select {
+  width: 220px;
+  background-color: #ffffff;
+}
+select[multiple], select[size] {
+  height: auto;
+}
+input[type=image] {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+textarea {
+  height: auto;
+}
+input[type=hidden] {
+  display: none;
+}
+.radio, .checkbox {
+  padding-left: 18px;
+}
+.radio input[type=radio], .checkbox input[type=checkbox] {
+  float: left;
+  margin-left: -18px;
+}
+.controls > .radio:first-child, .controls > .checkbox:first-child {
+  padding-top: 5px;
+}
+.radio.inline, .checkbox.inline {
+  display: inline-block;
+  margin-bottom: 0;
+}
+.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+input, textarea {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+  transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+input:focus, textarea:focus {
+  border-color: rgba(82, 168, 236, 0.8);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  outline: 0;
+}
+input[type=file]:focus, input[type=checkbox]:focus, select:focus {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  outline: 1px dotted #666;
+}
+.input-mini {
+  width: 60px;
+}
+.input-small {
+  width: 90px;
+}
+.input-medium {
+  width: 150px;
+}
+.input-large {
+  width: 210px;
+}
+.input-xlarge {
+  width: 270px;
+}
+.input-xxlarge {
+  width: 530px;
+}
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input {
+  float: none;
+  margin-left: 0;
+}
+input.span1, textarea.span1, .uneditable-input.span1 {
+  width: 50px;
+}
+input.span2, textarea.span2, .uneditable-input.span2 {
+  width: 130px;
+}
+input.span3, textarea.span3, .uneditable-input.span3 {
+  width: 210px;
+}
+input.span4, textarea.span4, .uneditable-input.span4 {
+  width: 290px;
+}
+input.span5, textarea.span5, .uneditable-input.span5 {
+  width: 370px;
+}
+input.span6, textarea.span6, .uneditable-input.span6 {
+  width: 450px;
+}
+input.span7, textarea.span7, .uneditable-input.span7 {
+  width: 530px;
+}
+input.span8, textarea.span8, .uneditable-input.span8 {
+  width: 610px;
+}
+input.span9, textarea.span9, .uneditable-input.span9 {
+  width: 690px;
+}
+input.span10, textarea.span10, .uneditable-input.span10 {
+  width: 770px;
+}
+input.span11, textarea.span11, .uneditable-input.span11 {
+  width: 850px;
+}
+input.span12, textarea.span12, .uneditable-input.span12 {
+  width: 930px;
+}
+select.span1 {
+  width: 70px;
+}
+select.span2 {
+  width: 150px;
+}
+select.span3 {
+  width: 230px;
+}
+select.span4 {
+  width: 310px;
+}
+select.span5 {
+  width: 390px;
+}
+select.span6 {
+  width: 470px;
+}
+select.span7 {
+  width: 550px;
+}
+select.span8 {
+  width: 630px;
+}
+select.span9 {
+  width: 710px;
+}
+select.span10 {
+  width: 790px;
+}
+select.span11 {
+  width: 870px;
+}
+select.span12 {
+  width: 950px;
+}
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  background-color: #f5f5f5;
+  border-color: #ddd;
+  cursor: not-allowed;
+}
+.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline {
+  color: #c09853;
+}
+.control-group.warning input, .control-group.warning select, .control-group.warning textarea {
+  color: #c09853;
+  border-color: #c09853;
+}
+.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
+  border-color: #a47e3c;
+  -webkit-box-shadow: 0 0 6px #dbc59e;
+  -moz-box-shadow: 0 0 6px #dbc59e;
+  box-shadow: 0 0 6px #dbc59e;
+}
+.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline {
+  color: #b94a48;
+}
+.control-group.error input, .control-group.error select, .control-group.error textarea {
+  color: #b94a48;
+  border-color: #b94a48;
+}
+.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
+  border-color: #953b39;
+  -webkit-box-shadow: 0 0 6px #d59392;
+  -moz-box-shadow: 0 0 6px #d59392;
+  box-shadow: 0 0 6px #d59392;
+}
+.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline {
+  color: #468847;
+}
+.control-group.success input, .control-group.success select, .control-group.success textarea {
+  color: #468847;
+  border-color: #468847;
+}
+.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
+  border-color: #356635;
+  -webkit-box-shadow: 0 0 6px #7aba7b;
+  -moz-box-shadow: 0 0 6px #7aba7b;
+  box-shadow: 0 0 6px #7aba7b;
+}
+.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+  -moz-box-shadow: 0 0 6px #f8b9b7;
+  box-shadow: 0 0 6px #f8b9b7;
+}
+.form-actions {
+  padding: 17px 20px 18px;
+  margin-top: 18px;
+  margin-bottom: 18px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+}
+.uneditable-input {
+  display: block;
+  background-color: #ffffff;
+  border-color: #eee;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  cursor: not-allowed;
+}
+:-moz-placeholder {
+  color: #999999;
+}
+::-webkit-input-placeholder {
+  color: #999999;
+}
+.help-block {
+  margin-top: 5px;
+  margin-bottom: 0;
+  color: #999999;
+}
+.help-inline {
+  display: inline-block;
+  margin-bottom: 9px;
+  vertical-align: middle;
+  padding-left: 5px;
+}
+.input-prepend, .input-append {
+  margin-bottom: 5px;
+  *zoom: 1;
+}
+.input-prepend:before,
+.input-append:before,
+.input-prepend:after,
+.input-append:after {
+  display: table;
+  content: "";
+}
+.input-prepend:after, .input-append:after {
+  clear: both;
+}
+.input-prepend input,
+.input-append input,
+.input-prepend .uneditable-input,
+.input-append .uneditable-input {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.input-prepend .uneditable-input, .input-append .uneditable-input {
+  border-left-color: #ccc;
+}
+.input-prepend .add-on, .input-append .add-on {
+  float: left;
+  display: block;
+  width: auto;
+  min-width: 16px;
+  height: 18px;
+  margin-right: -1px;
+  padding: 4px 4px 4px 5px;
+  font-weight: normal;
+  line-height: 18px;
+  color: #999999;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.input-prepend .active, .input-append .active {
+  background-color: #a9dba9;
+  border-color: #46a546;
+}
+.input-prepend .add-on {
+  *margin-top: 1px;
+  /* IE6-7 */
+
+}
+.input-append input, .input-append .uneditable-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 .uneditable-input {
+  border-right-color: #ccc;
+}
+.input-append .add-on {
+  margin-right: 0;
+  margin-left: -1px;
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.search-query {
+  padding-left: 14px;
+  padding-right: 14px;
+  margin-bottom: 0;
+  -webkit-border-radius: 14px;
+  -moz-border-radius: 14px;
+  border-radius: 14px;
+}
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input {
+  display: inline-block;
+  margin-bottom: 0;
+}
+.form-search label, .form-inline label {
+  display: inline-block;
+}
+.control-group {
+  margin-bottom: 9px;
+}
+.form-horizontal legend + .control-group {
+  margin-top: 18px;
+  -webkit-margin-top-collapse: separate;
+}
+.form-horizontal .control-group {
+  margin-bottom: 18px;
+}
+.form-horizontal .control-group > label {
+  float: left;
+  width: 140px;
+  padding-top: 5px;
+  text-align: right;
+}
+.form-horizontal .controls {
+  margin-left: 160px;
+}
+.form-horizontal .form-actions {
+  padding-left: 160px;
+}
+table {
+  max-width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+.table {
+  width: 100%;
+  margin-bottom: 18px;
+}
+.table th, .table td {
+  padding: 8px;
+  line-height: 18px;
+  text-align: left;
+  border-top: 1px solid #ddd;
+}
+.table th {
+  font-weight: bold;
+  vertical-align: bottom;
+}
+.table td {
+  vertical-align: top;
+}
+.table thead:first-child tr th, .table thead:first-child tr td {
+  border-top: 0;
+}
+.table tbody + tbody {
+  border-top: 2px solid #ddd;
+}
+.table-condensed th, .table-condensed td {
+  padding: 4px 5px;
+}
+.table-bordered {
+  border: 1px solid #ddd;
+  border-collapse: separate;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.table-bordered th + th,
+.table-bordered td + td,
+.table-bordered th + td,
+.table-bordered td + th {
+  border-left: 1px solid #ddd;
+}
+.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child {
+  -webkit-border-radius: 4px 0 0 0;
+  -moz-border-radius: 4px 0 0 0;
+  border-radius: 4px 0 0 0;
+}
+.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child {
+  -webkit-border-radius: 0 4px 0 0;
+  -moz-border-radius: 0 4px 0 0;
+  border-radius: 0 4px 0 0;
+}
+.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child {
+  -webkit-border-radius: 0 0 0 4px;
+  -moz-border-radius: 0 0 0 4px;
+  border-radius: 0 0 0 4px;
+}
+.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child {
+  -webkit-border-radius: 0 0 4px 0;
+  -moz-border-radius: 0 0 4px 0;
+  border-radius: 0 0 4px 0;
+}
+.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th {
+  background-color: #f9f9f9;
+}
+table .span1 {
+  float: none;
+  width: 44px;
+  margin-left: 0;
+}
+table .span2 {
+  float: none;
+  width: 124px;
+  margin-left: 0;
+}
+table .span3 {
+  float: none;
+  width: 204px;
+  margin-left: 0;
+}
+table .span4 {
+  float: none;
+  width: 284px;
+  margin-left: 0;
+}
+table .span5 {
+  float: none;
+  width: 364px;
+  margin-left: 0;
+}
+table .span6 {
+  float: none;
+  width: 444px;
+  margin-left: 0;
+}
+table .span7 {
+  float: none;
+  width: 524px;
+  margin-left: 0;
+}
+table .span8 {
+  float: none;
+  width: 604px;
+  margin-left: 0;
+}
+table .span9 {
+  float: none;
+  width: 684px;
+  margin-left: 0;
+}
+table .span10 {
+  float: none;
+  width: 764px;
+  margin-left: 0;
+}
+table .span11 {
+  float: none;
+  width: 844px;
+  margin-left: 0;
+}
+table .span12 {
+  float: none;
+  width: 924px;
+  margin-left: 0;
+}
+.icon {
+  background-image: url(img/glyphicons-halflings-sprite.png);
+  background-position: 0 0;
+  background-repeat: no-repeat;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 14px;
+  height: 14px;
+}
+.icon.white {
+  background-image: url(img/glyphicons-halflings-sprite-white.png);
+}
+.icon.glass {
+  background-position: 0      0;
+}
+.icon.music {
+  background-position: -24px 0;
+}
+.icon.search {
+  background-position: -48px 0;
+}
+.icon.envelope {
+  background-position: -72px 0;
+}
+.icon.heart {
+  background-position: -96px 0;
+}
+.icon.star {
+  background-position: -120px 0;
+}
+.icon.star-empty {
+  background-position: -144px 0;
+}
+.icon.user {
+  background-position: -168px 0;
+}
+.icon.film {
+  background-position: -192px 0;
+}
+.icon.th-large {
+  background-position: -216px 0;
+}
+.icon.th {
+  background-position: -240px 0;
+}
+.icon.th-list {
+  background-position: -264px 0;
+}
+.icon.ok {
+  background-position: -288px 0;
+}
+.icon.remove {
+  background-position: -312px 0;
+}
+.icon.zoom-in {
+  background-position: -336px 0;
+}
+.icon.zoom-out {
+  background-position: -360px 0;
+}
+.icon.off {
+  background-position: -384px 0;
+}
+.icon.signal {
+  background-position: -408px 0;
+}
+.icon.cog {
+  background-position: -432px 0;
+}
+.icon.trash {
+  background-position: -456px 0;
+}
+.icon.home {
+  background-position: 0 -24px;
+}
+.icon.file {
+  background-position: -24px -24px;
+}
+.icon.time {
+  background-position: -48px -24px;
+}
+.icon.road {
+  background-position: -72px -24px;
+}
+.icon.download-alt {
+  background-position: -96px -24px;
+}
+.icon.download {
+  background-position: -120px -24px;
+}
+.icon.upload {
+  background-position: -144px -24px;
+}
+.icon.inbox {
+  background-position: -168px -24px;
+}
+.icon.play-circle {
+  background-position: -192px -24px;
+}
+.icon.repeat {
+  background-position: -216px -24px;
+}
+.icon.refresh {
+  background-position: -240px -24px;
+}
+.icon.calendar {
+  background-position: -264px -24px;
+}
+.icon.lock {
+  background-position: -288px -24px;
+}
+.icon.flag {
+  background-position: -312px -24px;
+}
+.icon.headphones {
+  background-position: -336px -24px;
+}
+.icon.volume-off {
+  background-position: -360px -24px;
+}
+.icon.volume-down {
+  background-position: -384px -24px;
+}
+.icon.volume-up {
+  background-position: -408px -24px;
+}
+.icon.qrcode {
+  background-position: -432px -24px;
+}
+.icon.barcode {
+  background-position: -456px -24px;
+}
+.icon.tag {
+  background-position: 0 -48px;
+}
+.icon.tags {
+  background-position: -24px -48px;
+}
+.icon.book {
+  background-position: -48px -48px;
+}
+.icon.bookmark {
+  background-position: -72px -48px;
+}
+.icon.print {
+  background-position: -96px -48px;
+}
+.icon.camera {
+  background-position: -120px -48px;
+}
+.icon.font {
+  background-position: -144px -48px;
+}
+.icon.bold {
+  background-position: -168px -48px;
+}
+.icon.italic {
+  background-position: -192px -48px;
+}
+.icon.text-height {
+  background-position: -216px -48px;
+}
+.icon.text-width {
+  background-position: -240px -48px;
+}
+.icon.align-left {
+  background-position: -264px -48px;
+}
+.icon.align-center {
+  background-position: -288px -48px;
+}
+.icon.align-right {
+  background-position: -312px -48px;
+}
+.icon.align-justify {
+  background-position: -336px -48px;
+}
+.icon.list {
+  background-position: -360px -48px;
+}
+.icon.indent-left {
+  background-position: -384px -48px;
+}
+.icon.indent-right {
+  background-position: -408px -48px;
+}
+.icon.facetime-video {
+  background-position: -432px -48px;
+}
+.icon.picture {
+  background-position: -456px -48px;
+}
+.icon.pencil {
+  background-position: 0 -72px;
+}
+.icon.map-marker {
+  background-position: -24px -72px;
+}
+.icon.adjust {
+  background-position: -48px -72px;
+}
+.icon.tint {
+  background-position: -72px -72px;
+}
+.icon.edit {
+  background-position: -96px -72px;
+}
+.icon.share {
+  background-position: -120px -72px;
+}
+.icon.check {
+  background-position: -144px -72px;
+}
+.icon.move {
+  background-position: -168px -72px;
+}
+.icon.step-backward {
+  background-position: -192px -72px;
+}
+.icon.fast-backward {
+  background-position: -216px -72px;
+}
+.icon.backward {
+  background-position: -240px -72px;
+}
+.icon.play {
+  background-position: -264px -72px;
+}
+.icon.pause {
+  background-position: -288px -72px;
+}
+.icon.stop {
+  background-position: -312px -72px;
+}
+.icon.forward {
+  background-position: -336px -72px;
+}
+.icon.fast-forward {
+  background-position: -360px -72px;
+}
+.icon.step-forward {
+  background-position: -384px -72px;
+}
+.icon.eject {
+  background-position: -408px -72px;
+}
+.icon.chevron-left {
+  background-position: -432px -72px;
+}
+.icon.chevron-right {
+  background-position: -456px -72px;
+}
+.icon.arrow-left {
+  background-position: -240px -96px;
+}
+.icon.arrow-right {
+  background-position: -264px -96px;
+}
+.icon.arrow-up {
+  background-position: -288px -96px;
+}
+.icon.arrow-down {
+  background-position: -312px -96px;
+}
+.icon.share-alt {
+  background-position: -336px -96px;
+}
+.icon.resize-full {
+  background-position: -360px -96px;
+}
+.icon.resize-small {
+  background-position: -384px -96px;
+}
+.icon.plus {
+  background-position: -408px -96px;
+}
+.icon.minus {
+  background-position: -432px -96px;
+}
+.icon.asterisk {
+  background-position: -456px -96px;
+}
+.dropdown {
+  position: relative;
+}
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  text-indent: -99999px;
+  vertical-align: top;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid #000000;
+  opacity: 0.3;
+  filter: alpha(opacity=30);
+  content: "\2193";
+}
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+  *margin-top: 7px;
+}
+.dropdown:hover .caret, .open.dropdown .caret {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  z-index: 1000;
+  float: left;
+  display: none;
+  min-width: 160px;
+  max-width: 220px;
+  _width: 160px;
+  padding: 4px 0;
+  margin: 0;
+  list-style: none;
+  background-color: #ffffff;
+  border-color: #ccc;
+  border-color: rgba(0, 0, 0, 0.2);
+  border-style: solid;
+  border-width: 1px;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding;
+  background-clip: padding-box;
+  zoom: 1;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+}
+.dropdown-menu.bottom-up {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 2px;
+}
+.dropdown-menu .divider {
+  height: 1px;
+  margin: 5px 1px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+.dropdown-menu a {
+  display: block;
+  padding: 3px 15px;
+  clear: both;
+  font-weight: normal;
+  line-height: 18px;
+  color: #555555;
+  white-space: nowrap;
+}
+.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0088cc;
+}
+.dropdown.open .dropdown-toggle {
+  color: #ffffff;
+  background: #ccc;
+  background: rgba(0, 0, 0, 0.3);
+}
+.dropdown.open .dropdown-menu {
+  display: block;
+}
+.typeahead {
+  margin-top: 2px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #eee;
+  border: 1px solid rgba(0, 0, 0, 0.05);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -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);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+.fade {
+  -webkit-transition: opacity 0.15s linear;
+  -moz-transition: opacity 0.15s linear;
+  -ms-transition: opacity 0.15s linear;
+  -o-transition: opacity 0.15s linear;
+  transition: opacity 0.15s linear;
+  opacity: 0;
+}
+.fade.in {
+  opacity: 1;
+}
+.collapse {
+  -webkit-transition: height 0.35s ease;
+  -moz-transition: height 0.35s ease;
+  -ms-transition: height 0.35s ease;
+  -o-transition: height 0.35s ease;
+  transition: height 0.35s ease;
+  position: relative;
+  overflow: hidden;
+  height: 0;
+}
+.collapse.in {
+  height: auto;
+}
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+.close:hover {
+  color: #000000;
+  text-decoration: none;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+  cursor: pointer;
+}
+.nav {
+  margin-left: 0;
+  margin-bottom: 18px;
+  list-style: none;
+}
+.nav > li > a {
+  display: block;
+}
+.nav > li > a:hover {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+.nav.list {
+  padding-left: 14px;
+  padding-right: 14px;
+  margin-bottom: 0;
+}
+.nav.list > li > a, .nav.list .nav-header {
+  display: block;
+  padding: 3px 15px;
+  margin-left: -15px;
+  margin-right: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+.nav.list .nav-header {
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #999999;
+  text-transform: uppercase;
+}
+.nav.list > li + .nav-header {
+  margin-top: 9px;
+}
+.nav.list .active > a {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
+}
+.tabs, .pills {
+  *zoom: 1;
+}
+.tabs:before,
+.pills:before,
+.tabs:after,
+.pills:after {
+  display: table;
+  content: "";
+}
+.tabs:after, .pills:after {
+  clear: both;
+}
+.tabs > li, .pills > li {
+  float: left;
+}
+.tabs > li > a, .pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
+}
+.tabs {
+  border-bottom: 1px solid #ddd;
+}
+.tabs > li {
+  margin-bottom: -1px;
+}
+.tabs > li > a {
+  padding-top: 9px;
+  padding-bottom: 9px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+}
+.tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #dddddd;
+}
+.tabs > .active > a, .tabs > .active > a:hover {
+  color: #555555;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+  cursor: default;
+}
+.pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.pills .active > a, .pills .active > a:hover {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+.nav.stacked > li {
+  float: none;
+}
+.nav.stacked > li > a {
+  margin-right: 0;
+}
+.tabs.stacked {
+  border-bottom: 0;
+}
+.tabs.stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.tabs.stacked > li:first-child > a {
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+}
+.tabs.stacked > li:last-child > a {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+.tabs.stacked > li > a:hover {
+  border-color: #ddd;
+  z-index: 2;
+}
+.pills.stacked > li > a {
+  margin-bottom: 3px;
+}
+.pills.stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+.pills .dropdown-menu, .tabs .dropdown-menu {
+  margin-top: 1px;
+  border-width: 1px;
+}
+.pills .dropdown-menu {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
+  border-top-color: #0088cc;
+  margin-top: 6px;
+}
+.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret {
+  border-top-color: #005580;
+}
+.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret {
+  border-top-color: #333333;
+}
+.nav > .dropdown.active > a:hover {
+  color: #000000;
+  cursor: pointer;
+}
+.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
+}
+.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
+  border-top-color: #ffffff;
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.tabs.stacked .open > a:hover {
+  border-color: #999999;
+}
+.tabbable {
+  *zoom: 1;
+}
+.tabbable:before, .tabbable:after {
+  display: table;
+  content: "";
+}
+.tabbable:after {
+  clear: both;
+}
+.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs {
+  border-bottom: 0;
+}
+.tab-content > .tab-pane, .pill-content > .pill-pane {
+  display: none;
+}
+.tab-content > .active, .pill-content > .active {
+  display: block;
+}
+.tabs-below .tabs {
+  border-top: 1px solid #ddd;
+}
+.tabs-below .tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+.tabs-below .tabs > li > a {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+.tabs-below .tabs > li > a:hover {
+  border-bottom-color: transparent;
+  border-top-color: #ddd;
+}
+.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover {
+  border-color: transparent #ddd #ddd #ddd;
+}
+.tabs-left .tabs > li, .tabs-right .tabs > li {
+  float: none;
+}
+.tabs-left .tabs > li > a, .tabs-right .tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+.tabs-left .tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+.tabs-left .tabs > li > a {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+}
+.tabs-left .tabs > li > a:hover {
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+}
+.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover {
+  border-color: #ddd transparent #ddd #ddd;
+}
+.tabs-right .tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+.tabs-right .tabs > li > a {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+.tabs-right .tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+}
+.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
+  border-color: #ddd #ddd #ddd transparent;
+}
+.navbar {
+  overflow: visible;
+}
+.navbar-inner {
+  background-color: #222222;
+  background-color: #2c2c2c;
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  background-repeat: repeat-x;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+}
+.navbar .brand:hover {
+  color: #ffffff;
+  text-decoration: none;
+}
+.navbar .brand {
+  float: left;
+  display: block;
+  padding: 8px 20px 12px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 1;
+  color: #ffffff;
+}
+.navbar p {
+  margin: 0;
+  line-height: 40px;
+}
+.navbar p a:hover {
+  color: #ffffff;
+  background-color: transparent;
+}
+.navbar .btn, .navbar .btn-group {
+  margin-top: 5px;
+}
+.navbar .btn-group .btn {
+  margin-top: 0;
+}
+.navbar-form {
+  margin-bottom: 0;
+}
+.navbar-form input, .navbar-form select {
+  display: inline-block;
+  margin-bottom: 0;
+}
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 6px;
+  margin-bottom: 0;
+}
+.navbar-search .search-query {
+  padding: 4px 9px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  color: #ffffff;
+  color: rgba(255, 255, 255, 0.75);
+  background: #444;
+  background: rgba(255, 255, 255, 0.3);
+  border: 1px solid #111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  -webkit-transition: none;
+  -moz-transition: none;
+  -ms-transition: none;
+  -o-transition: none;
+  transition: none;
+}
+.navbar-search .search-query :-moz-placeholder {
+  color: #eeeeee;
+}
+.navbar-search .search-query::-webkit-input-placeholder {
+  color: #eeeeee;
+}
+.navbar-search .search-query:hover {
+  color: #ffffff;
+  background-color: #999999;
+  background-color: rgba(255, 255, 255, 0.5);
+}
+.navbar-search .search-query:focus, .navbar-search .search-query.focused {
+  padding: 5px 10px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  outline: 0;
+}
+.navbar-static {
+  margin-bottom: 18px;
+}
+.navbar-static .navbar-inner {
+  padding-left: 20px;
+  padding-right: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.navbar-fixed {
+  position: fixed;
+  top: 0;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+}
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+  float: right;
+}
+.navbar .nav > li {
+  display: block;
+  float: left;
+}
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 10px 11px;
+  line-height: 19px;
+  color: #999999;
+  text-decoration: none;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.navbar .nav > li > a:hover {
+  background-color: transparent;
+  color: #ffffff;
+  text-decoration: none;
+}
+.navbar .nav .active > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #222222;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+.navbar .vertical-divider {
+  height: 40px;
+  width: 1px;
+  margin: 0 5px;
+  overflow: hidden;
+  background-color: #222222;
+  border-right: 1px solid #444;
+}
+.navbar .nav.pull-right {
+  margin-left: 10px;
+  margin-right: 0;
+}
+.navbar .dropdown-menu {
+  margin-top: 1px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.navbar .dropdown-menu:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top: -7px;
+  left: 9px;
+}
+.navbar .dropdown-menu:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  position: absolute;
+  top: -6px;
+  left: 10px;
+}
+.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
+  border-top-color: #ffffff;
+}
+.navbar .nav .active .caret {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
+  background-color: transparent;
+}
+.navbar .nav .active > .dropdown-toggle:hover {
+  color: #ffffff;
+}
+.navbar .nav.pull-right .dropdown-menu {
+  right: 0;
+}
+.navbar .nav.pull-right .dropdown-menu:before {
+  left: auto;
+  right: 12px;
+}
+.navbar .nav.pull-right .dropdown-menu:after {
+  left: auto;
+  right: 13px;
+}
+.breadcrumb {
+  padding: 7px 14px;
+  margin: 0 0 18px;
+  background-color: #fbfbfb;
+  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: linear-gradient(top, #ffffff, #f5f5f5);
+  background-repeat: repeat-x;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+}
+.breadcrumb li {
+  display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+}
+.breadcrumb .divider {
+  padding: 0 5px;
+  color: #999999;
+}
+.breadcrumb .active a {
+  color: #333333;
+}
+.pagination {
+  height: 36px;
+  margin: 18px 0;
+}
+.pagination ul {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+  margin-left: 0;
+  margin-bottom: 0;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-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);
+}
+.pagination li {
+  display: inline;
+}
+.pagination a {
+  float: left;
+  padding: 0 14px;
+  line-height: 34px;
+  text-decoration: none;
+  border: 1px solid #ddd;
+  border-left-width: 0;
+}
+.pagination a:hover, .pagination .active a {
+  background-color: #f5f5f5;
+}
+.pagination .active a {
+  color: #999999;
+}
+.pagination .disabled a, .pagination .disabled a:hover {
+  color: #999999;
+  background-color: transparent;
+  cursor: default;
+}
+.pagination li:first-child a {
+  border-left-width: 1px;
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.pagination li:last-child a {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.pagination-centered {
+  text-align: center;
+}
+.pagination-right {
+  text-align: right;
+}
+.pager {
+  margin-left: 0;
+  margin-bottom: 18px;
+  list-style: none;
+  text-align: center;
+  *zoom: 1;
+}
+.pager:before, .pager:after {
+  display: table;
+  content: "";
+}
+.pager:after {
+  clear: both;
+}
+.pager li {
+  display: inline;
+}
+.pager a {
+  display: inline-block;
+  padding: 6px 15px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+}
+.pager .next a {
+  float: right;
+}
+.pager .previous a {
+  float: left;
+}
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000000;
+}
+.modal-backdrop.fade {
+  opacity: 0;
+}
+.modal-backdrop, .modal-backdrop.fade.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+.modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  z-index: 1050;
+  max-height: 500px;
+  overflow: auto;
+  width: 560px;
+  margin: -250px 0 0 -280px;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  /* IE6-7 */
+
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-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);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.modal.fade {
+  -webkit-transition: opacity .3s linear, top .3s ease-out;
+  -moz-transition: opacity .3s linear, top .3s ease-out;
+  -ms-transition: opacity .3s linear, top .3s ease-out;
+  -o-transition: opacity .3s linear, top .3s ease-out;
+  transition: opacity .3s linear, top .3s ease-out;
+  top: -25%;
+}
+.modal.fade.in {
+  top: 50%;
+}
+.modal-header {
+  padding: 5px 15px;
+  border-bottom: 1px solid #eee;
+}
+.modal-header .close {
+  margin-top: 2px;
+}
+.modal-body {
+  padding: 15px;
+}
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+  *zoom: 1;
+}
+.modal-footer:before, .modal-footer:after {
+  display: table;
+  content: "";
+}
+.modal-footer:after {
+  clear: both;
+}
+.modal-footer .btn {
+  float: right;
+  margin-left: 5px;
+  margin-bottom: 0;
+}
+.tooltip {
+  position: absolute;
+  z-index: 1020;
+  display: block;
+  visibility: visible;
+  padding: 5px;
+  font-size: 11px;
+  opacity: 0;
+  filter: alpha(opacity=0);
+}
+.tooltip.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+.tooltip.top {
+  margin-top: -2px;
+}
+.tooltip.right {
+  margin-left: 2px;
+}
+.tooltip.bottom {
+  margin-top: 2px;
+}
+.tooltip.left {
+  margin-left: -2px;
+}
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 5px solid #000000;
+}
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid #000000;
+}
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #000000;
+}
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 5px solid #000000;
+}
+.tooltip-inner {
+  max-width: 200px;
+  padding: 3px 8px;
+  color: #ffffff;
+  text-align: center;
+  text-decoration: none;
+  background-color: #000000;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1010;
+  display: none;
+  padding: 5px;
+}
+.popover.top {
+  margin-top: -5px;
+}
+.popover.right {
+  margin-left: 5px;
+}
+.popover.bottom {
+  margin-top: 5px;
+}
+.popover.left {
+  margin-left: -5px;
+}
+.popover.top .arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 5px solid #000000;
+}
+.popover.right .arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 5px solid #000000;
+}
+.popover.bottom .arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #000000;
+}
+.popover.left .arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid #000000;
+}
+.popover .arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
+.popover .inner {
+  padding: 3px;
+  width: 280px;
+  overflow: hidden;
+  background: #000000;
+  background: rgba(0, 0, 0, 0.8);
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-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);
+}
+.popover .title {
+  padding: 9px 15px;
+  line-height: 1;
+  background-color: #f5f5f5;
+  border-bottom: 1px solid #eee;
+  -webkit-border-radius: 3px 3px 0 0;
+  -moz-border-radius: 3px 3px 0 0;
+  border-radius: 3px 3px 0 0;
+}
+.popover .content {
+  padding: 14px;
+  background-color: #ffffff;
+  -webkit-border-radius: 0 0 3px 3px;
+  -moz-border-radius: 0 0 3px 3px;
+  border-radius: 0 0 3px 3px;
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.popover .content p, .popover .content ul, .popover .content ol {
+  margin-bottom: 0;
+}
+.btn.primary,
+.btn.primary:hover,
+.btn.danger,
+.btn.danger:hover,
+.btn.success,
+.btn.success:hover,
+.btn.info,
+.btn.info:hover {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  color: #ffffff;
+}
+.btn.primary {
+  background-color: #0074cc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0055cc);
+  background-image: linear-gradient(top, #0088cc, #0055cc);
+  background-repeat: repeat-x;
+  border-color: #0055cc #0055cc #003580;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.btn.primary:hover,
+.btn.primary:active,
+.btn.primary.active,
+.btn.primary.disabled {
+  background-color: #0055cc;
+}
+.btn.primary[disabled] {
+  background-color: #0055cc;
+}
+.btn.primary:active, .btn.primary.active {
+  background-color: #004099 \9;
+}
+.btn.danger {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+  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.danger:hover,
+.btn.danger:active,
+.btn.danger.active,
+.btn.danger.disabled {
+  background-color: #c43c35;
+}
+.btn.danger[disabled] {
+  background-color: #c43c35;
+}
+.btn.danger:active, .btn.danger.active {
+  background-color: #9c302a \9;
+}
+.btn.success {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -ms-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(top, #62c462, #57a957);
+  background-repeat: repeat-x;
+  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.success:hover,
+.btn.success:active,
+.btn.success.active,
+.btn.success.disabled {
+  background-color: #57a957;
+}
+.btn.success[disabled] {
+  background-color: #57a957;
+}
+.btn.success:active, .btn.success.active {
+  background-color: #458845 \9;
+}
+.btn.info {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(top, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+  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);
+}
+.btn.info:hover,
+.btn.info:active,
+.btn.info.active,
+.btn.info.disabled {
+  background-color: #339bb9;
+}
+.btn.info[disabled] {
+  background-color: #339bb9;
+}
+.btn.info:active, .btn.info.active {
+  background-color: #287a91 \9;
+}
+.btn {
+  display: inline-block;
+  padding: 4px 10px 4px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #333333;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  background-color: #fafafa;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-repeat: no-repeat;
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -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);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  cursor: pointer;
+}
+.btn:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: #e6e6e6;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+  -moz-transition: background-position 0.1s linear;
+  -ms-transition: background-position 0.1s linear;
+  -o-transition: background-position 0.1s linear;
+  transition: background-position 0.1s linear;
+}
+.btn:focus {
+  outline: 1px dotted #666;
+}
+.btn.active, .btn:active {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  background-color: #e6e6e6;
+  background-color: #d9d9d9 \9;
+}
+.btn.disabled {
+  cursor: default;
+  background-image: none;
+  background-color: #e6e6e6;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.btn[disabled] {
+  cursor: default;
+  background-image: none;
+  background-color: #e6e6e6;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.btn.large {
+  padding: 9px 14px 9px;
+  font-size: 15px;
+  line-height: normal;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.btn.large .icon {
+  margin-top: 1px;
+}
+.btn.small {
+  padding: 5px 9px 5px;
+  font-size: 11px;
+  line-height: 16px;
+}
+.btn.small .icon {
+  margin-top: -2px;
+}
+button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+.btn-group {
+  position: relative;
+  *zoom: 1;
+}
+.btn-group:before, .btn-group:after {
+  display: table;
+  content: "";
+}
+.btn-group:after {
+  clear: both;
+}
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+.btn-toolbar .btn-group {
+  display: inline-block;
+}
+.btn-group .btn {
+  position: relative;
+  float: left;
+  margin-left: -1px;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.btn-group .btn:first-child {
+  margin-left: 0;
+  -webkit-border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+  border-top-left-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  border-bottom-left-radius: 4px;
+}
+.btn-group .btn:last-child, .btn-group .dropdown-toggle {
+  -webkit-border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  border-bottom-right-radius: 4px;
+}
+.btn-group .btn.large:first-child {
+  margin-left: 0;
+  -webkit-border-top-left-radius: 6px;
+  -moz-border-radius-topleft: 6px;
+  border-top-left-radius: 6px;
+  -webkit-border-bottom-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  border-bottom-left-radius: 6px;
+}
+.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle {
+  -webkit-border-top-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+  -moz-border-radius-bottomright: 6px;
+  border-bottom-right-radius: 6px;
+}
+.btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active {
+  z-index: 2;
+}
+.btn-group .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.btn-group.open .dropdown-menu {
+  display: block;
+  margin-top: 1px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.btn .caret {
+  margin-top: 6px;
+  margin-left: 0;
+}
+.primary .caret,
+.danger .caret,
+.info .caret,
+.success .caret {
+  border-top-color: #ffffff;
+  opacity: 0.75;
+  filter: alpha(opacity=75);
+}
+.btn.small .caret {
+  margin-top: 4px;
+}
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: 18px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #f3edd2;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.alert, .alert-heading {
+  color: #c09853;
+}
+.alert .close {
+  position: relative;
+  right: -21px;
+  line-height: 18px;
+}
+.alert-success {
+  background-color: #dff0d8;
+  border-color: #cfe8c4;
+}
+.alert-success, .alert-success .alert-heading {
+  color: #468847;
+}
+.alert-danger, .alert-error {
+  background-color: #f2dede;
+  border-color: #e9c7c7;
+}
+.alert-danger,
+.alert-error,
+.alert-danger .alert-heading,
+.alert-error .alert-heading {
+  color: #b94a48;
+}
+.alert-info {
+  background-color: #d9edf7;
+  border-color: #bfe1f2;
+}
+.alert-info, .alert-info .alert-heading {
+  color: #3a87ad;
+}
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+.alert-block > p, .alert-block > ul {
+  margin-bottom: 0;
+}
+.alert-block p + p {
+  margin-top: 5px;
+}
+.thumbnails {
+  margin-left: -20px;
+  list-style: none;
+  *zoom: 1;
+}
+.thumbnails:before, .thumbnails:after {
+  display: table;
+  content: "";
+}
+.thumbnails:after {
+  clear: both;
+}
+.thumbnails > li {
+  float: left;
+  margin: 0 0 18px 20px;
+}
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 1;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-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);
+}
+a.thumbnail:hover {
+  border-color: #0088cc;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+}
+.thumbnail .caption {
+  padding: 9px;
+}
+.label {
+  padding: 1px 3px 2px;
+  font-size: 9.75px;
+  font-weight: bold;
+  color: #ffffff;
+  text-transform: uppercase;
+  background-color: #999999;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.label.important {
+  background-color: #b94a48;
+}
+.label.warning {
+  background-color: #f89406;
+}
+.label.success {
+  background-color: #468847;
+}
+.label.info {
+  background-color: #3a87ad;
+}
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+.progress, .progress .bar {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.progress {
+  height: 18px;
+  margin-bottom: 18px;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+.progress .bar {
+  width: 0%;
+  height: 18px;
+  color: #ffffff;
+  font-size: 12px;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -ms-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(top, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+  -moz-transition: width 0.6s ease;
+  -ms-transition: width 0.6s ease;
+  -o-transition: width 0.6s ease;
+  transition: width 0.6s ease;
+}
+.progress.striped .bar {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+  -moz-background-size: 40px 40px;
+  -o-background-size: 40px 40px;
+  background-size: 40px 40px;
+}
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+  -moz-animation: progress-bar-stripes 2s linear infinite;
+  animation: progress-bar-stripes 2s linear infinite;
+}
+.progress.danger .bar {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+}
+.progress.danger.striped .bar {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress.success .bar {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -ms-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(top, #62c462, #57a957);
+  background-repeat: repeat-x;
+}
+.progress.success.striped .bar {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress.info .bar {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(top, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+}
+.progress.info.striped .bar {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.accordion {
+  margin-bottom: 18px;
+}
+.accordion-group {
+  background-color: #f5f5f5;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.accordion-heading {
+  border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+.accordion-body {
+  margin-bottom: 2px;
+}
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+.carousel {
+  position: relative;
+  line-height: 1;
+}
+.carousel-inner {
+  overflow: hidden;
+  width: 100%;
+  position: relative;
+}
+.carousel .item {
+  display: none;
+  position: relative;
+  -webkit-transition: 0.6s ease-in-out left;
+  -moz-transition: 0.6s ease-in-out left;
+  -ms-transition: 0.6s ease-in-out left;
+  -o-transition: 0.6s ease-in-out left;
+  transition: 0.6s ease-in-out left;
+}
+.carousel .item > img {
+  display: block;
+  line-height: 1;
+}
+.carousel .active, .carousel .next, .carousel .prev {
+  display: block;
+}
+.carousel .active {
+  left: 0;
+}
+.carousel .next, .carousel .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.carousel .next {
+  left: 100%;
+}
+.carousel .prev {
+  left: -100%;
+}
+.carousel .next.left, .carousel .prev.right {
+  left: 0;
+}
+.carousel .active.left {
+  left: -100%;
+}
+.carousel .active.right {
+  left: 100%;
+}
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: #ffffff;
+  text-align: center;
+  background: #222222;
+  border: 3px solid #ffffff;
+  -webkit-border-radius: 23px;
+  -moz-border-radius: 23px;
+  border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+  -webkit-transition: all 0.2s linear;
+  -moz-transition: all 0.2s linear;
+  -ms-transition: all 0.2s linear;
+  -o-transition: all 0.2s linear;
+  transition: all 0.2s linear;
+}
+.carousel-control.right {
+  left: auto;
+  right: 15px;
+}
+.carousel-control:hover {
+  color: #ffffff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+.carousel-caption {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 10px 15px 5px;
+  background: #333333;
+  background: rgba(0, 0, 0, 0.75);
+}
+.carousel-caption h4, .carousel-caption p {
+  color: #ffffff;
+}
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+}
+.hero-unit p {
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 27px;
+}
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+.invisible {
+  visibility: hidden;
+}
diff --git a/docs/base-css.html b/docs/base-css.html
index a30e0c1f3..9cad9de01 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -13,8 +13,8 @@
     
 
     
-    
-    
+    
+    
     
     
 
diff --git a/docs/components.html b/docs/components.html
index 252e1a0c3..eba49449f 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -13,8 +13,8 @@
     
 
     
-    
-    
+    
+    
     
     
 
diff --git a/docs/download.html b/docs/download.html
index 99564576f..3af30dca7 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -13,8 +13,8 @@
     
 
     
-    
-    
+    
+    
     
     
 
diff --git a/docs/examples.html b/docs/examples.html
index 6fcbc5855..dfa62fe98 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -13,8 +13,8 @@
     
 
     
-    
-    
+    
+    
     
     
 
diff --git a/docs/index.html b/docs/index.html
index e60e9d711..317ec994b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -13,8 +13,8 @@
     
 
     
-    
-    
+    
+    
     
     
 
diff --git a/docs/javascript.html b/docs/javascript.html
index 07c55e834..dd65c1b8d 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -13,8 +13,8 @@
     
 
     
-    
-    
+    
+    
     
     
 
diff --git a/docs/less.html b/docs/less.html
index c827df453..fb1b0d18c 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -13,8 +13,8 @@
     
 
     
-    
-    
+    
+    
     
     
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 02b9721d3..f49b8d6c4 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -13,8 +13,8 @@
     
 
     
-    
-    
+    
+    
     
     
 
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 014f248d6..dbb718056 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -13,8 +13,8 @@
     
 
     
-    
-    
+    
+    
     
     
 
diff --git a/docs/upgrading.html b/docs/upgrading.html
index d0234a8ba..142e750cc 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -13,8 +13,8 @@
     
 
     
-    
-    
+    
+    
     
     
 
-- 
cgit v1.2.3


From a25f0cce95bc538f3aa19e9edf17ac3a353e334e Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 26 Jan 2012 22:11:32 -0800
Subject: simplify readme

---
 README.md | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index b77eb95ae..7dc9038a8 100644
--- a/README.md
+++ b/README.md
@@ -6,27 +6,6 @@ Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more
 To get started -- checkout http://twitter.github.com/bootstrap!
 
 
-Usage
------
-
-You can use Twitter Bootstrap in one of two ways: just drop the compiled CSS into any new project and start cranking, or run LESS on your site and compile on the fly like a boss.
-
-Here's what the LESS version looks like:
-
-``` html
-
-
-```
-
-Or if you prefer, the standard CSS way:
-
-``` html
-
-```
-
-For more info, refer to the docs!
-
-
 Versioning
 ----------
 
@@ -74,8 +53,8 @@ Developers
 
 We have included a makefile with convenience methods for working with the Bootstrap library.
 
-+ **build** - `make build`
-This will run the less compiler on the bootstrap lib and generate a bootstrap.css and bootstrap.min.css file.
++ **build** - `make`
+This will run the less compiler on the bootstrap lib and regenerate the docs dir.
 The lessc compiler is required for this command to run.
 
 + **watch** - `make watch`
-- 
cgit v1.2.3


From 815a2ae9f26f49137382fd4b186d174c7b1b8c5b Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 26 Jan 2012 22:39:17 -0800
Subject: rebuild + copy images to docs when making

---
 Makefile                                              |   1 +
 docs/assets/css/bootstrap.css                         |   6 +++---
 docs/assets/img/glyphicons-halflings-sprite-white.png | Bin 0 -> 13566 bytes
 docs/assets/img/glyphicons-halflings-sprite.png       | Bin 0 -> 14152 bytes
 less/sprites.less                                     |   4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 docs/assets/img/glyphicons-halflings-sprite-white.png
 create mode 100644 docs/assets/img/glyphicons-halflings-sprite.png

diff --git a/Makefile b/Makefile
index 127d6affe..f2213103a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ build:
 		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \
 		rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
 		node docs/build; \
+		cp img/* docs/assets/img/; \
 		echo "Bootstrap successfully built! - `date`"; \
 	else \
 		echo "You must have the LESS compiler installed in order to build Bootstrap."; \
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index cd7268bb7..68e161051 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Thu Jan 26 22:05:04 PST 2012
+ * Date: Thu Jan 26 22:39:03 PST 2012
  */
 article,
 aside,
@@ -1066,7 +1066,7 @@ table .span12 {
   margin-left: 0;
 }
 .icon {
-  background-image: url(img/glyphicons-halflings-sprite.png);
+  background-image: url(../img/glyphicons-halflings-sprite.png);
   background-position: 0 0;
   background-repeat: no-repeat;
   display: inline-block;
@@ -1075,7 +1075,7 @@ table .span12 {
   height: 14px;
 }
 .icon.white {
-  background-image: url(img/glyphicons-halflings-sprite-white.png);
+  background-image: url(../img/glyphicons-halflings-sprite-white.png);
 }
 .icon.glass {
   background-position: 0      0;
diff --git a/docs/assets/img/glyphicons-halflings-sprite-white.png b/docs/assets/img/glyphicons-halflings-sprite-white.png
new file mode 100644
index 000000000..a92b1913a
Binary files /dev/null and b/docs/assets/img/glyphicons-halflings-sprite-white.png differ
diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png
new file mode 100644
index 000000000..b4e0acfbc
Binary files /dev/null and b/docs/assets/img/glyphicons-halflings-sprite.png differ
diff --git a/less/sprites.less b/less/sprites.less
index c3b420665..599434b2b 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -12,7 +12,7 @@
 // will look like .
 
 .icon {
-  background-image: url(img/glyphicons-halflings-sprite.png);
+  background-image: url(../img/glyphicons-halflings-sprite.png);
   background-position: 0 0;
   background-repeat: no-repeat;
   display: inline-block;
@@ -21,7 +21,7 @@
   height: 14px;
 }
 .icon.white {
-  background-image: url(img/glyphicons-halflings-sprite-white.png);
+  background-image: url(../img/glyphicons-halflings-sprite-white.png);
 }
 
 .icon.glass              { background-position: 0      0; }
-- 
cgit v1.2.3


From c63175dc1d41e2d26e50194a7e24cc0ea618446b Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 26 Jan 2012 22:52:44 -0800
Subject: change endpoint to point to actual server...

---
 docs/assets/js/application.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 8c86ff028..02cc730bd 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -206,10 +206,9 @@ $(function () {
       $(this).val() && (vars[ $(this).prev().text() ] = $(this).val())
     })
 
-// , url: "http://bootstrap.herokuapp.com"
     $.ajax({
       type: 'POST'
-    , url: 'http://localhost:3000'
+    , url: 'http://bootstrap.herokuapp.com'
     , dataType: 'jsonpi'
     , params: {
         branch: '2.0-wip'
-- 
cgit v1.2.3


From aa594501bd24d51181dc3504602aa4aaefb1cb60 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 26 Jan 2012 23:16:02 -0800
Subject: change typeahead to data-source instead of data-data and add to docs

---
 docs/assets/css/bootstrap.css            | 2 +-
 docs/javascript.html                     | 8 +++++++-
 docs/templates/pages/javascript.mustache | 8 +++++++-
 js/bootstrap-typeahead.js                | 7 ++++---
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 68e161051..28f49391b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Thu Jan 26 22:39:03 PST 2012
+ * Date: Thu Jan 26 23:15:40 PST 2012
  */
 article,
 aside,
diff --git a/docs/javascript.html b/docs/javascript.html
index dd65c1b8d..894671b7e 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1323,7 +1323,7 @@ $('.myCarousel').carousel({
           
      Example
      
           
      Start typing in the field below to show the typeahead results.
      
           
      
-            
+            
           
      
           
      
           
      Using bootstrap-typeahead.js
      
@@ -1340,6 +1340,12 @@ $('.myCarousel').carousel({
              
             
             
+              
+               source
+               array
+               [ ]
+               The data source to query against.
+             
              
                items
                number
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 59b8a03d6..6e3ba25da 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1258,7 +1258,7 @@ $('.myCarousel').carousel({
           
      {{_i}}Example{{/i}}
      
           
      {{_i}}Start typing in the field below to show the typeahead results.{{/i}}
      
           
      
-            
+            
           
      
           
      
           
      {{_i}}Using bootstrap-typeahead.js{{/i}}
      
@@ -1275,6 +1275,12 @@ $('.myCarousel').carousel({
              
             
             
+              
+               {{_i}}source{{/i}}
+               {{_i}}array{{/i}}
+               [ ]
+               {{_i}}The data source to query against.{{/i}}
+             
              
                {{_i}}items{{/i}}
                {{_i}}number{{/i}}
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 1205a99ca..82c318831 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -25,7 +25,7 @@
     this.$element = $(element)
     this.options = $.extend({}, $.fn.typeahead.defaults, options)
     this.$menu = $(this.options.menu).appendTo('body')
-    this.data = this.options.data
+    this.source = this.options.source
     this.shown = false
     this.listen()
   }
@@ -79,7 +79,7 @@
 
       q = this.query.toLowerCase()
 
-      items = jQuery.grep(this.data, function (item) {
+      items = jQuery.grep(this.source, function (item) {
         if (that.matcher(item, q)) return item
       })
 
@@ -229,7 +229,8 @@
   }
 
   $.fn.typeahead.defaults = {
-    items: 8
+    source: []
+  , items: 8
   , menu: '
        '
   , item: '
        • '
   }
-- 
cgit v1.2.3


From 942d1b459568acb9f66525f8f6316a252a199e02 Mon Sep 17 00:00:00 2001
From: Burak Tuyan 
Date: Fri, 27 Jan 2012 16:33:18 +0200
Subject: Updating to latest version of Glyphicons Halflings set (v.1.5) along
 with some icon enhancements like:

- Updated the Gylphicons Halflings set to version 1.5 (30 new icons)
- Optimized the sprite PNG files for minimum filesize without any quality loss
- Made some fixes for horizontal alignment at the LESS/CSS level (tags, bold, arrow-up, minus, chevron-down)
- Made some fixes for vertical alignment at the LESS/CSS level (chevron-down, resize-vertical, resize-horizontal)
- Renamed the old "calendar" class as "list-alt" class (because now we've a real calendar icon)
- Changed the "background-position" of the icon class to "14px 14px", so that a wrong class name will not be showing the glass icon and instead will show a blank icon (which is useful for just positioning the text after the icons in some cases)
- Added new icons (classes) to the base-css Docs (to both HTML file and Mustache template)
- Changed one of the button examples to danger style and used a white icon
- Renamed the sprite image files to save a few bytes here and there (from glyphicons-halflings-sprite.png to lyphicons-halflings.png and from glyphicons-halflings-sprite-white.png to glyphicons-halflings-white.png)
---
 docs/assets/css/bootstrap.css                      | 108 +++++++++++++++++++--
 .../img/glyphicons-halflings-sprite-white.png      | Bin 13566 -> 0 bytes
 docs/assets/img/glyphicons-halflings-sprite.png    | Bin 14152 -> 0 bytes
 docs/assets/img/glyphicons-halflings-white.png     | Bin 0 -> 4352 bytes
 docs/assets/img/glyphicons-halflings.png           | Bin 0 -> 4364 bytes
 docs/base-css.html                                 |  62 +++++++++---
 docs/templates/pages/base-css.mustache             |  62 +++++++++---
 img/glyphicons-halflings-sprite-white.png          | Bin 13566 -> 0 bytes
 img/glyphicons-halflings-sprite.png                | Bin 14152 -> 0 bytes
 img/glyphicons-halflings-white.png                 | Bin 0 -> 4352 bytes
 img/glyphicons-halflings.png                       | Bin 0 -> 4364 bytes
 less/sprites.less                                  |  54 ++++++++---
 12 files changed, 234 insertions(+), 52 deletions(-)
 delete mode 100644 docs/assets/img/glyphicons-halflings-sprite-white.png
 delete mode 100644 docs/assets/img/glyphicons-halflings-sprite.png
 create mode 100644 docs/assets/img/glyphicons-halflings-white.png
 create mode 100644 docs/assets/img/glyphicons-halflings.png
 delete mode 100644 img/glyphicons-halflings-sprite-white.png
 delete mode 100644 img/glyphicons-halflings-sprite.png
 create mode 100644 img/glyphicons-halflings-white.png
 create mode 100644 img/glyphicons-halflings.png

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 68e161051..c878d70ff 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1066,8 +1066,8 @@ table .span12 {
   margin-left: 0;
 }
 .icon {
-  background-image: url(../img/glyphicons-halflings-sprite.png);
-  background-position: 0 0;
+  background-image: url(../img/glyphicons-halflings.png);
+  background-position: 14px 14px;
   background-repeat: no-repeat;
   display: inline-block;
   vertical-align: text-top;
@@ -1075,10 +1075,10 @@ table .span12 {
   height: 14px;
 }
 .icon.white {
-  background-image: url(../img/glyphicons-halflings-sprite-white.png);
+  background-image: url(../img/glyphicons-halflings-white.png);
 }
 .icon.glass {
-  background-position: 0      0;
+  background-position: 0 0;
 }
 .icon.music {
   background-position: -24px 0;
@@ -1170,7 +1170,7 @@ table .span12 {
 .icon.refresh {
   background-position: -240px -24px;
 }
-.icon.calendar {
+.icon.list-alt {
   background-position: -264px -24px;
 }
 .icon.lock {
@@ -1201,7 +1201,7 @@ table .span12 {
   background-position: 0 -48px;
 }
 .icon.tags {
-  background-position: -24px -48px;
+  background-position: -25px -48px;
 }
 .icon.book {
   background-position: -48px -48px;
@@ -1219,7 +1219,7 @@ table .span12 {
   background-position: -144px -48px;
 }
 .icon.bold {
-  background-position: -168px -48px;
+  background-position: -167px -48px;
 }
 .icon.italic {
   background-position: -192px -48px;
@@ -1320,11 +1320,41 @@ table .span12 {
 .icon.arrow-left {
   background-position: -240px -96px;
 }
+.icon.plus-sign {
+  background-position: 0 -96px;
+}
+.icon.minus-sign {
+  background-position: -24px  -96px;
+}
+.icon.remove-sign {
+  background-position: -48px  -96px;
+}
+.icon.ok-sign {
+  background-position: -72px  -96px;
+}
+.icon.question-sign {
+  background-position: -96px  -96px;
+}
+.icon.info-sign {
+  background-position: -120px -96px;
+}
+.icon.screenshot {
+  background-position: -144px -96px;
+}
+.icon.remove-circle {
+  background-position: -168px -96px;
+}
+.icon.ok-circle {
+  background-position: -192px -96px;
+}
+.icon.ban-circle {
+  background-position: -216px -96px;
+}
 .icon.arrow-right {
   background-position: -264px -96px;
 }
 .icon.arrow-up {
-  background-position: -288px -96px;
+  background-position: -289px -96px;
 }
 .icon.arrow-down {
   background-position: -312px -96px;
@@ -1342,11 +1372,71 @@ table .span12 {
   background-position: -408px -96px;
 }
 .icon.minus {
-  background-position: -432px -96px;
+  background-position: -433px -96px;
 }
 .icon.asterisk {
   background-position: -456px -96px;
 }
+.icon.exclamation-sign {
+  background-position: 0 -120px;
+}
+.icon.gift {
+  background-position: -24px  -120px;
+}
+.icon.leaf {
+  background-position: -48px  -120px;
+}
+.icon.fire {
+  background-position: -72px  -120px;
+}
+.icon.eye-open {
+  background-position: -96px  -120px;
+}
+.icon.eye-close {
+  background-position: -120px -120px;
+}
+.icon.warning-sign {
+  background-position: -144px -120px;
+}
+.icon.plane {
+  background-position: -168px -120px;
+}
+.icon.calendar {
+  background-position: -192px -120px;
+}
+.icon.random {
+  background-position: -216px -120px;
+}
+.icon.comment {
+  background-position: -240px -120px;
+}
+.icon.magnet {
+  background-position: -264px -120px;
+}
+.icon.chevron-up {
+  background-position: -288px -120px;
+}
+.icon.chevron-down {
+  background-position: -313px -119px;
+}
+.icon.retweet {
+  background-position: -336px -120px;
+}
+.icon.shopping-cart {
+  background-position: -360px -120px;
+}
+.icon.folder-close {
+  background-position: -384px -120px;
+}
+.icon.folder-open {
+  background-position: -409px -120px;
+}
+.icon.resize-vertical {
+  background-position: -432px -119px;
+}
+.icon.resize-horizontal {
+  background-position: -456px -118px;
+}
 .dropdown {
   position: relative;
 }
diff --git a/docs/assets/img/glyphicons-halflings-sprite-white.png b/docs/assets/img/glyphicons-halflings-sprite-white.png
deleted file mode 100644
index a92b1913a..000000000
Binary files a/docs/assets/img/glyphicons-halflings-sprite-white.png and /dev/null differ
diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png
deleted file mode 100644
index b4e0acfbc..000000000
Binary files a/docs/assets/img/glyphicons-halflings-sprite.png and /dev/null differ
diff --git a/docs/assets/img/glyphicons-halflings-white.png b/docs/assets/img/glyphicons-halflings-white.png
new file mode 100644
index 000000000..a20760bfd
Binary files /dev/null and b/docs/assets/img/glyphicons-halflings-white.png differ
diff --git a/docs/assets/img/glyphicons-halflings.png b/docs/assets/img/glyphicons-halflings.png
new file mode 100644
index 000000000..151407a29
Binary files /dev/null and b/docs/assets/img/glyphicons-halflings.png differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 9cad9de01..da5268069 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1338,10 +1338,6 @@
         
         
         
-      
        • 
-    
        
-    
        
-      
        
         
         
         
@@ -1349,8 +1345,12 @@
         
         
         
+      
        
+    
        
+    
        
+      
        
         
-        
+        
         
         
         
@@ -1366,10 +1366,6 @@
         
         
         
-      
        
-    
        
-    
        
-      
        
         
         
         
@@ -1384,7 +1380,10 @@
         
         
         
-
+      
        
+    
        
+    
        
+      
        
         
         
         
@@ -1394,10 +1393,6 @@
         
         
         
-      
        
-    
        
-    
        
-      
        
         
         
         
@@ -1410,6 +1405,20 @@
         
         
 
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
        
+    
        
+    
        
+      
        
         
         
         
@@ -1420,6 +1429,27 @@
         
         
         
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
        
     
        
   
        
@@ -1441,7 +1471,7 @@
 
         <i class="icon search"></i>
 
        
-      
        There are over 100 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
        
+      
        There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
        
     
        
     
        
       
        Use cases
        
@@ -1462,7 +1492,7 @@
       
        Use them in buttons, or in button groups for a toolbar style presentation.
        
       
        
          Refresh
-         Settings
+         Delete
       
        
       
        
         
        
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c3d10eb08..6476669e6 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1273,10 +1273,6 @@
         
         
         
-      
        
-    
        
-    
        
-      
        
         
         
         
@@ -1284,8 +1280,12 @@
         
         
         
+      
        
+    
        
+    
        
+      
        
         
-        
+        
         
         
         
@@ -1301,10 +1301,6 @@
         
         
         
-      
        
-    
        
-    
        
-      
        
         
         
         
@@ -1319,7 +1315,10 @@
         
         
         
-
+      
        
+    
        
+    
        
+      
        
         
         
         
@@ -1329,10 +1328,6 @@
         
         
         
-      
        
-    
        
-    
        
-      
        
         
         
         
@@ -1345,6 +1340,20 @@
         
         
 
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
        
+    
        
+    
        
+      
        
         
         
         
@@ -1355,6 +1364,27 @@
         
         
         
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
        
     
        
   
        
@@ -1376,7 +1406,7 @@
 
         <i class="icon search"></i>
 
        
-      
        {{_i}}There are over 100 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.{{/i}}
        
+      
        {{_i}}There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.{{/i}}
        
     
        
     
        
       
        {{_i}}Use cases{{/i}}
        
@@ -1397,7 +1427,7 @@
       
        {{_i}}Use them in buttons, or in button groups for a toolbar style presentation.{{/i}}
        
       
        
          {{_i}}Refresh{{/i}}
-         {{_i}}Settings{{/i}}
+         {{_i}}Delete{{/i}}
       
        
       
        
         
        
diff --git a/img/glyphicons-halflings-sprite-white.png b/img/glyphicons-halflings-sprite-white.png
deleted file mode 100644
index a92b1913a..000000000
Binary files a/img/glyphicons-halflings-sprite-white.png and /dev/null differ
diff --git a/img/glyphicons-halflings-sprite.png b/img/glyphicons-halflings-sprite.png
deleted file mode 100644
index b4e0acfbc..000000000
Binary files a/img/glyphicons-halflings-sprite.png and /dev/null differ
diff --git a/img/glyphicons-halflings-white.png b/img/glyphicons-halflings-white.png
new file mode 100644
index 000000000..a20760bfd
Binary files /dev/null and b/img/glyphicons-halflings-white.png differ
diff --git a/img/glyphicons-halflings.png b/img/glyphicons-halflings.png
new file mode 100644
index 000000000..151407a29
Binary files /dev/null and b/img/glyphicons-halflings.png differ
diff --git a/less/sprites.less b/less/sprites.less
index 599434b2b..c7cdc1710 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -7,13 +7,15 @@
 // -----
 
 // As of v2.0.0, the  tag is reserved for icons from the Glyphicons set.
-// All icons receive the styles of the  tag and are then given a unique
-// class to add width, height, and background-position. Your resulting HTML
-// will look like .
+// All icons receive the styles of the  tag with a base class of .icon
+// and are then given a unique class to add width, height, and
+// background-position. Your resulting HTML will look like this:
+// . And for the white version of the icons, just
+// add the .white class like this: 
 
 .icon {
-  background-image: url(../img/glyphicons-halflings-sprite.png);
-  background-position: 0 0;
+  background-image: url(../img/glyphicons-halflings.png);
+  background-position: 14px 14px;
   background-repeat: no-repeat;
   display: inline-block;
   vertical-align: text-top;
@@ -21,7 +23,7 @@
   height: 14px;
 }
 .icon.white {
-  background-image: url(../img/glyphicons-halflings-sprite-white.png);
+  background-image: url(../img/glyphicons-halflings-white.png);
 }
 
 .icon.glass              { background-position: 0      0; }
@@ -56,7 +58,7 @@
 .icon.play-circle        { background-position: -192px -24px; }
 .icon.repeat             { background-position: -216px -24px; }
 .icon.refresh            { background-position: -240px -24px; }
-.icon.calendar           { background-position: -264px -24px; }
+.icon.list-alt           { background-position: -264px -24px; }
 .icon.lock               { background-position: -288px -24px; }
 .icon.flag               { background-position: -312px -24px; }
 .icon.headphones         { background-position: -336px -24px; }
@@ -67,13 +69,13 @@
 .icon.barcode            { background-position: -456px -24px; }
 
 .icon.tag                { background-position: 0      -48px; }
-.icon.tags               { background-position: -24px  -48px; }
+.icon.tags               { background-position: -25px  -48px; }
 .icon.book               { background-position: -48px  -48px; }
 .icon.bookmark           { background-position: -72px  -48px; }
 .icon.print              { background-position: -96px  -48px; }
 .icon.camera             { background-position: -120px -48px; }
 .icon.font               { background-position: -144px -48px; }
-.icon.bold               { background-position: -168px -48px; }
+.icon.bold               { background-position: -167px -48px; }
 .icon.italic             { background-position: -192px -48px; }
 .icon.text-height        { background-position: -216px -48px; }
 .icon.text-width         { background-position: -240px -48px; }
@@ -108,14 +110,44 @@
 .icon.chevron-left       { background-position: -432px -72px; }
 .icon.chevron-right      { background-position: -456px -72px; }
 
+.icon.plus-sign          { background-position: 0      -96px; }
+.icon.minus-sign         { background-position: -24px  -96px; }
+.icon.remove-sign        { background-position: -48px  -96px; }
+.icon.ok-sign            { background-position: -72px  -96px; }
+.icon.question-sign      { background-position: -96px  -96px; }
+.icon.info-sign          { background-position: -120px -96px; }
+.icon.screenshot         { background-position: -144px -96px; }
+.icon.remove-circle      { background-position: -168px -96px; }
+.icon.ok-circle          { background-position: -192px -96px; }
+.icon.ban-circle         { background-position: -216px -96px; }
 .icon.arrow-left         { background-position: -240px -96px; }
 .icon.arrow-right        { background-position: -264px -96px; }
-.icon.arrow-up           { background-position: -288px -96px; }
+.icon.arrow-up           { background-position: -289px -96px; }
 .icon.arrow-down         { background-position: -312px -96px; }
 .icon.share-alt          { background-position: -336px -96px; }
 .icon.resize-full        { background-position: -360px -96px; }
 .icon.resize-small       { background-position: -384px -96px; }
 .icon.plus               { background-position: -408px -96px; }
-.icon.minus              { background-position: -432px -96px; }
+.icon.minus              { background-position: -433px -96px; }
 .icon.asterisk           { background-position: -456px -96px; }
 
+.icon.exclamation-sign   { background-position: 0      -120px; }
+.icon.gift               { background-position: -24px  -120px; }
+.icon.leaf               { background-position: -48px  -120px; }
+.icon.fire               { background-position: -72px  -120px; }
+.icon.eye-open           { background-position: -96px  -120px; }
+.icon.eye-close          { background-position: -120px -120px; }
+.icon.warning-sign       { background-position: -144px -120px; }
+.icon.plane              { background-position: -168px -120px; }
+.icon.calendar           { background-position: -192px -120px; }
+.icon.random             { background-position: -216px -120px; }
+.icon.comment            { background-position: -240px -120px; }
+.icon.magnet             { background-position: -264px -120px; }
+.icon.chevron-up         { background-position: -288px -120px; }
+.icon.chevron-down       { background-position: -313px -119px; }
+.icon.retweet            { background-position: -336px -120px; }
+.icon.shopping-cart      { background-position: -360px -120px; }
+.icon.folder-close       { background-position: -384px -120px; }
+.icon.folder-open        { background-position: -408px -120px; }
+.icon.resize-vertical    { background-position: -432px -119px; }
+.icon.resize-horizontal  { background-position: -456px -118px; }
-- 
cgit v1.2.3


From acaa3b59775d6e4c3f4776027bb325b418dca6b5 Mon Sep 17 00:00:00 2001
From: Burak Tuyan 
Date: Fri, 27 Jan 2012 18:02:57 +0200
Subject: Changing the color of the default icons from black (#000) to grayDark
 (#333)

---
 docs/assets/img/glyphicons-halflings.png | Bin 4364 -> 4352 bytes
 img/glyphicons-halflings.png             | Bin 4364 -> 4352 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/assets/img/glyphicons-halflings.png b/docs/assets/img/glyphicons-halflings.png
index 151407a29..92d4445df 100644
Binary files a/docs/assets/img/glyphicons-halflings.png and b/docs/assets/img/glyphicons-halflings.png differ
diff --git a/img/glyphicons-halflings.png b/img/glyphicons-halflings.png
index 151407a29..92d4445df 100644
Binary files a/img/glyphicons-halflings.png and b/img/glyphicons-halflings.png differ
-- 
cgit v1.2.3


From 9d0328ff00a1fa28f58b3cefa826bed9e21ab580 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 08:21:39 -0800
Subject: adding outline callout as a fallback for IE--needs testing though,
 thought I already added this

---
 docs/assets/css/bootstrap.css | 7 +++++--
 less/forms.less               | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 68e161051..3a981f94d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Thu Jan 26 22:39:03 PST 2012
+ * Date: Fri Jan 27 08:21:21 PST 2012
  */
 article,
 aside,
@@ -604,6 +604,9 @@ input:focus, textarea:focus {
   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   outline: 0;
+  outline: 1px dotted #666 \9;
+  /* IE6-8 */
+
 }
 input[type=file]:focus, input[type=checkbox]:focus, select:focus {
   -webkit-box-shadow: none;
@@ -1831,7 +1834,7 @@ table .span12 {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query::-webkit-input-placeholder {
+.navbar-search .search-query ::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
diff --git a/less/forms.less b/less/forms.less
index 9e2e1dc1b..d2e049de5 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -192,6 +192,7 @@ textarea:focus {
   @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
   .box-shadow(@shadow);
   outline: 0;
+  outline: 1px dotted #666 \9; /* IE6-8 */
 }
 input[type=file]:focus,
 input[type=checkbox]:focus,
-- 
cgit v1.2.3


From 6075b5dee6c892b991e8a00de70942f28f9a1c14 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 17:32:11 -0500
Subject: Collapses borders for IE7, which doesn't respect border-spacing

---
 less/tables.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/less/tables.less b/less/tables.less
index 809c2f60e..c069ed588 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -64,6 +64,7 @@ table {
 .table-bordered {
   border: 1px solid #ddd;
   border-collapse: separate; // Done so we can round those corners!
+  *border-collapse: collapsed; // IE7 can't round corners anyway
   .border-radius(4px);
   th + th,
   td + td,
-- 
cgit v1.2.3


From 841e386daf01e06f2eba00725545f3e3315334b3 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 17:32:44 -0500
Subject: Fixes up internal and external spacing for IE7 buttons

---
 less/buttons.less | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/less/buttons.less b/less/buttons.less
index d7f533783..f18cf9d95 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -67,6 +67,13 @@
   // Button Base
   display: inline-block;
   padding: 4px 10px 4px;
+  *padding: 2px 10px;
+  // IE7 likes to collapse the whitespace before the button, so bring it back...
+  *margin-left: 4px;
+  &:first-child {
+    // ...but not before the first button
+    *margin-left: 0;
+  }
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
   color: @grayDark;
-- 
cgit v1.2.3


From 526d38839332907062cde27727900deb06e0c50b Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 18:03:53 -0500
Subject: Compensates for IE7
 first-child-input-inheriting-hasLayout-parents-margins bug for appended text
 form element

---
 less/forms.less | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/less/forms.less b/less/forms.less
index d2e049de5..55a646368 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -440,6 +440,15 @@ select:focus:required:invalid {
     margin-left: -1px;
     .border-radius(0 3px 3px 0);
   }
+  input:first-child {
+    // In IE7, having a hasLayout container (from clearfix's zoom:1) can make the first input
+    // inherit the sum of its ancestors' margins.
+    *margin-left: -160px;
+
+    &+.add-on {
+      *margin-left: -21px;
+    }
+  }
 }
 
 
-- 
cgit v1.2.3


From f51e703ba6a87ad504682c16b6dd747ebcfd2afb Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Fri, 27 Jan 2012 12:16:36 -0500
Subject: Rebuild bootstrap.css

---
 docs/assets/css/bootstrap.css | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 3a981f94d..4fe86c977 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Fri Jan 27 08:21:21 PST 2012
+ * Date: Fri Jan 27 12:16:22 EST 2012
  */
 article,
 aside,
@@ -887,6 +887,12 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
+.input-append input:first-child {
+  *margin-left: -160px;
+}
+.input-append input:first-child + .add-on {
+  *margin-left: -21px;
+}
 .search-query {
   padding-left: 14px;
   padding-right: 14px;
@@ -972,6 +978,7 @@ table {
 .table-bordered {
   border: 1px solid #ddd;
   border-collapse: separate;
+  *border-collapse: collapsed;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -1834,7 +1841,7 @@ table .span12 {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
@@ -2448,6 +2455,8 @@ table .span12 {
 .btn {
   display: inline-block;
   padding: 4px 10px 4px;
+  *padding: 2px 10px;
+  *margin-left: 4px;
   font-size: 13px;
   line-height: 18px;
   color: #333333;
@@ -2470,6 +2479,9 @@ table .span12 {
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   cursor: pointer;
 }
+.btn:first-child {
+  *margin-left: 0;
+}
 .btn:hover {
   color: #333333;
   text-decoration: none;
-- 
cgit v1.2.3


From e44a7dd4ff2d505e6bc41ba0a5fdf66650cdf605 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 09:36:49 -0800
Subject: buttons for toggle links in js docs, code example for offsetting in
 grid

---
 docs/templates/pages/download.mustache    | 6 +++---
 docs/templates/pages/scaffolding.mustache | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 0f997d368..5b9f765ab 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -19,7 +19,7 @@
 
 
        
   
        
-    Toggle all
+    Toggle all
     
        
       1. Select components
       Get just the CSS you need
@@ -79,7 +79,7 @@
 
 
        
   
        
-    Reset to defaults
+    Reset to defaults
     
        
       2. Modify variables
       Customize Bootstrap without using a LESS compiler
@@ -157,7 +157,7 @@
 
 
        
   
        
-    Toggle all
+    Toggle all
     
        
       3. Select jQuery plugins
       Quickly add only the necessary javascript
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 7781e86f6..cf672cc6e 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -71,6 +71,8 @@
     
        
   
        
 
+  
        
+
   
        Offsetting columns
        
   
        
     
        4
        
@@ -83,6 +85,12 @@
   
        
     
        8 offset 4
        
   
        
+
        +<div class="row">
+  <div class="span4">...</div>
+  <div class="span4 offset4">...</div>
+</div>
+
        
 
   
        
 
-- 
cgit v1.2.3


From 70d95b1bd72a039d47695495aac6b71da17df7dc Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Fri, 27 Jan 2012 13:27:55 -0500
Subject: Moves IE7-specific button padding to only apply to form controls

---
 less/buttons.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/less/buttons.less b/less/buttons.less
index f18cf9d95..5f6f0c24b 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -67,7 +67,6 @@
   // Button Base
   display: inline-block;
   padding: 4px 10px 4px;
-  *padding: 2px 10px;
   // IE7 likes to collapse the whitespace before the button, so bring it back...
   *margin-left: 4px;
   &:first-child {
@@ -151,6 +150,8 @@
 // Help Firefox not be a jerk about adding extra padding to buttons
 button.btn,
 input[type=submit].btn {
+  // IE7 has some default padding on button controls
+  *padding: 2px 10px;
   &::-moz-focus-inner {
   	padding: 0;
   	border: 0;
-- 
cgit v1.2.3


From 7b31f4a33467d8e69c0723525b8d9d8e024eaeb6 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Fri, 27 Jan 2012 13:56:41 -0500
Subject: Brings back uneditable input

---
 docs/templates/pages/base-css.mustache | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c3d10eb08..2e7af5cc7 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -969,6 +969,12 @@
               
             
        
           
        
+          
        
+            
+            
        
+              Some value here
+            
        
+          
        
           
        
             
             
        
@@ -1424,4 +1430,4 @@
       
         
     
        
   
        
-
\ No newline at end of file
+
-- 
cgit v1.2.3


From 43f1a42f7f254ad5d776564122bdae6547a4fbcd Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Fri, 27 Jan 2012 13:57:51 -0500
Subject: Adds necessary ie7-inline-block macros

---
 less/button-groups.less | 1 +
 less/forms.less         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/less/button-groups.less b/less/button-groups.less
index 5fb0a8e97..fd802cc35 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -17,6 +17,7 @@
 .btn-toolbar {
   .btn-group {
     display: inline-block;
+    .ie7-inline-block;
   }
 }
 
diff --git a/less/forms.less b/less/forms.less
index 55a646368..52f5063f0 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -377,6 +377,7 @@ select:focus:required:invalid {
 
 .help-inline {
   display: inline-block;
+  .ie7-inline-block;
   margin-bottom: 9px;
   vertical-align: middle;
   padding-left: 5px;
-- 
cgit v1.2.3


From 347a15b69aff9cf3f9bc5c47c9bcadb459eb895b Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Fri, 27 Jan 2012 14:17:06 -0500
Subject: Cleans up IE7 inline margins for buttons and adds them for sprites,
 also fixes button padding for large/small sizes

---
 less/buttons.less | 26 ++++++++++++++++----------
 less/mixins.less  | 22 ++++++++++++++++++++++
 less/sprites.less |  2 ++
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/less/buttons.less b/less/buttons.less
index 5f6f0c24b..06a7d91bd 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -67,12 +67,6 @@
   // Button Base
   display: inline-block;
   padding: 4px 10px 4px;
-  // IE7 likes to collapse the whitespace before the button, so bring it back...
-  *margin-left: 4px;
-  &:first-child {
-    // ...but not before the first button
-    *margin-left: 0;
-  }
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
   color: @grayDark;
@@ -85,6 +79,8 @@
   .box-shadow(@shadow);
   cursor: pointer;
 
+  .ie7-restore-left-whitespace;
+
   &:hover {
     color: @grayDark;
     text-decoration: none;
@@ -129,7 +125,7 @@
 
   // Button Sizes
   &.large {
-    padding: 9px 14px 9px;
+    padding: 9px 14px;
     font-size: @baseFontSize + 2px;
     line-height: normal;
     .border-radius(5px);
@@ -138,7 +134,7 @@
     margin-top: 1px;
   }
   &.small {
-    padding: 5px 9px 5px;
+    padding: 5px 9px;
     font-size: @baseFontSize - 2px;
     line-height: @baseLineHeight - 2px;
   }
@@ -150,10 +146,20 @@
 // Help Firefox not be a jerk about adding extra padding to buttons
 button.btn,
 input[type=submit].btn {
-  // IE7 has some default padding on button controls
-  *padding: 2px 10px;
   &::-moz-focus-inner {
   	padding: 0;
   	border: 0;
   }
+
+  // IE7 has some default padding on button controls
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+  &.large {
+    *padding-top: 7px;
+    *padding-bottom: 7px;
+  }
+  &.small {
+    *padding-top: 3px;
+    *padding-bottom: 3px;
+  }
 }
diff --git a/less/mixins.less b/less/mixins.less
index dd331ebf2..745fe33d9 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -36,6 +36,28 @@
   *zoom: 1;
 }
 
+// IE7 likes to collapse whitespace on either side of the inline-block elements.
+// Ems because we're attempting to match the width of a space character. Left
+// version is for form buttons, which typically come after other elements, and
+// right version is for icons, which come before. Applying both is ok, but it will
+// mean that space between those elements will be .6em (~2 space characters) in IE7,
+// instead of the 1 space in other browsers.
+.ie7-restore-left-whitespace() {
+  *margin-left: .3em;
+
+  &:first-child {
+    *margin-left: 0;
+  }
+}
+
+.ie7-restore-right-whitespace() {
+  *margin-right: .3em;
+
+  &:last-child {
+    *margin-left: 0;
+  }
+}
+
 // Sizing shortcuts
 // -------------------------
 .size(@height: 5px, @width: 5px) {
diff --git a/less/sprites.less b/less/sprites.less
index 599434b2b..fac416df3 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -19,6 +19,8 @@
   vertical-align: text-top;
   width: 14px;
   height: 14px;
+
+  .ie7-restore-right-whitespace;
 }
 .icon.white {
   background-image: url(../img/glyphicons-halflings-sprite-white.png);
-- 
cgit v1.2.3


From 8328987b15e0bb9e1c2ee1bd90e8dee9843f0ea7 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Fri, 27 Jan 2012 16:06:58 -0500
Subject: IE7 fixes for split buttons and dropdowns

---
 less/button-groups.less | 30 ++++++++++++++++++++----------
 less/dropdowns.less     | 21 +++++++++++++++++++--
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/less/button-groups.less b/less/button-groups.less
index fd802cc35..a058f0344 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -6,6 +6,7 @@
 .btn-group {
   position: relative;
   .clearfix(); // clears the floated buttons
+  .ie7-restore-left-whitespace;
 }
 
 // Space out series of button groups
@@ -84,18 +85,27 @@
   padding-right: 8px;
   @shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   .box-shadow(@shadow);
+  *padding-top: 5px;
+  *padding-bottom: 5px;
 }
 
-// Reposition menu on open and round all corners
-.btn-group.open .dropdown-menu {
-  display: block;
-  margin-top: 1px;
-  .border-radius(5px);
-}
-.btn-group.open .dropdown-toggle {
-  background-image: none;
-  @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
+.btn-group.open {
+  // IE7's z-index only goes to the nearest positioned ancestor, which would
+  // make the menu appear below buttons that appeared later on the page
+  *z-index: @zindexDropdown;
+
+  // Reposition menu on open and round all corners
+  .dropdown-menu {
+    display: block;
+    margin-top: 1px;
+    .border-radius(5px);
+  }
+
+  .dropdown-toggle {
+    background-image: none;
+    @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+    .box-shadow(@shadow);
+  }
 }
 
 // Reposition the caret
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 06114b254..e73b056e9 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -5,12 +5,19 @@
 .dropdown {
   position: relative;
 }
+.dropdown .dropdown-toggle {
+  // The caret makes the toggle a bit too tall in IE7
+  *margin-bottom: -3px;
+}
 // Dropdown arrow/caret
 .caret {
   display: inline-block;
   width: 0;
   height: 0;
   text-indent: -99999px;
+  // IE7 won't do the border trick if there's a text indent, but it doesn't
+  // do the content that text-indent is hiding, either, so we're ok.
+  *text-indent: 0;
   vertical-align: top;
   border-left:  4px solid transparent;
   border-right: 4px solid transparent;
@@ -21,7 +28,6 @@
 .dropdown .caret {
   margin-top: 8px;
   margin-left: 2px;
-  *margin-top: 7px;
 }
 .dropdown:hover .caret,
 .open.dropdown .caret {
@@ -31,6 +37,7 @@
 .dropdown-menu {
   position: absolute;
   top: 100%;
+  left: 0;
   z-index: @zindexDropdown;
   float: left;
   display: none; // none by default, but block on "open" of the menu
@@ -50,7 +57,6 @@
   -webkit-background-clip: padding-box;
      -moz-background-clip: padding;
           background-clip: padding-box;
-  zoom: 1; // do we need this?
   *border-right-width: 2px;
   *border-bottom-width: 2px;
 
@@ -68,6 +74,13 @@
     overflow: hidden;
     background-color: #e5e5e5;
     border-bottom: 1px solid @white;
+
+    // IE7 needs a set width since we gave a height. Restricting just
+    // to IE7 to keep the 1px left/right space in other browsers.
+    // It is unclear where IE is getting the extra space that we need
+    // to negative-margin away, but so it goes.
+    *width: 100%;
+    *margin: -5px 0 5px;
   }
 
   // Links within the dropdown menu
@@ -93,6 +106,10 @@
 
 // Open state for the dropdown
 .dropdown.open {
+  // IE7's z-index only goes to the nearest positioned ancestor, which would
+  // make the menu appear below buttons that appeared later on the page
+  *z-index: @zindexDropdown;
+
   .dropdown-toggle {
     color: @white;
     background: #ccc;
-- 
cgit v1.2.3


From e8647c1b118d2c726a8987e9a41aad82da972b57 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 13:20:02 -0800
Subject: huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update
 to doces and stuff

---
 docs/assets/css/bootstrap-responsive.css |   2 +
 docs/assets/css/bootstrap.css            |  23 ++--
 docs/assets/css/docs.css                 |  32 ++---
 docs/base-css.html                       |   2 +-
 docs/components.html                     |  12 +-
 docs/download.html                       | 198 +++++++++++++++++--------------
 docs/examples.html                       |   2 +-
 docs/index.html                          |  27 +++--
 docs/javascript.html                     |   2 +-
 docs/less.html                           |  14 ++-
 docs/scaffolding.html                    |  10 +-
 docs/templates/layout.mustache           |   2 +-
 docs/templates/pages/components.mustache |  10 +-
 docs/templates/pages/download.mustache   | 192 ++++++++++++++++--------------
 docs/templates/pages/index.mustache      |  25 ++--
 docs/templates/pages/less.mustache       |  12 ++
 docs/upgrading.html                      |   2 +-
 less/accordion.less                      |   4 +-
 less/navbar.less                         |  27 +++--
 less/responsive.less                     |   2 +
 less/scaffolding.less                    |   8 +-
 less/variables.less                      |  12 +-
 22 files changed, 351 insertions(+), 269 deletions(-)

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 02b5c099e..6886105cb 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -111,6 +111,8 @@
 @media (min-width: 768px) and (max-width: 940px) {
   .container {
     width: 748px;
+    padding-left: 10px;
+    padding-right: 10px;
   }
   .span1 {
     width: 44px;
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 4fe86c977..b772e8bbb 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Fri Jan 27 12:16:22 EST 2012
+ * Date: Fri Jan 27 13:19:35 PST 2012
  */
 article,
 aside,
@@ -1791,11 +1791,12 @@ table .span12 {
   line-height: 1;
   color: #ffffff;
 }
-.navbar p {
-  margin: 0;
+.navbar .navbar-text {
+  margin-bottom: 0;
   line-height: 40px;
+  color: #999999;
 }
-.navbar p a:hover {
+.navbar .navbar-text a:hover {
   color: #ffffff;
   background-color: transparent;
 }
@@ -1841,7 +1842,7 @@ table .span12 {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query::-webkit-input-placeholder {
+.navbar-search .search-query ::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
@@ -1870,7 +1871,7 @@ table .span12 {
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.navbar-fixed {
+.navbar-fixed-top {
   position: fixed;
   top: 0;
   right: 0;
@@ -1916,7 +1917,7 @@ table .span12 {
   margin: 0 5px;
   overflow: hidden;
   background-color: #222222;
-  border-right: 1px solid #444;
+  border-right: 1px solid #333333;
 }
 .navbar .nav.pull-right {
   margin-left: 10px;
@@ -2649,7 +2650,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   margin-bottom: 18px;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
   background-color: #fcf8e3;
-  border: 1px solid #f3edd2;
+  border: 1px solid #fbeed5;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -2664,14 +2665,14 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 }
 .alert-success {
   background-color: #dff0d8;
-  border-color: #cfe8c4;
+  border-color: #d6e9c6;
 }
 .alert-success, .alert-success .alert-heading {
   color: #468847;
 }
 .alert-danger, .alert-error {
   background-color: #f2dede;
-  border-color: #e9c7c7;
+  border-color: #eed3d7;
 }
 .alert-danger,
 .alert-error,
@@ -2681,7 +2682,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 }
 .alert-info {
   background-color: #d9edf7;
-  border-color: #bfe1f2;
+  border-color: #bce8f1;
 }
 .alert-info, .alert-info .alert-heading {
   color: #3a87ad;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 6fa20cf4d..19356df1a 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -20,7 +20,7 @@ body {
 
 /* Tweak navbar brand link to be super sleek
 -------------------------------------------------- */
-.navbar-fixed .brand {
+.navbar-fixed-top .brand {
   padding-right: 0;
   padding-left: 0;
   margin-left: 20px;
@@ -32,7 +32,7 @@ body {
      -moz-transition: all .2s linear;
           transition: all .2s linear;
 }
-.navbar-fixed .brand:hover {
+.navbar-fixed-top .brand:hover {
   text-decoration: none;
 }
 
@@ -302,14 +302,9 @@ hr.soften {
 
 /* Quickstart section for getting le code
 -------------------------------------------------- */
-.getting-started h3,
-.getting-started p {
-  line-height: 18px;
-  text-align: center;
-  margin-bottom: 9px;
-}
 .getting-started p {
   color: #777;
+  margin-bottom: 9px;
 }
 .getting-started .current-version,
 .getting-started .current-version a {
@@ -322,14 +317,12 @@ hr.soften {
   display: block;
   width: 95%;
   height: auto;
-  margin-left: auto;
-  margin-right: auto;
   font-family: Menlo, Monaco, "Courier New", monospace;
   font-size: 12px;
   line-height: 20px;
   white-space: nowrap;
   overflow: hidden;
-  background-color: #f5f5f5;
+  color: #999;
   /* Makes inputs behave like true block-level elements */
   -webkit-box-sizing: border-box; /* Older Webkit */
      -moz-box-sizing: border-box; /* Older FF */
@@ -339,6 +332,9 @@ hr.soften {
   *width: 80%;
   *height: 24px;
 }
+.getting-started textarea:focus {
+  color: #333;
+}
 
 
 /* Footer
@@ -476,7 +472,7 @@ hr.soften {
   margin-top: 36px;
 }
 .page-header .toggle-all {
-  margin-top: 13px;
+  margin-top: 5px;
 }
 
 /* Space out h3s when following a section */
@@ -518,6 +514,11 @@ hr.soften {
   color: #777;
 }
 
+/* Variables section */
+#variables label {
+  margin-bottom: 0;
+}
+
 /* Giant download button */
 .download-btn {
   margin: 36px 0 108px.i;
@@ -525,13 +526,16 @@ hr.soften {
 .download p,
 .download h4 {
   max-width: 50%;
-  margin: 0 auto 18px;
+  margin: 0 auto;
   color: #999;
   text-align: center;
 }
-.download-btn h4 {
+.download h4 {
   margin-bottom: 0;
 }
+.download p {
+  margin-bottom: 18px;
+}
 .btn.xlarge {
   display: block;
   width: auto;
diff --git a/docs/base-css.html b/docs/base-css.html
index 9cad9de01..2cab601df 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -30,7 +30,7 @@
   
   
-    
        
+    
        
       
        
         
        
           Bootstrap
diff --git a/docs/components.html b/docs/components.html
index eba49449f..7efa889b8 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -30,7 +30,7 @@
   
   
-    
        
+    
        
       
        
         
        
           Bootstrap
@@ -71,7 +71,7 @@
   
        
     
          
       
        • Button groups
          • 
-      
        • Combo buttons
          • 
+      
        • Button dropdowns
          • 
       
        • Nav, tabs, pills
          • 
       
        • Navbar
          • 
       
        • Breadcrumbs
          • 
@@ -157,9 +157,9 @@
 
 
-
          
+
          
   
          
-    
          Combo buttons Built on button groups to provide contextual dropdown menus
          
+    
          Buttons dropdowns Built on button groups to provide contextual dropdown menus
          
   
          
   
          
     
          
@@ -699,9 +699,9 @@
   </div>
 </div>
 
-      
          To make the navbar fixed, swap the .navbar-static class for .navbar-fixed. In your CSS, you will also need to account for the overlap it causes by adding padding-top: 40px; to your <body>.
          
+      
          To make the navbar fixed, swap the .navbar-static class for .navbar-fixed-top. In your CSS, you will also need to account for the overlap it causes by adding padding-top: 40px; to your <body>.
          
 
          -<div class="navbar navbar-fixed">
+<div class="navbar navbar-fixed-top">
   ...
 </div>
 
          
diff --git a/docs/download.html b/docs/download.html
index 3af30dca7..458b5caa0 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -30,7 +30,7 @@
   
   
-    
          
+    
          
       
          
         
          
           Bootstrap
@@ -74,19 +74,19 @@
   
          Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.
          
   
          
     
   
          
 
 
 
          
   
          
-    Toggle all
+    Toggle all
     
          
-      1. Select components
+      1. Chose components
       Get just the CSS you need
     
          
   
          
@@ -107,8 +107,7 @@
     
          
     
          
       
          Components
          
-      
-      
+      
       
       
       
@@ -124,8 +123,7 @@
       
       
       
-      
-      
+      
       
     
          
     
          
@@ -134,97 +132,21 @@
       
       
       
+      
-  
          
-
          
-
-
          
-  
          
-    Reset to defaults
-    
          
-      2. Modify variables
-      Customize Bootstrap without using a LESS compiler
-    
          
-  
          
-  
          
-    
          
-      
          Links
          
-      
-      
-      
-      
-      
          Grid system
          
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-    
          
-    
          
-      
          Typography
          
-      
-      
-      
-      
-      
-      
-      
          Forms
          
-      
-      
-      
-      
-      
          Navbar
          
-      
-      
-      
-      
-      
-      
-    
          
-    
          
-      
          Form states & alerts
          
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+      -->
     
          
   
          
 
          
 
 
          
   
          
-    Toggle all
+    Toggle all
     
          
-      3. Select jQuery plugins
+      2. Select jQuery plugins
       Quickly add only the necessary javascript
     
          
   
          
@@ -288,6 +210,100 @@
   
        
 
 
+
+
        
+  
        
+    Reset to defaults
+    
        
+      3. Customize variables
+      Optionally modify Bootstrap without a compiler
+    
        
+  
        
+  
        
+    
        
+      
        Links
        
+      
+      
+      
+      
+      
        Colors
        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
        
+    
        
+      
        Grid system
        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
        Typography
        
+      
+      
+      
+      
+      
+      
+    
        
+    
        
+      
        Forms
        
+      
+      
+      
+      
+      
        Navbar
        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
        
+    
        
+      
        Form states & alerts
        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
        
+  
        
+
        
+
 
        
   
        
     
        
diff --git a/docs/examples.html b/docs/examples.html
index dfa62fe98..3416ea6f2 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -30,7 +30,7 @@
   
   
-    
        
+    
        
       
        
         
        
           Bootstrap
diff --git a/docs/index.html b/docs/index.html
index 317ec994b..4dd21b3fa 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -30,7 +30,7 @@
   
   
-    
        
+    
        
       
        
         
        
           Bootstrap
@@ -73,7 +73,7 @@
             
        Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
        
             
        
               View project on GitHub
-              Customize and download
+              Customize and Download
             
        
             
        
               
        Feature highlights
        
@@ -90,7 +90,7 @@
           
        
 
           
          
-            
        • GitHub repo
          • 
+            
        • Upgrading from 1.4
          • 
             
        • Issues
          • 
             
        • Roadmap
          • 
             
        • Changelog
          • 
@@ -220,27 +220,28 @@
           
          Quickly start using Bootstrap within your workflow and development process.
          
           
          
             
          
+              
          
+                
          Prostyle with Node
          
+                
          If you use Node, download the repo, customize Bootstrap, and run make.
          
+                
          +$ git clone git@github.com:twitter/bootstrap.git
+$ make
          
+              
          
               
          
                 
          Hotlink the CSS
          
-                
          For the quickest and easiest start, just copy this snippet into your webpage.
          
+                
          For the quickest and easiest start, just copy this snippet into your code to get the CSS.
          
                 
          
                   
                 
          
               
           
               
          
-                
          Use it with LESS
          
-                
          A fan of using LESS? No problem, just download the repo and add these lines to your page:
          
+                
          Use LESS.js
          
+                
          A fan of using LESS? No problem, just link to the appropriate .less and .js files:
          
                 
          
                   
                 
          
-              
           
-              
          
-                
          Fork on GitHub
          
-                
          Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.
          
-                
          Bootstrap on GitHub »
          
-                
          Currently v2.0.0
          
-              
           
+              
          
             
          
           
        
 
diff --git a/docs/javascript.html b/docs/javascript.html
index dd65c1b8d..3a869e930 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -30,7 +30,7 @@
   
   
-    
        
+    
        
       
        
         
        
           Bootstrap
diff --git a/docs/less.html b/docs/less.html
index fb1b0d18c..33ebc8276 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -30,7 +30,7 @@
   
   
-    
        
+    
        
       
        
         
        
           Bootstrap
@@ -331,6 +331,18 @@
             @navbarBackgroundHighlight
             @grayDark
           
+          
+            @navbarText
+            @grayLight
+          
+          
+            @navbarLinkColor
+            @grayLight
+          
+          
+            @navbarLinkColorHover
+            @white
+          
         
       
     
        
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index f49b8d6c4..eed2d7112 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -30,7 +30,7 @@
   
   
-    
        
+    
        
       
        
         
        
           Bootstrap
@@ -136,6 +136,8 @@
     
        
   
        
 
+  
        
+
   
        Offsetting columns
        
   
        
     
        4
        
@@ -148,6 +150,12 @@
   
        
     
        8 offset 4
        
   
        
+
        +<div class="row">
+  <div class="span4">...</div>
+  <div class="span4 offset4">...</div>
+</div>
+
        
 
   
        
 
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index dbb718056..4a016e4d1 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -30,7 +30,7 @@
   
   
-    
        
+    
        
       
        
         
        
           Bootstrap
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index aaee36410..f73052e63 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -6,7 +6,7 @@
   
        
     
          
       
        • {{_i}}Button groups{{/i}}
          • 
-      
        • {{_i}}Combo buttons{{/i}}
          • 
+      
        • {{_i}}Button dropdowns{{/i}}
          • 
       
        • {{_i}}Nav, tabs, pills{{/i}}
          • 
       
        • {{_i}}Navbar{{/i}}
          • 
       
        • {{_i}}Breadcrumbs{{/i}}
          • 
@@ -92,9 +92,9 @@
 
 
-
          
+
          
   
          
-    
          {{_i}}Combo buttons{{/i}} {{_i}}Built on button groups to provide contextual dropdown menus{{/i}}
          
+    
          {{_i}}Buttons dropdowns{{/i}} {{_i}}Built on button groups to provide contextual dropdown menus{{/i}}
          
   
          
   
          
     
          
@@ -634,9 +634,9 @@
   </div>
 </div>
 
-      
          {{_i}}To make the navbar fixed, swap the .navbar-static class for .navbar-fixed. In your CSS, you will also need to account for the overlap it causes by adding padding-top: 40px; to your <body>.{{/i}}
          
+      
          {{_i}}To make the navbar fixed, swap the .navbar-static class for .navbar-fixed-top. In your CSS, you will also need to account for the overlap it causes by adding padding-top: 40px; to your <body>.{{/i}}
          
 
          -<div class="navbar navbar-fixed">
+<div class="navbar navbar-fixed-top">
   ...
 </div>
 
          
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 5b9f765ab..2a8e46a8a 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -9,10 +9,10 @@
   
          {{_i}}Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}
          
   
          
     
   
          
 
@@ -21,7 +21,7 @@
   
          
     Toggle all
     
          
-      1. Select components
+      1. Chose components
       Get just the CSS you need
     
          
   
          
@@ -42,8 +42,7 @@
     
          
     
          
       
          Components
          
-      
-      
+      
       
       
       
@@ -59,8 +58,7 @@
       
       
       
-      
-      
+      
       
     
          
     
          
@@ -69,88 +67,12 @@
       
       
       
+      
-  
          
-
          
-
-
          
-  
          
-    Reset to defaults
-    
          
-      2. Modify variables
-      Customize Bootstrap without using a LESS compiler
-    
          
-  
          
-  
          
-    
          
-      
          Links
          
-      
-      
-      
-      
-      
          Grid system
          
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-    
          
-    
          
-      
          Typography
          
-      
-      
-      
-      
-      
-      
-      
          Forms
          
-      
-      
-      
-      
-      
          Navbar
          
-      
-      
-      
-      
-      
-      
-    
          
-    
          
-      
          Form states & alerts
          
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+      -->
     
          
   
          
 
          
@@ -159,7 +81,7 @@
   
          
     Toggle all
     
          
-      3. Select jQuery plugins
+      2. Select jQuery plugins
       Quickly add only the necessary javascript
     
          
   
          
@@ -223,6 +145,100 @@
   
        
 
        
 
+
+
        
+  
        
+    Reset to defaults
+    
        
+      3. Customize variables
+      Optionally modify Bootstrap without a compiler
+    
        
+  
        
+  
        
+    
        
+      
        Links
        
+      
+      
+      
+      
+      
        Colors
        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
        
+    
        
+      
        Grid system
        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
        Typography
        
+      
+      
+      
+      
+      
+      
+    
        
+    
        
+      
        Forms
        
+      
+      
+      
+      
+      
        Navbar
        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
        
+    
        
+      
        Form states & alerts
        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
        
+  
        
+
        
+
 
        
   
        
     
        
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 9a5421bd3..96477f0ca 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -8,7 +8,7 @@
             
        Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
        
             
        
               {{_i}}View project on GitHub{{/i}}
-              {{_i}}Customize and download{{/i}}
+              {{_i}}Customize and Download{{/i}}
             
        
             
        
               
        {{_i}}Feature highlights{{/i}}
        
@@ -25,7 +25,7 @@
           
        
 
           
          
-            
        • GitHub repo
          • 
+            
        • Upgrading from 1.4
          • 
             
        • {{_i}}Issues{{/i}}
          • 
             
        • {{_i}}Roadmap{{/i}}
          • 
             
        • {{_i}}Changelog{{/i}}
          • 
@@ -155,27 +155,28 @@
           
          {{_i}}Quickly start using Bootstrap within your workflow and development process.{{/i}}
          
           
          
             
          
+              
          
+                
          {{_i}}Prostyle with Node{{/i}}
          
+                
          {{_i}}If you use Node, download the repo, customize Bootstrap, and run make.{{/i}}
          
+                
          +$ git clone git@github.com:twitter/bootstrap.git
+$ make
          
+              
          
               
          
                 
          {{_i}}Hotlink the CSS{{/i}}
          
-                
          {{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}
          
+                
          {{_i}}For the quickest and easiest start, just copy this snippet into your code to get the CSS.{{/i}}
          
                 
          
                   
                 
          
               
           
               
          
-                
          {{_i}}Use it with LESS{{/i}}
          
-                
          {{_i}}A fan of using LESS? No problem, just download the repo and add these lines to your page:{{/i}}
          
+                
          {{_i}}Use LESS.js{{/i}}
          
+                
          {{_i}}A fan of using LESS? No problem, just link to the appropriate .less and .js files:{{/i}}
          
                 
          
                   
                 
          
-              
           
-              
          
-                
          {{_i}}Fork on GitHub{{/i}}
          
-                
          {{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}
          
-                
          {{_i}}Bootstrap on GitHub »{{/i}}
          
-                
          {{_i}}Currently{{/i}} v2.0.0
          
-              
           
+              
          
             
          
           
        
 
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 1aec06c2c..649f8f456 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -266,6 +266,18 @@
             @navbarBackgroundHighlight
             @grayDark
           
+          
+            @navbarText
+            @grayLight
+          
+          
+            @navbarLinkColor
+            @grayLight
+          
+          
+            @navbarLinkColorHover
+            @white
+          
         
       
     
        
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 142e750cc..779bf7165 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -30,7 +30,7 @@
   
   
-    
        
+    
        
       
        
         
        
           Bootstrap
diff --git a/less/accordion.less b/less/accordion.less
index 1ebd5b1a1..d5c00238c 100644
--- a/less/accordion.less
+++ b/less/accordion.less
@@ -1,5 +1,5 @@
-// ACCORDION
-// ---------
+// COLLAPSE
+// --------
 
 
 // Parent container
diff --git a/less/navbar.less b/less/navbar.less
index dba95e5cd..7a4b631d1 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -16,7 +16,7 @@
   .box-shadow(@shadow);
 }
 
-// Text and links
+// Brand, links, text, and buttons
 .navbar {
   // Hover and active states
   .brand:hover {
@@ -35,9 +35,10 @@
     color: @white;
   }
   // Plain text in topbar
-  p {
-    margin: 0;
+  .navbar-text {
+    margin-bottom: 0;
     line-height: 40px;
+    color: @navbarText;
     a:hover {
       color: @white;
       background-color: transparent;
@@ -105,6 +106,9 @@
 }
 
 
+// STATIC OR FIXED?
+// ----------------
+
 // Static navbar
 .navbar-static {
   margin-bottom: @baseLineHeight;
@@ -116,7 +120,7 @@
 }
 
 // Fixed navbar
-.navbar-fixed {
+.navbar-fixed-top {
   position: fixed;
   top: 0;
   right: 0;
@@ -125,7 +129,6 @@
 }
 
 
-
 // NAVIGATION
 // ----------
 
@@ -149,33 +152,33 @@
   float: none;
   padding: 10px 10px 11px;
   line-height: 19px;
-  color: @grayLight;
+  color: @navbarLinkColor;
   text-decoration: none;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 }
 // Hover
 .navbar .nav > li > a:hover {
   background-color: transparent;
-  color: @white;
+  color: @navbarLinkColorHover;
   text-decoration: none;
 }
 
 // Active nav items
 .navbar .nav .active > a {
-  color: @white;
+  color: @navbarLinkColorHover;
   text-decoration: none;
-  background-color: @grayDarker;
+  background-color: @navbarBackground;
   background-color: rgba(0,0,0,.5);
 }
 
 // Dividers (basically a vertical hr)
 .navbar .vertical-divider {
-  height: 40px;
+  height: @navbarHeight;
   width: 1px;
   margin: 0 5px;
   overflow: hidden;
-  background-color: @grayDarker;
-  border-right: 1px solid #444;
+  background-color: @navbarBackground;
+  border-right: 1px solid @navbarBackgroundHighlight;
 }
 
 // Secondary (floated right) nav in topbar
diff --git a/less/responsive.less b/less/responsive.less
index 2999eef4d..917fdc3e2 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -175,6 +175,8 @@
   // 16cols at 30px wide with 16px gutters
   .container {
     width: @siteWidth;
+    padding-left: 10px;
+    padding-right: 10px;
   }
 
   // Default columns
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 3c1826830..d8b3f56ab 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -22,8 +22,8 @@ body {
 a {
   color: @linkColor;
   text-decoration: none;
-  &:hover {
-    color: @linkColorHover;
-    text-decoration: underline;
-  }
+}
+a:hover {
+  color: @linkColorHover;
+  text-decoration: underline;
 }
diff --git a/less/variables.less b/less/variables.less
index 5ed896cc0..4265d7ed3 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -70,21 +70,25 @@
 @navbarBackground:                @grayDarker;
 @navbarBackgroundHighlight:       @grayDark;
 
+@navbarText:                      @grayLight;
+@navbarLinkColor:                 @grayLight;
+@navbarLinkColorHover:            @white;
+
 // Form states and alerts
 @warningText:             #c09853;
 @warningBackground:       #fcf8e3;
-@warningBorder:           #f3edd2;
+@warningBorder:           darken(spin(@warningBackground, -10), 3%);
 
 @errorText:               #b94a48;
 @errorBackground:         #f2dede;
-@errorBorder:             #e9c7c7;
+@errorBorder:             darken(spin(@errorBackground, -10), 3%);
 
 @successText:             #468847;
 @successBackground:       #dff0d8;
-@successBorder:           #cfe8c4;
+@successBorder:           darken(spin(@successBackground, -10), 5%);
 
 @infoText:                #3a87ad;
 @infoBackground:          #d9edf7;
-@infoBorder:              #bfe1f2;
+@infoBorder:              darken(spin(@infoBackground, -10), 7%);
 
 
-- 
cgit v1.2.3


From faa719d59c45eb05a7e77db311d7bb277341f85d Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Fri, 27 Jan 2012 16:35:21 -0500
Subject: Fixes left/right border overlap for IE7

---
 less/navs.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/less/navs.less b/less/navs.less
index cd356d9bb..f1d5b565c 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -317,6 +317,7 @@
 .tabs-left .tabs .active > a,
 .tabs-left .tabs .active > a:hover {
   border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: @white;
 }
 
 // Tabs on the right
@@ -335,4 +336,5 @@
 .tabs-right .tabs .active > a,
 .tabs-right .tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: @white;
 }
-- 
cgit v1.2.3


From a0b40b361a59987c98688fafae05d2eb68b659db Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 13:35:25 -0800
Subject: i18n download page

---
 docs/assets/css/bootstrap.css          |   2 +-
 docs/download.html                     |  11 +--
 docs/templates/pages/download.mustache | 147 ++++++++++++++++-----------------
 3 files changed, 75 insertions(+), 85 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 4f1e18ce9..6c630c35e 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Fri Jan 27 13:20:51 PST 2012
+ * Date: Fri Jan 27 13:35:16 PST 2012
  */
 article,
 aside,
diff --git a/docs/download.html b/docs/download.html
index 458b5caa0..0a433be54 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -63,10 +63,6 @@
 
     
        
 
-
        
-  Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
-
        
-
 
 
        
@@ -134,9 +130,9 @@
       
       
     
        
   
        
@@ -308,7 +304,6 @@
   
        
     
        
       4. Download
-      
     
        
   
        
   
        
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 2a8e46a8a..dccc5fbb6 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -1,7 +1,3 @@
-
        
-  Heads up! This page is still under construction and is missing plenty of documentation. Hang tight!
-
        
-
 
 
        
@@ -19,59 +15,59 @@
 
 
        
   
        
-    Toggle all
+    {{_i}}Toggle all{{/i}}
     
        
-      1. Chose components
-      Get just the CSS you need
+      {{_i}}1. Chose components{{/i}}
+      {{_i}}Get just the CSS you need{{/i}}
     
        
   
        
   
        
     
        
-      
        Scaffolding
        
-      
-      
-      
-      
        Base CSS
        
-      
-      
-      
-      
-      
-      
-      
+      
        {{_i}}Scaffolding{{/i}}
        
+      
+      
+      
+      
        {{_i}}Base CSS{{/i}}
        
+      
+      
+      
+      
+      
+      
+      
     
        
     
        
-      
        Components
        
-      
-      
-      
-      
-      
-      
-      
-      
-      
+      
        {{_i}}Components{{/i}}
        
+      
+      
+      
+      
+      
+      
+      
+      
+      
     
        
     
        
-      
        JS Components
        
-      
-      
-      
-      
-      
-      
+      
        {{_i}}JS Components{{/i}}
        
+      
+      
+      
+      
+      
+      
     
        
     
        
-      
        Miscellaneous
        
-      
-      
-      
-      
+      
        {{_i}}Miscellaneous{{/i}}
        
+      
+      
+      
+      
       
     
        
   
        
@@ -79,67 +75,67 @@
 
 
        
   
        
-    Toggle all
+    {{_i}}Toggle all{{/i}}
     
        
-      2. Select jQuery plugins
-      Quickly add only the necessary javascript
+      {{_i}}2. Select jQuery plugins{{/i}}
+      {{_i}}Quickly add only the necessary javascript{{/i}}
     
        
   
        
   
        
     
        
       
       
       
       
       
       
     
        
     
        
       
       
       
       
       
       
     
        
     
        
-      
        Heads up!
        
+      
        {{_i}}Heads up!{{/i}}
        
       
        {{_i}}All plugins require the latest version of jQuery to be included.{{/i}}
        
     
        
   
        
@@ -148,20 +144,20 @@
 
 
        
   
        
-    Reset to defaults
+    {{_i}}Reset to defaults{{/i}}
     
        
-      3. Customize variables
-      Optionally modify Bootstrap without a compiler
+      {{_i}}3. Customize variables{{/i}}
+      {{_i}}Optionally modify Bootstrap without a compiler{{/i}}
     
        
   
        
   
        
     
        
-      
        Links
        
+      
        {{_i}}Links{{/i}}
        
       
       
       
       
-      
        Colors
        
+      
        {{_i}}Colors{{/i}}
        
       
       
       
@@ -178,7 +174,7 @@
       
     
        
     
        
-      
        Grid system
        
+      
        {{_i}}Grid system{{/i}}
        
       
       
       
@@ -189,7 +185,7 @@
       
       
       
-      
        Typography
        
+      
        {{_i}}Typography{{/i}}
        
       
       
       
@@ -198,12 +194,12 @@
       
     
        
     
        
-      
        Forms
        
+      
        {{_i}}Forms{{/i}}
        
       
       
       
       
-      
        Navbar
        
+      
        {{_i}}Navbar{{/i}}
        
       
       
       
@@ -218,7 +214,7 @@
       
     
        
     
        
-      
        Form states & alerts
        
+      
        {{_i}}Form states & alerts{{/i}}
        
       
       
       
@@ -242,13 +238,12 @@
 
        
   
        
     
        
-      4. Download
-      
+      {{_i}}4. Download{{/i}}
     
        
   
        
   
        
-    Customize and Download
-    
        What's included?
        
-    
        Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.
        
+    {{_i}}Customize and Download{{/i}}
+    
        {{_i}}What's included?{{/i}}
        
+    
        {{_i}}Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.{{/i}}
        
   
        
 
        
-- 
cgit v1.2.3


From a1fc352cc2b8e94557c1414178a59c73a6c3b849 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Thu, 26 Jan 2012 17:03:15 -0500
Subject: Changes non-transparent navbar search box color to match transparent
 one better

---
 less/navbar.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/less/navbar.less b/less/navbar.less
index dba95e5cd..bdd71a1b1 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -74,7 +74,7 @@
     #font > .sans-serif(13px, normal, 1);
     color: @white;
     color: rgba(255,255,255,.75);
-    background: #444;
+    background: #6a6a6a;
     background: rgba(255,255,255,.3);
     border: 1px solid #111;
     @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
-- 
cgit v1.2.3


From d7b8a9c9303f1f1bd69ae02f74bb17aaa87a2ceb Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 13:36:08 -0800
Subject: align text in buttons so folks can easily make them different widths

---
 docs/assets/css/bootstrap.css | 3 ++-
 less/buttons.less             | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 6c630c35e..9c8aaee5a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Fri Jan 27 13:35:16 PST 2012
+ * Date: Fri Jan 27 13:35:54 PST 2012
  */
 article,
 aside,
@@ -2461,6 +2461,7 @@ table .span12 {
   font-size: 13px;
   line-height: 18px;
   color: #333333;
+  text-align: center;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
   background-color: #fafafa;
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
diff --git a/less/buttons.less b/less/buttons.less
index f18cf9d95..08620a3c3 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -77,6 +77,7 @@
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
   color: @grayDark;
+  text-align: center;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
   border: 1px solid #ccc;
-- 
cgit v1.2.3


From 6fd1e9f4c0903ae4ff4f57bd3cb193ee0ed2b9ad Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Fri, 27 Jan 2012 13:36:31 -0800
Subject: rebuil update layout

---
 docs/assets/css/bootstrap.css       |  4 ++--
 docs/base-css.html                  |  2 +-
 docs/components.html                |  2 +-
 docs/download.html                  |  2 +-
 docs/examples.html                  |  2 +-
 docs/index.html                     |  4 ++--
 docs/javascript.html                |  2 +-
 docs/less.html                      |  2 +-
 docs/scaffolding.html               |  2 +-
 docs/templates/layout.mustache      | 22 +++++++++++-----------
 docs/templates/pages/index.mustache |  2 +-
 docs/upgrading.html                 |  2 +-
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 4f1e18ce9..b365ad0f4 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Fri Jan 27 13:20:51 PST 2012
+ * Date: Fri Jan 27 13:34:19 PST 2012
  */
 article,
 aside,
@@ -1842,7 +1842,7 @@ table .span12 {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
diff --git a/docs/base-css.html b/docs/base-css.html
index 2cab601df..cd06c6118 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -54,7 +54,7 @@
               Using LESS
             
             
      • 
-              Download
+              Customize
             
        • 
           
         
        
diff --git a/docs/components.html b/docs/components.html
index 7efa889b8..cf5fcb928 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -54,7 +54,7 @@
               Using LESS
             
             
      • 
-              Download
+              Customize
             
        • 
           
         
        
diff --git a/docs/download.html b/docs/download.html
index 458b5caa0..e1eb9a3a8 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -54,7 +54,7 @@
               Using LESS
             
             
      • 
-              Download
+              Customize
             
        • 
           
         
        
diff --git a/docs/examples.html b/docs/examples.html
index 3416ea6f2..78d9c588e 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -54,7 +54,7 @@
               Using LESS
             
             
      • 
-              Download
+              Customize
             
        • 
           
         
        
diff --git a/docs/index.html b/docs/index.html
index 4dd21b3fa..1459da26c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -54,7 +54,7 @@
               Using LESS
             
             
      • 
-              Download
+              Customize
             
        • 
           
         
        
@@ -73,7 +73,7 @@
             
        Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
        
             
        
               View project on GitHub
-              Customize and Download
+              Download Bootstrap
             
        
             
        
               
        Feature highlights
        
diff --git a/docs/javascript.html b/docs/javascript.html
index cf9a1742d..24de47157 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -54,7 +54,7 @@
               Using LESS
             
             
      • 
-              Download
+              Customize
             
        • 
           
         
        
diff --git a/docs/less.html b/docs/less.html
index 33ebc8276..8e3e8e655 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -54,7 +54,7 @@
               Using LESS
             
             
      • 
-              Download
+              Customize
             
        • 
           
         
        
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index eed2d7112..91ef9556f 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -54,7 +54,7 @@
               Using LESS
             
             
      • 
-              Download
+              Customize
             
        • 
           
         
        
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 4a016e4d1..46e3d03d6 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -36,25 +36,25 @@
           Bootstrap
           
         
        
@@ -69,10 +69,10 @@
      
       
 
     
        
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 96477f0ca..5eb2774ab 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -8,7 +8,7 @@
             
        Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
        
             
        
               {{_i}}View project on GitHub{{/i}}
-              {{_i}}Customize and Download{{/i}}
+              {{_i}}Download Bootstrap{{/i}}
             
        
             
        
               
        {{_i}}Feature highlights{{/i}}
        
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 779bf7165..041aaccc5 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -54,7 +54,7 @@
               Using LESS
             
             
      • 
-              Download
+              Customize
             
        • 
           
         
        
-- 
cgit v1.2.3


From b1f38bbea85c313f1a9512c821de1255e2a0d537 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 13:39:19 -0800
Subject: update icon examples to show icons in differently sized buttons

---
 docs/assets/css/bootstrap.css          | 2 +-
 docs/base-css.html                     | 4 ++++
 docs/templates/pages/base-css.mustache | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9c8aaee5a..0783aa7ee 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Fri Jan 27 13:35:54 PST 2012
+ * Date: Fri Jan 27 13:38:50 PST 2012
  */
 article,
 aside,
diff --git a/docs/base-css.html b/docs/base-css.html
index 2cab601df..7968c70b3 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1477,6 +1477,10 @@
           
         
        
       
        
+      
        
+         Refresh
+         Settings
+      
        
     
        
     
        
       
        Or, use them in navigation.
        
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c3d10eb08..cf3e88c98 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1412,6 +1412,10 @@
           
         
        
       
        
+      
        
+         {{_i}}Refresh{{/i}}
+         {{_i}}Settings{{/i}}
+      
        
     
        
     
        
       
        {{_i}}Or, use them in navigation.{{/i}}
        
-- 
cgit v1.2.3


From 1c9db106fadd544d8af93a60c128842f95724f03 Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Fri, 27 Jan 2012 16:39:27 -0500
Subject: Moves buttonBackground to mixins (issue 1292)

---
 less/buttons.less | 25 -------------------------
 less/mixins.less  | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/less/buttons.less b/less/buttons.less
index 06a7d91bd..843af6c62 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -35,31 +35,6 @@
   }
 }
 
-
-// Mixin for generating button backgrounds
-// ---------------------------------------
-.buttonBackground(@startColor, @endColor) {
-  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
-  .gradientBar(@startColor, @endColor);
-
-  // in these cases the gradient won't cover the background, so we override
-  &:hover, &:active, &.active, &.disabled {
-    background-color: @endColor;
-  }
-
-  // called out separately because IE8 would ignore otherwise
-  &[disabled] {
-    background-color: @endColor;
-  }
-
-  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
-  &:active,
-  &.active {
-    background-color: darken(@endColor, 10%) e("\9");
-  }
-}
-
-
 // Base styles
 // -----------
 
diff --git a/less/mixins.less b/less/mixins.less
index 745fe33d9..bbbba1e02 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -339,6 +339,29 @@
 }
 
 
+// Mixin for generating button backgrounds
+// ---------------------------------------
+.buttonBackground(@startColor, @endColor) {
+  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
+  .gradientBar(@startColor, @endColor);
+
+  // in these cases the gradient won't cover the background, so we override
+  &:hover, &:active, &.active, &.disabled {
+    background-color: @endColor;
+  }
+
+  // called out separately because IE8 would ignore otherwise
+  &[disabled] {
+    background-color: @endColor;
+  }
+
+  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
+  &:active,
+  &.active {
+    background-color: darken(@endColor, 10%) e("\9");
+  }
+}
+
 
 // COMPONENT MIXINS
 // --------------------------------------------------
-- 
cgit v1.2.3


From 84b9a1bfb6ff5d1406f5c0393d6556caff6de40c Mon Sep 17 00:00:00 2001
From: Pete Hopkins 
Date: Fri, 27 Jan 2012 16:39:38 -0500
Subject: Rebuild css and html

---
 docs/assets/css/bootstrap.css | 58 +++++++++++++++++++++++++++++++++++++------
 docs/base-css.html            |  7 ++++++
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b2284bc16..e36ec0b3c 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Fri Jan 27 11:07:13 PST 2012
+ * Date: Fri Jan 27 16:39:29 EST 2012
  */
 article,
 aside,
@@ -814,6 +814,10 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 }
 .help-inline {
   display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
   margin-bottom: 9px;
   vertical-align: middle;
   padding-left: 5px;
@@ -1083,6 +1087,10 @@ table .span12 {
   vertical-align: text-top;
   width: 14px;
   height: 14px;
+  *margin-right: .3em;
+}
+.icon:last-child {
+  *margin-left: 0;
 }
 .icon.white {
   background-image: url(../img/glyphicons-halflings-sprite-white.png);
@@ -1360,11 +1368,15 @@ table .span12 {
 .dropdown {
   position: relative;
 }
+.dropdown .dropdown-toggle {
+  *margin-bottom: -3px;
+}
 .caret {
   display: inline-block;
   width: 0;
   height: 0;
   text-indent: -99999px;
+  *text-indent: 0;
   vertical-align: top;
   border-left: 4px solid transparent;
   border-right: 4px solid transparent;
@@ -1376,7 +1388,6 @@ table .span12 {
 .dropdown .caret {
   margin-top: 8px;
   margin-left: 2px;
-  *margin-top: 7px;
 }
 .dropdown:hover .caret, .open.dropdown .caret {
   opacity: 1;
@@ -1385,6 +1396,7 @@ table .span12 {
 .dropdown-menu {
   position: absolute;
   top: 100%;
+  left: 0;
   z-index: 1000;
   float: left;
   display: none;
@@ -1408,7 +1420,6 @@ table .span12 {
   -webkit-background-clip: padding-box;
   -moz-background-clip: padding;
   background-clip: padding-box;
-  zoom: 1;
   *border-right-width: 2px;
   *border-bottom-width: 2px;
 }
@@ -1423,6 +1434,8 @@ table .span12 {
   overflow: hidden;
   background-color: #e5e5e5;
   border-bottom: 1px solid #ffffff;
+  *width: 100%;
+  *margin: -5px 0 5px;
 }
 .dropdown-menu a {
   display: block;
@@ -1438,6 +1451,9 @@ table .span12 {
   text-decoration: none;
   background-color: #0088cc;
 }
+.dropdown.open {
+  *z-index: 1000;
+}
 .dropdown.open .dropdown-toggle {
   color: #ffffff;
   background: #ccc;
@@ -1742,6 +1758,7 @@ table .span12 {
 }
 .tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover {
   border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: #ffffff;
 }
 .tabs-right .tabs {
   float: right;
@@ -1759,6 +1776,7 @@ table .span12 {
 }
 .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: #ffffff;
 }
 .navbar {
   overflow: visible;
@@ -1826,7 +1844,7 @@ table .span12 {
   line-height: 1;
   color: #ffffff;
   color: rgba(255, 255, 255, 0.75);
-  background: #444;
+  background: #6a6a6a;
   background: rgba(255, 255, 255, 0.3);
   border: 1px solid #111;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
@@ -2455,8 +2473,6 @@ table .span12 {
 .btn {
   display: inline-block;
   padding: 4px 10px 4px;
-  *padding: 2px 10px;
-  *margin-left: 4px;
   font-size: 13px;
   line-height: 18px;
   color: #333333;
@@ -2478,6 +2494,7 @@ table .span12 {
   -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);
   cursor: pointer;
+  *margin-left: .3em;
 }
 .btn:first-child {
   *margin-left: 0;
@@ -2525,7 +2542,7 @@ table .span12 {
   box-shadow: none;
 }
 .btn.large {
-  padding: 9px 14px 9px;
+  padding: 9px 14px;
   font-size: 15px;
   line-height: normal;
   -webkit-border-radius: 5px;
@@ -2536,20 +2553,33 @@ table .span12 {
   margin-top: 1px;
 }
 .btn.small {
-  padding: 5px 9px 5px;
+  padding: 5px 9px;
   font-size: 11px;
   line-height: 16px;
 }
 .btn.small .icon {
   margin-top: -2px;
 }
+button.btn, input[type=submit].btn {
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+}
 button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   padding: 0;
   border: 0;
 }
+button.btn.large, input[type=submit].btn.large {
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+button.btn.small, input[type=submit].btn.small {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
 .btn-group {
   position: relative;
   *zoom: 1;
+  *margin-left: .3em;
 }
 .btn-group:before, .btn-group:after {
   display: table;
@@ -2558,11 +2588,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 .btn-group:after {
   clear: both;
 }
+.btn-group:first-child {
+  *margin-left: 0;
+}
 .btn-group + .btn-group {
   margin-left: 5px;
 }
 .btn-toolbar .btn-group {
   display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
 }
 .btn-group .btn {
   position: relative;
@@ -2615,6 +2652,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  *padding-top: 5px;
+  *padding-bottom: 5px;
+}
+.btn-group.open {
+  *z-index: 1000;
 }
 .btn-group.open .dropdown-menu {
   display: block;
diff --git a/docs/base-css.html b/docs/base-css.html
index 9cad9de01..d1399aaff 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1034,6 +1034,12 @@
               
             
        
           
        
+          
        
+            
+            
        
+              Some value here
+            
        
+          
        
           
        
             
             
        
@@ -1491,6 +1497,7 @@
   
        
 
 
+
      
       
        
-- 
cgit v1.2.3


From 3807a88ee9ba33f27bc8762efd789f7ff710ed1a Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 13:56:50 -0800
Subject: update the docs for icons

---
 docs/assets/css/bootstrap.css          | 28 ++++++++++++++--------------
 docs/base-css.html                     |  9 +++++++--
 docs/templates/pages/base-css.mustache |  9 +++++++--
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index cf2f1b59f..10faa36c0 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Fri Jan 27 13:43:19 PST 2012
+ * Date: Fri Jan 27 13:54:49 PST 2012
  */
 article,
 aside,
@@ -1088,7 +1088,7 @@ table .span12 {
   background-image: url(../img/glyphicons-halflings-white.png);
 }
 .icon.glass {
-  background-position: 0 0;
+  background-position: 0      0;
 }
 .icon.music {
   background-position: -24px 0;
@@ -1327,23 +1327,20 @@ table .span12 {
 .icon.chevron-right {
   background-position: -456px -72px;
 }
-.icon.arrow-left {
-  background-position: -240px -96px;
-}
 .icon.plus-sign {
   background-position: 0 -96px;
 }
 .icon.minus-sign {
-  background-position: -24px  -96px;
+  background-position: -24px -96px;
 }
 .icon.remove-sign {
-  background-position: -48px  -96px;
+  background-position: -48px -96px;
 }
 .icon.ok-sign {
-  background-position: -72px  -96px;
+  background-position: -72px -96px;
 }
 .icon.question-sign {
-  background-position: -96px  -96px;
+  background-position: -96px -96px;
 }
 .icon.info-sign {
   background-position: -120px -96px;
@@ -1360,6 +1357,9 @@ table .span12 {
 .icon.ban-circle {
   background-position: -216px -96px;
 }
+.icon.arrow-left {
+  background-position: -240px -96px;
+}
 .icon.arrow-right {
   background-position: -264px -96px;
 }
@@ -1391,16 +1391,16 @@ table .span12 {
   background-position: 0 -120px;
 }
 .icon.gift {
-  background-position: -24px  -120px;
+  background-position: -24px -120px;
 }
 .icon.leaf {
-  background-position: -48px  -120px;
+  background-position: -48px -120px;
 }
 .icon.fire {
-  background-position: -72px  -120px;
+  background-position: -72px -120px;
 }
 .icon.eye-open {
-  background-position: -96px  -120px;
+  background-position: -96px -120px;
 }
 .icon.eye-close {
   background-position: -120px -120px;
@@ -1439,7 +1439,7 @@ table .span12 {
   background-position: -384px -120px;
 }
 .icon.folder-open {
-  background-position: -409px -120px;
+  background-position: -408px -120px;
 }
 .icon.resize-vertical {
   background-position: -432px -119px;
diff --git a/docs/base-css.html b/docs/base-css.html
index fa22216ef..698b68ea1 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1454,7 +1454,7 @@
     
        
   
        
   
        
-    Heads up! On hover we show a light red background color to highlight the size of the icon. This won't appear in normal usage of icons.
+    Heads up! Icon classes are echoed via CSS :after and on hover in the docs we show a light red background color show the icon's size.
   
        
 
   
        
@@ -1470,6 +1470,10 @@
       
        With v2.0.0, we have opted to use an <i> tag for all our icons with a base class of .icon. To use, place the following code just about anywhere:
        
 
         <i class="icon search"></i>
+
        
+      
        There are also styles available for inverted (white) icons, made ready with one extra class:
        
+
        +<i class="icon white search"></i>
 
        
       
        There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
        
     
        
@@ -1488,10 +1492,11 @@
 
   
        Examples
        
   
        
-    
        
+    
        
       
        Use them in buttons, or in button groups for a toolbar style presentation.
        
       
        
          Refresh
+         Checkout
          Delete
       
        
       
        
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 45d359784..f6504a249 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1389,7 +1389,7 @@
     
        
   
        
   
        
-    {{_i}}Heads up! On hover we show a light red background color to highlight the size of the icon. This won't appear in normal usage of icons.{{/i}}
+    {{_i}}Heads up! Icon classes are echoed via CSS :after and on hover in the docs we show a light red background color show the icon's size.{{/i}}
   
        
 
   
        
@@ -1405,6 +1405,10 @@
       
        {{_i}}With v2.0.0, we have opted to use an <i> tag for all our icons with a base class of .icon. To use, place the following code just about anywhere:{{/i}}
        
 
         <i class="icon search"></i>
+
        
+      
        There are also styles available for inverted (white) icons, made ready with one extra class:
        
+
        +<i class="icon white search"></i>
 
        
       
        {{_i}}There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.{{/i}}
        
     
        
@@ -1423,10 +1427,11 @@
 
   
        {{_i}}Examples{{/i}}
        
   
        
-    
        
+    
        
       
        {{_i}}Use them in buttons, or in button groups for a toolbar style presentation.{{/i}}
        
       
        
          {{_i}}Refresh{{/i}}
+         {{_i}}Checkout{{/i}}
          {{_i}}Delete{{/i}}
       
        
       
        
-- 
cgit v1.2.3


From 6353e5070ae429297bdfb215f17093e4ccbc08f2 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 14:03:36 -0800
Subject: remove unused images from docs assets

---
 docs/assets/img/glyphicons-halflings-white.png | Bin 4352 -> 0 bytes
 docs/assets/img/glyphicons-halflings.png       | Bin 4352 -> 0 bytes
 docs/assets/img/grid-18px.png                  | Bin 166 -> 0 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 docs/assets/img/glyphicons-halflings-white.png
 delete mode 100644 docs/assets/img/glyphicons-halflings.png
 delete mode 100644 docs/assets/img/grid-18px.png

diff --git a/docs/assets/img/glyphicons-halflings-white.png b/docs/assets/img/glyphicons-halflings-white.png
deleted file mode 100644
index a20760bfd..000000000
Binary files a/docs/assets/img/glyphicons-halflings-white.png and /dev/null differ
diff --git a/docs/assets/img/glyphicons-halflings.png b/docs/assets/img/glyphicons-halflings.png
deleted file mode 100644
index 92d4445df..000000000
Binary files a/docs/assets/img/glyphicons-halflings.png and /dev/null differ
diff --git a/docs/assets/img/grid-18px.png b/docs/assets/img/grid-18px.png
deleted file mode 100644
index b2f88799b..000000000
Binary files a/docs/assets/img/grid-18px.png and /dev/null differ
-- 
cgit v1.2.3


From 003da1e089edf06c528667009fb59189b5f0e4cc Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 27 Jan 2012 14:21:17 -0800
Subject: fix inputs in navbar

---
 docs/assets/css/bootstrap.css | 3 ++-
 examples/container-app.html   | 4 ++--
 less/navbar.less              | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 10faa36c0..5ebfba675 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.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: Fri Jan 27 13:54:49 PST 2012
+ * Date: Fri Jan 27 14:21:03 PST 2012
  */
 article,
 aside,
@@ -1901,6 +1901,7 @@ table .span12 {
 }
 .navbar-form input, .navbar-form select {
   display: inline-block;
+  margin-top: 5px;
   margin-bottom: 0;
 }
 .navbar-search {
diff --git a/examples/container-app.html b/examples/container-app.html
index 9bf651753..df0e8dba4 100644
--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -12,7 +12,7 @@
     
 
     
-    
+    
     
+    
 
     
     
@@ -31,12 +33,19 @@
     
        
       
        
         
        
+          
+            
+            
+            
+          
           Project name
-          
+          
        
+            
+          
        
         
        
       
        
     
        
@@ -46,7 +55,7 @@
       
       
        
         
        Hello, world!
        
-        
        Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
        
+        
        This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.
        
         
        Learn more »
        
       
        
 
@@ -69,11 +78,20 @@
         
        
       
        
 
+      
        
+
       
        
         
        © Company 2012
        
       
        
 
     
         
 
+    
+    
+    
+    
+    
+
   
 
-- 
cgit v1.2.3


From 48529ad01fa2a60bfc9179743dcb5379e8ff944f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:06:57 -0800
Subject: last minute addition of a simple fluid grid for our fluid examples;
 it needs work, so we're not documenting it now

---
 docs/assets/css/bootstrap-responsive.css  | 101 ++++++++++++++++-
 docs/assets/css/bootstrap.css             |  76 ++++++++-----
 docs/scaffolding.html                     |   1 -
 docs/templates/pages/scaffolding.mustache |   1 -
 examples/fluid.html                       | 180 ++++++++++++++++--------------
 less/grid.less                            |  73 +++++++++++-
 less/layouts.less                         |  30 +----
 less/mixins.less                          |  21 +---
 less/responsive.less                      |  93 +++++++++++++--
 less/variables.less                       |   9 --
 10 files changed, 398 insertions(+), 187 deletions(-)

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index ca03cecde..44e0125c1 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -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%;
   }
 }
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c96818a56..60383fba0 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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;
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 184b35608..b00f5630b 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -124,7 +124,6 @@
   
        
     
        12
        
   
        
-
   
        
     
        
       
        The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.
        
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 6d5a66f8d..239d15265 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -52,7 +52,6 @@
   
        
     
        12
        
   
        
-
   
        
     
        
       
        {{_i}}The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.{{/i}}
        
diff --git a/examples/fluid.html b/examples/fluid.html
index ce2d3b628..1cdfd6568 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -16,8 +16,13 @@
     
+    
 
     
     
@@ -30,98 +35,107 @@
 
     
        
       
        
-        
        
+        
        
+          
+            
+            
+            
+          
           Project name
-          
-          
        Logged in as username
        
+          
        
+            
+            
        Logged in as username
        
+          
        
         
        
       
        
     
        
 
-    
        
-      
        
-        
        
-          
          
-            
        • Sidebar
          • 
-            
        • Link
          • 
-            
        • Link
          • 
-            
        • Link
          • 
-            
        • Link
          • 
+    
          
+      
          
+        
          
+          
          
+            
+          
                  
+        
          
+        
          
+          
          
+            
          Hello, world!
          
+            
          This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.
          
+            
          Learn more »
          
+          
          
+          
          
+            
          
+              
          Heading
          
+              
          Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
          
+              
          View details »
          
+            
          
+            
          
+              
          Heading
          
+              
          Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
          
+              
          View details »
          
+            
          
+            
          
+              
          Heading
          
+              
          Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
          
+              
          View details »
          
+            
          
+          
          
+          
          
+            
          
+              
          Heading
          
+              
          Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
          
+              
          View details »
          
+            
          
+            
          
+              
          Heading
          
+              
          Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
          
+              
          View details »
          
+            
          
+            
          
+              
          Heading
          
+              
          Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
          
+              
          View details »
          
+            
          
+          
          
+        
          
+      
          
 
-            
        • Sidebar
          • 
-            
        • Link
          • 
-            
        • Link
          • 
-            
        • Link
          • 
-            
        • Link
          • 
-            
        • Link
          • 
-            
        • Link
          • 
+      
          
 
-            
        • Sidebar
          • 
-            
        • Link
          • 
-            
        • Link
          • 
-            
        • Link
          • 
-          
        
-        
        
-      
        
-      
        
-        
-        
        
-          
        Hello, world!
        
-          
        Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
        
-          
        Learn more »
        
-        
        
-
-        
-        
        
-          
        
-            
        Heading
        
-           
        Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
        
-            
        View details »
        
-          
        
-          
        
-            
        Heading
        
-             
        Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
        
-            
        View details »
        
-         
        
-          
        
-            
        Heading
        
-            
        Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
        
-            
        View details »
        
-          
        
-        
        
+      
        
+        
        © Company 2012
        
+      
        
 
-        
        
+    
        
 
-        
-        
        
-          
        
-            
        Heading
        
-           
        Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
        
-            
        View details »
        
-          
        
-          
        
-            
        Heading
        
-             
        Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
        
-            
        View details »
        
-         
        
-          
        
-            
        Heading
        
-            
        Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
        
-            
        View details »
        
-          
        
-        
        
 
-        
        
-        
-        
        
-          
        © Company 2012
        
-        
        
-      
        
-    
        
+    
+    
+    
+    
+    
 
   
-
\ No newline at end of file
+
diff --git a/less/grid.less b/less/grid.less
index d5b5f487d..4493d0b95 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -1,14 +1,40 @@
 // GRID SYSTEM
 // -----------
-// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
+
+
+// Default grid sizing
+// -------------------
+@gridColumns:           12;
+@gridColumnWidth:       60px;
+@gridGutterWidth:       20px;
+
+@gridRowWidth:          (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+@gridTotalWidth:        @gridRowWidth;
+
+
+// Columns and offseting mixins
+// ----------------------------
+.columns(@columns: 1) {
+  //width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+  width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/@gridRowWidth);
+}
+.offset(@columns: 1) {
+  margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+}
+// Necessary grid styles for every column to make them appear next to each other horizontally
+.gridColumn() {
+  float: left;
+  margin-left: @gridGutterWidth;
+}
+
+// Grid rows and columns
+// ---------------------
 .row {
   margin-left: @gridGutterWidth * -1;
   .clearfix();
 }
 
-// Find all .span# classes within .row and give them the necessary properties for grid columns 
-// (supported by all browsers back to IE7)
-// Credit to @dhg for the idea
+// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg)
 [class*="span"] {
   .gridColumn();
 }
@@ -39,3 +65,42 @@
 .offset9   { .offset(9); }
 .offset10  { .offset(10); }
 .offset11  { .offset(11); }
+
+
+
+// FLUID GRID SYSTEM
+// -----------------
+// This is a very early and limited fluid grid system for now and will not be documented until it's refined in v2.1.
+
+.row-fluid {
+  @gridColumnWidth: 6.382978723%;
+  @gridGutterWidth: 2.127659574%;
+
+  width: 100% * ((@gridGutterWidth + @gridRowWidth)/@gridRowWidth);
+  margin-left: 0 - @gridGutterWidth;
+
+  // Redeclare the mixins
+  .gridColumn() {
+    float: left;
+    margin-left: @gridGutterWidth;
+  } 
+  [class*="span"] {
+    .gridColumn();
+  }
+  .fluidColumns(@columns: 1) {
+    width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/(@gridRowWidth+@gridGutterWidth));
+  }
+  // Redeclare the columns
+  .span1     { .fluidColumns(1); }
+  .span2     { .fluidColumns(2); }
+  .span3     { .fluidColumns(3); }
+  .span4     { .fluidColumns(4); }
+  .span5     { .fluidColumns(5); }
+  .span6     { .fluidColumns(6); }
+  .span7     { .fluidColumns(7); }
+  .span8     { .fluidColumns(8); }
+  .span9     { .fluidColumns(9); }
+  .span10    { .fluidColumns(10); }
+  .span11    { .fluidColumns(11); }
+  .span12    { .fluidColumns(12); }
+}
diff --git a/less/layouts.less b/less/layouts.less
index 14435c9d1..c8d358b24 100644
--- a/less/layouts.less
+++ b/less/layouts.less
@@ -10,34 +10,8 @@
 }
 
 // Fluid layouts (left aligned, with sidebar, min- & max-width content)
-.fluid-container {
-  position: relative;
-  min-width: @siteWidth;
+.container-fluid {
   padding-left: @gridGutterWidth;
   padding-right: @gridGutterWidth;
   .clearfix();
-}
-
-// Sidebars (left and right options)
-.fluid-sidebar {
-  width: @fluidSidebarWidth;
-  margin: 0 20px 18px;
-}
-.sidebar-left   { padding-left: @fluidSidebarWidth + @gridGutterWidth * 2; }
-.sidebar-right  { padding-right: @fluidSidebarWidth + @gridGutterWidth * 2; }
-
-// Float the sidebars accordingly
-.sidebar-left .fluid-sidebar {
-  float: left;
-  margin-left: (@fluidSidebarWidth + @gridGutterWidth) * -1;
-}
-.sidebar-right .fluid-sidebar {
-  float: right;
-  margin-right: (@fluidSidebarWidth + @gridGutterWidth) * -1;
-}
-
-// The main content area
-.fluid-content {
-  float: left;
-  width: 100%;
-}
+}
\ No newline at end of file
diff --git a/less/mixins.less b/less/mixins.less
index 2bfcd053e..2d0e2d4c0 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -133,31 +133,12 @@
 // Site container
 // -------------------------
 .container-fixed() {
-  width: @siteWidth;
+  width: @gridTotalWidth;
   margin-left: auto;
   margin-right: auto;
   .clearfix();
 }
 
-// Columns and offseting
-// -------------------------
-.columns(@columns: 1) {
-  width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-}
-.offset(@columns: 1) {
-  margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
-}
-// Necessary grid styles for every column to make them appear next to each other horizontally
-.gridColumn() {
-  float: left;
-  margin-left: @gridGutterWidth;
-}
-// makeColumn can be used to mark any element (e.g., .content-primary) as a column without changing markup to .span something
-.makeColumn(@columnSpan: 1) {
-  .gridColumn();
-  .columns(@columnSpan);
-}
-
 
 
 // CSS3 PROPERTIES
diff --git a/less/responsive.less b/less/responsive.less
index db2675e3d..107fa7dd7 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -115,6 +115,10 @@
     width: auto;
     padding: 0 20px;
   }
+  // Fluid rows
+  .row-fluid {
+    width: 100%;
+  }
   // Undo negative margin on rows
   .row {
     margin-left: 0;
@@ -182,6 +186,42 @@
   .offset10  { .offset(10); }
   .offset11  { .offset(11); }
 
+  // FLUID GRID
+  // ----------
+  .row-fluid {
+    @gridColumnWidth:     5.801104972%;
+    @gridGutterWidth:     2.762430939%;
+    @gridRowWidth:        (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+    @gridTotalWidth:      @gridRowWidth;
+
+    width: 100% * ((@gridGutterWidth + @gridRowWidth)/@gridRowWidth);
+    margin-left: 0 - @gridGutterWidth;
+
+    // Redeclare the mixins
+    .gridColumn() {
+      float: left;
+      margin-left: @gridGutterWidth;
+    } 
+    [class*="span"] {
+      .gridColumn();
+    }
+    .fluidColumns(@columns: 1) {
+      width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/(@gridRowWidth+@gridGutterWidth));
+    }
+    // Redeclare the columns
+    .span1     { .fluidColumns(1); }
+    .span2     { .fluidColumns(2); }
+    .span3     { .fluidColumns(3); }
+    .span4     { .fluidColumns(4); }
+    .span5     { .fluidColumns(5); }
+    .span6     { .fluidColumns(6); }
+    .span7     { .fluidColumns(7); }
+    .span8     { .fluidColumns(8); }
+    .span9     { .fluidColumns(9); }
+    .span10    { .fluidColumns(10); }
+    .span11    { .fluidColumns(11); }
+    .span12    { .fluidColumns(12); }
+  }
 }
 
 
@@ -198,7 +238,7 @@
   // Unfix the navbar
   .navbar-fixed-top {
     position: static;
-    margin-bottom: @baseLineHeight * 2;
+    margin-bottom: @baseLineHeight;
   }
   .navbar-inner {
     padding: 5px;
@@ -314,6 +354,14 @@
   @gridGutterWidth:   30px;
   @siteWidth:         1170px;
 
+  // Thumbnails
+  .thumbnails {
+    margin-left: @gridGutterWidth * -1;
+  }
+  .thumbnails > li {
+    margin-left: @gridGutterWidth;
+  }
+
   // Bring grid mixins to recalculate widths
   .columns(@columns: 1) {
     width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
@@ -358,12 +406,41 @@
   .offset10  { .offset(10); }
   .offset11  { .offset(11); }
 
-  // Thumbnails
-  .thumbnails {
-    margin-left: @gridGutterWidth * -1;
-  }
-  .thumbnails > li {
-    margin-left: @gridGutterWidth;
-  }
 
+  // FLUID GRID
+  // ----------
+  .row-fluid {
+    @gridColumnWidth:     5.982%;
+    @gridGutterWidth:     2.56%;
+    @gridRowWidth:        (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+    @gridTotalWidth:      @gridRowWidth;
+
+    width: 100% * ((@gridGutterWidth + @gridRowWidth)/@gridRowWidth);
+    margin-left: 0 - @gridGutterWidth;
+
+    // Redeclare the mixins
+    .gridColumn() {
+      float: left;
+      margin-left: @gridGutterWidth;
+    } 
+    [class*="span"] {
+      .gridColumn();
+    }
+    .fluidColumns(@columns: 1) {
+      width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/(@gridRowWidth+@gridGutterWidth));
+    }
+    // Redeclare the columns
+    .span1     { .fluidColumns(1); }
+    .span2     { .fluidColumns(2); }
+    .span3     { .fluidColumns(3); }
+    .span4     { .fluidColumns(4); }
+    .span5     { .fluidColumns(5); }
+    .span6     { .fluidColumns(6); }
+    .span7     { .fluidColumns(7); }
+    .span8     { .fluidColumns(8); }
+    .span9     { .fluidColumns(9); }
+    .span10    { .fluidColumns(10); }
+    .span11    { .fluidColumns(11); }
+    .span12    { .fluidColumns(12); }
+  }
 }
diff --git a/less/variables.less b/less/variables.less
index 4265d7ed3..c1e21978c 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -30,15 +30,6 @@
 @pink:                  #c3325f;
 @purple:                #7a43b6;
 
-// Grid system
-// Modify the grid styles in mixins.less
-@gridColumns:           12;
-@gridColumnWidth:       60px;
-@gridGutterWidth:       20px;
-@siteWidth:             (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-// Fluid width sidebar
-@fluidSidebarWidth:     220px;
-
 // Typography
 @baseFontSize:          13px;
 @baseFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
-- 
cgit v1.2.3


From 0952f3796ec7a4bb3efc0c6ba7b88ed4b7f45ada Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:07:31 -0800
Subject: fix js readme api capitalization

---
 js/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/README.md b/js/README.md
index 2f8e1716f..b58fa1d40 100644
--- a/js/README.md
+++ b/js/README.md
@@ -73,7 +73,7 @@ Each plugin should expose it's raw constructor on a `Constructor` property -- ac
 
 ### DATA ACCESSOR
 
-Each plugin stores a copy of the invoked class on an object. This class instance can be accessed directly through jQuery's data api like this:
+Each plugin stores a copy of the invoked class on an object. This class instance can be accessed directly through jQuery's data API like this:
 
     $('[rel=popover]').data('popover') instanceof $.fn.popover.Constructor
 
-- 
cgit v1.2.3


From 8c763589a2058785936a33088935c50f622859de Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:09:10 -0800
Subject: update text on icons note

---
 docs/base-css.html                     | 2 +-
 docs/templates/pages/base-css.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 3b4032805..0b2c4547e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1407,7 +1407,7 @@ For example, <code>section</code> should be wrapped as inline.
     
        
   
        
   
        
-    Heads up! Icon classes are echoed via CSS :after and on hover in the docs we show a light red background color show the icon's size.
+    Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to hightlight the icon's size.
   
        
 
   
        
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index b464084df..2b9a459c8 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1335,7 +1335,7 @@
     
        
   
        
   
        
-    {{_i}}Heads up! Icon classes are echoed via CSS :after and on hover in the docs we show a light red background color show the icon's size.{{/i}}
+    {{_i}}Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to hightlight the icon's size.{{/i}}
   
        
 
   
        
-- 
cgit v1.2.3


From 4e5b0e185e8cc9df3a77361380a44b16689fd2f7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:12:13 -0800
Subject: refined pager styles to give a border on the links and improved hover
 state

---
 docs/assets/css/bootstrap.css | 9 +++++++--
 less/pager.less               | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 60383fba0..3f36aaa4d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2707,12 +2707,17 @@ button.btn.small, input[type="submit"].btn.small {
 }
 .pager a {
   display: inline-block;
-  padding: 6px 15px;
-  background-color: #f5f5f5;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
   -webkit-border-radius: 15px;
   -moz-border-radius: 15px;
   border-radius: 15px;
 }
+.pager a:hover {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
 .pager .next a {
   float: right;
 }
diff --git a/less/pager.less b/less/pager.less
index de009afda..104e41cab 100644
--- a/less/pager.less
+++ b/less/pager.less
@@ -13,10 +13,15 @@
 }
 .pager a {
   display: inline-block;
-  padding: 6px 15px;
-  background-color: #f5f5f5;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
   .border-radius(15px);
 }
+.pager a:hover {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
 .pager .next a {
   float: right;
 }
-- 
cgit v1.2.3


From 49d565a6da38359a776f83f31a1f1ccd658c88a7 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 29 Jan 2012 13:15:37 -0800
Subject: move building zip file into docs/makefile

---
 Makefile                            |  53 ++++++++++++++++++++++--------------
 docs/assets/bootstrap.zip           | Bin 0 -> 50335 bytes
 docs/index.html                     |   2 +-
 docs/templates/pages/index.mustache |   2 +-
 4 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 docs/assets/bootstrap.zip

diff --git a/Makefile b/Makefile
index 399b57c6e..fed5ffca4 100644
--- a/Makefile
+++ b/Makefile
@@ -6,31 +6,42 @@ LESS_COMPRESSOR ?= `which lessc`
 WATCHR ?= `which watchr`
 
 #
-# Build less files + docs
+# BUILD DOCS
 #
 
-build:
-	@if test ! -z ${LESS_COMPRESSOR}; then \
-		lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}; \
-		lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}; \
-		node docs/build; \
-		cp img/* docs/assets/img/; \
-	else \
-		echo "You must have the LESS compiler installed in order to build Bootstrap."; \
-		echo "You can install it by running: npm install less -g"; \
-	fi
+docs: dist
+	cp -r dist bootstrap
+	zip -r docs/assets/bootstrap.zip bootstrap
+	rm -r bootstrap
+	lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
+	lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
+	node docs/build
+	cp img/* docs/assets/img/
 
 #
-# Watch less files
+# BUILD SIMPLE DIST DIRECTORY
+# lessc & uglifyjs are required
+#
+
+dist:
+	mkdir -p dist/img
+	mkdir -p dist/css
+	mkdir -p dist/js
+	cp img/* dist/img/
+	lessc ${BOOTSTRAP_LESS} > dist/css/bootstrap.css
+	lessc --compress ${BOOTSTRAP_LESS} > dist/css/bootstrap.min.css
+	lessc ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.responsive
+	lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.min.responsive
+	cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > dist/js/bootstrap.js
+	uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.js
+
+#
+# WATCH LESS FILES
 #
 
 watch:
-	@if test ! -z ${WATCHR}; then \
-	  echo "Watching less files..."; \
-	  watchr -e "watch('less/.*\.less') { system 'make' }"; \
-	else \
-		echo "You must have the watchr installed in order to watch Bootstrap Less files."; \
-		echo "You can install it by running: gem install watchr"; \
-	fi
-
-.PHONY: build watch
\ No newline at end of file
+	echo "Watching less files..."; \
+	watchr -e "watch('less/.*\.less') { system 'make' }"
+
+
+.PHONY: dist docs watch
\ No newline at end of file
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
new file mode 100644
index 000000000..0e691e290
Binary files /dev/null and b/docs/assets/bootstrap.zip differ
diff --git a/docs/index.html b/docs/index.html
index 89f5accd6..3ecc7718f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -80,7 +80,7 @@
             
        Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
        
             
        
               View project on GitHub
-              Download Bootstrap
+              Download Bootstrap
             
        
             
        
               
        Feature highlights
        
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 5fa70645a..7a98afa07 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -8,7 +8,7 @@
             
        Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
        
             
        
               {{_i}}View project on GitHub{{/i}}
-              {{_i}}Download Bootstrap{{/i}}
+              {{_i}}Download Bootstrap{{/i}}
             
        
             
        
               
        {{_i}}Feature highlights{{/i}}
        
-- 
cgit v1.2.3


From 9fa8bde44d9bb6f26b16c7633a01bbe5ce7b20a4 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:15:38 -0800
Subject: fix animated/striped gradients in progress bars

---
 docs/assets/css/bootstrap.css | 2 +-
 less/progress-bars.less       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 3f36aaa4d..675446f62 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3127,7 +3127,7 @@ a.thumbnail:hover {
   -o-transition: width 0.6s ease;
   transition: width 0.6s ease;
 }
-.progress.striped .bar {
+.progress-striped .bar {
   background-color: #62c462;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
diff --git a/less/progress-bars.less b/less/progress-bars.less
index ac820c610..c3144e1bd 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -53,7 +53,7 @@
 }
 
 // Striped bars
-.progress.striped .bar {
+.progress-striped .bar {
   #gradient > .striped(#62c462);
   .background-size(40px 40px);
 }
-- 
cgit v1.2.3


From 2696c6a4bd5eaea9de1d447da8f24da5cb3f74bd Mon Sep 17 00:00:00 2001
From: Chad Moran 
Date: Sun, 29 Jan 2012 13:20:39 -0800
Subject: Fixed @warningText and @warningBackground colors in docs

---
 docs/less.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/less.html b/docs/less.html
index 5935c9125..18ccaea2e 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -345,13 +345,13 @@
         
           
             @warningText
-            #f3edd2
-            
+            #c09853
+            
           
           
             @warningBackground
-            #c09853
-            
+            #f3edd2
+            
           
           
             @errorText
-- 
cgit v1.2.3


From 278858e70698f0dcf8651cb59b13e48fe756d8bd Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 13:25:13 -0800
Subject: fix form styles on prepend/append for consistency, update code docs
 with examples of the code snippets

---
 docs/assets/css/bootstrap.css          | 2 +-
 docs/base-css.html                     | 6 ++++++
 docs/templates/pages/base-css.mustache | 6 ++++++
 less/forms.less                        | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 675446f62..5330b5102 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -894,7 +894,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   min-width: 16px;
   height: 18px;
   margin-right: -1px;
-  padding: 4px 4px 4px 5px;
+  padding: 4px 5px;
   font-weight: normal;
   line-height: 18px;
   color: #999999;
diff --git a/docs/base-css.html b/docs/base-css.html
index 0b2c4547e..0406ff229 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -372,6 +372,9 @@ For example, <code>section</code> should be wrapped as inline.
     
        
       
        Basic block
        
       
        Use <pre> for multiple lines of code. Be sure to turn any carets into their unicode characters for proper rendering.
        
+
        +<p>Sample text here...</p>
+
        
 
         <pre>
   &lt;p&gt;Sample text here...&lt;/p&gt;
@@ -383,6 +386,9 @@ For example, <code>section</code> should be wrapped as inline.
       
        Google Prettify
        
       
        Take the same <pre> element and add two optional classes for enhanced rendering.
        
 
        +<p>Sample text here...</p>
+
        
+
         <pre class="prettyprint
      linenums">
   &lt;p&gt;Sample text here...&lt;/p&gt;
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 2b9a459c8..b47bcf265 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -300,6 +300,9 @@
     
        
       
        Basic block
        
       
        {{_i}}Use <pre> for multiple lines of code. Be sure to turn any carets into their unicode characters for proper rendering.{{/i}}
        
+
        +<p>{{_i}}Sample text here...{{/i}}</p>
+
        
 
         <pre>
   &lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
@@ -311,6 +314,9 @@
       
        Google Prettify
        
       
        Take the same <pre> element and add two optional classes for enhanced rendering.
        
 
        +<p>{{_i}}Sample text here...{{/i}}</p>
+
        
+
         <pre class="prettyprint
      linenums">
   &lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
diff --git a/less/forms.less b/less/forms.less
index 6b0f5ec52..9d94a64b7 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -417,7 +417,7 @@ select:focus:required:invalid {
     min-width: 16px;
     height: @baseLineHeight;
     margin-right: -1px;
-    padding: 4px 4px 4px 5px;
+    padding: 4px 5px;
     font-weight: normal;
     line-height: @baseLineHeight;
     color: @grayLight;
-- 
cgit v1.2.3


From 9e7f5025b494927e9ffc88119b0b9426f7487a62 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 14:07:14 -0800
Subject: update collapsible nav in navbar

---
 docs/assets/bootstrap.zip                 | Bin 50335 -> 51322 bytes
 docs/assets/css/bootstrap-responsive.css  |   7 +++++--
 docs/assets/css/bootstrap.css             |   2 +-
 docs/base-css.html                        |   2 +-
 docs/components.html                      |   2 +-
 docs/download.html                        |   2 +-
 docs/examples.html                        |   2 +-
 docs/index.html                           |   2 +-
 docs/javascript.html                      |   2 +-
 docs/less.html                            |   2 +-
 docs/scaffolding.html                     |   4 ++--
 docs/templates/layout.mustache            |   2 +-
 docs/templates/pages/components.mustache  |   4 ++--
 docs/templates/pages/scaffolding.mustache |   2 +-
 docs/upgrading.html                       |   2 +-
 less/navbar.less                          |   3 ++-
 less/responsive.less                      |   7 +++++--
 17 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 0e691e290..ebd162b67 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 44e0125c1..68ccf676f 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -218,7 +218,7 @@
     position: static;
     margin-bottom: 18px;
   }
-  .navbar-inner {
+  .navbar-fixed-top .navbar-inner {
     padding: 5px;
     background-image: none;
   }
@@ -305,10 +305,13 @@
   .btn-navbar {
     display: block;
   }
-  .nav-collapse {
+  .nav-collapse.collapse {
     overflow: hidden;
     height: 0;
   }
+  .nav-collapse.collapse.in {
+    height: auto;
+  }
 }
 @media (min-width: 1200px) {
   .thumbnails {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5330b5102..9b6217fbd 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2396,7 +2396,7 @@ button.btn.small, input[type="submit"].btn.small {
   margin-top: 3px;
 }
 .nav-collapse.collapse {
-  height: auto !important;
+  height: auto;
 }
 .navbar .brand:hover {
   text-decoration: none;
diff --git a/docs/base-css.html b/docs/base-css.html
index 0406ff229..291feb6e1 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
        
+          
        
             
          
               
        • 
                 Overview
diff --git a/docs/components.html b/docs/components.html
index 63a4b3dd0..19ab820f5 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
          
+          
          
             
            
               
          • 
                 Overview
diff --git a/docs/download.html b/docs/download.html
index 832b07ce6..97f1c24c4 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
            
+          
            
             
              
               
            • 
                 Overview
diff --git a/docs/examples.html b/docs/examples.html
index 7d79fc0a0..b2fd296d1 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
              
+          
              
             
                
               
              • 
                 Overview
diff --git a/docs/index.html b/docs/index.html
index e20d08bcd..7d728dc7d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                
+          
                
             
                  
               
                • 
                 Overview
diff --git a/docs/javascript.html b/docs/javascript.html
index eb4a175c3..9838aa0d1 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                  
+          
                  
             
                    
               
                  • 
                 Overview
diff --git a/docs/less.html b/docs/less.html
index 5935c9125..76794dbe4 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                    
+          
                    
             
                      
               
                    • 
                 Overview
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index b00f5630b..00aadd472 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                      
+          
                      
             
                        
               
                      • 
                 Overview
@@ -127,7 +127,7 @@
   
                        
     
                        
       
                        The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.
                        
-      
                        It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.
                        
+      
                        It also has four responsive variations for various devices and resolutions: phone, tablet portrait, table landscape and small desktops, and large widescreen desktops.
                        
     
                        
     
                        
 
                        diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 7c0ab655b..b49ec28f6 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                        
+          
                        
             
                          
               
                        • 
                 {{_i}}Overview{{/i}}
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 75ca3eb7e..fd7c464db 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -669,7 +669,7 @@
 </form>
 
                        
       
                        {{_i}}Optional responsive variation{{/i}}
                        
-      
                        {{_i}}Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, .nav-collapse, and add the navbar toggle button, .btn-navbar.{{/i}}
                        
+      
                        {{_i}}Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, .nav-collapse.collapse, and add the navbar toggle button, .btn-navbar.{{/i}}
                        
 
                         <div class="navbar">
   <div class="navbar-inner">
@@ -686,7 +686,7 @@
       <a class="brand" href="#">{{_i}}Project name{{/i}}</a>
 
       <!-- Everything you want hidden at 940px or less, place within here -->
-      <div class="nav-collapse">
+      <div class="nav-collapse collapse">
         <!-- .nav, .navbar-search, .navbar-form, etc -->
       </div>
 
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 239d15265..15c438b97 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -55,7 +55,7 @@
   
                        
     
                        
       
                        {{_i}}The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.{{/i}}
                        
-      
                        {{_i}}It also has three responsive variations for various devices and resolutions: phone, tablet, and large widescreen desktops.{{/i}}
                        
+      
                        {{_i}}It also has four responsive variations for various devices and resolutions: phone, tablet portrait, table landscape and small desktops, and large widescreen desktops.{{/i}}
                        
     
                        
     
                        
 
                        diff --git a/docs/upgrading.html b/docs/upgrading.html
index d7ad30f56..b8e82fe31 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                        
+          
                        
             
                          
               
                        • 
                 Overview
diff --git a/less/navbar.less b/less/navbar.less
index 25ca7b4e2..b677b192b 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -42,8 +42,9 @@
 .btn-navbar .i-bar + .i-bar {
   margin-top: 3px;
 }
+// Override the default collapsed state
 .nav-collapse.collapse {
-  height: auto !important; // Required to be !important to override native collapse plugin
+  height: auto;
 }
 
 
diff --git a/less/responsive.less b/less/responsive.less
index 107fa7dd7..7ae28b825 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -240,7 +240,7 @@
     position: static;
     margin-bottom: @baseLineHeight;
   }
-  .navbar-inner {
+  .navbar-fixed-top .navbar-inner {
     padding: 5px;
     background-image: none;
   }
@@ -335,10 +335,13 @@
   }
 
   // Hide everything in the navbar save .brand and toggle button */
-  .nav-collapse {
+  .nav-collapse.collapse {
     overflow: hidden;
     height: 0;
   }
+  .nav-collapse.collapse.in {
+    height: auto;
+  }
 
 }
 
-- 
cgit v1.2.3


From e493f7fc19d75dba88f3c6594fb94ef1cea09131 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 14:22:51 -0800
Subject: update navbar collapse everywhere and remake

---
 docs/assets/bootstrap.zip | Bin 51322 -> 51322 bytes
 docs/components.html      |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ebd162b67..1b658bf83 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 19ab820f5..81c328352 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -741,7 +741,7 @@
 </form>
 
                        
       
                        Optional responsive variation
                        
-      
                        Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, .nav-collapse, and add the navbar toggle button, .btn-navbar.
                        
+      
                        Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, .nav-collapse.collapse, and add the navbar toggle button, .btn-navbar.
                        
 
                         <div class="navbar">
   <div class="navbar-inner">
@@ -758,7 +758,7 @@
       <a class="brand" href="#">Project name</a>
 
       <!-- Everything you want hidden at 940px or less, place within here -->
-      <div class="nav-collapse">
+      <div class="nav-collapse collapse">
         <!-- .nav, .navbar-search, .navbar-form, etc -->
       </div>
 
-- 
cgit v1.2.3


From f622822459b792137768b71e7c7aa9253cc93a6b Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 29 Jan 2012 16:19:41 -0800
Subject: check in dist dir for hb5 + update images to point to correct spot
 for builder

---
 .gitignore                              |    4 +-
 dist/css/bootstrap.css                  | 3352 +++++++++++++++++++++++++++++++
 dist/css/bootstrap.min.css              |  615 ++++++
 dist/css/bootstrap.min.responsive       |    3 +
 dist/css/bootstrap.responsive           |  442 ++++
 dist/img/glyphicons-halflings-white.png |  Bin 0 -> 4352 bytes
 dist/img/glyphicons-halflings.png       |  Bin 0 -> 4352 bytes
 dist/js/bootstrap.js                    | 1722 ++++++++++++++++
 dist/js/bootstrap.min.js                |    1 +
 docs/assets/js/application.js           |    2 +-
 10 files changed, 6137 insertions(+), 4 deletions(-)
 create mode 100644 dist/css/bootstrap.css
 create mode 100644 dist/css/bootstrap.min.css
 create mode 100644 dist/css/bootstrap.min.responsive
 create mode 100644 dist/css/bootstrap.responsive
 create mode 100644 dist/img/glyphicons-halflings-white.png
 create mode 100644 dist/img/glyphicons-halflings.png
 create mode 100644 dist/js/bootstrap.js
 create mode 100644 dist/js/bootstrap.min.js

diff --git a/.gitignore b/.gitignore
index 01700de23..72b1d2772 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,4 @@ nbproject
 .idea
 
 # Misc
-js/min
-
-dist
\ No newline at end of file
+js/min
\ No newline at end of file
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
new file mode 100644
index 000000000..675446f62
--- /dev/null
+++ b/dist/css/bootstrap.css
@@ -0,0 +1,3352 @@
+/*!
+ * Bootstrap v2.0.0
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+audio, canvas, video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+audio:not([controls]) {
+  display: none;
+}
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+}
+a:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+a:hover, a:active {
+  outline: 0;
+}
+sub, sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+sup {
+  top: -0.5em;
+}
+sub {
+  bottom: -0.25em;
+}
+img {
+  max-width: 100%;
+  height: auto;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+button, input {
+  *overflow: visible;
+  line-height: normal;
+}
+button::-moz-focus-inner, input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+input[type="search"] {
+  -webkit-appearance: textfield;
+  -webkit-box-sizing: content-box;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  color: #555555;
+  background-color: #ffffff;
+}
+a {
+  color: #0088cc;
+  text-decoration: none;
+}
+a:hover {
+  color: #005580;
+  text-decoration: underline;
+}
+.row {
+  margin-left: -20px;
+  *zoom: 1;
+}
+.row:before, .row:after {
+  display: table;
+  content: "";
+}
+.row:after {
+  clear: both;
+}
+[class*="span"] {
+  float: left;
+  margin-left: 20px;
+}
+.span1 {
+  width: 59.99999999999999px;
+}
+.span2 {
+  width: 140px;
+}
+.span3 {
+  width: 220px;
+}
+.span4 {
+  width: 300px;
+}
+.span5 {
+  width: 380px;
+}
+.span6 {
+  width: 460px;
+}
+.span7 {
+  width: 540px;
+}
+.span8 {
+  width: 620px;
+}
+.span9 {
+  width: 700px;
+}
+.span10 {
+  width: 780px;
+}
+.span11 {
+  width: 860px;
+}
+.span12 {
+  width: 940px;
+}
+.offset1 {
+  margin-left: 100px;
+}
+.offset2 {
+  margin-left: 180px;
+}
+.offset3 {
+  margin-left: 260px;
+}
+.offset4 {
+  margin-left: 340px;
+}
+.offset5 {
+  margin-left: 420px;
+}
+.offset6 {
+  margin-left: 500px;
+}
+.offset7 {
+  margin-left: 580px;
+}
+.offset8 {
+  margin-left: 660px;
+}
+.offset9 {
+  margin-left: 740px;
+}
+.offset10 {
+  margin-left: 820px;
+}
+.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;
+  margin-right: auto;
+  *zoom: 1;
+}
+.container:before, .container:after {
+  display: table;
+  content: "";
+}
+.container:after {
+  clear: both;
+}
+.container-fluid {
+  padding-left: 20px;
+  padding-right: 20px;
+  *zoom: 1;
+}
+.container-fluid:before, .container-fluid:after {
+  display: table;
+  content: "";
+}
+.container-fluid:after {
+  clear: both;
+}
+p {
+  margin: 0 0 9px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+p small {
+  font-size: 11px;
+  color: #999999;
+}
+.lead {
+  margin-bottom: 18px;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 27px;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 0;
+  font-weight: bold;
+  color: #333333;
+  text-rendering: optimizelegibility;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  font-weight: normal;
+  color: #999999;
+}
+h1 {
+  font-size: 30px;
+  line-height: 36px;
+}
+h1 small {
+  font-size: 18px;
+}
+h2 {
+  font-size: 24px;
+  line-height: 36px;
+}
+h2 small {
+  font-size: 18px;
+}
+h3 {
+  line-height: 27px;
+  font-size: 18px;
+}
+h3 small {
+  font-size: 14px;
+}
+h4, h5, h6 {
+  line-height: 18px;
+}
+h4 {
+  font-size: 14px;
+}
+h4 small {
+  font-size: 12px;
+}
+h5 {
+  font-size: 12px;
+}
+h6 {
+  font-size: 11px;
+  color: #999999;
+  text-transform: uppercase;
+}
+.page-header {
+  padding-bottom: 17px;
+  margin: 18px 0;
+  border-bottom: 1px solid #eeeeee;
+}
+.page-header h1 {
+  line-height: 1;
+}
+ul, ol {
+  padding: 0;
+  margin: 0 0 9px 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+ul {
+  list-style: disc;
+}
+ol {
+  list-style: decimal;
+}
+li {
+  line-height: 18px;
+}
+ul.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+dl {
+  margin-bottom: 18px;
+}
+dt, dd {
+  line-height: 18px;
+}
+dt {
+  font-weight: bold;
+}
+dd {
+  margin-left: 9px;
+}
+hr {
+  margin: 18px 0;
+  border: 0;
+  border-top: 1px solid #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+strong {
+  font-weight: bold;
+}
+em {
+  font-style: italic;
+}
+.muted {
+  color: #999999;
+}
+abbr {
+  font-size: 90%;
+  text-transform: uppercase;
+  border-bottom: 1px dotted #ddd;
+  cursor: help;
+}
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 18px;
+  border-left: 5px solid #eeeeee;
+}
+blockquote p {
+  margin-bottom: 0;
+  font-size: 16px;
+  font-weight: 300;
+  line-height: 22.5px;
+}
+blockquote small {
+  display: block;
+  line-height: 18px;
+  color: #999999;
+}
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+blockquote.pull-right {
+  float: right;
+  padding-left: 0;
+  padding-right: 15px;
+  border-left: 0;
+  border-right: 5px solid #eeeeee;
+}
+blockquote.pull-right p, blockquote.pull-right small {
+  text-align: right;
+}
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+address {
+  display: block;
+  margin-bottom: 18px;
+  line-height: 18px;
+  font-style: normal;
+}
+small {
+  font-size: 100%;
+}
+cite {
+  font-style: normal;
+}
+code, pre {
+  padding: 0 3px 2px;
+  font-family: Menlo, Monaco, "Courier New", monospace;
+  font-size: 12px;
+  color: #333333;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+code {
+  padding: 3px 4px;
+  color: #d14;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+pre {
+  display: block;
+  padding: 8.5px;
+  margin: 0 0 9px;
+  font-size: 12px;
+  line-height: 18px;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  white-space: pre;
+  white-space: pre-wrap;
+  word-break: break-all;
+}
+pre.prettyprint {
+  margin-bottom: 18px;
+}
+pre code {
+  padding: 0;
+  background-color: transparent;
+}
+form {
+  margin: 0 0 18px;
+}
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 27px;
+  font-size: 19.5px;
+  line-height: 36px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #eee;
+}
+label,
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 18px;
+}
+label {
+  display: block;
+  margin-bottom: 5px;
+  color: #333333;
+}
+input,
+textarea,
+select,
+.uneditable-input {
+  display: inline-block;
+  width: 210px;
+  height: 18px;
+  padding: 4px;
+  margin-bottom: 9px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #555555;
+  border: 1px solid #ccc;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+label input, label textarea, label select {
+  display: block;
+}
+input[type="image"], input[type="checkbox"], input[type="radio"] {
+  width: auto;
+  height: auto;
+  padding: 0;
+  margin: 3px 0;
+  *margin-top: 0;
+  /* IE7 */
+
+  line-height: normal;
+  border: 0;
+  cursor: pointer;
+  border-radius: 0 \0/;
+}
+input[type="file"] {
+  padding: initial;
+  line-height: initial;
+  border: initial;
+  background-color: #ffffff;
+  background-color: initial;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+input[type="button"], input[type="reset"], input[type="submit"] {
+  width: auto;
+  height: auto;
+}
+select, input[type="file"] {
+  height: 28px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
+  line-height: 28px;
+}
+select {
+  width: 220px;
+  background-color: #ffffff;
+}
+select[multiple], select[size] {
+  height: auto;
+}
+input[type="image"] {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+textarea {
+  height: auto;
+}
+input[type="hidden"] {
+  display: none;
+}
+.radio, .checkbox {
+  padding-left: 18px;
+}
+.radio input[type="radio"], .checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -18px;
+}
+.controls > .radio:first-child, .controls > .checkbox:first-child {
+  padding-top: 5px;
+}
+.radio.inline, .checkbox.inline {
+  display: inline-block;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child {
+  padding-top: 5px;
+}
+input, textarea {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+  transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+input:focus, textarea:focus {
+  border-color: rgba(82, 168, 236, 0.8);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  outline: 0;
+  outline: thin dotted \9;
+  /* IE6-8 */
+
+}
+input[type="file"]:focus, input[type="checkbox"]:focus, select:focus {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+.input-mini {
+  width: 60px;
+}
+.input-small {
+  width: 90px;
+}
+.input-medium {
+  width: 150px;
+}
+.input-large {
+  width: 210px;
+}
+.input-xlarge {
+  width: 270px;
+}
+.input-xxlarge {
+  width: 530px;
+}
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input {
+  float: none;
+  margin-left: 0;
+}
+input.span1, textarea.span1, .uneditable-input.span1 {
+  width: 50px;
+}
+input.span2, textarea.span2, .uneditable-input.span2 {
+  width: 130px;
+}
+input.span3, textarea.span3, .uneditable-input.span3 {
+  width: 210px;
+}
+input.span4, textarea.span4, .uneditable-input.span4 {
+  width: 290px;
+}
+input.span5, textarea.span5, .uneditable-input.span5 {
+  width: 370px;
+}
+input.span6, textarea.span6, .uneditable-input.span6 {
+  width: 450px;
+}
+input.span7, textarea.span7, .uneditable-input.span7 {
+  width: 530px;
+}
+input.span8, textarea.span8, .uneditable-input.span8 {
+  width: 610px;
+}
+input.span9, textarea.span9, .uneditable-input.span9 {
+  width: 690px;
+}
+input.span10, textarea.span10, .uneditable-input.span10 {
+  width: 770px;
+}
+input.span11, textarea.span11, .uneditable-input.span11 {
+  width: 850px;
+}
+input.span12, textarea.span12, .uneditable-input.span12 {
+  width: 930px;
+}
+select.span1 {
+  width: 70px;
+}
+select.span2 {
+  width: 150px;
+}
+select.span3 {
+  width: 230px;
+}
+select.span4 {
+  width: 310px;
+}
+select.span5 {
+  width: 390px;
+}
+select.span6 {
+  width: 470px;
+}
+select.span7 {
+  width: 550px;
+}
+select.span8 {
+  width: 630px;
+}
+select.span9 {
+  width: 710px;
+}
+select.span10 {
+  width: 790px;
+}
+select.span11 {
+  width: 870px;
+}
+select.span12 {
+  width: 950px;
+}
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  background-color: #f5f5f5;
+  border-color: #ddd;
+  cursor: not-allowed;
+}
+.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline {
+  color: #c09853;
+}
+.control-group.warning input, .control-group.warning select, .control-group.warning textarea {
+  color: #c09853;
+  border-color: #c09853;
+}
+.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
+  border-color: #a47e3c;
+  -webkit-box-shadow: 0 0 6px #dbc59e;
+  -moz-box-shadow: 0 0 6px #dbc59e;
+  box-shadow: 0 0 6px #dbc59e;
+}
+.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline {
+  color: #b94a48;
+}
+.control-group.error input, .control-group.error select, .control-group.error textarea {
+  color: #b94a48;
+  border-color: #b94a48;
+}
+.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
+  border-color: #953b39;
+  -webkit-box-shadow: 0 0 6px #d59392;
+  -moz-box-shadow: 0 0 6px #d59392;
+  box-shadow: 0 0 6px #d59392;
+}
+.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline {
+  color: #468847;
+}
+.control-group.success input, .control-group.success select, .control-group.success textarea {
+  color: #468847;
+  border-color: #468847;
+}
+.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
+  border-color: #356635;
+  -webkit-box-shadow: 0 0 6px #7aba7b;
+  -moz-box-shadow: 0 0 6px #7aba7b;
+  box-shadow: 0 0 6px #7aba7b;
+}
+.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+  -moz-box-shadow: 0 0 6px #f8b9b7;
+  box-shadow: 0 0 6px #f8b9b7;
+}
+.form-actions {
+  padding: 17px 20px 18px;
+  margin-top: 18px;
+  margin-bottom: 18px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+}
+.uneditable-input {
+  display: block;
+  background-color: #ffffff;
+  border-color: #eee;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  cursor: not-allowed;
+}
+:-moz-placeholder {
+  color: #999999;
+}
+::-webkit-input-placeholder {
+  color: #999999;
+}
+.help-block {
+  margin-top: 5px;
+  margin-bottom: 0;
+  color: #999999;
+}
+.help-inline {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+  margin-bottom: 9px;
+  vertical-align: middle;
+  padding-left: 5px;
+}
+.input-prepend, .input-append {
+  margin-bottom: 5px;
+  *zoom: 1;
+}
+.input-prepend:before,
+.input-append:before,
+.input-prepend:after,
+.input-append:after {
+  display: table;
+  content: "";
+}
+.input-prepend:after, .input-append:after {
+  clear: both;
+}
+.input-prepend input,
+.input-append input,
+.input-prepend .uneditable-input,
+.input-append .uneditable-input {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.input-prepend input:focus,
+.input-append input:focus,
+.input-prepend .uneditable-input:focus,
+.input-append .uneditable-input:focus {
+  position: relative;
+  z-index: 2;
+}
+.input-prepend .uneditable-input, .input-append .uneditable-input {
+  border-left-color: #ccc;
+}
+.input-prepend .add-on, .input-append .add-on {
+  float: left;
+  display: block;
+  width: auto;
+  min-width: 16px;
+  height: 18px;
+  margin-right: -1px;
+  padding: 4px 4px 4px 5px;
+  font-weight: normal;
+  line-height: 18px;
+  color: #999999;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.input-prepend .active, .input-append .active {
+  background-color: #a9dba9;
+  border-color: #46a546;
+}
+.input-prepend .add-on {
+  *margin-top: 1px;
+  /* IE6-7 */
+
+}
+.input-append input, .input-append .uneditable-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 .uneditable-input {
+  border-right-color: #ccc;
+}
+.input-append .add-on {
+  margin-right: 0;
+  margin-left: -1px;
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.input-append input:first-child {
+  *margin-left: -160px;
+}
+.input-append input:first-child + .add-on {
+  *margin-left: -21px;
+}
+.search-query {
+  padding-left: 14px;
+  padding-right: 14px;
+  margin-bottom: 0;
+  -webkit-border-radius: 14px;
+  -moz-border-radius: 14px;
+  border-radius: 14px;
+}
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input {
+  display: inline-block;
+  margin-bottom: 0;
+}
+.form-search label,
+.form-inline label,
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  display: inline-block;
+}
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on,
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on {
+  vertical-align: middle;
+}
+.control-group {
+  margin-bottom: 9px;
+}
+.form-horizontal legend + .control-group {
+  margin-top: 18px;
+  -webkit-margin-top-collapse: separate;
+}
+.form-horizontal .control-group {
+  margin-bottom: 18px;
+  *zoom: 1;
+}
+.form-horizontal .control-group:before, .form-horizontal .control-group:after {
+  display: table;
+  content: "";
+}
+.form-horizontal .control-group:after {
+  clear: both;
+}
+.form-horizontal .control-group > label {
+  float: left;
+  width: 140px;
+  padding-top: 5px;
+  text-align: right;
+}
+.form-horizontal .controls {
+  margin-left: 160px;
+}
+.form-horizontal .form-actions {
+  padding-left: 160px;
+}
+table {
+  max-width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+.table {
+  width: 100%;
+  margin-bottom: 18px;
+}
+.table th, .table td {
+  padding: 8px;
+  line-height: 18px;
+  text-align: left;
+  border-top: 1px solid #ddd;
+}
+.table th {
+  font-weight: bold;
+  vertical-align: bottom;
+}
+.table td {
+  vertical-align: top;
+}
+.table thead:first-child tr th, .table thead:first-child tr td {
+  border-top: 0;
+}
+.table tbody + tbody {
+  border-top: 2px solid #ddd;
+}
+.table-condensed th, .table-condensed td {
+  padding: 4px 5px;
+}
+.table-bordered {
+  border: 1px solid #ddd;
+  border-collapse: separate;
+  *border-collapse: collapsed;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.table-bordered th + th,
+.table-bordered td + td,
+.table-bordered th + td,
+.table-bordered td + th {
+  border-left: 1px solid #ddd;
+}
+.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child {
+  -webkit-border-radius: 4px 0 0 0;
+  -moz-border-radius: 4px 0 0 0;
+  border-radius: 4px 0 0 0;
+}
+.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child {
+  -webkit-border-radius: 0 4px 0 0;
+  -moz-border-radius: 0 4px 0 0;
+  border-radius: 0 4px 0 0;
+}
+.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child {
+  -webkit-border-radius: 0 0 0 4px;
+  -moz-border-radius: 0 0 0 4px;
+  border-radius: 0 0 0 4px;
+}
+.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child {
+  -webkit-border-radius: 0 0 4px 0;
+  -moz-border-radius: 0 0 4px 0;
+  border-radius: 0 0 4px 0;
+}
+.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th {
+  background-color: #f9f9f9;
+}
+table .span1 {
+  float: none;
+  width: 44px;
+  margin-left: 0;
+}
+table .span2 {
+  float: none;
+  width: 124px;
+  margin-left: 0;
+}
+table .span3 {
+  float: none;
+  width: 204px;
+  margin-left: 0;
+}
+table .span4 {
+  float: none;
+  width: 284px;
+  margin-left: 0;
+}
+table .span5 {
+  float: none;
+  width: 364px;
+  margin-left: 0;
+}
+table .span6 {
+  float: none;
+  width: 444px;
+  margin-left: 0;
+}
+table .span7 {
+  float: none;
+  width: 524px;
+  margin-left: 0;
+}
+table .span8 {
+  float: none;
+  width: 604px;
+  margin-left: 0;
+}
+table .span9 {
+  float: none;
+  width: 684px;
+  margin-left: 0;
+}
+table .span10 {
+  float: none;
+  width: 764px;
+  margin-left: 0;
+}
+table .span11 {
+  float: none;
+  width: 844px;
+  margin-left: 0;
+}
+table .span12 {
+  float: none;
+  width: 924px;
+  margin-left: 0;
+}
+.icon {
+  background-image: url(../img/glyphicons-halflings.png);
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+  display: inline-block;
+  vertical-align: text-top;
+  width: 14px;
+  height: 14px;
+  *margin-right: .3em;
+}
+.icon:last-child {
+  *margin-left: 0;
+}
+.icon.white {
+  background-image: url(../img/glyphicons-halflings-white.png);
+}
+.icon.glass {
+  background-position: 0      0;
+}
+.icon.music {
+  background-position: -24px 0;
+}
+.icon.search {
+  background-position: -48px 0;
+}
+.icon.envelope {
+  background-position: -72px 0;
+}
+.icon.heart {
+  background-position: -96px 0;
+}
+.icon.star {
+  background-position: -120px 0;
+}
+.icon.star-empty {
+  background-position: -144px 0;
+}
+.icon.user {
+  background-position: -168px 0;
+}
+.icon.film {
+  background-position: -192px 0;
+}
+.icon.th-large {
+  background-position: -216px 0;
+}
+.icon.th {
+  background-position: -240px 0;
+}
+.icon.th-list {
+  background-position: -264px 0;
+}
+.icon.ok {
+  background-position: -288px 0;
+}
+.icon.remove {
+  background-position: -312px 0;
+}
+.icon.zoom-in {
+  background-position: -336px 0;
+}
+.icon.zoom-out {
+  background-position: -360px 0;
+}
+.icon.off {
+  background-position: -384px 0;
+}
+.icon.signal {
+  background-position: -408px 0;
+}
+.icon.cog {
+  background-position: -432px 0;
+}
+.icon.trash {
+  background-position: -456px 0;
+}
+.icon.home {
+  background-position: 0 -24px;
+}
+.icon.file {
+  background-position: -24px -24px;
+}
+.icon.time {
+  background-position: -48px -24px;
+}
+.icon.road {
+  background-position: -72px -24px;
+}
+.icon.download-alt {
+  background-position: -96px -24px;
+}
+.icon.download {
+  background-position: -120px -24px;
+}
+.icon.upload {
+  background-position: -144px -24px;
+}
+.icon.inbox {
+  background-position: -168px -24px;
+}
+.icon.play-circle {
+  background-position: -192px -24px;
+}
+.icon.repeat {
+  background-position: -216px -24px;
+}
+.icon.refresh {
+  background-position: -240px -24px;
+}
+.icon.list-alt {
+  background-position: -264px -24px;
+}
+.icon.lock {
+  background-position: -287px -24px;
+}
+.icon.flag {
+  background-position: -312px -24px;
+}
+.icon.headphones {
+  background-position: -336px -24px;
+}
+.icon.volume-off {
+  background-position: -360px -24px;
+}
+.icon.volume-down {
+  background-position: -384px -24px;
+}
+.icon.volume-up {
+  background-position: -408px -24px;
+}
+.icon.qrcode {
+  background-position: -432px -24px;
+}
+.icon.barcode {
+  background-position: -456px -24px;
+}
+.icon.tag {
+  background-position: 0 -48px;
+}
+.icon.tags {
+  background-position: -25px -48px;
+}
+.icon.book {
+  background-position: -48px -48px;
+}
+.icon.bookmark {
+  background-position: -72px -48px;
+}
+.icon.print {
+  background-position: -96px -48px;
+}
+.icon.camera {
+  background-position: -120px -48px;
+}
+.icon.font {
+  background-position: -144px -48px;
+}
+.icon.bold {
+  background-position: -167px -48px;
+}
+.icon.italic {
+  background-position: -192px -48px;
+}
+.icon.text-height {
+  background-position: -216px -48px;
+}
+.icon.text-width {
+  background-position: -240px -48px;
+}
+.icon.align-left {
+  background-position: -264px -48px;
+}
+.icon.align-center {
+  background-position: -288px -48px;
+}
+.icon.align-right {
+  background-position: -312px -48px;
+}
+.icon.align-justify {
+  background-position: -336px -48px;
+}
+.icon.list {
+  background-position: -360px -48px;
+}
+.icon.indent-left {
+  background-position: -384px -48px;
+}
+.icon.indent-right {
+  background-position: -408px -48px;
+}
+.icon.facetime-video {
+  background-position: -432px -48px;
+}
+.icon.picture {
+  background-position: -456px -48px;
+}
+.icon.pencil {
+  background-position: 0 -72px;
+}
+.icon.map-marker {
+  background-position: -24px -72px;
+}
+.icon.adjust {
+  background-position: -48px -72px;
+}
+.icon.tint {
+  background-position: -72px -72px;
+}
+.icon.edit {
+  background-position: -96px -72px;
+}
+.icon.share {
+  background-position: -120px -72px;
+}
+.icon.check {
+  background-position: -144px -72px;
+}
+.icon.move {
+  background-position: -168px -72px;
+}
+.icon.step-backward {
+  background-position: -192px -72px;
+}
+.icon.fast-backward {
+  background-position: -216px -72px;
+}
+.icon.backward {
+  background-position: -240px -72px;
+}
+.icon.play {
+  background-position: -264px -72px;
+}
+.icon.pause {
+  background-position: -288px -72px;
+}
+.icon.stop {
+  background-position: -312px -72px;
+}
+.icon.forward {
+  background-position: -336px -72px;
+}
+.icon.fast-forward {
+  background-position: -360px -72px;
+}
+.icon.step-forward {
+  background-position: -384px -72px;
+}
+.icon.eject {
+  background-position: -408px -72px;
+}
+.icon.chevron-left {
+  background-position: -432px -72px;
+}
+.icon.chevron-right {
+  background-position: -456px -72px;
+}
+.icon.plus-sign {
+  background-position: 0 -96px;
+}
+.icon.minus-sign {
+  background-position: -24px -96px;
+}
+.icon.remove-sign {
+  background-position: -48px -96px;
+}
+.icon.ok-sign {
+  background-position: -72px -96px;
+}
+.icon.question-sign {
+  background-position: -96px -96px;
+}
+.icon.info-sign {
+  background-position: -120px -96px;
+}
+.icon.screenshot {
+  background-position: -144px -96px;
+}
+.icon.remove-circle {
+  background-position: -168px -96px;
+}
+.icon.ok-circle {
+  background-position: -192px -96px;
+}
+.icon.ban-circle {
+  background-position: -216px -96px;
+}
+.icon.arrow-left {
+  background-position: -240px -96px;
+}
+.icon.arrow-right {
+  background-position: -264px -96px;
+}
+.icon.arrow-up {
+  background-position: -289px -96px;
+}
+.icon.arrow-down {
+  background-position: -312px -96px;
+}
+.icon.share-alt {
+  background-position: -336px -96px;
+}
+.icon.resize-full {
+  background-position: -360px -96px;
+}
+.icon.resize-small {
+  background-position: -384px -96px;
+}
+.icon.plus {
+  background-position: -408px -96px;
+}
+.icon.minus {
+  background-position: -433px -96px;
+}
+.icon.asterisk {
+  background-position: -456px -96px;
+}
+.icon.exclamation-sign {
+  background-position: 0 -120px;
+}
+.icon.gift {
+  background-position: -24px -120px;
+}
+.icon.leaf {
+  background-position: -48px -120px;
+}
+.icon.fire {
+  background-position: -72px -120px;
+}
+.icon.eye-open {
+  background-position: -96px -120px;
+}
+.icon.eye-close {
+  background-position: -120px -120px;
+}
+.icon.warning-sign {
+  background-position: -144px -120px;
+}
+.icon.plane {
+  background-position: -168px -120px;
+}
+.icon.calendar {
+  background-position: -192px -120px;
+}
+.icon.random {
+  background-position: -216px -120px;
+}
+.icon.comment {
+  background-position: -240px -120px;
+}
+.icon.magnet {
+  background-position: -264px -120px;
+}
+.icon.chevron-up {
+  background-position: -288px -120px;
+}
+.icon.chevron-down {
+  background-position: -313px -119px;
+}
+.icon.retweet {
+  background-position: -336px -120px;
+}
+.icon.shopping-cart {
+  background-position: -360px -120px;
+}
+.icon.folder-close {
+  background-position: -384px -120px;
+}
+.icon.folder-open {
+  background-position: -408px -120px;
+}
+.icon.resize-vertical {
+  background-position: -432px -119px;
+}
+.icon.resize-horizontal {
+  background-position: -456px -118px;
+}
+.dropdown {
+  position: relative;
+}
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+.dropdown-toggle:active, .open .dropdown-toggle {
+  outline: 0;
+}
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  text-indent: -99999px;
+  *text-indent: 0;
+  vertical-align: top;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid #000000;
+  opacity: 0.3;
+  filter: alpha(opacity=30);
+  content: "\2193";
+}
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+.dropdown:hover .caret, .open.dropdown .caret {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  float: left;
+  display: none;
+  min-width: 160px;
+  max-width: 220px;
+  _width: 160px;
+  padding: 4px 0;
+  margin: 0;
+  list-style: none;
+  background-color: #ffffff;
+  border-color: #ccc;
+  border-color: rgba(0, 0, 0, 0.2);
+  border-style: solid;
+  border-width: 1px;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding;
+  background-clip: padding-box;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+}
+.dropdown-menu.bottom-up {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 2px;
+}
+.dropdown-menu .divider {
+  height: 1px;
+  margin: 5px 1px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+  *width: 100%;
+  *margin: -5px 0 5px;
+}
+.dropdown-menu a {
+  display: block;
+  padding: 3px 15px;
+  clear: both;
+  font-weight: normal;
+  line-height: 18px;
+  color: #555555;
+  white-space: nowrap;
+}
+.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0088cc;
+}
+.dropdown.open {
+  *z-index: 1000;
+}
+.dropdown.open .dropdown-toggle {
+  color: #ffffff;
+  background: #ccc;
+  background: rgba(0, 0, 0, 0.3);
+}
+.dropdown.open .dropdown-menu {
+  display: block;
+}
+.typeahead {
+  margin-top: 2px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #eee;
+  border: 1px solid rgba(0, 0, 0, 0.05);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -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);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+.fade {
+  -webkit-transition: opacity 0.15s linear;
+  -moz-transition: opacity 0.15s linear;
+  -ms-transition: opacity 0.15s linear;
+  -o-transition: opacity 0.15s linear;
+  transition: opacity 0.15s linear;
+  opacity: 0;
+}
+.fade.in {
+  opacity: 1;
+}
+.collapse {
+  -webkit-transition: height 0.35s ease;
+  -moz-transition: height 0.35s ease;
+  -ms-transition: height 0.35s ease;
+  -o-transition: height 0.35s ease;
+  transition: height 0.35s ease;
+  position: relative;
+  overflow: hidden;
+  height: 0;
+}
+.collapse.in {
+  height: auto;
+}
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+.close:hover {
+  color: #000000;
+  text-decoration: none;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+  cursor: pointer;
+}
+.btn.primary,
+.btn.primary:hover,
+.btn.danger,
+.btn.danger:hover,
+.btn.success,
+.btn.success:hover,
+.btn.info,
+.btn.info:hover {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  color: #ffffff;
+}
+.btn.primary.active,
+.btn.danger.active,
+.btn.success.active,
+.btn.info.active {
+  color: rgba(255, 255, 255, 0.75);
+}
+.btn.primary {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn.primary:hover,
+.btn.primary:active,
+.btn.primary.active,
+.btn.primary.disabled,
+.btn.primary[disabled] {
+  background-color: #0044cc;
+}
+.btn.primary:active, .btn.primary.active {
+  background-color: #003399 \9;
+}
+.btn.danger {
+  background-color: #da4f49;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(top, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
+  border-color: #bd362f #bd362f #802420;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn.danger:hover,
+.btn.danger:active,
+.btn.danger.active,
+.btn.danger.disabled,
+.btn.danger[disabled] {
+  background-color: #bd362f;
+}
+.btn.danger:active, .btn.danger.active {
+  background-color: #942a25 \9;
+}
+.btn.success {
+  background-color: #5bb75b;
+  background-image: -moz-linear-gradient(top, #62c462, #51a351);
+  background-image: -ms-linear-gradient(top, #62c462, #51a351);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
+  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
+  background-image: -o-linear-gradient(top, #62c462, #51a351);
+  background-image: linear-gradient(top, #62c462, #51a351);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
+  border-color: #51a351 #51a351 #387038;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn.success:hover,
+.btn.success:active,
+.btn.success.active,
+.btn.success.disabled,
+.btn.success[disabled] {
+  background-color: #51a351;
+}
+.btn.success:active, .btn.success.active {
+  background-color: #408140 \9;
+}
+.btn.info {
+  background-color: #49afcd;
+  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: linear-gradient(top, #5bc0de, #2f96b4);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
+  border-color: #2f96b4 #2f96b4 #1f6377;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn.info:hover,
+.btn.info:active,
+.btn.info.active,
+.btn.info.disabled,
+.btn.info[disabled] {
+  background-color: #2f96b4;
+}
+.btn.info:active, .btn.info.active {
+  background-color: #24748c \9;
+}
+.btn {
+  display: inline-block;
+  padding: 4px 10px 4px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #333333;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  background-color: #fafafa;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -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);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  cursor: pointer;
+  *margin-left: .3em;
+}
+.btn:first-child {
+  *margin-left: 0;
+}
+.btn:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: #e6e6e6;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+  -moz-transition: background-position 0.1s linear;
+  -ms-transition: background-position 0.1s linear;
+  -o-transition: background-position 0.1s linear;
+  transition: background-position 0.1s linear;
+}
+.btn:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+.btn.active, .btn:active {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  background-color: #e6e6e6;
+  background-color: #d9d9d9 \9;
+  color: rgba(0, 0, 0, 0.5);
+  outline: 0;
+}
+.btn.disabled, .btn[disabled] {
+  cursor: default;
+  background-image: none;
+  background-color: #e6e6e6;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.btn.large {
+  padding: 9px 14px;
+  font-size: 15px;
+  line-height: normal;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.btn.large .icon {
+  margin-top: 1px;
+}
+.btn.small {
+  padding: 5px 9px;
+  font-size: 11px;
+  line-height: 16px;
+}
+.btn.small .icon {
+  margin-top: -1px;
+}
+button.btn, input[type="submit"].btn {
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+}
+button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+button.btn.large, input[type="submit"].btn.large {
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+button.btn.small, input[type="submit"].btn.small {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+.btn-group {
+  position: relative;
+  *zoom: 1;
+  *margin-left: .3em;
+}
+.btn-group:before, .btn-group:after {
+  display: table;
+  content: "";
+}
+.btn-group:after {
+  clear: both;
+}
+.btn-group:first-child {
+  *margin-left: 0;
+}
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+.btn-toolbar {
+  margin-top: 9px;
+  margin-bottom: 9px;
+}
+.btn-toolbar .btn-group {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+}
+.btn-group .btn {
+  position: relative;
+  float: left;
+  margin-left: -1px;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.btn-group .btn:first-child {
+  margin-left: 0;
+  -webkit-border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+  border-top-left-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  border-bottom-left-radius: 4px;
+}
+.btn-group .btn:last-child, .btn-group .dropdown-toggle {
+  -webkit-border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  border-bottom-right-radius: 4px;
+}
+.btn-group .btn.large:first-child {
+  margin-left: 0;
+  -webkit-border-top-left-radius: 6px;
+  -moz-border-radius-topleft: 6px;
+  border-top-left-radius: 6px;
+  -webkit-border-bottom-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  border-bottom-left-radius: 6px;
+}
+.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle {
+  -webkit-border-top-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+  -moz-border-radius-bottomright: 6px;
+  border-bottom-right-radius: 6px;
+}
+.btn-group .btn:hover,
+.btn-group .btn:focus,
+.btn-group .btn:active,
+.btn-group .btn.active {
+  z-index: 2;
+}
+.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+.btn-group .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  *padding-top: 5px;
+  *padding-bottom: 5px;
+}
+.btn-group.open {
+  *z-index: 1000;
+}
+.btn-group.open .dropdown-menu {
+  display: block;
+  margin-top: 1px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.btn .caret {
+  margin-top: 7px;
+  margin-left: 0;
+}
+.btn:hover .caret, .open.btn-group .caret {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.primary .caret,
+.danger .caret,
+.info .caret,
+.success .caret {
+  border-top-color: #ffffff;
+  opacity: 0.75;
+  filter: alpha(opacity=75);
+}
+.btn.small .caret {
+  margin-top: 4px;
+}
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: 18px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.alert, .alert-heading {
+  color: #c09853;
+}
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: 18px;
+}
+.alert-success {
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+.alert-success, .alert-success .alert-heading {
+  color: #468847;
+}
+.alert-danger, .alert-error {
+  background-color: #f2dede;
+  border-color: #eed3d7;
+}
+.alert-danger,
+.alert-error,
+.alert-danger .alert-heading,
+.alert-error .alert-heading {
+  color: #b94a48;
+}
+.alert-info {
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.alert-info, .alert-info .alert-heading {
+  color: #3a87ad;
+}
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+.alert-block > p, .alert-block > ul {
+  margin-bottom: 0;
+}
+.alert-block p + p {
+  margin-top: 5px;
+}
+.nav {
+  margin-left: 0;
+  margin-bottom: 18px;
+  list-style: none;
+}
+.nav > li > a {
+  display: block;
+}
+.nav > li > a:hover {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+.nav.list {
+  padding-left: 14px;
+  padding-right: 14px;
+  margin-bottom: 0;
+}
+.nav.list > li > a, .nav.list .nav-header {
+  display: block;
+  padding: 3px 15px;
+  margin-left: -15px;
+  margin-right: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+.nav.list .nav-header {
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #999999;
+  text-transform: uppercase;
+}
+.nav.list > li + .nav-header {
+  margin-top: 9px;
+}
+.nav.list .active > a {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
+}
+.nav.list .icon {
+  margin-right: 2px;
+}
+.tabs, .pills {
+  *zoom: 1;
+}
+.tabs:before,
+.pills:before,
+.tabs:after,
+.pills:after {
+  display: table;
+  content: "";
+}
+.tabs:after, .pills:after {
+  clear: both;
+}
+.tabs > li, .pills > li {
+  float: left;
+}
+.tabs > li > a, .pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
+}
+.tabs {
+  border-bottom: 1px solid #ddd;
+}
+.tabs > li {
+  margin-bottom: -1px;
+}
+.tabs > li > a {
+  padding-top: 9px;
+  padding-bottom: 9px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+}
+.tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #dddddd;
+}
+.tabs > .active > a, .tabs > .active > a:hover {
+  color: #555555;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+  cursor: default;
+}
+.pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.pills .active > a, .pills .active > a:hover {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+.nav.stacked > li {
+  float: none;
+}
+.nav.stacked > li > a {
+  margin-right: 0;
+}
+.tabs.stacked {
+  border-bottom: 0;
+}
+.tabs.stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.tabs.stacked > li:first-child > a {
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+}
+.tabs.stacked > li:last-child > a {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+.tabs.stacked > li > a:hover {
+  border-color: #ddd;
+  z-index: 2;
+}
+.pills.stacked > li > a {
+  margin-bottom: 3px;
+}
+.pills.stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+.pills .dropdown-menu, .tabs .dropdown-menu {
+  margin-top: 1px;
+  border-width: 1px;
+}
+.pills .dropdown-menu {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
+  border-top-color: #0088cc;
+  margin-top: 6px;
+}
+.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret {
+  border-top-color: #005580;
+}
+.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret {
+  border-top-color: #333333;
+}
+.nav > .dropdown.active > a:hover {
+  color: #000000;
+  cursor: pointer;
+}
+.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
+}
+.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
+  border-top-color: #ffffff;
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.tabs.stacked .open > a:hover {
+  border-color: #999999;
+}
+.tabbable {
+  *zoom: 1;
+}
+.tabbable:before, .tabbable:after {
+  display: table;
+  content: "";
+}
+.tabbable:after {
+  clear: both;
+}
+.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs {
+  border-bottom: 0;
+}
+.tab-content > .tab-pane, .pill-content > .pill-pane {
+  display: none;
+}
+.tab-content > .active, .pill-content > .active {
+  display: block;
+}
+.tabs-below .tabs {
+  border-top: 1px solid #ddd;
+}
+.tabs-below .tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+.tabs-below .tabs > li > a {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+.tabs-below .tabs > li > a:hover {
+  border-bottom-color: transparent;
+  border-top-color: #ddd;
+}
+.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover {
+  border-color: transparent #ddd #ddd #ddd;
+}
+.tabs-left .tabs > li, .tabs-right .tabs > li {
+  float: none;
+}
+.tabs-left .tabs > li > a, .tabs-right .tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+.tabs-left .tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+.tabs-left .tabs > li > a {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+}
+.tabs-left .tabs > li > a:hover {
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+}
+.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: #ffffff;
+}
+.tabs-right .tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+.tabs-right .tabs > li > a {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+.tabs-right .tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+}
+.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: #ffffff;
+}
+.navbar {
+  overflow: visible;
+  margin-bottom: 18px;
+}
+.navbar-inner {
+  padding-left: 20px;
+  padding-right: 20px;
+  background-color: #2c2c2c;
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+}
+.btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-left: 5px;
+  margin-right: 5px;
+  background-color: #2c2c2c;
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  border-color: #222222 #222222 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+}
+.btn-navbar:hover,
+.btn-navbar:active,
+.btn-navbar.active,
+.btn-navbar.disabled,
+.btn-navbar[disabled] {
+  background-color: #222222;
+}
+.btn-navbar:active, .btn-navbar.active {
+  background-color: #080808 \9;
+}
+.btn-navbar .i-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 1px;
+  -moz-border-radius: 1px;
+  border-radius: 1px;
+  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+  -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+}
+.btn-navbar .i-bar + .i-bar {
+  margin-top: 3px;
+}
+.nav-collapse.collapse {
+  height: auto !important;
+}
+.navbar .brand:hover {
+  text-decoration: none;
+}
+.navbar .brand {
+  float: left;
+  display: block;
+  padding: 8px 20px 12px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 1;
+  color: #ffffff;
+}
+.navbar .navbar-text {
+  margin-bottom: 0;
+  line-height: 40px;
+  color: #999999;
+}
+.navbar .navbar-text a:hover {
+  color: #ffffff;
+  background-color: transparent;
+}
+.navbar .btn, .navbar .btn-group {
+  margin-top: 5px;
+}
+.navbar .btn-group .btn {
+  margin-top: 0;
+}
+.navbar-form {
+  margin-bottom: 0;
+}
+.navbar-form input, .navbar-form select {
+  display: inline-block;
+  margin-top: 5px;
+  margin-bottom: 0;
+}
+.navbar-form .radio, .navbar-form .checkbox {
+  margin-top: 5px;
+}
+.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] {
+  margin-top: 3px;
+}
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 6px;
+  margin-bottom: 0;
+}
+.navbar-search .search-query {
+  padding: 4px 9px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  color: #ffffff;
+  color: rgba(255, 255, 255, 0.75);
+  background: #666;
+  background: rgba(255, 255, 255, 0.3);
+  border: 1px solid #111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  -webkit-transition: none;
+  -moz-transition: none;
+  -ms-transition: none;
+  -o-transition: none;
+  transition: none;
+}
+.navbar-search .search-query :-moz-placeholder {
+  color: #eeeeee;
+}
+.navbar-search .search-query::-webkit-input-placeholder {
+  color: #eeeeee;
+}
+.navbar-search .search-query:hover {
+  color: #ffffff;
+  background-color: #999999;
+  background-color: rgba(255, 255, 255, 0.5);
+}
+.navbar-search .search-query:focus, .navbar-search .search-query.focused {
+  padding: 5px 10px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  outline: 0;
+}
+.navbar-fixed-top {
+  position: fixed;
+  top: 0;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+}
+.navbar-fixed-top .navbar-inner {
+  padding-left: 0;
+  padding-right: 0;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+  float: right;
+}
+.navbar .nav > li {
+  display: block;
+  float: left;
+}
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 10px 11px;
+  line-height: 19px;
+  color: #999999;
+  text-decoration: none;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.navbar .nav > li > a:hover {
+  background-color: transparent;
+  color: #ffffff;
+  text-decoration: none;
+}
+.navbar .nav .active > a, .navbar .nav .active > a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #222222;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+.navbar .vertical-divider {
+  height: 40px;
+  width: 1px;
+  margin: 0 5px;
+  overflow: hidden;
+  background-color: #222222;
+  border-right: 1px solid #333333;
+}
+.navbar .nav.pull-right {
+  margin-left: 10px;
+  margin-right: 0;
+}
+.navbar .dropdown-menu {
+  margin-top: 1px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.navbar .dropdown-menu:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top: -7px;
+  left: 9px;
+}
+.navbar .dropdown-menu:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  position: absolute;
+  top: -6px;
+  left: 10px;
+}
+.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
+  border-top-color: #ffffff;
+}
+.navbar .nav .active .caret {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
+  background-color: transparent;
+}
+.navbar .nav .active > .dropdown-toggle:hover {
+  color: #ffffff;
+}
+.navbar .nav.pull-right .dropdown-menu {
+  left: auto;
+  right: 0;
+}
+.navbar .nav.pull-right .dropdown-menu:before {
+  left: auto;
+  right: 12px;
+}
+.navbar .nav.pull-right .dropdown-menu:after {
+  left: auto;
+  right: 13px;
+}
+.breadcrumb {
+  padding: 7px 14px;
+  margin: 0 0 18px;
+  background-color: #fbfbfb;
+  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: linear-gradient(top, #ffffff, #f5f5f5);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
+  border: 1px solid #ddd;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+}
+.breadcrumb li {
+  display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+}
+.breadcrumb .divider {
+  padding: 0 5px;
+  color: #999999;
+}
+.breadcrumb .active a {
+  color: #333333;
+}
+.pagination {
+  height: 36px;
+  margin: 18px 0;
+}
+.pagination ul {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+  margin-left: 0;
+  margin-bottom: 0;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-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);
+}
+.pagination li {
+  display: inline;
+}
+.pagination a {
+  float: left;
+  padding: 0 14px;
+  line-height: 34px;
+  text-decoration: none;
+  border: 1px solid #ddd;
+  border-left-width: 0;
+}
+.pagination a:hover, .pagination .active a {
+  background-color: #f5f5f5;
+}
+.pagination .active a {
+  color: #999999;
+}
+.pagination .disabled a, .pagination .disabled a:hover {
+  color: #999999;
+  background-color: transparent;
+  cursor: default;
+}
+.pagination li:first-child a {
+  border-left-width: 1px;
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.pagination li:last-child a {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.pagination-centered {
+  text-align: center;
+}
+.pagination-right {
+  text-align: right;
+}
+.pager {
+  margin-left: 0;
+  margin-bottom: 18px;
+  list-style: none;
+  text-align: center;
+  *zoom: 1;
+}
+.pager:before, .pager:after {
+  display: table;
+  content: "";
+}
+.pager:after {
+  clear: both;
+}
+.pager li {
+  display: inline;
+}
+.pager a {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+}
+.pager a:hover {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+.pager .next a {
+  float: right;
+}
+.pager .previous a {
+  float: left;
+}
+.modal-open .dropdown-menu {
+  z-index: 2050;
+}
+.modal-open .dropdown.open {
+  *z-index: 2050;
+}
+.modal-open .popover {
+  z-index: 2060;
+}
+.modal-open .tooltip {
+  z-index: 2070;
+}
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000000;
+}
+.modal-backdrop.fade {
+  opacity: 0;
+}
+.modal-backdrop, .modal-backdrop.fade.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+.modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  z-index: 1050;
+  max-height: 500px;
+  overflow: auto;
+  width: 560px;
+  margin: -250px 0 0 -280px;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  /* IE6-7 */
+
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-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);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.modal.fade {
+  -webkit-transition: opacity .3s linear, top .3s ease-out;
+  -moz-transition: opacity .3s linear, top .3s ease-out;
+  -ms-transition: opacity .3s linear, top .3s ease-out;
+  -o-transition: opacity .3s linear, top .3s ease-out;
+  transition: opacity .3s linear, top .3s ease-out;
+  top: -25%;
+}
+.modal.fade.in {
+  top: 50%;
+}
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+}
+.modal-header .close {
+  margin-top: 2px;
+}
+.modal-body {
+  padding: 15px;
+}
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+  *zoom: 1;
+}
+.modal-footer:before, .modal-footer:after {
+  display: table;
+  content: "";
+}
+.modal-footer:after {
+  clear: both;
+}
+.modal-footer .btn {
+  float: right;
+  margin-left: 5px;
+  margin-bottom: 0;
+}
+.tooltip {
+  position: absolute;
+  z-index: 1020;
+  display: block;
+  visibility: visible;
+  padding: 5px;
+  font-size: 11px;
+  opacity: 0;
+  filter: alpha(opacity=0);
+}
+.tooltip.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+.tooltip.top {
+  margin-top: -2px;
+}
+.tooltip.right {
+  margin-left: 2px;
+}
+.tooltip.bottom {
+  margin-top: 2px;
+}
+.tooltip.left {
+  margin-left: -2px;
+}
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 5px solid #000000;
+}
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid #000000;
+}
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #000000;
+}
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 5px solid #000000;
+}
+.tooltip-inner {
+  max-width: 200px;
+  padding: 3px 8px;
+  color: #ffffff;
+  text-align: center;
+  text-decoration: none;
+  background-color: #000000;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1010;
+  display: none;
+  padding: 5px;
+}
+.popover.top {
+  margin-top: -5px;
+}
+.popover.right {
+  margin-left: 5px;
+}
+.popover.bottom {
+  margin-top: 5px;
+}
+.popover.left {
+  margin-left: -5px;
+}
+.popover.top .arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 5px solid #000000;
+}
+.popover.right .arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 5px solid #000000;
+}
+.popover.bottom .arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #000000;
+}
+.popover.left .arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid #000000;
+}
+.popover .arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
+.popover .inner {
+  padding: 3px;
+  width: 280px;
+  overflow: hidden;
+  background: #000000;
+  background: rgba(0, 0, 0, 0.8);
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-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);
+}
+.popover .title {
+  padding: 9px 15px;
+  line-height: 1;
+  background-color: #f5f5f5;
+  border-bottom: 1px solid #eee;
+  -webkit-border-radius: 3px 3px 0 0;
+  -moz-border-radius: 3px 3px 0 0;
+  border-radius: 3px 3px 0 0;
+}
+.popover .content {
+  padding: 14px;
+  background-color: #ffffff;
+  -webkit-border-radius: 0 0 3px 3px;
+  -moz-border-radius: 0 0 3px 3px;
+  border-radius: 0 0 3px 3px;
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.popover .content p, .popover .content ul, .popover .content ol {
+  margin-bottom: 0;
+}
+.thumbnails {
+  margin-left: -20px;
+  list-style: none;
+  *zoom: 1;
+}
+.thumbnails:before, .thumbnails:after {
+  display: table;
+  content: "";
+}
+.thumbnails:after {
+  clear: both;
+}
+.thumbnails > li {
+  float: left;
+  margin: 0 0 18px 20px;
+}
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 1;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-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);
+}
+a.thumbnail:hover {
+  border-color: #0088cc;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-left: auto;
+  margin-right: auto;
+}
+.thumbnail .caption {
+  padding: 9px;
+}
+.label {
+  padding: 1px 3px 2px;
+  font-size: 9.75px;
+  font-weight: bold;
+  color: #ffffff;
+  text-transform: uppercase;
+  background-color: #999999;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.label-important {
+  background-color: #b94a48;
+}
+.label-warning {
+  background-color: #f89406;
+}
+.label-success {
+  background-color: #468847;
+}
+.label-info {
+  background-color: #3a87ad;
+}
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+@-moz-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+.progress {
+  overflow: hidden;
+  height: 18px;
+  margin-bottom: 18px;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.progress .bar {
+  width: 0%;
+  height: 18px;
+  color: #ffffff;
+  font-size: 12px;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -ms-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(top, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+  -moz-transition: width 0.6s ease;
+  -ms-transition: width 0.6s ease;
+  -o-transition: width 0.6s ease;
+  transition: width 0.6s ease;
+}
+.progress-striped .bar {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+  -moz-background-size: 40px 40px;
+  -o-background-size: 40px 40px;
+  background-size: 40px 40px;
+}
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+  -moz-animation: progress-bar-stripes 2s linear infinite;
+  animation: progress-bar-stripes 2s linear infinite;
+}
+.progress-danger .bar {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
+}
+.progress-danger.progress-striped .bar {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-success .bar {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -ms-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(top, #62c462, #57a957);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+}
+.progress-success.progress-striped .bar {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-info .bar {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(top, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
+}
+.progress-info.progress-striped .bar {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.accordion {
+  margin-bottom: 18px;
+}
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.accordion-heading {
+  border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+.carousel {
+  position: relative;
+  line-height: 1;
+}
+.carousel-inner {
+  overflow: hidden;
+  width: 100%;
+  position: relative;
+}
+.carousel .item {
+  display: none;
+  position: relative;
+  -webkit-transition: 0.6s ease-in-out left;
+  -moz-transition: 0.6s ease-in-out left;
+  -ms-transition: 0.6s ease-in-out left;
+  -o-transition: 0.6s ease-in-out left;
+  transition: 0.6s ease-in-out left;
+}
+.carousel .item > img {
+  display: block;
+  line-height: 1;
+}
+.carousel .active, .carousel .next, .carousel .prev {
+  display: block;
+}
+.carousel .active {
+  left: 0;
+}
+.carousel .next, .carousel .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.carousel .next {
+  left: 100%;
+}
+.carousel .prev {
+  left: -100%;
+}
+.carousel .next.left, .carousel .prev.right {
+  left: 0;
+}
+.carousel .active.left {
+  left: -100%;
+}
+.carousel .active.right {
+  left: 100%;
+}
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: #ffffff;
+  text-align: center;
+  background: #222222;
+  border: 3px solid #ffffff;
+  -webkit-border-radius: 23px;
+  -moz-border-radius: 23px;
+  border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+.carousel-control.right {
+  left: auto;
+  right: 15px;
+}
+.carousel-control:hover {
+  color: #ffffff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+.carousel-caption {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 10px 15px 5px;
+  background: #333333;
+  background: rgba(0, 0, 0, 0.75);
+}
+.carousel-caption h4, .carousel-caption p {
+  color: #ffffff;
+}
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+}
+.hero-unit p {
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 27px;
+}
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+.invisible {
+  visibility: hidden;
+}
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
new file mode 100644
index 000000000..729f3d9d9
--- /dev/null
+++ b/dist/css/bootstrap.min.css
@@ -0,0 +1,615 @@
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]){display:none;}
+html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+a:hover,a:active{outline:0;}
+sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
+sup{top:-0.5em;}
+sub{bottom:-0.25em;}
+img{max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;}
+button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}
+button,input{*overflow:visible;line-height:normal;}
+button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
+button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
+input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
+input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
+textarea{overflow:auto;vertical-align:top;}
+body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#555555;background-color:#ffffff;}
+a{color:#0088cc;text-decoration:none;}
+a:hover{color:#005580;text-decoration:underline;}
+.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
+.row:after{clear:both;}
+[class*="span"]{float:left;margin-left:20px;}
+.span1{width:59.99999999999999px;}
+.span2{width:140px;}
+.span3{width:220px;}
+.span4{width:300px;}
+.span5{width:380px;}
+.span6{width:460px;}
+.span7{width:540px;}
+.span8{width:620px;}
+.span9{width:700px;}
+.span10{width:780px;}
+.span11{width:860px;}
+.span12{width:940px;}
+.offset1{margin-left:100px;}
+.offset2{margin-left:180px;}
+.offset3{margin-left:260px;}
+.offset4{margin-left:340px;}
+.offset5{margin-left:420px;}
+.offset6{margin-left:500px;}
+.offset7{margin-left:580px;}
+.offset8{margin-left:660px;}
+.offset9{margin-left:740px;}
+.offset10{margin-left:820px;}
+.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;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
+.container:after{clear:both;}
+.container-fluid{padding-left:20px;padding-right:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
+.container-fluid:after{clear:both;}
+p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
+.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;}
+h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;}
+h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}
+h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}
+h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
+h4,h5,h6{line-height:18px;}
+h4{font-size:14px;}h4 small{font-size:12px;}
+h5{font-size:12px;}
+h6{font-size:11px;color:#999999;text-transform:uppercase;}
+.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;}
+.page-header h1{line-height:1;}
+ul,ol{padding:0;margin:0 0 9px 25px;}
+ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
+ul{list-style:disc;}
+ol{list-style:decimal;}
+li{line-height:18px;}
+ul.unstyled{margin-left:0;list-style:none;}
+dl{margin-bottom:18px;}
+dt,dd{line-height:18px;}
+dt{font-weight:bold;}
+dd{margin-left:9px;}
+hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;}
+strong{font-weight:bold;}
+em{font-style:italic;}
+.muted{color:#999999;}
+abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;}
+blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
+blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
+blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
+small{font-size:100%;}
+cite{font-style:normal;}
+code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}
+pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
+pre code{padding:0;background-color:transparent;}
+form{margin:0 0 18px;}
+fieldset{padding:0;margin:0;border:0;}
+legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;}
+label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
+label{display:block;margin-bottom:5px;color:#333333;}
+input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.uneditable-textarea{width:auto;height:auto;}
+label input,label textarea,label select{display:block;}
+input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:0;cursor:pointer;border-radius:0 \0/;}
+input[type="file"]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;}
+select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;}
+select{width:220px;background-color:#ffffff;}
+select[multiple],select[size]{height:auto;}
+input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+textarea{height:auto;}
+input[type="hidden"]{display:none;}
+.radio,.checkbox{padding-left:18px;}
+.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;}
+.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;}
+.radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;vertical-align:middle;}
+.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
+.controls>.radio.inline:first-child,.controls>.checkbox.inline:first-child{padding-top:5px;}
+input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
+input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;}
+input[type="file"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.input-mini{width:60px;}
+.input-small{width:90px;}
+.input-medium{width:150px;}
+.input-large{width:210px;}
+.input-xlarge{width:270px;}
+.input-xxlarge{width:530px;}
+input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;}
+input.span1,textarea.span1,.uneditable-input.span1{width:50px;}
+input.span2,textarea.span2,.uneditable-input.span2{width:130px;}
+input.span3,textarea.span3,.uneditable-input.span3{width:210px;}
+input.span4,textarea.span4,.uneditable-input.span4{width:290px;}
+input.span5,textarea.span5,.uneditable-input.span5{width:370px;}
+input.span6,textarea.span6,.uneditable-input.span6{width:450px;}
+input.span7,textarea.span7,.uneditable-input.span7{width:530px;}
+input.span8,textarea.span8,.uneditable-input.span8{width:610px;}
+input.span9,textarea.span9,.uneditable-input.span9{width:690px;}
+input.span10,textarea.span10,.uneditable-input.span10{width:770px;}
+input.span11,textarea.span11,.uneditable-input.span11{width:850px;}
+input.span12,textarea.span12,.uneditable-input.span12{width:930px;}
+select.span1{width:70px;}
+select.span2{width:150px;}
+select.span3{width:230px;}
+select.span4{width:310px;}
+select.span5{width:390px;}
+select.span6{width:470px;}
+select.span7{width:550px;}
+select.span8{width:630px;}
+select.span9{width:710px;}
+select.span10{width:790px;}
+select.span11{width:870px;}
+select.span12{width:950px;}
+input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
+.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
+.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
+.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
+.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
+.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
+.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
+.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
+.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
+.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
+input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
+.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
+.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
+:-moz-placeholder{color:#999999;}
+::-webkit-input-placeholder{color:#999999;}
+.help-block{margin-top:5px;margin-bottom:0;color:#999999;}
+.help-inline{display:inline-block;*display:inline;*zoom:1;margin-bottom:9px;vertical-align:middle;padding-left:5px;}
+.input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";}
+.input-prepend:after,.input-append:after{clear:both;}
+.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;}
+.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;}
+.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;}
+.input-prepend .add-on{*margin-top:1px;}
+.input-append input,.input-append .uneditable-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 .uneditable-input{border-right-color:#ccc;}
+.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.input-append input:first-child{*margin-left:-160px;}.input-append input:first-child+.add-on{*margin-left:-21px;}
+.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
+.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
+.form-search label,.form-inline label,.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{display:inline-block;}
+.form-search .input-append .add-on,.form-inline .input-prepend .add-on,.form-search .input-append .add-on,.form-inline .input-prepend .add-on{vertical-align:middle;}
+.control-group{margin-bottom:9px;}
+.form-horizontal legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;}
+.form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";}
+.form-horizontal .control-group:after{clear:both;}
+.form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
+.form-horizontal .controls{margin-left:160px;}
+.form-horizontal .form-actions{padding-left:160px;}
+table{max-width:100%;border-collapse:collapse;border-spacing:0;}
+.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;}
+.table th{font-weight:bold;vertical-align:bottom;}
+.table td{vertical-align:top;}
+.table thead:first-child tr th,.table thead:first-child tr td{border-top:0;}
+.table tbody+tbody{border-top:2px solid #ddd;}
+.table-condensed th,.table-condensed td{padding:4px 5px;}
+.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;}
+.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
+.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
+.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
+.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
+.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
+.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;}
+table .span1{float:none;width:44px;margin-left:0;}
+table .span2{float:none;width:124px;margin-left:0;}
+table .span3{float:none;width:204px;margin-left:0;}
+table .span4{float:none;width:284px;margin-left:0;}
+table .span5{float:none;width:364px;margin-left:0;}
+table .span6{float:none;width:444px;margin-left:0;}
+table .span7{float:none;width:524px;margin-left:0;}
+table .span8{float:none;width:604px;margin-left:0;}
+table .span9{float:none;width:684px;margin-left:0;}
+table .span10{float:none;width:764px;margin-left:0;}
+table .span11{float:none;width:844px;margin-left:0;}
+table .span12{float:none;width:924px;margin-left:0;}
+.icon{background-image:url(../img/glyphicons-halflings.png);background-position:14px 14px;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;*margin-right:.3em;}.icon:last-child{*margin-left:0;}
+.icon.white{background-image:url(../img/glyphicons-halflings-white.png);}
+.icon.glass{background-position:0 0;}
+.icon.music{background-position:-24px 0;}
+.icon.search{background-position:-48px 0;}
+.icon.envelope{background-position:-72px 0;}
+.icon.heart{background-position:-96px 0;}
+.icon.star{background-position:-120px 0;}
+.icon.star-empty{background-position:-144px 0;}
+.icon.user{background-position:-168px 0;}
+.icon.film{background-position:-192px 0;}
+.icon.th-large{background-position:-216px 0;}
+.icon.th{background-position:-240px 0;}
+.icon.th-list{background-position:-264px 0;}
+.icon.ok{background-position:-288px 0;}
+.icon.remove{background-position:-312px 0;}
+.icon.zoom-in{background-position:-336px 0;}
+.icon.zoom-out{background-position:-360px 0;}
+.icon.off{background-position:-384px 0;}
+.icon.signal{background-position:-408px 0;}
+.icon.cog{background-position:-432px 0;}
+.icon.trash{background-position:-456px 0;}
+.icon.home{background-position:0 -24px;}
+.icon.file{background-position:-24px -24px;}
+.icon.time{background-position:-48px -24px;}
+.icon.road{background-position:-72px -24px;}
+.icon.download-alt{background-position:-96px -24px;}
+.icon.download{background-position:-120px -24px;}
+.icon.upload{background-position:-144px -24px;}
+.icon.inbox{background-position:-168px -24px;}
+.icon.play-circle{background-position:-192px -24px;}
+.icon.repeat{background-position:-216px -24px;}
+.icon.refresh{background-position:-240px -24px;}
+.icon.list-alt{background-position:-264px -24px;}
+.icon.lock{background-position:-287px -24px;}
+.icon.flag{background-position:-312px -24px;}
+.icon.headphones{background-position:-336px -24px;}
+.icon.volume-off{background-position:-360px -24px;}
+.icon.volume-down{background-position:-384px -24px;}
+.icon.volume-up{background-position:-408px -24px;}
+.icon.qrcode{background-position:-432px -24px;}
+.icon.barcode{background-position:-456px -24px;}
+.icon.tag{background-position:0 -48px;}
+.icon.tags{background-position:-25px -48px;}
+.icon.book{background-position:-48px -48px;}
+.icon.bookmark{background-position:-72px -48px;}
+.icon.print{background-position:-96px -48px;}
+.icon.camera{background-position:-120px -48px;}
+.icon.font{background-position:-144px -48px;}
+.icon.bold{background-position:-167px -48px;}
+.icon.italic{background-position:-192px -48px;}
+.icon.text-height{background-position:-216px -48px;}
+.icon.text-width{background-position:-240px -48px;}
+.icon.align-left{background-position:-264px -48px;}
+.icon.align-center{background-position:-288px -48px;}
+.icon.align-right{background-position:-312px -48px;}
+.icon.align-justify{background-position:-336px -48px;}
+.icon.list{background-position:-360px -48px;}
+.icon.indent-left{background-position:-384px -48px;}
+.icon.indent-right{background-position:-408px -48px;}
+.icon.facetime-video{background-position:-432px -48px;}
+.icon.picture{background-position:-456px -48px;}
+.icon.pencil{background-position:0 -72px;}
+.icon.map-marker{background-position:-24px -72px;}
+.icon.adjust{background-position:-48px -72px;}
+.icon.tint{background-position:-72px -72px;}
+.icon.edit{background-position:-96px -72px;}
+.icon.share{background-position:-120px -72px;}
+.icon.check{background-position:-144px -72px;}
+.icon.move{background-position:-168px -72px;}
+.icon.step-backward{background-position:-192px -72px;}
+.icon.fast-backward{background-position:-216px -72px;}
+.icon.backward{background-position:-240px -72px;}
+.icon.play{background-position:-264px -72px;}
+.icon.pause{background-position:-288px -72px;}
+.icon.stop{background-position:-312px -72px;}
+.icon.forward{background-position:-336px -72px;}
+.icon.fast-forward{background-position:-360px -72px;}
+.icon.step-forward{background-position:-384px -72px;}
+.icon.eject{background-position:-408px -72px;}
+.icon.chevron-left{background-position:-432px -72px;}
+.icon.chevron-right{background-position:-456px -72px;}
+.icon.plus-sign{background-position:0 -96px;}
+.icon.minus-sign{background-position:-24px -96px;}
+.icon.remove-sign{background-position:-48px -96px;}
+.icon.ok-sign{background-position:-72px -96px;}
+.icon.question-sign{background-position:-96px -96px;}
+.icon.info-sign{background-position:-120px -96px;}
+.icon.screenshot{background-position:-144px -96px;}
+.icon.remove-circle{background-position:-168px -96px;}
+.icon.ok-circle{background-position:-192px -96px;}
+.icon.ban-circle{background-position:-216px -96px;}
+.icon.arrow-left{background-position:-240px -96px;}
+.icon.arrow-right{background-position:-264px -96px;}
+.icon.arrow-up{background-position:-289px -96px;}
+.icon.arrow-down{background-position:-312px -96px;}
+.icon.share-alt{background-position:-336px -96px;}
+.icon.resize-full{background-position:-360px -96px;}
+.icon.resize-small{background-position:-384px -96px;}
+.icon.plus{background-position:-408px -96px;}
+.icon.minus{background-position:-433px -96px;}
+.icon.asterisk{background-position:-456px -96px;}
+.icon.exclamation-sign{background-position:0 -120px;}
+.icon.gift{background-position:-24px -120px;}
+.icon.leaf{background-position:-48px -120px;}
+.icon.fire{background-position:-72px -120px;}
+.icon.eye-open{background-position:-96px -120px;}
+.icon.eye-close{background-position:-120px -120px;}
+.icon.warning-sign{background-position:-144px -120px;}
+.icon.plane{background-position:-168px -120px;}
+.icon.calendar{background-position:-192px -120px;}
+.icon.random{background-position:-216px -120px;}
+.icon.comment{background-position:-240px -120px;}
+.icon.magnet{background-position:-264px -120px;}
+.icon.chevron-up{background-position:-288px -120px;}
+.icon.chevron-down{background-position:-313px -119px;}
+.icon.retweet{background-position:-336px -120px;}
+.icon.shopping-cart{background-position:-360px -120px;}
+.icon.folder-close{background-position:-384px -120px;}
+.icon.folder-open{background-position:-408px -120px;}
+.icon.resize-vertical{background-position:-432px -119px;}
+.icon.resize-horizontal{background-position:-456px -118px;}
+.dropdown{position:relative;}
+.dropdown-toggle{*margin-bottom:-3px;}
+.dropdown-toggle:active,.open .dropdown-toggle{outline:0;}
+.caret{display:inline-block;width:0;height:0;text-indent:-99999px;*text-indent:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";}
+.dropdown .caret{margin-top:8px;margin-left:2px;}
+.dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);}
+.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.bottom-up{top:auto;bottom:100%;margin-bottom:2px;}
+.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;}
+.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
+.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;}
+.dropdown.open{*z-index:1000;}.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
+.dropdown.open .dropdown-menu{display:block;}
+.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
+.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
+.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
+.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;}
+.btn.primary,.btn.primary:hover,.btn.danger,.btn.danger:hover,.btn.success,.btn.success:hover,.btn.info,.btn.info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
+.btn.primary.active,.btn.danger.active,.btn.success.active,.btn.info.active{color:rgba(255, 255, 255, 0.75);}
+.btn.primary{background-color:#006dcc;background-image:-moz-linear-gradient(top, #0088cc, #0044cc);background-image:-ms-linear-gradient(top, #0088cc, #0044cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));background-image:-webkit-linear-gradient(top, #0088cc, #0044cc);background-image:-o-linear-gradient(top, #0088cc, #0044cc);background-image:linear-gradient(top, #0088cc, #0044cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);border-color:#0044cc #0044cc #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn.primary:hover,.btn.primary:active,.btn.primary.active,.btn.primary.disabled,.btn.primary[disabled]{background-color:#0044cc;}
+.btn.primary:active,.btn.primary.active{background-color:#003399 \9;}
+.btn.danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn.danger:hover,.btn.danger:active,.btn.danger.active,.btn.danger.disabled,.btn.danger[disabled]{background-color:#bd362f;}
+.btn.danger:active,.btn.danger.active{background-color:#942a25 \9;}
+.btn.success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn.success:hover,.btn.success:active,.btn.success.active,.btn.success.disabled,.btn.success[disabled]{background-color:#51a351;}
+.btn.success:active,.btn.success.active{background-color:#408140 \9;}
+.btn.info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn.info:hover,.btn.info:active,.btn.info.active,.btn.info.disabled,.btn.info[disabled]{background-color:#2f96b4;}
+.btn.info:active,.btn.info.active{background-color:#24748c \9;}
+.btn{display:inline-block;padding:4px 10px 4px;font-size:13px;line-height:18px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;}
+.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
+.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;color:rgba(0, 0, 0, 0.5);outline:0;}
+.btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn.large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn.large .icon{margin-top:1px;}
+.btn.small{padding:5px 9px;font-size:11px;line-height:16px;}
+.btn.small .icon{margin-top:-1px;}
+button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;}
+button.btn.large,input[type="submit"].btn.large{*padding-top:7px;*padding-bottom:7px;}
+button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom:3px;}
+.btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";}
+.btn-group:after{clear:both;}
+.btn-group:first-child{*margin-left:0;}
+.btn-group+.btn-group{margin-left:5px;}
+.btn-toolbar{margin-top:9px;margin-bottom:9px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;}
+.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
+.btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
+.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
+.btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
+.btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active,.btn-group .btn.active{z-index:2;}
+.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;}
+.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:5px;*padding-bottom:5px;}
+.btn-group.open{*z-index:1000;}.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn .caret{margin-top:7px;margin-left:0;}
+.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);}
+.primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
+.btn.small .caret{margin-top:4px;}
+.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.alert,.alert-heading{color:#c09853;}
+.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;}
+.alert-success{background-color:#dff0d8;border-color:#d6e9c6;}
+.alert-success,.alert-success .alert-heading{color:#468847;}
+.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;}
+.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading{color:#b94a48;}
+.alert-info{background-color:#d9edf7;border-color:#bce8f1;}
+.alert-info,.alert-info .alert-heading{color:#3a87ad;}
+.alert-block{padding-top:14px;padding-bottom:14px;}
+.alert-block>p,.alert-block>ul{margin-bottom:0;}
+.alert-block p+p{margin-top:5px;}
+.nav{margin-left:0;margin-bottom:18px;list-style:none;}
+.nav>li>a{display:block;}
+.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;}
+.nav.list{padding-left:14px;padding-right:14px;margin-bottom:0;}
+.nav.list>li>a,.nav.list .nav-header{display:block;padding:3px 15px;margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
+.nav.list .nav-header{font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-transform:uppercase;}
+.nav.list>li+.nav-header{margin-top:9px;}
+.nav.list .active>a{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;}
+.nav.list .icon{margin-right:2px;}
+.tabs,.pills{*zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
+.tabs:after,.pills:after{clear:both;}
+.tabs>li,.pills>li{float:left;}
+.tabs>li>a,.pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
+.tabs{border-bottom:1px solid #ddd;}
+.tabs>li{margin-bottom:-1px;}
+.tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
+.tabs>.active>a,.tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
+.pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.pills .active>a,.pills .active>a:hover{color:#ffffff;background-color:#0088cc;}
+.nav.stacked>li{float:none;}
+.nav.stacked>li>a{margin-right:0;}
+.tabs.stacked{border-bottom:0;}
+.tabs.stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.tabs.stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
+.tabs.stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
+.tabs.stacked>li>a:hover{border-color:#ddd;z-index:2;}
+.pills.stacked>li>a{margin-bottom:3px;}
+.pills.stacked>li:last-child>a{margin-bottom:1px;}
+.pills .dropdown-menu,.tabs .dropdown-menu{margin-top:1px;border-width:1px;}
+.pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;}
+.tabs .dropdown-toggle:hover .caret,.pills .dropdown-toggle:hover .caret{border-top-color:#005580;}
+.tabs .active .dropdown-toggle .caret,.pills .active .dropdown-toggle .caret{border-top-color:#333333;}
+.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;}
+.tabs .open .dropdown-toggle,.pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;}
+.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;opacity:1;filter:alpha(opacity=100);}
+.tabs.stacked .open>a:hover{border-color:#999999;}
+.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";}
+.tabbable:after{clear:both;}
+.tabs-below .tabs,.tabs-right .tabs,.tabs-left .tabs{border-bottom:0;}
+.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
+.tab-content>.active,.pill-content>.active{display:block;}
+.tabs-below .tabs{border-top:1px solid #ddd;}
+.tabs-below .tabs>li{margin-top:-1px;margin-bottom:0;}
+.tabs-below .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
+.tabs-below .tabs .active>a,.tabs-below .tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;}
+.tabs-left .tabs>li,.tabs-right .tabs>li{float:none;}
+.tabs-left .tabs>li>a,.tabs-right .tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;}
+.tabs-left .tabs{float:left;margin-right:19px;border-right:1px solid #ddd;}
+.tabs-left .tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
+.tabs-left .tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;}
+.tabs-left .tabs .active>a,.tabs-left .tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;}
+.tabs-right .tabs{float:right;margin-left:19px;border-left:1px solid #ddd;}
+.tabs-right .tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.tabs-right .tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
+.tabs-right .tabs .active>a,.tabs-right .tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;}
+.navbar{overflow:visible;margin-bottom:18px;}
+.navbar-inner{padding-left:20px;padding-right:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
+.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#222222;}
+.btn-navbar:active,.btn-navbar.active{background-color:#080808 \9;}
+.btn-navbar .i-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);}
+.btn-navbar .i-bar+.i-bar{margin-top:3px;}
+.nav-collapse.collapse{height:auto !important;}
+.navbar .brand:hover{text-decoration:none;}
+.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
+.navbar .navbar-text{margin-bottom:0;line-height:40px;color:#999999;}.navbar .navbar-text a:hover{color:#ffffff;background-color:transparent;}
+.navbar .btn,.navbar .btn-group{margin-top:5px;}
+.navbar .btn-group .btn{margin-top:0;}
+.navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-top:5px;margin-bottom:0;}
+.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;}
+.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;}
+.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#666;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
+.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
+.navbar-fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030;}
+.navbar-fixed-top .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
+.navbar .nav.pull-right{float:right;}
+.navbar .nav>li{display:block;float:left;}
+.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
+.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;}
+.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;background-color:rgba(0, 0, 0, 0.5);}
+.navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222222;border-right:1px solid #333333;}
+.navbar .nav.pull-right{margin-left:10px;margin-right:0;}
+.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
+.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;}
+.navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);}
+.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
+.navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;}
+.navbar .nav.pull-right .dropdown-menu{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
+.navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
+.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
+.breadcrumb .divider{padding:0 5px;color:#999999;}
+.breadcrumb .active a{color:#333333;}
+.pagination{height:36px;margin:18px 0;}
+.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);}
+.pagination li{display:inline;}
+.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;}
+.pagination a:hover,.pagination .active a{background-color:#f5f5f5;}
+.pagination .active a{color:#999999;}
+.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;}
+.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.pagination-centered{text-align:center;}
+.pagination-right{text-align:right;}
+.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";}
+.pager:after{clear:both;}
+.pager li{display:inline;}
+.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
+.pager a:hover{text-decoration:none;background-color:#f5f5f5;}
+.pager .next a{float:right;}
+.pager .previous a{float:left;}
+.modal-open .dropdown-menu{z-index:2050;}
+.modal-open .dropdown.open{*z-index:2050;}
+.modal-open .popover{z-index:2060;}
+.modal-open .tooltip{z-index:2070;}
+.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;}
+.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);}
+.modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
+.modal.fade.in{top:50%;}
+.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;}
+.modal-body{padding:15px;}
+.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
+.modal-footer:after{clear:both;}
+.modal-footer .btn{float:right;margin-left:5px;margin-bottom:0;}
+.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);}
+.tooltip.top{margin-top:-2px;}
+.tooltip.right{margin-left:2px;}
+.tooltip.bottom{margin-top:2px;}
+.tooltip.left{margin-left:-2px;}
+.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.tooltip-arrow{position:absolute;width:0;height:0;}
+.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
+.popover.right{margin-left:5px;}
+.popover.bottom{margin-top:5px;}
+.popover.left{margin-left:-5px;}
+.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.popover .arrow{position:absolute;width:0;height:0;}
+.popover .inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);}
+.popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
+.popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
+.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
+.thumbnails:after{clear:both;}
+.thumbnails>li{float:left;margin:0 0 18px 20px;}
+.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}
+a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
+.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;}
+.thumbnail .caption{padding:9px;}
+.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.label-important{background-color:#b94a48;}
+.label-warning{background-color:#f89406;}
+.label-success{background-color:#468847;}
+.label-info{background-color:#3a87ad;}
+@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
+.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
+.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
+.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
+.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
+.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.accordion{margin-bottom:18px;}
+.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.accordion-heading{border-bottom:0;}
+.accordion-heading .accordion-toggle{display:block;padding:8px 15px;}
+.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
+.carousel{position:relative;line-height:1;}
+.carousel-inner{overflow:hidden;width:100%;position:relative;}
+.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}
+.carousel .item>img{display:block;line-height:1;}
+.carousel .active,.carousel .next,.carousel .prev{display:block;}
+.carousel .active{left:0;}
+.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;}
+.carousel .next{left:100%;}
+.carousel .prev{left:-100%;}
+.carousel .next.left,.carousel .prev.right{left:0;}
+.carousel .active.left{left:-100%;}
+.carousel .active.right{left:100%;}
+.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;}
+.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
+.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
+.carousel-caption h4,.carousel-caption p{color:#ffffff;}
+.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
+.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.invisible{visibility:hidden;}
diff --git a/dist/css/bootstrap.min.responsive b/dist/css/bootstrap.min.responsive
new file mode 100644
index 000000000..e01056e95
--- /dev/null
+++ b/dist/css/bootstrap.min.responsive
@@ -0,0 +1,3 @@
+
+.hidden{display:none;visibility:hidden;}
+@media (max-width:480px){.page-header h1 small{display:block;line-height:18px;} input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} .input-prepend input[class*="span"],.input-append input[class*="span"]{width:auto;} input[type="checkbox"],input[type="radio"]{border:1px solid #ccc;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:10px;padding-right:10px;} .modal{position:absolute;top:10px;left:10px;right:10px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;margin:-10px;} .carousel-caption{position:static;}}@media (max-width:768px){.container{width:auto;padding:0 20px;} .row-fluid{width:100%;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:724px;padding-left:20px;padding-right:20px;} .span1{width:42px;} .span2{width:104px;} .span3{width:166px;} .span4{width:228px;} .span5{width:290px;} .span6{width:352px;} .span7{width:414px;} .span8{width:476px;} .span9{width:538px;} .span10{width:600px;} .span11{width:662px;} .span12{width:724px;} .offset1{margin-left:82px;} .offset2{margin-left:144px;} .offset3{margin-left:206px;} .offset4{margin-left:268px;} .offset5{margin-left:330px;} .offset6{margin-left:392px;} .offset7{margin-left:454px;} .offset8{margin-left:516px;} .offset9{margin-left:578px;} .offset10{margin-left:640px;} .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{padding-top:0;} .navbar-fixed-top{position:static;margin-bottom:18px;} .navbar-inner{padding:5px;background-image:none;} .navbar .container{padding:0;} .navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px;} .navbar .nav-collapse{clear:left;} .navbar .nav{float:none;margin:0 0 9px;} .navbar .nav>li{float:none;} .navbar .nav>li>a{margin-bottom:2px;} .navbar .nav>.vertical-divider{display:none;} .navbar .nav>li>a,.navbar .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .navbar .dropdown-menu li+li a{margin-bottom:2px;} .navbar .nav>li>a:hover,.navbar .dropdown-menu a:hover{background-color:#222222;} .navbar .dropdown-menu{position:static;top:auto;left:auto;float:none;display:block;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .dropdown-menu:before,.navbar .dropdown-menu:after{display:none;} .navbar .dropdown-menu .divider{display:none;} .navbar-form,.navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222222;border-bottom:1px solid #222222;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);} .navbar .nav.pull-right{float:none;margin-left:0;} .navbar-static .navbar-inner{padding-left:10px;padding-right:10px;} .btn-navbar{display:block;} .nav-collapse{overflow:hidden;height:0;}}@media (min-width:1200px){.thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;} .container{width:1170px;} .row{margin-left:-30px;} [class*="span"]{margin-left:30px;} .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;} .row-fluid{width:102.56143440326584%;margin-left:-2.56%;}.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%;}}
diff --git a/dist/css/bootstrap.responsive b/dist/css/bootstrap.responsive
new file mode 100644
index 000000000..44e0125c1
--- /dev/null
+++ b/dist/css/bootstrap.responsive
@@ -0,0 +1,442 @@
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+@media (max-width: 480px) {
+  .page-header h1 small {
+    display: block;
+    line-height: 18px;
+  }
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    height: 28px;
+    /* Make inputs at least the height of their button counterpart */
+  
+    /* Makes inputs behave like true block-level elements */
+  
+    -webkit-box-sizing: border-box;
+    /* Older Webkit */
+  
+    -moz-box-sizing: border-box;
+    /* Older FF */
+  
+    -ms-box-sizing: border-box;
+    /* IE8 */
+  
+    box-sizing: border-box;
+    /* CSS3 spec*/
+  
+  }
+  .input-prepend input[class*="span"], .input-append input[class*="span"] {
+    width: auto;
+  }
+  input[type="checkbox"], input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+  .modal {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    right: 10px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade.in {
+    top: auto;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+@media (max-width: 768px) {
+  .container {
+    width: auto;
+    padding: 0 20px;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row {
+    margin-left: 0;
+  }
+  .row > [class*="span"] {
+    float: none;
+    display: block;
+    width: auto;
+    margin: 0;
+  }
+}
+@media (min-width: 768px) and (max-width: 940px) {
+  .container {
+    width: 724px;
+    padding-left: 20px;
+    padding-right: 20px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .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 {
+    padding-top: 0;
+  }
+  .navbar-fixed-top {
+    position: static;
+    margin-bottom: 18px;
+  }
+  .navbar-inner {
+    padding: 5px;
+    background-image: none;
+  }
+  .navbar .container {
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-left: 10px;
+    padding-right: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .navbar .nav-collapse {
+    clear: left;
+  }
+  .navbar .nav {
+    float: none;
+    margin: 0 0 9px;
+  }
+  .navbar .nav > li {
+    float: none;
+  }
+  .navbar .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .navbar .nav > .vertical-divider {
+    display: none;
+  }
+  .navbar .nav > li > a, .navbar .dropdown-menu a {
+    padding: 6px 15px;
+    font-weight: bold;
+    color: #999999;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+  }
+  .navbar .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover {
+    background-color: #222222;
+  }
+  .navbar .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    float: none;
+    display: block;
+    max-width: none;
+    margin: 0 15px;
+    padding: 0;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+    -moz-border-radius: 0;
+    border-radius: 0;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+  }
+  .navbar .dropdown-menu:before, .navbar .dropdown-menu:after {
+    display: none;
+  }
+  .navbar .dropdown-menu .divider {
+    display: none;
+  }
+  .navbar-form, .navbar-search {
+    float: none;
+    padding: 9px 15px;
+    margin: 9px 0;
+    border-top: 1px solid #222222;
+    border-bottom: 1px solid #222222;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .navbar-static .navbar-inner {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+  .btn-navbar {
+    display: block;
+  }
+  .nav-collapse {
+    overflow: hidden;
+    height: 0;
+  }
+}
+@media (min-width: 1200px) {
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .container {
+    width: 1170px;
+  }
+  .row {
+    margin-left: -30px;
+  }
+  [class*="span"] {
+    margin-left: 30px;
+  }
+  .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;
+  }
+  .row-fluid {
+    width: 102.56143440326584%;
+    margin-left: -2.56%;
+  }
+  .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%;
+  }
+}
diff --git a/dist/img/glyphicons-halflings-white.png b/dist/img/glyphicons-halflings-white.png
new file mode 100644
index 000000000..a20760bfd
Binary files /dev/null and b/dist/img/glyphicons-halflings-white.png differ
diff --git a/dist/img/glyphicons-halflings.png b/dist/img/glyphicons-halflings.png
new file mode 100644
index 000000000..92d4445df
Binary files /dev/null and b/dist/img/glyphicons-halflings.png differ
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
new file mode 100644
index 000000000..265e75883
--- /dev/null
+++ b/dist/js/bootstrap.js
@@ -0,0 +1,1722 @@
+/* ===================================================
+ * bootstrap-transition.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#transitions
+ * ===================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+!function( $ ) {
+
+  $(function () {
+
+    "use strict"
+
+    /* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
+     * ======================================================= */
+
+    $.support.transition = (function () {
+      var thisBody = document.body || document.documentElement
+        , thisStyle = thisBody.style
+        , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined
+
+      return support && {
+        end: (function () {
+          var transitionEnd = "TransitionEnd"
+          if ( $.browser.webkit ) {
+          	transitionEnd = "webkitTransitionEnd"
+          } else if ( $.browser.mozilla ) {
+          	transitionEnd = "transitionend"
+          } else if ( $.browser.opera ) {
+          	transitionEnd = "oTransitionEnd"
+          }
+          return transitionEnd
+        }())
+      }
+    })()
+
+  })
+  
+}( window.jQuery )
+/* ==========================================================
+ * bootstrap-alert.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function( $ ){
+
+  "use strict"
+
+ /* ALERT CLASS DEFINITION
+  * ====================== */
+
+  var dismiss = '[data-dismiss="alert"]'
+    , Alert = function ( el ) {
+        $(el).on('click', dismiss, this.close)
+      }
+
+  Alert.prototype = {
+
+    constructor: Alert
+
+  , close: function ( e ) {
+      var $this = $(this)
+        , selector = $this.attr('data-target')
+        , $parent
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      $parent = $(selector)
+      $parent.trigger('close')
+
+      e && e.preventDefault()
+
+      $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+
+      $parent.removeClass('in')
+
+      function removeElement() {
+        $parent.remove()
+        $parent.trigger('closed')
+      }
+
+      $.support.transition && $parent.hasClass('fade') ?
+        $parent.on($.support.transition.end, removeElement) :
+        removeElement()
+    }
+
+  }
+
+
+ /* ALERT PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.alert = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('alert')
+      if (!data) $this.data('alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.alert.Constructor = Alert
+
+
+ /* ALERT DATA-API
+  * ============== */
+
+  $(function () {
+    $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
+  })
+
+}( window.jQuery )
+/* ============================================================
+ * bootstrap-button.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+!function( $ ){
+
+  "use strict"
+
+ /* BUTTON PUBLIC CLASS DEFINITION
+  * ============================== */
+
+  var Button = function ( element, options ) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.button.defaults, options)
+  }
+
+  Button.prototype = {
+
+      constructor: Button
+
+    , setState: function ( state ) {
+        var d = 'disabled'
+          , $el = this.$element
+          , data = $el.data()
+          , val = $el.is('input') ? 'val' : 'html'
+
+        state = state + 'Text'
+        data.resetText || $el.data('resetText', $el[val]())
+
+        $el[val](data[state] || this.options[state])
+
+        // push to event loop to allow forms to submit
+        setTimeout(function () {
+          state == 'loadingText' ?
+            $el.addClass(d).attr(d, d) :
+            $el.removeClass(d).removeAttr(d)
+        }, 0)
+      }
+
+    , toggle: function () {
+        var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
+
+        $parent && $parent
+          .find('.active')
+          .removeClass('active')
+
+        this.$element.toggleClass('active')
+      }
+
+  }
+
+
+ /* BUTTON PLUGIN DEFINITION
+  * ======================== */
+
+  $.fn.button = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('button')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('button', (data = new Button(this, options)))
+      if (option == 'toggle') data.toggle()
+      else if (option) data.setState(option)
+    })
+  }
+
+  $.fn.button.defaults = {
+    loadingText: 'loading...'
+  }
+
+  $.fn.button.Constructor = Button
+
+
+ /* BUTTON DATA-API
+  * =============== */
+
+  $(function () {
+    $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
+      $(e.target).button('toggle')
+    })
+  })
+
+}( window.jQuery )
+/* ==========================================================
+ * bootstrap-carousel.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function( $ ){
+
+  "use strict"
+
+ /* CAROUSEL CLASS DEFINITION
+  * ========================= */
+
+  var Carousel = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.carousel.defaults, options)
+    this.options.slide && this.slide(this.options.slide)
+  }
+
+  Carousel.prototype = {
+
+    cycle: function () {
+      this.interval = setInterval($.proxy(this.next, this), this.options.interval)
+      return this
+    }
+
+  , to: function (pos) {
+      var $active = this.$element.find('.active')
+        , children = $active.parent().children()
+        , activePos = children.index($active)
+        , that = this
+
+      if (pos > (children.length - 1) || pos < 0) return
+
+      if (this.sliding) {
+        return this.$element.one('slid', function () {
+          that.to(pos)
+        })
+      }
+
+      if (activePos == pos) {
+        return this.pause().cycle()
+      }
+
+      return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
+    }
+
+  , pause: function () {
+      clearInterval(this.interval)
+      return this
+    }
+
+  , next: function () {
+      if (this.sliding) return
+      return this.slide('next')
+    }
+
+  , prev: function () {
+      if (this.sliding) return
+      return this.slide('prev')
+    }
+
+  , slide: function (type, next) {
+      var $active = this.$element.find('.active')
+        , $next = next || $active[type]()
+        , isCycling = this.interval
+        , direction = type == 'next' ? 'left' : 'right'
+        , fallback  = type == 'next' ? 'first' : 'last'
+        , that = this
+
+      this.sliding = true
+
+      isCycling && this.pause()
+
+      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
+
+      if (!$.support.transition && this.$element.hasClass('slide')) {
+        this.$element.trigger('slide')
+        $active.removeClass('active')
+        $next.addClass('active')
+        this.sliding = false
+        this.$element.trigger('slid')
+      } else {
+        $next.addClass(type)
+        $next[0].offsetWidth // force reflow
+        $active.addClass(direction)
+        $next.addClass(direction)
+        this.$element.trigger('slide')
+        this.$element.one($.support.transition.end, function () {
+          $next.removeClass([type, direction].join(' ')).addClass('active')
+          $active.removeClass(['active', direction].join(' '))
+          that.sliding = false
+          setTimeout(function () { that.$element.trigger('slid') }, 0)
+        })
+      }
+
+      isCycling && this.cycle()
+
+      return this
+    }
+
+  }
+
+
+ /* CAROUSEL PLUGIN DEFINITION
+  * ========================== */
+
+  $.fn.carousel = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('carousel')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
+      if (typeof option == 'number') data.to(option)
+      else if (typeof option == 'string' || (option = options.slide)) data[option]()
+      else data.cycle()
+    })
+  }
+
+  $.fn.carousel.defaults = {
+    interval: 5000
+  }
+
+  $.fn.carousel.Constructor = Carousel
+
+
+ /* CAROUSEL DATA-API
+  * ================= */
+
+  $(function () {
+    $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
+      var $this = $(this), href
+        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+        , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
+      $target.carousel(options)
+      e.preventDefault()
+    })
+  })
+
+}( window.jQuery )
+/* =============================================================
+ * bootstrap-collapse.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+!function( $ ){
+
+  "use strict"
+
+  var Collapse = function ( element, options ) {
+  	this.$element = $(element)
+    this.options = $.extend({}, $.fn.collapse.defaults, options)
+
+    if (this.options["parent"]) {
+      this.$parent = $(this.options["parent"])
+    }
+
+    this.options.toggle && this.toggle()
+  }
+
+  Collapse.prototype = {
+
+    constructor: Collapse
+
+  , dimension: function () {
+      var hasWidth = this.$element.hasClass('width')
+      return hasWidth ? 'width' : 'height'
+    }
+
+  , show: function () {
+      var dimension = this.dimension()
+        , scroll = $.camelCase(['scroll', dimension].join('-'))
+        , actives = this.$parent && this.$parent.find('.in')
+        , hasData
+
+      if (actives && actives.length) {
+        hasData = actives.data('collapse')
+        actives.collapse('hide')
+        hasData || actives.data('collapse', null)
+      }
+
+      this.$element[dimension](0)
+      this.transition('addClass', 'show', 'shown')
+      this.$element[dimension](this.$element[0][scroll])
+
+    }
+
+  , hide: function () {
+      var dimension = this.dimension()
+      this.reset(this.$element[dimension]())
+      this.transition('removeClass', 'hide', 'hidden')
+      this.$element[dimension](0)
+    }
+
+  , reset: function ( size ) {
+      var dimension = this.dimension()
+
+      this.$element
+        .removeClass('collapse')
+        [dimension](size || '')
+        [0].offsetWidth
+
+      this.$element.addClass('collapse')
+    }
+
+  , transition: function ( method, startEvent, completeEvent ) {
+      var that = this
+        , complete = function () {
+            if (startEvent == 'show') that.reset()
+            that.$element.trigger(completeEvent)
+          }
+
+      this.$element
+        .trigger(startEvent)
+        [method]('in')
+
+      $.support.transition && this.$element.hasClass('collapse') ?
+        this.$element.one($.support.transition.end, complete) :
+        complete()
+  	}
+
+  , toggle: function () {
+      this[this.$element.hasClass('in') ? 'hide' : 'show']()
+  	}
+
+  }
+
+  /* COLLAPSIBLE PLUGIN DEFINITION
+  * ============================== */
+
+  $.fn.collapse = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('collapse')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.collapse.defaults = {
+    toggle: true
+  }
+
+  $.fn.collapse.Constructor = Collapse
+
+
+ /* COLLAPSIBLE DATA-API
+  * ==================== */
+
+  $(function () {
+    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
+      var $this = $(this), href
+        , target = $this.attr('data-target')
+          || e.preventDefault()
+          || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+        , option = $(target).data('collapse') ? 'toggle' : $this.data()
+      $(target).collapse(option)
+    })
+  })
+
+}( window.jQuery )
+/* ============================================================
+ * bootstrap-dropdown.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function( $ ){
+
+  "use strict"
+
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle="dropdown"]'
+    , Dropdown = function ( element ) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function ( e ) {
+      var $this = $(this)
+        , selector = $this.attr('data-target')
+        , $parent
+        , isActive
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      $parent = $(selector)
+      $parent.length || ($parent = $this.parent())
+
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+      !isActive && $parent.toggleClass('open')
+
+      return false
+    }
+
+  }
+
+  function clearMenus() {
+    $(toggle).parent().removeClass('open')
+  }
+
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  $.fn.dropdown = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  $(function () {
+    $('html').on('click.dropdown.data-api', clearMenus)
+    $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+  })
+
+}( window.jQuery )
+/* =========================================================
+ * bootstrap-modal.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#modals
+ * =========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+
+!function( $ ){
+
+  "use strict"
+
+ /* MODAL CLASS DEFINITION
+  * ====================== */
+
+  var Modal = function ( content, options ) {
+    this.options = $.extend({}, $.fn.modal.defaults, options)
+    this.$element = $(content)
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+  }
+
+  Modal.prototype = {
+
+      constructor: Modal
+
+    , toggle: function () {
+        return this[!this.isShown ? 'show' : 'hide']()
+      }
+
+    , show: function () {
+        var that = this
+
+        if (this.isShown) return
+
+        $('body').addClass('modal-open')
+
+        this.isShown = true
+        this.$element.trigger('show')
+
+        escape.call(this)
+        backdrop.call(this, function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
+          !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position
+
+          that.$element
+            .show()
+
+          if (transition) {
+            that.$element[0].offsetWidth // force reflow
+          }
+
+          that.$element.addClass('in')
+
+          transition ?
+            that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
+            that.$element.trigger('shown')
+
+        })
+      }
+
+    , hide: function ( e ) {
+        e && e.preventDefault()
+
+        if (!this.isShown) return
+
+        var that = this
+        this.isShown = false
+
+        $('body').removeClass('modal-open')
+
+        escape.call(this)
+
+        this.$element
+          .trigger('hide')
+          .removeClass('in')
+
+        $.support.transition && this.$element.hasClass('fade') ?
+          hideWithTransition.call(this) :
+          hideModal.call(this)
+      }
+
+  }
+
+
+ /* MODAL PRIVATE METHODS
+  * ===================== */
+
+  function hideWithTransition() {
+    var that = this
+      , timeout = setTimeout(function () {
+          that.$element.off($.support.transition.end)
+          hideModal.call(that)
+        }, 500)
+
+    this.$element.one($.support.transition.end, function () {
+      clearTimeout(timeout)
+      hideModal.call(that)
+    })
+  }
+
+  function hideModal( that ) {
+    this.$element
+      .hide()
+      .trigger('hidden')
+
+    backdrop.call(this)
+  }
+
+  function backdrop( callback ) {
+    var that = this
+      , animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+    if (this.isShown && this.options.backdrop) {
+      var doAnimate = $.support.transition && animate
+
+      this.$backdrop = $('
                        ')
+        .appendTo(document.body)
+
+      if (this.options.backdrop != 'static') {
+        this.$backdrop.click($.proxy(this.hide, this))
+      }
+
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+      this.$backdrop.addClass('in')
+
+      doAnimate ?
+        this.$backdrop.one($.support.transition.end, callback) :
+        callback()
+
+    } else if (!this.isShown && this.$backdrop) {
+      this.$backdrop.removeClass('in')
+
+      $.support.transition && this.$element.hasClass('fade')?
+        this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) :
+        removeBackdrop.call(this)
+
+    } else if (callback) {
+      callback()
+    }
+  }
+
+  function removeBackdrop() {
+    this.$backdrop.remove()
+    this.$backdrop = null
+  }
+
+  function escape() {
+    var that = this
+    if (this.isShown && this.options.keyboard) {
+      $(document).on('keyup.dismiss.modal', function ( e ) {
+        e.which == 27 && that.hide()
+      })
+    } else if (!this.isShown) {
+      $(document).off('keyup.dismiss.modal')
+    }
+  }
+
+
+ /* MODAL PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.modal = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else data.show()
+    })
+  }
+
+  $.fn.modal.defaults = {
+      backdrop: true
+    , keyboard: true
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL DATA-API
+  * ============== */
+
+  $(function () {
+    $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
+      var $this = $(this), href
+        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+        , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data())
+
+      e.preventDefault()
+      $target.modal(option)
+    })
+  })
+
+}( window.jQuery )
+/* ===========================================================
+ * bootstrap-tooltip.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+!function( $ ) {
+
+  "use strict"
+
+ /* TOOLTIP PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Tooltip = function ( element, options ) {
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.prototype = {
+
+    constructor: Tooltip
+
+  , init: function ( type, element, options ) {
+      var eventIn
+        , eventOut
+
+      this.type = type
+      this.$element = $(element)
+      this.options = this.getOptions(options)
+      this.enabled = true
+
+      if (this.options.trigger != 'manual') {
+        eventIn  = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
+        eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
+        this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
+      }
+
+      this.options.selector ?
+        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+        this.fixTitle()
+    }
+
+  , getOptions: function ( options ) {
+      options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
+
+      if (options.delay && typeof options.delay == 'number') {
+        options.delay = {
+          show: options.delay
+        , hide: options.delay
+        }
+      }
+
+      return options
+    }
+
+  , enter: function ( e ) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.show) {
+        self.show()
+      } else {
+        self.hoverState = 'in'
+        setTimeout(function() {
+          if (self.hoverState == 'in') {
+            self.show()
+          }
+        }, self.options.delay.show)
+      }
+    }
+
+  , leave: function ( e ) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.hide) {
+        self.hide()
+      } else {
+        self.hoverState = 'out'
+        setTimeout(function() {
+          if (self.hoverState == 'out') {
+            self.hide()
+          }
+        }, self.options.delay.hide)
+      }
+    }
+
+  , show: function () {
+      var $tip
+        , inside
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+
+      if (this.hasContent() && this.enabled) {
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        inside = /in/.test(placement)
+
+        $tip
+          .remove()
+          .css({ top: 0, left: 0, display: 'block' })
+          .appendTo(inside ? this.$element : document.body)
+
+        pos = this.getPosition(inside)
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        switch (inside ? placement.split(' ')[1] : placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+        }
+
+        $tip
+          .css(tp)
+          .addClass(placement)
+          .addClass('in')
+      }
+    }
+
+  , setContent: function () {
+      var $tip = this.tip()
+      $tip.find('.tooltip-inner').html(this.getTitle())
+      $tip.removeClass('fade in top bottom left right')
+    }
+
+  , hide: function () {
+      var that = this
+        , $tip = this.tip()
+
+      $tip.removeClass('in')
+
+      function removeWithAnimation() {
+        var timeout = setTimeout(function () {
+          $tip.off($.support.transition.end).remove()
+        }, 500)
+
+        $tip.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          $tip.remove()
+        })
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        removeWithAnimation() :
+        $tip.remove()
+    }
+
+  , fixTitle: function () {
+      var $e = this.$element
+      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+        $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
+      }
+    }
+
+  , hasContent: function () {
+      return this.getTitle()
+    }
+
+  , getPosition: function (inside) {
+      return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
+        width: this.$element[0].offsetWidth
+      , height: this.$element[0].offsetHeight
+      })
+    }
+
+  , getTitle: function () {
+      var title
+        , $e = this.$element
+        , o = this.options
+
+      title = $e.attr('data-original-title')
+        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+      title = title.toString().replace(/(^\s*|\s*$)/, "")
+
+      return title
+    }
+
+  , tip: function () {
+      return this.$tip = this.$tip || $(this.options.template)
+    }
+
+  , validate: function () {
+      if (!this.$element[0].parentNode) {
+        this.hide()
+        this.$element = null
+        this.options = null
+      }
+    }
+
+  , enable: function () {
+      this.enabled = true
+    }
+
+  , disable: function () {
+      this.enabled = false
+    }
+
+  , toggleEnabled: function () {
+      this.enabled = !this.enabled
+    }
+
+  , toggle: function () {
+      this[this.tip().hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* TOOLTIP PLUGIN DEFINITION
+  * ========================= */
+
+  $.fn.tooltip = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+  $.fn.tooltip.defaults = {
+    animation: true
+  , delay: 0
+  , selector: false
+  , placement: 'top'
+  , trigger: 'hover'
+  , title: ''
+  , template: '
                        '
+  }
+
+}( window.jQuery )
+/* ===========================================================
+ * bootstrap-popover.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#popovers
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================================================== */
+
+
+!function( $ ) {
+
+ "use strict"
+
+  var Popover = function ( element, options ) {
+    this.init('popover', element, options)
+  }
+
+  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
+     ========================================== */
+
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
+
+    constructor: Popover
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+        , content = this.getContent()
+
+      $tip.find('.title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
+      $tip.find('.content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
+
+      $tip.removeClass('fade top bottom left right in')
+    }
+
+  , hasContent: function () {
+      return this.getTitle() || this.getContent()
+    }
+
+  , getContent: function () {
+      var content
+        , $e = this.$element
+        , o = this.options
+
+      content = $e.attr('data-content')
+        || (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
+
+      content = content.toString().replace(/(^\s*|\s*$)/, "")
+
+      return content
+    }
+
+  , tip: function() {
+      if (!this.$tip) {
+        this.$tip = $(this.options.template)
+      }
+      return this.$tip
+    }
+
+  })
+
+
+ /* POPOVER PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.popover = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('popover')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.popover.Constructor = Popover
+
+  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
+    placement: 'right'
+  , content: ''
+  , template: '
                        '
+  })
+
+}( window.jQuery )
+/* =============================================================
+ * bootstrap-scrollspy.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#scrollspy
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================== */
+
+!function ( $ ) {
+
+  "use strict"
+
+  /* SCROLLSPY CLASS DEFINITION
+   * ========================== */
+
+  function ScrollSpy( element, options) {
+    var process = $.proxy(this.process, this)
+      , $element = $(element).is('body') ? $(window) : $(element)
+      , href
+    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
+    this.$scrollElement = $element.on('scroll.scroll.data-api', process)
+    this.selector = (this.options.target
+      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      || '') + ' .nav li > a'
+    this.$body = $('body').on('click.scroll.data-api', this.selector, process)
+    this.refresh()
+    this.process()
+  }
+
+  ScrollSpy.prototype = {
+
+      constructor: ScrollSpy
+
+    , refresh: function () {
+        this.targets = this.$body
+          .find(this.selector)
+          .map(function () {
+            var href = $(this).attr('href')
+            return /^#\w/.test(href) && $(href).length ? href : null
+          })
+
+        this.offsets = $.map(this.targets, function (id) {
+          return $(id).position().top
+        })
+      }
+
+    , process: function () {
+        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
+          , offsets = this.offsets
+          , targets = this.targets
+          , activeTarget = this.activeTarget
+          , i
+
+        for (i = offsets.length; i--;) {
+          activeTarget != targets[i]
+            && scrollTop >= offsets[i]
+            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+            && this.activate( targets[i] )
+        }
+      }
+
+    , activate: function (target) {
+        var active
+
+        this.activeTarget = target
+
+        this.$body
+          .find(this.selector).parent('.active')
+          .removeClass('active')
+
+        active = this.$body
+          .find(this.selector + '[href="' + target + '"]')
+          .parent('li')
+          .addClass('active')
+
+        if ( active.parent('.dropdown-menu') )  {
+          active.closest('li.dropdown').addClass('active')
+        }
+      }
+
+  }
+
+
+ /* SCROLLSPY PLUGIN DEFINITION
+  * =========================== */
+
+  $.fn.scrollspy = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('scrollspy')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.scrollspy.Constructor = ScrollSpy
+
+  $.fn.scrollspy.defaults = {
+    offset: 10
+  }
+
+
+ /* SCROLLSPY DATA-API
+  * ================== */
+
+  $(function () {
+    $('[data-spy="scroll"]').each(function () {
+      var $spy = $(this)
+      $spy.scrollspy($spy.data())
+    })
+  })
+
+}( window.jQuery )
+/* ========================================================
+ * bootstrap-tab.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#tabs
+ * ========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ======================================================== */
+
+
+!function( $ ){
+
+  "use strict"
+
+ /* TAB CLASS DEFINITION
+  * ==================== */
+
+  var Tab = function ( element ) {
+    this.element = $(element)
+  }
+
+  Tab.prototype = {
+
+    constructor: Tab
+
+  , show: function () {
+      var $this = this.element
+        , $ul = $this.closest('ul:not(.dropdown-menu)')
+        , selector = $this.attr('data-target')
+        , previous
+        , $target
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      if ( $this.parent('li').hasClass('active') ) return
+
+      previous = $ul.find('.active a').last()[0]
+
+      $this.trigger({
+        type: 'show'
+      , relatedTarget: previous
+      })
+
+      $target = $(selector)
+
+      this.activate($this.parent('li'), $ul)
+      this.activate($target, $target.parent(), function () {
+        $this.trigger({
+          type: 'shown'
+        , relatedTarget: previous
+        })
+      })
+    }
+
+  , activate: function ( element, container, callback) {
+      var $active = container.find('> .active')
+        , transition = callback
+            && $.support.transition
+            && $active.hasClass('fade')
+
+      function next() {
+        $active
+          .removeClass('active')
+          .find('> .dropdown-menu > .active')
+          .removeClass('active')
+
+        element.addClass('active')
+
+        if (transition) {
+          element[0].offsetWidth // reflow for transition
+          element.addClass('in')
+        } else {
+          element.removeClass('fade')
+        }
+
+        if ( element.parent('.dropdown-menu') ) {
+          element.closest('li.dropdown').addClass('active')
+        }
+
+        callback && callback()
+      }
+
+      transition ?
+        $active.one($.support.transition.end, next) :
+        next()
+
+      $active.removeClass('in')
+    }
+  }
+
+
+ /* TAB PLUGIN DEFINITION
+  * ===================== */
+
+  $.fn.tab = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tab')
+      if (!data) $this.data('tab', (data = new Tab(this)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tab.Constructor = Tab
+
+
+ /* TAB DATA-API
+  * ============ */
+
+  $(function () {
+    $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+      e.preventDefault()
+      $(this).tab('show')
+    })
+  })
+
+}( window.jQuery )
+/* =============================================================
+ * bootstrap-typeahead.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+!function( $ ){
+
+  "use strict"
+
+  var Typeahead = function ( element, options ) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.matcher = this.options.matcher || this.matcher
+    this.sorter = this.options.sorter || this.sorter
+    this.highlighter = this.options.highlighter || this.highlighter
+    this.$menu = $(this.options.menu).appendTo('body')
+    this.source = this.options.source
+    this.shown = false
+    this.listen()
+  }
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead
+
+  , select: function () {
+      var val = this.$menu.find('.active').attr('data-value')
+      this.$element.val(val)
+      return this.hide()
+    }
+
+  , show: function () {
+      var pos = $.extend({}, this.$element.offset(), {
+        height: this.$element[0].offsetHeight
+      })
+
+      this.$menu.css({
+        top: pos.top + pos.height
+      , left: pos.left
+      })
+
+      this.$menu.show()
+      this.shown = true
+      return this
+    }
+
+  , hide: function () {
+      this.$menu.hide()
+      this.shown = false
+      return this
+    }
+
+  , lookup: function (event) {
+      var that = this
+        , items
+        , q
+
+      this.query = this.$element.val()
+
+      if (!this.query) {
+        return this.shown ? this.hide() : this
+      }
+
+      items = $.grep(this.source, function (item) {
+        if (that.matcher(item)) return item
+      })
+
+      items = this.sorter(items)
+
+      if (!items.length) {
+        return this.shown ? this.hide() : this
+      }
+
+      return this.render(items.slice(0, this.options.items)).show()
+    }
+
+  , matcher: function (item) {
+      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
+    }
+
+  , sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item
+
+      while (item = items.shift()) {
+        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+        else if (~item.indexOf(this.query)) caseSensitive.push(item)
+        else caseInsensitive.push(item)
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive)
+    }
+
+  , highlighter: function (item) {
+      return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) {
+        return '' + match + ''
+      })
+    }
+
+  , render: function (items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        i = $(that.options.item).attr('data-value', item)
+        i.find('a').html(that.highlighter(item))
+        return i[0]
+      })
+
+      items.first().addClass('active')
+      this.$menu.html(items)
+      return this
+    }
+
+  , next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next()
+
+      if (!next.length) {
+        next = $(this.$menu.find('li')[0])
+      }
+
+      next.addClass('active')
+    }
+
+  , prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , prev = active.prev()
+
+      if (!prev.length) {
+        prev = this.$menu.find('li').last()
+      }
+
+      prev.addClass('active')
+    }
+
+  , listen: function () {
+      this.$element
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      if ($.browser.webkit || $.browser.msie) {
+        this.$element.on('keydown', $.proxy(this.keypress, this))
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+    }
+
+  , keyup: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+
+      switch(e.keyCode) {
+        case 40: // down arrow
+        case 38: // up arrow
+          break
+
+        case 9: // tab
+        case 13: // enter
+          if (!this.shown) return
+          this.select()
+          break
+
+        case 27: // escape
+          this.hide()
+          break
+
+        default:
+          this.lookup()
+      }
+
+  }
+
+  , keypress: function (e) {
+      e.stopPropagation()
+      if (!this.shown) return
+
+      switch(e.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          e.preventDefault()
+          break
+
+        case 38: // up arrow
+          e.preventDefault()
+          this.prev()
+          break
+
+        case 40: // down arrow
+          e.preventDefault()
+          this.next()
+          break
+      }
+    }
+
+  , blur: function (e) {
+      var that = this
+      e.stopPropagation()
+      e.preventDefault()
+      setTimeout(function () { that.hide() }, 150)
+    }
+
+  , click: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+      this.select()
+    }
+
+  , mouseenter: function (e) {
+      this.$menu.find('.active').removeClass('active')
+      $(e.currentTarget).addClass('active')
+    }
+
+  }
+
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+   * =========================== */
+
+  $.fn.typeahead = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.typeahead.defaults = {
+    source: []
+  , items: 8
+  , menu: '
                          '
+  , item: '
                          • '
+  }
+
+  $.fn.typeahead.Constructor = Typeahead
+
+
+ /* TYPEAHEAD DATA-API
+  * ================== */
+
+  $(function () {
+    $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
+      var $this = $(this)
+      if ($this.data('typeahead')) return
+      e.preventDefault()
+      $this.typeahead($this.data())
+    })
+  })
+
+}( window.jQuery )
diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js
new file mode 100644
index 000000000..9d4fbd07a
--- /dev/null
+++ b/dist/js/bootstrap.min.js
@@ -0,0 +1 @@
+!function(a){a(function(){"use strict",a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.remove(),e.trigger("closed")}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype={constructor:b,setState:function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},toggle:function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")}},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){a(b.target).button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.carousel.defaults,c),this.options.slide&&this.slide(this.options.slide)};b.prototype={cycle:function(){return this.interval=setInterval(a.proxy(this.next,this),this.options.interval),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(){return clearInterval(this.interval),this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;return this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h](),!a.support.transition&&this.$element.hasClass("slide")?(this.$element.trigger("slide"),d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")):(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.trigger("slide"),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})),f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=typeof c=="object"&&c;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():e.cycle()})},a.fn.carousel.defaults={interval:5e3},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find(".in"),e;d&&d.length&&(e=d.data("collapse"),d.collapse("hide"),e||d.data("collapse",null)),this.$element[b](0),this.transition("addClass","show","shown"),this.$element[b](this.$element[0][c])},hide:function(){var a=this.dimension();this.reset(this.$element[a]()),this.transition("removeClass","hide","hidden"),this.$element[a](0)},reset:function(a){var b=this.dimension();this.$element.removeClass("collapse")[b](a||"")[0].offsetWidth,this.$element.addClass("collapse")},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.$element.trigger(d)};this.$element.trigger(c)[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e=c.attr("data-target"),f,g;return e||(e=c.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,"")),f=a(e),f.length||(f=c.parent()),g=f.hasClass("open"),d(),!g&&f.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
                          ').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=a.extend({},a.fn.modal.defaults,c),this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this;if(this.isShown)return;a("body").addClass("modal-open"),this.isShown=!0,this.$element.trigger("show"),g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");!b.$element.parent().length&&b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();if(!this.isShown)return;var e=this;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.trigger("hide").removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=typeof c=="object"&&c;e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.show?c.show():(c.hoverState="in",setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show))},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.hide?c.hide():(c.hoverState="out",setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide))},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip();a.find(".tooltip-inner").html(this.getTitle()),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,delay:0,selector:!1,placement:"top",trigger:"hover",title:"",template:'
                          '}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var b=this.tip(),c=this.getTitle(),d=this.getContent();b.find(".title")[a.type(c)=="object"?"append":"html"](c),b.find(".content > *")[a.type(d)=="object"?"append":"html"](d),b.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'
                          '})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body").on("click.scroll.data-api",this.selector,d),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){this.targets=this.$body.find(this.selector).map(function(){var b=a(this).attr("href");return/^#\w/.test(b)&&a(b).length?b:null}),this.offsets=a.map(this.targets,function(b){return a(b).position().top})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.offsets,c=this.targets,d=this.activeTarget,e;for(e=b.length;e--;)d!=c[e]&&a>=b[e]&&(!b[e+1]||a<=b[e+1])&&this.activate(c[e])},activate:function(a){var b;this.activeTarget=a,this.$body.find(this.selector).parent(".active").removeClass("active"),b=this.$body.find(this.selector+'[href="'+a+'"]').parent("li").addClass("active"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],b.trigger({type:"show",relatedTarget:e}),f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(a),this.hide()},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){if(c.matcher(a))return a}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){return a.replace(new RegExp("("+this.query+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){a.stopPropagation(),a.preventDefault();switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:this.hide();break;default:this.lookup()}},keypress:function(a){a.stopPropagation();if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}},blur:function(a){var b=this;a.stopPropagation(),a.preventDefault(),setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
                            ',item:'
                            • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery);
\ No newline at end of file
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 585700f8e..b29b63aee 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -123,7 +123,7 @@
             .map(function () { return this.value })
             .toArray()
         , vars = {}
-        , img = ['glyphicons-halflings-sprite.png', 'glyphicons-halflings-sprite-white.png']
+        , img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png']
 
     $("#variables.download input")
       .each(function () {
-- 
cgit v1.2.3


From 298e637d004c66a0e4351c7ce4a8d03866b75f66 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 29 Jan 2012 16:33:29 -0800
Subject: remove dist dir

---
 Makefile                                |   27 +-
 dist/css/bootstrap.css                  | 3352 -------------------------------
 dist/css/bootstrap.min.css              |  615 ------
 dist/css/bootstrap.min.responsive       |    3 -
 dist/css/bootstrap.responsive           |  442 ----
 dist/img/glyphicons-halflings-white.png |  Bin 4352 -> 0 bytes
 dist/img/glyphicons-halflings.png       |  Bin 4352 -> 0 bytes
 dist/js/bootstrap.js                    | 1722 ----------------
 dist/js/bootstrap.min.js                |    1 -
 docs/assets/bootstrap.zip               |  Bin 51322 -> 51322 bytes
 docs/less.html                          |    8 +-
 11 files changed, 17 insertions(+), 6153 deletions(-)
 delete mode 100644 dist/css/bootstrap.css
 delete mode 100644 dist/css/bootstrap.min.css
 delete mode 100644 dist/css/bootstrap.min.responsive
 delete mode 100644 dist/css/bootstrap.responsive
 delete mode 100644 dist/img/glyphicons-halflings-white.png
 delete mode 100644 dist/img/glyphicons-halflings.png
 delete mode 100644 dist/js/bootstrap.js
 delete mode 100644 dist/js/bootstrap.min.js

diff --git a/Makefile b/Makefile
index fed5ffca4..8811d03e1 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,7 @@ WATCHR ?= `which watchr`
 # BUILD DOCS
 #
 
-docs: dist
-	cp -r dist bootstrap
+docs: bootstrap
 	zip -r docs/assets/bootstrap.zip bootstrap
 	rm -r bootstrap
 	lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
@@ -19,21 +18,21 @@ docs: dist
 	cp img/* docs/assets/img/
 
 #
-# BUILD SIMPLE DIST DIRECTORY
+# BUILD SIMPLE BOOTSTRAP DIRECTORY
 # lessc & uglifyjs are required
 #
 
-dist:
-	mkdir -p dist/img
-	mkdir -p dist/css
-	mkdir -p dist/js
-	cp img/* dist/img/
-	lessc ${BOOTSTRAP_LESS} > dist/css/bootstrap.css
-	lessc --compress ${BOOTSTRAP_LESS} > dist/css/bootstrap.min.css
-	lessc ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.responsive
-	lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.min.responsive
-	cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > dist/js/bootstrap.js
-	uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.js
+bootstrap:
+	mkdir -p bootstrap/img
+	mkdir -p bootstrap/css
+	mkdir -p bootstrap/js
+	cp img/* bootstrap/img/
+	lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
+	lessc --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
+	lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap.responsive
+	lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap.min.responsive
+	cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > bootstrap/js/bootstrap.js
+	uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.js
 
 #
 # WATCH LESS FILES
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
deleted file mode 100644
index 675446f62..000000000
--- a/dist/css/bootstrap.css
+++ /dev/null
@@ -1,3352 +0,0 @@
-/*!
- * Bootstrap v2.0.0
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-  display: block;
-}
-audio, canvas, video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-audio:not([controls]) {
-  display: none;
-}
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-a:focus {
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-a:hover, a:active {
-  outline: 0;
-}
-sub, sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-sup {
-  top: -0.5em;
-}
-sub {
-  bottom: -0.25em;
-}
-img {
-  max-width: 100%;
-  height: auto;
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-button,
-input,
-select,
-textarea {
-  margin: 0;
-  font-size: 100%;
-  vertical-align: middle;
-}
-button, input {
-  *overflow: visible;
-  line-height: normal;
-}
-button::-moz-focus-inner, input::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  cursor: pointer;
-  -webkit-appearance: button;
-}
-input[type="search"] {
-  -webkit-appearance: textfield;
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-}
-input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none;
-}
-textarea {
-  overflow: auto;
-  vertical-align: top;
-}
-body {
-  margin: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-  color: #555555;
-  background-color: #ffffff;
-}
-a {
-  color: #0088cc;
-  text-decoration: none;
-}
-a:hover {
-  color: #005580;
-  text-decoration: underline;
-}
-.row {
-  margin-left: -20px;
-  *zoom: 1;
-}
-.row:before, .row:after {
-  display: table;
-  content: "";
-}
-.row:after {
-  clear: both;
-}
-[class*="span"] {
-  float: left;
-  margin-left: 20px;
-}
-.span1 {
-  width: 59.99999999999999px;
-}
-.span2 {
-  width: 140px;
-}
-.span3 {
-  width: 220px;
-}
-.span4 {
-  width: 300px;
-}
-.span5 {
-  width: 380px;
-}
-.span6 {
-  width: 460px;
-}
-.span7 {
-  width: 540px;
-}
-.span8 {
-  width: 620px;
-}
-.span9 {
-  width: 700px;
-}
-.span10 {
-  width: 780px;
-}
-.span11 {
-  width: 860px;
-}
-.span12 {
-  width: 940px;
-}
-.offset1 {
-  margin-left: 100px;
-}
-.offset2 {
-  margin-left: 180px;
-}
-.offset3 {
-  margin-left: 260px;
-}
-.offset4 {
-  margin-left: 340px;
-}
-.offset5 {
-  margin-left: 420px;
-}
-.offset6 {
-  margin-left: 500px;
-}
-.offset7 {
-  margin-left: 580px;
-}
-.offset8 {
-  margin-left: 660px;
-}
-.offset9 {
-  margin-left: 740px;
-}
-.offset10 {
-  margin-left: 820px;
-}
-.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;
-  margin-right: auto;
-  *zoom: 1;
-}
-.container:before, .container:after {
-  display: table;
-  content: "";
-}
-.container:after {
-  clear: both;
-}
-.container-fluid {
-  padding-left: 20px;
-  padding-right: 20px;
-  *zoom: 1;
-}
-.container-fluid:before, .container-fluid:after {
-  display: table;
-  content: "";
-}
-.container-fluid:after {
-  clear: both;
-}
-p {
-  margin: 0 0 9px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-}
-p small {
-  font-size: 11px;
-  color: #999999;
-}
-.lead {
-  margin-bottom: 18px;
-  font-size: 20px;
-  font-weight: 200;
-  line-height: 27px;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 0;
-  font-weight: bold;
-  color: #333333;
-  text-rendering: optimizelegibility;
-}
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
-  font-weight: normal;
-  color: #999999;
-}
-h1 {
-  font-size: 30px;
-  line-height: 36px;
-}
-h1 small {
-  font-size: 18px;
-}
-h2 {
-  font-size: 24px;
-  line-height: 36px;
-}
-h2 small {
-  font-size: 18px;
-}
-h3 {
-  line-height: 27px;
-  font-size: 18px;
-}
-h3 small {
-  font-size: 14px;
-}
-h4, h5, h6 {
-  line-height: 18px;
-}
-h4 {
-  font-size: 14px;
-}
-h4 small {
-  font-size: 12px;
-}
-h5 {
-  font-size: 12px;
-}
-h6 {
-  font-size: 11px;
-  color: #999999;
-  text-transform: uppercase;
-}
-.page-header {
-  padding-bottom: 17px;
-  margin: 18px 0;
-  border-bottom: 1px solid #eeeeee;
-}
-.page-header h1 {
-  line-height: 1;
-}
-ul, ol {
-  padding: 0;
-  margin: 0 0 9px 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-ul {
-  list-style: disc;
-}
-ol {
-  list-style: decimal;
-}
-li {
-  line-height: 18px;
-}
-ul.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-dl {
-  margin-bottom: 18px;
-}
-dt, dd {
-  line-height: 18px;
-}
-dt {
-  font-weight: bold;
-}
-dd {
-  margin-left: 9px;
-}
-hr {
-  margin: 18px 0;
-  border: 0;
-  border-top: 1px solid #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-strong {
-  font-weight: bold;
-}
-em {
-  font-style: italic;
-}
-.muted {
-  color: #999999;
-}
-abbr {
-  font-size: 90%;
-  text-transform: uppercase;
-  border-bottom: 1px dotted #ddd;
-  cursor: help;
-}
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 18px;
-  border-left: 5px solid #eeeeee;
-}
-blockquote p {
-  margin-bottom: 0;
-  font-size: 16px;
-  font-weight: 300;
-  line-height: 22.5px;
-}
-blockquote small {
-  display: block;
-  line-height: 18px;
-  color: #999999;
-}
-blockquote small:before {
-  content: '\2014 \00A0';
-}
-blockquote.pull-right {
-  float: right;
-  padding-left: 0;
-  padding-right: 15px;
-  border-left: 0;
-  border-right: 5px solid #eeeeee;
-}
-blockquote.pull-right p, blockquote.pull-right small {
-  text-align: right;
-}
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-address {
-  display: block;
-  margin-bottom: 18px;
-  line-height: 18px;
-  font-style: normal;
-}
-small {
-  font-size: 100%;
-}
-cite {
-  font-style: normal;
-}
-code, pre {
-  padding: 0 3px 2px;
-  font-family: Menlo, Monaco, "Courier New", monospace;
-  font-size: 12px;
-  color: #333333;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-code {
-  padding: 3px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-pre {
-  display: block;
-  padding: 8.5px;
-  margin: 0 0 9px;
-  font-size: 12px;
-  line-height: 18px;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  white-space: pre;
-  white-space: pre-wrap;
-  word-break: break-all;
-}
-pre.prettyprint {
-  margin-bottom: 18px;
-}
-pre code {
-  padding: 0;
-  background-color: transparent;
-}
-form {
-  margin: 0 0 18px;
-}
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 27px;
-  font-size: 19.5px;
-  line-height: 36px;
-  color: #333333;
-  border: 0;
-  border-bottom: 1px solid #eee;
-}
-label,
-input,
-button,
-select,
-textarea {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  font-weight: normal;
-  line-height: 18px;
-}
-label {
-  display: block;
-  margin-bottom: 5px;
-  color: #333333;
-}
-input,
-textarea,
-select,
-.uneditable-input {
-  display: inline-block;
-  width: 210px;
-  height: 18px;
-  padding: 4px;
-  margin-bottom: 9px;
-  font-size: 13px;
-  line-height: 18px;
-  color: #555555;
-  border: 1px solid #ccc;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-label input, label textarea, label select {
-  display: block;
-}
-input[type="image"], input[type="checkbox"], input[type="radio"] {
-  width: auto;
-  height: auto;
-  padding: 0;
-  margin: 3px 0;
-  *margin-top: 0;
-  /* IE7 */
-
-  line-height: normal;
-  border: 0;
-  cursor: pointer;
-  border-radius: 0 \0/;
-}
-input[type="file"] {
-  padding: initial;
-  line-height: initial;
-  border: initial;
-  background-color: #ffffff;
-  background-color: initial;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-input[type="button"], input[type="reset"], input[type="submit"] {
-  width: auto;
-  height: auto;
-}
-select, input[type="file"] {
-  height: 28px;
-  /* In IE7, the height of the select element cannot be changed by height, only font-size */
-
-  *margin-top: 4px;
-  /* For IE7, add top margin to align select with labels */
-
-  line-height: 28px;
-}
-select {
-  width: 220px;
-  background-color: #ffffff;
-}
-select[multiple], select[size] {
-  height: auto;
-}
-input[type="image"] {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-textarea {
-  height: auto;
-}
-input[type="hidden"] {
-  display: none;
-}
-.radio, .checkbox {
-  padding-left: 18px;
-}
-.radio input[type="radio"], .checkbox input[type="checkbox"] {
-  float: left;
-  margin-left: -18px;
-}
-.controls > .radio:first-child, .controls > .checkbox:first-child {
-  padding-top: 5px;
-}
-.radio.inline, .checkbox.inline {
-  display: inline-block;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
-  margin-left: 10px;
-}
-.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child {
-  padding-top: 5px;
-}
-input, textarea {
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
-  transition: border linear 0.2s, box-shadow linear 0.2s;
-}
-input:focus, textarea:focus {
-  border-color: rgba(82, 168, 236, 0.8);
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  outline: 0;
-  outline: thin dotted \9;
-  /* IE6-8 */
-
-}
-input[type="file"]:focus, input[type="checkbox"]:focus, select:focus {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-.input-mini {
-  width: 60px;
-}
-.input-small {
-  width: 90px;
-}
-.input-medium {
-  width: 150px;
-}
-.input-large {
-  width: 210px;
-}
-.input-xlarge {
-  width: 270px;
-}
-.input-xxlarge {
-  width: 530px;
-}
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input {
-  float: none;
-  margin-left: 0;
-}
-input.span1, textarea.span1, .uneditable-input.span1 {
-  width: 50px;
-}
-input.span2, textarea.span2, .uneditable-input.span2 {
-  width: 130px;
-}
-input.span3, textarea.span3, .uneditable-input.span3 {
-  width: 210px;
-}
-input.span4, textarea.span4, .uneditable-input.span4 {
-  width: 290px;
-}
-input.span5, textarea.span5, .uneditable-input.span5 {
-  width: 370px;
-}
-input.span6, textarea.span6, .uneditable-input.span6 {
-  width: 450px;
-}
-input.span7, textarea.span7, .uneditable-input.span7 {
-  width: 530px;
-}
-input.span8, textarea.span8, .uneditable-input.span8 {
-  width: 610px;
-}
-input.span9, textarea.span9, .uneditable-input.span9 {
-  width: 690px;
-}
-input.span10, textarea.span10, .uneditable-input.span10 {
-  width: 770px;
-}
-input.span11, textarea.span11, .uneditable-input.span11 {
-  width: 850px;
-}
-input.span12, textarea.span12, .uneditable-input.span12 {
-  width: 930px;
-}
-select.span1 {
-  width: 70px;
-}
-select.span2 {
-  width: 150px;
-}
-select.span3 {
-  width: 230px;
-}
-select.span4 {
-  width: 310px;
-}
-select.span5 {
-  width: 390px;
-}
-select.span6 {
-  width: 470px;
-}
-select.span7 {
-  width: 550px;
-}
-select.span8 {
-  width: 630px;
-}
-select.span9 {
-  width: 710px;
-}
-select.span10 {
-  width: 790px;
-}
-select.span11 {
-  width: 870px;
-}
-select.span12 {
-  width: 950px;
-}
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  background-color: #f5f5f5;
-  border-color: #ddd;
-  cursor: not-allowed;
-}
-.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline {
-  color: #c09853;
-}
-.control-group.warning input, .control-group.warning select, .control-group.warning textarea {
-  color: #c09853;
-  border-color: #c09853;
-}
-.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
-  border-color: #a47e3c;
-  -webkit-box-shadow: 0 0 6px #dbc59e;
-  -moz-box-shadow: 0 0 6px #dbc59e;
-  box-shadow: 0 0 6px #dbc59e;
-}
-.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #c09853;
-}
-.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline {
-  color: #b94a48;
-}
-.control-group.error input, .control-group.error select, .control-group.error textarea {
-  color: #b94a48;
-  border-color: #b94a48;
-}
-.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
-  border-color: #953b39;
-  -webkit-box-shadow: 0 0 6px #d59392;
-  -moz-box-shadow: 0 0 6px #d59392;
-  box-shadow: 0 0 6px #d59392;
-}
-.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #b94a48;
-}
-.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline {
-  color: #468847;
-}
-.control-group.success input, .control-group.success select, .control-group.success textarea {
-  color: #468847;
-  border-color: #468847;
-}
-.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
-  border-color: #356635;
-  -webkit-box-shadow: 0 0 6px #7aba7b;
-  -moz-box-shadow: 0 0 6px #7aba7b;
-  box-shadow: 0 0 6px #7aba7b;
-}
-.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #468847;
-}
-input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-}
-input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus {
-  border-color: #e9322d;
-  -webkit-box-shadow: 0 0 6px #f8b9b7;
-  -moz-box-shadow: 0 0 6px #f8b9b7;
-  box-shadow: 0 0 6px #f8b9b7;
-}
-.form-actions {
-  padding: 17px 20px 18px;
-  margin-top: 18px;
-  margin-bottom: 18px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-}
-.uneditable-input {
-  display: block;
-  background-color: #ffffff;
-  border-color: #eee;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  cursor: not-allowed;
-}
-:-moz-placeholder {
-  color: #999999;
-}
-::-webkit-input-placeholder {
-  color: #999999;
-}
-.help-block {
-  margin-top: 5px;
-  margin-bottom: 0;
-  color: #999999;
-}
-.help-inline {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-  margin-bottom: 9px;
-  vertical-align: middle;
-  padding-left: 5px;
-}
-.input-prepend, .input-append {
-  margin-bottom: 5px;
-  *zoom: 1;
-}
-.input-prepend:before,
-.input-append:before,
-.input-prepend:after,
-.input-append:after {
-  display: table;
-  content: "";
-}
-.input-prepend:after, .input-append:after {
-  clear: both;
-}
-.input-prepend input,
-.input-append input,
-.input-prepend .uneditable-input,
-.input-append .uneditable-input {
-  -webkit-border-radius: 0 3px 3px 0;
-  -moz-border-radius: 0 3px 3px 0;
-  border-radius: 0 3px 3px 0;
-}
-.input-prepend input:focus,
-.input-append input:focus,
-.input-prepend .uneditable-input:focus,
-.input-append .uneditable-input:focus {
-  position: relative;
-  z-index: 2;
-}
-.input-prepend .uneditable-input, .input-append .uneditable-input {
-  border-left-color: #ccc;
-}
-.input-prepend .add-on, .input-append .add-on {
-  float: left;
-  display: block;
-  width: auto;
-  min-width: 16px;
-  height: 18px;
-  margin-right: -1px;
-  padding: 4px 4px 4px 5px;
-  font-weight: normal;
-  line-height: 18px;
-  color: #999999;
-  text-align: center;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  -webkit-border-radius: 3px 0 0 3px;
-  -moz-border-radius: 3px 0 0 3px;
-  border-radius: 3px 0 0 3px;
-}
-.input-prepend .active, .input-append .active {
-  background-color: #a9dba9;
-  border-color: #46a546;
-}
-.input-prepend .add-on {
-  *margin-top: 1px;
-  /* IE6-7 */
-
-}
-.input-append input, .input-append .uneditable-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 .uneditable-input {
-  border-right-color: #ccc;
-}
-.input-append .add-on {
-  margin-right: 0;
-  margin-left: -1px;
-  -webkit-border-radius: 0 3px 3px 0;
-  -moz-border-radius: 0 3px 3px 0;
-  border-radius: 0 3px 3px 0;
-}
-.input-append input:first-child {
-  *margin-left: -160px;
-}
-.input-append input:first-child + .add-on {
-  *margin-left: -21px;
-}
-.search-query {
-  padding-left: 14px;
-  padding-right: 14px;
-  margin-bottom: 0;
-  -webkit-border-radius: 14px;
-  -moz-border-radius: 14px;
-  border-radius: 14px;
-}
-.form-search input,
-.form-inline input,
-.form-horizontal input,
-.form-search textarea,
-.form-inline textarea,
-.form-horizontal textarea,
-.form-search select,
-.form-inline select,
-.form-horizontal select,
-.form-search .help-inline,
-.form-inline .help-inline,
-.form-horizontal .help-inline,
-.form-search .uneditable-input,
-.form-inline .uneditable-input,
-.form-horizontal .uneditable-input {
-  display: inline-block;
-  margin-bottom: 0;
-}
-.form-search label,
-.form-inline label,
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  display: inline-block;
-}
-.form-search .input-append .add-on,
-.form-inline .input-prepend .add-on,
-.form-search .input-append .add-on,
-.form-inline .input-prepend .add-on {
-  vertical-align: middle;
-}
-.control-group {
-  margin-bottom: 9px;
-}
-.form-horizontal legend + .control-group {
-  margin-top: 18px;
-  -webkit-margin-top-collapse: separate;
-}
-.form-horizontal .control-group {
-  margin-bottom: 18px;
-  *zoom: 1;
-}
-.form-horizontal .control-group:before, .form-horizontal .control-group:after {
-  display: table;
-  content: "";
-}
-.form-horizontal .control-group:after {
-  clear: both;
-}
-.form-horizontal .control-group > label {
-  float: left;
-  width: 140px;
-  padding-top: 5px;
-  text-align: right;
-}
-.form-horizontal .controls {
-  margin-left: 160px;
-}
-.form-horizontal .form-actions {
-  padding-left: 160px;
-}
-table {
-  max-width: 100%;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.table {
-  width: 100%;
-  margin-bottom: 18px;
-}
-.table th, .table td {
-  padding: 8px;
-  line-height: 18px;
-  text-align: left;
-  border-top: 1px solid #ddd;
-}
-.table th {
-  font-weight: bold;
-  vertical-align: bottom;
-}
-.table td {
-  vertical-align: top;
-}
-.table thead:first-child tr th, .table thead:first-child tr td {
-  border-top: 0;
-}
-.table tbody + tbody {
-  border-top: 2px solid #ddd;
-}
-.table-condensed th, .table-condensed td {
-  padding: 4px 5px;
-}
-.table-bordered {
-  border: 1px solid #ddd;
-  border-collapse: separate;
-  *border-collapse: collapsed;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.table-bordered th + th,
-.table-bordered td + td,
-.table-bordered th + td,
-.table-bordered td + th {
-  border-left: 1px solid #ddd;
-}
-.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td {
-  border-top: 0;
-}
-.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child {
-  -webkit-border-radius: 4px 0 0 0;
-  -moz-border-radius: 4px 0 0 0;
-  border-radius: 4px 0 0 0;
-}
-.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child {
-  -webkit-border-radius: 0 4px 0 0;
-  -moz-border-radius: 0 4px 0 0;
-  border-radius: 0 4px 0 0;
-}
-.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child {
-  -webkit-border-radius: 0 0 0 4px;
-  -moz-border-radius: 0 0 0 4px;
-  border-radius: 0 0 0 4px;
-}
-.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child {
-  -webkit-border-radius: 0 0 4px 0;
-  -moz-border-radius: 0 0 4px 0;
-  border-radius: 0 0 4px 0;
-}
-.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th {
-  background-color: #f9f9f9;
-}
-table .span1 {
-  float: none;
-  width: 44px;
-  margin-left: 0;
-}
-table .span2 {
-  float: none;
-  width: 124px;
-  margin-left: 0;
-}
-table .span3 {
-  float: none;
-  width: 204px;
-  margin-left: 0;
-}
-table .span4 {
-  float: none;
-  width: 284px;
-  margin-left: 0;
-}
-table .span5 {
-  float: none;
-  width: 364px;
-  margin-left: 0;
-}
-table .span6 {
-  float: none;
-  width: 444px;
-  margin-left: 0;
-}
-table .span7 {
-  float: none;
-  width: 524px;
-  margin-left: 0;
-}
-table .span8 {
-  float: none;
-  width: 604px;
-  margin-left: 0;
-}
-table .span9 {
-  float: none;
-  width: 684px;
-  margin-left: 0;
-}
-table .span10 {
-  float: none;
-  width: 764px;
-  margin-left: 0;
-}
-table .span11 {
-  float: none;
-  width: 844px;
-  margin-left: 0;
-}
-table .span12 {
-  float: none;
-  width: 924px;
-  margin-left: 0;
-}
-.icon {
-  background-image: url(../img/glyphicons-halflings.png);
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
-  display: inline-block;
-  vertical-align: text-top;
-  width: 14px;
-  height: 14px;
-  *margin-right: .3em;
-}
-.icon:last-child {
-  *margin-left: 0;
-}
-.icon.white {
-  background-image: url(../img/glyphicons-halflings-white.png);
-}
-.icon.glass {
-  background-position: 0      0;
-}
-.icon.music {
-  background-position: -24px 0;
-}
-.icon.search {
-  background-position: -48px 0;
-}
-.icon.envelope {
-  background-position: -72px 0;
-}
-.icon.heart {
-  background-position: -96px 0;
-}
-.icon.star {
-  background-position: -120px 0;
-}
-.icon.star-empty {
-  background-position: -144px 0;
-}
-.icon.user {
-  background-position: -168px 0;
-}
-.icon.film {
-  background-position: -192px 0;
-}
-.icon.th-large {
-  background-position: -216px 0;
-}
-.icon.th {
-  background-position: -240px 0;
-}
-.icon.th-list {
-  background-position: -264px 0;
-}
-.icon.ok {
-  background-position: -288px 0;
-}
-.icon.remove {
-  background-position: -312px 0;
-}
-.icon.zoom-in {
-  background-position: -336px 0;
-}
-.icon.zoom-out {
-  background-position: -360px 0;
-}
-.icon.off {
-  background-position: -384px 0;
-}
-.icon.signal {
-  background-position: -408px 0;
-}
-.icon.cog {
-  background-position: -432px 0;
-}
-.icon.trash {
-  background-position: -456px 0;
-}
-.icon.home {
-  background-position: 0 -24px;
-}
-.icon.file {
-  background-position: -24px -24px;
-}
-.icon.time {
-  background-position: -48px -24px;
-}
-.icon.road {
-  background-position: -72px -24px;
-}
-.icon.download-alt {
-  background-position: -96px -24px;
-}
-.icon.download {
-  background-position: -120px -24px;
-}
-.icon.upload {
-  background-position: -144px -24px;
-}
-.icon.inbox {
-  background-position: -168px -24px;
-}
-.icon.play-circle {
-  background-position: -192px -24px;
-}
-.icon.repeat {
-  background-position: -216px -24px;
-}
-.icon.refresh {
-  background-position: -240px -24px;
-}
-.icon.list-alt {
-  background-position: -264px -24px;
-}
-.icon.lock {
-  background-position: -287px -24px;
-}
-.icon.flag {
-  background-position: -312px -24px;
-}
-.icon.headphones {
-  background-position: -336px -24px;
-}
-.icon.volume-off {
-  background-position: -360px -24px;
-}
-.icon.volume-down {
-  background-position: -384px -24px;
-}
-.icon.volume-up {
-  background-position: -408px -24px;
-}
-.icon.qrcode {
-  background-position: -432px -24px;
-}
-.icon.barcode {
-  background-position: -456px -24px;
-}
-.icon.tag {
-  background-position: 0 -48px;
-}
-.icon.tags {
-  background-position: -25px -48px;
-}
-.icon.book {
-  background-position: -48px -48px;
-}
-.icon.bookmark {
-  background-position: -72px -48px;
-}
-.icon.print {
-  background-position: -96px -48px;
-}
-.icon.camera {
-  background-position: -120px -48px;
-}
-.icon.font {
-  background-position: -144px -48px;
-}
-.icon.bold {
-  background-position: -167px -48px;
-}
-.icon.italic {
-  background-position: -192px -48px;
-}
-.icon.text-height {
-  background-position: -216px -48px;
-}
-.icon.text-width {
-  background-position: -240px -48px;
-}
-.icon.align-left {
-  background-position: -264px -48px;
-}
-.icon.align-center {
-  background-position: -288px -48px;
-}
-.icon.align-right {
-  background-position: -312px -48px;
-}
-.icon.align-justify {
-  background-position: -336px -48px;
-}
-.icon.list {
-  background-position: -360px -48px;
-}
-.icon.indent-left {
-  background-position: -384px -48px;
-}
-.icon.indent-right {
-  background-position: -408px -48px;
-}
-.icon.facetime-video {
-  background-position: -432px -48px;
-}
-.icon.picture {
-  background-position: -456px -48px;
-}
-.icon.pencil {
-  background-position: 0 -72px;
-}
-.icon.map-marker {
-  background-position: -24px -72px;
-}
-.icon.adjust {
-  background-position: -48px -72px;
-}
-.icon.tint {
-  background-position: -72px -72px;
-}
-.icon.edit {
-  background-position: -96px -72px;
-}
-.icon.share {
-  background-position: -120px -72px;
-}
-.icon.check {
-  background-position: -144px -72px;
-}
-.icon.move {
-  background-position: -168px -72px;
-}
-.icon.step-backward {
-  background-position: -192px -72px;
-}
-.icon.fast-backward {
-  background-position: -216px -72px;
-}
-.icon.backward {
-  background-position: -240px -72px;
-}
-.icon.play {
-  background-position: -264px -72px;
-}
-.icon.pause {
-  background-position: -288px -72px;
-}
-.icon.stop {
-  background-position: -312px -72px;
-}
-.icon.forward {
-  background-position: -336px -72px;
-}
-.icon.fast-forward {
-  background-position: -360px -72px;
-}
-.icon.step-forward {
-  background-position: -384px -72px;
-}
-.icon.eject {
-  background-position: -408px -72px;
-}
-.icon.chevron-left {
-  background-position: -432px -72px;
-}
-.icon.chevron-right {
-  background-position: -456px -72px;
-}
-.icon.plus-sign {
-  background-position: 0 -96px;
-}
-.icon.minus-sign {
-  background-position: -24px -96px;
-}
-.icon.remove-sign {
-  background-position: -48px -96px;
-}
-.icon.ok-sign {
-  background-position: -72px -96px;
-}
-.icon.question-sign {
-  background-position: -96px -96px;
-}
-.icon.info-sign {
-  background-position: -120px -96px;
-}
-.icon.screenshot {
-  background-position: -144px -96px;
-}
-.icon.remove-circle {
-  background-position: -168px -96px;
-}
-.icon.ok-circle {
-  background-position: -192px -96px;
-}
-.icon.ban-circle {
-  background-position: -216px -96px;
-}
-.icon.arrow-left {
-  background-position: -240px -96px;
-}
-.icon.arrow-right {
-  background-position: -264px -96px;
-}
-.icon.arrow-up {
-  background-position: -289px -96px;
-}
-.icon.arrow-down {
-  background-position: -312px -96px;
-}
-.icon.share-alt {
-  background-position: -336px -96px;
-}
-.icon.resize-full {
-  background-position: -360px -96px;
-}
-.icon.resize-small {
-  background-position: -384px -96px;
-}
-.icon.plus {
-  background-position: -408px -96px;
-}
-.icon.minus {
-  background-position: -433px -96px;
-}
-.icon.asterisk {
-  background-position: -456px -96px;
-}
-.icon.exclamation-sign {
-  background-position: 0 -120px;
-}
-.icon.gift {
-  background-position: -24px -120px;
-}
-.icon.leaf {
-  background-position: -48px -120px;
-}
-.icon.fire {
-  background-position: -72px -120px;
-}
-.icon.eye-open {
-  background-position: -96px -120px;
-}
-.icon.eye-close {
-  background-position: -120px -120px;
-}
-.icon.warning-sign {
-  background-position: -144px -120px;
-}
-.icon.plane {
-  background-position: -168px -120px;
-}
-.icon.calendar {
-  background-position: -192px -120px;
-}
-.icon.random {
-  background-position: -216px -120px;
-}
-.icon.comment {
-  background-position: -240px -120px;
-}
-.icon.magnet {
-  background-position: -264px -120px;
-}
-.icon.chevron-up {
-  background-position: -288px -120px;
-}
-.icon.chevron-down {
-  background-position: -313px -119px;
-}
-.icon.retweet {
-  background-position: -336px -120px;
-}
-.icon.shopping-cart {
-  background-position: -360px -120px;
-}
-.icon.folder-close {
-  background-position: -384px -120px;
-}
-.icon.folder-open {
-  background-position: -408px -120px;
-}
-.icon.resize-vertical {
-  background-position: -432px -119px;
-}
-.icon.resize-horizontal {
-  background-position: -456px -118px;
-}
-.dropdown {
-  position: relative;
-}
-.dropdown-toggle {
-  *margin-bottom: -3px;
-}
-.dropdown-toggle:active, .open .dropdown-toggle {
-  outline: 0;
-}
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  text-indent: -99999px;
-  *text-indent: 0;
-  vertical-align: top;
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top: 4px solid #000000;
-  opacity: 0.3;
-  filter: alpha(opacity=30);
-  content: "\2193";
-}
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
-}
-.dropdown:hover .caret, .open.dropdown .caret {
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  float: left;
-  display: none;
-  min-width: 160px;
-  max-width: 220px;
-  _width: 160px;
-  padding: 4px 0;
-  margin: 0;
-  list-style: none;
-  background-color: #ffffff;
-  border-color: #ccc;
-  border-color: rgba(0, 0, 0, 0.2);
-  border-style: solid;
-  border-width: 1px;
-  -webkit-border-radius: 0 0 5px 5px;
-  -moz-border-radius: 0 0 5px 5px;
-  border-radius: 0 0 5px 5px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding;
-  background-clip: padding-box;
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-}
-.dropdown-menu.bottom-up {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 2px;
-}
-.dropdown-menu .divider {
-  height: 1px;
-  margin: 5px 1px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-  *width: 100%;
-  *margin: -5px 0 5px;
-}
-.dropdown-menu a {
-  display: block;
-  padding: 3px 15px;
-  clear: both;
-  font-weight: normal;
-  line-height: 18px;
-  color: #555555;
-  white-space: nowrap;
-}
-.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #0088cc;
-}
-.dropdown.open {
-  *z-index: 1000;
-}
-.dropdown.open .dropdown-toggle {
-  color: #ffffff;
-  background: #ccc;
-  background: rgba(0, 0, 0, 0.3);
-}
-.dropdown.open .dropdown-menu {
-  display: block;
-}
-.typeahead {
-  margin-top: 2px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #eee;
-  border: 1px solid rgba(0, 0, 0, 0.05);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -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);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-}
-.well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, 0.15);
-}
-.fade {
-  -webkit-transition: opacity 0.15s linear;
-  -moz-transition: opacity 0.15s linear;
-  -ms-transition: opacity 0.15s linear;
-  -o-transition: opacity 0.15s linear;
-  transition: opacity 0.15s linear;
-  opacity: 0;
-}
-.fade.in {
-  opacity: 1;
-}
-.collapse {
-  -webkit-transition: height 0.35s ease;
-  -moz-transition: height 0.35s ease;
-  -ms-transition: height 0.35s ease;
-  -o-transition: height 0.35s ease;
-  transition: height 0.35s ease;
-  position: relative;
-  overflow: hidden;
-  height: 0;
-}
-.collapse.in {
-  height: auto;
-}
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: 18px;
-  color: #000000;
-  text-shadow: 0 1px 0 #ffffff;
-  opacity: 0.2;
-  filter: alpha(opacity=20);
-}
-.close:hover {
-  color: #000000;
-  text-decoration: none;
-  opacity: 0.4;
-  filter: alpha(opacity=40);
-  cursor: pointer;
-}
-.btn.primary,
-.btn.primary:hover,
-.btn.danger,
-.btn.danger:hover,
-.btn.success,
-.btn.success:hover,
-.btn.info,
-.btn.info:hover {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  color: #ffffff;
-}
-.btn.primary.active,
-.btn.danger.active,
-.btn.success.active,
-.btn.info.active {
-  color: rgba(255, 255, 255, 0.75);
-}
-.btn.primary {
-  background-color: #006dcc;
-  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-  background-image: linear-gradient(top, #0088cc, #0044cc);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
-  border-color: #0044cc #0044cc #002a80;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.btn.primary:hover,
-.btn.primary:active,
-.btn.primary.active,
-.btn.primary.disabled,
-.btn.primary[disabled] {
-  background-color: #0044cc;
-}
-.btn.primary:active, .btn.primary.active {
-  background-color: #003399 \9;
-}
-.btn.danger {
-  background-color: #da4f49;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: linear-gradient(top, #ee5f5b, #bd362f);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
-  border-color: #bd362f #bd362f #802420;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.btn.danger:hover,
-.btn.danger:active,
-.btn.danger.active,
-.btn.danger.disabled,
-.btn.danger[disabled] {
-  background-color: #bd362f;
-}
-.btn.danger:active, .btn.danger.active {
-  background-color: #942a25 \9;
-}
-.btn.success {
-  background-color: #5bb75b;
-  background-image: -moz-linear-gradient(top, #62c462, #51a351);
-  background-image: -ms-linear-gradient(top, #62c462, #51a351);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
-  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
-  background-image: -o-linear-gradient(top, #62c462, #51a351);
-  background-image: linear-gradient(top, #62c462, #51a351);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
-  border-color: #51a351 #51a351 #387038;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.btn.success:hover,
-.btn.success:active,
-.btn.success.active,
-.btn.success.disabled,
-.btn.success[disabled] {
-  background-color: #51a351;
-}
-.btn.success:active, .btn.success.active {
-  background-color: #408140 \9;
-}
-.btn.info {
-  background-color: #49afcd;
-  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: linear-gradient(top, #5bc0de, #2f96b4);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
-  border-color: #2f96b4 #2f96b4 #1f6377;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.btn.info:hover,
-.btn.info:active,
-.btn.info.active,
-.btn.info.disabled,
-.btn.info[disabled] {
-  background-color: #2f96b4;
-}
-.btn.info:active, .btn.info.active {
-  background-color: #24748c \9;
-}
-.btn {
-  display: inline-block;
-  padding: 4px 10px 4px;
-  font-size: 13px;
-  line-height: 18px;
-  color: #333333;
-  text-align: center;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  background-color: #fafafa;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-repeat: no-repeat;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
-  border: 1px solid #ccc;
-  border-bottom-color: #bbb;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -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);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  cursor: pointer;
-  *margin-left: .3em;
-}
-.btn:first-child {
-  *margin-left: 0;
-}
-.btn:hover {
-  color: #333333;
-  text-decoration: none;
-  background-color: #e6e6e6;
-  background-position: 0 -15px;
-  -webkit-transition: background-position 0.1s linear;
-  -moz-transition: background-position 0.1s linear;
-  -ms-transition: background-position 0.1s linear;
-  -o-transition: background-position 0.1s linear;
-  transition: background-position 0.1s linear;
-}
-.btn:focus {
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-.btn.active, .btn:active {
-  background-image: none;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  background-color: #e6e6e6;
-  background-color: #d9d9d9 \9;
-  color: rgba(0, 0, 0, 0.5);
-  outline: 0;
-}
-.btn.disabled, .btn[disabled] {
-  cursor: default;
-  background-image: none;
-  background-color: #e6e6e6;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-.btn.large {
-  padding: 9px 14px;
-  font-size: 15px;
-  line-height: normal;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-}
-.btn.large .icon {
-  margin-top: 1px;
-}
-.btn.small {
-  padding: 5px 9px;
-  font-size: 11px;
-  line-height: 16px;
-}
-.btn.small .icon {
-  margin-top: -1px;
-}
-button.btn, input[type="submit"].btn {
-  *padding-top: 2px;
-  *padding-bottom: 2px;
-}
-button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-button.btn.large, input[type="submit"].btn.large {
-  *padding-top: 7px;
-  *padding-bottom: 7px;
-}
-button.btn.small, input[type="submit"].btn.small {
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-}
-.btn-group {
-  position: relative;
-  *zoom: 1;
-  *margin-left: .3em;
-}
-.btn-group:before, .btn-group:after {
-  display: table;
-  content: "";
-}
-.btn-group:after {
-  clear: both;
-}
-.btn-group:first-child {
-  *margin-left: 0;
-}
-.btn-group + .btn-group {
-  margin-left: 5px;
-}
-.btn-toolbar {
-  margin-top: 9px;
-  margin-bottom: 9px;
-}
-.btn-toolbar .btn-group {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-}
-.btn-group .btn {
-  position: relative;
-  float: left;
-  margin-left: -1px;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.btn-group .btn:first-child {
-  margin-left: 0;
-  -webkit-border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-  border-top-left-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  border-bottom-left-radius: 4px;
-}
-.btn-group .btn:last-child, .btn-group .dropdown-toggle {
-  -webkit-border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  border-bottom-right-radius: 4px;
-}
-.btn-group .btn.large:first-child {
-  margin-left: 0;
-  -webkit-border-top-left-radius: 6px;
-  -moz-border-radius-topleft: 6px;
-  border-top-left-radius: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-  -moz-border-radius-bottomleft: 6px;
-  border-bottom-left-radius: 6px;
-}
-.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle {
-  -webkit-border-top-right-radius: 6px;
-  -moz-border-radius-topright: 6px;
-  border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-  -moz-border-radius-bottomright: 6px;
-  border-bottom-right-radius: 6px;
-}
-.btn-group .btn:hover,
-.btn-group .btn:focus,
-.btn-group .btn:active,
-.btn-group .btn.active {
-  z-index: 2;
-}
-.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-.btn-group .dropdown-toggle {
-  padding-left: 8px;
-  padding-right: 8px;
-  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  *padding-top: 5px;
-  *padding-bottom: 5px;
-}
-.btn-group.open {
-  *z-index: 1000;
-}
-.btn-group.open .dropdown-menu {
-  display: block;
-  margin-top: 1px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-}
-.btn-group.open .dropdown-toggle {
-  background-image: none;
-  -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-.btn .caret {
-  margin-top: 7px;
-  margin-left: 0;
-}
-.btn:hover .caret, .open.btn-group .caret {
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-.primary .caret,
-.danger .caret,
-.info .caret,
-.success .caret {
-  border-top-color: #ffffff;
-  opacity: 0.75;
-  filter: alpha(opacity=75);
-}
-.btn.small .caret {
-  margin-top: 4px;
-}
-.alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: 18px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  background-color: #fcf8e3;
-  border: 1px solid #fbeed5;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.alert, .alert-heading {
-  color: #c09853;
-}
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: 18px;
-}
-.alert-success {
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
-}
-.alert-success, .alert-success .alert-heading {
-  color: #468847;
-}
-.alert-danger, .alert-error {
-  background-color: #f2dede;
-  border-color: #eed3d7;
-}
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
-  color: #b94a48;
-}
-.alert-info {
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.alert-info, .alert-info .alert-heading {
-  color: #3a87ad;
-}
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-.alert-block > p, .alert-block > ul {
-  margin-bottom: 0;
-}
-.alert-block p + p {
-  margin-top: 5px;
-}
-.nav {
-  margin-left: 0;
-  margin-bottom: 18px;
-  list-style: none;
-}
-.nav > li > a {
-  display: block;
-}
-.nav > li > a:hover {
-  text-decoration: none;
-  background-color: #eeeeee;
-}
-.nav.list {
-  padding-left: 14px;
-  padding-right: 14px;
-  margin-bottom: 0;
-}
-.nav.list > li > a, .nav.list .nav-header {
-  display: block;
-  padding: 3px 15px;
-  margin-left: -15px;
-  margin-right: -15px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
-.nav.list .nav-header {
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 18px;
-  color: #999999;
-  text-transform: uppercase;
-}
-.nav.list > li + .nav-header {
-  margin-top: 9px;
-}
-.nav.list .active > a {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  background-color: #0088cc;
-}
-.nav.list .icon {
-  margin-right: 2px;
-}
-.tabs, .pills {
-  *zoom: 1;
-}
-.tabs:before,
-.pills:before,
-.tabs:after,
-.pills:after {
-  display: table;
-  content: "";
-}
-.tabs:after, .pills:after {
-  clear: both;
-}
-.tabs > li, .pills > li {
-  float: left;
-}
-.tabs > li > a, .pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px;
-}
-.tabs {
-  border-bottom: 1px solid #ddd;
-}
-.tabs > li {
-  margin-bottom: -1px;
-}
-.tabs > li > a {
-  padding-top: 9px;
-  padding-bottom: 9px;
-  border: 1px solid transparent;
-  -webkit-border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
-  border-radius: 4px 4px 0 0;
-}
-.tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #dddddd;
-}
-.tabs > .active > a, .tabs > .active > a:hover {
-  color: #555555;
-  background-color: #ffffff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-  cursor: default;
-}
-.pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-}
-.pills .active > a, .pills .active > a:hover {
-  color: #ffffff;
-  background-color: #0088cc;
-}
-.nav.stacked > li {
-  float: none;
-}
-.nav.stacked > li > a {
-  margin-right: 0;
-}
-.tabs.stacked {
-  border-bottom: 0;
-}
-.tabs.stacked > li > a {
-  border: 1px solid #ddd;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.tabs.stacked > li:first-child > a {
-  -webkit-border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
-  border-radius: 4px 4px 0 0;
-}
-.tabs.stacked > li:last-child > a {
-  -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius: 0 0 4px 4px;
-  border-radius: 0 0 4px 4px;
-}
-.tabs.stacked > li > a:hover {
-  border-color: #ddd;
-  z-index: 2;
-}
-.pills.stacked > li > a {
-  margin-bottom: 3px;
-}
-.pills.stacked > li:last-child > a {
-  margin-bottom: 1px;
-}
-.pills .dropdown-menu, .tabs .dropdown-menu {
-  margin-top: 1px;
-  border-width: 1px;
-}
-.pills .dropdown-menu {
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
-  border-top-color: #0088cc;
-  margin-top: 6px;
-}
-.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret {
-  border-top-color: #005580;
-}
-.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret {
-  border-top-color: #333333;
-}
-.nav > .dropdown.active > a:hover {
-  color: #000000;
-  cursor: pointer;
-}
-.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover {
-  color: #ffffff;
-  background-color: #999999;
-  border-color: #999999;
-}
-.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
-  border-top-color: #ffffff;
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-.tabs.stacked .open > a:hover {
-  border-color: #999999;
-}
-.tabbable {
-  *zoom: 1;
-}
-.tabbable:before, .tabbable:after {
-  display: table;
-  content: "";
-}
-.tabbable:after {
-  clear: both;
-}
-.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs {
-  border-bottom: 0;
-}
-.tab-content > .tab-pane, .pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active, .pill-content > .active {
-  display: block;
-}
-.tabs-below .tabs {
-  border-top: 1px solid #ddd;
-}
-.tabs-below .tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-.tabs-below .tabs > li > a {
-  -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius: 0 0 4px 4px;
-  border-radius: 0 0 4px 4px;
-}
-.tabs-below .tabs > li > a:hover {
-  border-bottom-color: transparent;
-  border-top-color: #ddd;
-}
-.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover {
-  border-color: transparent #ddd #ddd #ddd;
-}
-.tabs-left .tabs > li, .tabs-right .tabs > li {
-  float: none;
-}
-.tabs-left .tabs > li > a, .tabs-right .tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-.tabs-left .tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
-}
-.tabs-left .tabs > li > a {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius: 4px 0 0 4px;
-  border-radius: 4px 0 0 4px;
-}
-.tabs-left .tabs > li > a:hover {
-  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
-}
-.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: #ffffff;
-}
-.tabs-right .tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
-}
-.tabs-right .tabs > li > a {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius: 0 4px 4px 0;
-  border-radius: 0 4px 4px 0;
-}
-.tabs-right .tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
-}
-.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
-  border-color: #ddd #ddd #ddd transparent;
-  *border-left-color: #ffffff;
-}
-.navbar {
-  overflow: visible;
-  margin-bottom: 18px;
-}
-.navbar-inner {
-  padding-left: 20px;
-  padding-right: 20px;
-  background-color: #2c2c2c;
-  background-image: -moz-linear-gradient(top, #333333, #222222);
-  background-image: -ms-linear-gradient(top, #333333, #222222);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
-  background-image: -webkit-linear-gradient(top, #333333, #222222);
-  background-image: -o-linear-gradient(top, #333333, #222222);
-  background-image: linear-gradient(top, #333333, #222222);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-}
-.btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-left: 5px;
-  margin-right: 5px;
-  background-color: #2c2c2c;
-  background-image: -moz-linear-gradient(top, #333333, #222222);
-  background-image: -ms-linear-gradient(top, #333333, #222222);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
-  background-image: -webkit-linear-gradient(top, #333333, #222222);
-  background-image: -o-linear-gradient(top, #333333, #222222);
-  background-image: linear-gradient(top, #333333, #222222);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
-  border-color: #222222 #222222 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-}
-.btn-navbar:hover,
-.btn-navbar:active,
-.btn-navbar.active,
-.btn-navbar.disabled,
-.btn-navbar[disabled] {
-  background-color: #222222;
-}
-.btn-navbar:active, .btn-navbar.active {
-  background-color: #080808 \9;
-}
-.btn-navbar .i-bar {
-  display: block;
-  width: 18px;
-  height: 2px;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 1px;
-  -moz-border-radius: 1px;
-  border-radius: 1px;
-  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-  -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-}
-.btn-navbar .i-bar + .i-bar {
-  margin-top: 3px;
-}
-.nav-collapse.collapse {
-  height: auto !important;
-}
-.navbar .brand:hover {
-  text-decoration: none;
-}
-.navbar .brand {
-  float: left;
-  display: block;
-  padding: 8px 20px 12px;
-  margin-left: -20px;
-  font-size: 20px;
-  font-weight: 200;
-  line-height: 1;
-  color: #ffffff;
-}
-.navbar .navbar-text {
-  margin-bottom: 0;
-  line-height: 40px;
-  color: #999999;
-}
-.navbar .navbar-text a:hover {
-  color: #ffffff;
-  background-color: transparent;
-}
-.navbar .btn, .navbar .btn-group {
-  margin-top: 5px;
-}
-.navbar .btn-group .btn {
-  margin-top: 0;
-}
-.navbar-form {
-  margin-bottom: 0;
-}
-.navbar-form input, .navbar-form select {
-  display: inline-block;
-  margin-top: 5px;
-  margin-bottom: 0;
-}
-.navbar-form .radio, .navbar-form .checkbox {
-  margin-top: 5px;
-}
-.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] {
-  margin-top: 3px;
-}
-.navbar-search {
-  position: relative;
-  float: left;
-  margin-top: 6px;
-  margin-bottom: 0;
-}
-.navbar-search .search-query {
-  padding: 4px 9px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  font-weight: normal;
-  line-height: 1;
-  color: #ffffff;
-  color: rgba(255, 255, 255, 0.75);
-  background: #666;
-  background: rgba(255, 255, 255, 0.3);
-  border: 1px solid #111;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-  -webkit-transition: none;
-  -moz-transition: none;
-  -ms-transition: none;
-  -o-transition: none;
-  transition: none;
-}
-.navbar-search .search-query :-moz-placeholder {
-  color: #eeeeee;
-}
-.navbar-search .search-query::-webkit-input-placeholder {
-  color: #eeeeee;
-}
-.navbar-search .search-query:hover {
-  color: #ffffff;
-  background-color: #999999;
-  background-color: rgba(255, 255, 255, 0.5);
-}
-.navbar-search .search-query:focus, .navbar-search .search-query.focused {
-  padding: 5px 10px;
-  color: #333333;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #ffffff;
-  border: 0;
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  outline: 0;
-}
-.navbar-fixed-top {
-  position: fixed;
-  top: 0;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-}
-.navbar-fixed-top .navbar-inner {
-  padding-left: 0;
-  padding-right: 0;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.navbar .nav {
-  position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.navbar .nav.pull-right {
-  float: right;
-}
-.navbar .nav > li {
-  display: block;
-  float: left;
-}
-.navbar .nav > li > a {
-  float: none;
-  padding: 10px 10px 11px;
-  line-height: 19px;
-  color: #999999;
-  text-decoration: none;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.navbar .nav > li > a:hover {
-  background-color: transparent;
-  color: #ffffff;
-  text-decoration: none;
-}
-.navbar .nav .active > a, .navbar .nav .active > a:hover {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #222222;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-.navbar .vertical-divider {
-  height: 40px;
-  width: 1px;
-  margin: 0 5px;
-  overflow: hidden;
-  background-color: #222222;
-  border-right: 1px solid #333333;
-}
-.navbar .nav.pull-right {
-  margin-left: 10px;
-  margin-right: 0;
-}
-.navbar .dropdown-menu {
-  margin-top: 1px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.navbar .dropdown-menu:before {
-  content: '';
-  display: inline-block;
-  border-left: 7px solid transparent;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  position: absolute;
-  top: -7px;
-  left: 9px;
-}
-.navbar .dropdown-menu:after {
-  content: '';
-  display: inline-block;
-  border-left: 6px solid transparent;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
-  position: absolute;
-  top: -6px;
-  left: 10px;
-}
-.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
-  border-top-color: #ffffff;
-}
-.navbar .nav .active .caret {
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
-  background-color: transparent;
-}
-.navbar .nav .active > .dropdown-toggle:hover {
-  color: #ffffff;
-}
-.navbar .nav.pull-right .dropdown-menu {
-  left: auto;
-  right: 0;
-}
-.navbar .nav.pull-right .dropdown-menu:before {
-  left: auto;
-  right: 12px;
-}
-.navbar .nav.pull-right .dropdown-menu:after {
-  left: auto;
-  right: 13px;
-}
-.breadcrumb {
-  padding: 7px 14px;
-  margin: 0 0 18px;
-  background-color: #fbfbfb;
-  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
-  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: linear-gradient(top, #ffffff, #f5f5f5);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
-  border: 1px solid #ddd;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 0 #ffffff;
-  -moz-box-shadow: inset 0 1px 0 #ffffff;
-  box-shadow: inset 0 1px 0 #ffffff;
-}
-.breadcrumb li {
-  display: inline;
-  text-shadow: 0 1px 0 #ffffff;
-}
-.breadcrumb .divider {
-  padding: 0 5px;
-  color: #999999;
-}
-.breadcrumb .active a {
-  color: #333333;
-}
-.pagination {
-  height: 36px;
-  margin: 18px 0;
-}
-.pagination ul {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-  margin-left: 0;
-  margin-bottom: 0;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  -webkit-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);
-}
-.pagination li {
-  display: inline;
-}
-.pagination a {
-  float: left;
-  padding: 0 14px;
-  line-height: 34px;
-  text-decoration: none;
-  border: 1px solid #ddd;
-  border-left-width: 0;
-}
-.pagination a:hover, .pagination .active a {
-  background-color: #f5f5f5;
-}
-.pagination .active a {
-  color: #999999;
-}
-.pagination .disabled a, .pagination .disabled a:hover {
-  color: #999999;
-  background-color: transparent;
-  cursor: default;
-}
-.pagination li:first-child a {
-  border-left-width: 1px;
-  -webkit-border-radius: 3px 0 0 3px;
-  -moz-border-radius: 3px 0 0 3px;
-  border-radius: 3px 0 0 3px;
-}
-.pagination li:last-child a {
-  -webkit-border-radius: 0 3px 3px 0;
-  -moz-border-radius: 0 3px 3px 0;
-  border-radius: 0 3px 3px 0;
-}
-.pagination-centered {
-  text-align: center;
-}
-.pagination-right {
-  text-align: right;
-}
-.pager {
-  margin-left: 0;
-  margin-bottom: 18px;
-  list-style: none;
-  text-align: center;
-  *zoom: 1;
-}
-.pager:before, .pager:after {
-  display: table;
-  content: "";
-}
-.pager:after {
-  clear: both;
-}
-.pager li {
-  display: inline;
-}
-.pager a {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 15px;
-  -moz-border-radius: 15px;
-  border-radius: 15px;
-}
-.pager a:hover {
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-.pager .next a {
-  float: right;
-}
-.pager .previous a {
-  float: left;
-}
-.modal-open .dropdown-menu {
-  z-index: 2050;
-}
-.modal-open .dropdown.open {
-  *z-index: 2050;
-}
-.modal-open .popover {
-  z-index: 2060;
-}
-.modal-open .tooltip {
-  z-index: 2070;
-}
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  background-color: #000000;
-}
-.modal-backdrop.fade {
-  opacity: 0;
-}
-.modal-backdrop, .modal-backdrop.fade.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-.modal {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  z-index: 1050;
-  max-height: 500px;
-  overflow: auto;
-  width: 560px;
-  margin: -250px 0 0 -280px;
-  background-color: #ffffff;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-  *border: 1px solid #999;
-  /* IE6-7 */
-
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-  -webkit-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);
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
-  background-clip: padding-box;
-}
-.modal.fade {
-  -webkit-transition: opacity .3s linear, top .3s ease-out;
-  -moz-transition: opacity .3s linear, top .3s ease-out;
-  -ms-transition: opacity .3s linear, top .3s ease-out;
-  -o-transition: opacity .3s linear, top .3s ease-out;
-  transition: opacity .3s linear, top .3s ease-out;
-  top: -25%;
-}
-.modal.fade.in {
-  top: 50%;
-}
-.modal-header {
-  padding: 9px 15px;
-  border-bottom: 1px solid #eee;
-}
-.modal-header .close {
-  margin-top: 2px;
-}
-.modal-body {
-  padding: 15px;
-}
-.modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  -webkit-border-radius: 0 0 6px 6px;
-  -moz-border-radius: 0 0 6px 6px;
-  border-radius: 0 0 6px 6px;
-  -webkit-box-shadow: inset 0 1px 0 #ffffff;
-  -moz-box-shadow: inset 0 1px 0 #ffffff;
-  box-shadow: inset 0 1px 0 #ffffff;
-  *zoom: 1;
-}
-.modal-footer:before, .modal-footer:after {
-  display: table;
-  content: "";
-}
-.modal-footer:after {
-  clear: both;
-}
-.modal-footer .btn {
-  float: right;
-  margin-left: 5px;
-  margin-bottom: 0;
-}
-.tooltip {
-  position: absolute;
-  z-index: 1020;
-  display: block;
-  visibility: visible;
-  padding: 5px;
-  font-size: 11px;
-  opacity: 0;
-  filter: alpha(opacity=0);
-}
-.tooltip.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-.tooltip.top {
-  margin-top: -2px;
-}
-.tooltip.right {
-  margin-left: 2px;
-}
-.tooltip.bottom {
-  margin-top: 2px;
-}
-.tooltip.left {
-  margin-left: -2px;
-}
-.tooltip.top .tooltip-arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-top: 5px solid #000000;
-}
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid #000000;
-}
-.tooltip.bottom .tooltip-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-bottom: 5px solid #000000;
-}
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-right: 5px solid #000000;
-}
-.tooltip-inner {
-  max-width: 200px;
-  padding: 3px 8px;
-  color: #ffffff;
-  text-align: center;
-  text-decoration: none;
-  background-color: #000000;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-}
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1010;
-  display: none;
-  padding: 5px;
-}
-.popover.top {
-  margin-top: -5px;
-}
-.popover.right {
-  margin-left: 5px;
-}
-.popover.bottom {
-  margin-top: 5px;
-}
-.popover.left {
-  margin-left: -5px;
-}
-.popover.top .arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-top: 5px solid #000000;
-}
-.popover.right .arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-right: 5px solid #000000;
-}
-.popover.bottom .arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-bottom: 5px solid #000000;
-}
-.popover.left .arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid #000000;
-}
-.popover .arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-}
-.popover .inner {
-  padding: 3px;
-  width: 280px;
-  overflow: hidden;
-  background: #000000;
-  background: rgba(0, 0, 0, 0.8);
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-  -webkit-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);
-}
-.popover .title {
-  padding: 9px 15px;
-  line-height: 1;
-  background-color: #f5f5f5;
-  border-bottom: 1px solid #eee;
-  -webkit-border-radius: 3px 3px 0 0;
-  -moz-border-radius: 3px 3px 0 0;
-  border-radius: 3px 3px 0 0;
-}
-.popover .content {
-  padding: 14px;
-  background-color: #ffffff;
-  -webkit-border-radius: 0 0 3px 3px;
-  -moz-border-radius: 0 0 3px 3px;
-  border-radius: 0 0 3px 3px;
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
-  background-clip: padding-box;
-}
-.popover .content p, .popover .content ul, .popover .content ol {
-  margin-bottom: 0;
-}
-.thumbnails {
-  margin-left: -20px;
-  list-style: none;
-  *zoom: 1;
-}
-.thumbnails:before, .thumbnails:after {
-  display: table;
-  content: "";
-}
-.thumbnails:after {
-  clear: both;
-}
-.thumbnails > li {
-  float: left;
-  margin: 0 0 18px 20px;
-}
-.thumbnail {
-  display: block;
-  padding: 4px;
-  line-height: 1;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-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);
-}
-a.thumbnail:hover {
-  border-color: #0088cc;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-  box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-}
-.thumbnail > img {
-  display: block;
-  max-width: 100%;
-  margin-left: auto;
-  margin-right: auto;
-}
-.thumbnail .caption {
-  padding: 9px;
-}
-.label {
-  padding: 1px 3px 2px;
-  font-size: 9.75px;
-  font-weight: bold;
-  color: #ffffff;
-  text-transform: uppercase;
-  background-color: #999999;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.label-important {
-  background-color: #b94a48;
-}
-.label-warning {
-  background-color: #f89406;
-}
-.label-success {
-  background-color: #468847;
-}
-.label-info {
-  background-color: #3a87ad;
-}
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-.progress {
-  overflow: hidden;
-  height: 18px;
-  margin-bottom: 18px;
-  background-color: #f7f7f7;
-  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.progress .bar {
-  width: 0%;
-  height: 18px;
-  color: #ffffff;
-  font-size: 12px;
-  text-align: center;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e90d2;
-  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
-  background-image: -ms-linear-gradient(top, #149bdf, #0480be);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
-  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
-  background-image: -o-linear-gradient(top, #149bdf, #0480be);
-  background-image: linear-gradient(top, #149bdf, #0480be);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  -webkit-transition: width 0.6s ease;
-  -moz-transition: width 0.6s ease;
-  -ms-transition: width 0.6s ease;
-  -o-transition: width 0.6s ease;
-  transition: width 0.6s ease;
-}
-.progress-striped .bar {
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  -webkit-background-size: 40px 40px;
-  -moz-background-size: 40px 40px;
-  -o-background-size: 40px 40px;
-  background-size: 40px 40px;
-}
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-  -moz-animation: progress-bar-stripes 2s linear infinite;
-  animation: progress-bar-stripes 2s linear infinite;
-}
-.progress-danger .bar {
-  background-color: #dd514c;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(top, #ee5f5b, #c43c35);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
-}
-.progress-danger.progress-striped .bar {
-  background-color: #ee5f5b;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-.progress-success .bar {
-  background-color: #5eb95e;
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -ms-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(top, #62c462, #57a957);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
-}
-.progress-success.progress-striped .bar {
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-.progress-info .bar {
-  background-color: #4bb1cf;
-  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: linear-gradient(top, #5bc0de, #339bb9);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
-}
-.progress-info.progress-striped .bar {
-  background-color: #5bc0de;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-.accordion {
-  margin-bottom: 18px;
-}
-.accordion-group {
-  margin-bottom: 2px;
-  border: 1px solid #e5e5e5;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.accordion-heading {
-  border-bottom: 0;
-}
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
-.accordion-inner {
-  padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
-}
-.carousel {
-  position: relative;
-  line-height: 1;
-}
-.carousel-inner {
-  overflow: hidden;
-  width: 100%;
-  position: relative;
-}
-.carousel .item {
-  display: none;
-  position: relative;
-  -webkit-transition: 0.6s ease-in-out left;
-  -moz-transition: 0.6s ease-in-out left;
-  -ms-transition: 0.6s ease-in-out left;
-  -o-transition: 0.6s ease-in-out left;
-  transition: 0.6s ease-in-out left;
-}
-.carousel .item > img {
-  display: block;
-  line-height: 1;
-}
-.carousel .active, .carousel .next, .carousel .prev {
-  display: block;
-}
-.carousel .active {
-  left: 0;
-}
-.carousel .next, .carousel .prev {
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.carousel .next {
-  left: 100%;
-}
-.carousel .prev {
-  left: -100%;
-}
-.carousel .next.left, .carousel .prev.right {
-  left: 0;
-}
-.carousel .active.left {
-  left: -100%;
-}
-.carousel .active.right {
-  left: 100%;
-}
-.carousel-control {
-  position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: #ffffff;
-  text-align: center;
-  background: #222222;
-  border: 3px solid #ffffff;
-  -webkit-border-radius: 23px;
-  -moz-border-radius: 23px;
-  border-radius: 23px;
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-}
-.carousel-control.right {
-  left: auto;
-  right: 15px;
-}
-.carousel-control:hover {
-  color: #ffffff;
-  text-decoration: none;
-  opacity: 0.9;
-  filter: alpha(opacity=90);
-}
-.carousel-caption {
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding: 10px 15px 5px;
-  background: #333333;
-  background: rgba(0, 0, 0, 0.75);
-}
-.carousel-caption h4, .carousel-caption p {
-  color: #ffffff;
-}
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-}
-.hero-unit h1 {
-  margin-bottom: 0;
-  font-size: 60px;
-  line-height: 1;
-  letter-spacing: -1px;
-}
-.hero-unit p {
-  font-size: 18px;
-  font-weight: 200;
-  line-height: 27px;
-}
-.pull-right {
-  float: right;
-}
-.pull-left {
-  float: left;
-}
-.hide {
-  display: none;
-}
-.show {
-  display: block;
-}
-.invisible {
-  visibility: hidden;
-}
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
deleted file mode 100644
index 729f3d9d9..000000000
--- a/dist/css/bootstrap.min.css
+++ /dev/null
@@ -1,615 +0,0 @@
-article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
-audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
-audio:not([controls]){display:none;}
-html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
-a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
-a:hover,a:active{outline:0;}
-sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
-sup{top:-0.5em;}
-sub{bottom:-0.25em;}
-img{max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;}
-button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}
-button,input{*overflow:visible;line-height:normal;}
-button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
-button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
-input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
-input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
-textarea{overflow:auto;vertical-align:top;}
-body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#555555;background-color:#ffffff;}
-a{color:#0088cc;text-decoration:none;}
-a:hover{color:#005580;text-decoration:underline;}
-.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
-.row:after{clear:both;}
-[class*="span"]{float:left;margin-left:20px;}
-.span1{width:59.99999999999999px;}
-.span2{width:140px;}
-.span3{width:220px;}
-.span4{width:300px;}
-.span5{width:380px;}
-.span6{width:460px;}
-.span7{width:540px;}
-.span8{width:620px;}
-.span9{width:700px;}
-.span10{width:780px;}
-.span11{width:860px;}
-.span12{width:940px;}
-.offset1{margin-left:100px;}
-.offset2{margin-left:180px;}
-.offset3{margin-left:260px;}
-.offset4{margin-left:340px;}
-.offset5{margin-left:420px;}
-.offset6{margin-left:500px;}
-.offset7{margin-left:580px;}
-.offset8{margin-left:660px;}
-.offset9{margin-left:740px;}
-.offset10{margin-left:820px;}
-.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;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
-.container:after{clear:both;}
-.container-fluid{padding-left:20px;padding-right:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
-.container-fluid:after{clear:both;}
-p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
-.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;}
-h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;}
-h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}
-h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}
-h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
-h4,h5,h6{line-height:18px;}
-h4{font-size:14px;}h4 small{font-size:12px;}
-h5{font-size:12px;}
-h6{font-size:11px;color:#999999;text-transform:uppercase;}
-.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;}
-.page-header h1{line-height:1;}
-ul,ol{padding:0;margin:0 0 9px 25px;}
-ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
-ul{list-style:disc;}
-ol{list-style:decimal;}
-li{line-height:18px;}
-ul.unstyled{margin-left:0;list-style:none;}
-dl{margin-bottom:18px;}
-dt,dd{line-height:18px;}
-dt{font-weight:bold;}
-dd{margin-left:9px;}
-hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;}
-strong{font-weight:bold;}
-em{font-style:italic;}
-.muted{color:#999999;}
-abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;}
-blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
-blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
-blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
-q:before,q:after,blockquote:before,blockquote:after{content:"";}
-address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
-small{font-size:100%;}
-cite{font-style:normal;}
-code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}
-pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
-pre code{padding:0;background-color:transparent;}
-form{margin:0 0 18px;}
-fieldset{padding:0;margin:0;border:0;}
-legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;}
-label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
-label{display:block;margin-bottom:5px;color:#333333;}
-input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-.uneditable-textarea{width:auto;height:auto;}
-label input,label textarea,label select{display:block;}
-input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:0;cursor:pointer;border-radius:0 \0/;}
-input[type="file"]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;}
-select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;}
-select{width:220px;background-color:#ffffff;}
-select[multiple],select[size]{height:auto;}
-input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-textarea{height:auto;}
-input[type="hidden"]{display:none;}
-.radio,.checkbox{padding-left:18px;}
-.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;}
-.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;}
-.radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;vertical-align:middle;}
-.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
-.controls>.radio.inline:first-child,.controls>.checkbox.inline:first-child{padding-top:5px;}
-input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
-input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;}
-input[type="file"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
-.input-mini{width:60px;}
-.input-small{width:90px;}
-.input-medium{width:150px;}
-.input-large{width:210px;}
-.input-xlarge{width:270px;}
-.input-xxlarge{width:530px;}
-input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;}
-input.span1,textarea.span1,.uneditable-input.span1{width:50px;}
-input.span2,textarea.span2,.uneditable-input.span2{width:130px;}
-input.span3,textarea.span3,.uneditable-input.span3{width:210px;}
-input.span4,textarea.span4,.uneditable-input.span4{width:290px;}
-input.span5,textarea.span5,.uneditable-input.span5{width:370px;}
-input.span6,textarea.span6,.uneditable-input.span6{width:450px;}
-input.span7,textarea.span7,.uneditable-input.span7{width:530px;}
-input.span8,textarea.span8,.uneditable-input.span8{width:610px;}
-input.span9,textarea.span9,.uneditable-input.span9{width:690px;}
-input.span10,textarea.span10,.uneditable-input.span10{width:770px;}
-input.span11,textarea.span11,.uneditable-input.span11{width:850px;}
-input.span12,textarea.span12,.uneditable-input.span12{width:930px;}
-select.span1{width:70px;}
-select.span2{width:150px;}
-select.span3{width:230px;}
-select.span4{width:310px;}
-select.span5{width:390px;}
-select.span6{width:470px;}
-select.span7{width:550px;}
-select.span8{width:630px;}
-select.span9{width:710px;}
-select.span10{width:790px;}
-select.span11{width:870px;}
-select.span12{width:950px;}
-input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
-.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
-.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
-.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
-.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
-.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
-.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
-.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
-.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
-.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
-input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
-.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
-.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
-:-moz-placeholder{color:#999999;}
-::-webkit-input-placeholder{color:#999999;}
-.help-block{margin-top:5px;margin-bottom:0;color:#999999;}
-.help-inline{display:inline-block;*display:inline;*zoom:1;margin-bottom:9px;vertical-align:middle;padding-left:5px;}
-.input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";}
-.input-prepend:after,.input-append:after{clear:both;}
-.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;}
-.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;}
-.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
-.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;}
-.input-prepend .add-on{*margin-top:1px;}
-.input-append input,.input-append .uneditable-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 .uneditable-input{border-right-color:#ccc;}
-.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
-.input-append input:first-child{*margin-left:-160px;}.input-append input:first-child+.add-on{*margin-left:-21px;}
-.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
-.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
-.form-search label,.form-inline label,.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{display:inline-block;}
-.form-search .input-append .add-on,.form-inline .input-prepend .add-on,.form-search .input-append .add-on,.form-inline .input-prepend .add-on{vertical-align:middle;}
-.control-group{margin-bottom:9px;}
-.form-horizontal legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;}
-.form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";}
-.form-horizontal .control-group:after{clear:both;}
-.form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
-.form-horizontal .controls{margin-left:160px;}
-.form-horizontal .form-actions{padding-left:160px;}
-table{max-width:100%;border-collapse:collapse;border-spacing:0;}
-.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;}
-.table th{font-weight:bold;vertical-align:bottom;}
-.table td{vertical-align:top;}
-.table thead:first-child tr th,.table thead:first-child tr td{border-top:0;}
-.table tbody+tbody{border-top:2px solid #ddd;}
-.table-condensed th,.table-condensed td{padding:4px 5px;}
-.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;}
-.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
-.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
-.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
-.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
-.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
-.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;}
-table .span1{float:none;width:44px;margin-left:0;}
-table .span2{float:none;width:124px;margin-left:0;}
-table .span3{float:none;width:204px;margin-left:0;}
-table .span4{float:none;width:284px;margin-left:0;}
-table .span5{float:none;width:364px;margin-left:0;}
-table .span6{float:none;width:444px;margin-left:0;}
-table .span7{float:none;width:524px;margin-left:0;}
-table .span8{float:none;width:604px;margin-left:0;}
-table .span9{float:none;width:684px;margin-left:0;}
-table .span10{float:none;width:764px;margin-left:0;}
-table .span11{float:none;width:844px;margin-left:0;}
-table .span12{float:none;width:924px;margin-left:0;}
-.icon{background-image:url(../img/glyphicons-halflings.png);background-position:14px 14px;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;*margin-right:.3em;}.icon:last-child{*margin-left:0;}
-.icon.white{background-image:url(../img/glyphicons-halflings-white.png);}
-.icon.glass{background-position:0 0;}
-.icon.music{background-position:-24px 0;}
-.icon.search{background-position:-48px 0;}
-.icon.envelope{background-position:-72px 0;}
-.icon.heart{background-position:-96px 0;}
-.icon.star{background-position:-120px 0;}
-.icon.star-empty{background-position:-144px 0;}
-.icon.user{background-position:-168px 0;}
-.icon.film{background-position:-192px 0;}
-.icon.th-large{background-position:-216px 0;}
-.icon.th{background-position:-240px 0;}
-.icon.th-list{background-position:-264px 0;}
-.icon.ok{background-position:-288px 0;}
-.icon.remove{background-position:-312px 0;}
-.icon.zoom-in{background-position:-336px 0;}
-.icon.zoom-out{background-position:-360px 0;}
-.icon.off{background-position:-384px 0;}
-.icon.signal{background-position:-408px 0;}
-.icon.cog{background-position:-432px 0;}
-.icon.trash{background-position:-456px 0;}
-.icon.home{background-position:0 -24px;}
-.icon.file{background-position:-24px -24px;}
-.icon.time{background-position:-48px -24px;}
-.icon.road{background-position:-72px -24px;}
-.icon.download-alt{background-position:-96px -24px;}
-.icon.download{background-position:-120px -24px;}
-.icon.upload{background-position:-144px -24px;}
-.icon.inbox{background-position:-168px -24px;}
-.icon.play-circle{background-position:-192px -24px;}
-.icon.repeat{background-position:-216px -24px;}
-.icon.refresh{background-position:-240px -24px;}
-.icon.list-alt{background-position:-264px -24px;}
-.icon.lock{background-position:-287px -24px;}
-.icon.flag{background-position:-312px -24px;}
-.icon.headphones{background-position:-336px -24px;}
-.icon.volume-off{background-position:-360px -24px;}
-.icon.volume-down{background-position:-384px -24px;}
-.icon.volume-up{background-position:-408px -24px;}
-.icon.qrcode{background-position:-432px -24px;}
-.icon.barcode{background-position:-456px -24px;}
-.icon.tag{background-position:0 -48px;}
-.icon.tags{background-position:-25px -48px;}
-.icon.book{background-position:-48px -48px;}
-.icon.bookmark{background-position:-72px -48px;}
-.icon.print{background-position:-96px -48px;}
-.icon.camera{background-position:-120px -48px;}
-.icon.font{background-position:-144px -48px;}
-.icon.bold{background-position:-167px -48px;}
-.icon.italic{background-position:-192px -48px;}
-.icon.text-height{background-position:-216px -48px;}
-.icon.text-width{background-position:-240px -48px;}
-.icon.align-left{background-position:-264px -48px;}
-.icon.align-center{background-position:-288px -48px;}
-.icon.align-right{background-position:-312px -48px;}
-.icon.align-justify{background-position:-336px -48px;}
-.icon.list{background-position:-360px -48px;}
-.icon.indent-left{background-position:-384px -48px;}
-.icon.indent-right{background-position:-408px -48px;}
-.icon.facetime-video{background-position:-432px -48px;}
-.icon.picture{background-position:-456px -48px;}
-.icon.pencil{background-position:0 -72px;}
-.icon.map-marker{background-position:-24px -72px;}
-.icon.adjust{background-position:-48px -72px;}
-.icon.tint{background-position:-72px -72px;}
-.icon.edit{background-position:-96px -72px;}
-.icon.share{background-position:-120px -72px;}
-.icon.check{background-position:-144px -72px;}
-.icon.move{background-position:-168px -72px;}
-.icon.step-backward{background-position:-192px -72px;}
-.icon.fast-backward{background-position:-216px -72px;}
-.icon.backward{background-position:-240px -72px;}
-.icon.play{background-position:-264px -72px;}
-.icon.pause{background-position:-288px -72px;}
-.icon.stop{background-position:-312px -72px;}
-.icon.forward{background-position:-336px -72px;}
-.icon.fast-forward{background-position:-360px -72px;}
-.icon.step-forward{background-position:-384px -72px;}
-.icon.eject{background-position:-408px -72px;}
-.icon.chevron-left{background-position:-432px -72px;}
-.icon.chevron-right{background-position:-456px -72px;}
-.icon.plus-sign{background-position:0 -96px;}
-.icon.minus-sign{background-position:-24px -96px;}
-.icon.remove-sign{background-position:-48px -96px;}
-.icon.ok-sign{background-position:-72px -96px;}
-.icon.question-sign{background-position:-96px -96px;}
-.icon.info-sign{background-position:-120px -96px;}
-.icon.screenshot{background-position:-144px -96px;}
-.icon.remove-circle{background-position:-168px -96px;}
-.icon.ok-circle{background-position:-192px -96px;}
-.icon.ban-circle{background-position:-216px -96px;}
-.icon.arrow-left{background-position:-240px -96px;}
-.icon.arrow-right{background-position:-264px -96px;}
-.icon.arrow-up{background-position:-289px -96px;}
-.icon.arrow-down{background-position:-312px -96px;}
-.icon.share-alt{background-position:-336px -96px;}
-.icon.resize-full{background-position:-360px -96px;}
-.icon.resize-small{background-position:-384px -96px;}
-.icon.plus{background-position:-408px -96px;}
-.icon.minus{background-position:-433px -96px;}
-.icon.asterisk{background-position:-456px -96px;}
-.icon.exclamation-sign{background-position:0 -120px;}
-.icon.gift{background-position:-24px -120px;}
-.icon.leaf{background-position:-48px -120px;}
-.icon.fire{background-position:-72px -120px;}
-.icon.eye-open{background-position:-96px -120px;}
-.icon.eye-close{background-position:-120px -120px;}
-.icon.warning-sign{background-position:-144px -120px;}
-.icon.plane{background-position:-168px -120px;}
-.icon.calendar{background-position:-192px -120px;}
-.icon.random{background-position:-216px -120px;}
-.icon.comment{background-position:-240px -120px;}
-.icon.magnet{background-position:-264px -120px;}
-.icon.chevron-up{background-position:-288px -120px;}
-.icon.chevron-down{background-position:-313px -119px;}
-.icon.retweet{background-position:-336px -120px;}
-.icon.shopping-cart{background-position:-360px -120px;}
-.icon.folder-close{background-position:-384px -120px;}
-.icon.folder-open{background-position:-408px -120px;}
-.icon.resize-vertical{background-position:-432px -119px;}
-.icon.resize-horizontal{background-position:-456px -118px;}
-.dropdown{position:relative;}
-.dropdown-toggle{*margin-bottom:-3px;}
-.dropdown-toggle:active,.open .dropdown-toggle{outline:0;}
-.caret{display:inline-block;width:0;height:0;text-indent:-99999px;*text-indent:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";}
-.dropdown .caret{margin-top:8px;margin-left:2px;}
-.dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);}
-.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.bottom-up{top:auto;bottom:100%;margin-bottom:2px;}
-.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;}
-.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
-.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;}
-.dropdown.open{*z-index:1000;}.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
-.dropdown.open .dropdown-menu{display:block;}
-.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
-.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
-.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
-.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;}
-.btn.primary,.btn.primary:hover,.btn.danger,.btn.danger:hover,.btn.success,.btn.success:hover,.btn.info,.btn.info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
-.btn.primary.active,.btn.danger.active,.btn.success.active,.btn.info.active{color:rgba(255, 255, 255, 0.75);}
-.btn.primary{background-color:#006dcc;background-image:-moz-linear-gradient(top, #0088cc, #0044cc);background-image:-ms-linear-gradient(top, #0088cc, #0044cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));background-image:-webkit-linear-gradient(top, #0088cc, #0044cc);background-image:-o-linear-gradient(top, #0088cc, #0044cc);background-image:linear-gradient(top, #0088cc, #0044cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);border-color:#0044cc #0044cc #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn.primary:hover,.btn.primary:active,.btn.primary.active,.btn.primary.disabled,.btn.primary[disabled]{background-color:#0044cc;}
-.btn.primary:active,.btn.primary.active{background-color:#003399 \9;}
-.btn.danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn.danger:hover,.btn.danger:active,.btn.danger.active,.btn.danger.disabled,.btn.danger[disabled]{background-color:#bd362f;}
-.btn.danger:active,.btn.danger.active{background-color:#942a25 \9;}
-.btn.success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn.success:hover,.btn.success:active,.btn.success.active,.btn.success.disabled,.btn.success[disabled]{background-color:#51a351;}
-.btn.success:active,.btn.success.active{background-color:#408140 \9;}
-.btn.info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn.info:hover,.btn.info:active,.btn.info.active,.btn.info.disabled,.btn.info[disabled]{background-color:#2f96b4;}
-.btn.info:active,.btn.info.active{background-color:#24748c \9;}
-.btn{display:inline-block;padding:4px 10px 4px;font-size:13px;line-height:18px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-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);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;}
-.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
-.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
-.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;color:rgba(0, 0, 0, 0.5);outline:0;}
-.btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.btn.large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
-.btn.large .icon{margin-top:1px;}
-.btn.small{padding:5px 9px;font-size:11px;line-height:16px;}
-.btn.small .icon{margin-top:-1px;}
-button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;}
-button.btn.large,input[type="submit"].btn.large{*padding-top:7px;*padding-bottom:7px;}
-button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom:3px;}
-.btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";}
-.btn-group:after{clear:both;}
-.btn-group:first-child{*margin-left:0;}
-.btn-group+.btn-group{margin-left:5px;}
-.btn-toolbar{margin-top:9px;margin-bottom:9px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;}
-.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
-.btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
-.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
-.btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
-.btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active,.btn-group .btn.active{z-index:2;}
-.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;}
-.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:5px;*padding-bottom:5px;}
-.btn-group.open{*z-index:1000;}.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
-.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
-.btn .caret{margin-top:7px;margin-left:0;}
-.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);}
-.primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
-.btn.small .caret{margin-top:4px;}
-.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.alert,.alert-heading{color:#c09853;}
-.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;}
-.alert-success{background-color:#dff0d8;border-color:#d6e9c6;}
-.alert-success,.alert-success .alert-heading{color:#468847;}
-.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;}
-.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading{color:#b94a48;}
-.alert-info{background-color:#d9edf7;border-color:#bce8f1;}
-.alert-info,.alert-info .alert-heading{color:#3a87ad;}
-.alert-block{padding-top:14px;padding-bottom:14px;}
-.alert-block>p,.alert-block>ul{margin-bottom:0;}
-.alert-block p+p{margin-top:5px;}
-.nav{margin-left:0;margin-bottom:18px;list-style:none;}
-.nav>li>a{display:block;}
-.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;}
-.nav.list{padding-left:14px;padding-right:14px;margin-bottom:0;}
-.nav.list>li>a,.nav.list .nav-header{display:block;padding:3px 15px;margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
-.nav.list .nav-header{font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-transform:uppercase;}
-.nav.list>li+.nav-header{margin-top:9px;}
-.nav.list .active>a{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;}
-.nav.list .icon{margin-right:2px;}
-.tabs,.pills{*zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
-.tabs:after,.pills:after{clear:both;}
-.tabs>li,.pills>li{float:left;}
-.tabs>li>a,.pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
-.tabs{border-bottom:1px solid #ddd;}
-.tabs>li{margin-bottom:-1px;}
-.tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
-.tabs>.active>a,.tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
-.pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
-.pills .active>a,.pills .active>a:hover{color:#ffffff;background-color:#0088cc;}
-.nav.stacked>li{float:none;}
-.nav.stacked>li>a{margin-right:0;}
-.tabs.stacked{border-bottom:0;}
-.tabs.stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.tabs.stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
-.tabs.stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
-.tabs.stacked>li>a:hover{border-color:#ddd;z-index:2;}
-.pills.stacked>li>a{margin-bottom:3px;}
-.pills.stacked>li:last-child>a{margin-bottom:1px;}
-.pills .dropdown-menu,.tabs .dropdown-menu{margin-top:1px;border-width:1px;}
-.pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;}
-.tabs .dropdown-toggle:hover .caret,.pills .dropdown-toggle:hover .caret{border-top-color:#005580;}
-.tabs .active .dropdown-toggle .caret,.pills .active .dropdown-toggle .caret{border-top-color:#333333;}
-.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;}
-.tabs .open .dropdown-toggle,.pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;}
-.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;opacity:1;filter:alpha(opacity=100);}
-.tabs.stacked .open>a:hover{border-color:#999999;}
-.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";}
-.tabbable:after{clear:both;}
-.tabs-below .tabs,.tabs-right .tabs,.tabs-left .tabs{border-bottom:0;}
-.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
-.tab-content>.active,.pill-content>.active{display:block;}
-.tabs-below .tabs{border-top:1px solid #ddd;}
-.tabs-below .tabs>li{margin-top:-1px;margin-bottom:0;}
-.tabs-below .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
-.tabs-below .tabs .active>a,.tabs-below .tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;}
-.tabs-left .tabs>li,.tabs-right .tabs>li{float:none;}
-.tabs-left .tabs>li>a,.tabs-right .tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;}
-.tabs-left .tabs{float:left;margin-right:19px;border-right:1px solid #ddd;}
-.tabs-left .tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
-.tabs-left .tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;}
-.tabs-left .tabs .active>a,.tabs-left .tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;}
-.tabs-right .tabs{float:right;margin-left:19px;border-left:1px solid #ddd;}
-.tabs-right .tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
-.tabs-right .tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
-.tabs-right .tabs .active>a,.tabs-right .tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;}
-.navbar{overflow:visible;margin-bottom:18px;}
-.navbar-inner{padding-left:20px;padding-right:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
-.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#222222;}
-.btn-navbar:active,.btn-navbar.active{background-color:#080808 \9;}
-.btn-navbar .i-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);}
-.btn-navbar .i-bar+.i-bar{margin-top:3px;}
-.nav-collapse.collapse{height:auto !important;}
-.navbar .brand:hover{text-decoration:none;}
-.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
-.navbar .navbar-text{margin-bottom:0;line-height:40px;color:#999999;}.navbar .navbar-text a:hover{color:#ffffff;background-color:transparent;}
-.navbar .btn,.navbar .btn-group{margin-top:5px;}
-.navbar .btn-group .btn{margin-top:0;}
-.navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-top:5px;margin-bottom:0;}
-.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;}
-.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;}
-.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#666;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
-.navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
-.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
-.navbar-fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030;}
-.navbar-fixed-top .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
-.navbar .nav.pull-right{float:right;}
-.navbar .nav>li{display:block;float:left;}
-.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
-.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;}
-.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;background-color:rgba(0, 0, 0, 0.5);}
-.navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222222;border-right:1px solid #333333;}
-.navbar .nav.pull-right{margin-left:10px;margin-right:0;}
-.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
-.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
-.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;}
-.navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);}
-.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
-.navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;}
-.navbar .nav.pull-right .dropdown-menu{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
-.navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
-.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
-.breadcrumb .divider{padding:0 5px;color:#999999;}
-.breadcrumb .active a{color:#333333;}
-.pagination{height:36px;margin:18px 0;}
-.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-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);}
-.pagination li{display:inline;}
-.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;}
-.pagination a:hover,.pagination .active a{background-color:#f5f5f5;}
-.pagination .active a{color:#999999;}
-.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;}
-.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
-.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
-.pagination-centered{text-align:center;}
-.pagination-right{text-align:right;}
-.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";}
-.pager:after{clear:both;}
-.pager li{display:inline;}
-.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
-.pager a:hover{text-decoration:none;background-color:#f5f5f5;}
-.pager .next a{float:right;}
-.pager .previous a{float:left;}
-.modal-open .dropdown-menu{z-index:2050;}
-.modal-open .dropdown.open{*z-index:2050;}
-.modal-open .popover{z-index:2060;}
-.modal-open .tooltip{z-index:2070;}
-.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;}
-.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);}
-.modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
-.modal.fade.in{top:50%;}
-.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;}
-.modal-body{padding:15px;}
-.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
-.modal-footer:after{clear:both;}
-.modal-footer .btn{float:right;margin-left:5px;margin-bottom:0;}
-.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);}
-.tooltip.top{margin-top:-2px;}
-.tooltip.right{margin-left:2px;}
-.tooltip.bottom{margin-top:2px;}
-.tooltip.left{margin-left:-2px;}
-.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
-.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
-.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
-.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
-.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.tooltip-arrow{position:absolute;width:0;height:0;}
-.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
-.popover.right{margin-left:5px;}
-.popover.bottom{margin-top:5px;}
-.popover.left{margin-left:-5px;}
-.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
-.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
-.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
-.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
-.popover .arrow{position:absolute;width:0;height:0;}
-.popover .inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-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);}
-.popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
-.popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
-.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
-.thumbnails:after{clear:both;}
-.thumbnails>li{float:left;margin:0 0 18px 20px;}
-.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-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);}
-a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
-.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;}
-.thumbnail .caption{padding:9px;}
-.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-.label-important{background-color:#b94a48;}
-.label-warning{background-color:#f89406;}
-.label-success{background-color:#468847;}
-.label-info{background-color:#3a87ad;}
-@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
-.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
-.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
-.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
-.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
-.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
-.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.accordion{margin-bottom:18px;}
-.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.accordion-heading{border-bottom:0;}
-.accordion-heading .accordion-toggle{display:block;padding:8px 15px;}
-.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
-.carousel{position:relative;line-height:1;}
-.carousel-inner{overflow:hidden;width:100%;position:relative;}
-.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}
-.carousel .item>img{display:block;line-height:1;}
-.carousel .active,.carousel .next,.carousel .prev{display:block;}
-.carousel .active{left:0;}
-.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;}
-.carousel .next{left:100%;}
-.carousel .prev{left:-100%;}
-.carousel .next.left,.carousel .prev.right{left:0;}
-.carousel .active.left{left:-100%;}
-.carousel .active.right{left:100%;}
-.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;}
-.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
-.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
-.carousel-caption h4,.carousel-caption p{color:#ffffff;}
-.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
-.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
-.pull-right{float:right;}
-.pull-left{float:left;}
-.hide{display:none;}
-.show{display:block;}
-.invisible{visibility:hidden;}
diff --git a/dist/css/bootstrap.min.responsive b/dist/css/bootstrap.min.responsive
deleted file mode 100644
index e01056e95..000000000
--- a/dist/css/bootstrap.min.responsive
+++ /dev/null
@@ -1,3 +0,0 @@
-
-.hidden{display:none;visibility:hidden;}
-@media (max-width:480px){.page-header h1 small{display:block;line-height:18px;} input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} .input-prepend input[class*="span"],.input-append input[class*="span"]{width:auto;} input[type="checkbox"],input[type="radio"]{border:1px solid #ccc;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:10px;padding-right:10px;} .modal{position:absolute;top:10px;left:10px;right:10px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;margin:-10px;} .carousel-caption{position:static;}}@media (max-width:768px){.container{width:auto;padding:0 20px;} .row-fluid{width:100%;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:724px;padding-left:20px;padding-right:20px;} .span1{width:42px;} .span2{width:104px;} .span3{width:166px;} .span4{width:228px;} .span5{width:290px;} .span6{width:352px;} .span7{width:414px;} .span8{width:476px;} .span9{width:538px;} .span10{width:600px;} .span11{width:662px;} .span12{width:724px;} .offset1{margin-left:82px;} .offset2{margin-left:144px;} .offset3{margin-left:206px;} .offset4{margin-left:268px;} .offset5{margin-left:330px;} .offset6{margin-left:392px;} .offset7{margin-left:454px;} .offset8{margin-left:516px;} .offset9{margin-left:578px;} .offset10{margin-left:640px;} .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{padding-top:0;} .navbar-fixed-top{position:static;margin-bottom:18px;} .navbar-inner{padding:5px;background-image:none;} .navbar .container{padding:0;} .navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px;} .navbar .nav-collapse{clear:left;} .navbar .nav{float:none;margin:0 0 9px;} .navbar .nav>li{float:none;} .navbar .nav>li>a{margin-bottom:2px;} .navbar .nav>.vertical-divider{display:none;} .navbar .nav>li>a,.navbar .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .navbar .dropdown-menu li+li a{margin-bottom:2px;} .navbar .nav>li>a:hover,.navbar .dropdown-menu a:hover{background-color:#222222;} .navbar .dropdown-menu{position:static;top:auto;left:auto;float:none;display:block;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .dropdown-menu:before,.navbar .dropdown-menu:after{display:none;} .navbar .dropdown-menu .divider{display:none;} .navbar-form,.navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222222;border-bottom:1px solid #222222;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);} .navbar .nav.pull-right{float:none;margin-left:0;} .navbar-static .navbar-inner{padding-left:10px;padding-right:10px;} .btn-navbar{display:block;} .nav-collapse{overflow:hidden;height:0;}}@media (min-width:1200px){.thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;} .container{width:1170px;} .row{margin-left:-30px;} [class*="span"]{margin-left:30px;} .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;} .row-fluid{width:102.56143440326584%;margin-left:-2.56%;}.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%;}}
diff --git a/dist/css/bootstrap.responsive b/dist/css/bootstrap.responsive
deleted file mode 100644
index 44e0125c1..000000000
--- a/dist/css/bootstrap.responsive
+++ /dev/null
@@ -1,442 +0,0 @@
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-@media (max-width: 480px) {
-  .page-header h1 small {
-    display: block;
-    line-height: 18px;
-  }
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    display: block;
-    width: 100%;
-    height: 28px;
-    /* Make inputs at least the height of their button counterpart */
-  
-    /* Makes inputs behave like true block-level elements */
-  
-    -webkit-box-sizing: border-box;
-    /* Older Webkit */
-  
-    -moz-box-sizing: border-box;
-    /* Older FF */
-  
-    -ms-box-sizing: border-box;
-    /* IE8 */
-  
-    box-sizing: border-box;
-    /* CSS3 spec*/
-  
-  }
-  .input-prepend input[class*="span"], .input-append input[class*="span"] {
-    width: auto;
-  }
-  input[type="checkbox"], input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-  .form-horizontal .control-group > label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-left: 10px;
-    padding-right: 10px;
-  }
-  .modal {
-    position: absolute;
-    top: 10px;
-    left: 10px;
-    right: 10px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade.in {
-    top: auto;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-  .carousel-caption {
-    position: static;
-  }
-}
-@media (max-width: 768px) {
-  .container {
-    width: auto;
-    padding: 0 20px;
-  }
-  .row-fluid {
-    width: 100%;
-  }
-  .row {
-    margin-left: 0;
-  }
-  .row > [class*="span"] {
-    float: none;
-    display: block;
-    width: auto;
-    margin: 0;
-  }
-}
-@media (min-width: 768px) and (max-width: 940px) {
-  .container {
-    width: 724px;
-    padding-left: 20px;
-    padding-right: 20px;
-  }
-  .span1 {
-    width: 42px;
-  }
-  .span2 {
-    width: 104px;
-  }
-  .span3 {
-    width: 166px;
-  }
-  .span4 {
-    width: 228px;
-  }
-  .span5 {
-    width: 290px;
-  }
-  .span6 {
-    width: 352px;
-  }
-  .span7 {
-    width: 414px;
-  }
-  .span8 {
-    width: 476px;
-  }
-  .span9 {
-    width: 538px;
-  }
-  .span10 {
-    width: 600px;
-  }
-  .span11 {
-    width: 662px;
-  }
-  .span12 {
-    width: 724px;
-  }
-  .offset1 {
-    margin-left: 82px;
-  }
-  .offset2 {
-    margin-left: 144px;
-  }
-  .offset3 {
-    margin-left: 206px;
-  }
-  .offset4 {
-    margin-left: 268px;
-  }
-  .offset5 {
-    margin-left: 330px;
-  }
-  .offset6 {
-    margin-left: 392px;
-  }
-  .offset7 {
-    margin-left: 454px;
-  }
-  .offset8 {
-    margin-left: 516px;
-  }
-  .offset9 {
-    margin-left: 578px;
-  }
-  .offset10 {
-    margin-left: 640px;
-  }
-  .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 {
-    padding-top: 0;
-  }
-  .navbar-fixed-top {
-    position: static;
-    margin-bottom: 18px;
-  }
-  .navbar-inner {
-    padding: 5px;
-    background-image: none;
-  }
-  .navbar .container {
-    padding: 0;
-  }
-  .navbar .brand {
-    padding-left: 10px;
-    padding-right: 10px;
-    margin: 0 0 0 -5px;
-  }
-  .navbar .nav-collapse {
-    clear: left;
-  }
-  .navbar .nav {
-    float: none;
-    margin: 0 0 9px;
-  }
-  .navbar .nav > li {
-    float: none;
-  }
-  .navbar .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .navbar .nav > .vertical-divider {
-    display: none;
-  }
-  .navbar .nav > li > a, .navbar .dropdown-menu a {
-    padding: 6px 15px;
-    font-weight: bold;
-    color: #999999;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-  }
-  .navbar .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover {
-    background-color: #222222;
-  }
-  .navbar .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    float: none;
-    display: block;
-    max-width: none;
-    margin: 0 15px;
-    padding: 0;
-    background-color: transparent;
-    border: none;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-  }
-  .navbar .dropdown-menu:before, .navbar .dropdown-menu:after {
-    display: none;
-  }
-  .navbar .dropdown-menu .divider {
-    display: none;
-  }
-  .navbar-form, .navbar-search {
-    float: none;
-    padding: 9px 15px;
-    margin: 9px 0;
-    border-top: 1px solid #222222;
-    border-bottom: 1px solid #222222;
-    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-  }
-  .navbar .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  .navbar-static .navbar-inner {
-    padding-left: 10px;
-    padding-right: 10px;
-  }
-  .btn-navbar {
-    display: block;
-  }
-  .nav-collapse {
-    overflow: hidden;
-    height: 0;
-  }
-}
-@media (min-width: 1200px) {
-  .thumbnails {
-    margin-left: -30px;
-  }
-  .thumbnails > li {
-    margin-left: 30px;
-  }
-  .container {
-    width: 1170px;
-  }
-  .row {
-    margin-left: -30px;
-  }
-  [class*="span"] {
-    margin-left: 30px;
-  }
-  .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;
-  }
-  .row-fluid {
-    width: 102.56143440326584%;
-    margin-left: -2.56%;
-  }
-  .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%;
-  }
-}
diff --git a/dist/img/glyphicons-halflings-white.png b/dist/img/glyphicons-halflings-white.png
deleted file mode 100644
index a20760bfd..000000000
Binary files a/dist/img/glyphicons-halflings-white.png and /dev/null differ
diff --git a/dist/img/glyphicons-halflings.png b/dist/img/glyphicons-halflings.png
deleted file mode 100644
index 92d4445df..000000000
Binary files a/dist/img/glyphicons-halflings.png and /dev/null differ
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
deleted file mode 100644
index 265e75883..000000000
--- a/dist/js/bootstrap.js
+++ /dev/null
@@ -1,1722 +0,0 @@
-/* ===================================================
- * bootstrap-transition.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#transitions
- * ===================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-!function( $ ) {
-
-  $(function () {
-
-    "use strict"
-
-    /* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
-     * ======================================================= */
-
-    $.support.transition = (function () {
-      var thisBody = document.body || document.documentElement
-        , thisStyle = thisBody.style
-        , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined
-
-      return support && {
-        end: (function () {
-          var transitionEnd = "TransitionEnd"
-          if ( $.browser.webkit ) {
-          	transitionEnd = "webkitTransitionEnd"
-          } else if ( $.browser.mozilla ) {
-          	transitionEnd = "transitionend"
-          } else if ( $.browser.opera ) {
-          	transitionEnd = "oTransitionEnd"
-          }
-          return transitionEnd
-        }())
-      }
-    })()
-
-  })
-  
-}( window.jQuery )
-/* ==========================================================
- * bootstrap-alert.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#alerts
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function( $ ){
-
-  "use strict"
-
- /* ALERT CLASS DEFINITION
-  * ====================== */
-
-  var dismiss = '[data-dismiss="alert"]'
-    , Alert = function ( el ) {
-        $(el).on('click', dismiss, this.close)
-      }
-
-  Alert.prototype = {
-
-    constructor: Alert
-
-  , close: function ( e ) {
-      var $this = $(this)
-        , selector = $this.attr('data-target')
-        , $parent
-
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-      }
-
-      $parent = $(selector)
-      $parent.trigger('close')
-
-      e && e.preventDefault()
-
-      $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
-
-      $parent.removeClass('in')
-
-      function removeElement() {
-        $parent.remove()
-        $parent.trigger('closed')
-      }
-
-      $.support.transition && $parent.hasClass('fade') ?
-        $parent.on($.support.transition.end, removeElement) :
-        removeElement()
-    }
-
-  }
-
-
- /* ALERT PLUGIN DEFINITION
-  * ======================= */
-
-  $.fn.alert = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('alert')
-      if (!data) $this.data('alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.alert.Constructor = Alert
-
-
- /* ALERT DATA-API
-  * ============== */
-
-  $(function () {
-    $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
-  })
-
-}( window.jQuery )
-/* ============================================================
- * bootstrap-button.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#buttons
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-!function( $ ){
-
-  "use strict"
-
- /* BUTTON PUBLIC CLASS DEFINITION
-  * ============================== */
-
-  var Button = function ( element, options ) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.button.defaults, options)
-  }
-
-  Button.prototype = {
-
-      constructor: Button
-
-    , setState: function ( state ) {
-        var d = 'disabled'
-          , $el = this.$element
-          , data = $el.data()
-          , val = $el.is('input') ? 'val' : 'html'
-
-        state = state + 'Text'
-        data.resetText || $el.data('resetText', $el[val]())
-
-        $el[val](data[state] || this.options[state])
-
-        // push to event loop to allow forms to submit
-        setTimeout(function () {
-          state == 'loadingText' ?
-            $el.addClass(d).attr(d, d) :
-            $el.removeClass(d).removeAttr(d)
-        }, 0)
-      }
-
-    , toggle: function () {
-        var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
-
-        $parent && $parent
-          .find('.active')
-          .removeClass('active')
-
-        this.$element.toggleClass('active')
-      }
-
-  }
-
-
- /* BUTTON PLUGIN DEFINITION
-  * ======================== */
-
-  $.fn.button = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('button')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('button', (data = new Button(this, options)))
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
-
-  $.fn.button.defaults = {
-    loadingText: 'loading...'
-  }
-
-  $.fn.button.Constructor = Button
-
-
- /* BUTTON DATA-API
-  * =============== */
-
-  $(function () {
-    $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
-      $(e.target).button('toggle')
-    })
-  })
-
-}( window.jQuery )
-/* ==========================================================
- * bootstrap-carousel.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#carousel
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function( $ ){
-
-  "use strict"
-
- /* CAROUSEL CLASS DEFINITION
-  * ========================= */
-
-  var Carousel = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.carousel.defaults, options)
-    this.options.slide && this.slide(this.options.slide)
-  }
-
-  Carousel.prototype = {
-
-    cycle: function () {
-      this.interval = setInterval($.proxy(this.next, this), this.options.interval)
-      return this
-    }
-
-  , to: function (pos) {
-      var $active = this.$element.find('.active')
-        , children = $active.parent().children()
-        , activePos = children.index($active)
-        , that = this
-
-      if (pos > (children.length - 1) || pos < 0) return
-
-      if (this.sliding) {
-        return this.$element.one('slid', function () {
-          that.to(pos)
-        })
-      }
-
-      if (activePos == pos) {
-        return this.pause().cycle()
-      }
-
-      return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
-    }
-
-  , pause: function () {
-      clearInterval(this.interval)
-      return this
-    }
-
-  , next: function () {
-      if (this.sliding) return
-      return this.slide('next')
-    }
-
-  , prev: function () {
-      if (this.sliding) return
-      return this.slide('prev')
-    }
-
-  , slide: function (type, next) {
-      var $active = this.$element.find('.active')
-        , $next = next || $active[type]()
-        , isCycling = this.interval
-        , direction = type == 'next' ? 'left' : 'right'
-        , fallback  = type == 'next' ? 'first' : 'last'
-        , that = this
-
-      this.sliding = true
-
-      isCycling && this.pause()
-
-      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
-
-      if (!$.support.transition && this.$element.hasClass('slide')) {
-        this.$element.trigger('slide')
-        $active.removeClass('active')
-        $next.addClass('active')
-        this.sliding = false
-        this.$element.trigger('slid')
-      } else {
-        $next.addClass(type)
-        $next[0].offsetWidth // force reflow
-        $active.addClass(direction)
-        $next.addClass(direction)
-        this.$element.trigger('slide')
-        this.$element.one($.support.transition.end, function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
-        })
-      }
-
-      isCycling && this.cycle()
-
-      return this
-    }
-
-  }
-
-
- /* CAROUSEL PLUGIN DEFINITION
-  * ========================== */
-
-  $.fn.carousel = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('carousel')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (typeof option == 'string' || (option = options.slide)) data[option]()
-      else data.cycle()
-    })
-  }
-
-  $.fn.carousel.defaults = {
-    interval: 5000
-  }
-
-  $.fn.carousel.Constructor = Carousel
-
-
- /* CAROUSEL DATA-API
-  * ================= */
-
-  $(function () {
-    $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
-      var $this = $(this), href
-        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-        , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
-      $target.carousel(options)
-      e.preventDefault()
-    })
-  })
-
-}( window.jQuery )
-/* =============================================================
- * bootstrap-collapse.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#collapse
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-!function( $ ){
-
-  "use strict"
-
-  var Collapse = function ( element, options ) {
-  	this.$element = $(element)
-    this.options = $.extend({}, $.fn.collapse.defaults, options)
-
-    if (this.options["parent"]) {
-      this.$parent = $(this.options["parent"])
-    }
-
-    this.options.toggle && this.toggle()
-  }
-
-  Collapse.prototype = {
-
-    constructor: Collapse
-
-  , dimension: function () {
-      var hasWidth = this.$element.hasClass('width')
-      return hasWidth ? 'width' : 'height'
-    }
-
-  , show: function () {
-      var dimension = this.dimension()
-        , scroll = $.camelCase(['scroll', dimension].join('-'))
-        , actives = this.$parent && this.$parent.find('.in')
-        , hasData
-
-      if (actives && actives.length) {
-        hasData = actives.data('collapse')
-        actives.collapse('hide')
-        hasData || actives.data('collapse', null)
-      }
-
-      this.$element[dimension](0)
-      this.transition('addClass', 'show', 'shown')
-      this.$element[dimension](this.$element[0][scroll])
-
-    }
-
-  , hide: function () {
-      var dimension = this.dimension()
-      this.reset(this.$element[dimension]())
-      this.transition('removeClass', 'hide', 'hidden')
-      this.$element[dimension](0)
-    }
-
-  , reset: function ( size ) {
-      var dimension = this.dimension()
-
-      this.$element
-        .removeClass('collapse')
-        [dimension](size || '')
-        [0].offsetWidth
-
-      this.$element.addClass('collapse')
-    }
-
-  , transition: function ( method, startEvent, completeEvent ) {
-      var that = this
-        , complete = function () {
-            if (startEvent == 'show') that.reset()
-            that.$element.trigger(completeEvent)
-          }
-
-      this.$element
-        .trigger(startEvent)
-        [method]('in')
-
-      $.support.transition && this.$element.hasClass('collapse') ?
-        this.$element.one($.support.transition.end, complete) :
-        complete()
-  	}
-
-  , toggle: function () {
-      this[this.$element.hasClass('in') ? 'hide' : 'show']()
-  	}
-
-  }
-
-  /* COLLAPSIBLE PLUGIN DEFINITION
-  * ============================== */
-
-  $.fn.collapse = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('collapse')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.collapse.defaults = {
-    toggle: true
-  }
-
-  $.fn.collapse.Constructor = Collapse
-
-
- /* COLLAPSIBLE DATA-API
-  * ==================== */
-
-  $(function () {
-    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
-      var $this = $(this), href
-        , target = $this.attr('data-target')
-          || e.preventDefault()
-          || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-        , option = $(target).data('collapse') ? 'toggle' : $this.data()
-      $(target).collapse(option)
-    })
-  })
-
-}( window.jQuery )
-/* ============================================================
- * bootstrap-dropdown.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#dropdowns
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function( $ ){
-
-  "use strict"
-
- /* DROPDOWN CLASS DEFINITION
-  * ========================= */
-
-  var toggle = '[data-toggle="dropdown"]'
-    , Dropdown = function ( element ) {
-        var $el = $(element).on('click.dropdown.data-api', this.toggle)
-        $('html').on('click.dropdown.data-api', function () {
-          $el.parent().removeClass('open')
-        })
-      }
-
-  Dropdown.prototype = {
-
-    constructor: Dropdown
-
-  , toggle: function ( e ) {
-      var $this = $(this)
-        , selector = $this.attr('data-target')
-        , $parent
-        , isActive
-
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-      }
-
-      $parent = $(selector)
-      $parent.length || ($parent = $this.parent())
-
-      isActive = $parent.hasClass('open')
-
-      clearMenus()
-      !isActive && $parent.toggleClass('open')
-
-      return false
-    }
-
-  }
-
-  function clearMenus() {
-    $(toggle).parent().removeClass('open')
-  }
-
-
-  /* DROPDOWN PLUGIN DEFINITION
-   * ========================== */
-
-  $.fn.dropdown = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('dropdown')
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.dropdown.Constructor = Dropdown
-
-
-  /* APPLY TO STANDARD DROPDOWN ELEMENTS
-   * =================================== */
-
-  $(function () {
-    $('html').on('click.dropdown.data-api', clearMenus)
-    $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-  })
-
-}( window.jQuery )
-/* =========================================================
- * bootstrap-modal.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#modals
- * =========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================= */
-
-
-!function( $ ){
-
-  "use strict"
-
- /* MODAL CLASS DEFINITION
-  * ====================== */
-
-  var Modal = function ( content, options ) {
-    this.options = $.extend({}, $.fn.modal.defaults, options)
-    this.$element = $(content)
-      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-  }
-
-  Modal.prototype = {
-
-      constructor: Modal
-
-    , toggle: function () {
-        return this[!this.isShown ? 'show' : 'hide']()
-      }
-
-    , show: function () {
-        var that = this
-
-        if (this.isShown) return
-
-        $('body').addClass('modal-open')
-
-        this.isShown = true
-        this.$element.trigger('show')
-
-        escape.call(this)
-        backdrop.call(this, function () {
-          var transition = $.support.transition && that.$element.hasClass('fade')
-
-          !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position
-
-          that.$element
-            .show()
-
-          if (transition) {
-            that.$element[0].offsetWidth // force reflow
-          }
-
-          that.$element.addClass('in')
-
-          transition ?
-            that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
-            that.$element.trigger('shown')
-
-        })
-      }
-
-    , hide: function ( e ) {
-        e && e.preventDefault()
-
-        if (!this.isShown) return
-
-        var that = this
-        this.isShown = false
-
-        $('body').removeClass('modal-open')
-
-        escape.call(this)
-
-        this.$element
-          .trigger('hide')
-          .removeClass('in')
-
-        $.support.transition && this.$element.hasClass('fade') ?
-          hideWithTransition.call(this) :
-          hideModal.call(this)
-      }
-
-  }
-
-
- /* MODAL PRIVATE METHODS
-  * ===================== */
-
-  function hideWithTransition() {
-    var that = this
-      , timeout = setTimeout(function () {
-          that.$element.off($.support.transition.end)
-          hideModal.call(that)
-        }, 500)
-
-    this.$element.one($.support.transition.end, function () {
-      clearTimeout(timeout)
-      hideModal.call(that)
-    })
-  }
-
-  function hideModal( that ) {
-    this.$element
-      .hide()
-      .trigger('hidden')
-
-    backdrop.call(this)
-  }
-
-  function backdrop( callback ) {
-    var that = this
-      , animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-    if (this.isShown && this.options.backdrop) {
-      var doAnimate = $.support.transition && animate
-
-      this.$backdrop = $('
                            ')
-        .appendTo(document.body)
-
-      if (this.options.backdrop != 'static') {
-        this.$backdrop.click($.proxy(this.hide, this))
-      }
-
-      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-      this.$backdrop.addClass('in')
-
-      doAnimate ?
-        this.$backdrop.one($.support.transition.end, callback) :
-        callback()
-
-    } else if (!this.isShown && this.$backdrop) {
-      this.$backdrop.removeClass('in')
-
-      $.support.transition && this.$element.hasClass('fade')?
-        this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) :
-        removeBackdrop.call(this)
-
-    } else if (callback) {
-      callback()
-    }
-  }
-
-  function removeBackdrop() {
-    this.$backdrop.remove()
-    this.$backdrop = null
-  }
-
-  function escape() {
-    var that = this
-    if (this.isShown && this.options.keyboard) {
-      $(document).on('keyup.dismiss.modal', function ( e ) {
-        e.which == 27 && that.hide()
-      })
-    } else if (!this.isShown) {
-      $(document).off('keyup.dismiss.modal')
-    }
-  }
-
-
- /* MODAL PLUGIN DEFINITION
-  * ======================= */
-
-  $.fn.modal = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('modal')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option]()
-      else data.show()
-    })
-  }
-
-  $.fn.modal.defaults = {
-      backdrop: true
-    , keyboard: true
-  }
-
-  $.fn.modal.Constructor = Modal
-
-
- /* MODAL DATA-API
-  * ============== */
-
-  $(function () {
-    $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
-      var $this = $(this), href
-        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-        , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data())
-
-      e.preventDefault()
-      $target.modal(option)
-    })
-  })
-
-}( window.jQuery )
-/* ===========================================================
- * bootstrap-tooltip.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#tooltips
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-!function( $ ) {
-
-  "use strict"
-
- /* TOOLTIP PUBLIC CLASS DEFINITION
-  * =============================== */
-
-  var Tooltip = function ( element, options ) {
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.prototype = {
-
-    constructor: Tooltip
-
-  , init: function ( type, element, options ) {
-      var eventIn
-        , eventOut
-
-      this.type = type
-      this.$element = $(element)
-      this.options = this.getOptions(options)
-      this.enabled = true
-
-      if (this.options.trigger != 'manual') {
-        eventIn  = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
-        eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
-        this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
-      }
-
-      this.options.selector ?
-        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-        this.fixTitle()
-    }
-
-  , getOptions: function ( options ) {
-      options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
-
-      if (options.delay && typeof options.delay == 'number') {
-        options.delay = {
-          show: options.delay
-        , hide: options.delay
-        }
-      }
-
-      return options
-    }
-
-  , enter: function ( e ) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
-
-      if (!self.options.delay || !self.options.delay.show) {
-        self.show()
-      } else {
-        self.hoverState = 'in'
-        setTimeout(function() {
-          if (self.hoverState == 'in') {
-            self.show()
-          }
-        }, self.options.delay.show)
-      }
-    }
-
-  , leave: function ( e ) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
-
-      if (!self.options.delay || !self.options.delay.hide) {
-        self.hide()
-      } else {
-        self.hoverState = 'out'
-        setTimeout(function() {
-          if (self.hoverState == 'out') {
-            self.hide()
-          }
-        }, self.options.delay.hide)
-      }
-    }
-
-  , show: function () {
-      var $tip
-        , inside
-        , pos
-        , actualWidth
-        , actualHeight
-        , placement
-        , tp
-
-      if (this.hasContent() && this.enabled) {
-        $tip = this.tip()
-        this.setContent()
-
-        if (this.options.animation) {
-          $tip.addClass('fade')
-        }
-
-        placement = typeof this.options.placement == 'function' ?
-          this.options.placement.call(this, $tip[0], this.$element[0]) :
-          this.options.placement
-
-        inside = /in/.test(placement)
-
-        $tip
-          .remove()
-          .css({ top: 0, left: 0, display: 'block' })
-          .appendTo(inside ? this.$element : document.body)
-
-        pos = this.getPosition(inside)
-
-        actualWidth = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
-
-        switch (inside ? placement.split(' ')[1] : placement) {
-          case 'bottom':
-            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'top':
-            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'left':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
-            break
-          case 'right':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
-            break
-        }
-
-        $tip
-          .css(tp)
-          .addClass(placement)
-          .addClass('in')
-      }
-    }
-
-  , setContent: function () {
-      var $tip = this.tip()
-      $tip.find('.tooltip-inner').html(this.getTitle())
-      $tip.removeClass('fade in top bottom left right')
-    }
-
-  , hide: function () {
-      var that = this
-        , $tip = this.tip()
-
-      $tip.removeClass('in')
-
-      function removeWithAnimation() {
-        var timeout = setTimeout(function () {
-          $tip.off($.support.transition.end).remove()
-        }, 500)
-
-        $tip.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          $tip.remove()
-        })
-      }
-
-      $.support.transition && this.$tip.hasClass('fade') ?
-        removeWithAnimation() :
-        $tip.remove()
-    }
-
-  , fixTitle: function () {
-      var $e = this.$element
-      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-        $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
-      }
-    }
-
-  , hasContent: function () {
-      return this.getTitle()
-    }
-
-  , getPosition: function (inside) {
-      return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
-        width: this.$element[0].offsetWidth
-      , height: this.$element[0].offsetHeight
-      })
-    }
-
-  , getTitle: function () {
-      var title
-        , $e = this.$element
-        , o = this.options
-
-      title = $e.attr('data-original-title')
-        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-      title = title.toString().replace(/(^\s*|\s*$)/, "")
-
-      return title
-    }
-
-  , tip: function () {
-      return this.$tip = this.$tip || $(this.options.template)
-    }
-
-  , validate: function () {
-      if (!this.$element[0].parentNode) {
-        this.hide()
-        this.$element = null
-        this.options = null
-      }
-    }
-
-  , enable: function () {
-      this.enabled = true
-    }
-
-  , disable: function () {
-      this.enabled = false
-    }
-
-  , toggleEnabled: function () {
-      this.enabled = !this.enabled
-    }
-
-  , toggle: function () {
-      this[this.tip().hasClass('in') ? 'hide' : 'show']()
-    }
-
-  }
-
-
- /* TOOLTIP PLUGIN DEFINITION
-  * ========================= */
-
-  $.fn.tooltip = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('tooltip')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tooltip.Constructor = Tooltip
-
-  $.fn.tooltip.defaults = {
-    animation: true
-  , delay: 0
-  , selector: false
-  , placement: 'top'
-  , trigger: 'hover'
-  , title: ''
-  , template: '
                            '
-  }
-
-}( window.jQuery )
-/* ===========================================================
- * bootstrap-popover.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#popovers
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================================================== */
-
-
-!function( $ ) {
-
- "use strict"
-
-  var Popover = function ( element, options ) {
-    this.init('popover', element, options)
-  }
-
-  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
-     ========================================== */
-
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
-
-    constructor: Popover
-
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
-        , content = this.getContent()
-
-      $tip.find('.title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
-      $tip.find('.content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
-
-      $tip.removeClass('fade top bottom left right in')
-    }
-
-  , hasContent: function () {
-      return this.getTitle() || this.getContent()
-    }
-
-  , getContent: function () {
-      var content
-        , $e = this.$element
-        , o = this.options
-
-      content = $e.attr('data-content')
-        || (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
-
-      content = content.toString().replace(/(^\s*|\s*$)/, "")
-
-      return content
-    }
-
-  , tip: function() {
-      if (!this.$tip) {
-        this.$tip = $(this.options.template)
-      }
-      return this.$tip
-    }
-
-  })
-
-
- /* POPOVER PLUGIN DEFINITION
-  * ======================= */
-
-  $.fn.popover = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('popover')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.popover.Constructor = Popover
-
-  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
-    placement: 'right'
-  , content: ''
-  , template: '
                            '
-  })
-
-}( window.jQuery )
-/* =============================================================
- * bootstrap-scrollspy.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#scrollspy
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================== */
-
-!function ( $ ) {
-
-  "use strict"
-
-  /* SCROLLSPY CLASS DEFINITION
-   * ========================== */
-
-  function ScrollSpy( element, options) {
-    var process = $.proxy(this.process, this)
-      , $element = $(element).is('body') ? $(window) : $(element)
-      , href
-    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
-    this.$scrollElement = $element.on('scroll.scroll.data-api', process)
-    this.selector = (this.options.target
-      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      || '') + ' .nav li > a'
-    this.$body = $('body').on('click.scroll.data-api', this.selector, process)
-    this.refresh()
-    this.process()
-  }
-
-  ScrollSpy.prototype = {
-
-      constructor: ScrollSpy
-
-    , refresh: function () {
-        this.targets = this.$body
-          .find(this.selector)
-          .map(function () {
-            var href = $(this).attr('href')
-            return /^#\w/.test(href) && $(href).length ? href : null
-          })
-
-        this.offsets = $.map(this.targets, function (id) {
-          return $(id).position().top
-        })
-      }
-
-    , process: function () {
-        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
-          , offsets = this.offsets
-          , targets = this.targets
-          , activeTarget = this.activeTarget
-          , i
-
-        for (i = offsets.length; i--;) {
-          activeTarget != targets[i]
-            && scrollTop >= offsets[i]
-            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
-            && this.activate( targets[i] )
-        }
-      }
-
-    , activate: function (target) {
-        var active
-
-        this.activeTarget = target
-
-        this.$body
-          .find(this.selector).parent('.active')
-          .removeClass('active')
-
-        active = this.$body
-          .find(this.selector + '[href="' + target + '"]')
-          .parent('li')
-          .addClass('active')
-
-        if ( active.parent('.dropdown-menu') )  {
-          active.closest('li.dropdown').addClass('active')
-        }
-      }
-
-  }
-
-
- /* SCROLLSPY PLUGIN DEFINITION
-  * =========================== */
-
-  $.fn.scrollspy = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('scrollspy')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.scrollspy.Constructor = ScrollSpy
-
-  $.fn.scrollspy.defaults = {
-    offset: 10
-  }
-
-
- /* SCROLLSPY DATA-API
-  * ================== */
-
-  $(function () {
-    $('[data-spy="scroll"]').each(function () {
-      var $spy = $(this)
-      $spy.scrollspy($spy.data())
-    })
-  })
-
-}( window.jQuery )
-/* ========================================================
- * bootstrap-tab.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#tabs
- * ========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================== */
-
-
-!function( $ ){
-
-  "use strict"
-
- /* TAB CLASS DEFINITION
-  * ==================== */
-
-  var Tab = function ( element ) {
-    this.element = $(element)
-  }
-
-  Tab.prototype = {
-
-    constructor: Tab
-
-  , show: function () {
-      var $this = this.element
-        , $ul = $this.closest('ul:not(.dropdown-menu)')
-        , selector = $this.attr('data-target')
-        , previous
-        , $target
-
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-      }
-
-      if ( $this.parent('li').hasClass('active') ) return
-
-      previous = $ul.find('.active a').last()[0]
-
-      $this.trigger({
-        type: 'show'
-      , relatedTarget: previous
-      })
-
-      $target = $(selector)
-
-      this.activate($this.parent('li'), $ul)
-      this.activate($target, $target.parent(), function () {
-        $this.trigger({
-          type: 'shown'
-        , relatedTarget: previous
-        })
-      })
-    }
-
-  , activate: function ( element, container, callback) {
-      var $active = container.find('> .active')
-        , transition = callback
-            && $.support.transition
-            && $active.hasClass('fade')
-
-      function next() {
-        $active
-          .removeClass('active')
-          .find('> .dropdown-menu > .active')
-          .removeClass('active')
-
-        element.addClass('active')
-
-        if (transition) {
-          element[0].offsetWidth // reflow for transition
-          element.addClass('in')
-        } else {
-          element.removeClass('fade')
-        }
-
-        if ( element.parent('.dropdown-menu') ) {
-          element.closest('li.dropdown').addClass('active')
-        }
-
-        callback && callback()
-      }
-
-      transition ?
-        $active.one($.support.transition.end, next) :
-        next()
-
-      $active.removeClass('in')
-    }
-  }
-
-
- /* TAB PLUGIN DEFINITION
-  * ===================== */
-
-  $.fn.tab = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('tab')
-      if (!data) $this.data('tab', (data = new Tab(this)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tab.Constructor = Tab
-
-
- /* TAB DATA-API
-  * ============ */
-
-  $(function () {
-    $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
-      e.preventDefault()
-      $(this).tab('show')
-    })
-  })
-
-}( window.jQuery )
-/* =============================================================
- * bootstrap-typeahead.js v2.0.0
- * http://twitter.github.com/bootstrap/javascript.html#typeahead
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-!function( $ ){
-
-  "use strict"
-
-  var Typeahead = function ( element, options ) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.typeahead.defaults, options)
-    this.matcher = this.options.matcher || this.matcher
-    this.sorter = this.options.sorter || this.sorter
-    this.highlighter = this.options.highlighter || this.highlighter
-    this.$menu = $(this.options.menu).appendTo('body')
-    this.source = this.options.source
-    this.shown = false
-    this.listen()
-  }
-
-  Typeahead.prototype = {
-
-    constructor: Typeahead
-
-  , select: function () {
-      var val = this.$menu.find('.active').attr('data-value')
-      this.$element.val(val)
-      return this.hide()
-    }
-
-  , show: function () {
-      var pos = $.extend({}, this.$element.offset(), {
-        height: this.$element[0].offsetHeight
-      })
-
-      this.$menu.css({
-        top: pos.top + pos.height
-      , left: pos.left
-      })
-
-      this.$menu.show()
-      this.shown = true
-      return this
-    }
-
-  , hide: function () {
-      this.$menu.hide()
-      this.shown = false
-      return this
-    }
-
-  , lookup: function (event) {
-      var that = this
-        , items
-        , q
-
-      this.query = this.$element.val()
-
-      if (!this.query) {
-        return this.shown ? this.hide() : this
-      }
-
-      items = $.grep(this.source, function (item) {
-        if (that.matcher(item)) return item
-      })
-
-      items = this.sorter(items)
-
-      if (!items.length) {
-        return this.shown ? this.hide() : this
-      }
-
-      return this.render(items.slice(0, this.options.items)).show()
-    }
-
-  , matcher: function (item) {
-      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
-    }
-
-  , sorter: function (items) {
-      var beginswith = []
-        , caseSensitive = []
-        , caseInsensitive = []
-        , item
-
-      while (item = items.shift()) {
-        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
-        else if (~item.indexOf(this.query)) caseSensitive.push(item)
-        else caseInsensitive.push(item)
-      }
-
-      return beginswith.concat(caseSensitive, caseInsensitive)
-    }
-
-  , highlighter: function (item) {
-      return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) {
-        return '' + match + ''
-      })
-    }
-
-  , render: function (items) {
-      var that = this
-
-      items = $(items).map(function (i, item) {
-        i = $(that.options.item).attr('data-value', item)
-        i.find('a').html(that.highlighter(item))
-        return i[0]
-      })
-
-      items.first().addClass('active')
-      this.$menu.html(items)
-      return this
-    }
-
-  , next: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , next = active.next()
-
-      if (!next.length) {
-        next = $(this.$menu.find('li')[0])
-      }
-
-      next.addClass('active')
-    }
-
-  , prev: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , prev = active.prev()
-
-      if (!prev.length) {
-        prev = this.$menu.find('li').last()
-      }
-
-      prev.addClass('active')
-    }
-
-  , listen: function () {
-      this.$element
-        .on('blur',     $.proxy(this.blur, this))
-        .on('keypress', $.proxy(this.keypress, this))
-        .on('keyup',    $.proxy(this.keyup, this))
-
-      if ($.browser.webkit || $.browser.msie) {
-        this.$element.on('keydown', $.proxy(this.keypress, this))
-      }
-
-      this.$menu
-        .on('click', $.proxy(this.click, this))
-        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
-    }
-
-  , keyup: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-
-      switch(e.keyCode) {
-        case 40: // down arrow
-        case 38: // up arrow
-          break
-
-        case 9: // tab
-        case 13: // enter
-          if (!this.shown) return
-          this.select()
-          break
-
-        case 27: // escape
-          this.hide()
-          break
-
-        default:
-          this.lookup()
-      }
-
-  }
-
-  , keypress: function (e) {
-      e.stopPropagation()
-      if (!this.shown) return
-
-      switch(e.keyCode) {
-        case 9: // tab
-        case 13: // enter
-        case 27: // escape
-          e.preventDefault()
-          break
-
-        case 38: // up arrow
-          e.preventDefault()
-          this.prev()
-          break
-
-        case 40: // down arrow
-          e.preventDefault()
-          this.next()
-          break
-      }
-    }
-
-  , blur: function (e) {
-      var that = this
-      e.stopPropagation()
-      e.preventDefault()
-      setTimeout(function () { that.hide() }, 150)
-    }
-
-  , click: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-      this.select()
-    }
-
-  , mouseenter: function (e) {
-      this.$menu.find('.active').removeClass('active')
-      $(e.currentTarget).addClass('active')
-    }
-
-  }
-
-
-  /* TYPEAHEAD PLUGIN DEFINITION
-   * =========================== */
-
-  $.fn.typeahead = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('typeahead')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.typeahead.defaults = {
-    source: []
-  , items: 8
-  , menu: '
                              '
-  , item: '
                              • '
-  }
-
-  $.fn.typeahead.Constructor = Typeahead
-
-
- /* TYPEAHEAD DATA-API
-  * ================== */
-
-  $(function () {
-    $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
-      var $this = $(this)
-      if ($this.data('typeahead')) return
-      e.preventDefault()
-      $this.typeahead($this.data())
-    })
-  })
-
-}( window.jQuery )
diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js
deleted file mode 100644
index 9d4fbd07a..000000000
--- a/dist/js/bootstrap.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){a(function(){"use strict",a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.remove(),e.trigger("closed")}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype={constructor:b,setState:function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},toggle:function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")}},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){a(b.target).button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.carousel.defaults,c),this.options.slide&&this.slide(this.options.slide)};b.prototype={cycle:function(){return this.interval=setInterval(a.proxy(this.next,this),this.options.interval),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(){return clearInterval(this.interval),this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;return this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h](),!a.support.transition&&this.$element.hasClass("slide")?(this.$element.trigger("slide"),d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")):(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.trigger("slide"),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})),f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=typeof c=="object"&&c;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():e.cycle()})},a.fn.carousel.defaults={interval:5e3},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find(".in"),e;d&&d.length&&(e=d.data("collapse"),d.collapse("hide"),e||d.data("collapse",null)),this.$element[b](0),this.transition("addClass","show","shown"),this.$element[b](this.$element[0][c])},hide:function(){var a=this.dimension();this.reset(this.$element[a]()),this.transition("removeClass","hide","hidden"),this.$element[a](0)},reset:function(a){var b=this.dimension();this.$element.removeClass("collapse")[b](a||"")[0].offsetWidth,this.$element.addClass("collapse")},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.$element.trigger(d)};this.$element.trigger(c)[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e=c.attr("data-target"),f,g;return e||(e=c.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,"")),f=a(e),f.length||(f=c.parent()),g=f.hasClass("open"),d(),!g&&f.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
                              ').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=a.extend({},a.fn.modal.defaults,c),this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this;if(this.isShown)return;a("body").addClass("modal-open"),this.isShown=!0,this.$element.trigger("show"),g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");!b.$element.parent().length&&b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();if(!this.isShown)return;var e=this;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.trigger("hide").removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=typeof c=="object"&&c;e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.show?c.show():(c.hoverState="in",setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show))},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.hide?c.hide():(c.hoverState="out",setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide))},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip();a.find(".tooltip-inner").html(this.getTitle()),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,delay:0,selector:!1,placement:"top",trigger:"hover",title:"",template:'
                              '}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var b=this.tip(),c=this.getTitle(),d=this.getContent();b.find(".title")[a.type(c)=="object"?"append":"html"](c),b.find(".content > *")[a.type(d)=="object"?"append":"html"](d),b.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'
                              '})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body").on("click.scroll.data-api",this.selector,d),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){this.targets=this.$body.find(this.selector).map(function(){var b=a(this).attr("href");return/^#\w/.test(b)&&a(b).length?b:null}),this.offsets=a.map(this.targets,function(b){return a(b).position().top})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.offsets,c=this.targets,d=this.activeTarget,e;for(e=b.length;e--;)d!=c[e]&&a>=b[e]&&(!b[e+1]||a<=b[e+1])&&this.activate(c[e])},activate:function(a){var b;this.activeTarget=a,this.$body.find(this.selector).parent(".active").removeClass("active"),b=this.$body.find(this.selector+'[href="'+a+'"]').parent("li").addClass("active"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],b.trigger({type:"show",relatedTarget:e}),f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(a),this.hide()},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){if(c.matcher(a))return a}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){return a.replace(new RegExp("("+this.query+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){a.stopPropagation(),a.preventDefault();switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:this.hide();break;default:this.lookup()}},keypress:function(a){a.stopPropagation();if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}},blur:function(a){var b=this;a.stopPropagation(),a.preventDefault(),setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
                                ',item:'
                                • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery);
\ No newline at end of file
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 1b658bf83..dbceeaa25 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/less.html b/docs/less.html
index 4499c78df..76794dbe4 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -345,13 +345,13 @@
         
           
             @warningText
-            #c09853
-            
+            #f3edd2
+            
           
           
             @warningBackground
-            #f3edd2
-            
+            #c09853
+            
           
           
             @errorText
-- 
cgit v1.2.3


From 702d3b6dfe7a150deb090f70d7d9c2a2964a3eb2 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 16:35:55 -0800
Subject: fix broken navbar collapse

---
 docs/assets/bootstrap.zip                | Bin 51322 -> 51339 bytes
 docs/assets/css/bootstrap-responsive.css |   8 +++++---
 docs/base-css.html                       |   2 +-
 docs/components.html                     |   2 +-
 docs/download.html                       |   2 +-
 docs/examples.html                       |   2 +-
 docs/index.html                          |   2 +-
 docs/javascript.html                     |   2 +-
 docs/less.html                           |  10 +++++-----
 docs/scaffolding.html                    |   2 +-
 docs/templates/layout.mustache           |   2 +-
 docs/upgrading.html                      |   2 +-
 less/responsive.less                     |  21 ++++++++++++++++-----
 13 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 1b658bf83..bd974a462 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 68ccf676f..76e27d672 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -305,12 +305,14 @@
   .btn-navbar {
     display: block;
   }
-  .nav-collapse.collapse {
+  .nav-collapse {
     overflow: hidden;
     height: 0;
   }
-  .nav-collapse.collapse.in {
-    height: auto;
+}
+@media (min-width: 940px) {
+  .nav-collapse.collapse {
+    height: auto !important;
   }
 }
 @media (min-width: 1200px) {
diff --git a/docs/base-css.html b/docs/base-css.html
index 291feb6e1..0406ff229 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                                
+          
                                
             
                                  
               
                                • 
                 Overview
diff --git a/docs/components.html b/docs/components.html
index 81c328352..9fc762fc6 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                                  
+          
                                  
             
                                    
               
                                  • 
                 Overview
diff --git a/docs/download.html b/docs/download.html
index 97f1c24c4..832b07ce6 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                                    
+          
                                    
             
                                      
               
                                    • 
                 Overview
diff --git a/docs/examples.html b/docs/examples.html
index b2fd296d1..7d79fc0a0 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                                      
+          
                                      
             
                                        
               
                                      • 
                 Overview
diff --git a/docs/index.html b/docs/index.html
index 7d728dc7d..e20d08bcd 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                                        
+          
                                        
             
                                          
               
                                        • 
                 Overview
diff --git a/docs/javascript.html b/docs/javascript.html
index 9838aa0d1..eb4a175c3 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                                          
+          
                                          
             
                                            
               
                                          • 
                 Overview
diff --git a/docs/less.html b/docs/less.html
index 4499c78df..5935c9125 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                                            
+          
                                            
             
                                              
               
                                            • 
                 Overview
@@ -345,13 +345,13 @@
         
           
             @warningText
-            #c09853
-            
+            #f3edd2
+            
           
           
             @warningBackground
-            #f3edd2
-            
+            #c09853
+            
           
           
             @errorText
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 00aadd472..b9eb399f9 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                                              
+          
                                              
             
                                                
               
                                              • 
                 Overview
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index b49ec28f6..7c0ab655b 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                                                
+          
                                                
             
                                                  
               
                                                • 
                 {{_i}}Overview{{/i}}
diff --git a/docs/upgrading.html b/docs/upgrading.html
index b8e82fe31..d7ad30f56 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -39,7 +39,7 @@
             
           
           Bootstrap
-          
                                                  
+          
                                                  
             
                                                    
               
                                                  • 
                 Overview
diff --git a/less/responsive.less b/less/responsive.less
index 7ae28b825..a1d4cf2c8 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -22,6 +22,7 @@
 }
 
 
+
 // UP TO LANDSCAPE PHONE
 // ---------------------
 
@@ -103,11 +104,11 @@
 }
 
 
+
 // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
 // --------------------------------------------------
 
 @media (max-width: 768px) {
-
   // GRID & CONTAINERS
   // -----------------
   // Remove width from containers
@@ -133,6 +134,7 @@
 }
 
 
+
 // PORTRAIT TABLET TO DEFAULT DESKTOP
 // ----------------------------------
 
@@ -225,6 +227,7 @@
 }
 
 
+
 // TABLETS AND BELOW
 // -----------------
 @media (max-width: 940px) {
@@ -335,17 +338,25 @@
   }
 
   // Hide everything in the navbar save .brand and toggle button */
-  .nav-collapse.collapse {
+  .nav-collapse {
     overflow: hidden;
     height: 0;
   }
-  .nav-collapse.collapse.in {
-    height: auto;
-  }
+}
+
+
+
+// DEFAULT DESKTOP
+// ---------------
 
+@media (min-width: 940px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+  }
 }
 
 
+
 // LARGE DESKTOP & UP
 // ------------------
 
-- 
cgit v1.2.3


From 882bb9dbd3631124b8c5052dff5be5b22a1e3867 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 16:43:03 -0800
Subject: reran make

---
 docs/assets/bootstrap.zip | Bin 51339 -> 51339 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7a18bce0d..5fa5857ab 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
-- 
cgit v1.2.3


From 90f2e8e196eaaf60256659d9a76205b66ba6e941 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 29 Jan 2012 16:46:40 -0800
Subject: rebuild zip

---
 docs/assets/bootstrap.zip | Bin 51339 -> 51339 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 5fa5857ab..099ed3b1a 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
-- 
cgit v1.2.3


From 0301d469e8f8bd9da6d63ffb929ad48cae573afc Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 16:54:51 -0800
Subject: remove .collapse from navbar responsive docs

---
 docs/assets/bootstrap.zip                | Bin 51339 -> 51339 bytes
 docs/components.html                     |   2 +-
 docs/templates/pages/components.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 5fa5857ab..c44397278 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 9fc762fc6..95c7c9907 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -758,7 +758,7 @@
       <a class="brand" href="#">Project name</a>
 
       <!-- Everything you want hidden at 940px or less, place within here -->
-      <div class="nav-collapse collapse">
+      <div class="nav-collapse">
         <!-- .nav, .navbar-search, .navbar-form, etc -->
       </div>
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index fd7c464db..7fd1c1ac6 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -686,7 +686,7 @@
       <a class="brand" href="#">{{_i}}Project name{{/i}}</a>
 
       <!-- Everything you want hidden at 940px or less, place within here -->
-      <div class="nav-collapse collapse">
+      <div class="nav-collapse">
         <!-- .nav, .navbar-search, .navbar-form, etc -->
       </div>
 
-- 
cgit v1.2.3


From fda77e69eb825f6b098a303fedcc96d257b4b050 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 16:58:51 -0800
Subject: move vars and mixins for default grid back to appropriate files

---
 docs/assets/bootstrap.zip | Bin 51339 -> 51339 bytes
 less/grid.less            |  25 -------------------------
 less/mixins.less          |  15 +++++++++++++++
 less/variables.less       |  11 +++++++++++
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 21df15cef..cb200386a 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/less/grid.less b/less/grid.less
index 4493d0b95..2ef767a4a 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -2,31 +2,6 @@
 // -----------
 
 
-// Default grid sizing
-// -------------------
-@gridColumns:           12;
-@gridColumnWidth:       60px;
-@gridGutterWidth:       20px;
-
-@gridRowWidth:          (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-@gridTotalWidth:        @gridRowWidth;
-
-
-// Columns and offseting mixins
-// ----------------------------
-.columns(@columns: 1) {
-  //width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-  width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/@gridRowWidth);
-}
-.offset(@columns: 1) {
-  margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
-}
-// Necessary grid styles for every column to make them appear next to each other horizontally
-.gridColumn() {
-  float: left;
-  margin-left: @gridGutterWidth;
-}
-
 // Grid rows and columns
 // ---------------------
 .row {
diff --git a/less/mixins.less b/less/mixins.less
index 2d0e2d4c0..cba2670db 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -139,6 +139,21 @@
   .clearfix();
 }
 
+// Columns and offseting mixins
+// ----------------------------
+.columns(@columns: 1) {
+  //width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+  width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/@gridRowWidth);
+}
+.offset(@columns: 1) {
+  margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+}
+// Necessary grid styles for every column to make them appear next to each other horizontally
+.gridColumn() {
+  float: left;
+  margin-left: @gridGutterWidth;
+}
+
 
 
 // CSS3 PROPERTIES
diff --git a/less/variables.less b/less/variables.less
index c1e21978c..f09a88cdb 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -40,6 +40,17 @@
 
 
 
+// GRID SYSTEM VARIABLES
+// --------------------------------------------------
+
+@gridColumns:           12;
+@gridColumnWidth:       60px;
+@gridGutterWidth:       20px;
+@gridRowWidth:          (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+@gridTotalWidth:        @gridRowWidth;
+
+
+
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
-- 
cgit v1.2.3


From 2ba1b01f8d9a0410d9cf45532d8924d858af74cd Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 29 Jan 2012 17:03:05 -0800
Subject: subnav adjustments

---
 docs/assets/css/docs.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 74b548628..1380b9e6c 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -707,6 +707,13 @@ form.well {
   .subnav .nav > li + li > a {
     border-top: 1px solid #e5e5e5;
   }
+  .subnav .nav > li:first-child > a,
+  .subnav .nav > li:first-child > a:hover {
+      -webkit-border-radius: 4px 4px 0 0;
+         -moz-border-radius: 4px 4px 0 0;
+              border-radius: 4px 4px 0 0;
+  }
+
 
   /* Popovers */
   .large-bird {
-- 
cgit v1.2.3


From fae04c8ac1da675338c1cfaf3922223980667281 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 29 Jan 2012 19:04:26 -0800
Subject: add license for responsive and rebuild

---
 docs/assets/bootstrap.zip                | Bin 51339 -> 51502 bytes
 docs/assets/css/bootstrap-responsive.css |   9 +++++++++
 less/responsive.less                     |  14 ++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 099ed3b1a..dafd812dc 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 76e27d672..8fadecceb 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -1,3 +1,12 @@
+/*!
+ * Bootstrap Responsive v2.0.0
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
 .hidden {
   display: none;
   visibility: hidden;
diff --git a/less/responsive.less b/less/responsive.less
index a1d4cf2c8..7f0892809 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -1,3 +1,13 @@
+/*!
+ * Bootstrap Responsive v2.0.0
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
 // Responsive.less
 // For phone and tablet devices
 // -------------------------------------------------------------
@@ -203,7 +213,7 @@
     .gridColumn() {
       float: left;
       margin-left: @gridGutterWidth;
-    } 
+    }
     [class*="span"] {
       .gridColumn();
     }
@@ -436,7 +446,7 @@
     .gridColumn() {
       float: left;
       margin-left: @gridGutterWidth;
-    } 
+    }
     [class*="span"] {
       .gridColumn();
     }
-- 
cgit v1.2.3


From f9b53d424e55bca4c7efe6220d36acafaee613cd Mon Sep 17 00:00:00 2001
From: Mark Reeder 
Date: Sun, 29 Jan 2012 21:14:07 -0800
Subject: Fixes issue with Opera flickering on the collapse plugin when reset
 is called without specifying the size

https://github.com/twitter/bootstrap/issues/1208
---
 js/bootstrap-collapse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index ee36840d2..8134cc42f 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -71,7 +71,7 @@
 
       this.$element
         .removeClass('collapse')
-        [dimension](size || '')
+        [dimension](size || 'auto')
         [0].offsetWidth
 
       this.$element.addClass('collapse')
-- 
cgit v1.2.3


From ae7f94eeff733584cbdc80a2d13a85f136a7744e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 00:39:44 -0800
Subject: overhaul grid mixins and variables, standardize fluid grid system and
 enable it across responsive layouts

---
 docs/assets/bootstrap.zip                | Bin 51339 -> 51780 bytes
 docs/assets/css/bootstrap-responsive.css | 196 ++++++++++++++++++++++++-------
 docs/assets/css/bootstrap.css            |  78 ++++--------
 docs/assets/css/docs.css                 |   1 +
 docs/base-css.html                       |  25 ++++
 docs/components.html                     |   4 +
 docs/download.html                       |   4 +
 docs/examples.html                       |   4 +
 docs/index.html                          |   4 +
 docs/javascript.html                     |   4 +
 docs/less.html                           |   4 +
 docs/scaffolding.html                    |   4 +
 docs/templates/layout.mustache           |   4 +
 docs/templates/pages/base-css.mustache   |  21 ++++
 docs/upgrading.html                      |   4 +
 examples/fluid.html                      |   6 +-
 less/forms.less                          |  46 ++------
 less/grid.less                           |  81 +------------
 less/mixins.less                         | 134 +++++++++++++++++++--
 less/responsive.less                     | 190 +++---------------------------
 less/variables.less                      |  25 ++--
 21 files changed, 430 insertions(+), 409 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index cb200386a..f42b5b57b 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 76e27d672..fb1d62692 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -83,7 +83,7 @@
   .row {
     margin-left: 0;
   }
-  .row > [class*="span"] {
+  .row > [class*="span"], .row-fluid > [class*="span"] {
     float: none;
     display: block;
     width: auto;
@@ -91,10 +91,20 @@
   }
 }
 @media (min-width: 768px) and (max-width: 940px) {
-  .container {
-    width: 724px;
-    padding-left: 20px;
-    padding-right: 20px;
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before, .row:after {
+    display: table;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    margin-left: 20px;
   }
   .span1 {
     width: 42px;
@@ -129,7 +139,7 @@
   .span11 {
     width: 662px;
   }
-  .span12 {
+  .span12, .container {
     width: 724px;
   }
   .offset1 {
@@ -166,48 +176,94 @@
     margin-left: 702px;
   }
   .row-fluid {
-    width: 102.76243093919337%;
-    margin-left: -2.762430939%;
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before, .row-fluid:after {
+    display: table;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
   }
   .row-fluid [class*="span"] {
     float: left;
     margin-left: 2.762430939%;
   }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
   .row-fluid .span1 {
-    width: 5.6451612899588115%;
+    width: 5.801104972%;
   }
   .row-fluid .span2 {
-    width: 13.978494622708812%;
+    width: 14.364640883%;
   }
   .row-fluid .span3 {
-    width: 22.31182795545881%;
+    width: 22.928176794%;
   }
   .row-fluid .span4 {
-    width: 30.64516128820881%;
+    width: 31.491712705%;
   }
   .row-fluid .span5 {
-    width: 38.97849462095881%;
+    width: 40.055248616%;
   }
   .row-fluid .span6 {
-    width: 47.311827953708814%;
+    width: 48.618784527%;
   }
   .row-fluid .span7 {
-    width: 55.645161286458816%;
+    width: 57.182320438000005%;
   }
   .row-fluid .span8 {
-    width: 63.97849461920882%;
+    width: 65.74585634900001%;
   }
   .row-fluid .span9 {
-    width: 72.31182795195882%;
+    width: 74.30939226%;
   }
   .row-fluid .span10 {
-    width: 80.64516128470882%;
+    width: 82.87292817100001%;
   }
   .row-fluid .span11 {
-    width: 88.97849461745884%;
+    width: 91.436464082%;
   }
   .row-fluid .span12 {
-    width: 97.31182795020881%;
+    width: 99.999999993%;
+  }
+  input.span1, textarea.span1, .uneditable-input.span1 {
+    width: 32px;
+  }
+  input.span2, textarea.span2, .uneditable-input.span2 {
+    width: 94px;
+  }
+  input.span3, textarea.span3, .uneditable-input.span3 {
+    width: 156px;
+  }
+  input.span4, textarea.span4, .uneditable-input.span4 {
+    width: 218px;
+  }
+  input.span5, textarea.span5, .uneditable-input.span5 {
+    width: 280px;
+  }
+  input.span6, textarea.span6, .uneditable-input.span6 {
+    width: 342px;
+  }
+  input.span7, textarea.span7, .uneditable-input.span7 {
+    width: 404px;
+  }
+  input.span8, textarea.span8, .uneditable-input.span8 {
+    width: 466px;
+  }
+  input.span9, textarea.span9, .uneditable-input.span9 {
+    width: 528px;
+  }
+  input.span10, textarea.span10, .uneditable-input.span10 {
+    width: 590px;
+  }
+  input.span11, textarea.span11, .uneditable-input.span11 {
+    width: 652px;
+  }
+  input.span12, textarea.span12, .uneditable-input.span12 {
+    width: 714px;
   }
 }
 @media (max-width: 940px) {
@@ -316,19 +372,19 @@
   }
 }
 @media (min-width: 1200px) {
-  .thumbnails {
+  .row {
     margin-left: -30px;
+    *zoom: 1;
   }
-  .thumbnails > li {
-    margin-left: 30px;
+  .row:before, .row:after {
+    display: table;
+    content: "";
   }
-  .container {
-    width: 1170px;
-  }
-  .row {
-    margin-left: -30px;
+  .row:after {
+    clear: both;
   }
   [class*="span"] {
+    float: left;
     margin-left: 30px;
   }
   .span1 {
@@ -364,7 +420,7 @@
   .span11 {
     width: 1070px;
   }
-  .span12 {
+  .span12, .container {
     width: 1170px;
   }
   .offset1 {
@@ -401,47 +457,99 @@
     margin-left: 1130px;
   }
   .row-fluid {
-    width: 102.56143440326584%;
-    margin-left: -2.56%;
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before, .row-fluid:after {
+    display: table;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
   }
   .row-fluid [class*="span"] {
     float: left;
-    margin-left: 2.56%;
+    margin-left: 2.564102564%;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
   }
   .row-fluid .span1 {
-    width: 5.832601732615312%;
+    width: 5.982905983%;
   }
   .row-fluid .span2 {
-    width: 14.16126839928198%;
+    width: 14.529914530000001%;
   }
   .row-fluid .span3 {
-    width: 22.489935065948643%;
+    width: 23.076923077%;
   }
   .row-fluid .span4 {
-    width: 30.818601732615313%;
+    width: 31.623931624%;
   }
   .row-fluid .span5 {
-    width: 39.14726839928198%;
+    width: 40.170940171000005%;
   }
   .row-fluid .span6 {
-    width: 47.47593506594863%;
+    width: 48.717948718%;
   }
   .row-fluid .span7 {
-    width: 55.8046017326153%;
+    width: 57.264957265%;
   }
   .row-fluid .span8 {
-    width: 64.13326839928197%;
+    width: 65.81196581200001%;
   }
   .row-fluid .span9 {
-    width: 72.46193506594864%;
+    width: 74.358974359%;
   }
   .row-fluid .span10 {
-    width: 80.7906017326153%;
+    width: 82.905982906%;
   }
   .row-fluid .span11 {
-    width: 89.11926839928198%;
+    width: 91.45299145300001%;
   }
   .row-fluid .span12 {
-    width: 97.44793506594864%;
+    width: 100%;
+  }
+  input.span1, textarea.span1, .uneditable-input.span1 {
+    width: 60px;
+  }
+  input.span2, textarea.span2, .uneditable-input.span2 {
+    width: 160px;
+  }
+  input.span3, textarea.span3, .uneditable-input.span3 {
+    width: 260px;
+  }
+  input.span4, textarea.span4, .uneditable-input.span4 {
+    width: 360px;
+  }
+  input.span5, textarea.span5, .uneditable-input.span5 {
+    width: 460px;
+  }
+  input.span6, textarea.span6, .uneditable-input.span6 {
+    width: 560px;
+  }
+  input.span7, textarea.span7, .uneditable-input.span7 {
+    width: 660px;
+  }
+  input.span8, textarea.span8, .uneditable-input.span8 {
+    width: 760px;
+  }
+  input.span9, textarea.span9, .uneditable-input.span9 {
+    width: 860px;
+  }
+  input.span10, textarea.span10, .uneditable-input.span10 {
+    width: 960px;
+  }
+  input.span11, textarea.span11, .uneditable-input.span11 {
+    width: 1060px;
+  }
+  input.span12, textarea.span12, .uneditable-input.span12 {
+    width: 1160px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
   }
 }
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9b6217fbd..b6766f0aa 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -126,7 +126,7 @@ a:hover {
   margin-left: 20px;
 }
 .span1 {
-  width: 59.99999999999999px;
+  width: 60px;
 }
 .span2 {
   width: 140px;
@@ -158,7 +158,7 @@ a:hover {
 .span11 {
   width: 860px;
 }
-.span12 {
+.span12, .container {
   width: 940px;
 }
 .offset1 {
@@ -195,48 +195,58 @@ a:hover {
   margin-left: 900px;
 }
 .row-fluid {
-  width: 102.12765957421277%;
-  margin-left: -2.127659574%;
+  width: 100%;
+  *zoom: 1;
+}
+.row-fluid:before, .row-fluid:after {
+  display: table;
+  content: "";
+}
+.row-fluid:after {
+  clear: both;
 }
 .row-fluid [class*="span"] {
   float: left;
   margin-left: 2.127659574%;
 }
+.row-fluid [class*="span"]:first-child {
+  margin-left: 0;
+}
 .row-fluid .span1 {
-  width: 6.249999999619791%;
+  width: 6.382978723%;
 }
 .row-fluid .span2 {
-  width: 14.58333333211979%;
+  width: 14.89361702%;
 }
 .row-fluid .span3 {
-  width: 22.91666666461979%;
+  width: 23.404255317%;
 }
 .row-fluid .span4 {
-  width: 31.24999999711979%;
+  width: 31.914893614%;
 }
 .row-fluid .span5 {
-  width: 39.58333332961979%;
+  width: 40.425531911%;
 }
 .row-fluid .span6 {
-  width: 47.91666666211979%;
+  width: 48.93617020799999%;
 }
 .row-fluid .span7 {
-  width: 56.24999999461979%;
+  width: 57.446808505%;
 }
 .row-fluid .span8 {
-  width: 64.58333332711977%;
+  width: 65.95744680199999%;
 }
 .row-fluid .span9 {
-  width: 72.91666665961978%;
+  width: 74.468085099%;
 }
 .row-fluid .span10 {
-  width: 81.24999999211977%;
+  width: 82.97872339599999%;
 }
 .row-fluid .span11 {
-  width: 89.58333332461977%;
+  width: 91.489361693%;
 }
 .row-fluid .span12 {
-  width: 97.91666665711978%;
+  width: 99.99999998999999%;
 }
 .container {
   width: 940px;
@@ -708,42 +718,6 @@ input.span11, textarea.span11, .uneditable-input.span11 {
 input.span12, textarea.span12, .uneditable-input.span12 {
   width: 930px;
 }
-select.span1 {
-  width: 70px;
-}
-select.span2 {
-  width: 150px;
-}
-select.span3 {
-  width: 230px;
-}
-select.span4 {
-  width: 310px;
-}
-select.span5 {
-  width: 390px;
-}
-select.span6 {
-  width: 470px;
-}
-select.span7 {
-  width: 550px;
-}
-select.span8 {
-  width: 630px;
-}
-select.span9 {
-  width: 710px;
-}
-select.span10 {
-  width: 790px;
-}
-select.span11 {
-  width: 870px;
-}
-select.span12 {
-  width: 950px;
-}
 input[disabled],
 select[disabled],
 textarea[disabled],
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 1380b9e6c..acbcc6941 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -553,6 +553,7 @@ form.well {
 }
 
 /* For input sizes, make them display block */
+.docs-input-sizes select,
 .docs-input-sizes input[type=text] {
   display: block;
   margin-bottom: 9px;
diff --git a/docs/base-css.html b/docs/base-css.html
index 0406ff229..72eea8d67 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -62,6 +62,10 @@
               
                                                  • 
                 Customize
               
                                                    • 
+              
                                                  • 
+              
                                                  • 
+                Examples
+              
                                                    • 
             
                                                  
           
                                                  
         
                                                  
@@ -1078,6 +1082,27 @@ For example, <code>section</code> should be wrapped as inline.
               
               
               
+              
+              
+              
               
                                                  Use the same .span* classes from the grid system for input sizes.
                                                  
             
                                                
           
                                                
diff --git a/docs/components.html b/docs/components.html
index 95c7c9907..f62d84b9a 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -62,6 +62,10 @@
               
                                              • 
                 Customize
               
                                                • 
+              
                                              • 
+              
                                              • 
+                Examples
+              
                                                • 
             
                                              
           
                                              
         
                                              
diff --git a/docs/download.html b/docs/download.html
index 832b07ce6..da442ac62 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -62,6 +62,10 @@
               
                                            • 
                 Customize
               
                                              • 
+              
                                            • 
+              
                                            • 
+                Examples
+              
                                              • 
             
                                            
           
                                            
         
                                            
diff --git a/docs/examples.html b/docs/examples.html
index 7d79fc0a0..63570c7cb 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -62,6 +62,10 @@
               
                                          • 
                 Customize
               
                                            • 
+              
                                          • 
+              
                                          • 
+                Examples
+              
                                            • 
             
                                          
           
                                          
         
                                          
diff --git a/docs/index.html b/docs/index.html
index e20d08bcd..055f36028 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -62,6 +62,10 @@
               
                                        • 
                 Customize
               
                                          • 
+              
                                        • 
+              
                                        • 
+                Examples
+              
                                          • 
             
                                        
           
                                        
         
                                        
diff --git a/docs/javascript.html b/docs/javascript.html
index eb4a175c3..c4c3dd72a 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -62,6 +62,10 @@
               
                                      • 
                 Customize
               
                                        • 
+              
                                      • 
+              
                                      • 
+                Examples
+              
                                        • 
             
                                      
           
                                      
         
                                      
diff --git a/docs/less.html b/docs/less.html
index 5935c9125..1242b66a1 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -62,6 +62,10 @@
               
                                    • 
                 Customize
               
                                      • 
+              
                                    • 
+              
                                    • 
+                Examples
+              
                                      • 
             
                                    
           
                                    
         
                                    
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index b9eb399f9..5f3cd4f43 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -62,6 +62,10 @@
               
                                  • 
                 Customize
               
                                    • 
+              
                                  • 
+              
                                  • 
+                Examples
+              
                                    • 
             
                                  
           
                                  
         
                                  
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 7c0ab655b..b372820fd 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -62,6 +62,10 @@
               
                                • 
                 {{_i}}Customize{{/i}}
               
                                  • 
+              
                                • 
+              
                                • 
+                {{_i}}Examples{{/i}}
+              
                                  • 
             
                                
           
                                
         
                                
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index b47bcf265..dedc201f3 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1006,6 +1006,27 @@
               
               
               
+              
+              
+              
               
                                {{_i}}Use the same .span* classes from the grid system for input sizes.{{/i}}
                                
             
                                
           
                                
diff --git a/docs/upgrading.html b/docs/upgrading.html
index d7ad30f56..f4f848c11 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -62,6 +62,10 @@
               
                              • 
                 Customize
               
                                • 
+              
                              • 
+              
                              • 
+                Examples
+              
                                • 
             
                              
           
                              
         
                              
diff --git a/examples/fluid.html b/examples/fluid.html
index 1cdfd6568..738c52058 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -55,7 +55,7 @@
     
                            
 
     
                            
-      
                            
+      
                            
         
                            
           
                            
             
                              
@@ -84,7 +84,7 @@
             
                              This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.
                              
             
                              Learn more »
                              
           
                            
-          
                            
+          
                            
             
                            
               
                            Heading
                            
               
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
@@ -101,7 +101,7 @@
               
                            View details »
                            
             
                            
           
                            
-          
                            
+          
                            
             
                            
               
                            Heading
                            
               
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
diff --git a/less/forms.less b/less/forms.less
index 9d94a64b7..131f8af55 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -229,45 +229,13 @@ textarea[class*="span"],
   margin-left: 0;
 }
 
-// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
-.inputColumns(@columnSpan: 1) {
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
-}
-input,
-textarea,
-.uneditable-input {
-  // Default columns
-  &.span1     { .inputColumns(1); }
-  &.span2     { .inputColumns(2); }
-  &.span3     { .inputColumns(3); }
-  &.span4     { .inputColumns(4); }
-  &.span5     { .inputColumns(5); }
-  &.span6     { .inputColumns(6); }
-  &.span7     { .inputColumns(7); }
-  &.span8     { .inputColumns(8); }
-  &.span9     { .inputColumns(9); }
-  &.span10    { .inputColumns(10); }
-  &.span11    { .inputColumns(11); }
-  &.span12    { .inputColumns(12); }
-}
-
-.selectColumns(@columnSpan: 1) {
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) + 10;
-}
-select {
-  &.span1     { .selectColumns(1); }
-  &.span2     { .selectColumns(2); }
-  &.span3     { .selectColumns(3); }
-  &.span4     { .selectColumns(4); }
-  &.span5     { .selectColumns(5); }
-  &.span6     { .selectColumns(6); }
-  &.span7     { .selectColumns(7); }
-  &.span8     { .selectColumns(8); }
-  &.span9     { .selectColumns(9); }
-  &.span10    { .selectColumns(10); }
-  &.span11    { .selectColumns(11); }
-  &.span12    { .selectColumns(12); }
-}
+
+
+// GRID SIZING FOR INPUTS
+// ----------------------
+
+#inputGridSystem > .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth);
+
 
 
 
diff --git a/less/grid.less b/less/grid.less
index 2ef767a4a..4acb0a44c 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -1,81 +1,8 @@
 // GRID SYSTEM
 // -----------
 
+// Fixed (940px)
+#gridSystem > .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth);
 
-// Grid rows and columns
-// ---------------------
-.row {
-  margin-left: @gridGutterWidth * -1;
-  .clearfix();
-}
-
-// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg)
-[class*="span"] {
-  .gridColumn();
-}
-
-// Default columns
-.span1     { .columns(1); }
-.span2     { .columns(2); }
-.span3     { .columns(3); }
-.span4     { .columns(4); }
-.span5     { .columns(5); }
-.span6     { .columns(6); }
-.span7     { .columns(7); }
-.span8     { .columns(8); }
-.span9     { .columns(9); }
-.span10    { .columns(10); }
-.span11    { .columns(11); }
-.span12    { .columns(12); }
-
-// Offset column options
-.offset1   { .offset(1); }
-.offset2   { .offset(2); }
-.offset3   { .offset(3); }
-.offset4   { .offset(4); }
-.offset5   { .offset(5); }
-.offset6   { .offset(6); }
-.offset7   { .offset(7); }
-.offset8   { .offset(8); }
-.offset9   { .offset(9); }
-.offset10  { .offset(10); }
-.offset11  { .offset(11); }
-
-
-
-// FLUID GRID SYSTEM
-// -----------------
-// This is a very early and limited fluid grid system for now and will not be documented until it's refined in v2.1.
-
-.row-fluid {
-  @gridColumnWidth: 6.382978723%;
-  @gridGutterWidth: 2.127659574%;
-
-  width: 100% * ((@gridGutterWidth + @gridRowWidth)/@gridRowWidth);
-  margin-left: 0 - @gridGutterWidth;
-
-  // Redeclare the mixins
-  .gridColumn() {
-    float: left;
-    margin-left: @gridGutterWidth;
-  } 
-  [class*="span"] {
-    .gridColumn();
-  }
-  .fluidColumns(@columns: 1) {
-    width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/(@gridRowWidth+@gridGutterWidth));
-  }
-  // Redeclare the columns
-  .span1     { .fluidColumns(1); }
-  .span2     { .fluidColumns(2); }
-  .span3     { .fluidColumns(3); }
-  .span4     { .fluidColumns(4); }
-  .span5     { .fluidColumns(5); }
-  .span6     { .fluidColumns(6); }
-  .span7     { .fluidColumns(7); }
-  .span8     { .fluidColumns(8); }
-  .span9     { .fluidColumns(9); }
-  .span10    { .fluidColumns(10); }
-  .span11    { .fluidColumns(11); }
-  .span12    { .fluidColumns(12); }
-}
+// Fluid (940px)
+#fluidGridSystem > .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth);
diff --git a/less/mixins.less b/less/mixins.less
index cba2670db..39e1d8796 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -133,25 +133,135 @@
 // Site container
 // -------------------------
 .container-fixed() {
-  width: @gridTotalWidth;
+  width: @gridRowWidth;
   margin-left: auto;
   margin-right: auto;
   .clearfix();
 }
 
-// Columns and offseting mixins
-// ----------------------------
-.columns(@columns: 1) {
-  //width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-  width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/@gridRowWidth);
+// Le grid system
+// -------------------------
+#gridSystem {
+  // Setup the mixins to be used
+  .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @columns) {
+    width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+  } 
+  .offset(@gridColumnWidth, @gridGutterWidth, @columns) {
+    margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+  }
+  .gridColumn(@gridGutterWidth) {
+    float: left;
+    margin-left: @gridGutterWidth;
+  }
+  // Take these values and mixins, and make 'em do their thang
+  .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth) {
+    // Row surrounds the columns
+    .row {
+      margin-left: @gridGutterWidth * -1;
+      .clearfix();
+    }
+    // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg)
+    [class*="span"] {
+      #gridSystem > .gridColumn(@gridGutterWidth);
+    }
+    // Default columns
+    .span1     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); }
+    .span2     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); }
+    .span3     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 3); }
+    .span4     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 4); }
+    .span5     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 5); }
+    .span6     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 6); }
+    .span7     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 7); }
+    .span8     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 8); }
+    .span9     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); }
+    .span10    { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); }
+    .span11    { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); }
+    .span12,
+    .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); }
+    // Offset column options
+    .offset1   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); }
+    .offset2   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); }
+    .offset3   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 3); }
+    .offset4   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 4); }
+    .offset5   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 5); }
+    .offset6   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 6); }
+    .offset7   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 7); }
+    .offset8   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 8); }
+    .offset9   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 9); }
+    .offset10  { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 10); }
+    .offset11  { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 11); }
+  }
 }
-.offset(@columns: 1) {
-  margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+
+// Fluid grid system
+// -------------------------
+#fluidGridSystem {
+  // Setup the mixins to be used
+  .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, @columns) {
+    width: 1% * (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
+  } 
+  .gridColumn(@fluidGridGutterWidth) {
+    float: left;
+    margin-left: @fluidGridGutterWidth;
+  }
+  // Take these values and mixins, and make 'em do their thang
+  .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth) {      
+    // Row surrounds the columns
+    .row-fluid {
+      width: 100%;
+      .clearfix();
+
+      // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg)
+      [class*="span"] {
+        #fluidGridSystem > .gridColumn(@fluidGridGutterWidth);
+      }
+      [class*="span"]:first-child {
+        margin-left: 0;
+      }
+      // Default columns
+      .span1     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 1); }
+      .span2     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 2); }
+      .span3     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 3); }
+      .span4     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 4); }
+      .span5     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 5); }
+      .span6     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 6); }
+      .span7     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 7); }
+      .span8     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 8); }
+      .span9     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 9); }
+      .span10    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 10); }
+      .span11    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 11); }
+      .span12    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 12); }
+    }
+  }
 }
-// Necessary grid styles for every column to make them appear next to each other horizontally
-.gridColumn() {
-  float: left;
-  margin-left: @gridGutterWidth;
+
+
+
+
+// Input grid system
+// -------------------------
+#inputGridSystem {
+  .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @columns) {
+    width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 10;
+  }
+  .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth) {
+    input,
+    textarea,
+    .uneditable-input {
+      &.span1     { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); }
+      &.span2     { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); }
+      &.span3     { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 3); }
+      &.span4     { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 4); }
+      &.span5     { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 5); }
+      &.span6     { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 6); }
+      &.span7     { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 7); }
+      &.span8     { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 8); }
+      &.span9     { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); }
+      &.span10    { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); }
+      &.span11    { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); }
+      &.span12    { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); }
+    }
+  }
 }
 
 
diff --git a/less/responsive.less b/less/responsive.less
index a1d4cf2c8..72fa21384 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -125,7 +125,8 @@
     margin-left: 0;
   }
   // Make all columns even
-  .row > [class*="span"] {
+  .row > [class*="span"],
+  .row-fluid > [class*="span"] {
     float: none;
     display: block;
     width: auto;
@@ -140,90 +141,15 @@
 
 @media (min-width: 768px) and (max-width: 940px) {
 
-  // Reset grid variables
-  @gridColumns:       12;
-  @gridColumnWidth:   42px;
-  @gridGutterWidth:   20px;
-  @siteWidth:         724px;
+  // Fixed grid
+  #gridSystem > .generate(12, 42px, 20px);
 
-  // Bring grid mixins to recalculate widths
-  .columns(@columns: 1) {
-    width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-  }
-  .offset(@columns: 1) {
-    margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
-  }
+  // Fluid grid
+  #fluidGridSystem > .generate(12, 5.801104972%, 2.762430939%);
+
+  // Input grid
+  #inputGridSystem > .generate(12, 42px, 20px);
 
-  // 12cols at 44px wide with 20px gutters
-  .container {
-    width: @siteWidth;
-    padding-left: 20px;
-    padding-right: 20px;
-  }
-
-  // Default columns
-  .span1     { .columns(1); }
-  .span2     { .columns(2); }
-  .span3     { .columns(3); }
-  .span4     { .columns(4); }
-  .span5     { .columns(5); }
-  .span6     { .columns(6); }
-  .span7     { .columns(7); }
-  .span8     { .columns(8); }
-  .span9     { .columns(9); }
-  .span10    { .columns(10); }
-  .span11    { .columns(11); }
-  .span12    { .columns(12); }
-
-  // Offset column options
-  .offset1   { .offset(1); }
-  .offset2   { .offset(2); }
-  .offset3   { .offset(3); }
-  .offset4   { .offset(4); }
-  .offset5   { .offset(5); }
-  .offset6   { .offset(6); }
-  .offset7   { .offset(7); }
-  .offset8   { .offset(8); }
-  .offset9   { .offset(9); }
-  .offset10  { .offset(10); }
-  .offset11  { .offset(11); }
-
-  // FLUID GRID
-  // ----------
-  .row-fluid {
-    @gridColumnWidth:     5.801104972%;
-    @gridGutterWidth:     2.762430939%;
-    @gridRowWidth:        (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-    @gridTotalWidth:      @gridRowWidth;
-
-    width: 100% * ((@gridGutterWidth + @gridRowWidth)/@gridRowWidth);
-    margin-left: 0 - @gridGutterWidth;
-
-    // Redeclare the mixins
-    .gridColumn() {
-      float: left;
-      margin-left: @gridGutterWidth;
-    } 
-    [class*="span"] {
-      .gridColumn();
-    }
-    .fluidColumns(@columns: 1) {
-      width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/(@gridRowWidth+@gridGutterWidth));
-    }
-    // Redeclare the columns
-    .span1     { .fluidColumns(1); }
-    .span2     { .fluidColumns(2); }
-    .span3     { .fluidColumns(3); }
-    .span4     { .fluidColumns(4); }
-    .span5     { .fluidColumns(5); }
-    .span6     { .fluidColumns(6); }
-    .span7     { .fluidColumns(7); }
-    .span8     { .fluidColumns(8); }
-    .span9     { .fluidColumns(9); }
-    .span10    { .fluidColumns(10); }
-    .span11    { .fluidColumns(11); }
-    .span12    { .fluidColumns(12); }
-  }
 }
 
 
@@ -362,99 +288,21 @@
 
 @media (min-width: 1200px) {
 
-  // Reset grid variables
-  @gridColumns:       12;
-  @gridColumnWidth:   70px;
-  @gridGutterWidth:   30px;
-  @siteWidth:         1170px;
+  // Fixed grid
+  #gridSystem > .generate(12, 70px, 30px);
+
+  // Fluid grid
+  #fluidGridSystem > .generate(12, 5.982905983%, 2.564102564%);
+  
+  // Input grid
+  #inputGridSystem > .generate(12, 70px, 30px);
 
   // Thumbnails
   .thumbnails {
-    margin-left: @gridGutterWidth * -1;
+    margin-left: -30px;
   }
   .thumbnails > li {
-    margin-left: @gridGutterWidth;
+    margin-left: 30px;
   }
 
-  // Bring grid mixins to recalculate widths
-  .columns(@columns: 1) {
-    width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-  }
-  .offset(@columns: 1) {
-    margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
-  }
-  .container {
-    width: @siteWidth;
-  }
-  .row {
-    margin-left: @gridGutterWidth * -1;
-  }
-  [class*="span"] {
-    margin-left: @gridGutterWidth;
-  }
-
-  // Default columns
-  .span1     { .columns(1); }
-  .span2     { .columns(2); }
-  .span3     { .columns(3); }
-  .span4     { .columns(4); }
-  .span5     { .columns(5); }
-  .span6     { .columns(6); }
-  .span7     { .columns(7); }
-  .span8     { .columns(8); }
-  .span9     { .columns(9); }
-  .span10    { .columns(10); }
-  .span11    { .columns(11); }
-  .span12    { .columns(12); }
-
-  // Offset column options
-  .offset1   { .offset(1); }
-  .offset2   { .offset(2); }
-  .offset3   { .offset(3); }
-  .offset4   { .offset(4); }
-  .offset5   { .offset(5); }
-  .offset6   { .offset(6); }
-  .offset7   { .offset(7); }
-  .offset8   { .offset(8); }
-  .offset9   { .offset(9); }
-  .offset10  { .offset(10); }
-  .offset11  { .offset(11); }
-
-
-  // FLUID GRID
-  // ----------
-  .row-fluid {
-    @gridColumnWidth:     5.982%;
-    @gridGutterWidth:     2.56%;
-    @gridRowWidth:        (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-    @gridTotalWidth:      @gridRowWidth;
-
-    width: 100% * ((@gridGutterWidth + @gridRowWidth)/@gridRowWidth);
-    margin-left: 0 - @gridGutterWidth;
-
-    // Redeclare the mixins
-    .gridColumn() {
-      float: left;
-      margin-left: @gridGutterWidth;
-    } 
-    [class*="span"] {
-      .gridColumn();
-    }
-    .fluidColumns(@columns: 1) {
-      width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/(@gridRowWidth+@gridGutterWidth));
-    }
-    // Redeclare the columns
-    .span1     { .fluidColumns(1); }
-    .span2     { .fluidColumns(2); }
-    .span3     { .fluidColumns(3); }
-    .span4     { .fluidColumns(4); }
-    .span5     { .fluidColumns(5); }
-    .span6     { .fluidColumns(6); }
-    .span7     { .fluidColumns(7); }
-    .span8     { .fluidColumns(8); }
-    .span9     { .fluidColumns(9); }
-    .span10    { .fluidColumns(10); }
-    .span11    { .fluidColumns(11); }
-    .span12    { .fluidColumns(12); }
-  }
 }
diff --git a/less/variables.less b/less/variables.less
index f09a88cdb..d9d79f05c 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -40,17 +40,6 @@
 
 
 
-// GRID SYSTEM VARIABLES
-// --------------------------------------------------
-
-@gridColumns:           12;
-@gridColumnWidth:       60px;
-@gridGutterWidth:       20px;
-@gridRowWidth:          (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-@gridTotalWidth:        @gridRowWidth;
-
-
-
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
@@ -94,3 +83,17 @@
 @infoBorder:              darken(spin(@infoBackground, -10), 7%);
 
 
+
+// GRID
+// --------------------------------------------------
+
+// Default 940px grid
+@gridColumns:             12;
+@gridColumnWidth:         60px;
+@gridGutterWidth:         20px;
+@gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+// Fluid grid
+@fluidGridColumnWidth:    6.382978723%;
+@fluidGridGutterWidth:    2.127659574%;
+
-- 
cgit v1.2.3


From dc3d2b1044afa5633291f856b451543f17ecd690 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 00:44:27 -0800
Subject: update js docs page to clarify usage of images on carousel

---
 docs/assets/bootstrap.zip                | Bin 49734 -> 51953 bytes
 docs/javascript.html                     |   4 ++++
 docs/templates/pages/javascript.mustache |   4 ++++
 3 files changed, 8 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 75d6f207e..255d08950 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/javascript.html b/docs/javascript.html
index c4c3dd72a..8e1569026 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1265,6 +1265,10 @@ $('#myCollapsible').on('hidden', function () {
             ‹
             ›
           
                            
+          
                            
+            Heads up!
+            When implementing this carousel, remove the images we have provided and replace them with your own.
+          
                            
           
                            
           
                            Using bootstrap-carousel.js
                            
           
                            Call via javascript:
                            
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index cba75ac08..f8fdec8ea 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1189,6 +1189,10 @@ $('#myCollapsible').on('hidden', function () {
             ‹
             ›
           
                            
+          
                            
+            {{_i}}Heads up!{{/i}}
+            {{_i}}When implementing this carousel, remove the images we have provided and replace them with your own.{{/i}}
+          
                            
           
                            
           
                            {{_i}}Using bootstrap-carousel.js{{/i}}
                            
           
                            {{_i}}Call via javascript:{{/i}}
                            
-- 
cgit v1.2.3


From 8b77722a936f989cecaf93f97aa86d6ed8fdfa05 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 01:06:20 -0800
Subject: update reverse fluid layout to mirror the fluid layout

---
 examples/fluid-reverse.html | 180 ++++++++++++++++++++++++--------------------
 1 file changed, 97 insertions(+), 83 deletions(-)

diff --git a/examples/fluid-reverse.html b/examples/fluid-reverse.html
index 4a1993a41..aa2a77489 100644
--- a/examples/fluid-reverse.html
+++ b/examples/fluid-reverse.html
@@ -16,8 +16,13 @@
     
+    
 
     
     
@@ -30,98 +35,107 @@
 
     
                            
       
                            
-        
                            
+        
                            
+          
+            
+            
+            
+          
           Project name
-          
-          
                            Logged in as username
                            
+          
                            
+            
+            
                            Logged in as username
                            
+          
                            
         
                            
       
                            
     
                            
 
-    
                            
-      
                            
-        
                            
-          
-        
                            
-      
                            
-      
                            
-        
-        
                            
-          
                            Hello, world!
                            
-          
                            Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
                            
-          
                            Learn more »
                            
-        
                            
-
-        
-        
                            
-          
                            
-            
                            Heading
                            
-           
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
-            
                            View details »
                            
-          
                            
-          
                            
-            
                            Heading
                            
-             
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
-            
                            View details »
                            
-         
                            
-          
                            
-            
                            Heading
                            
-            
                            Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
                            
-            
                            View details »
                            
+    
                            
+      
                            
+        
                            
+          
                            
+            
                            Hello, world!
                            
+            
                            This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.
                            
+            
                            Learn more »
                            
           
                            
-        
                            
+          
                            
+            
                            
+              
                            Heading
                            
+              
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
+              
                            View details »
                            
+            
                            
+            
                            
+              
                            Heading
                            
+              
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
+              
                            View details »
                            
+            
                            
+            
                            
+              
                            Heading
                            
+              
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
+              
                            View details »
                            
+            
                            
+          
                            
+          
                            
+            
                            
+              
                            Heading
                            
+              
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
+              
                            View details »
                            
+            
                            
+            
                            
+              
                            Heading
                            
+              
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
+              
                            View details »
                            
+            
                            
+            
                            
+              
                            Heading
                            
+              
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
+              
                            View details »
                            
+            
                            
+          
                            
+        
                            
+        
                            
+          
                            
+            
+          
                                    
+        
                            
+      
                            
 
-        
                            
+      
                            
 
-        
-        
                            
-          
                            
-            
                            Heading
                            
-           
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
-            
                            View details »
                            
-          
                            
-          
                            
-            
                            Heading
                            
-             
                            Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. 
                            
-            
                            View details »
                            
-         
                            
-          
                            
-            
                            Heading
                            
-            
                            Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
                            
-            
                            View details »
                            
-          
                            
-        
                            
+      
                            
+        
                            © Company 2012
                            
+      
                            
 
-        
                            
+    
                            
 
-        
                            
-          
                            © Company 2012
                            
-        
                            
-      
                            
-    
                            
+
+    
+    
+    
+    
+    
 
   
-
\ No newline at end of file
+
-- 
cgit v1.2.3


From 8f448610a944efd134170f44e305ec6710bcff1a Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 01:09:34 -0800
Subject: rename vertical-divider to divider-vertical, add more space around
 the divider

---
 docs/assets/bootstrap.zip                | Bin 51953 -> 51954 bytes
 docs/assets/css/bootstrap-responsive.css |   2 +-
 docs/assets/css/bootstrap.css            |   4 ++--
 docs/base-css.html                       |   2 +-
 docs/components.html                     |   4 ++--
 docs/download.html                       |   2 +-
 docs/examples.html                       |   2 +-
 docs/index.html                          |   2 +-
 docs/javascript.html                     |   2 +-
 docs/less.html                           |   2 +-
 docs/scaffolding.html                    |   2 +-
 docs/templates/layout.mustache           |   2 +-
 docs/templates/pages/components.mustache |   2 +-
 docs/upgrading.html                      |   2 +-
 less/navbar.less                         |   4 ++--
 less/responsive.less                     |   2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 255d08950..7a2cddc35 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index da6440bd2..8d2743709 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -308,7 +308,7 @@
   .navbar .nav > li > a {
     margin-bottom: 2px;
   }
-  .navbar .nav > .vertical-divider {
+  .navbar .nav > .divider-vertical {
     display: none;
   }
   .navbar .nav > li > a, .navbar .dropdown-menu a {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b6766f0aa..5a9068829 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2509,10 +2509,10 @@ button.btn.small, input[type="submit"].btn.small {
   background-color: #222222;
   background-color: rgba(0, 0, 0, 0.5);
 }
-.navbar .vertical-divider {
+.navbar .divider-vertical {
   height: 40px;
   width: 1px;
-  margin: 0 5px;
+  margin: 0 9px;
   overflow: hidden;
   background-color: #222222;
   border-right: 1px solid #333333;
diff --git a/docs/base-css.html b/docs/base-css.html
index 72eea8d67..22d6262ff 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -59,10 +59,10 @@
               
                          • 
                 Using LESS
               
                            • 
+              
                          • 
               
                          • 
                 Customize
               
                            • 
-              
                          • 
               
                          • 
                 Examples
               
                            • 
diff --git a/docs/components.html b/docs/components.html
index f62d84b9a..dc01d07dd 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -59,10 +59,10 @@
               
                          • 
                 Using LESS
               
                            • 
+              
                          • 
               
                          • 
                 Customize
               
                            • 
-              
                          • 
               
                          • 
                 Examples
               
                            • 
@@ -694,7 +694,7 @@
           
           
                              
             
                            • Link
                              • 
-            
                            • 
+            
                            • 
             
                            • 
               Dropdown 
               
                                
diff --git a/docs/download.html b/docs/download.html
index da442ac62..c19dc8f49 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -59,10 +59,10 @@
               
                              • 
                 Using LESS
               
                                • 
+              
                              • 
               
                              • 
                 Customize
               
                                • 
-              
                              • 
               
                              • 
                 Examples
               
                                • 
diff --git a/docs/examples.html b/docs/examples.html
index 63570c7cb..43c0ad496 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -59,10 +59,10 @@
               
                              • 
                 Using LESS
               
                                • 
+              
                              • 
               
                              • 
                 Customize
               
                                • 
-              
                              • 
               
                              • 
                 Examples
               
                                • 
diff --git a/docs/index.html b/docs/index.html
index 055f36028..a8fd8e31b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -59,10 +59,10 @@
               
                              • 
                 Using LESS
               
                                • 
+              
                              • 
               
                              • 
                 Customize
               
                                • 
-              
                              • 
               
                              • 
                 Examples
               
                                • 
diff --git a/docs/javascript.html b/docs/javascript.html
index 8e1569026..4297fe652 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -59,10 +59,10 @@
               
                              • 
                 Using LESS
               
                                • 
+              
                              • 
               
                              • 
                 Customize
               
                                • 
-              
                              • 
               
                              • 
                 Examples
               
                                • 
diff --git a/docs/less.html b/docs/less.html
index 1242b66a1..90133b0f8 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -59,10 +59,10 @@
               
                              • 
                 Using LESS
               
                                • 
+              
                              • 
               
                              • 
                 Customize
               
                                • 
-              
                              • 
               
                              • 
                 Examples
               
                                • 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 5f3cd4f43..9bb5d303b 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -59,10 +59,10 @@
               
                              • 
                 Using LESS
               
                                • 
+              
                              • 
               
                              • 
                 Customize
               
                                • 
-              
                              • 
               
                              • 
                 Examples
               
                                • 
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index b372820fd..6923be7dc 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -59,10 +59,10 @@
               
                              • 
                 {{_i}}Using LESS{{/i}}
               
                                • 
+              
                              • 
               
                              • 
                 {{_i}}Customize{{/i}}
               
                                • 
-              
                              • 
               
                              • 
                 {{_i}}Examples{{/i}}
               
                                • 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 7fd1c1ac6..4997b2990 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -618,7 +618,7 @@
           
           
                                  
             
                                • {{_i}}Link{{/i}}
                                  • 
-            
                                • 
+            
                                • 
             
                                • 
               {{_i}}Dropdown{{/i}} 
               
                                    
diff --git a/docs/upgrading.html b/docs/upgrading.html
index f4f848c11..b311cf499 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -59,10 +59,10 @@
               
                                  • 
                 Using LESS
               
                                    • 
+              
                                  • 
               
                                  • 
                 Customize
               
                                    • 
-              
                                  • 
               
                                  • 
                 Examples
               
                                    • 
diff --git a/less/navbar.less b/less/navbar.less
index b677b192b..ccfbb6945 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -208,10 +208,10 @@
 }
 
 // Dividers (basically a vertical hr)
-.navbar .vertical-divider {
+.navbar .divider-vertical {
   height: @navbarHeight;
   width: 1px;
-  margin: 0 5px;
+  margin: 0 9px;
   overflow: hidden;
   background-color: @navbarBackground;
   border-right: 1px solid @navbarBackgroundHighlight;
diff --git a/less/responsive.less b/less/responsive.less
index 2ec57b478..4a9fc6fb8 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -207,7 +207,7 @@
   .navbar .nav > li > a {
     margin-bottom: 2px;
   }
-  .navbar .nav > .vertical-divider {
+  .navbar .nav > .divider-vertical {
     display: none;
   }
   // Nav and dropdown links in navbar
-- 
cgit v1.2.3


From db31efb99587cea660ba5359665b4a6828d9f384 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 01:18:45 -0800
Subject: scope .content in container example

---
 examples/container-app.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/container-app.html b/examples/container-app.html
index 63261fd8e..b25ed55bf 100644
--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -29,7 +29,7 @@
       }
 
       /* The white background content wrapper */
-      .content {
+      .body-content {
         background-color: #fff;
         padding: 20px;
         margin: 0 -20px 18px; /* negative indent the amount of the padding to maintain the grid system */
@@ -49,12 +49,12 @@
       }
 
       /* Styles you shouldn't keep as they are for displaying this base example only */
-      .content .span7,
-      .content .span3 {
+      .body-content .span7,
+      .body-content .span3 {
         min-height: 500px;
       }
       /* Give a quick and non-cross-browser friendly divider */
-      .content .span3 {
+      .body-content .span3 {
         margin-left: 0;
         padding-left: 19px;
         border-left: 1px solid #eee;
@@ -90,7 +90,7 @@
 
     
                                    
 
-      
                                    
+      
                                    
         
                                    
           
                                    Page name Supporting text or tagline
                                    
         
                                    
-- 
cgit v1.2.3


From f4e5bc1c536f0e2bd77958dd5575863808d4cfe4 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 01:20:51 -0800
Subject: namespace popover values

---
 docs/assets/bootstrap.zip     | Bin 51954 -> 51957 bytes
 docs/assets/css/bootstrap.css |   8 +++----
 js/bootstrap-popover.js       |   6 ++---
 less/popovers.less            |  50 +++++++++++++++++++++---------------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7a2cddc35..8a4919782 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5a9068829..82b7dc249 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2928,7 +2928,7 @@ button.btn.small, input[type="submit"].btn.small {
   width: 0;
   height: 0;
 }
-.popover .inner {
+.popover-inner {
   padding: 3px;
   width: 280px;
   overflow: hidden;
@@ -2941,7 +2941,7 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
   box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
 }
-.popover .title {
+.popover-title {
   padding: 9px 15px;
   line-height: 1;
   background-color: #f5f5f5;
@@ -2950,7 +2950,7 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-border-radius: 3px 3px 0 0;
   border-radius: 3px 3px 0 0;
 }
-.popover .content {
+.popover-content {
   padding: 14px;
   background-color: #ffffff;
   -webkit-border-radius: 0 0 3px 3px;
@@ -2960,7 +2960,7 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
-.popover .content p, .popover .content ul, .popover .content ol {
+.popover-content p, .popover-content ul, .popover-content ol {
   margin-bottom: 0;
 }
 .thumbnails {
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 57864fc6e..35ff9d0ab 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -38,8 +38,8 @@
         , title = this.getTitle()
         , content = this.getContent()
 
-      $tip.find('.title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
-      $tip.find('.content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
+      $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
+      $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
 
       $tip.removeClass('fade top bottom left right in')
     }
@@ -89,7 +89,7 @@
   $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
     placement: 'right'
   , content: ''
-  , template: '
                                    '
+  , template: '
                                    '
   })
 
 }( window.jQuery )
diff --git a/less/popovers.less b/less/popovers.less
index 6de314d86..558d99ec9 100644
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -21,29 +21,29 @@
     width: 0;
     height: 0;
   }
-  .inner {
-    padding: 3px;
-    width: 280px;
-    overflow: hidden;
-    background: @black; // has to be full background declaration for IE fallback
-    background: rgba(0,0,0,.8);
-    .border-radius(6px);
-    .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+}
+.popover-inner {
+  padding: 3px;
+  width: 280px;
+  overflow: hidden;
+  background: @black; // has to be full background declaration for IE fallback
+  background: rgba(0,0,0,.8);
+  .border-radius(6px);
+  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+}
+.popover-title {
+  padding: 9px 15px;
+  line-height: 1;
+  background-color: #f5f5f5;
+  border-bottom:1px solid #eee;
+  .border-radius(3px 3px 0 0);
+}
+.popover-content {
+  padding: 14px;
+  background-color: @white;
+  .border-radius(0 0 3px 3px);
+  .background-clip(padding-box);
+  p, ul, ol {
+    margin-bottom: 0;
   }
-  .title {
-    padding: 9px 15px;
-    line-height: 1;
-    background-color: #f5f5f5;
-    border-bottom:1px solid #eee;
-    .border-radius(3px 3px 0 0);
-  }
-  .content {
-    padding: 14px;
-    background-color: @white;
-    .border-radius(0 0 3px 3px);
-    .background-clip(padding-box);
-    p, ul, ol {
-      margin-bottom: 0;
-    }
-  }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 144789788f123a8642c72082fd674125cac52a6e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 01:24:02 -0800
Subject: updated upgrade page to reflect popover changes

---
 docs/assets/bootstrap.zip               | Bin 51957 -> 51957 bytes
 docs/templates/pages/upgrading.mustache |   4 ++++
 docs/upgrading.html                     |   4 ++++
 3 files changed, 8 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 8a4919782..49f0cee97 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 95587456a..a82896b3a 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -165,6 +165,10 @@
   
                                    
     
                                    {{_i}}Javascript plugins{{/i}}
                                    
   
                                    
+  
                                    {{_i}}Popovers{{/i}}
                                    
+  
                                      
+    
                                    • {{_i}}Child elements now properly namespaced: .title to .popover-title, .inner to .popover-inner, and .content to .popover-content.{{/i}}
                                      • 
+  
                                    
 
 
 
diff --git a/docs/upgrading.html b/docs/upgrading.html
index b311cf499..6e1180f16 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -241,6 +241,10 @@
   
                                    
     
                                    Javascript plugins
                                    
   
                                    
+  
                                    Popovers
                                    
+  
                                      
+    
                                    • Child elements now properly namespaced: .title to .popover-title, .inner to .popover-inner, and .content to .popover-content.
                                      • 
+  
                                    
 
 
 
-- 
cgit v1.2.3


From 175fd98a7c4668dbb5441ebf3ebc616b29bd8210 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 01:25:02 -0800
Subject: fix forms typo on error state

---
 docs/assets/bootstrap.zip              | Bin 51957 -> 51957 bytes
 docs/base-css.html                     |   2 +-
 docs/templates/pages/base-css.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 49f0cee97..991e35373 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 22d6262ff..b76ace1e2 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1059,7 +1059,7 @@ For example, <code>section</code> should be wrapped as inline.
       
                                    Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.
                                    
       
                                    
       
                                    Form validation
                                    
-      
                                    It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.
                                    
+      
                                    It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.
                                    
 
                                     <fieldset
   class="control-group error">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index dedc201f3..95de45e09 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -983,7 +983,7 @@
       
                                    {{_i}}Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.{{/i}}
                                    
       
                                    
       
                                    {{_i}}Form validation{{/i}}
                                    
-      
                                    {{_i}}It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.{{/i}}
                                    
+      
                                    {{_i}}It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.{{/i}}
                                    
 
                                     <fieldset
   class="control-group error">
-- 
cgit v1.2.3


From 160a0bf5608c00cc99465199d41c45177634b585 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 01:30:18 -0800
Subject: update tests for popover to use proper classes

---
 js/tests/unit/bootstrap-popover.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/tests/unit/bootstrap-popover.js b/js/tests/unit/bootstrap-popover.js
index 08cabae42..afd6b170b 100644
--- a/js/tests/unit/bootstrap-popover.js
+++ b/js/tests/unit/bootstrap-popover.js
@@ -47,8 +47,8 @@ $(function () {
         popover.popover('show')
 
         ok($('.popover').length, 'popover was inserted')
-        equals($('.popover .title').text(), '@fat', 'title correctly inserted')
-        equals($('.popover .content').text(), 'loves writing tests （╯°□°）╯︵ ┻━┻', 'content correctly inserted')
+        equals($('.popover .popover-title').text(), '@fat', 'title correctly inserted')
+        equals($('.popover .popover-content').text(), 'loves writing tests （╯°□°）╯︵ ┻━┻', 'content correctly inserted')
 
         popover.popover('hide')
         ok(!$('.popover').length, 'popover was removed')
@@ -63,8 +63,8 @@ $(function () {
           .popover('show')
 
         ok($('.popover').length, 'popover was inserted')
-        equals($('.popover .title').text(), '@mdo', 'title correctly inserted')
-        equals($('.popover .content').text(), "loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻", 'content correctly inserted')
+        equals($('.popover .popover-title').text(), '@mdo', 'title correctly inserted')
+        equals($('.popover .popover-content').text(), "loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻", 'content correctly inserted')
 
         popover.popover('hide')
         ok(!$('.popover').length, 'popover was removed')
-- 
cgit v1.2.3


From 33a969dd0c47d1e79b8c671eb2942383bf71f49f Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 01:34:59 -0800
Subject: update vars in less and download pages

---
 docs/assets/bootstrap.zip              | Bin 51957 -> 51957 bytes
 docs/download.html                     |   9 +++++----
 docs/less.html                         |   8 ++++++--
 docs/templates/pages/download.mustache |   9 +++++----
 docs/templates/pages/less.mustache     |   8 ++++++--
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 991e35373..752890142 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/download.html b/docs/download.html
index c19dc8f49..f52ee6a72 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -253,10 +253,11 @@
       
       
       
-      
-      
-      
-      
+      
                                    Fluid grid system
                                    
+      
+      
+      
+      
       
                                    Typography
                                    
       
       
diff --git a/docs/less.html b/docs/less.html
index 90133b0f8..996ad31b9 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -176,8 +176,12 @@
             20px
           
           
-            @siteWidth
-            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
+            @fluidGridColumnWidth
+            6.382978723%
+          
+          
+            @fluidGridGutterWidth
+            2.127659574%
           
         
       
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 34f8130ac..1609c02b0 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -177,10 +177,11 @@
       
       
       
-      
-      
-      
-      
+      
                                    {{_i}}Fluid grid system{{/i}}
                                    
+      
+      
+      
+      
       
                                    {{_i}}Typography{{/i}}
                                    
       
       
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 82b921d24..eb262c78b 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -100,8 +100,12 @@
             20px
           
           
-            @siteWidth
-            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
+            @fluidGridColumnWidth
+            6.382978723%
+          
+          
+            @fluidGridGutterWidth
+            2.127659574%
           
         
       
-- 
cgit v1.2.3


From 9ba70796e2a25154689fa428d07018e877bbd6e4 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 07:40:24 -0800
Subject: remove top 5px padding from first inline radio/checkbox

---
 docs/assets/bootstrap.zip     | Bin 51957 -> 51960 bytes
 docs/assets/css/bootstrap.css |   2 +-
 less/forms.less               |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 752890142..0fd6d9d5c 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 82b7dc249..61e5e3e58 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -627,7 +627,7 @@ input[type="hidden"] {
   margin-left: 10px;
 }
 .controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child {
-  padding-top: 5px;
+  padding-top: 0;
 }
 input, textarea {
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
diff --git a/less/forms.less b/less/forms.less
index 131f8af55..d70d532e8 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -178,7 +178,7 @@ input[type="hidden"] {
 // But don't forget to remove their padding on first-child
 .controls > .radio.inline:first-child,
 .controls > .checkbox.inline:first-child {
-  padding-top: 5px; // has to be padding because margin collaspes
+  padding-top: 0;
 }
 
 
-- 
cgit v1.2.3


From 9f5b619094e9023d775e2ebd438ed2d327baeda2 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 07:49:28 -0800
Subject: add in regular button dropdowns, rejigger the button dropdowns
 section to reflect change

---
 docs/assets/bootstrap.zip                | Bin 51960 -> 51960 bytes
 docs/components.html                     |  81 ++++++++++++++++++++++++++++++-
 docs/templates/pages/components.mustache |  81 ++++++++++++++++++++++++++++++-
 3 files changed, 158 insertions(+), 4 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 0fd6d9d5c..7e6f0e7a3 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index dc01d07dd..960616704 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -179,8 +179,85 @@
 ================================================== -->
 
                                    
   
                                    
-    
                                    Buttons dropdowns Built on button groups to provide contextual dropdown menus
                                    
+    
                                    Buttons dropdowns Contextual dropdown menus built on button groups
                                    
   
                                    
+
+  
                                    
+    
                                    
+      
                                    Button dropdowns
                                    
+      
                                    Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.
                                    
+      
                                    
+        
                                    
+          Action 
+          
+        
                                    
+        
                                    
+          Action 
+          
+        
                                    
+        
                                    
+          Danger 
+          
+        
                                    
+      
                                    
+      
                                    
+        
                                    
+          Success 
+          
+        
                                    
+        
                                    
+          Info 
+          
+        
                                    
+      
                                    
+    
                                    
+    
                                    
+      
                                    Example markup
                                    
+      
                                    Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.
                                    
+
                                    +<div class="btn-group">
+  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+    Action
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+    <!-- dropdown menu links -->
+  </ul>
+</div>
+
                                    
+    
                                    
+  
                                    
+
   
                                    
     
                                    
       
                                    Split button dropdowns
                                    
@@ -247,7 +324,7 @@
     
                                    
     
                                    
       
                                    Example markup
                                    
-      
                                    Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.
                                    
+      
                                    We expand on the normal button dropdowns to provide a second button action that operates as a separate dropdown trigger.
                                    
 
                                     <div class="btn-group">
   <a class="btn" href="#">Action</a>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 4997b2990..b257cd4d1 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -103,8 +103,85 @@
 ================================================== -->
 
                                    
   
                                    
-    
                                    {{_i}}Buttons dropdowns{{/i}} {{_i}}Built on button groups to provide contextual dropdown menus{{/i}}
                                    
+    
                                    {{_i}}Buttons dropdowns{{/i}} {{_i}}Contextual dropdown menus built on button groups{{/i}}
                                    
   
                                    
+
+  
                                    
+    
                                    
+      
                                    {{_i}}Button dropdowns{{/i}}
                                    
+      
                                    {{_i}}Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.{{/i}}
                                    
+      
                                    
+        
                                    
+          {{_i}}Action{{/i}} 
+          
+        
                                    
+        
                                    
+          {{_i}}Action{{/i}} 
+          
+        
                                    
+        
                                    
+          {{_i}}Danger{{/i}} 
+          
+        
                                    
+      
                                    
+      
                                    
+        
                                    
+          {{_i}}Success{{/i}} 
+          
+        
                                    
+        
                                    
+          {{_i}}Info{{/i}} 
+          
+        
                                    
+      
                                    
+    
                                    
+    
                                    
+      
                                    {{_i}}Example markup{{/i}}
                                    
+      
                                    {{_i}}Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.{{/i}}
                                    
+
                                    +<div class="btn-group">
+  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+    {{_i}}Action{{/i}}
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+    <!-- {{_i}}dropdown menu links{{/i}} -->
+  </ul>
+</div>
+
                                    
+    
                                    
+  
                                    
+
   
                                    
     
                                    
       
                                    {{_i}}Split button dropdowns{{/i}}
                                    
@@ -171,7 +248,7 @@
     
                                    
     
                                    
       
                                    {{_i}}Example markup{{/i}}
                                    
-      
                                    {{_i}}Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.{{/i}}
                                    
+      
                                    {{_i}}We expand on the normal button dropdowns to provide a second button action that operates as a separate dropdown trigger.{{/i}}
                                    
 
                                     <div class="btn-group">
   <a class="btn" href="#">{{_i}}Action{{/i}}</a>
-- 
cgit v1.2.3


From 2c8ca4f5e284d5160e021071ec5cda46710bb78d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 07:54:47 -0800
Subject: add skew mixin

---
 docs/assets/bootstrap.zip | Bin 51960 -> 51960 bytes
 less/mixins.less          |  15 ++++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7e6f0e7a3..c6153a061 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/less/mixins.less b/less/mixins.less
index 39e1d8796..804f834e5 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -237,7 +237,6 @@
 
 
 
-
 // Input grid system
 // -------------------------
 #inputGridSystem {
@@ -314,6 +313,20 @@
        -o-transform: translate(@x, @y);
           transform: translate(@x, @y);
 }
+.skew(@x: 0, @y: 0) {
+  -webkit-transform: translate(@x, @y);
+     -moz-transform: translate(@x, @y);
+      -ms-transform: translate(@x, @y);
+       -o-transform: translate(@x, @y);
+          transform: translate(@x, @y);
+}
+.skew(@x: 0, @y: 0) {
+  -webkit-transform: skew(@x, @y);
+     -moz-transform: skew(@x, @y);
+      -ms-transform: skew(@x, @y);
+       -o-transform: skew(@x, @y);
+          transform: skew(@x, @y);
+}
 
 // Background clipping
 // Heads up: FF 3.6 and under need "padding" instead of "padding-box"
-- 
cgit v1.2.3


From a8400009dac99819c25e8b55c737f67810c35649 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 07:59:03 -0800
Subject: testing out button dropdown group

---
 docs/templates/pages/components.mustache | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index b257cd4d1..d24a4ddf3 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -163,6 +163,35 @@
             
                                  • {{_i}}Separated link{{/i}}
                                    • 
           
                                  
         
                          
+
+        
                          
+          {{_i}}1{{/i}} 
+          {{_i}}2{{/i}} 
+          {{_i}}3{{/i}} 
+          
+          
+          
+        
                          
+
+
       
                          
     
                        
     
                        
-- 
cgit v1.2.3


From a29dee44aca68585b04ef5156dd4f0a50ae70db0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 08:04:48 -0800
Subject: remove all new dropdown button stuff

---
 docs/assets/bootstrap.zip                | Bin 51960 -> 51960 bytes
 docs/templates/pages/components.mustache |  29 -----------------------------
 2 files changed, 29 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c6153a061..682dbbc7f 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index d24a4ddf3..b257cd4d1 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -163,35 +163,6 @@
             
                      • {{_i}}Separated link{{/i}}
                        • 
           
                      
         
                      
-
-        
                      
-          {{_i}}1{{/i}} 
-          {{_i}}2{{/i}} 
-          {{_i}}3{{/i}} 
-          
-          
-          
-        
                      
-
-
       
                      
     
                    
     
                    
-- 
cgit v1.2.3


From 2d40b07afc62ce9d899a290ab33222fd18287190 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 08:15:28 -0800
Subject: adding warning (orange) button, fix responsive navbar problem

---
 docs/assets/bootstrap.zip                | Bin 51960 -> 52197 bytes
 docs/assets/css/bootstrap-responsive.css |   9 +++++----
 docs/assets/css/bootstrap.css            |  31 +++++++++++++++++++++++++++++--
 docs/base-css.html                       |   5 +++++
 docs/templates/pages/base-css.mustache   |   5 +++++
 less/buttons.less                        |   7 +++++++
 less/mixins.less                         |   4 ++--
 less/responsive.less                     |   1 +
 8 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 682dbbc7f..78d7f57a4 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 8d2743709..8fe389563 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -195,11 +195,11 @@
   .row-fluid:after {
     clear: both;
   }
-  .row-fluid [class*="span"] {
+  .row-fluid > [class*="span"] {
     float: left;
     margin-left: 2.762430939%;
   }
-  .row-fluid [class*="span"]:first-child {
+  .row-fluid > [class*="span"]:first-child {
     margin-left: 0;
   }
   .row-fluid .span1 {
@@ -288,6 +288,7 @@
     background-image: none;
   }
   .navbar .container {
+    width: auto;
     padding: 0;
   }
   .navbar .brand {
@@ -476,11 +477,11 @@
   .row-fluid:after {
     clear: both;
   }
-  .row-fluid [class*="span"] {
+  .row-fluid > [class*="span"] {
     float: left;
     margin-left: 2.564102564%;
   }
-  .row-fluid [class*="span"]:first-child {
+  .row-fluid > [class*="span"]:first-child {
     margin-left: 0;
   }
   .row-fluid .span1 {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 61e5e3e58..7d987a56c 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -205,11 +205,11 @@ a:hover {
 .row-fluid:after {
   clear: both;
 }
-.row-fluid [class*="span"] {
+.row-fluid > [class*="span"] {
   float: left;
   margin-left: 2.127659574%;
 }
-.row-fluid [class*="span"]:first-child {
+.row-fluid > [class*="span"]:first-child {
   margin-left: 0;
 }
 .row-fluid .span1 {
@@ -1655,6 +1655,8 @@ table .span12 {
 }
 .btn.primary,
 .btn.primary:hover,
+.btn.warning,
+.btn.warning:hover,
 .btn.danger,
 .btn.danger:hover,
 .btn.success,
@@ -1665,6 +1667,7 @@ table .span12 {
   color: #ffffff;
 }
 .btn.primary.active,
+.btn.warning.active,
 .btn.danger.active,
 .btn.success.active,
 .btn.info.active {
@@ -1694,6 +1697,30 @@ table .span12 {
 .btn.primary:active, .btn.primary.active {
   background-color: #003399 \9;
 }
+.btn.warning {
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -ms-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(top, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
+  border-color: #f89406 #f89406 #ad6704;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn.warning:hover,
+.btn.warning:active,
+.btn.warning.active,
+.btn.warning.disabled,
+.btn.warning[disabled] {
+  background-color: #f89406;
+}
+.btn.warning:active, .btn.warning.active {
+  background-color: #c67605 \9;
+}
 .btn.danger {
   background-color: #da4f49;
   background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
diff --git a/docs/base-css.html b/docs/base-css.html
index b76ace1e2..5df63b917 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1229,6 +1229,11 @@ For example, <code>section</code> should be wrapped as inline.
         .success
         Indicates a successful or positive action
       
+      
+        Warning
+        .warning
+        Indicates caution should be taken with this action
+      
       
         Danger
         .danger
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 95de45e09..433a18c88 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1153,6 +1153,11 @@
         .success
         {{_i}}Indicates a successful or positive action{{/i}}
       
+      
+        {{_i}}Warning{{/i}}
+        .warning
+        {{_i}}Indicates caution should be taken with this action{{/i}}
+      
       
         {{_i}}Danger{{/i}}
         .danger
diff --git a/less/buttons.less b/less/buttons.less
index d5a4353b3..2bc457f65 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -9,6 +9,8 @@
   // Set text color
   &.primary,
   &.primary:hover,
+  &.warning,
+  &.warning:hover,
   &.danger,
   &.danger:hover,
   &.success,
@@ -19,6 +21,7 @@
     color: @white
   }
   &.primary.active,
+  &.warning.active,
   &.danger.active,
   &.success.active,
   &.info.active {
@@ -27,6 +30,10 @@
   &.primary {
     .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20));
   }
+  // Warning appears are orange
+  &.warning {
+    .buttonBackground(lighten(@orange, 15%), @orange);
+  }
   // Danger and error appear as red
   &.danger {
     .buttonBackground(#ee5f5b, #bd362f);
diff --git a/less/mixins.less b/less/mixins.less
index 804f834e5..545ccb9ba 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -212,10 +212,10 @@
       .clearfix();
 
       // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg)
-      [class*="span"] {
+      > [class*="span"] {
         #fluidGridSystem > .gridColumn(@fluidGridGutterWidth);
       }
-      [class*="span"]:first-child {
+      > [class*="span"]:first-child {
         margin-left: 0;
       }
       // Default columns
diff --git a/less/responsive.less b/less/responsive.less
index 4a9fc6fb8..e9920251e 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -184,6 +184,7 @@
     background-image: none;
   }
   .navbar .container {
+    width: auto;
     padding: 0;
   }
   // Account for brand name
-- 
cgit v1.2.3


From 3722c34b5032e5f1d4f6e8d28260b16ee48af4da Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 08:20:37 -0800
Subject: account for floated inputs in the .navbar-form

---
 docs/assets/bootstrap.zip     | Bin 52197 -> 52232 bytes
 docs/assets/css/bootstrap.css |   8 ++++++++
 less/navbar.less              |   1 +
 3 files changed, 9 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 78d7f57a4..2a4e8934e 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 7d987a56c..2caba5f4d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2429,6 +2429,14 @@ button.btn.small, input[type="submit"].btn.small {
 }
 .navbar-form {
   margin-bottom: 0;
+  *zoom: 1;
+}
+.navbar-form:before, .navbar-form:after {
+  display: table;
+  content: "";
+}
+.navbar-form:after {
+  clear: both;
 }
 .navbar-form input, .navbar-form select {
   display: inline-block;
diff --git a/less/navbar.less b/less/navbar.less
index ccfbb6945..eb19a2b07 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -88,6 +88,7 @@
 // Navbar forms
 .navbar-form {
   margin-bottom: 0; // remove default bottom margin
+  .clearfix();
   input,
   select {
     display: inline-block;
-- 
cgit v1.2.3


From 774904464dc8237b36be8197ca7c91d701ce4f0e Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 08:58:40 -0800
Subject: fix docs: move .pull-left from search input to search form in navbar

---
 docs/assets/bootstrap.zip                | Bin 52232 -> 52232 bytes
 docs/components.html                     |   4 ++--
 docs/templates/pages/components.mustache |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2a4e8934e..927cc332e 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 960616704..1d70ac476 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -817,8 +817,8 @@
       
                    Search form
                    
       
                    Search forms receive custom styles in the navbar with the .navbar-search class. Include .pull-left or .pull-right on the form to align it.
                    
 
                    -<form class="navbar-search">
-  <input type="text" class="search-query pull-left" placeholder="Search">
+<form class="navbar-search pull-left">
+  <input type="text" class="search-query" placeholder="Search">
 </form>
 
                    
       
                    Optional responsive variation
                    
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index b257cd4d1..214478966 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -741,8 +741,8 @@
       
                    {{_i}}Search form{{/i}}
                    
       
                    {{_i}}Search forms receive custom styles in the navbar with the .navbar-search class. Include .pull-left or .pull-right on the form to align it.{{/i}}
                    
 
                    -<form class="navbar-search">
-  <input type="text" class="search-query pull-left" placeholder="{{_i}}Search{{/i}}">
+<form class="navbar-search pull-left">
+  <input type="text" class="search-query" placeholder="{{_i}}Search{{/i}}">
 </form>
 
                    
       
                    {{_i}}Optional responsive variation{{/i}}
                    
-- 
cgit v1.2.3


From ac581eebac209ce20591bac2f726f35a9b22d750 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 09:19:25 -0800
Subject: large carousel images and margin bottom added

---
 docs/assets/bootstrap.zip                   | Bin 52232 -> 52239 bytes
 docs/assets/css/bootstrap.css               |   1 +
 docs/assets/img/bootstrap-mdo-sfmoma-01.jpg | Bin 59871 -> 130647 bytes
 docs/assets/img/bootstrap-mdo-sfmoma-02.jpg | Bin 93456 -> 84505 bytes
 docs/assets/img/bootstrap-mdo-sfmoma-03.jpg | Bin 125720 -> 50755 bytes
 less/carousel.less                          |   1 +
 6 files changed, 2 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 927cc332e..f658b0e2e 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2caba5f4d..787e3f2ff 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3237,6 +3237,7 @@ a.thumbnail:hover {
 }
 .carousel {
   position: relative;
+  margin-bottom: 18px;
   line-height: 1;
 }
 .carousel-inner {
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg
index a5c7bb900..135c9babb 100644
Binary files a/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg and b/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg differ
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg
index 2f795e18f..704e5dfe4 100644
Binary files a/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg and b/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg differ
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg
index 911e64f89..430fde2cf 100644
Binary files a/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg and b/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg differ
diff --git a/less/carousel.less b/less/carousel.less
index 4163b069f..8fbd30315 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -3,6 +3,7 @@
 
 .carousel {
   position: relative;
+  margin-bottom: @baseLineHeight;
   line-height: 1;
 }
 
-- 
cgit v1.2.3


From e94e0f1cf94e8232933a05cfe61efdb49dd64249 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 09:41:31 -0800
Subject: implement @textColor for body text

---
 docs/assets/bootstrap.zip     | Bin 52239 -> 52238 bytes
 docs/assets/css/bootstrap.css |   2 +-
 less/scaffolding.less         |   2 +-
 less/variables.less           |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index f658b0e2e..250a05a55 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 787e3f2ff..8045e561d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -99,7 +99,7 @@ body {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   line-height: 18px;
-  color: #555555;
+  color: #333333;
   background-color: #ffffff;
 }
 a {
diff --git a/less/scaffolding.less b/less/scaffolding.less
index d8b3f56ab..47ce53818 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -11,7 +11,7 @@ body {
   font-family: @baseFontFamily;
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
-  color: @gray;
+  color: @textColor;
   background-color: @white;
 }
 
diff --git a/less/variables.less b/less/variables.less
index d9d79f05c..f01c232e4 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -34,6 +34,7 @@
 @baseFontSize:          13px;
 @baseFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
 @baseLineHeight:        18px;
+@textColor:             @grayDark;
 
 // Buttons
 @primaryButtonBackground:    @linkColor;
@@ -96,4 +97,3 @@
 // Fluid grid
 @fluidGridColumnWidth:    6.382978723%;
 @fluidGridGutterWidth:    2.127659574%;
-
-- 
cgit v1.2.3


From 74f2a89611b818fda662dbbbb5d978549cae14c2 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 10:01:02 -0800
Subject: fix wrong value in grid column width in download page

---
 docs/assets/bootstrap.zip              | Bin 52238 -> 52238 bytes
 docs/download.html                     |   2 +-
 docs/templates/pages/download.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 250a05a55..300737ac4 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/download.html b/docs/download.html
index f52ee6a72..e2cc50836 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -250,7 +250,7 @@
       
       
       
-      
+      
       
       
       
                    Fluid grid system
                    
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 1609c02b0..4cc3244f5 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -174,7 +174,7 @@
       
       
       
-      
+      
       
       
       
                    {{_i}}Fluid grid system{{/i}}
                    
-- 
cgit v1.2.3


From 155047c3e6cfe589f1f244cdeb4e37244ab206ca Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Mon, 30 Jan 2012 13:59:05 -0800
Subject: speed up topbar animation for responsive

---
 docs/assets/bootstrap.zip                | Bin 52238 -> 52285 bytes
 docs/assets/css/bootstrap-responsive.css |   1 +
 less/responsive.less                     |   3 ++-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 300737ac4..fed424c46 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 8fe389563..f00ec1de3 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -374,6 +374,7 @@
   .nav-collapse {
     overflow: hidden;
     height: 0;
+    -webkit-transform: translate3d(0, 0, 0);
   }
 }
 @media (min-width: 940px) {
diff --git a/less/responsive.less b/less/responsive.less
index e9920251e..295625438 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -278,6 +278,7 @@
   .nav-collapse {
     overflow: hidden;
     height: 0;
+    -webkit-transform: translate3d(0, 0, 0); // activate the GPU
   }
 }
 
@@ -304,7 +305,7 @@
 
   // Fluid grid
   #fluidGridSystem > .generate(12, 5.982905983%, 2.564102564%);
-  
+
   // Input grid
   #inputGridSystem > .generate(12, 70px, 30px);
 
-- 
cgit v1.2.3


From 21bebe77feb9265b06d65e1e941cf7c73c4d90c1 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 20:50:51 -0800
Subject: refactor buttons.less

---
 docs/assets/bootstrap.zip           | Bin 52285 -> 52308 bytes
 docs/assets/css/bootstrap.css       | 172 +++++++++++-----------
 docs/assets/css/docs.css            |   2 +-
 docs/index.html                     | 275 ++++++++++++++++++------------------
 docs/templates/pages/index.mustache | 263 +++++++++++++++++-----------------
 less/buttons.less                   | 219 +++++++++++++++-------------
 6 files changed, 471 insertions(+), 460 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index fed424c46..930c01937 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 8045e561d..c377d6f97 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1653,6 +1653,92 @@ table .span12 {
   filter: alpha(opacity=40);
   cursor: pointer;
 }
+.btn {
+  display: inline-block;
+  padding: 4px 10px 4px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #333333;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  background-color: #fafafa;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -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);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  cursor: pointer;
+  *margin-left: .3em;
+}
+.btn:first-child {
+  *margin-left: 0;
+}
+.btn:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: #e6e6e6;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+  -moz-transition: background-position 0.1s linear;
+  -ms-transition: background-position 0.1s linear;
+  -o-transition: background-position 0.1s linear;
+  transition: background-position 0.1s linear;
+}
+.btn:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+.btn.active, .btn:active {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  background-color: #e6e6e6;
+  background-color: #d9d9d9 \9;
+  color: rgba(0, 0, 0, 0.5);
+  outline: 0;
+}
+.btn.disabled, .btn[disabled] {
+  cursor: default;
+  background-image: none;
+  background-color: #e6e6e6;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.btn.large {
+  padding: 9px 14px;
+  font-size: 15px;
+  line-height: normal;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.btn.large .icon {
+  margin-top: 1px;
+}
+.btn.small {
+  padding: 5px 9px;
+  font-size: 11px;
+  line-height: 16px;
+}
+.btn.small .icon {
+  margin-top: -1px;
+}
 .btn.primary,
 .btn.primary:hover,
 .btn.warning,
@@ -1793,92 +1879,6 @@ table .span12 {
 .btn.info:active, .btn.info.active {
   background-color: #24748c \9;
 }
-.btn {
-  display: inline-block;
-  padding: 4px 10px 4px;
-  font-size: 13px;
-  line-height: 18px;
-  color: #333333;
-  text-align: center;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  background-color: #fafafa;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-repeat: no-repeat;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
-  border: 1px solid #ccc;
-  border-bottom-color: #bbb;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -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);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  cursor: pointer;
-  *margin-left: .3em;
-}
-.btn:first-child {
-  *margin-left: 0;
-}
-.btn:hover {
-  color: #333333;
-  text-decoration: none;
-  background-color: #e6e6e6;
-  background-position: 0 -15px;
-  -webkit-transition: background-position 0.1s linear;
-  -moz-transition: background-position 0.1s linear;
-  -ms-transition: background-position 0.1s linear;
-  -o-transition: background-position 0.1s linear;
-  transition: background-position 0.1s linear;
-}
-.btn:focus {
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-.btn.active, .btn:active {
-  background-image: none;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  background-color: #e6e6e6;
-  background-color: #d9d9d9 \9;
-  color: rgba(0, 0, 0, 0.5);
-  outline: 0;
-}
-.btn.disabled, .btn[disabled] {
-  cursor: default;
-  background-image: none;
-  background-color: #e6e6e6;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-.btn.large {
-  padding: 9px 14px;
-  font-size: 15px;
-  line-height: normal;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-}
-.btn.large .icon {
-  margin-top: 1px;
-}
-.btn.small {
-  padding: 5px 9px;
-  font-size: 11px;
-  line-height: 16px;
-}
-.btn.small .icon {
-  margin-top: -1px;
-}
 button.btn, input[type="submit"].btn {
   *padding-top: 2px;
   *padding-bottom: 2px;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index acbcc6941..026872a34 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -73,7 +73,7 @@ hr.soften {
   line-height: 36px;
   color: #333;
 }
-.jumbotron .btn-large {
+.jumbotron .btn {
   font-size: 20px;
   font-weight: normal;
   padding: 14px 24px;
diff --git a/docs/index.html b/docs/index.html
index a8fd8e31b..66cc0ee48 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -74,145 +74,142 @@
 
     
                    
 
-      
                    
-
-        
-        
                    
-          
                    
-            
                    Bootstrap, from Twitter
                    
-            
                    Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
                    
-            
                    
-              View project on GitHub
-              Download Bootstrap
-            
                    
-          
                    
-
-          
-        
                    
-
-        
                    
-
-        
                    
-          
                    Designed for everyone, everywhere.
                    
-          
                    Need reasons to love Bootstrap? Look no further.
                    
-          
                    
-            
                    
-              
-              
                    Built for and by nerds
                    
-              
                    Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.
                    
-            
                    
-            
                    
-              
-              
                    For all skill levels
                    
-              
                    Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.
                    
-            
                    
-            
                    
-              
-              
                    Cross-everything
                    
-              
                    Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.
                    
-            
                    
-          
                    
-          
                    
-            
                    
-              
-              
                    12-column grid
                    
-              
                    Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.
                    
-            
                    
-            
                    
-              
-              
                    Responsive design
                    
-              
                    With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.
                    
-            
                    
-            
                    
-              
-              
                    Styleguide docs
                    
-              
                    Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.
                    
-            
                    
-          
                    
-          
                    
-            
                    
-              
-              
                    Growing library
                    
-              
                    Despite being only 10kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.
                    
-            
                    
-            
                    
-              
-              
                    Custom jQuery plugins
                    
-              
                    What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.
                    
-            
                    
-            
                    
-              
-              
                    Built on LESS
                    
-              
                    Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.
                    
-            
                    
-          
                    
-          
                    
-            
                    
-              
-              
                    HTML5
                    
-              
                    Built to support new HTML5 elements and syntax.
                    
-            
                    
-            
                    
-              
-              
                    CSS3
                    
-              
                    Progressively enhanced components for ultimate style.
                    
-            
                    
-            
                    
-              
-              
                    Open-source
                    
-              
                    Built for and maintained by the community via GitHub.
                    
-            
                    
-            
                    
-              
-              
                    Made at Twitter
                    
-              
                    Brought to you by an experienced engineer and designer.
                    
-            
                    
-          
                    
-
-          
                    
-
-          
                    Built with Bootstrap.
                    
-          
                    For even more sites built with Bootstrap, visit the unofficial Tumblr or browse the examples.
                    
-          
-
-        
                    
-      
                    
+
+
                    
+  
                    
+    
                    Bootstrap, from Twitter
                    
+    
                    Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
                    
+    
                    
+      View project on GitHub
+      Download Bootstrap
+    
                    
+  
                    
+
+  
+
                    
+
+
                    
+
+
                    
+  
                    Designed for everyone, everywhere.
                    
+  
                    Need reasons to love Bootstrap? Look no further.
                    
+  
                    
+    
                    
+      
+      
                    Built for and by nerds
                    
+      
                    Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.
                    
+    
                    
+    
                    
+      
+      
                    For all skill levels
                    
+      
                    Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.
                    
+    
                    
+    
                    
+      
+      
                    Cross-everything
                    
+      
                    Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.
                    
+    
                    
+  
                    
+  
                    
+    
                    
+      
+      
                    12-column grid
                    
+      
                    Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.
                    
+    
                    
+    
                    
+      
+      
                    Responsive design
                    
+      
                    With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.
                    
+    
                    
+    
                    
+      
+      
                    Styleguide docs
                    
+      
                    Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.
                    
+    
                    
+  
                    
+  
                    
+    
                    
+      
+      
                    Growing library
                    
+      
                    Despite being only 10kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.
                    
+    
                    
+    
                    
+      
+      
                    Custom jQuery plugins
                    
+      
                    What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.
                    
+    
                    
+    
                    
+      
+      
                    Built on LESS
                    
+      
                    Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.
                    
+    
                    
+  
                    
+  
                    
+    
                    
+      
+      
                    HTML5
                    
+      
                    Built to support new HTML5 elements and syntax.
                    
+    
                    
+    
                    
+      
+      
                    CSS3
                    
+      
                    Progressively enhanced components for ultimate style.
                    
+    
                    
+    
                    
+      
+      
                    Open-source
                    
+      
                    Built for and maintained by the community via GitHub.
                    
+    
                    
+    
                    
+      
+      
                    Made at Twitter
                    
+      
                    Brought to you by an experienced engineer and designer.
                    
+    
                    
+  
                    
+
+  
                    
+
+  
                    Built with Bootstrap.
                    
+  
                    For even more sites built with Bootstrap, visit the unofficial Tumblr or browse the examples.
                    
+  
+
+
                    
 
      
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index d49f95f9b..5ef0c680a 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -1,139 +1,136 @@
-      
                    
+
+
                    
+  
                    
+    
                    {{_i}}Bootstrap, from Twitter{{/i}}
                    
+    
                    Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
                    
+    
                    
+      {{_i}}View project on GitHub{{/i}}
+      {{_i}}Download Bootstrap{{/i}}
+    
                    
+  
                    
 
-        
-        
                    
-          
                    
-            
                    {{_i}}Bootstrap, from Twitter{{/i}}
                    
-            
                    Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
                    
-            
                    
-              {{_i}}View project on GitHub{{/i}}
-              {{_i}}Download Bootstrap{{/i}}
-            
                    
-          
                    
+  
+
                    
 
-          
-        
                    
+
                    
 
-        
                    
+
                    
+  
                    {{_i}}Designed for everyone, everywhere.{{/i}}
                    
+  
                    {{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}
                    
+  
                    
+    
                    
+      
+      
                    {{_i}}Built for and by nerds{{/i}}
                    
+      
                    {{_i}}Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.{{/i}}
                    
+    
                    
+    
                    
+      
+      
                    {{_i}}For all skill levels{{/i}}
                    
+      
                    {{_i}}Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.{{/i}}
                    
+    
                    
+    
                    
+      
+      
                    {{_i}}Cross-everything{{/i}}
                    
+      
                    {{_i}}Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.{{/i}}
                    
+    
                    
+  
                    
+  
                    
+    
                    
+      
+      
                    {{_i}}12-column grid{{/i}}
                    
+      
                    {{_i}}Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.{{/i}}
                    
+    
                    
+    
                    
+      
+      
                    {{_i}}Responsive design{{/i}}
                    
+      
                    {{_i}}With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.{{/i}}
                    
+    
                    
+    
                    
+      
+      
                    {{_i}}Styleguide docs{{/i}}
                    
+      
                    {{_i}}Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.{{/i}}
                    
+    
                    
+  
                    
+  
                    
+    
                    
+      
+      
                    {{_i}}Growing library{{/i}}
                    
+      
                    {{_i}}Despite being only 10kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.{{/i}}
                    
+    
                    
+    
                    
+      
+      
                    {{_i}}Custom jQuery plugins{{/i}}
                    
+      
                    {{_i}}What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.{{/i}}
                    
+    
                    
+    
                    
+      
+      
                    {{_i}}Built on LESS{{/i}}
                    
+      
                    {{_i}}Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.{{/i}}
                    
+    
                    
+  
                    
+  
                    
+    
                    
+      
+      
                    HTML5
                    
+      
                    {{_i}}Built to support new HTML5 elements and syntax.{{/i}}
                    
+    
                    
+    
                    
+      
+      
                    CSS3
                    
+      
                    {{_i}}Progressively enhanced components for ultimate style.{{/i}}
                    
+    
                    
+    
                    
+      
+      
                    {{_i}}Open-source{{/i}}
                    
+      
                    {{_i}}Built for and maintained by the community via GitHub.{{/i}}
                    
+    
                    
+    
                    
+      
+      
                    {{_i}}Made at Twitter{{/i}}
                    
+      
                    {{_i}}Brought to you by an experienced engineer and designer.{{/i}}
                    
+    
                    
+  
                    
 
-        
                    
-          
                    {{_i}}Designed for everyone, everywhere.{{/i}}
                    
-          
                    {{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}
                    
-          
                    
-            
                    
-              
-              
                    {{_i}}Built for and by nerds{{/i}}
                    
-              
                    {{_i}}Like you, we love building awesome products on the web. We love it so much, we decided to help people just like us do it easier, better, and faster. Bootstrap is built for you.{{/i}}
                    
-            
                    
-            
                    
-              
-              
                    {{_i}}For all skill levels{{/i}}
                    
-              
                    {{_i}}Bootstrap is designed to help people of all skill level—designer or developer, huge nerd or early beginner. Use it as a complete kit or use to start something more complex.{{/i}}
                    
-            
                    
-            
                    
-              
-              
                    {{_i}}Cross-everything{{/i}}
                    
-              
                    {{_i}}Originally built with only modern browsers in mind, Bootstrap has evolved to include support for all major browsers (even IE7!) and, with Bootstrap 2, tablets and smartphones, too.{{/i}}
                    
-            
                    
-          
                    
-          
                    
-            
                    
-              
-              
                    {{_i}}12-column grid{{/i}}
                    
-              
                    {{_i}}Grid systems aren't everything, but having a durable and flexible one at the core of your work can make development much simpler. Use our built-in grid classes or roll your own.{{/i}}
                    
-            
                    
-            
                    
-              
-              
                    {{_i}}Responsive design{{/i}}
                    
-              
                    {{_i}}With Bootstrap 2, we've gone fully responsive. Our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.{{/i}}
                    
-            
                    
-            
                    
-              
-              
                    {{_i}}Styleguide docs{{/i}}
                    
-              
                    {{_i}}Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.{{/i}}
                    
-            
                    
-          
                    
-          
                    
-            
                    
-              
-              
                    {{_i}}Growing library{{/i}}
                    
-              
                    {{_i}}Despite being only 10kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.{{/i}}
                    
-            
                    
-            
                    
-              
-              
                    {{_i}}Custom jQuery plugins{{/i}}
                    
-              
                    {{_i}}What good is an awesome design component without easy-to-use, proper, and extensible interactions? With Bootstrap, you get custom-built jQuery plugins to bring your projects to life.{{/i}}
                    
-            
                    
-            
                    
-              
-              
                    {{_i}}Built on LESS{{/i}}
                    
-              
                    {{_i}}Where vanilla CSS falters, LESS excels. Variables, nesting, operations, and mixins in LESS makes coding CSS faster and more efficient with minimal overhead.{{/i}}
                    
-            
                    
-          
                    
-          
                    
-            
                    
-              
-              
                    HTML5
                    
-              
                    {{_i}}Built to support new HTML5 elements and syntax.{{/i}}
                    
-            
                    
-            
                    
-              
-              
                    CSS3
                    
-              
                    {{_i}}Progressively enhanced components for ultimate style.{{/i}}
                    
-            
                    
-            
                    
-              
-              
                    {{_i}}Open-source{{/i}}
                    
-              
                    {{_i}}Built for and maintained by the community via GitHub.{{/i}}
                    
-            
                    
-            
                    
-              
-              
                    {{_i}}Made at Twitter{{/i}}
                    
-              
                    {{_i}}Brought to you by an experienced engineer and designer.{{/i}}
                    
-            
                    
-          
                    
+  
                    
 
-          
                    
+  
                    {{_i}}Built with Bootstrap.{{/i}}
                    
+  
                    {{_i}}For even more sites built with Bootstrap, visit the unofficial Tumblr or browse the examples.{{/i}}
                    
+  
 
-          
                    {{_i}}Built with Bootstrap.{{/i}}
                    
-          
                    {{_i}}For even more sites built with Bootstrap, visit the unofficial Tumblr or browse the examples.{{/i}}
                    
-          
-
-        
                    
-      
                    
\ No newline at end of file
+
                    
\ No newline at end of file
diff --git a/less/buttons.less b/less/buttons.less
index 2bc457f65..ce725cd4b 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -2,57 +2,11 @@
 // -------------
 
 
-// Colors
-// ------
-
-.btn {
-  // Set text color
-  &.primary,
-  &.primary:hover,
-  &.warning,
-  &.warning:hover,
-  &.danger,
-  &.danger:hover,
-  &.success,
-  &.success:hover,
-  &.info,
-  &.info:hover {
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-    color: @white
-  }
-  &.primary.active,
-  &.warning.active,
-  &.danger.active,
-  &.success.active,
-  &.info.active {
-    color: rgba(255,255,255,.75);
-  }
-  &.primary {
-    .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20));
-  }
-  // Warning appears are orange
-  &.warning {
-    .buttonBackground(lighten(@orange, 15%), @orange);
-  }
-  // Danger and error appear as red
-  &.danger {
-    .buttonBackground(#ee5f5b, #bd362f);
-  }
-  // Success appears as green
-  &.success {
-    .buttonBackground(#62c462, #51a351);
-  }
-  // Info appears as a neutral blue
-  &.info {
-    .buttonBackground(#5bc0de, #2f96b4);
-  }
-}
-
 // Base styles
-// -----------
+// --------------------------------------------------
 
+// Core
 .btn {
-  // Button Base
   display: inline-block;
   padding: 4px 10px 4px;
   font-size: @baseFontSize;
@@ -68,70 +22,133 @@
   .box-shadow(@shadow);
   cursor: pointer;
 
+  // Give IE7 some love
   .ie7-restore-left-whitespace();
+}
 
-  &:hover {
-    color: @grayDark;
-    text-decoration: none;
-    background-color: darken(@white, 10%);
-    background-position: 0 -15px;
+// Hover state
+.btn:hover {
+  color: @grayDark;
+  text-decoration: none;
+  background-color: darken(@white, 10%);
+  background-position: 0 -15px;
 
-    // transition is only when going to hover, otherwise the background
-    // behind the gradient (there for IE<=9 fallback) gets mismatched
-    .transition(background-position .1s linear);
-  }
+  // transition is only when going to hover, otherwise the background
+  // behind the gradient (there for IE<=9 fallback) gets mismatched
+  .transition(background-position .1s linear);
+}
 
-  // Focus state for keyboard and accessibility
-  &:focus {
-    .tab-focus();
-  }
+// Focus state for keyboard and accessibility
+.btn:focus {
+  .tab-focus();
+}
 
-  // Active and Disabled states
-  &.active,
-  &:active {
-    background-image: none;
-    @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-    .box-shadow(@shadow);
-    background-color: darken(@white, 10%);
-    background-color: darken(@white, 15%) e("\9");
-    color: rgba(0,0,0,.5);
-    outline: 0;
-  }
-  &.disabled,
-  &[disabled] {
-    cursor: default;
-    background-image: none;
-    background-color: darken(@white, 10%);
-    .opacity(65);
-    .box-shadow(none);
-  }
+// Active state
+.btn.active,
+.btn:active {
+  background-image: none;
+  @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  .box-shadow(@shadow);
+  background-color: darken(@white, 10%);
+  background-color: darken(@white, 15%) e("\9");
+  color: rgba(0,0,0,.5);
+  outline: 0;
+}
 
-  // Button Sizes
-  &.large {
-    padding: 9px 14px;
-    font-size: @baseFontSize + 2px;
-    line-height: normal;
-    .border-radius(5px);
-  }
-  &.large .icon {
-    margin-top: 1px;
-  }
-  &.small {
-    padding: 5px 9px;
-    font-size: @baseFontSize - 2px;
-    line-height: @baseLineHeight - 2px;
-  }
-  &.small .icon {
-    margin-top: -1px;
-  }
+// Disabled state
+.btn.disabled,
+.btn[disabled] {
+  cursor: default;
+  background-image: none;
+  background-color: darken(@white, 10%);
+  .opacity(65);
+  .box-shadow(none);
+}
+
+
+// Button Sizes
+// --------------------------------------------------
+
+// Large
+.btn.large {
+  padding: 9px 14px;
+  font-size: @baseFontSize + 2px;
+  line-height: normal;
+  .border-radius(5px);
+}
+.btn.large .icon {
+  margin-top: 1px;
+}
+
+// Small
+.btn.small {
+  padding: 5px 9px;
+  font-size: @baseFontSize - 2px;
+  line-height: @baseLineHeight - 2px;
+}
+.btn.small .icon {
+  margin-top: -1px;
+}
+
+
+// Alternate buttons
+// --------------------------------------------------
+
+// Set text color
+// -------------------------
+.btn.primary,
+.btn.primary:hover,
+.btn.warning,
+.btn.warning:hover,
+.btn.danger,
+.btn.danger:hover,
+.btn.success,
+.btn.success:hover,
+.btn.info,
+.btn.info:hover {
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  color: @white
+}
+// Provide *some* extra contrast for those who can get it
+.btn.primary.active,
+.btn.warning.active,
+.btn.danger.active,
+.btn.success.active,
+.btn.info.active {
+  color: rgba(255,255,255,.75);
+}
+
+// Set the backgrounds
+// -------------------------
+.btn.primary {
+  .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20));
 }
+// Warning appears are orange
+.btn.warning {
+  .buttonBackground(lighten(@orange, 15%), @orange);
+}
+// Danger and error appear as red
+.btn.danger {
+  .buttonBackground(#ee5f5b, #bd362f);
+}
+// Success appears as green
+.btn.success {
+  .buttonBackground(#62c462, #51a351);
+}
+// Info appears as a neutral blue
+.btn.info {
+  .buttonBackground(#5bc0de, #2f96b4);
+}
+
+
+// Cross-browser Jank
+// --------------------------------------------------
 
-// Help Firefox not be a jerk about adding extra padding to buttons
 button.btn,
 input[type="submit"].btn {
   &::-moz-focus-inner {
-  	padding: 0;
-  	border: 0;
+  padding: 0;
+    border: 0;
   }
 
   // IE7 has some default padding on button controls
-- 
cgit v1.2.3


From 0f3a073b8dca534e78c09b71999d5a2632e2245d Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 21:15:57 -0800
Subject: *really* refactor the buttons and update them all over the docs

---
 docs/assets/bootstrap.zip                | Bin 52308 -> 52307 bytes
 docs/assets/css/bootstrap.css            | 122 +++++++++++++++----------------
 docs/assets/css/docs.css                 |   6 +-
 docs/base-css.html                       |  68 ++++++++---------
 docs/components.html                     |  24 +++---
 docs/download.html                       |   8 +-
 docs/index.html                          |   4 +-
 docs/javascript.html                     |  30 ++++----
 docs/templates/pages/base-css.mustache   |  68 ++++++++---------
 docs/templates/pages/components.mustache |  24 +++---
 docs/templates/pages/download.mustache   |   8 +-
 docs/templates/pages/index.mustache      |   4 +-
 docs/templates/pages/javascript.mustache |  30 ++++----
 examples/fluid-reverse.html              |   2 +-
 examples/fluid.html                      |   2 +-
 examples/hero.html                       |   2 +-
 less/button-groups.less                  |  10 +--
 less/buttons.less                        |  52 ++++++-------
 18 files changed, 232 insertions(+), 232 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 930c01937..55b71b927 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c377d6f97..ec8a5f3ff 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1700,7 +1700,7 @@ table .span12 {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-.btn.active, .btn:active {
+.btn-active, .btn:active {
   background-image: none;
   -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
@@ -1710,7 +1710,7 @@ table .span12 {
   color: rgba(0, 0, 0, 0.5);
   outline: 0;
 }
-.btn.disabled, .btn[disabled] {
+.btn-disabled, .btn[disabled] {
   cursor: default;
   background-image: none;
   background-color: #e6e6e6;
@@ -1720,7 +1720,7 @@ table .span12 {
   -moz-box-shadow: none;
   box-shadow: none;
 }
-.btn.large {
+.btn-large {
   padding: 9px 14px;
   font-size: 15px;
   line-height: normal;
@@ -1728,38 +1728,38 @@ table .span12 {
   -moz-border-radius: 5px;
   border-radius: 5px;
 }
-.btn.large .icon {
+.btn-large .icon {
   margin-top: 1px;
 }
-.btn.small {
+.btn-small {
   padding: 5px 9px;
   font-size: 11px;
   line-height: 16px;
 }
-.btn.small .icon {
+.btn-small .icon {
   margin-top: -1px;
 }
-.btn.primary,
-.btn.primary:hover,
-.btn.warning,
-.btn.warning:hover,
-.btn.danger,
-.btn.danger:hover,
-.btn.success,
-.btn.success:hover,
-.btn.info,
-.btn.info:hover {
+.btn-primary,
+.btn-primary:hover,
+.btn-warning,
+.btn-warning:hover,
+.btn-danger,
+.btn-danger:hover,
+.btn-success,
+.btn-success:hover,
+.btn-info,
+.btn-info:hover {
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   color: #ffffff;
 }
-.btn.primary.active,
-.btn.warning.active,
-.btn.danger.active,
-.btn.success.active,
-.btn.info.active {
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active {
   color: rgba(255, 255, 255, 0.75);
 }
-.btn.primary {
+.btn-primary {
   background-color: #006dcc;
   background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
   background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
@@ -1773,17 +1773,17 @@ table .span12 {
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
-.btn.primary:hover,
-.btn.primary:active,
-.btn.primary.active,
-.btn.primary.disabled,
-.btn.primary[disabled] {
+.btn-primary:hover,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
   background-color: #0044cc;
 }
-.btn.primary:active, .btn.primary.active {
+.btn-primary:active, .btn-primary.active {
   background-color: #003399 \9;
 }
-.btn.warning {
+.btn-warning {
   background-color: #faa732;
   background-image: -moz-linear-gradient(top, #fbb450, #f89406);
   background-image: -ms-linear-gradient(top, #fbb450, #f89406);
@@ -1797,17 +1797,17 @@ table .span12 {
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
-.btn.warning:hover,
-.btn.warning:active,
-.btn.warning.active,
-.btn.warning.disabled,
-.btn.warning[disabled] {
+.btn-warning:hover,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
   background-color: #f89406;
 }
-.btn.warning:active, .btn.warning.active {
+.btn-warning:active, .btn-warning.active {
   background-color: #c67605 \9;
 }
-.btn.danger {
+.btn-danger {
   background-color: #da4f49;
   background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
   background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);
@@ -1821,17 +1821,17 @@ table .span12 {
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
-.btn.danger:hover,
-.btn.danger:active,
-.btn.danger.active,
-.btn.danger.disabled,
-.btn.danger[disabled] {
+.btn-danger:hover,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
   background-color: #bd362f;
 }
-.btn.danger:active, .btn.danger.active {
+.btn-danger:active, .btn-danger.active {
   background-color: #942a25 \9;
 }
-.btn.success {
+.btn-success {
   background-color: #5bb75b;
   background-image: -moz-linear-gradient(top, #62c462, #51a351);
   background-image: -ms-linear-gradient(top, #62c462, #51a351);
@@ -1845,17 +1845,17 @@ table .span12 {
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
-.btn.success:hover,
-.btn.success:active,
-.btn.success.active,
-.btn.success.disabled,
-.btn.success[disabled] {
+.btn-success:hover,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
   background-color: #51a351;
 }
-.btn.success:active, .btn.success.active {
+.btn-success:active, .btn-success.active {
   background-color: #408140 \9;
 }
-.btn.info {
+.btn-info {
   background-color: #49afcd;
   background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
   background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4);
@@ -1869,14 +1869,14 @@ table .span12 {
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
-.btn.info:hover,
-.btn.info:active,
-.btn.info.active,
-.btn.info.disabled,
-.btn.info[disabled] {
+.btn-info:hover,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
   background-color: #2f96b4;
 }
-.btn.info:active, .btn.info.active {
+.btn-info:active, .btn-info.active {
   background-color: #24748c \9;
 }
 button.btn, input[type="submit"].btn {
@@ -2008,15 +2008,15 @@ button.btn.small, input[type="submit"].btn.small {
   opacity: 1;
   filter: alpha(opacity=100);
 }
-.primary .caret,
-.danger .caret,
-.info .caret,
-.success .caret {
+.btn-primary .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret {
   border-top-color: #ffffff;
   opacity: 0.75;
   filter: alpha(opacity=75);
 }
-.btn.small .caret {
+.btn-small .caret {
   margin-top: 4px;
 }
 .alert {
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 026872a34..a5ad9631a 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -73,7 +73,7 @@ hr.soften {
   line-height: 36px;
   color: #333;
 }
-.jumbotron .btn {
+.jumbotron .btn-large {
   font-size: 20px;
   font-weight: normal;
   padding: 14px 24px;
@@ -440,7 +440,7 @@ hr.soften {
 
 /* Giant download button */
 .download-btn {
-  margin: 36px 0 108px.i;
+  margin: 36px 0 108px;
 }
 .download p,
 .download h4 {
@@ -455,7 +455,7 @@ hr.soften {
 .download p {
   margin-bottom: 18px;
 }
-.btn.xlarge {
+.download-btn .btn {
   display: block;
   width: auto;
   padding: 19px 24px;
diff --git a/docs/base-css.html b/docs/base-css.html
index 5df63b917..ddbbad174 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -832,11 +832,6 @@ For example, <code>section</code> should be wrapped as inline.
         .form-vertical (not required)
         Stacked, left-aligned labels over controls
       
-      
-        Horizontal
-        .form-horizontal
-        Float left, right-aligned labels on same line as controls
-      
       
         Inline
         .form-inline
@@ -847,6 +842,11 @@ For example, <code>section</code> should be wrapped as inline.
         .form-search
         Extra-rounded text input for a typical search aesthetic
       
+      
+        Horizontal
+        .form-horizontal
+        Float left, right-aligned labels on same line as controls
+      
     
   
 
@@ -955,7 +955,7 @@ For example, <code>section</code> should be wrapped as inline.
             
                    
           
                    
           
                    
-            
+            
             
           
                    
         
@@ -1048,7 +1048,7 @@ For example, <code>section</code> should be wrapped as inline.
             
                    
           
                  
           
                  
-            
+            
             
           
                  
         
@@ -1172,7 +1172,7 @@ For example, <code>section</code> should be wrapped as inline.
             
                  
           
                
           
                
-            
+            
             
           
                
         
@@ -1215,28 +1215,28 @@ For example, <code>section</code> should be wrapped as inline.
         Standard gray button with gradient
       
       
-        Primary
-        .primary
+        Primary
+        .btn-primary
         Provides extra visual weight and identifies the primary action in a set of buttons
       
       
-        Info
-        .info
+        Info
+        .btn-info
         Used as an alternate to the default styles
       
       
-        Success
-        .success
+        Success
+        .btn-success
         Indicates a successful or positive action
       
       
-        Warning
-        .warning
+        Warning
+        .btn-warning
         Indicates caution should be taken with this action
       
       
-        Danger
-        .danger
+        Danger
+        .btn-danger
         Indicates a dangerous or potentially negative action
       
     
@@ -1261,24 +1261,24 @@ For example, <code>section</code> should be wrapped as inline.
       
                Multiple sizes
                
       
                Fancy larger or smaller buttons? Have at it!
                
       
                
-        Primary action
-        Action
+        Primary action
+        Action
       
                
       
                
-        Primary action
-        Action
+        Primary action
+        Action
       
                
     
                
     
                
       
                Disabled state
                
-      
                For disabled buttons, use .disabled for links and :disabled for <button> elements.
                
+      
                For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.
                
       
                
-        Primary action
-        Action
+        Primary action
+        Action
       
                
       
                
-        
-        
+        
+        
       
                
     
                
     
                
@@ -1491,8 +1491,8 @@ For example, <code>section</code> should be wrapped as inline.
           
         
                
         
                
-           User
-          
+           User
+          
           
                  
             
                •  Edit
                  • 
             
                •  Delete
                  • 
@@ -1504,13 +1504,13 @@ For example, <code>section</code> should be wrapped as inline.
       
                
       
                
          Refresh
-         Checkout
-         Delete
+         Checkout
+         Delete
       
                
       
                
-         Comment
-         Settings
-         More Info
+         Comment
+         Settings
+         More Info
       
                
     
                
     
                
diff --git a/docs/components.html b/docs/components.html
index 1d70ac476..eb876572d 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -198,7 +198,7 @@
           
         
                
         
                
-          Action 
+          Action 
           
         
                
         
                
-          Danger 
+          Danger 
           
                
       
                
         
                
-          Success 
+          Success 
           
         
                
         
                
-          Info 
+          Info 
           
         
                
         
                
-          Action
-          
+          Action
+          
           
         
                
         
                
-          Danger
-          
+          Danger
+          
           
                
       
                
         
                
-          Success
-          
+          Success
+          
           
         
                
         
                
-          Info
-          
+          Info
+          
           
                  
             
                • Action
                  • 
             
                • Another action
                  • 
diff --git a/docs/download.html b/docs/download.html
index e2cc50836..38ebee85f 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -91,7 +91,7 @@
 
 
                  
   
                  
-    Toggle all
+    Toggle all
     
                  
       1. Chose components
       Get just the CSS you need
@@ -147,7 +147,7 @@
 
 
                  
   
                  
-    Toggle all
+    Toggle all
     
                  
       2. Select jQuery plugins
       Quickly add only the necessary javascript
@@ -216,7 +216,7 @@
 
 
                  
   
                  
-    Reset to defaults
+    Reset to defaults
     
                  
       3. Customize variables
       Optionally modify Bootstrap without a compiler
@@ -315,7 +315,7 @@
     
                  
   
                  
   
                  
-    Customize and Download
+    Customize and Download
     
                  What's included?
                  
     
                  Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.
                  
   
                  
diff --git a/docs/index.html b/docs/index.html
index 66cc0ee48..71c2970a0 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -81,8 +81,8 @@
     
                  Bootstrap, from Twitter
                  
     
                  Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.
                  
     
                  
-      View project on GitHub
-      Download Bootstrap
+      View project on GitHub
+      Download Bootstrap
     
                  
   
                  
 
diff --git a/docs/javascript.html b/docs/javascript.html
index 4297fe652..2789198e6 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -214,7 +214,7 @@
                 
                  One fine body…
                  
               
                  
               
                  
-                Save changes
+                Save changes
                 Close
               
                  
             
                
@@ -239,11 +239,11 @@
               
                This link and that link should have tooltips on hover.
                
             
                
             
                
-              Save changes
+              Save changes
               Close
             
                
           
                
-          Launch demo modal
+          Launch demo modal
 
           
                
 
@@ -292,7 +292,7 @@
     <p>One fine body…</p>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn primary">Save changes</a>
+    <a href="#" class="btn btn-primary">Save changes</a>
     <a href="#" class="btn">Close</a>
   </div>
 </div>
@@ -802,7 +802,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
                Example hover popover
                
           
                Hover over the button to trigger the popover.
                
           
                
-            hover for popover
+            hover for popover
           
                
           
                
           
                Using bootstrap-popover.js
                
@@ -917,7 +917,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
             
                Oh snap! You got an error!
                
             
                Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.
                
             
                
-              Take this action Or do this
+              Take this action Or do this
             
                
           
                
           
                
@@ -983,7 +983,7 @@ $('#my-alert').bind('closed', function () {
              
                Stateful
                
-                  
                 
@@ -991,16 +991,16 @@ $('#my-alert').bind('closed', function () {
              
                Single toggle
                
-                  
+                  
                 
              
              
                Checkbox
                
                   
                
-                    
-                    
-                    
+                    
+                    
+                    
                   
                
                
              
@@ -1008,9 +1008,9 @@ $('#my-alert').bind('closed', function () {
                Radio
                
                   
                
-                    
-                    
-                    
+                    
+                    
+                    
                   
                
                
              
@@ -1158,7 +1158,7 @@ $('#my-alert').bind('closed', function () {
           
                Markup
                
           
                Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.
                
           
                -<button class="btn danger" data-toggle="collapse" data-target="#demo">
+<button class="btn btn-danger" data-toggle="collapse" data-target="#demo">
   simple collapsible
 </button>
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 433a18c88..c000c9c88 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -756,11 +756,6 @@
         .form-vertical ({{_i}}not required{{/i}})
         {{_i}}Stacked, left-aligned labels over controls{{/i}}
       
-      
-        {{_i}}Horizontal{{/i}}
-        .form-horizontal
-        {{_i}}Float left, right-aligned labels on same line as controls{{/i}}
-      
       
         {{_i}}Inline{{/i}}
         .form-inline
@@ -771,6 +766,11 @@
         .form-search
         {{_i}}Extra-rounded text input for a typical search aesthetic{{/i}}
       
+      
+        {{_i}}Horizontal{{/i}}
+        .form-horizontal
+        {{_i}}Float left, right-aligned labels on same line as controls{{/i}}
+      
     
   
 
@@ -879,7 +879,7 @@
             
                
           
                
           
                
-            
+            
             
           
                
         
@@ -972,7 +972,7 @@
             
                
           
                
           
                
-            
+            
             
           
                
         
@@ -1096,7 +1096,7 @@
             
                
           
                
           
                
-            
+            
             
           
                
         
@@ -1139,28 +1139,28 @@
         {{_i}}Standard gray button with gradient{{/i}}
       
       
-        {{_i}}Primary{{/i}}
-        .primary
+        {{_i}}Primary{{/i}}
+        .btn-primary
         {{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}
       
       
-        {{_i}}Info{{/i}}
-        .info
+        {{_i}}Info{{/i}}
+        .btn-info
         {{_i}}Used as an alternate to the default styles{{/i}}
       
       
-        {{_i}}Success{{/i}}
-        .success
+        {{_i}}Success{{/i}}
+        .btn-success
         {{_i}}Indicates a successful or positive action{{/i}}
       
       
-        {{_i}}Warning{{/i}}
-        .warning
+        {{_i}}Warning{{/i}}
+        .btn-warning
         {{_i}}Indicates caution should be taken with this action{{/i}}
       
       
-        {{_i}}Danger{{/i}}
-        .danger
+        {{_i}}Danger{{/i}}
+        .btn-danger
         {{_i}}Indicates a dangerous or potentially negative action{{/i}}
       
     
@@ -1185,24 +1185,24 @@
       
                {{_i}}Multiple sizes{{/i}}
                
       
                {{_i}}Fancy larger or smaller buttons? Have at it!{{/i}}
                
       
                
-        {{_i}}Primary action{{/i}}
-        {{_i}}Action{{/i}}
+        {{_i}}Primary action{{/i}}
+        {{_i}}Action{{/i}}
       
                
       
                
-        {{_i}}Primary action{{/i}}
-        {{_i}}Action{{/i}}
+        {{_i}}Primary action{{/i}}
+        {{_i}}Action{{/i}}
       
                
     
                
     
                
       
                {{_i}}Disabled state{{/i}}
                
-      
                {{_i}}For disabled buttons, use .disabled for links and :disabled for <button> elements.{{/i}}
                
+      
                {{_i}}For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.{{/i}}
                
       
                
-        {{_i}}Primary action{{/i}}
-        {{_i}}Action{{/i}}
+        {{_i}}Primary action{{/i}}
+        {{_i}}Action{{/i}}
       
                
       
                
-        
-        
+        
+        
       
                
     
                
     
                
@@ -1415,8 +1415,8 @@
           
         
                
         
                
-           {{_i}}User{{/i}}
-          
+           {{_i}}User{{/i}}
+          
           
                
       
                
          {{_i}}Refresh{{/i}}
-         {{_i}}Checkout{{/i}}
-         {{_i}}Delete{{/i}}
+         {{_i}}Checkout{{/i}}
+         {{_i}}Delete{{/i}}
       
                
       
                
-         {{_i}}Comment{{/i}}
-         {{_i}}Settings{{/i}}
-         {{_i}}More Info{{/i}}
+         {{_i}}Comment{{/i}}
+         {{_i}}Settings{{/i}}
+         {{_i}}More Info{{/i}}
       
                
     
                
     
                
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 214478966..e61d83152 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -122,7 +122,7 @@
           
         
                
         
                
-          {{_i}}Action{{/i}} 
+          {{_i}}Action{{/i}} 
           
         
                
         
                
-          {{_i}}Danger{{/i}} 
+          {{_i}}Danger{{/i}} 
           
                
       
                
         
                
-          {{_i}}Success{{/i}} 
+          {{_i}}Success{{/i}} 
           
         
                
         
                
-          {{_i}}Info{{/i}} 
+          {{_i}}Info{{/i}} 
           
         
                
         
                
-          {{_i}}Action{{/i}}
-          
+          {{_i}}Action{{/i}}
+          
           
         
                
         
                
-          {{_i}}Danger{{/i}}
-          
+          {{_i}}Danger{{/i}}
+          
           
                
       
                
         
                
-          {{_i}}Success{{/i}}
-          
+          {{_i}}Success{{/i}}
+          
           
         
                
         
                
-          {{_i}}Info{{/i}}
-          
+          {{_i}}Info{{/i}}
+          
           
                
@@ -163,11 +163,11 @@
               
                {{_i}}This link and that link should have tooltips on hover.{{/i}}
                
             
                
             
                
-              {{_i}}Save changes{{/i}}
+              {{_i}}Save changes{{/i}}
               {{_i}}Close{{/i}}
             
                
           
                
-          {{_i}}Launch demo modal{{/i}}
+          {{_i}}Launch demo modal{{/i}}
 
           
                
 
@@ -216,7 +216,7 @@
     <p>{{_i}}One fine body…{{/i}}</p>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn primary">{{_i}}Save changes{{/i}}</a>
+    <a href="#" class="btn btn-primary">{{_i}}Save changes{{/i}}</a>
     <a href="#" class="btn">{{_i}}Close{{/i}}</a>
   </div>
 </div>
@@ -726,7 +726,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
                {{_i}}Example hover popover{{/i}}
                
           
                {{_i}}Hover over the button to trigger the popover.{{/i}}
                
           
                
-            {{_i}}hover for popover{{/i}}
+            {{_i}}hover for popover{{/i}}
           
                
           
                
           
                {{_i}}Using bootstrap-popover.js{{/i}}
                
@@ -841,7 +841,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
             
                {{_i}}Oh snap! You got an error!{{/i}}
                
             
                {{_i}}Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.{{/i}}
                
             
                
-              {{_i}}Take this action{{/i}} {{_i}}Or do this{{/i}}
+              {{_i}}Take this action{{/i}} {{_i}}Or do this{{/i}}
             
                
           
                
           
                
@@ -907,7 +907,7 @@ $('#my-alert').bind('closed', function () {
              
                {{_i}}Stateful{{/i}}
                
-                  
                 
@@ -915,16 +915,16 @@ $('#my-alert').bind('closed', function () {
              
                {{_i}}Single toggle{{/i}}
                
-                  
+                  
                 
              
              
                {{_i}}Checkbox{{/i}}
                
                   
                
-                    
-                    
-                    
+                    
+                    
+                    
                   
                
                
              
@@ -932,9 +932,9 @@ $('#my-alert').bind('closed', function () {
                {{_i}}Radio{{/i}}
                
                   
                
-                    
-                    
-                    
+                    
+                    
+                    
                   
                
                
              
@@ -1082,7 +1082,7 @@ $('#my-alert').bind('closed', function () {
           
                {{_i}}Markup{{/i}}
                
           
                {{_i}}Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.{{/i}}
                
           
                -<button class="btn danger" data-toggle="collapse" data-target="#demo">
+<button class="btn btn-danger" data-toggle="collapse" data-target="#demo">
   {{_i}}simple collapsible{{/i}}
 </button>
 
diff --git a/examples/fluid-reverse.html b/examples/fluid-reverse.html
index aa2a77489..2812e2152 100644
--- a/examples/fluid-reverse.html
+++ b/examples/fluid-reverse.html
@@ -60,7 +60,7 @@
           
                
             
                Hello, world!
                
             
                This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.
                
-            
                Learn more »
                
+            
                Learn more »
                
           
                
           
                
             
                
diff --git a/examples/fluid.html b/examples/fluid.html
index 738c52058..57ee5b091 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -82,7 +82,7 @@
           
                
             
                Hello, world!
                
             
                This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.
                
-            
                Learn more »
                
+            
                Learn more »
                
           
                
           
                
             
                
diff --git a/examples/hero.html b/examples/hero.html
index 1fa39922f..f6d97481c 100644
--- a/examples/hero.html
+++ b/examples/hero.html
@@ -56,7 +56,7 @@
       
                
         
                Hello, world!
                
         
                This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.
                
-        
                Learn more »
                
+        
                Learn more »
                
       
                
 
       
diff --git a/less/button-groups.less b/less/button-groups.less
index 7367103ca..4b0523df2 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -130,10 +130,10 @@
 
 
 // Account for other colors
-.primary,
-.danger,
-.info,
-.success {
+.btn-primary,
+.btn-danger,
+.btn-info,
+.btn-success {
   .caret {
     border-top-color: @white;
     .opacity(75);
@@ -141,7 +141,7 @@
 }
 
 // Small button dropdowns
-.btn.small .caret {
+.btn-small .caret {
   margin-top: 4px;
 }
 
diff --git a/less/buttons.less b/less/buttons.less
index ce725cd4b..48cfa7560 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -44,7 +44,7 @@
 }
 
 // Active state
-.btn.active,
+.btn-active,
 .btn:active {
   background-image: none;
   @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
@@ -56,7 +56,7 @@
 }
 
 // Disabled state
-.btn.disabled,
+.btn-disabled,
 .btn[disabled] {
   cursor: default;
   background-image: none;
@@ -70,23 +70,23 @@
 // --------------------------------------------------
 
 // Large
-.btn.large {
+.btn-large {
   padding: 9px 14px;
   font-size: @baseFontSize + 2px;
   line-height: normal;
   .border-radius(5px);
 }
-.btn.large .icon {
+.btn-large .icon {
   margin-top: 1px;
 }
 
 // Small
-.btn.small {
+.btn-small {
   padding: 5px 9px;
   font-size: @baseFontSize - 2px;
   line-height: @baseLineHeight - 2px;
 }
-.btn.small .icon {
+.btn-small .icon {
   margin-top: -1px;
 }
 
@@ -96,47 +96,47 @@
 
 // Set text color
 // -------------------------
-.btn.primary,
-.btn.primary:hover,
-.btn.warning,
-.btn.warning:hover,
-.btn.danger,
-.btn.danger:hover,
-.btn.success,
-.btn.success:hover,
-.btn.info,
-.btn.info:hover {
+.btn-primary,
+.btn-primary:hover,
+.btn-warning,
+.btn-warning:hover,
+.btn-danger,
+.btn-danger:hover,
+.btn-success,
+.btn-success:hover,
+.btn-info,
+.btn-info:hover {
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   color: @white
 }
 // Provide *some* extra contrast for those who can get it
-.btn.primary.active,
-.btn.warning.active,
-.btn.danger.active,
-.btn.success.active,
-.btn.info.active {
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active {
   color: rgba(255,255,255,.75);
 }
 
 // Set the backgrounds
 // -------------------------
-.btn.primary {
+.btn-primary {
   .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20));
 }
 // Warning appears are orange
-.btn.warning {
+.btn-warning {
   .buttonBackground(lighten(@orange, 15%), @orange);
 }
 // Danger and error appear as red
-.btn.danger {
+.btn-danger {
   .buttonBackground(#ee5f5b, #bd362f);
 }
 // Success appears as green
-.btn.success {
+.btn-success {
   .buttonBackground(#62c462, #51a351);
 }
 // Info appears as a neutral blue
-.btn.info {
+.btn-info {
   .buttonBackground(#5bc0de, #2f96b4);
 }
 
-- 
cgit v1.2.3


From 31911659a200d39d8494f35f8fd71863ac1226d0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 21:29:50 -0800
Subject: refactor the navs to use prefixed classes, because you know,
 consistency is beast mode

---
 docs/assets/bootstrap.zip                 | Bin 52307 -> 52329 bytes
 docs/assets/css/bootstrap.css             | 106 ++++++++++++-------------
 docs/base-css.html                        |   2 +-
 docs/components.html                      |  54 ++++++-------
 docs/download.html                        |   2 +-
 docs/javascript.html                      |   2 +-
 docs/scaffolding.html                     |   2 +-
 docs/templates/pages/base-css.mustache    |   2 +-
 docs/templates/pages/components.mustache  |  54 ++++++-------
 docs/templates/pages/download.mustache    |   2 +-
 docs/templates/pages/javascript.mustache  |   2 +-
 docs/templates/pages/scaffolding.mustache |   2 +-
 less/navs.less                            | 128 +++++++++++++++---------------
 13 files changed, 179 insertions(+), 179 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 55b71b927..e5a745be6 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index ec8a5f3ff..60e54ce9d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2084,65 +2084,65 @@ button.btn.small, input[type="submit"].btn.small {
   text-decoration: none;
   background-color: #eeeeee;
 }
-.nav.list {
+.nav-list {
   padding-left: 14px;
   padding-right: 14px;
   margin-bottom: 0;
 }
-.nav.list > li > a, .nav.list .nav-header {
+.nav-list > li > a, .nav-list .nav-header {
   display: block;
   padding: 3px 15px;
   margin-left: -15px;
   margin-right: -15px;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
-.nav.list .nav-header {
+.nav-list .nav-header {
   font-size: 11px;
   font-weight: bold;
   line-height: 18px;
   color: #999999;
   text-transform: uppercase;
 }
-.nav.list > li + .nav-header {
+.nav-list > li + .nav-header {
   margin-top: 9px;
 }
-.nav.list .active > a {
+.nav-list .active > a {
   color: #ffffff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
   background-color: #0088cc;
 }
-.nav.list .icon {
+.nav-list .icon {
   margin-right: 2px;
 }
-.tabs, .pills {
+.nav-tabs, .nav-pills {
   *zoom: 1;
 }
-.tabs:before,
-.pills:before,
-.tabs:after,
-.pills:after {
+.nav-tabs:before,
+.nav-pills:before,
+.nav-tabs:after,
+.nav-pills:after {
   display: table;
   content: "";
 }
-.tabs:after, .pills:after {
+.nav-tabs:after, .nav-pills:after {
   clear: both;
 }
-.tabs > li, .pills > li {
+.nav-tabs > li, .nav-pills > li {
   float: left;
 }
-.tabs > li > a, .pills > li > a {
+.nav-tabs > li > a, .nav-pills > li > a {
   padding-right: 12px;
   padding-left: 12px;
   margin-right: 2px;
   line-height: 14px;
 }
-.tabs {
+.nav-tabs {
   border-bottom: 1px solid #ddd;
 }
-.tabs > li {
+.nav-tabs > li {
   margin-bottom: -1px;
 }
-.tabs > li > a {
+.nav-tabs > li > a {
   padding-top: 9px;
   padding-bottom: 9px;
   border: 1px solid transparent;
@@ -2150,17 +2150,17 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
-.tabs > li > a:hover {
+.nav-tabs > li > a:hover {
   border-color: #eeeeee #eeeeee #dddddd;
 }
-.tabs > .active > a, .tabs > .active > a:hover {
+.nav-tabs > .active > a, .nav-tabs > .active > a:hover {
   color: #555555;
   background-color: #ffffff;
   border: 1px solid #ddd;
   border-bottom-color: transparent;
   cursor: default;
 }
-.pills > li > a {
+.nav-pills > li > a {
   padding-top: 8px;
   padding-bottom: 8px;
   margin-top: 2px;
@@ -2169,69 +2169,69 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-border-radius: 5px;
   border-radius: 5px;
 }
-.pills .active > a, .pills .active > a:hover {
+.nav-pills .active > a, .nav-pills .active > a:hover {
   color: #ffffff;
   background-color: #0088cc;
 }
-.nav.stacked > li {
+.nav-stacked > li {
   float: none;
 }
-.nav.stacked > li > a {
+.nav-stacked > li > a {
   margin-right: 0;
 }
-.tabs.stacked {
+.nav-tabs.nav-stacked {
   border-bottom: 0;
 }
-.tabs.stacked > li > a {
+.nav-tabs.nav-stacked > li > a {
   border: 1px solid #ddd;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
 }
-.tabs.stacked > li:first-child > a {
+.nav-tabs.nav-stacked > li:first-child > a {
   -webkit-border-radius: 4px 4px 0 0;
   -moz-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
-.tabs.stacked > li:last-child > a {
+.nav-tabs.nav-stacked > li:last-child > a {
   -webkit-border-radius: 0 0 4px 4px;
   -moz-border-radius: 0 0 4px 4px;
   border-radius: 0 0 4px 4px;
 }
-.tabs.stacked > li > a:hover {
+.nav-tabs.nav-stacked > li > a:hover {
   border-color: #ddd;
   z-index: 2;
 }
-.pills.stacked > li > a {
+.nav-pills.nav-stacked > li > a {
   margin-bottom: 3px;
 }
-.pills.stacked > li:last-child > a {
+.nav-pills.nav-stacked > li:last-child > a {
   margin-bottom: 1px;
 }
-.pills .dropdown-menu, .tabs .dropdown-menu {
+.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu {
   margin-top: 1px;
   border-width: 1px;
 }
-.pills .dropdown-menu {
+.nav-pills .dropdown-menu {
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
+.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret {
   border-top-color: #0088cc;
   margin-top: 6px;
 }
-.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret {
+.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret {
   border-top-color: #005580;
 }
-.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret {
+.nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret {
   border-top-color: #333333;
 }
 .nav > .dropdown.active > a:hover {
   color: #000000;
   cursor: pointer;
 }
-.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover {
+.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover {
   color: #ffffff;
   background-color: #999999;
   border-color: #999999;
@@ -2241,7 +2241,7 @@ button.btn.small, input[type="submit"].btn.small {
   opacity: 1;
   filter: alpha(opacity=100);
 }
-.tabs.stacked .open > a:hover {
+.tabs-stacked .open > a:hover {
   border-color: #999999;
 }
 .tabbable {
@@ -2254,7 +2254,7 @@ button.btn.small, input[type="submit"].btn.small {
 .tabbable:after {
   clear: both;
 }
-.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs {
+.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
   border-bottom: 0;
 }
 .tab-content > .tab-pane, .pill-content > .pill-pane {
@@ -2263,66 +2263,66 @@ button.btn.small, input[type="submit"].btn.small {
 .tab-content > .active, .pill-content > .active {
   display: block;
 }
-.tabs-below .tabs {
+.tabs-below .nav-tabs {
   border-top: 1px solid #ddd;
 }
-.tabs-below .tabs > li {
+.tabs-below .nav-tabs > li {
   margin-top: -1px;
   margin-bottom: 0;
 }
-.tabs-below .tabs > li > a {
+.tabs-below .nav-tabs > li > a {
   -webkit-border-radius: 0 0 4px 4px;
   -moz-border-radius: 0 0 4px 4px;
   border-radius: 0 0 4px 4px;
 }
-.tabs-below .tabs > li > a:hover {
+.tabs-below .nav-tabs > li > a:hover {
   border-bottom-color: transparent;
   border-top-color: #ddd;
 }
-.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover {
+.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover {
   border-color: transparent #ddd #ddd #ddd;
 }
-.tabs-left .tabs > li, .tabs-right .tabs > li {
+.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li {
   float: none;
 }
-.tabs-left .tabs > li > a, .tabs-right .tabs > li > a {
+.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a {
   min-width: 74px;
   margin-right: 0;
   margin-bottom: 3px;
 }
-.tabs-left .tabs {
+.tabs-left .nav-tabs {
   float: left;
   margin-right: 19px;
   border-right: 1px solid #ddd;
 }
-.tabs-left .tabs > li > a {
+.tabs-left .nav-tabs > li > a {
   margin-right: -1px;
   -webkit-border-radius: 4px 0 0 4px;
   -moz-border-radius: 4px 0 0 4px;
   border-radius: 4px 0 0 4px;
 }
-.tabs-left .tabs > li > a:hover {
+.tabs-left .nav-tabs > li > a:hover {
   border-color: #eeeeee #dddddd #eeeeee #eeeeee;
 }
-.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover {
+.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover {
   border-color: #ddd transparent #ddd #ddd;
   *border-right-color: #ffffff;
 }
-.tabs-right .tabs {
+.tabs-right .nav-tabs {
   float: right;
   margin-left: 19px;
   border-left: 1px solid #ddd;
 }
-.tabs-right .tabs > li > a {
+.tabs-right .nav-tabs > li > a {
   margin-left: -1px;
   -webkit-border-radius: 0 4px 4px 0;
   -moz-border-radius: 0 4px 4px 0;
   border-radius: 0 4px 4px 0;
 }
-.tabs-right .tabs > li > a:hover {
+.tabs-right .nav-tabs > li > a:hover {
   border-color: #eeeeee #eeeeee #eeeeee #dddddd;
 }
-.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
+.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
   *border-left-color: #ffffff;
 }
diff --git a/docs/base-css.html b/docs/base-css.html
index ddbbad174..0f97a036a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -80,7 +80,7 @@
   
                Base CSS
                
   
                On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
                
   
                
-    
                  
+    
                    
       
                  • Typography
                    • 
       
                  • Code
                    • 
       
                  • Tables
                    • 
diff --git a/docs/components.html b/docs/components.html
index eb876572d..02b50211e 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -80,7 +80,7 @@
   
                    Components
                    
   
                    Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.
                    
   
                    
-    
                      
+    
                        
       
                      • 
         Buttons 
         
                          
@@ -361,13 +361,13 @@
     
                          
       
                          Basic tabs
                          
       
                          Take a regular <ul> of links and add .tabs:
                          
-      
                            
+      
 
                            -<ul class="nav tabs">
+<ul class="nav nav-tabs">
   <li class="active">
     <a href="#">Home</a>
   </li>
@@ -379,13 +379,13 @@
     
                            
       
                            Basic pills
                            
       
                            Take that same HTML, but use .pills instead:
                            
-      
                              
+      
 
                              -<ul class="nav pills">
+<ul class="nav nav-pills">
   <li class="active">
     <a href="#">Home</a>
   </li>
@@ -404,26 +404,26 @@
     
                            
     
                            
       
                            Stacked tabs
                            
-      
                              
+      
 
                              -<ul class="nav tabs stacked">
+<ul class="nav nav-tabs nav-stacked">
   ...
 </ul>
 
                              
     
                            
     
                            
       
                            Stacked pills
                            
-      
                              
+      
 
                              -<ul class="nav pills stacked">
+<ul class="nav nav-pills nav-stacked">
   ...
 </ul>
 
                              
@@ -439,7 +439,7 @@
     
                            
     
                            
       
                            Tabs with dropdowns
                            
-      
                              
+      
 
                              -<ul class="nav tabs">
+<ul class="nav nav-tabs">
   <li class="dropdown">
     <a class="dropdown-toggle"
        data-toggle="dropdown"
@@ -471,7 +471,7 @@
     
                            
     
                            
       
                            Pills with dropdowns
                            
-      
                              
+      
 
                              -<ul class="nav pills">
+<ul class="nav nav-pills">
   <li class="dropdown">
     <a class="dropdown-toggle"
        data-toggle="dropdown"
@@ -516,7 +516,7 @@
       
                              Example nav list
                              
       
                              Take a list of links and add class="nav list":
                              
       
                              
-        
                               
 
                              -<ul class="nav list">
+<ul class="nav nav-list">
   <li class="nav-header">
     List header
   </li>
@@ -546,7 +546,7 @@
       
                              Example with icons
                              
       
                              Same example, but with <i> tags for icons.
                              
       
                              
-        
                               
 
                              -<ul class="nav list">
+<ul class="nav nav-list">
   ...
   <li>
     <a href="#">
@@ -584,7 +584,7 @@
       
                              Tabbable example
                              
       
                              To make tabs tabbable, wrap the .tabs in another div with class .tabbable.
                              
       
                              
-        
                                
+        
                                  
           
                                • Section 1
                                  • 
           
                                • Section 2
                                  • 
           
                                • Section 3
                                  • 
@@ -613,7 +613,7 @@
   
                                  Using tabbable tabs requires a wrapping div, a set of tabs, and a set of tabbable panes of content.
                                  
 
                                   <div class="tabbable">
-  <ul class="nav tabs">
+  <ul class="nav nav-tabs">
     <li class="active"><a href="#1" data-toggle="tab">Section 1</a></li>
     <li><a href="#2" data-toggle="tab">Section 2</a></li>
   </ul>
@@ -645,7 +645,7 @@
             
                                  What up girl, this is Section C.
                                  
           
                              
         
                            
-        
                           
 
                           <div class="tabbable tabs-below">
-  <ul class="nav tabs">
-    ...
-  </ul>
   <div class="tab-content">
     ...
   </div>
+  <ul class="nav nav-tabs">
+    ...
+  </ul>
 </div>
 
                          
     
                    
@@ -666,7 +666,7 @@
       
                    Tabs on the left
                    
       
                    Swap the class to put tabs on the left.
                    
       
                    
-        
                     
 
                     <div class="tabbable tabs-left">
-  <ul class="nav tabs">
+  <ul class="nav nav-tabs">
     ...
   </ul>
   <div class="tab-content">
@@ -698,7 +698,7 @@
       
                    Tabs on the right
                    
       
                    Swap the class to put tabs on the right.
                    
       
                    
-        
                     
 
                     <div class="tabbable tabs-right">
-  <ul class="nav tabs">
+  <ul class="nav nav-tabs">
     ...
   </ul>
   <div class="tab-content">
diff --git a/docs/download.html b/docs/download.html
index 38ebee85f..ea096d290 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -80,7 +80,7 @@
   
                    Customize and download
                    
   
                    Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.
                    
   
                    
-    
                      
+    
                        
       
                      • 1. Choose components
                        • 
       
                      • 2. Select jQuery plugins
                        • 
       
                      • 3. Customize variables
                        • 
diff --git a/docs/javascript.html b/docs/javascript.html
index 2789198e6..9781f3bc0 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -80,7 +80,7 @@
         
                        Javascript for Bootstrap
                        
         
                        Bring Bootstrap's components to life—now with 12 custom jQuery plugins.
         
                        
-          
                          
+          
                            
             
                          • All plugins
                            • 
             
                          • Modal
                            • 
             
                          • Dropdown
                            • 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 9bb5d303b..0d5a83d64 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -80,7 +80,7 @@
         
                            Scaffolding
                            
         
                            Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
                            
         
                            
-          
                              
+          
                                
             
                              • Grid system
                                • 
             
                              • Layouts
                                • 
             
                              • Responsive design
                                • 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c000c9c88..2da59f0ef 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -4,7 +4,7 @@
   
                                {{_i}}Base CSS{{/i}}
                                
   
                                {{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}
                                
   
                                
-    
                                  
+    
                                    
       
                                  • {{_i}}Typography{{/i}}
                                    • 
       
                                  • {{_i}}Code{{/i}}
                                    • 
       
                                  • {{_i}}Tables{{/i}}
                                    • 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index e61d83152..c9f740b4a 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -4,7 +4,7 @@
   
                                    {{_i}}Components{{/i}}
                                    
   
                                    {{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}
                                    
   
                                    
-    
                                      
+    
                                        
       
                                      • 
         {{_i}}Buttons{{/i}} 
         
                                          
@@ -285,13 +285,13 @@
     
                                          
       
                                          {{_i}}Basic tabs{{/i}}
                                          
       
                                          {{_i}}Take a regular <ul> of links and add .tabs:{{/i}}
                                          
-      
                                            
+      
 
                                            -<ul class="nav tabs">
+<ul class="nav nav-tabs">
   <li class="active">
     <a href="#">{{_i}}Home{{/i}}</a>
   </li>
@@ -303,13 +303,13 @@
     
                                            
       
                                            {{_i}}Basic pills{{/i}}
                                            
       
                                            {{_i}}Take that same HTML, but use .pills instead:{{/i}}
                                            
-      
                                            
     
                                            
       
                                            {{_i}}Stacked tabs{{/i}}
                                            
-      
                                            
     
                                            
       
                                            {{_i}}Stacked pills{{/i}}
                                            
-      
                                            
     
                                            
       
                                            {{_i}}Tabs with dropdowns{{/i}}
                                            
-      
                                              
+      
 
                                              -<ul class="nav tabs">
+<ul class="nav nav-tabs">
   <li class="dropdown">
     <a class="dropdown-toggle"
        data-toggle="dropdown"
@@ -395,7 +395,7 @@
     
                                            
     
                                            
       
                                            {{_i}}Pills with dropdowns{{/i}}
                                            
-      
                                              
+      
 
                                              -<ul class="nav pills">
+<ul class="nav nav-pills">
   <li class="dropdown">
     <a class="dropdown-toggle"
        data-toggle="dropdown"
@@ -440,7 +440,7 @@
       
                                              {{_i}}Example nav list{{/i}}
                                              
       
                                              {{_i}}Take a list of links and add class="nav list":{{/i}}
                                              
       
                                              
-        
                                               
 
                                              -<ul class="nav list">
+<ul class="nav nav-list">
   <li class="nav-header">
     {{_i}}List header{{/i}}
   </li>
@@ -470,7 +470,7 @@
       
                                              {{_i}}Example with icons{{/i}}
                                              
       
                                              {{_i}}Same example, but with <i> tags for icons.{{/i}}
                                              
       
                                              
-        
                                               
 
                                              -<ul class="nav list">
+<ul class="nav nav-list">
   ...
   <li>
     <a href="#">
@@ -508,7 +508,7 @@
       
                                              {{_i}}Tabbable example{{/i}}
                                              
       
                                              {{_i}}To make tabs tabbable, wrap the .tabs in another div with class .tabbable.{{/i}}
                                              
       
                                              
-        
                                                
+        
                                                  
           
                                                • {{_i}}Section 1{{/i}}
                                                  • 
           
                                                • {{_i}}Section 2{{/i}}
                                                  • 
           
                                                • {{_i}}Section 3{{/i}}
                                                  • 
@@ -537,7 +537,7 @@
   
                                                  {{_i}}Using tabbable tabs requires a wrapping div, a set of tabs, and a set of tabbable panes of content.{{/i}}
                                                  
 
                                                   <div class="tabbable">
-  <ul class="nav tabs">
+  <ul class="nav nav-tabs">
     <li class="active"><a href="#1" data-toggle="tab">{{_i}}Section 1{{/i}}</a></li>
     <li><a href="#2" data-toggle="tab">{{_i}}Section 2{{/i}}</a></li>
   </ul>
@@ -569,7 +569,7 @@
             
                                                  {{_i}}What up girl, this is Section C.{{/i}}
                                                  
           
                                              
         
                                            
-        
                                           
 
                                           <div class="tabbable tabs-below">
-  <ul class="nav tabs">
-    ...
-  </ul>
   <div class="tab-content">
     ...
   </div>
+  <ul class="nav nav-tabs">
+    ...
+  </ul>
 </div>
 
                                          
     
                                    
@@ -590,7 +590,7 @@
       
                                    {{_i}}Tabs on the left{{/i}}
                                    
       
                                    {{_i}}Swap the class to put tabs on the left.{{/i}}
                                    
       
                                    
-        
                                     
 
                                     <div class="tabbable tabs-left">
-  <ul class="nav tabs">
+  <ul class="nav nav-tabs">
     ...
   </ul>
   <div class="tab-content">
@@ -622,7 +622,7 @@
       
                                    {{_i}}Tabs on the right{{/i}}
                                    
       
                                    {{_i}}Swap the class to put tabs on the right.{{/i}}
                                    
       
                                    
-        
                                     
 
                                     <div class="tabbable tabs-right">
-  <ul class="nav tabs">
+  <ul class="nav nav-tabs">
     ...
   </ul>
   <div class="tab-content">
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 9160e895b..da91b1159 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -4,7 +4,7 @@
   
                                    {{_i}}Customize and download{{/i}}
                                    
   
                                    {{_i}}Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}
                                    
   
                                    
-    
                                      
+    
                                        
       
                                      • {{_i}}1. Choose components{{/i}}
                                        • 
       
                                      • {{_i}}2. Select jQuery plugins{{/i}}
                                        • 
       
                                      • {{_i}}3. Customize variables{{/i}}
                                        • 
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 9b787fb1b..716a2b3fa 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -4,7 +4,7 @@
         
                                        {{_i}}Javascript for Bootstrap{{/i}}
                                        
         
                                        {{_i}}Bring Bootstrap's components to life—now with 12 custom jQuery plugins.{{/i}}
         
                                        
-          
                                          
+          
                                            
             
                                          • {{_i}}All plugins{{/i}}
                                            • 
             
                                          • {{_i}}Modal{{/i}}
                                            • 
             
                                          • {{_i}}Dropdown{{/i}}
                                            • 
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 15c438b97..40d368c66 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -4,7 +4,7 @@
         
                                            {{_i}}Scaffolding{{/i}}
                                            
         
                                            {{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}
                                            
         
                                            
-          
                                              
+          
                                                
             
                                              • {{_i}}Grid system{{/i}}
                                                • 
             
                                              • {{_i}}Layouts{{/i}}
                                                • 
             
                                              • {{_i}}Responsive design{{/i}}
                                                • 
diff --git a/less/navs.less b/less/navs.less
index aa718cd74..dfb2996f0 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -26,35 +26,35 @@
 // NAV LIST
 // --------
 
-.nav.list {
+.nav-list {
   padding-left: 14px;
   padding-right: 14px;
   margin-bottom: 0;
 }
-.nav.list > li > a,
-.nav.list .nav-header {
+.nav-list > li > a,
+.nav-list .nav-header {
   display: block;
   padding: 3px 15px;
   margin-left:  -15px;
   margin-right: -15px;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
 }
-.nav.list .nav-header {
+.nav-list .nav-header {
   font-size: 11px;
   font-weight: bold;
   line-height: @baseLineHeight;
   color: @grayLight;
   text-transform: uppercase;
 }
-.nav.list > li + .nav-header {
+.nav-list > li + .nav-header {
   margin-top: 9px;
 }
-.nav.list .active > a {
+.nav-list .active > a {
   color: @white;
   text-shadow: 0 -1px 0 rgba(0,0,0,.2);
   background-color: @linkColor;
 }
-.nav.list .icon {
+.nav-list .icon {
   margin-right: 2px;
 }
 
@@ -64,16 +64,16 @@
 // -------------
 
 // Common styles
-.tabs,
-.pills {
+.nav-tabs,
+.nav-pills {
   .clearfix();
 }
-.tabs > li,
-.pills > li {
+.nav-tabs > li,
+.nav-pills > li {
   float: left;
 }
-.tabs > li > a,
-.pills > li > a {
+.nav-tabs > li > a,
+.nav-pills > li > a {
   padding-right: 12px;
   padding-left: 12px;
   margin-right: 2px;
@@ -84,17 +84,17 @@
 // ----
 
 // Give the tabs something to sit on
-.tabs {
+.nav-tabs {
   border-bottom: 1px solid #ddd;
 }
 
 // Make the list-items overlay the bottom border
-.tabs > li {
+.nav-tabs > li {
   margin-bottom: -1px;
 }
 
 // Actual tabs (as links)
-.tabs > li > a {
+.nav-tabs > li > a {
   padding-top: 9px;
   padding-bottom: 9px;
   border: 1px solid transparent;
@@ -104,8 +104,8 @@
   }
 }
 // Active state, and it's :hover to override normal :hover
-.tabs > .active > a,
-.tabs > .active > a:hover {
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover {
   color: @gray;
   background-color: @white;
   border: 1px solid #ddd;
@@ -117,7 +117,7 @@
 // -----
 
 // Links rendered as pills
-.pills > li > a {
+.nav-pills > li > a {
   padding-top: 8px;
   padding-bottom: 8px;
   margin-top: 2px;
@@ -126,8 +126,8 @@
 }
 
 // Active state
-.pills .active > a,
-.pills .active > a:hover {
+.nav-pills .active > a,
+.nav-pills .active > a:hover {
   color: @white;
   background-color: @linkColor;
 }
@@ -138,37 +138,37 @@
 // -----------
 
 // Stacked tabs and pills
-.nav.stacked > li {
+.nav-stacked > li {
   float: none;
 }
-.nav.stacked > li > a {
+.nav-stacked > li > a {
   margin-right: 0; // no need for the gap between nav items
 }
 
 // Tabs
-.tabs.stacked {
+.nav-tabs.nav-stacked {
   border-bottom: 0;
 }
-.tabs.stacked > li > a {
+.nav-tabs.nav-stacked > li > a {
   border: 1px solid #ddd;
   .border-radius(0);
 }
-.tabs.stacked > li:first-child > a {
+.nav-tabs.nav-stacked > li:first-child > a {
   .border-radius(4px 4px 0 0);
 }
-.tabs.stacked > li:last-child > a {
+.nav-tabs.nav-stacked > li:last-child > a {
   .border-radius(0 0 4px 4px);
 }
-.tabs.stacked > li > a:hover {
+.nav-tabs.nav-stacked > li > a:hover {
   border-color: #ddd;
   z-index: 2;
 }
 
 // Pills
-.pills.stacked > li > a {
+.nav-pills.nav-stacked > li > a {
   margin-bottom: 3px;
 }
-.pills.stacked > li:last-child > a {
+.nav-pills.nav-stacked > li:last-child > a {
   margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
 }
 
@@ -178,32 +178,32 @@
 // ---------
 
 // Position the menu
-.pills .dropdown-menu,
-.tabs .dropdown-menu {
+.nav-tabs .dropdown-menu,
+.nav-pills .dropdown-menu {
   margin-top: 1px;
   border-width: 1px;
 }
-.pills .dropdown-menu {
+.nav-pills .dropdown-menu {
   .border-radius(4px);
 }
 
 // Default dropdown links
 // -------------------------
 // Make carets use linkColor to start
-.tabs .dropdown-toggle .caret,
-.pills .dropdown-toggle .caret {
+.nav-tabs .dropdown-toggle .caret,
+.nav-pills .dropdown-toggle .caret {
   border-top-color: @linkColor;
   margin-top: 6px;
 }
-.tabs .dropdown-toggle:hover .caret,
-.pills .dropdown-toggle:hover .caret {
+.nav-tabs .dropdown-toggle:hover .caret,
+.nav-pills .dropdown-toggle:hover .caret {
   border-top-color: @linkColorHover;
 }
 
 // Active dropdown links
 // -------------------------
-.tabs .active .dropdown-toggle .caret,
-.pills .active .dropdown-toggle .caret {
+.nav-tabs .active .dropdown-toggle .caret,
+.nav-pills .active .dropdown-toggle .caret {
   border-top-color: @grayDark;
 }
 
@@ -216,8 +216,8 @@
 
 // Open dropdowns
 // -------------------------
-.tabs .open .dropdown-toggle,
-.pills .open .dropdown-toggle,
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
 .nav > .open.active > a:hover {
   color: @white;
   background-color: @grayLight;
@@ -231,7 +231,7 @@
 }
 
 // Dropdowns in stacked tabs
-.tabs.stacked .open > a:hover {
+.tabs-stacked .open > a:hover {
   border-color: @grayLight;
 }
 
@@ -250,9 +250,9 @@
 }
 
 // Remove border on bottom, left, right
-.tabs-below .tabs,
-.tabs-right .tabs,
-.tabs-left .tabs {
+.tabs-below .nav-tabs,
+.tabs-right .nav-tabs,
+.tabs-left .nav-tabs {
   border-bottom: 0;
 }
 
@@ -270,22 +270,22 @@
 // BOTTOM
 // ------
 
-.tabs-below .tabs {
+.tabs-below .nav-tabs {
   border-top: 1px solid #ddd;
 }
-.tabs-below .tabs > li {
+.tabs-below .nav-tabs > li {
   margin-top: -1px;
   margin-bottom: 0;
 }
-.tabs-below .tabs > li > a {
+.tabs-below .nav-tabs > li > a {
   .border-radius(0 0 4px 4px);
   &:hover {
     border-bottom-color: transparent;
     border-top-color: #ddd;
   }
 }
-.tabs-below .tabs .active > a,
-.tabs-below .tabs .active > a:hover {
+.tabs-below .nav-tabs .active > a,
+.tabs-below .nav-tabs .active > a:hover {
   border-color: transparent #ddd #ddd #ddd;
 }
 
@@ -293,51 +293,51 @@
 // ------------
 
 // Common styles
-.tabs-left .tabs > li,
-.tabs-right .tabs > li {
+.tabs-left .nav-tabs > li,
+.tabs-right .nav-tabs > li {
   float: none;
 }
-.tabs-left .tabs > li > a,
-.tabs-right .tabs > li > a {
+.tabs-left .nav-tabs > li > a,
+.tabs-right .nav-tabs > li > a {
   min-width: 74px;
   margin-right: 0;
   margin-bottom: 3px;
 }
 
 // Tabs on the left
-.tabs-left .tabs {
+.tabs-left .nav-tabs {
   float: left;
   margin-right: 19px;
   border-right: 1px solid #ddd;
 }
-.tabs-left .tabs > li > a {
+.tabs-left .nav-tabs > li > a {
   margin-right: -1px;
   .border-radius(4px 0 0 4px);
 }
-.tabs-left .tabs > li > a:hover {
+.tabs-left .nav-tabs > li > a:hover {
   border-color: @grayLighter #ddd @grayLighter @grayLighter;
 }
-.tabs-left .tabs .active > a,
-.tabs-left .tabs .active > a:hover {
+.tabs-left .nav-tabs .active > a,
+.tabs-left .nav-tabs .active > a:hover {
   border-color: #ddd transparent #ddd #ddd;
   *border-right-color: @white;
 }
 
 // Tabs on the right
-.tabs-right .tabs {
+.tabs-right .nav-tabs {
   float: right;
   margin-left: 19px;
   border-left: 1px solid #ddd;
 }
-.tabs-right .tabs > li > a {
+.tabs-right .nav-tabs > li > a {
   margin-left: -1px;
   .border-radius(0 4px 4px 0);
 }
-.tabs-right .tabs > li > a:hover {
+.tabs-right .nav-tabs > li > a:hover {
   border-color: @grayLighter @grayLighter @grayLighter #ddd;
 }
-.tabs-right .tabs .active > a,
-.tabs-right .tabs .active > a:hover {
+.tabs-right .nav-tabs .active > a,
+.tabs-right .nav-tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
   *border-left-color: @white;
 }
-- 
cgit v1.2.3


From 47a68ae3aa8cad828eebe529403b46210c9d9d16 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 22:57:00 -0800
Subject: update icons everywhere to be scoped per other components, fix broken
 elements on js docs page

---
 docs/assets/bootstrap.zip                | Bin 52329 -> 52298 bytes
 docs/assets/css/bootstrap.css            | 254 +++++++++++++-------------
 docs/assets/css/docs.css                 |   6 +-
 docs/base-css.html                       | 297 ++++++++++++++++---------------
 docs/components.html                     |  14 +-
 docs/javascript.html                     |   4 +-
 docs/templates/pages/base-css.mustache   | 289 +++++++++++++++---------------
 docs/templates/pages/components.mustache |  14 +-
 docs/templates/pages/javascript.mustache |   4 +-
 less/sprites.less                        | 265 +++++++++++++--------------
 10 files changed, 575 insertions(+), 572 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index e5a745be6..a9b2dba5a 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 60e54ce9d..2ffef9edf 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1112,380 +1112,380 @@ table .span12 {
   width: 924px;
   margin-left: 0;
 }
-.icon {
-  background-image: url(../img/glyphicons-halflings.png);
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
+.i {
   display: inline-block;
-  vertical-align: text-top;
   width: 14px;
   height: 14px;
+  vertical-align: text-top;
+  background-image: url(../img/glyphicons-halflings.png);
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
   *margin-right: .3em;
 }
-.icon:last-child {
+.i:last-child {
   *margin-left: 0;
 }
-.icon.white {
+.i-white {
   background-image: url(../img/glyphicons-halflings-white.png);
 }
-.icon.glass {
+.i-glass {
   background-position: 0      0;
 }
-.icon.music {
+.i-music {
   background-position: -24px 0;
 }
-.icon.search {
+.i-search {
   background-position: -48px 0;
 }
-.icon.envelope {
+.i-envelope {
   background-position: -72px 0;
 }
-.icon.heart {
+.i-heart {
   background-position: -96px 0;
 }
-.icon.star {
+.i-star {
   background-position: -120px 0;
 }
-.icon.star-empty {
+.i-star-empty {
   background-position: -144px 0;
 }
-.icon.user {
+.i-user {
   background-position: -168px 0;
 }
-.icon.film {
+.i-film {
   background-position: -192px 0;
 }
-.icon.th-large {
+.i-th-large {
   background-position: -216px 0;
 }
-.icon.th {
+.i-th {
   background-position: -240px 0;
 }
-.icon.th-list {
+.i-th-list {
   background-position: -264px 0;
 }
-.icon.ok {
+.i-ok {
   background-position: -288px 0;
 }
-.icon.remove {
+.i-remove {
   background-position: -312px 0;
 }
-.icon.zoom-in {
+.i-zoom-in {
   background-position: -336px 0;
 }
-.icon.zoom-out {
+.i-zoom-out {
   background-position: -360px 0;
 }
-.icon.off {
+.i-off {
   background-position: -384px 0;
 }
-.icon.signal {
+.i-signal {
   background-position: -408px 0;
 }
-.icon.cog {
+.i-cog {
   background-position: -432px 0;
 }
-.icon.trash {
+.i-trash {
   background-position: -456px 0;
 }
-.icon.home {
+.i-home {
   background-position: 0 -24px;
 }
-.icon.file {
+.i-file {
   background-position: -24px -24px;
 }
-.icon.time {
+.i-time {
   background-position: -48px -24px;
 }
-.icon.road {
+.i-road {
   background-position: -72px -24px;
 }
-.icon.download-alt {
+.i-download-alt {
   background-position: -96px -24px;
 }
-.icon.download {
+.i-download {
   background-position: -120px -24px;
 }
-.icon.upload {
+.i-upload {
   background-position: -144px -24px;
 }
-.icon.inbox {
+.i-inbox {
   background-position: -168px -24px;
 }
-.icon.play-circle {
+.i-play-circle {
   background-position: -192px -24px;
 }
-.icon.repeat {
+.i-repeat {
   background-position: -216px -24px;
 }
-.icon.refresh {
+.i-refresh {
   background-position: -240px -24px;
 }
-.icon.list-alt {
+.i-list-alt {
   background-position: -264px -24px;
 }
-.icon.lock {
+.i-lock {
   background-position: -287px -24px;
 }
-.icon.flag {
+.i-flag {
   background-position: -312px -24px;
 }
-.icon.headphones {
+.i-headphones {
   background-position: -336px -24px;
 }
-.icon.volume-off {
+.i-volume-off {
   background-position: -360px -24px;
 }
-.icon.volume-down {
+.i-volume-down {
   background-position: -384px -24px;
 }
-.icon.volume-up {
+.i-volume-up {
   background-position: -408px -24px;
 }
-.icon.qrcode {
+.i-qrcode {
   background-position: -432px -24px;
 }
-.icon.barcode {
+.i-barcode {
   background-position: -456px -24px;
 }
-.icon.tag {
+.i-tag {
   background-position: 0 -48px;
 }
-.icon.tags {
+.i-tags {
   background-position: -25px -48px;
 }
-.icon.book {
+.i-book {
   background-position: -48px -48px;
 }
-.icon.bookmark {
+.i-bookmark {
   background-position: -72px -48px;
 }
-.icon.print {
+.i-print {
   background-position: -96px -48px;
 }
-.icon.camera {
+.i-camera {
   background-position: -120px -48px;
 }
-.icon.font {
+.i-font {
   background-position: -144px -48px;
 }
-.icon.bold {
+.i-bold {
   background-position: -167px -48px;
 }
-.icon.italic {
+.i-italic {
   background-position: -192px -48px;
 }
-.icon.text-height {
+.i-text-height {
   background-position: -216px -48px;
 }
-.icon.text-width {
+.i-text-width {
   background-position: -240px -48px;
 }
-.icon.align-left {
+.i-align-left {
   background-position: -264px -48px;
 }
-.icon.align-center {
+.i-align-center {
   background-position: -288px -48px;
 }
-.icon.align-right {
+.i-align-right {
   background-position: -312px -48px;
 }
-.icon.align-justify {
+.i-align-justify {
   background-position: -336px -48px;
 }
-.icon.list {
+.i-list {
   background-position: -360px -48px;
 }
-.icon.indent-left {
+.i-indent-left {
   background-position: -384px -48px;
 }
-.icon.indent-right {
+.i-indent-right {
   background-position: -408px -48px;
 }
-.icon.facetime-video {
+.i-facetime-video {
   background-position: -432px -48px;
 }
-.icon.picture {
+.i-picture {
   background-position: -456px -48px;
 }
-.icon.pencil {
+.i-pencil {
   background-position: 0 -72px;
 }
-.icon.map-marker {
+.i-map-marker {
   background-position: -24px -72px;
 }
-.icon.adjust {
+.i-adjust {
   background-position: -48px -72px;
 }
-.icon.tint {
+.i-tint {
   background-position: -72px -72px;
 }
-.icon.edit {
+.i-edit {
   background-position: -96px -72px;
 }
-.icon.share {
+.i-share {
   background-position: -120px -72px;
 }
-.icon.check {
+.i-check {
   background-position: -144px -72px;
 }
-.icon.move {
+.i-move {
   background-position: -168px -72px;
 }
-.icon.step-backward {
+.i-step-backward {
   background-position: -192px -72px;
 }
-.icon.fast-backward {
+.i-fast-backward {
   background-position: -216px -72px;
 }
-.icon.backward {
+.i-backward {
   background-position: -240px -72px;
 }
-.icon.play {
+.i-play {
   background-position: -264px -72px;
 }
-.icon.pause {
+.i-pause {
   background-position: -288px -72px;
 }
-.icon.stop {
+.i-stop {
   background-position: -312px -72px;
 }
-.icon.forward {
+.i-forward {
   background-position: -336px -72px;
 }
-.icon.fast-forward {
+.i-fast-forward {
   background-position: -360px -72px;
 }
-.icon.step-forward {
+.i-step-forward {
   background-position: -384px -72px;
 }
-.icon.eject {
+.i-eject {
   background-position: -408px -72px;
 }
-.icon.chevron-left {
+.i-chevron-left {
   background-position: -432px -72px;
 }
-.icon.chevron-right {
+.i-chevron-right {
   background-position: -456px -72px;
 }
-.icon.plus-sign {
+.i-plus-sign {
   background-position: 0 -96px;
 }
-.icon.minus-sign {
+.i-minus-sign {
   background-position: -24px -96px;
 }
-.icon.remove-sign {
+.i-remove-sign {
   background-position: -48px -96px;
 }
-.icon.ok-sign {
+.i-ok-sign {
   background-position: -72px -96px;
 }
-.icon.question-sign {
+.i-question-sign {
   background-position: -96px -96px;
 }
-.icon.info-sign {
+.i-info-sign {
   background-position: -120px -96px;
 }
-.icon.screenshot {
+.i-screenshot {
   background-position: -144px -96px;
 }
-.icon.remove-circle {
+.i-remove-circle {
   background-position: -168px -96px;
 }
-.icon.ok-circle {
+.i-ok-circle {
   background-position: -192px -96px;
 }
-.icon.ban-circle {
+.i-ban-circle {
   background-position: -216px -96px;
 }
-.icon.arrow-left {
+.i-arrow-left {
   background-position: -240px -96px;
 }
-.icon.arrow-right {
+.i-arrow-right {
   background-position: -264px -96px;
 }
-.icon.arrow-up {
+.i-arrow-up {
   background-position: -289px -96px;
 }
-.icon.arrow-down {
+.i-arrow-down {
   background-position: -312px -96px;
 }
-.icon.share-alt {
+.i-share-alt {
   background-position: -336px -96px;
 }
-.icon.resize-full {
+.i-resize-full {
   background-position: -360px -96px;
 }
-.icon.resize-small {
+.i-resize-small {
   background-position: -384px -96px;
 }
-.icon.plus {
+.i-plus {
   background-position: -408px -96px;
 }
-.icon.minus {
+.i-minus {
   background-position: -433px -96px;
 }
-.icon.asterisk {
+.i-asterisk {
   background-position: -456px -96px;
 }
-.icon.exclamation-sign {
+.i-exclamation-sign {
   background-position: 0 -120px;
 }
-.icon.gift {
+.i-gift {
   background-position: -24px -120px;
 }
-.icon.leaf {
+.i-leaf {
   background-position: -48px -120px;
 }
-.icon.fire {
+.i-fire {
   background-position: -72px -120px;
 }
-.icon.eye-open {
+.i-eye-open {
   background-position: -96px -120px;
 }
-.icon.eye-close {
+.i-eye-close {
   background-position: -120px -120px;
 }
-.icon.warning-sign {
+.i-warning-sign {
   background-position: -144px -120px;
 }
-.icon.plane {
+.i-plane {
   background-position: -168px -120px;
 }
-.icon.calendar {
+.i-calendar {
   background-position: -192px -120px;
 }
-.icon.random {
+.i-random {
   background-position: -216px -120px;
 }
-.icon.comment {
+.i-comment {
   background-position: -240px -120px;
 }
-.icon.magnet {
+.i-magnet {
   background-position: -264px -120px;
 }
-.icon.chevron-up {
+.i-chevron-up {
   background-position: -288px -120px;
 }
-.icon.chevron-down {
+.i-chevron-down {
   background-position: -313px -119px;
 }
-.icon.retweet {
+.i-retweet {
   background-position: -336px -120px;
 }
-.icon.shopping-cart {
+.i-shopping-cart {
   background-position: -360px -120px;
 }
-.icon.folder-close {
+.i-folder-close {
   background-position: -384px -120px;
 }
-.icon.folder-open {
+.i-folder-open {
   background-position: -408px -120px;
 }
-.icon.resize-vertical {
+.i-resize-vertical {
   background-position: -432px -119px;
 }
-.icon.resize-horizontal {
+.i-resize-horizontal {
   background-position: -456px -118px;
 }
 .dropdown {
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index a5ad9631a..7b6e4ef3a 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -564,14 +564,14 @@ form.well {
 .the-icons {
   margin-bottom: 18px;
 }
-.the-icons i {
+.the-icons .i {
   display: block;
   margin-bottom: 5px;
 }
-.the-icons i:hover {
+.the-icons .i:hover {
   background-color: rgba(255,0,0,.25);
 }
-.the-icons i:after {
+.the-icons .i:after {
   display: block;
   content: attr(class);
   font-style: normal;
diff --git a/docs/base-css.html b/docs/base-css.html
index 0f97a036a..c71874b3a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1303,142 +1303,142 @@ For example, <code>section</code> should be wrapped as inline.
   
                                                
     
                                                
       
                                                
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                                                
     
                                                
     
                                                
       
                                                
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                                                
     
                                                
     
                                                
       
                                                
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                                                
     
                                                
     
                                                
       
                                                
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                                                
     
                                                
   
                                                
@@ -1452,17 +1452,18 @@ For example, <code>section</code> should be wrapped as inline.
     
                                                
       
                                                Built as a sprite
                                                
       
                                                Instead of making every icon an extra request, we've compiled them into a sprite—a bunch of images in one file that uses CSS to position the images with background-position. This is the same method we use on Twitter.com and it has worked well for us.
                                                
-      
                                                Glyphicons has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit. Please consider doing the same in your projects.
                                                
+      
                                                All icons classes are prefixed with .i- for proper namespacing and scoping, much like our other components. This will help avoid conflicts with other tools.
                                                
+      
                                                Glyphicons has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit here in the docs. Please consider doing the same in your projects.
                                                
     
                                                
     
                                                
       
                                                How to use
                                                
-      
                                                With v2.0.0, we have opted to use an <i> tag for all our icons with a base class of .icon. To use, place the following code just about anywhere:
                                                
+      
                                                With v2.0.0, we have opted to use an <i> tag for all our icons with a base class of .i. To use, place the following code just about anywhere:
                                                
 
                                                -<i class="icon search"></i>
+<i class="i i-search"></i>
 
                                                
       
                                                There are also styles available for inverted (white) icons, made ready with one extra class:
                                                
 
                                                -<i class="icon white search"></i>
+<i class="i i-search i-white"></i>
 
                                                
       
                                                There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
                                                
     
                                                
@@ -1485,41 +1486,41 @@ For example, <code>section</code> should be wrapped as inline.
     
                                                
       
                                                
         
                                                
-          
-          
-          
-          
+          
+          
+          
+          
         
                                                
         
                                                
            User
           
           
         
                                                
       
                                                
       
                                                
-         Refresh
-         Checkout
-         Delete
+         Refresh
+         Checkout
+         Delete
       
                                                
       
                                                
-         Comment
-         Settings
-         More Info
+         Comment
+         Settings
+         More Info
       
                                                
     
                                                
     
                                                
       
                                                
-        
                                                 
     
                                                
@@ -1529,7 +1530,7 @@ For example, <code>section</code> should be wrapped as inline.
           
           
                                                
             
                                                
-              
+              
               
             
                                                
           
                                                
diff --git a/docs/components.html b/docs/components.html
index 02b50211e..26fa9b7f5 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -548,13 +548,13 @@
       
                                                
         
       
                                                 
 
                                                @@ -562,7 +562,7 @@
   ...
   <li>
     <a href="#">
-      <i class="icon book"></i>
+      <i class="i i-book"></i>
       Library
     </a>
   </li>
diff --git a/docs/javascript.html b/docs/javascript.html
index 9781f3bc0..0c064a6ac 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -412,7 +412,7 @@ $('#myModal').on('hidden', function () {
             
                                            
           
                                         
 
-          
                                     
 
-          
                                      
+          
                                        
             
                                      • {{_i}}Regular link{{/i}}
                                        • 
             
                                      • 
               {{_i}}Dropdown{{/i}} 
@@ -516,7 +516,7 @@ $('#myModal').on('hidden', function () {
         
                                        
           
                                        {{_i}}Example tabs{{/i}}
                                        
           
                                        {{_i}}Click the tabs below to toggle between hidden panes, even via dropdown menus.{{/i}}
                                        
-          
                                        
     
                                        
       
                                        Fluid layout
                                        
-      
                                        <div class="fluid-container"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.
                                        
+      
                                        <div class="container-fluid"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.
                                        
       
                                        
         
                                        
         
                                        
       
                                        
 
                                        -<body>
-  <div class="fluid-container sidebar-left">
-    <div class="fluid-sidebar">
-      ...
+<div class="container-fluid">
+  <div class="row-fluid">
+    <div class="span2">
+      <!--Sidebar content-->
     </div>
-    <div class="fluid-content">
-      ...
+    <div class="span10">
+      <!--Body content-->
     </div>
   </div>
-</body>
+</div>
 
                                        
     
                                        
   
                                
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 40d368c66..d192709c3 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -202,22 +202,22 @@
     
                            
     
                            
       
                            {{_i}}Fluid layout{{/i}}
                            
-      
                            {{_i}}<div class="fluid-container"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}
                            
+      
                            {{_i}}<div class="container-fluid"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}
                            
       
                            
         
                            
         
                            
       
                            
 
                            -<body>
-  <div class="fluid-container sidebar-left">
-    <div class="fluid-sidebar">
-      ...
+<div class="container-fluid">
+  <div class="row-fluid">
+    <div class="span2">
+      <!--{{_i}}Sidebar content{{/i}}-->
     </div>
-    <div class="fluid-content">
-      ...
+    <div class="span10">
+      <!--{{_i}}Body content{{/i}}-->
     </div>
   </div>
-</body>
+</div>
 
                            
     
                            
   
                        
-- 
cgit v1.2.3


From 5c9a687665f7851435e29b28afb02b450a5903a4 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 23:16:27 -0800
Subject: fix button styles on active and disabled

---
 docs/assets/bootstrap.zip     | Bin 52273 -> 52270 bytes
 docs/assets/css/bootstrap.css |   4 ++--
 less/buttons.less             |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2b0aa987a..a47ed64a3 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2ffef9edf..e1413d440 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1700,7 +1700,7 @@ table .span12 {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-.btn-active, .btn:active {
+.btn.active, .btn:active {
   background-image: none;
   -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
@@ -1710,7 +1710,7 @@ table .span12 {
   color: rgba(0, 0, 0, 0.5);
   outline: 0;
 }
-.btn-disabled, .btn[disabled] {
+.btn.disabled, .btn[disabled] {
   cursor: default;
   background-image: none;
   background-color: #e6e6e6;
diff --git a/less/buttons.less b/less/buttons.less
index 48cfa7560..07a2b5879 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -44,7 +44,7 @@
 }
 
 // Active state
-.btn-active,
+.btn.active,
 .btn:active {
   background-image: none;
   @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
@@ -56,7 +56,7 @@
 }
 
 // Disabled state
-.btn-disabled,
+.btn.disabled,
 .btn[disabled] {
   cursor: default;
   background-image: none;
-- 
cgit v1.2.3


From de994efac76aa9f3955c150115ff3ea75d084c1c Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 23:17:05 -0800
Subject: fix the other disabled button style

---
 docs/assets/bootstrap.zip | Bin 52270 -> 52270 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index a47ed64a3..483251b92 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
-- 
cgit v1.2.3


From d533310bd2fa157edb076f9047af8f1cff0fca05 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 23:24:35 -0800
Subject: once more, overhaul the icons and use the css regex selector on our
 icons

---
 docs/assets/bootstrap.zip                | Bin 52270 -> 52284 bytes
 docs/assets/css/bootstrap.css            |   4 +-
 docs/assets/css/docs.css                 |   6 +-
 docs/base-css.html                       | 288 +++++++++++++++----------------
 docs/components.html                     |  14 +-
 docs/templates/pages/base-css.mustache   | 280 +++++++++++++++---------------
 docs/templates/pages/components.mustache |  14 +-
 less/sprites.less                        |   2 +-
 8 files changed, 304 insertions(+), 304 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 483251b92..61babf125 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e1413d440..2fe20c332 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1112,7 +1112,7 @@ table .span12 {
   width: 924px;
   margin-left: 0;
 }
-.i {
+[class*="i-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
@@ -1122,7 +1122,7 @@ table .span12 {
   background-repeat: no-repeat;
   *margin-right: .3em;
 }
-.i:last-child {
+[class*="i-"]:last-child {
   *margin-left: 0;
 }
 .i-white {
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 9d07f3c44..cc64d3166 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -564,14 +564,14 @@ form.well {
 .the-icons {
   margin-bottom: 18px;
 }
-.the-icons .i {
+.the-icons i {
   display: block;
   margin-bottom: 5px;
 }
-.the-icons .i:hover {
+.the-icons i:hover {
   background-color: rgba(255,0,0,.25);
 }
-.the-icons .i:after {
+.the-icons i:after {
   display: block;
   content: attr(class);
   font-style: normal;
diff --git a/docs/base-css.html b/docs/base-css.html
index c71874b3a..654775fc1 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1303,142 +1303,142 @@ For example, <code>section</code> should be wrapped as inline.
   
                        
     
                        
       
                        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                        
     
                        
     
                        
       
                        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                        
     
                        
     
                        
       
                        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                        
     
                        
     
                        
       
                        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                        
     
                        
   
                        
@@ -1457,13 +1457,13 @@ For example, <code>section</code> should be wrapped as inline.
     
                    
     
                    
       
                    How to use
                    
-      
                    With v2.0.0, we have opted to use an <i> tag for all our icons with a base class of .i. To use, place the following code just about anywhere:
                    
+      
                    With v2.0.0, we have opted to use an <i> tag for all our icons, but they have no case class—only a shared prefix. To use, place the following code just about anywhere:
                    
 
                    -<i class="i i-search"></i>
+<i class="i-search"></i>
 
                    
       
                    There are also styles available for inverted (white) icons, made ready with one extra class:
                    
 
                    -<i class="i i-search i-white"></i>
+<i class="i-search i-white"></i>
 
                    
       
                    There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.
                    
     
                    
@@ -1486,40 +1486,40 @@ For example, <code>section</code> should be wrapped as inline.
     
                    
       
                    
         
                    
-          
-          
-          
-          
+          
+          
+          
+          
         
                    
         
                    
            User
           
           
         
                    
       
                    
       
                    
-         Refresh
-         Checkout
-         Delete
+         Refresh
+         Checkout
+         Delete
       
                    
       
                    
-         Comment
-         Settings
-         More Info
+         Comment
+         Settings
+         More Info
       
                    
     
                    
     
                    
       
                    
         
       
                     
@@ -1530,7 +1530,7 @@ For example, <code>section</code> should be wrapped as inline.
           
           
                    
             
                    
-              
+              
               
             
                    
           
                    
diff --git a/docs/components.html b/docs/components.html
index 26fa9b7f5..a26fed219 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -548,13 +548,13 @@
       
                    
         
       
                     
 
                    @@ -562,7 +562,7 @@
   ...
   <li>
     <a href="#">
-      <i class="i i-book"></i>
+      <i class="i-book"></i>
       Library
     </a>
   </li>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 31607eef9..7b174d604 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1227,142 +1227,142 @@
   
                    
     
                    
       
                    
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
 
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                    
     
                    
     
                    
       
                    
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
 
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                    
     
                    
     
                    
       
                    
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
 
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                    
     
                    
     
                    
       
                    
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
 
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
       
                    
     
                    
   
                    
@@ -1381,13 +1381,13 @@
     
                    
     
                    
       
                    {{_i}}How to use{{/i}}
                    
-      
                    {{_i}}With v2.0.0, we have opted to use an <i> tag for all our icons with a base class of .i. To use, place the following code just about anywhere:{{/i}}
                    
+      
                    {{_i}}With v2.0.0, we have opted to use an <i> tag for all our icons, but they have no case class—only a shared prefix. To use, place the following code just about anywhere:{{/i}}
                    
 
                    -<i class="i i-search"></i>
+<i class="i-search"></i>
 
                    
       
                    {{_i}}There are also styles available for inverted (white) icons, made ready with one extra class:{{/i}}
                    
 
                    -<i class="i i-search i-white"></i>
+<i class="i-search i-white"></i>
 
                    
       
                    {{_i}}There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.{{/i}}
                    
     
                    
@@ -1410,40 +1410,40 @@
     
                    
       
                    
         
                    
-          
-          
-          
-          
+          
+          
+          
+          
         
                    
         
                    
            {{_i}}User{{/i}}
           
           
         
                    
       
                    
       
                    
-         {{_i}}Refresh{{/i}}
-         {{_i}}Checkout{{/i}}
-         {{_i}}Delete{{/i}}
+         {{_i}}Refresh{{/i}}
+         {{_i}}Checkout{{/i}}
+         {{_i}}Delete{{/i}}
       
                    
       
                    
-         {{_i}}Comment{{/i}}
-         {{_i}}Settings{{/i}}
-         {{_i}}More Info{{/i}}
+         {{_i}}Comment{{/i}}
+         {{_i}}Settings{{/i}}
+         {{_i}}More Info{{/i}}
       
                    
     
                    
     
                    
       
                    
         
       
                     
@@ -1454,7 +1454,7 @@
           
           
                    
             
                    
-              
+              
               
             
                    
           
                    
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 2386f6a9e..69ee4c16a 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -472,13 +472,13 @@
       
                    
         
       
                     
 
                    @@ -486,7 +486,7 @@
   ...
   <li>
     <a href="#">
-      <i class="i i-book"></i>
+      <i class="i-book"></i>
       {{_i}}Library{{/i}}
     </a>
   </li>
diff --git a/less/sprites.less b/less/sprites.less
index c5c8fd725..6e1f1ba9c 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -14,7 +14,7 @@
 // For the white version of the  icons, just add the .i-white class:
 // 
 
-.i {
+[class*="i-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
-- 
cgit v1.2.3


From 4d93b639164f4331dc8b52ae1bcb824dddb97370 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 30 Jan 2012 23:27:58 -0800
Subject: disable cursor on disabled and active pagination links

---
 docs/assets/bootstrap.zip     | Bin 52284 -> 52290 bytes
 docs/assets/css/bootstrap.css |   1 +
 less/pagination.less          |   1 +
 3 files changed, 2 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 61babf125..c8e342106 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2fe20c332..ce589dd80 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2674,6 +2674,7 @@ button.btn.small, input[type="submit"].btn.small {
 }
 .pagination .active a {
   color: #999999;
+  cursor: default;
 }
 .pagination .disabled a, .pagination .disabled a:hover {
   color: #999999;
diff --git a/less/pagination.less b/less/pagination.less
index 8ecb2a401..de5780759 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -30,6 +30,7 @@
 }
 .pagination .active a {
   color: @grayLight;
+  cursor: default;
 }
 .pagination .disabled a,
 .pagination .disabled a:hover {
-- 
cgit v1.2.3


From d633dbb44e40f402c85d4339bb3ac0e7069915eb Mon Sep 17 00:00:00 2001
From: nkryptic 
Date: Tue, 31 Jan 2012 02:54:10 -0500
Subject: add nav- prefix to rest of docs

---
 docs/components.html                     | 10 +++++-----
 docs/templates/pages/components.mustache | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/components.html b/docs/components.html
index a26fed219..a8db82ffb 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -360,7 +360,7 @@
     
                    
     
                    
       
                    Basic tabs
                    
-      
                    Take a regular <ul> of links and add .tabs:
                    
+      
                    Take a regular <ul> of links and add .nav-tabs:
                    
       
                    
     
                    
       
                    Basic pills
                    
-      
                    Take that same HTML, but use .pills instead:
                    
+      
                    Take that same HTML, but use .nav-pills instead:
                    
       
                      
         
                    • Home
                      • 
         
                    • Profile
                      • 
@@ -400,7 +400,7 @@
   
                      
     
                      
       
                      How to stack 'em
                      
-      
                      As tabs and pills are horizontal by default, just add a second class, .stacked, to make them appear vertically stacked.
                      
+      
                      As tabs and pills are horizontal by default, just add a second class, .nav-stacked, to make them appear vertically stacked.
                      
     
                      
     
                      
       
                      Stacked tabs
                      
@@ -514,7 +514,7 @@
     
                      
     
                      
       
                      Example nav list
                      
-      
                      Take a list of links and add class="nav list":
                      
+      
                      Take a list of links and add class="nav nav-list":
                      
       
                      
         
                        
           
                      • List header
                        • 
@@ -582,7 +582,7 @@
     
                      
     
                      
       
                      Tabbable example
                      
-      
                      To make tabs tabbable, wrap the .tabs in another div with class .tabbable.
                      
+      
                      To make tabs tabbable, wrap the .nav-tabs in another div with class .tabbable.
                      
       
                      
         
                        
           
                      • Section 1
                        • 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 69ee4c16a..4bf6c5d48 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -284,7 +284,7 @@
     
                      
     
                      
       
                      {{_i}}Basic tabs{{/i}}
                      
-      
                      {{_i}}Take a regular <ul> of links and add .tabs:{{/i}}
                      
+      
                      {{_i}}Take a regular <ul> of links and add .nav-tabs:{{/i}}
                      
       
                      
     
                      
       
                      {{_i}}Basic pills{{/i}}
                      
-      
                      {{_i}}Take that same HTML, but use .pills instead:{{/i}}
                      
+      
                      {{_i}}Take that same HTML, but use .nav-pills instead:{{/i}}
                      
       
                        
         
                      • {{_i}}Home{{/i}}
                        • 
         
                      • {{_i}}Profile{{/i}}
                        • 
@@ -324,7 +324,7 @@
   
                        
     
                        
       
                        {{_i}}How to stack 'em{{/i}}
                        
-      
                        {{_i}}As tabs and pills are horizontal by default, just add a second class, .stacked, to make them appear vertically stacked.{{/i}}
                        
+      
                        {{_i}}As tabs and pills are horizontal by default, just add a second class, .nav-stacked, to make them appear vertically stacked.{{/i}}
                        
     
                        
     
                        
       
                        {{_i}}Stacked tabs{{/i}}
                        
@@ -438,7 +438,7 @@
     
                        
     
                        
       
                        {{_i}}Example nav list{{/i}}
                        
-      
                        {{_i}}Take a list of links and add class="nav list":{{/i}}
                        
+      
                        {{_i}}Take a list of links and add class="nav nav-list":{{/i}}
                        
       
                        
         
                          
           
                        • {{_i}}List header{{/i}}
                          • 
@@ -506,7 +506,7 @@
     
                        
     
                        
       
                        {{_i}}Tabbable example{{/i}}
                        
-      
                        {{_i}}To make tabs tabbable, wrap the .tabs in another div with class .tabbable.{{/i}}
                        
+      
                        {{_i}}To make tabs tabbable, wrap the .nav-tabs in another div with class .tabbable.{{/i}}
                        
       
                        
         
                          
           
                        • {{_i}}Section 1{{/i}}
                          • 
-- 
cgit v1.2.3


From b7713b83fa25f4b28869fe846b04baac00ca781b Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 31 Jan 2012 00:11:19 -0800
Subject: chance icon class

---
 docs/assets/bootstrap.zip                 | Bin 52290 -> 52315 bytes
 docs/assets/css/bootstrap.css             | 250 ++++++++++++-------------
 docs/base-css.html                        | 296 +++++++++++++++---------------
 docs/components.html                      |  34 ++--
 docs/download.html                        |   6 +-
 docs/examples.html                        |   6 +-
 docs/index.html                           |   6 +-
 docs/javascript.html                      |   6 +-
 docs/less.html                            |   6 +-
 docs/scaffolding.html                     |  16 +-
 docs/templates/layout.mustache            |   6 +-
 docs/templates/pages/base-css.mustache    | 282 ++++++++++++++--------------
 docs/templates/pages/components.mustache  |  28 +--
 docs/templates/pages/scaffolding.mustache |  10 +-
 docs/upgrading.html                       |   6 +-
 less/navbar.less                          |   4 +-
 less/sprites.less                         | 250 ++++++++++++-------------
 17 files changed, 606 insertions(+), 606 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c8e342106..c507815f6 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index ce589dd80..7d519a608 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1112,7 +1112,7 @@ table .span12 {
   width: 924px;
   margin-left: 0;
 }
-[class*="i-"] {
+[class*="icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
@@ -1122,370 +1122,370 @@ table .span12 {
   background-repeat: no-repeat;
   *margin-right: .3em;
 }
-[class*="i-"]:last-child {
+[class*="icon-"]:last-child {
   *margin-left: 0;
 }
-.i-white {
+.icon-white {
   background-image: url(../img/glyphicons-halflings-white.png);
 }
-.i-glass {
+.icon-glass {
   background-position: 0      0;
 }
-.i-music {
+.icon-music {
   background-position: -24px 0;
 }
-.i-search {
+.icon-search {
   background-position: -48px 0;
 }
-.i-envelope {
+.icon-envelope {
   background-position: -72px 0;
 }
-.i-heart {
+.icon-heart {
   background-position: -96px 0;
 }
-.i-star {
+.icon-star {
   background-position: -120px 0;
 }
-.i-star-empty {
+.icon-star-empty {
   background-position: -144px 0;
 }
-.i-user {
+.icon-user {
   background-position: -168px 0;
 }
-.i-film {
+.icon-film {
   background-position: -192px 0;
 }
-.i-th-large {
+.icon-th-large {
   background-position: -216px 0;
 }
-.i-th {
+.icon-th {
   background-position: -240px 0;
 }
-.i-th-list {
+.icon-th-list {
   background-position: -264px 0;
 }
-.i-ok {
+.icon-ok {
   background-position: -288px 0;
 }
-.i-remove {
+.icon-remove {
   background-position: -312px 0;
 }
-.i-zoom-in {
+.icon-zoom-in {
   background-position: -336px 0;
 }
-.i-zoom-out {
+.icon-zoom-out {
   background-position: -360px 0;
 }
-.i-off {
+.icon-off {
   background-position: -384px 0;
 }
-.i-signal {
+.icon-signal {
   background-position: -408px 0;
 }
-.i-cog {
+.icon-cog {
   background-position: -432px 0;
 }
-.i-trash {
+.icon-trash {
   background-position: -456px 0;
 }
-.i-home {
+.icon-home {
   background-position: 0 -24px;
 }
-.i-file {
+.icon-file {
   background-position: -24px -24px;
 }
-.i-time {
+.icon-time {
   background-position: -48px -24px;
 }
-.i-road {
+.icon-road {
   background-position: -72px -24px;
 }
-.i-download-alt {
+.icon-download-alt {
   background-position: -96px -24px;
 }
-.i-download {
+.icon-download {
   background-position: -120px -24px;
 }
-.i-upload {
+.icon-upload {
   background-position: -144px -24px;
 }
-.i-inbox {
+.icon-inbox {
   background-position: -168px -24px;
 }
-.i-play-circle {
+.icon-play-circle {
   background-position: -192px -24px;
 }
-.i-repeat {
+.icon-repeat {
   background-position: -216px -24px;
 }
-.i-refresh {
+.icon-refresh {
   background-position: -240px -24px;
 }
-.i-list-alt {
+.icon-list-alt {
   background-position: -264px -24px;
 }
-.i-lock {
+.icon-lock {
   background-position: -287px -24px;
 }
-.i-flag {
+.icon-flag {
   background-position: -312px -24px;
 }
-.i-headphones {
+.icon-headphones {
   background-position: -336px -24px;
 }
-.i-volume-off {
+.icon-volume-off {
   background-position: -360px -24px;
 }
-.i-volume-down {
+.icon-volume-down {
   background-position: -384px -24px;
 }
-.i-volume-up {
+.icon-volume-up {
   background-position: -408px -24px;
 }
-.i-qrcode {
+.icon-qrcode {
   background-position: -432px -24px;
 }
-.i-barcode {
+.icon-barcode {
   background-position: -456px -24px;
 }
-.i-tag {
+.icon-tag {
   background-position: 0 -48px;
 }
-.i-tags {
+.icon-tags {
   background-position: -25px -48px;
 }
-.i-book {
+.icon-book {
   background-position: -48px -48px;
 }
-.i-bookmark {
+.icon-bookmark {
   background-position: -72px -48px;
 }
-.i-print {
+.icon-print {
   background-position: -96px -48px;
 }
-.i-camera {
+.icon-camera {
   background-position: -120px -48px;
 }
-.i-font {
+.icon-font {
   background-position: -144px -48px;
 }
-.i-bold {
+.icon-bold {
   background-position: -167px -48px;
 }
-.i-italic {
+.icon-italic {
   background-position: -192px -48px;
 }
-.i-text-height {
+.icon-text-height {
   background-position: -216px -48px;
 }
-.i-text-width {
+.icon-text-width {
   background-position: -240px -48px;
 }
-.i-align-left {
+.icon-align-left {
   background-position: -264px -48px;
 }
-.i-align-center {
+.icon-align-center {
   background-position: -288px -48px;
 }
-.i-align-right {
+.icon-align-right {
   background-position: -312px -48px;
 }
-.i-align-justify {
+.icon-align-justify {
   background-position: -336px -48px;
 }
-.i-list {
+.icon-list {
   background-position: -360px -48px;
 }
-.i-indent-left {
+.icon-indent-left {
   background-position: -384px -48px;
 }
-.i-indent-right {
+.icon-indent-right {
   background-position: -408px -48px;
 }
-.i-facetime-video {
+.icon-facetime-video {
   background-position: -432px -48px;
 }
-.i-picture {
+.icon-picture {
   background-position: -456px -48px;
 }
-.i-pencil {
+.icon-pencil {
   background-position: 0 -72px;
 }
-.i-map-marker {
+.icon-map-marker {
   background-position: -24px -72px;
 }
-.i-adjust {
+.icon-adjust {
   background-position: -48px -72px;
 }
-.i-tint {
+.icon-tint {
   background-position: -72px -72px;
 }
-.i-edit {
+.icon-edit {
   background-position: -96px -72px;
 }
-.i-share {
+.icon-share {
   background-position: -120px -72px;
 }
-.i-check {
+.icon-check {
   background-position: -144px -72px;
 }
-.i-move {
+.icon-move {
   background-position: -168px -72px;
 }
-.i-step-backward {
+.icon-step-backward {
   background-position: -192px -72px;
 }
-.i-fast-backward {
+.icon-fast-backward {
   background-position: -216px -72px;
 }
-.i-backward {
+.icon-backward {
   background-position: -240px -72px;
 }
-.i-play {
+.icon-play {
   background-position: -264px -72px;
 }
-.i-pause {
+.icon-pause {
   background-position: -288px -72px;
 }
-.i-stop {
+.icon-stop {
   background-position: -312px -72px;
 }
-.i-forward {
+.icon-forward {
   background-position: -336px -72px;
 }
-.i-fast-forward {
+.icon-fast-forward {
   background-position: -360px -72px;
 }
-.i-step-forward {
+.icon-step-forward {
   background-position: -384px -72px;
 }
-.i-eject {
+.icon-eject {
   background-position: -408px -72px;
 }
-.i-chevron-left {
+.icon-chevron-left {
   background-position: -432px -72px;
 }
-.i-chevron-right {
+.icon-chevron-right {
   background-position: -456px -72px;
 }
-.i-plus-sign {
+.icon-plus-sign {
   background-position: 0 -96px;
 }
-.i-minus-sign {
+.icon-minus-sign {
   background-position: -24px -96px;
 }
-.i-remove-sign {
+.icon-remove-sign {
   background-position: -48px -96px;
 }
-.i-ok-sign {
+.icon-ok-sign {
   background-position: -72px -96px;
 }
-.i-question-sign {
+.icon-question-sign {
   background-position: -96px -96px;
 }
-.i-info-sign {
+.icon-info-sign {
   background-position: -120px -96px;
 }
-.i-screenshot {
+.icon-screenshot {
   background-position: -144px -96px;
 }
-.i-remove-circle {
+.icon-remove-circle {
   background-position: -168px -96px;
 }
-.i-ok-circle {
+.icon-ok-circle {
   background-position: -192px -96px;
 }
-.i-ban-circle {
+.icon-ban-circle {
   background-position: -216px -96px;
 }
-.i-arrow-left {
+.icon-arrow-left {
   background-position: -240px -96px;
 }
-.i-arrow-right {
+.icon-arrow-right {
   background-position: -264px -96px;
 }
-.i-arrow-up {
+.icon-arrow-up {
   background-position: -289px -96px;
 }
-.i-arrow-down {
+.icon-arrow-down {
   background-position: -312px -96px;
 }
-.i-share-alt {
+.icon-share-alt {
   background-position: -336px -96px;
 }
-.i-resize-full {
+.icon-resize-full {
   background-position: -360px -96px;
 }
-.i-resize-small {
+.icon-resize-small {
   background-position: -384px -96px;
 }
-.i-plus {
+.icon-plus {
   background-position: -408px -96px;
 }
-.i-minus {
+.icon-minus {
   background-position: -433px -96px;
 }
-.i-asterisk {
+.icon-asterisk {
   background-position: -456px -96px;
 }
-.i-exclamation-sign {
+.icon-exclamation-sign {
   background-position: 0 -120px;
 }
-.i-gift {
+.icon-gift {
   background-position: -24px -120px;
 }
-.i-leaf {
+.icon-leaf {
   background-position: -48px -120px;
 }
-.i-fire {
+.icon-fire {
   background-position: -72px -120px;
 }
-.i-eye-open {
+.icon-eye-open {
   background-position: -96px -120px;
 }
-.i-eye-close {
+.icon-eye-close {
   background-position: -120px -120px;
 }
-.i-warning-sign {
+.icon-warning-sign {
   background-position: -144px -120px;
 }
-.i-plane {
+.icon-plane {
   background-position: -168px -120px;
 }
-.i-calendar {
+.icon-calendar {
   background-position: -192px -120px;
 }
-.i-random {
+.icon-random {
   background-position: -216px -120px;
 }
-.i-comment {
+.icon-comment {
   background-position: -240px -120px;
 }
-.i-magnet {
+.icon-magnet {
   background-position: -264px -120px;
 }
-.i-chevron-up {
+.icon-chevron-up {
   background-position: -288px -120px;
 }
-.i-chevron-down {
+.icon-chevron-down {
   background-position: -313px -119px;
 }
-.i-retweet {
+.icon-retweet {
   background-position: -336px -120px;
 }
-.i-shopping-cart {
+.icon-shopping-cart {
   background-position: -360px -120px;
 }
-.i-folder-close {
+.icon-folder-close {
   background-position: -384px -120px;
 }
-.i-folder-open {
+.icon-folder-open {
   background-position: -408px -120px;
 }
-.i-resize-vertical {
+.icon-resize-vertical {
   background-position: -432px -119px;
 }
-.i-resize-horizontal {
+.icon-resize-horizontal {
   background-position: -456px -118px;
 }
 .dropdown {
@@ -2381,7 +2381,7 @@ button.btn.small, input[type="submit"].btn.small {
 .btn-navbar:active, .btn-navbar.active {
   background-color: #080808 \9;
 }
-.btn-navbar .i-bar {
+.btn-navbar .icon-bar {
   display: block;
   width: 18px;
   height: 2px;
@@ -2393,7 +2393,7 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
   box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
 }
-.btn-navbar .i-bar + .i-bar {
+.btn-navbar .icon-bar + .icon-bar {
   margin-top: 3px;
 }
 .nav-collapse.collapse {
diff --git a/docs/base-css.html b/docs/base-css.html
index 654775fc1..298312edd 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -34,9 +34,9 @@
       
                          
         
                          
           
-            
-            
-            
+            
+            
+            
           
           Bootstrap
           
                          
@@ -931,7 +931,7 @@ For example, <code>section</code> should be wrapped as inline.
             
                          
           
                          
           
                          
-            
+            
             
                          
               
             
                          
           
                          
diff --git a/docs/components.html b/docs/components.html
index a26fed219..af15572dc 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -34,9 +34,9 @@
       
                          
         
                          
           
-            
-            
-            
+            
+            
+            
           
           Bootstrap
           
                          
@@ -548,13 +548,13 @@
       
                          
         
       
                           
 
                          @@ -562,7 +562,7 @@
   ...
   <li>
     <a href="#">
-      <i class="i-book"></i>
+      <i class="icon-book"></i>
       Library
     </a>
   </li>
@@ -744,9 +744,9 @@
     
                          
       
                          
         
-          
-          
-          
+          
+          
+          
         
         Project name
         
                          
@@ -830,9 +830,9 @@
       
       <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
       <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="i-bar"></span>
-        <span class="i-bar"></span>
-        <span class="i-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
       </a>
       
       <!-- Be sure to leave the brand out there if you want it shown -->
@@ -946,7 +946,7 @@
     
                          Pagination Two options for paging through content
                          
   
                          
 
-  
                          Multi-page pagination
                          
+  
                          Multicon-page pagination
                          
   
                          
     
                          
       
                          When to use
                          
diff --git a/docs/download.html b/docs/download.html
index ea096d290..8367e2e83 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -34,9 +34,9 @@
       
                          
         
                          
           
-            
-            
-            
+            
+            
+            
           
           Bootstrap
           
                          
diff --git a/docs/examples.html b/docs/examples.html
index 43c0ad496..83188c77f 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -34,9 +34,9 @@
       
                          
         
                          
           
-            
-            
-            
+            
+            
+            
           
           Bootstrap
           
                          
diff --git a/docs/index.html b/docs/index.html
index 71c2970a0..d74424852 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -34,9 +34,9 @@
       
                          
         
                          
           
-            
-            
-            
+            
+            
+            
           
           Bootstrap
           
                          
diff --git a/docs/javascript.html b/docs/javascript.html
index 0c064a6ac..188d26e34 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -34,9 +34,9 @@
       
                          
         
                          
           
-            
-            
-            
+            
+            
+            
           
           Bootstrap
           
                          
diff --git a/docs/less.html b/docs/less.html
index 996ad31b9..0bc7a71ac 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -34,9 +34,9 @@
       
                          
         
                          
           
-            
-            
-            
+            
+            
+            
           
           Bootstrap
           
                          
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 813ec27ae..e41bb2fb7 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -34,9 +34,9 @@
       
                          
         
                          
           
-            
-            
-            
+            
+            
+            
           
           Bootstrap
           
                          
@@ -265,8 +265,8 @@
     
                          
       
                          Fixed layout
                          
       
                          The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.
                          
-      
                          
-        
                          
+      
                          
+        
                          
       
                          
 
                           <body>
@@ -279,9 +279,9 @@
     
                          
       
                          Fluid layout
                          
       
                          <div class="container-fluid"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.
                          
-      
                          
-        
                          
-        
                          
+      
                          
+        
                          
+        
                          
       
                          
 
                           <div class="container-fluid">
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 6923be7dc..77f584cd1 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -34,9 +34,9 @@
       
                          
         
                          
           
-            
-            
-            
+            
+            
+            
           
           Bootstrap
           
                          
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 7b174d604..4d9533522 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -855,7 +855,7 @@
             
                          
           
                          
           
                          
-            
+            
             
                          
               
             
                          
           
                          
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 69ee4c16a..d26abba7b 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -472,13 +472,13 @@
       
                          
         
       
                           
 
                          @@ -486,7 +486,7 @@
   ...
   <li>
     <a href="#">
-      <i class="i-book"></i>
+      <i class="icon-book"></i>
       {{_i}}Library{{/i}}
     </a>
   </li>
@@ -668,9 +668,9 @@
     
                          
       
                          
         
-          
-          
-          
+          
+          
+          
         
         {{_i}}Project name{{/i}}
         
                          
@@ -754,9 +754,9 @@
       
       <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
       <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="i-bar"></span>
-        <span class="i-bar"></span>
-        <span class="i-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
       </a>
       
       <!-- Be sure to leave the brand out there if you want it shown -->
@@ -870,7 +870,7 @@
     
                          {{_i}}Pagination{{/i}} {{_i}}Two options for paging through content{{/i}}
                          
   
                          
 
-  
                          {{_i}}Multi-page pagination{{/i}}
                          
+  
                          {{_i}}Multicon-page pagination{{/i}}
                          
   
                          
     
                          
       
                          {{_i}}When to use{{/i}}
                          
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index d192709c3..bfbd879d5 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -189,8 +189,8 @@
     
                          
       
                          {{_i}}Fixed layout{{/i}}
                          
       
                          {{_i}}The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.{{/i}}
                          
-      
                          
-        
                          
+      
                          
+        
                          
       
                          
 
                           <body>
@@ -203,9 +203,9 @@
     
                          
       
                          {{_i}}Fluid layout{{/i}}
                          
       
                          {{_i}}<div class="container-fluid"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}
                          
-      
                          
-        
                          
-        
                          
+      
                          
+        
                          
+        
                          
       
                          
 
                           <div class="container-fluid">
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 6e1180f16..0cf2c9d69 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -34,9 +34,9 @@
       
                          
         
                          
           
-            
-            
-            
+            
+            
+            
           
           Bootstrap
           
                          
diff --git a/less/navbar.less b/less/navbar.less
index eb19a2b07..93c0400b6 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -31,7 +31,7 @@
   @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
   .box-shadow(@shadow);
 }
-.btn-navbar .i-bar {
+.btn-navbar .icon-bar {
   display: block;
   width: 18px;
   height: 2px;
@@ -39,7 +39,7 @@
   .border-radius(1px);
   .box-shadow(0 1px 0 rgba(0,0,0,.25));
 }
-.btn-navbar .i-bar + .i-bar {
+.btn-navbar .icon-bar + .icon-bar {
   margin-top: 3px;
 }
 // Override the default collapsed state
diff --git a/less/sprites.less b/less/sprites.less
index 6e1f1ba9c..9a68fe048 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -9,12 +9,12 @@
 // All icons receive the styles of the  tag with a base class 
 // of .i and are then given a unique class to add width, height, 
 // and background-position. Your resulting HTML will look like
-// .
+// .
 
-// For the white version of the  icons, just add the .i-white class:
-// 
+// For the white version of the  icons, just add the .icon-white class:
+// 
 
-[class*="i-"] {
+[class*="icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
@@ -25,132 +25,132 @@
 
   .ie7-restore-right-whitespace();
 }
-.i-white {
+.icon-white {
   background-image: url(../img/glyphicons-halflings-white.png);
 }
 
-.i-glass              { background-position: 0      0; }
-.i-music              { background-position: -24px  0; }
-.i-search             { background-position: -48px  0; }
-.i-envelope           { background-position: -72px  0; }
-.i-heart              { background-position: -96px  0; }
-.i-star               { background-position: -120px 0; }
-.i-star-empty         { background-position: -144px 0; }
-.i-user               { background-position: -168px 0; }
-.i-film               { background-position: -192px 0; }
-.i-th-large           { background-position: -216px 0; }
-.i-th                 { background-position: -240px 0; }
-.i-th-list            { background-position: -264px 0; }
-.i-ok                 { background-position: -288px 0; }
-.i-remove             { background-position: -312px 0; }
-.i-zoom-in            { background-position: -336px 0; }
-.i-zoom-out           { background-position: -360px 0; }
-.i-off                { background-position: -384px 0; }
-.i-signal             { background-position: -408px 0; }
-.i-cog                { background-position: -432px 0; }
-.i-trash              { background-position: -456px 0; }
+.icon-glass              { background-position: 0      0; }
+.icon-music              { background-position: -24px  0; }
+.icon-search             { background-position: -48px  0; }
+.icon-envelope           { background-position: -72px  0; }
+.icon-heart              { background-position: -96px  0; }
+.icon-star               { background-position: -120px 0; }
+.icon-star-empty         { background-position: -144px 0; }
+.icon-user               { background-position: -168px 0; }
+.icon-film               { background-position: -192px 0; }
+.icon-th-large           { background-position: -216px 0; }
+.icon-th                 { background-position: -240px 0; }
+.icon-th-list            { background-position: -264px 0; }
+.icon-ok                 { background-position: -288px 0; }
+.icon-remove             { background-position: -312px 0; }
+.icon-zoom-in            { background-position: -336px 0; }
+.icon-zoom-out           { background-position: -360px 0; }
+.icon-off                { background-position: -384px 0; }
+.icon-signal             { background-position: -408px 0; }
+.icon-cog                { background-position: -432px 0; }
+.icon-trash              { background-position: -456px 0; }
 
-.i-home               { background-position: 0      -24px; }
-.i-file               { background-position: -24px  -24px; }
-.i-time               { background-position: -48px  -24px; }
-.i-road               { background-position: -72px  -24px; }
-.i-download-alt       { background-position: -96px  -24px; }
-.i-download           { background-position: -120px -24px; }
-.i-upload             { background-position: -144px -24px; }
-.i-inbox              { background-position: -168px -24px; }
-.i-play-circle        { background-position: -192px -24px; }
-.i-repeat             { background-position: -216px -24px; }
-.i-refresh            { background-position: -240px -24px; }
-.i-list-alt           { background-position: -264px -24px; }
-.i-lock               { background-position: -287px -24px; } // 1px off
-.i-flag               { background-position: -312px -24px; }
-.i-headphones         { background-position: -336px -24px; }
-.i-volume-off         { background-position: -360px -24px; }
-.i-volume-down        { background-position: -384px -24px; }
-.i-volume-up          { background-position: -408px -24px; }
-.i-qrcode             { background-position: -432px -24px; }
-.i-barcode            { background-position: -456px -24px; }
+.icon-home               { background-position: 0      -24px; }
+.icon-file               { background-position: -24px  -24px; }
+.icon-time               { background-position: -48px  -24px; }
+.icon-road               { background-position: -72px  -24px; }
+.icon-download-alt       { background-position: -96px  -24px; }
+.icon-download           { background-position: -120px -24px; }
+.icon-upload             { background-position: -144px -24px; }
+.icon-inbox              { background-position: -168px -24px; }
+.icon-play-circle        { background-position: -192px -24px; }
+.icon-repeat             { background-position: -216px -24px; }
+.icon-refresh            { background-position: -240px -24px; }
+.icon-list-alt           { background-position: -264px -24px; }
+.icon-lock               { background-position: -287px -24px; } // 1px off
+.icon-flag               { background-position: -312px -24px; }
+.icon-headphones         { background-position: -336px -24px; }
+.icon-volume-off         { background-position: -360px -24px; }
+.icon-volume-down        { background-position: -384px -24px; }
+.icon-volume-up          { background-position: -408px -24px; }
+.icon-qrcode             { background-position: -432px -24px; }
+.icon-barcode            { background-position: -456px -24px; }
 
-.i-tag                { background-position: 0      -48px; }
-.i-tags               { background-position: -25px  -48px; } // 1px off
-.i-book               { background-position: -48px  -48px; }
-.i-bookmark           { background-position: -72px  -48px; }
-.i-print              { background-position: -96px  -48px; }
-.i-camera             { background-position: -120px -48px; }
-.i-font               { background-position: -144px -48px; }
-.i-bold               { background-position: -167px -48px; } // 1px off
-.i-italic             { background-position: -192px -48px; }
-.i-text-height        { background-position: -216px -48px; }
-.i-text-width         { background-position: -240px -48px; }
-.i-align-left         { background-position: -264px -48px; }
-.i-align-center       { background-position: -288px -48px; }
-.i-align-right        { background-position: -312px -48px; }
-.i-align-justify      { background-position: -336px -48px; }
-.i-list               { background-position: -360px -48px; }
-.i-indent-left        { background-position: -384px -48px; }
-.i-indent-right       { background-position: -408px -48px; }
-.i-facetime-video     { background-position: -432px -48px; }
-.i-picture            { background-position: -456px -48px; }
+.icon-tag                { background-position: 0      -48px; }
+.icon-tags               { background-position: -25px  -48px; } // 1px off
+.icon-book               { background-position: -48px  -48px; }
+.icon-bookmark           { background-position: -72px  -48px; }
+.icon-print              { background-position: -96px  -48px; }
+.icon-camera             { background-position: -120px -48px; }
+.icon-font               { background-position: -144px -48px; }
+.icon-bold               { background-position: -167px -48px; } // 1px off
+.icon-italic             { background-position: -192px -48px; }
+.icon-text-height        { background-position: -216px -48px; }
+.icon-text-width         { background-position: -240px -48px; }
+.icon-align-left         { background-position: -264px -48px; }
+.icon-align-center       { background-position: -288px -48px; }
+.icon-align-right        { background-position: -312px -48px; }
+.icon-align-justify      { background-position: -336px -48px; }
+.icon-list               { background-position: -360px -48px; }
+.icon-indent-left        { background-position: -384px -48px; }
+.icon-indent-right       { background-position: -408px -48px; }
+.icon-facetime-video     { background-position: -432px -48px; }
+.icon-picture            { background-position: -456px -48px; }
 
-.i-pencil             { background-position: 0      -72px; }
-.i-map-marker         { background-position: -24px  -72px; }
-.i-adjust             { background-position: -48px  -72px; }
-.i-tint               { background-position: -72px  -72px; }
-.i-edit               { background-position: -96px  -72px; }
-.i-share              { background-position: -120px -72px; }
-.i-check              { background-position: -144px -72px; }
-.i-move               { background-position: -168px -72px; }
-.i-step-backward      { background-position: -192px -72px; }
-.i-fast-backward      { background-position: -216px -72px; }
-.i-backward           { background-position: -240px -72px; }
-.i-play               { background-position: -264px -72px; }
-.i-pause              { background-position: -288px -72px; }
-.i-stop               { background-position: -312px -72px; }
-.i-forward            { background-position: -336px -72px; }
-.i-fast-forward       { background-position: -360px -72px; }
-.i-step-forward       { background-position: -384px -72px; }
-.i-eject              { background-position: -408px -72px; }
-.i-chevron-left       { background-position: -432px -72px; }
-.i-chevron-right      { background-position: -456px -72px; }
+.icon-pencil             { background-position: 0      -72px; }
+.icon-map-marker         { background-position: -24px  -72px; }
+.icon-adjust             { background-position: -48px  -72px; }
+.icon-tint               { background-position: -72px  -72px; }
+.icon-edit               { background-position: -96px  -72px; }
+.icon-share              { background-position: -120px -72px; }
+.icon-check              { background-position: -144px -72px; }
+.icon-move               { background-position: -168px -72px; }
+.icon-step-backward      { background-position: -192px -72px; }
+.icon-fast-backward      { background-position: -216px -72px; }
+.icon-backward           { background-position: -240px -72px; }
+.icon-play               { background-position: -264px -72px; }
+.icon-pause              { background-position: -288px -72px; }
+.icon-stop               { background-position: -312px -72px; }
+.icon-forward            { background-position: -336px -72px; }
+.icon-fast-forward       { background-position: -360px -72px; }
+.icon-step-forward       { background-position: -384px -72px; }
+.icon-eject              { background-position: -408px -72px; }
+.icon-chevron-left       { background-position: -432px -72px; }
+.icon-chevron-right      { background-position: -456px -72px; }
 
-.i-plus-sign          { background-position: 0      -96px; }
-.i-minus-sign         { background-position: -24px  -96px; }
-.i-remove-sign        { background-position: -48px  -96px; }
-.i-ok-sign            { background-position: -72px  -96px; }
-.i-question-sign      { background-position: -96px  -96px; }
-.i-info-sign          { background-position: -120px -96px; }
-.i-screenshot         { background-position: -144px -96px; }
-.i-remove-circle      { background-position: -168px -96px; }
-.i-ok-circle          { background-position: -192px -96px; }
-.i-ban-circle         { background-position: -216px -96px; }
-.i-arrow-left         { background-position: -240px -96px; }
-.i-arrow-right        { background-position: -264px -96px; }
-.i-arrow-up           { background-position: -289px -96px; } // 1px off
-.i-arrow-down         { background-position: -312px -96px; }
-.i-share-alt          { background-position: -336px -96px; }
-.i-resize-full        { background-position: -360px -96px; }
-.i-resize-small       { background-position: -384px -96px; }
-.i-plus               { background-position: -408px -96px; }
-.i-minus              { background-position: -433px -96px; }
-.i-asterisk           { background-position: -456px -96px; }
+.icon-plus-sign          { background-position: 0      -96px; }
+.icon-minus-sign         { background-position: -24px  -96px; }
+.icon-remove-sign        { background-position: -48px  -96px; }
+.icon-ok-sign            { background-position: -72px  -96px; }
+.icon-question-sign      { background-position: -96px  -96px; }
+.icon-info-sign          { background-position: -120px -96px; }
+.icon-screenshot         { background-position: -144px -96px; }
+.icon-remove-circle      { background-position: -168px -96px; }
+.icon-ok-circle          { background-position: -192px -96px; }
+.icon-ban-circle         { background-position: -216px -96px; }
+.icon-arrow-left         { background-position: -240px -96px; }
+.icon-arrow-right        { background-position: -264px -96px; }
+.icon-arrow-up           { background-position: -289px -96px; } // 1px off
+.icon-arrow-down         { background-position: -312px -96px; }
+.icon-share-alt          { background-position: -336px -96px; }
+.icon-resize-full        { background-position: -360px -96px; }
+.icon-resize-small       { background-position: -384px -96px; }
+.icon-plus               { background-position: -408px -96px; }
+.icon-minus              { background-position: -433px -96px; }
+.icon-asterisk           { background-position: -456px -96px; }
 
-.i-exclamation-sign   { background-position: 0      -120px; }
-.i-gift               { background-position: -24px  -120px; }
-.i-leaf               { background-position: -48px  -120px; }
-.i-fire               { background-position: -72px  -120px; }
-.i-eye-open           { background-position: -96px  -120px; }
-.i-eye-close          { background-position: -120px -120px; }
-.i-warning-sign       { background-position: -144px -120px; }
-.i-plane              { background-position: -168px -120px; }
-.i-calendar           { background-position: -192px -120px; }
-.i-random             { background-position: -216px -120px; }
-.i-comment            { background-position: -240px -120px; }
-.i-magnet             { background-position: -264px -120px; }
-.i-chevron-up         { background-position: -288px -120px; }
-.i-chevron-down       { background-position: -313px -119px; } // 1px off
-.i-retweet            { background-position: -336px -120px; }
-.i-shopping-cart      { background-position: -360px -120px; }
-.i-folder-close       { background-position: -384px -120px; }
-.i-folder-open        { background-position: -408px -120px; }
-.i-resize-vertical    { background-position: -432px -119px; }
-.i-resize-horizontal  { background-position: -456px -118px; }
+.icon-exclamation-sign   { background-position: 0      -120px; }
+.icon-gift               { background-position: -24px  -120px; }
+.icon-leaf               { background-position: -48px  -120px; }
+.icon-fire               { background-position: -72px  -120px; }
+.icon-eye-open           { background-position: -96px  -120px; }
+.icon-eye-close          { background-position: -120px -120px; }
+.icon-warning-sign       { background-position: -144px -120px; }
+.icon-plane              { background-position: -168px -120px; }
+.icon-calendar           { background-position: -192px -120px; }
+.icon-random             { background-position: -216px -120px; }
+.icon-comment            { background-position: -240px -120px; }
+.icon-magnet             { background-position: -264px -120px; }
+.icon-chevron-up         { background-position: -288px -120px; }
+.icon-chevron-down       { background-position: -313px -119px; } // 1px off
+.icon-retweet            { background-position: -336px -120px; }
+.icon-shopping-cart      { background-position: -360px -120px; }
+.icon-folder-close       { background-position: -384px -120px; }
+.icon-folder-open        { background-position: -408px -120px; }
+.icon-resize-vertical    { background-position: -432px -119px; }
+.icon-resize-horizontal  { background-position: -456px -118px; }
-- 
cgit v1.2.3


From a6253f0937a5d1f0bd18655729bff03bd5373f17 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 31 Jan 2012 00:15:43 -0800
Subject: fix disabled button docs

---
 docs/assets/bootstrap.zip              | Bin 52315 -> 52315 bytes
 docs/base-css.html                     |   4 ++--
 docs/templates/pages/base-css.mustache |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c507815f6..358ac17ab 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 298312edd..90240747b 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1273,8 +1273,8 @@ For example, <code>section</code> should be wrapped as inline.
       
                          Disabled state
                          
       
                          For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.
                          
       
                          
-        Primary action
-        Action
+        Primary action
+        Action
       
                          
       
                          
         
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4d9533522..34ac69cd7 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1197,8 +1197,8 @@
       
                          {{_i}}Disabled state{{/i}}
                          
       
                          {{_i}}For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.{{/i}}
                          
       
                          
-        {{_i}}Primary action{{/i}}
-        {{_i}}Action{{/i}}
+        {{_i}}Primary action{{/i}}
+        {{_i}}Action{{/i}}
       
                          
       
                          
         
-- 
cgit v1.2.3


From d70ba6c5e66b27acfc46121bf2293773451a339e Mon Sep 17 00:00:00 2001
From: nkryptic 
Date: Tue, 31 Jan 2012 03:54:07 -0500
Subject: add form help-* documentation

---
 docs/base-css.html                     | 5 ++++-
 docs/templates/pages/base-css.mustache | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index 90240747b..2e4e116db 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1155,7 +1155,7 @@ For example, <code>section</code> should be wrapped as inline.
                 
                 Option three can—yes, you guessed it—also be checked and included in form results
               
-              
                          Note: Labels surround all the options for much larger click areas and a more usable form.
                          
+              
                          Note: Labels surround all the options for much larger click areas and a more usable form.
                          
             
                          
           
                          
           
                          
@@ -1188,6 +1188,9 @@ For example, <code>section</code> should be wrapped as inline.
       
                          
       
                          Inline forms and append/prepend
                          
       
                          To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.
                          
+      
                          
+      
                          Form help text
                          
+      
                          To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.
                          
     
                          
   
                          
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 34ac69cd7..cc0b2a1ea 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1079,7 +1079,7 @@
                 
                 {{_i}}Option three can—yes, you guessed it—also be checked and included in form results{{/i}}
               
-              
                          {{_i}}Note: Labels surround all the options for much larger click areas and a more usable form.{{/i}}
                          
+              
                          {{_i}}Note: Labels surround all the options for much larger click areas and a more usable form.{{/i}}
                          
             
                          
           
                          
           
                          
@@ -1112,6 +1112,9 @@
       
                          
       
                          {{_i}}Inline forms and append/prepend{{/i}}
                          
       
                          {{_i}}To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.{{/i}}
                          
+      
                          
+      
                          {{_i}}Form help text{{/i}}
                          
+      
                          {{_i}}To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.{{/i}}
                          
     
                          
   
                          
 
-- 
cgit v1.2.3