From ec8619a9808b9b6e721334af8e6b5248ccbea8b5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Sep 2011 17:21:43 -0700 Subject: [PATCH 001/667] 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 8b6fe3eb42..6d3c15390a 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 aabdf2428b..4a3b6485bb 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 f99b756fe1..5c5162471a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - + @@ -37,22 +37,42 @@ -
+
Bootstrap @@ -718,102 +738,6 @@ - -
- - -
-
-

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 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 91aca77fe7..fd46fc71e8 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; - margin-top: @baseline; - margin-bottom: @baseline; - padding: (@baseline - 1) 20px @baseline 150px; - border-top: 1px solid #ddd; - .border-radius(0 0 3px 3px); - .secondary-action { - float: right; - a { - line-height: 30px; - &:hover { - text-decoration: underline; - } + + +// 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; + 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 { + 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; +} + +// Lists of controls (checkboxes and radios) +.control-list { } -// STACKED FORMS -// ------------- +// Horizontal-specific styles +// -------------------------- -.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 +// 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 929618a409..b0ecf03d37 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 6be76fdba6..983f14f3dc 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 077ae9d8f7..88b320459f 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 34000d0669..dcb0a8ebf0 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 From ecdba931ec4a6eced099026c1aeab503567a4e0a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:41:03 -0700 Subject: [PATCH 007/667] remove that test gradient --- docs/index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/index.html b/docs/index.html index 75a18ea409..d24bb1afda 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1796,9 +1796,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita - -
-
From 4e9849966d0f7b18cd4b8a22f6ef98c6900a2099 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:43:14 -0700 Subject: [PATCH 008/667] 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 d3bb942cda..33cc011f94 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 bb31375dd1..ef0f69f1f0 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 eae09a5963..ec40641d39 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 { From 00204a80cf1c45cb9d7d80986756401d304a3944 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:44:51 -0700 Subject: [PATCH 009/667] 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 33cc011f94..acc05c7174 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 ef0f69f1f0..5be71dd4a4 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 88b320459f..ea1f289e72 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; } From f54568fa31396556a0df7bf8e2b180885e2b1c3f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:47:55 -0700 Subject: [PATCH 010/667] 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 acc05c7174..6758ea7eb9 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 5be71dd4a4..cf290c8e1e 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 fd46fc71e8..56325daa9c 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 // --------------------------- From 0a6d8c30db0600ab8d33e14ead0ff120cd03ac9d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 02:21:02 -0700 Subject: [PATCH 011/667] 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 6758ea7eb9..92da336f65 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 cf290c8e1e..a6052c7666 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 d24bb1afda..137144991f 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!

+ + +

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

+ +

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 b0ecf03d37..131d142783 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 ec40641d39..8add82c166 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 // ----------- From 96dd7a2903aa5213ddb364b385660e26396dc670 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 00:20:38 -0700 Subject: [PATCH 012/667] 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 92da336f65..75928c7490 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 a6052c7666..4ba50158e6 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 56325daa9c..b657e53d65 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 131d142783..c43f166328 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 8add82c166..1b27b71847 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 26bb0cc059..b6852535c9 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 988483f0ef..8a786ffd2a 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 ea1f289e72..4232a24dff 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 dcb0a8ebf0..864dbe8c03 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 +// --------------- -// 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 +// Typography +@baseFontSize: 13px; +@baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; +@baseLineHeight: 18px; + +// Visuals +@primaryButtonColor: @blue; From cde17c94919ef26093145e5412c6d425d3199d9f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 00:48:31 -0700 Subject: [PATCH 013/667] 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 75928c7490..2b0e88c86d 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 c43f166328..47eb1a1c38 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; From bdbc35206630645e6cc6655ec9e50aa70081a2fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 00:55:35 -0700 Subject: [PATCH 014/667] adding new mixins --- lib/mixins.less | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/mixins.less b/lib/mixins.less index 47eb1a1c38..9c27346c2a 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) { From 913338f930736a1b186178469c6eafb55c1dbea8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 01:15:31 -0700 Subject: [PATCH 015/667] 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 2b0e88c86d..ab96f6c7c6 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 4ba50158e6..9a241d80d0 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 b657e53d65..4bdddc3a2e 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; } From a91a407bd60a266f928b5fea70d3c4332394b3c8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 4 Oct 2011 21:48:53 -0700 Subject: [PATCH 016/667] 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 82bcac5246..4498270cb9 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 75320c0f87..6379653c56 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 5c38a7477b..c8d41a50b2 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 = $(' @@ -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 () { -
+

Designed for everyone, everywhere

@@ -235,13 +218,6 @@ - - - - - - - From 00cbadf9943fea6a196cc01c7705d7f2c012bfa1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 18:21:55 -0600 Subject: [PATCH 144/667] 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 c7f2dfc6a2..3fa776fcbb 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 728a48a129..71996816d8 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 12626df3f1..9e25f50272 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; From 12a0d69454a2831031035d19237d36d38bb2c2a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 18:38:03 -0600 Subject: [PATCH 145/667] 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 9c683b9b2d..2f359ab57f 100644 --- a/docs/components.html +++ b/docs/components.html @@ -22,6 +22,18 @@ + + + + + + + + + + + + @@ -230,7 +242,7 @@

Navbar

Fixed navbar

-
@@ -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 919872db24..1fec7788ef 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 ba864ce9e5..6308522595 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 94d72a5403..5da0e6989e 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 0000000000..453bf11418 --- /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}}

    +
    + +
    + +
    +
    +

    Scaffolding

    + + + +

    Base CSS

    + + + + + + + +
    +
    +

    Components

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

    JS Components

    + + + + + + + +
    +
    +

    Miscellaneous

    + + + + +

    Responsive

    + + + +
    +
    + + +
    +
    +

    Links

    + + + + +

    Grid system

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

    Typography

    + + + + + + +

    Forms

    + + + + +

    Navbar

    + + + + + + +
    +
    +

    Form states & alerts

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

    Heads up!

    +

    {{_i}}All plugins require the latest version of jQuery to be included.{{/i}}

    +
    +
    + + +
    diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 2ac950251b..df114841a7 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 2633abdf3f..76ecf70c9e 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}}

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

    Scaffolding

    - - - -

    Base CSS

    - - - - - - - -
    -
    -

    Components

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

    JS Components

    - - - - - - - -
    -
    -

    Responsive

    - - - -

    Miscellaneous

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

    Links

    - - - - -

    Grid system

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

    Typography

    - - - - - - -

    Forms

    - - - - -

    Navbar

    - - - - - - -
    -
    -

    Form states & alerts

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

    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}}Hyperlinks{{/i}}

    @@ -494,85 +333,8 @@ - - - - - - - - - - - - - - - -
    - -
    -
    -

    {{_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}}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 ed80dabfca..981c60706d 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 7dab4c0000..75b8e7327b 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 e35b23da02..100b0ab915 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; } From bd36e2a1633ea66fee2bcfdd1123bd70f41b43f2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 01:25:15 -0800 Subject: [PATCH 419/667] 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 a7818ff461..5977006ffd 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 df114841a7..7671bc99ad 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}}

    From de4ada3b88d7514d0320540e5a298fbe878778e1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 01:45:15 -0800 Subject: [PATCH 420/667] 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 ac75dd3469..e10c8899b0 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 @@ - - -

    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

    +
    + +

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

    +
    + +

    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) { ... } From 9553b1e3e9457a48b6da3724c906a36f935aa526 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 10:02:52 -0800 Subject: [PATCH 427/667] 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 f4324e5665..612f77fdf5 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 0000000000..4a924da68d --- /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 0000000000..5c45bd12b7 --- /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 85b515ecc3..d90ec91889 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 cd155d561d..01342ea849 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 6b6bd5c51a..7902434268 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 c1cec739cd..e527801838 100644 --- a/docs/components.html +++ b/docs/components.html @@ -14,6 +14,7 @@ + diff --git a/docs/download.html b/docs/download.html index 1d74c4f78b..7c03675196 100644 --- a/docs/download.html +++ b/docs/download.html @@ -14,6 +14,7 @@ + diff --git a/docs/index.html b/docs/index.html index 83e65c97e6..4e3ecd038c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -14,6 +14,7 @@ + diff --git a/docs/javascript.html b/docs/javascript.html index c6682660f8..9ef609138c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -14,6 +14,7 @@ + diff --git a/docs/less.html b/docs/less.html index e10c8899b0..1e6c48253e 100644 --- a/docs/less.html +++ b/docs/less.html @@ -14,6 +14,7 @@ + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 3a903cf573..7f2bbc09f3 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. +
    3. Use the compiled responsive version, bootstrap-reponsive.css
    4. Add @import "responsive.less" and recompile Bootstrap
    5. Modify and recompile responsive.less as a separate
    diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 1fec7788ef..0bcfaeb63a 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 aea8002ad0..a89f93d8e1 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. +
    3. {{_i}}Use the compiled responsive version, bootstrap-reponsive.css{{/i}}
    4. {{_i}}Add @import "responsive.less" and recompile Bootstrap{{/i}}
    5. {{_i}}Modify and recompile responsive.less as a separate{{/i}}
    diff --git a/docs/upgrading.html b/docs/upgrading.html index 75b8e7327b..33b4d939aa 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -14,6 +14,7 @@ + diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 67642d1c45..8d307d4271 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 416a8da7b7..452116ea0d 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 // ------------------ From 9380ff8a06197de3f7a3f27a66284da540192f0c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 10:09:26 -0800 Subject: [PATCH 428/667] 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 79764356bb..9bf651753a 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; - } - From 1fa3eab20c827d0300cd4a4bb50e2c28e16a2872 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 10:19:29 -0800 Subject: [PATCH 429/667] 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 7902434268..8013ee8aad 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 e527801838..0833cbf6b6 100644 --- a/docs/components.html +++ b/docs/components.html @@ -19,7 +19,7 @@ - + diff --git a/docs/download.html b/docs/download.html index 7c03675196..cdc129049d 100644 --- a/docs/download.html +++ b/docs/download.html @@ -19,7 +19,7 @@ - + diff --git a/docs/index.html b/docs/index.html index 4e3ecd038c..958f17bf8f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -19,7 +19,7 @@ - + diff --git a/docs/javascript.html b/docs/javascript.html index 9ef609138c..9d6b2812df 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -19,7 +19,7 @@ - + diff --git a/docs/less.html b/docs/less.html index 1e6c48253e..f920a80a88 100644 --- a/docs/less.html +++ b/docs/less.html @@ -19,7 +19,7 @@ - + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 7f2bbc09f3..77aeea5a33 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 0bcfaeb63a..3435e35799 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 33b4d939aa..c7e6c815f0 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -19,7 +19,7 @@ - + From 324ebb59900fd69411aec323a85953aec8c55bb6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 10:47:08 -0800 Subject: [PATCH 430/667] 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 d90ec91889..d028d2b3e7 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 0000000000..04ca7fd684 --- /dev/null +++ b/docs/examples.html @@ -0,0 +1,123 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + 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.

    +
    + + + + +
    + + +

    Container app

    +

    Fluid layout

    +

    Reversed fluid layout

    +

    Hero marketing site

    + +
    + + + + +
    + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/index.html b/docs/index.html index 958f17bf8f..2a6078cbea 100644 --- a/docs/index.html +++ b/docs/index.html @@ -115,7 +115,7 @@

    Built with Bootstrap.

    - +
    diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 5da0e6989e..2566eb05ee 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -388,13 +388,13 @@
    
    From e49e49ff9557676d9018b410cea14a7f9f399733 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Wed, 25 Jan 2012 10:51:26 -0800
    Subject: [PATCH 433/667] 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 5d67727016..1a9c4e15ab 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 4c70510783..4263bead3b 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}}
           
           
    
    From 6cbf2f402432187f79aea1a938a08f1ce876fd2d Mon Sep 17 00:00:00 2001
    From: Jon Stevens 
    Date: Wed, 25 Jan 2012 10:59:45 -0800
    Subject: [PATCH 434/667] 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 27c1ba6605..8ada01f20c 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 c1a3f97922..ff754b8173 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);
    
    From 0b2dd16e7293fa11f453abf67395493cbfe18935 Mon Sep 17 00:00:00 2001
    From: Jon Stevens 
    Date: Wed, 25 Jan 2012 11:02:28 -0800
    Subject: [PATCH 435/667] 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 8ada01f20c..b0e95bfe93 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;
    
    From 603aaa01ef487d912569459adc69bc06eb0ade52 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Wed, 25 Jan 2012 11:05:23 -0800
    Subject: [PATCH 436/667] 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 767624b14b..33260da9ee 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 01342ea849..f9f4d074d7 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;}
    
    From fd3c6733a2d7b8f3afa3fc8511162e23ad1ac412 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Wed, 25 Jan 2012 11:11:22 -0800
    Subject: [PATCH 437/667] 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 5991cba36e..a7a4470843 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 2566eb05ee..effa107626 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>
    
    From cfa925cab6dbb10af28ddca6d38e76aed97bb1ef Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Wed, 25 Jan 2012 11:15:48 -0800
    Subject: [PATCH 438/667] 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 33260da9ee..8069c5d254 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 f9f4d074d7..216af09ceb 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;}
    
    From d3c5dd4e6acc421e06ef72680e794cfd9d52a04a Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Wed, 25 Jan 2012 11:21:44 -0800
    Subject: [PATCH 439/667] 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 8069c5d254..0166a32015 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 216af09ceb..438305f715 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 100b0ab915..178c210181 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;
     }
    
    From 25519bacd56ee2507cdde727d85458e5e5ef7949 Mon Sep 17 00:00:00 2001
    From: Jacob Thornton 
    Date: Wed, 25 Jan 2012 11:25:35 -0800
    Subject: [PATCH 440/667] 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 6a97d792bc..31c1fdbefe 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 0166a32015..e548f5afc6 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 438305f715..a9caab69bc 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 1a9c4e15ab..b0a6743f34 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 a7a4470843..56c5280dbd 100644
    --- a/docs/components.html
    +++ b/docs/components.html
    @@ -25,7 +25,7 @@
         
       
     
    -  
    +  
       
       
    diff --git a/docs/download.html b/docs/download.html
    index cdc129049d..e873b5e740 100644
    --- a/docs/download.html
    +++ b/docs/download.html
    @@ -25,7 +25,7 @@
         
       
     
    -  
    +  
       
       
    diff --git a/docs/examples.html b/docs/examples.html
    index 04ca7fd684..bc52bea555 100644
    --- a/docs/examples.html
    +++ b/docs/examples.html
    @@ -25,7 +25,7 @@
         
       
     
    -  
    +  
       
       
    diff --git a/docs/index.html b/docs/index.html
    index 2a6078cbea..0835c46472 100644
    --- a/docs/index.html
    +++ b/docs/index.html
    @@ -25,7 +25,7 @@
         
       
     
    -  
    +  
       
       
    diff --git a/docs/javascript.html b/docs/javascript.html
    index 9d6b2812df..eb291a1a37 100644
    --- a/docs/javascript.html
    +++ b/docs/javascript.html
    @@ -25,7 +25,7 @@
         
       
     
    -  
    +  
       
       
    diff --git a/docs/less.html b/docs/less.html
    index f920a80a88..c77ba9706f 100644
    --- a/docs/less.html
    +++ b/docs/less.html
    @@ -25,7 +25,7 @@
         
       
     
    -  
    +  
       
       
    diff --git a/docs/scaffolding.html b/docs/scaffolding.html
    index 77aeea5a33..8245f860cc 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 3435e35799..addcb224f7 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 c7e6c815f0..fb1fbfcfe0 100644
    --- a/docs/upgrading.html
    +++ b/docs/upgrading.html
    @@ -25,7 +25,7 @@
         
       
     
    -  
    +  
       
       
    
    From b8511568637dfa4decb3f0475436a3dfa637a57d Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Wed, 25 Jan 2012 11:26:45 -0800
    Subject: [PATCH 441/667] 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 0166a32015..39add86960 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 438305f715..20614ea732 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 1a9c4e15ab..057c98b859 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 4263bead3b..4daa98309d 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 178c210181..70a065bdb6 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; From a4b8cc2a9c8c7f16c4a93e64d2a187d839bfbb40 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:30:30 -0800 Subject: [PATCH 442/667] 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 0fe480ecb3..600894f386 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; From 58d08a2db3e2ed1b789a5290ced2f0327c9c163b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:35:08 -0800 Subject: [PATCH 443/667] 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 730167f51f..4bffde24d1 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 20614ea732..c800de5e00 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 a8a87da42a..1e9a3d942e 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 4daa98309d..913eea31ab 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 70a065bdb6..3b35a172c7 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; From 06017b26ca5a9c835edb9d42188431fa30c7e499 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:47:36 -0800 Subject: [PATCH 444/667] 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 4bffde24d1..7a538c7176 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 c800de5e00..87ea670e09 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 b0e95bfe93..254a9f60c7 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; } From 319b65e64b6882ad2184f398f1763543cfa48a16 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 25 Jan 2012 11:49:00 -0800 Subject: [PATCH 445/667] 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 3262f0cab0..500c7da7fe 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() }) }) From 04f84997c18f2f132c8173f728f72b6b7aef52d1 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 25 Jan 2012 11:49:34 -0800 Subject: [PATCH 446/667] 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 6a97d792bc..31c1fdbefe 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 7a538c7176..b9cd608ae4 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 87ea670e09..eeb88b285b 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;} From 86191d898b2520611b537892e33be3b179f83199 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:51:13 -0800 Subject: [PATCH 447/667] 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 7a538c7176..1556d7704f 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 87ea670e09..8174829501 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 3b35a172c7..355a33a30d 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 From 2b2c72b9aae6db9505d0fdb3abc1832de8e0ce7f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 12:04:19 -0800 Subject: [PATCH 448/667] 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 1556d7704f..c53264a2d6 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 8174829501..447ecbb2d8 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 355a33a30d..7451f36efc 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; } From 9c4a70c597a35f772bb21cb60dd7812146fc29ee Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 12:43:38 -0800 Subject: [PATCH 449/667] 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 1e9a3d942e..60b5640dff 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 913eea31ab..7a85d1138e 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}}

    - -
    +
    +
    - -
    +
    +
    - +
    From 4ea63e5261ba0c10e2b729e2216105896108733b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 13:33:55 -0800 Subject: [PATCH 450/667] 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 | 254 ++++++++++++----------- docs/download.html | 28 ++- docs/templates/pages/base-css.mustache | 254 ++++++++++++----------- docs/templates/pages/download.mustache | 28 ++- 6 files changed, 331 insertions(+), 272 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 600894f386..739ae1fc4d 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 70b6573d7e292256256f919b6b0ca6fe02aa7d8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1509 zcmVULceR75QZg>Ji06mhF-@t2k&3;wPZ1?@s<*@gWfShf4Z7Z^ok zbwy)|Z^cC8JDPq+=gN3<^HAH+!VVl}?s?63=gypS=6cEg8%@RfGui*F$w6w++w9q3 zv)L>j1t6CvmzI{s&&+8#xmX`h`YHDgK z1qhj^2u-uGu`zCAZE$d~p7?}Az(n{Q+2`iwrq0jLzaSr7U0si8Gk6mJ`8ymRAMc)> zo!N-?_V!lL%REI33k#nLa}#ZEZ;uk6;W+0JK3Zrgd!y0#J8wTUH1x42@e?VON~K!Z zjedT9T2Jo&sHmtF{y88Z;6RLn@J&xo>!j?VAI?7q1qB6r`UET4QMy+1^75jXqdYx5 zwMfV)E~z0iIk45Bvp{Y|uLre)z5xz1WDlh9a7W%L-;tgpjO_6cSPuWO1;iK6a-eIp zTCH=CYfDN>vLYiR)d2DmyjT2g$;imi6%`f5lZ+M!ax0S&=;YScR$X^@_bX;=0lN#l z#j&xm)y~e&Ri=KW_4f8gCnhFliLr5hOUGgXJh?sAgyI7DsMxE&`FE5W578WLvPg*$4`N(WGuZZ=ChxpkJ zofKL#0WG#DwqCD)>PiG{)V&8U0I6FK04lRniM+w)kSnA0JF(HhXAx1?B zW5letZhBl1tRvuGC2^Cn@y`~Eg|KUG8y-+$tYCL)Mf}H7x^_FTxw-lKwY9Z2wOTE% z@u*gsg3QX>pd9!Ty6yP#q2b}-nY=6^A>lq`BWxE{@G=z3$9Q4M9f&Nq~CTPS9V#)ywKrrw#G) z;y#Yd^9*2fTp7@$C8WC8jTh3i9suf4`nZVfD*%`xa zBK73tq{G|WyVMnys;VlQ?#@v3Qa0VqRQa?7|hZ#MJ_7G@8p8s0Wq16C3bybmXbJ&jN6>6J3)d z8SEDEB6&29iHW&Vir^$1v9ZC`91IKn(#j*Bj`Scua}%>r_Pk3yu6H{Ej~|N@mxA?F zh2H`F=H%m;@FgFxG3|~l34H_0R`0Mou1R#QYN!8yOpjVW?*sMM51hW9>9)JTVqkjW z`7T~iq4-+DpUL5$U6tw=k=>QC-9O2j{7iV$WOh67O}k
    - 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

    -
    -
    - -
    -
    - - .00 +
    + +
    +
    + @ + +
    +

    Here's some help text

    -

    Here's more help text

    -
    -
    - -
    - - - +
    + +
    +
    + + .00 +
    +

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

    +
    -
    +
    + +
    + +
    + +
    +
    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 7a85d1138e..cbc0519e5a 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}}

    -
    -
    - -
    -
    - - .00 +
    + +
    +
    + @ + +
    +

    {{_i}}Here's some help text{{/i}}

    -

    {{_i}}Here's more help text{{/i}}

    -
    -
    - -
    - - - +
    + +
    +
    + + .00 +
    +

    {{_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 453bf11418..216098bad0 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}}

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

    -
    + From 7ca3b98d885071bc032ca28e20452ad879cea422 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 13:56:44 -0800 Subject: [PATCH 451/667] 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 739ae1fc4d..b70b039f20 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 d4c31ed4df..7b045ae8ef 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 0835c46472..b866da87c6 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 @@
    - +

    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 216098bad0..f5964dc352 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 c3f725a05d..ff486bc7b9 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}}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}}

    From 7d83f45ebbadf7d100b56f944718763a6ce3e55c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 14:08:51 -0800 Subject: [PATCH 452/667] 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 c77ba9706f..23c2c53c65 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 0889592eb2..51d2295def 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 From 0777e391ee19cbc3bda7637dcbb17b5b171afac5 Mon Sep 17 00:00:00 2001 From: Krister Kari Date: Thu, 26 Jan 2012 01:03:36 +0200 Subject: [PATCH 453/667] 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 e64b80ad36..793c000ab9 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 From b6b7d1343b74713a60e86401d8b625f097a7b8dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 15:03:44 -0800 Subject: [PATCH 454/667] 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 23c2c53c65..f6321fc69b 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 8245f860cc..2ba8d5d7ad 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 51d2295def..f2c2668421 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 @@ -

    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 a89f93d8e1..bc924e3ef7 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 e64b80ad36..4ebb94cfcb 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 ff029e841b..7002b04083 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) From 0db2d45350a67bc1a98c0f2d1c4706e3bd25ca50 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 15:04:41 -0800 Subject: [PATCH 455/667] 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 31c1fdbefe..6a97d792bc 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 931d0c0179..0d81b9b038 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 f8266b49b1..447ecbb2d8 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 4ebb94cfcb..327e21813c 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); From e877d125d7a2c673fec4e63600c2d8544c3128f6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 20:02:32 -0800 Subject: [PATCH 456/667] 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 0d81b9b038..4ece30d203 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 447ecbb2d8..50b328682c 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 b70b039f20..3265e324fd 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 56c5280dbd..2ccfd26e6f 100644 --- a/docs/components.html +++ b/docs/components.html @@ -70,7 +70,7 @@ - + + - + diff --git a/docs/download.html b/docs/download.html index 58fdd56597..3ad6ec921d 100644 --- a/docs/download.html +++ b/docs/download.html @@ -27,6 +27,7 @@ + +
    @@ -313,9 +315,11 @@
    - + + - + diff --git a/docs/examples.html b/docs/examples.html index bc52bea555..0d3e11f5a3 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -27,6 +27,7 @@ + - + + - + diff --git a/docs/index.html b/docs/index.html index f3738e8372..333077601e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -27,6 +27,7 @@ +
    +
    @@ -255,9 +259,11 @@
    - + + - + diff --git a/docs/javascript.html b/docs/javascript.html index 34d61ef9cb..400a93dd23 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -27,6 +27,7 @@ +
    +
    @@ -1368,9 +1370,11 @@ $('.myCarousel').carousel({
    - + + - + diff --git a/docs/less.html b/docs/less.html index f6321fc69b..d2e083c2e0 100644 --- a/docs/less.html +++ b/docs/less.html @@ -27,6 +27,7 @@ + +
    @@ -767,9 +769,11 @@
    - + + - + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 2ba8d5d7ad..2c8d873e7f 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -27,6 +27,7 @@ +
    +
    @@ -391,9 +393,11 @@
    - + + - + diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index addcb224f7..547b99bb40 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -27,6 +27,7 @@ + - + + - + diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index c2dd661ae0..325883872b 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 33bfd035f2..5bc52644d6 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}}

    @@ -146,6 +147,7 @@
    +
    diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index f2c2668421..6478e3b2fe 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 fb1fbfcfe0..e80fac2d6f 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -27,6 +27,7 @@ + - + + - + diff --git a/lib/buttons.less b/lib/buttons.less index f13a9acbfd..d97f044cfe 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 3acb8c5dcb..744649f904 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 2eab8f36ed..b58571e6a1 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 3c4f562ca4..5ed896cc0c 100644 --- a/lib/variables.less +++ b/lib/variables.less @@ -45,7 +45,7 @@ @baseLineHeight: 18px; // Buttons -@primaryButtonColor: @blue; +@primaryButtonBackground: @linkColor; From 29f0e4c28b56e684a9be9931dcf77b418cb63ae0 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 13:01:03 -0500 Subject: [PATCH 463/667] 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 d2e083c2e0..dc0e834435 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 6478e3b2fe..1aec06c2c2 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 d97f044cfe..7f5a91b990 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 b58571e6a1..b8c969ea8f 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 From 2c2f8ebe3a090bff0254aba10b745dae10bf242d Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 13:04:30 -0500 Subject: [PATCH 464/667] 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 8ed8745bb6..dcf17dce92 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 787211a75c..6462eb5a88 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 94bde2d36f..be9c1f2602 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;} From ef4d0dd7dbd959f830d4cb7976d6a4b061784ec6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 10:12:25 -0800 Subject: [PATCH 465/667] 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 d266dd92e0..27c446d233 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 { From 7117db499f0b02da32a8d08f6371cab1f6b53338 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 13:26:14 -0500 Subject: [PATCH 466/667] 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 b8c969ea8f..dd331ebf28 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); From 86e0e89ee81d4a2a1daef6b68aa269419ee7d644 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 13:26:28 -0500 Subject: [PATCH 467/667] 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 6462eb5a88..f4af5ede94 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 be9c1f2602..bada2d6adb 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;} From 34488a450081422037e84d269ddb289aa709e9fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 10:39:07 -0800 Subject: [PATCH 468/667] 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 400a93dd23..e589c4670d 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 6b2a3693d5..66493dc0c6 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> From b8c1950cbfbb48d49f79b1e36f8c8294b19ed57d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 10:43:08 -0800 Subject: [PATCH 469/667] 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 e589c4670d..63881d2c9a 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.

    diff --git a/docs/scaffolding.html b/docs/scaffolding.html index df6ea9f008..02b9721d31 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 4707e60a94..0f997d3686 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/docs/assets/img/glyphicons-halflings-sprite-white.png b/img/glyphicons-halflings-sprite-white.png similarity index 100% rename from docs/assets/img/glyphicons-halflings-sprite-white.png rename to img/glyphicons-halflings-sprite-white.png diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/img/glyphicons-halflings-sprite.png similarity index 100% rename from docs/assets/img/glyphicons-halflings-sprite.png rename to img/glyphicons-halflings-sprite.png diff --git a/lib/accordion.less b/less/accordion.less similarity index 100% rename from lib/accordion.less rename to less/accordion.less diff --git a/lib/alerts.less b/less/alerts.less similarity index 100% rename from lib/alerts.less rename to less/alerts.less diff --git a/lib/bootstrap.less b/less/bootstrap.less similarity index 100% rename from lib/bootstrap.less rename to less/bootstrap.less diff --git a/lib/breadcrumbs.less b/less/breadcrumbs.less similarity index 100% rename from lib/breadcrumbs.less rename to less/breadcrumbs.less diff --git a/lib/button-groups.less b/less/button-groups.less similarity index 100% rename from lib/button-groups.less rename to less/button-groups.less diff --git a/lib/buttons.less b/less/buttons.less similarity index 100% rename from lib/buttons.less rename to less/buttons.less diff --git a/lib/carousel.less b/less/carousel.less similarity index 100% rename from lib/carousel.less rename to less/carousel.less diff --git a/lib/close.less b/less/close.less similarity index 100% rename from lib/close.less rename to less/close.less diff --git a/lib/code.less b/less/code.less similarity index 100% rename from lib/code.less rename to less/code.less diff --git a/lib/component-animations.less b/less/component-animations.less similarity index 100% rename from lib/component-animations.less rename to less/component-animations.less diff --git a/lib/dropdowns.less b/less/dropdowns.less similarity index 100% rename from lib/dropdowns.less rename to less/dropdowns.less diff --git a/lib/forms.less b/less/forms.less similarity index 100% rename from lib/forms.less rename to less/forms.less diff --git a/lib/grid.less b/less/grid.less similarity index 100% rename from lib/grid.less rename to less/grid.less diff --git a/lib/hero-unit.less b/less/hero-unit.less similarity index 100% rename from lib/hero-unit.less rename to less/hero-unit.less diff --git a/lib/labels.less b/less/labels.less similarity index 100% rename from lib/labels.less rename to less/labels.less diff --git a/lib/layouts.less b/less/layouts.less similarity index 100% rename from lib/layouts.less rename to less/layouts.less diff --git a/lib/mixins.less b/less/mixins.less similarity index 100% rename from lib/mixins.less rename to less/mixins.less diff --git a/lib/modals.less b/less/modals.less similarity index 100% rename from lib/modals.less rename to less/modals.less diff --git a/lib/navbar.less b/less/navbar.less similarity index 100% rename from lib/navbar.less rename to less/navbar.less diff --git a/lib/navs.less b/less/navs.less similarity index 100% rename from lib/navs.less rename to less/navs.less diff --git a/lib/pager.less b/less/pager.less similarity index 100% rename from lib/pager.less rename to less/pager.less diff --git a/lib/pagination.less b/less/pagination.less similarity index 100% rename from lib/pagination.less rename to less/pagination.less diff --git a/lib/patterns.less b/less/patterns.less similarity index 100% rename from lib/patterns.less rename to less/patterns.less diff --git a/lib/popovers.less b/less/popovers.less similarity index 100% rename from lib/popovers.less rename to less/popovers.less diff --git a/lib/print.less b/less/print.less similarity index 100% rename from lib/print.less rename to less/print.less diff --git a/lib/progress-bars.less b/less/progress-bars.less similarity index 100% rename from lib/progress-bars.less rename to less/progress-bars.less diff --git a/lib/reset.less b/less/reset.less similarity index 100% rename from lib/reset.less rename to less/reset.less diff --git a/lib/responsive.less b/less/responsive.less similarity index 100% rename from lib/responsive.less rename to less/responsive.less diff --git a/lib/scaffolding.less b/less/scaffolding.less similarity index 100% rename from lib/scaffolding.less rename to less/scaffolding.less diff --git a/lib/sprites.less b/less/sprites.less similarity index 97% rename from lib/sprites.less rename to less/sprites.less index ef92952884..c3b4206656 100644 --- a/lib/sprites.less +++ b/less/sprites.less @@ -12,7 +12,7 @@ // will look like . .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; @@ -21,7 +21,7 @@ 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; } diff --git a/lib/tables.less b/less/tables.less similarity index 100% rename from lib/tables.less rename to less/tables.less diff --git a/lib/thumbnails.less b/less/thumbnails.less similarity index 100% rename from lib/thumbnails.less rename to less/thumbnails.less diff --git a/lib/tooltip.less b/less/tooltip.less similarity index 100% rename from lib/tooltip.less rename to less/tooltip.less diff --git a/lib/type.less b/less/type.less similarity index 100% rename from lib/type.less rename to less/type.less diff --git a/lib/utilities.less b/less/utilities.less similarity index 100% rename from lib/utilities.less rename to less/utilities.less diff --git a/lib/variables.less b/less/variables.less similarity index 100% rename from lib/variables.less rename to less/variables.less diff --git a/lib/wells.less b/less/wells.less similarity index 100% rename from lib/wells.less rename to less/wells.less From ed64276e5be1bbf808f2ab1451aa02522cc3aff0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 22:05:45 -0800 Subject: [PATCH 503/667] move doc building into base make method + build bootstrap to doc assets --- Makefile | 20 +- bootstrap-responsive.min.css | 3 - bootstrap.min.css | 556 ------------------ .../assets/css/bootstrap-responsive.css | 0 .../assets/css/bootstrap.css | 2 +- 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 +- 15 files changed, 26 insertions(+), 595 deletions(-) delete mode 100644 bootstrap-responsive.min.css delete mode 100644 bootstrap.min.css rename bootstrap-responsive.css => docs/assets/css/bootstrap-responsive.css (100%) rename bootstrap.css => docs/assets/css/bootstrap.css (99%) diff --git a/Makefile b/Makefile index 337baf03fa..127d6affe0 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.min.css b/bootstrap-responsive.min.css deleted file mode 100644 index dcf17dce92..0000000000 --- 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.min.css b/bootstrap.min.css deleted file mode 100644 index e7e5d16be9..0000000000 --- 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/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css similarity index 100% rename from bootstrap-responsive.css rename to docs/assets/css/bootstrap-responsive.css diff --git a/bootstrap.css b/docs/assets/css/bootstrap.css similarity index 99% rename from bootstrap.css rename to docs/assets/css/bootstrap.css index 9d26b41c8d..cd7268bb77 100644 --- a/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 21:48:03 PST 2012 + * Date: Thu Jan 26 22:05:04 PST 2012 */ article, aside, diff --git a/docs/base-css.html b/docs/base-css.html index a30e0c1f37..9cad9de017 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 252e1a0c3b..eba49449f9 100644 --- a/docs/components.html +++ b/docs/components.html @@ -13,8 +13,8 @@ - - + + diff --git a/docs/download.html b/docs/download.html index 99564576fc..3af30dca7f 100644 --- a/docs/download.html +++ b/docs/download.html @@ -13,8 +13,8 @@ - - + + diff --git a/docs/examples.html b/docs/examples.html index 6fcbc58556..dfa62fe98c 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -13,8 +13,8 @@ - - + + diff --git a/docs/index.html b/docs/index.html index e60e9d7116..317ec994ba 100644 --- a/docs/index.html +++ b/docs/index.html @@ -13,8 +13,8 @@ - - + + diff --git a/docs/javascript.html b/docs/javascript.html index 07c55e834a..dd65c1b8d0 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -13,8 +13,8 @@ - - + + diff --git a/docs/less.html b/docs/less.html index c827df4539..fb1b0d18c8 100644 --- a/docs/less.html +++ b/docs/less.html @@ -13,8 +13,8 @@ - - + + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 02b9721d31..f49b8d6c4b 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 014f248d68..dbb718056b 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 d0234a8ba9..142e750cc9 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -13,8 +13,8 @@ - - + + From a25f0cce95bc538f3aa19e9edf17ac3a353e334e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 22:11:32 -0800 Subject: [PATCH 504/667] simplify readme --- README.md | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index b77eb95ae0..7dc9038a8c 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` From 815a2ae9f26f49137382fd4b186d174c7b1b8c5b Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 22:39:17 -0800 Subject: [PATCH 505/667] rebuild + copy images to docs when making --- Makefile | 1 + docs/assets/css/bootstrap.css | 6 +++--- .../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 127d6affe0..f2213103aa 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 cd7268bb77..68e161051b 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 0000000000000000000000000000000000000000..a92b1913a2ba91686e5d96e915367d7c31a26146 GIT binary patch literal 13566 zcmbVzby$>Nw>Acfw332KNeT?zAq`50fJhD@HA4&?Bi$e(At?h03@y?noq~ciNO$)P z49xf7`+LuMuXCO6`{Uye*z?R@`&nzp+V{HGB0^JLi3pzt9|s4ANJUv*8wcmcDA0!B z-2r|(w?~`+e;&dV3}8A?YnX?*ixrNHCDg)-Ud7Se#!B1D+|tXr*Gd8h=N8&l*8paq zrYZ)8I&zy|_u=+*bONMta3rKXoy@`ZRxo-CD;rygB;#H~3nRU)r6i-ipc;>wlbqFC zTV-z-D;;ljU9h)3Sk#hHT8du6Qw$iu(F$fx@9F3OaTW8FWc)j>7|_0c3}U4J+XZGX z$@nj&4AeB~<)AKB^n%wp8=)vXc z1%a7+azR{~{yl=cl`GiA)(K_{h0tG*Xl?;@gGn+1n*PfKM<+G4{~8$L`p-lGQwH)h zcLMQp^MD*3ukHHV+ZCp5_1|jzuf1J$y_~E-+E%VmHy1Fl9@b3%76#_-|NWwWceDim zS3f5=7l*%gT7p4V4pxp<5SS~V6z^Y+0L{fTTx@{_G_03Y+(*o|Ljp22iQL?2ixm?BIaNYu>mH8%hJl)+|2>TC}rc| z<@DAT428Iwx;mOWIG9?RyVy&BuD7FuEg<{1^{-(-|1tRA$N#Z^|J@Tf6xYrFI*q`G z|2ofB5a1BI0H?JoYoZDVhbK)%UPjk*YTJ*AW zf#Xr`fXiNqjBlB0ye#NWT0Q=zHSOKx=lv~n?Mc|uq$DhoyA1_t2q4P25d++Ws@QL517!@BVO+i5+xSd0`1fm0#dSi|0DGRZc3gOH-x8a9_ThyjSLWHMH^jQ#cr_Hz0I0dy1|YGCMpHI^uwW zD9e_-IJ0u{!LtuSKeiKfUu77^^YQU<#v5FnE^ttUM%p~;XH`#sd&C1N%E`H<_ek{r6Oxx~dy)b;X`wnm!S--SB%HPAU?84h7Cq|8B? zX-hMsv@~33Dr#22(yh^Py4r30jjLMxrb7GX__#ExXSRF zYIFQO;8s-|L?*)SxFw=$ie%90cY#(}Nc)1Ojm?^xOPGKC3cCm*Nm8FYIyi&vppV}$$oT;Mc-Y4=i4tE=}ukuM%4>YLPcbMEmB>KG$wYQv~i-#PkvJKSX$=jXb|am7sbQi zB)eR$HlcQK{^CU~Y?`F<24-oBh*oGq>c+jf@zZSMc4>pQRTbt!%?0L{NdpNTC0X<4 zbg^3OAHx=$hK-O#MewU0rns4aC%KynLn5!1=sqp@w|RD{Oy*UDdQhE?j*X2K3Dvu8 zjd5vIj|71IOnA;<9v&p~uG4n{IuBTA1jx22ovN#=pR6?L<{CprXL@~LbFO_X%+ zd*A%yf3Y(?^T9WoL96QK1HET5Qi|vxNu|aW1803Hc#SYwVy?+{+62c*x)*U4 zqhcK=@?W#%FZ^s@M8-NDp#zOh5H^xklz(u#>VE5`z9mJ*5KFdtws8<}#GZJyVmLQ% zVLa!ki1s==IZVTaf>X~{$lnIDUXGs)s9Jn+D zwKhCF3_9o;?b#}8F@Xi&&nS23 z9HBOjS0qv>v(7L&|F>Zg9UTHQBo@<|qsuj@ov@o!-P&e$xvx!4_flbs$R|u<{T*z3 zy0!U{_8&#_hzDrr&%`Si?;(*SviYib?+G2+rAD=)+p**?syPG};OQ6_zSbf6hQv#3 zh5Ulyqjp?><%rFrA!%$47Z;b_VwS1*MjpG1(i?|vUT8CV^+YDhF0#AM-N%>Yw#9kn zCKftdeNTqM-o_BcmEAaCVNR5!`$@kOYpcc#|JpQc_ZMba?3BBLes6dT0~O zLqIbPKTOE_h(UEr$6Cxa`&|q+?za&@4^?K}ryXnjE>@CFui`u_%Xp7yx)(ep_wyTOiYNsrfDvt^E?hy-CKnR(}2ZX9eM=JB|&O z&3-5`#FP?(+=4$q2|Hf3U{*jSYw50oswnd=HjKWO#!#g98_#QOK8x|xUt_+ef*n0n-H3W*8wXt8t7 zNq0&R^AZ?D9)?g{2F1rCH{#cSU>;UFtVsz)vOkgb_nqU(t*J>k;ne-Qo+9GBcxE6K z|B&B$hP^F-NiiCg5+iXHwc^~p+?&w-t*WXd=;&lK#w);8nk_l8l^FV>C2ErQv;to; z+vK?I7p;dB$N`be4Q>m*cWN2@SlnHrQ}GtIi>5sgKqG&;y*-3e3+!8mytg!romz2) zq$|THrCWwhH5C;V*%h1A-}s|fCLMBPE|}kfNeZKdK0FLT#_9$=IS}nzd2~Y@9!7X% zRG+gW{Kpe)^wTlRIJtrPOyCpMoI)n`&H}Z<`SVMSpO|gb9Ix}0wYvJCU^us--_Xr* z6|IiEiMtI828r>R8@~$ENG`WbvFGU6*jT(HvJlTC0c(kBq6<~j5CgwVlQvlYjo~~~!3AlBC*>fMo?Eqkk@=+COyf{=fz2ZG{ zjD`#}*@E#OcEYR8C~N29U2k6H(wL~IsAz$~VA?hn&aBpZxCM!i`E6Ui58s8D%f^h8 ze{qqjaV0tOZMa&d1dnL;dTFQMjPZ1)U@sboi>y;N08rxm>^W z9m@x2WKArW9rUK{U6>*Iqqrqo@)|7btGObbX#qc2_R97>fKf4kFbF<*ZfAfNd6%fQHjMaRdGLIlDhU|i~NN4#4L z$oB@eRsf>xyi5GZK+0w?J!J5b18Q!;C^?^%-j7q*JgY+K{mPxQ_m#s*6Fn_K7WjsJ zdiMwiTBNq(w&7hY`u!4r(2BFJFiEDy@7$QcZ$oAWM-&hfHK%onBn`ACXA1%R2K41T zoB~t3>(um+8;)B;tBt#q1=&15k=4@DQqBY1@(xMeqeIeXXBuw4@}JdVpD)*(r;Qq8 zO-F5|ZworcUlyoe+-{jCyD~88Q+J@6mW2dzj1gHO>;we_2uWXcD&BXqjb>O-hAAWx znBYG1xX~wN(GfoQ@gsS$(}&O_vwMR@cy0L%NCLwUjCeEjPb2!CuLYMj1O?^W- zcAvGfw6+daO=_vE99dQ3U}Gx>P=V~1Qqz`<6Zw^)!NFZK+wWJBKBop$#xO1AZYAZ| z`!5414t|vN*~hg}Rc!fWcb%MYRQmm@Tg$X>J;m8f8HeKT9Y2D*o2z@4~R4Jj~S`n@rs#sz0SdUiNv^}5C1 zkIR+*6o1cGQX~2{{{G|Xa*}S;52Y@lJ6fkTf4qyRRWMyrdbD-&HxVXVlf;4-gp}Cb z*#@JI)Gv^TvivDN-F~__)8Y_zt^lj_xr&aYy!urKL~cE7Jd)zs;C-v*6%Z#75KMbL zE;z?)tpI>AG3Q7~$2ie!Q#Fa;%o+PM-Bv7QuKBViiju2dYvR^i1ERuY+BJln7A%F7EA*z!=(wf zaxJngK}vysB6p~YBMx8w4wz7S&u?=WO{%N+>u9liz4vxY+R}${!=!PeF~i(9969A0 zskT~)jtpaSD^X6*%50*_1);QfrZ%triaPP;eZKfc$FeP8e?7!W=JXc3NgbCJHS3^* z*le4-+HKgo(kRYu0AOsB7{c!IY}i>#IN-6aRt#$aq|HuSm#ee0X+>9G|Lh40h4^+$ zwgBhU+{n>!XN!X<@PuzKu|L-2+f2e8rvXiJJx)i<*~ni|31Di-@0iO_M2eIi7-~LTw~ygg_Z*(VFHgN0zSmo87C_&EG(^WY~1u( zNq6a>GN2dA7~ccGJRfgqmZ{R&9bm! zfdyTx`PxqeqbCs&5nZnp{0hB>rBwM73Wmuiin|EYj;@Czll>kEX@8ANpvz%$kKd-i zpa%DZ*^kD@$6Iccs-+2C{_Y0@Vc8^r3KhvtWi(R5?$Z6P8fp!?dnSrr`tzMv(?0dU&6UGWIh@;Wb@)t8eI7}Wq&C&id`@CiH6BIBmV4d2fa^I;EAm(E8<>>|%{j(|s#}@H;WTM@L7eMn+r* zM5hu!?l|4$;5ame#BnC7lhiG^KszJ*DQ~^j{n6|AS(aL7wFBxf?i{Xu@jRFLSLv^c zI09)!CG>}kL$r{U{~Or%eo%|VP`^1~mJHjF?!^r|JG)Fivn;T>e_SsOb;ZsryfTXY zkA(0GP1-`mO9mb-E4SasKEFA?Gvkz=E0L~TKhKP-92gfi#}4&73VyOVD*Sop4l{B- zc`FoqI(6wtRF1b-S(X6nkHb3KX5C_e&ZhtovGk_;?TGHOx7g=O$RK89c*=aUtCttLDdl;v zMzC%-wx4gV>}V>d+yDcM^FYNnL>qhA*Kn`uh4z_vTu#v!CTD zFy)dY7m8lT8tjeR)XKd~x-Tn8OP3lpG-!4Oi7UlYSeN`RTey7V&|#%{mnmZEM^fH^Y3I zp2HGf>(gy*k}ul{y*A8tldQxov+vaQ#cA)ch}Ww5YF5Q7q1#!eG=A>r2+%q&*49L- z(6OL3665VO&(gfs1lYA!5D2n}o(?9ZVO7sHRdD}PxQa?IkuPO+p_1MC0sO3C?(z@> zNB3iZCCn)%x|~>M66DU&x94eV$(9E_a+-cJ-@f!>@40*h57Ma0ZWMo2*CjPI)rqd( z|LE8HuN?j_s-FVGDrnb+valzD_G7vi?C_@#yh_W<_tm{Z^kf;3FRdVkRK*XhEqM4M^%Rp9rim)Erw5Y zR3A+%jIlEz8NaoAGuBX&lh1qv3~hg8u*RC@J6sFyCT`5!!L4qI&ohx;!J?Mp;?z@k z%%dAiN=tY3Ipg*g#9hr=(uEwSq(!gRs4udPvln%*;mnJ*L+9yO;+ynyr_r1=WcFPz5>7w-)2O2V#D)gIS=9%E9jyP9o_^9nKlswY+kg zy0aZ4FLgB<#>rXG&7MY$6gwkjjtHW|niGYy?a3o9A0deQsm`!}qOkvok6SUuPWIqa ze7w0@mXx1r4{t^Hhu`C_4HoUsR1q>tgt}8AnTiWymK$V6dzWdB98|5csV#;*THxKIBz1R*?kUPD14WV!)A892)}+0)W!uPSp1NX2eWw(tJU3;ZPf#m8%B zR(=Plq3w zS(&~Q;@Cl2xrrMmlDTnA)lM^x)jRg0+x9%a_qS|}=H8ZlccsaR8zy~CZ-4;)B5nT? zU|?U#$psaapEt5CIb&gKgBfv^bH?>(hl%p+)8Ut(%NeNuQ5sZw|NE_&CyX&x?>;8S zzUa!VM+Cd!W)v+RA0HdQ&quPpeu_CIrqXh>vpZi0F0IUOwj*EQ4TpWtu)VQUMKcgI|6JSouA1UzAfPdM(Se&C`R! z{dUsw>T1&0QwRZE0DbfP!KkHIg?E@KZReJzY_8yC(9EX@mQB+2{g;oMIg6kNH<&V( zEX8I*QI$)HMpbgFO<}yoJ9$k_mwD0A(QTe> zoBFzBPCocWS-t@Khp@?TOX?i|aJ-paRD2@x77>Y?S607?oC08ZP2}ZWcjA_DHx857 zmyq9g(#L+NzJHbOcRFcH=Xd<8qPVyiMn*;0e>aMmZfWk<0p3uCxG+H6|0z7*Zzu6s zUS3uetlC{l;xh6#GB7}utYyKk2E})4!Fh_GSSzrX;eP7Y(njSXM=wE5$44OqRFFh5 zZ;K|SqT=H1uSSr%mAg4gaaVy^F0B1&NlB-;2`~5RxbnYD`9E+Y)J;}*WnWb8Iw)-2 z68V{T4_8_|j-TwKQK8&wK?B>Kr-IsOneNs5ZZp=+uWvH7evKSJU(J0D;Qt`@-q_>o z8TWE__rwEXfRE}{;+@`oh){drTzAca;h874Tl%-AzrPd(cM;mxGCm?UU1KT0+4_ii ze1U4h2UXfPjMh9#X`Dd6`@@Khv})_xOz#H5k6nnpy-`1n0XMB1nCKU7u}PMY8A5&S z43~gXU?Cxfg*B}>3fMrt+@)KBg|C-2SnQ4_x~017a86xxRmo`$y@&QfvN+2uy3I7X zk*$4U3!aUQXHTU z1N!qv5v-XaX0;O$Z9N$(kN8s>%Uy@7Pw)?zN3McsHkk3xXy)f0IH7UjLg!vG3IiWR zSv$`KyYjr$t?KIPIwKKw3-D}1fI;=B$dX=34{vMg)3$Zk#q$=tINkB#O2xT2+lz~g zP(Wo_CTQ$BuoQ!k%L!~G_pSGPKMAzlgII@AN~O}hCw?MPtHG4z|NSZAn&)L$5U<|( z(`1B}uq-xhx%!itnfdBe@Z^^gT@#^Y7ztghOSd)qZ~GSCT-R{OpTYEJIHo!=u+X+J_W~$(x>1g0FiQ$1@>W#xsJ$wZEkK7W4io(P<+md9eWk<@(y`M z;hvlq(l7Rsjh<8>PuW7BO(?q|^vfUvDZGk@-|^gl?8{2cth*7Be+z(uMkd1#2e-Gk zACX}kI*j^g_N?8XR7zbQkKFHxi#c~`Tj25bz&iB3D%KYP|3WByn!~ILM;Tnyfmm7B z;FS_{W(~14pR+=wm0}-F+TXuPGKc$EN=?YYTPzf=@X@UABReYdz%T^9uxI%2^NqYO ziqpg~4}Z8RKK#iiC3{JIv(I;`eq$tGqrF7w^plC9VVycLc30&UModgh@q#nTbXT$s zFF)<5P5znm*^7(O5jz=7j2mpMIo;49MDQL@|l0hR`bDH zKpp$(l6$dlGJ#B0hyXKgo7j&M{e;J$H&K2fio61e{R4k;iY;2?1S zYPQOL+J?+u*-@kzdHH$BiD1mG-0QEhvt1h zsXS^tTc#Q9{PJykC{crRT6BzZj-a3*ZR6n!6?ff;HC6P!M;ziO>vGqnWVGh5qMtpi zn)KcYZ}t)f>YuNhb_Za-$ZAE)v*wv7}QH7neFKy>lte4+xJ|Bxo{ z3y>T{+Z$CoprtLAZP8_db?+wqoA*0qKNgdc{`rKSrlYyoQ)d3A^qlu@3JJTB_eygde;eSM& zA2A2`0g+@|Sxe*ClZ@_%Ht7ch!TVW$r-o~Ut4qbrTMS52V|V|!N=LUy#&bWk2`P<; z^~WWD((m5yv6+d9dCz{&Q3;th4U-VzVILf@|2cme$F{O37WcRpvrUs4zn;QC`6rs# z^=icWw9NJ*CFRC;<*m=TT!Tu285&=oP8U^#^)YhVa|o<-5rr|zHq)4g=7wUC<`Thz z03?XI$En`gN`Pm5pjmDg{*yS7vBPPx<6haMy+_0nIf{TY&ajia@H_Zp~XFYJ2>h-!`E=1Q) zFsC;y1^M*t+qVgR#1gZ=>ZE3~qzop@5H%i2bw$)CWm2OAD_z3*0Gfd69(w)?kr128 zp)pbZ;PdDa!dfaMLNP#0_PX-uy}{o0fCVA>ON4$Z7l_KWvn;L(TV=WT)yW zuMDBPVVmD5B+hlyYNbqXpt~qG&h-Lj*Q~`J=NIj=4;iTtEt__Td*YI9M637qViNGn z*fRjtm^|7OQB^eW#-up!@mhM6#d-&$ZY{*setXE}PlbJx!baDA8lmj98Co862yNa> zHYv?$G;eupid`T~0CsKLh{^rWDNRq>E zGdQ5>7V8uWfC`Y**^KMX=rC{!Z6Axebci|4;{-#qk@L>2g=RCj27%FTIATK*M+4tV zOSzqxMqOmYkk63u%DKB=`?(vwH8)@7NMq4M$$>ihx`t?|wQ2I}Tgje9R+tfm?mJsq zd_LLW%0V1B?owuuo62OjiJsOA%`0NanOL!P5ZGWcZZn)?N)rO%7E=cRZ@Wu=IdV)+ zK|$dofm_e7_(C(Q%u?_8&LxG})SmuMMMX5)%WO2$qHAOFRK1&+sPbjZKG%nmyAC>4 z8hjXE#|25$;HI$U<{Q-m?{6BYC~Y#KLp$sYoLgX&J0#T5?-?9jW=igGd45urCgg|& z@{*Sil7zR`*Wdm$cx@kGz*yYWpHXP7SSC~3`aS^Oou2g!_c`e6_7dJBx zSbUdy#H9X)nFNw>w-pyi+$)Wj7}e+s6(Ecuf2tkReyp)oHqAWRH1CY0Slgbe+M;l1 z*lWJv{=H!H_!Ahoe5Gv^s>k1TzBoO6omamS7E?a+@X%|!q8noMvG8rU!A)Yf&vrfx z1qdRQoi78EQV%<4rAg_C}y%d0Zo`O zQE@g@ZZLLLg0wrPA^koq(-l?-7&SIV@7GspylMF2usnJd0_UkBOy8G2*c8tGyqFaq zT;A4OL|Fg?p^^**GuhzY@~DvV!^;;IT(=XCz8sRlB0nZMF>OC9Bf{SoDy3dcm5`c<8{L)# z$AMTz@w5=p#nVn`k9xqqca?^Y(Ba~mJw?mg7rLVQGhbQBb#Jivic^71d^1hMxLH}e zh4cX$6tse=hRmK5a93+Rt}v;GZRkIyLgAD*n(CK)Q-1n&Jf^a_xmivjdig$%2jeG` z6Pyb66&TS-}3p!)=g{ec{mdHU-D*^Nctmx_%J($19i zH+~0wqsP2Eg|>ZaH~>~=t6tETn>Ss=nK6=>rS1K?L*_1G6ZX|4R#@3T!EsceO#ec_ ziV5Vemqo^!<>1uy%tt$rqwW2xIg6P-Tv-uPUx4YPU6D92TFz;k9vgEfpRow0(a`;L zU|3sNceelsGyR?OCIksU?E9m z*@Pj9r?T+ zL*Fy{KD|xhIUjJhRChtrbKguby%tZji|lXd%PS&dCB}H>l=-Eue!0(I zI>>&+^UzEyALQibF5j8Ct4ASu7tX=L8c`6;S%4>8wBIi&=iD;stWot-vw)RDK{b$c zl;q8$i1BBAn)>Wi4J|YqGs=vz)62bfbv<&0aDCEnc~~fN+(P#VNFQxIh~SWZ#SWXD zn5ey62&2nnzuo?=^1+IA+a-VWBdd#kG7Z9TBpK5$WnG1#kU7d%zpK`{0*zcg_AyYE z`5;4OC56m9sJbce$_g8Qss}E|kzHMW1|nBT3|n_0<<;dojaAs=^xM63&r##lP(J=L zH*2$oDmc0q2dGi;z1eEmQV}1InNXFG870@V2a4X3ML;f6_QE<#EGHuVaLwSve6NA4 zOPp?GXeomOtuVwlHO@U}&{eZ43Xe&-lARw-IK`8dd-R!nc;EOgH|CO&d?Hqn5k>TI zZt<*!wJy<=b-8VCR&=j0=^_3Jp3N?c=C!knV&d`7Z%=&E--h=zhJ}O3sgz|c2k-=9 z$OpHfnr`!>S3%ynEGCz)eaS0+peLe}KW|2IcqVfi@@Yh$&c7{dxjL7f-T2*>LOKT2 zJG8&wdD5hiC*gmbLuVYs*Z$e1=d}p+fW)h+mjKOt_PyOk=kz75kVAN6x2IEjWCrH& zuCYIn)?*%(=TEX}{MARj0`9Z{JMvz@e*aoPuQw*C6@9F%w#`eP?zJq{@qgQ}1 zFBL&U_DWbr5Pf*J8<*yKX&;3xBhX!7@rryGz@)V5Jx? zSl4P!t+SU1%<+IAQg|J>4*oTTq4bEDm>Brca)O3XrK6+73Cjb$TV+UDPbd7BYMgGg zz6zrN;dgL^3U1*j`|-*ievi6~ z_Y6A&F89M%dJ+%P9C)u7roS|5o!N*-{^|NE4{Xt@&#W2@S&1LonN=xc-?mAX5Ed7& z-autaP;u8dhDgMPx4QDSiQ~D=vlNHej}?ms3)v%$4}HHrJVQr|FTQGF_=D3nbHE%j za?r+bjjGD;>;0eA3-IJ9P^cAQZ{|L5Be|dOxl%L@?W;n*2{KjQtti%Y;5Z4wuqRfYP z;feRB?_CEu(|jJO?pUvi&Dvz0_sM1rOq{vBLg$tYQCR!dHSOHlOcmk!?$Xex1gN#S z9qcYN4g0uT_y8}TbRxu$zoEz8W*|k26b95ucrj?`SY`29z1RS#{hc|~KyR<%_i7Mz zteg3ilnIkEo(U8RUCW7+^0u+J-?G!eT+=MY#C9Q{r4BmCu-_Fswluo8kd>9LGkM7- z=c2FjAC}im#O?v9BN3J{dxU(%@V?q18+5wbQESZJojX#>EEid)+&EuxB%9e|lt_0k zXY2g@oVZ3|cMgudB;FRT3a=U{0aJl4%sSeJ&(tQn2>}0up+Et6_Zo9OX&Bu!$`PBk zyu??=Os$-K#cGZ*g~pfPaNsHhX|;T~RMJKzKNk^H%y+L%jyc3TKUy)zvLdOhjvm%hHS*)6+nqDU3pv=gXTv?6H1EbJWLY3q|@%3es1}$9|--y z;-~h}7S>BwOk{c*GJ_{($*KewTb6&&$c$GFEQy1oiQt zZg&ohiG>g-NKjsZqUYUuF9sE}BZj$V^!^qvL^EcEfk)n}0_8B_*Yx@)n5zg6m?7_XXMr82*o|73wg8rpn5rpw9{v zUQTzV)yH{>KNL)z(Q84RTxr#YSJnbkAAa_GW3!NoG%Yjic#6CnWQbOlyH43jOwspc zMLJ60-)GUvli&DFHfkUu@>YvtL6t1lnN(r)^;gSYiD0{zFJHD;2F|Hz5>2y)0{K*% z2ZIF%rdKM|6|77X`4t6`Z+|LZ83!kFHFHshe4cE%-L{`4zfk><%Bw6{N8tP3r?5y3 z=Vh(+l!DxWtyYqSl(q+o$Zj`uP&LU?^3JcMx5Mu(E{RhV98#psFE_^yG+VJ$W;o;* XG79cOO}DTABS}R;UA|P-Eb#vTi{*=0 literal 0 HcmV?d00001 diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..b4e0acfbc11203068a008545ed95e2e03ecbb921 GIT binary patch literal 14152 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 literal 0 HcmV?d00001 diff --git a/less/sprites.less b/less/sprites.less index c3b4206656..599434b2bc 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; } From c63175dc1d41e2d26e50194a7e24cc0ea618446b Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 22:52:44 -0800 Subject: [PATCH 506/667] 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 8c86ff0282..02cc730bd3 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' From aa594501bd24d51181dc3504602aa4aaefb1cb60 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 23:16:02 -0800 Subject: [PATCH 507/667] 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 68e161051b..28f49391b5 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 dd65c1b8d0..894671b7e9 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 59b8a03d6b..6e3ba25da4 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 1205a99caf..82c3188319 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: '
  • ' } From 942d1b459568acb9f66525f8f6316a252a199e02 Mon Sep 17 00:00:00 2001 From: Burak Tuyan Date: Fri, 27 Jan 2012 16:33:18 +0200 Subject: [PATCH 508/667] 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 .../img/glyphicons-halflings-sprite.png | Bin 14152 -> 0 bytes .../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 68e161051b..c878d70ff4 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 a92b1913a2ba91686e5d96e915367d7c31a26146..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13566 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 XG79cOO}DTABS}R;UA|P-Eb#vTi{*=0 diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png deleted file mode 100644 index b4e0acfbc11203068a008545ed95e2e03ecbb921..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14152 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 diff --git a/docs/assets/img/glyphicons-halflings-white.png b/docs/assets/img/glyphicons-halflings-white.png new file mode 100644 index 0000000000000000000000000000000000000000..a20760bfde58d1c92cee95116059fba03c68d689 GIT binary patch literal 4352 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 R{`JtfXJldc{ -
    -
    -
    -
    @@ -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 c3d10eb081..6476669e61 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 a92b1913a2ba91686e5d96e915367d7c31a26146..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13566 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 XG79cOO}DTABS}R;UA|P-Eb#vTi{*=0 diff --git a/img/glyphicons-halflings-sprite.png b/img/glyphicons-halflings-sprite.png deleted file mode 100644 index b4e0acfbc11203068a008545ed95e2e03ecbb921..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14152 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 diff --git a/img/glyphicons-halflings-white.png b/img/glyphicons-halflings-white.png new file mode 100644 index 0000000000000000000000000000000000000000..a20760bfde58d1c92cee95116059fba03c68d689 GIT binary patch literal 4352 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 R{`JtfXJldc{ 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; } From acaa3b59775d6e4c3f4776027bb325b418dca6b5 Mon Sep 17 00:00:00 2001 From: Burak Tuyan Date: Fri, 27 Jan 2012 18:02:57 +0200 Subject: [PATCH 509/667] 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 151407a29a4486d24ece6b94b84556ec16511903..92d4445dfd0af414835467132cf50c7c38a303af 100644 GIT binary patch literal 4352 zcmc(jSvb@I*TDbCl4#mw&6;FnOR{7wTf|sqB70@Y*4Sf=t&%DGGDxy7<4in zwn`&QQOr<`27|~lU*GNfe)r$+;%v`3=Q$VW;ymZMrG+ssw-7e~0K7L%46Ffwh5XNs z<6`?KHS^P-{ZmgZZ@~?jOs2~JH%~nY@PG5j1zTI#0Amn(L8qe2oETm=+B^jogFL!D zS!ISRHW3ybWQ6o&?2=byQi)JhfBSH9PzL~<0B#!S!^50cUq25lRnLyYPq06zWw>~J z`$KJG?wJet%MCZ1y81U)c?UzG;{mBi?no2aAHvt8L__Xy66K$DAupSD_4^VSeG;vA zGhrY7dmCA}Zg<=d*dvUYvYMo40k!iu>o|-n)q^ld6Q(6yBtUWr1GY<4vK2?uoeS|r zT(a}}&NC3;#Lv8{0Y$f=#j|95fZYUrx?foCUQ)KvUf$-LSb+6D%%)z#|1KO+ZTgw~ zNbE_n|4p~xYoc$edOQF-XOS;%evzdNi3 zk@(r9h#R5FpacG)j3VDRRz>g49u-o5A=@X`M=nQQ@W&MqFu3+}8)vIJyezf?(vDF#3iq72Yg1rU0$uCw``L1fzH6tU=MT zJ)FP#7~BMLoosB<>)Y`BnyxN?%PW`qwa_nrmk;P<^+|3lA$cC z!KnRdI-*8rENgl-h*t3^hviocbR?_BCX&(%?-)#H*`RRAUES@w^(0ey@bvFIq^EE0 zYIYPpa4Xz>{9(cUIq~=IuByDHtJskc@OXkoyhOvqjT$BRxhihe#hq<$(TaV?g(bYx zzk*$b_y4xdrKd-u!#@W)7x%!%FE62JOZu)fTpnAUKW94KXQKo9lR9BoI`nN#BVNL^WLc-2PBnDb`!FkQ6Yw zt8#VMCqN`vOx>8A-pqa3!sg7$vF4w|C29%3h5O_{d+D-|gED!U;S&A}5QU_Uz%?vp zmMBIPvj7qQQG74PJJYIU8KAgcJcJvNO0O6=%8w|@chXvpUX6O34cERMj)m?X)jwit zWYksusgx8zcrOv1Kd4Cm%yUoW#?wfM-ee=?*pXt7dUvyZrhI*Zx3!VQzm2&Dk2i(z zv;J?=_W|Z`2Nb*9*m`XJ^1ixr>GY^eNXXM8UzHKbJ%`E&g=nC-&t%U{b2>k}4 zM^eC8z9@VJ)NO6~zgW94x7psn_*GsP&AXPV>|c7+3V*`GDl?NuNHOr8_5jSBY+FrJ zxxFy&omakmacj-wPLUexLeI~s2^i^7jdiy$lDh;U-ze^bf8Wq&_j48xx9sRj~I0?AI|l`&NRKa0xj_M7{QQP8x>W$llZ# z^2}mA)Bep^+iA@Qw-LK1wT3nbnW#j??18HOX9M~EwO_4MW54*U(nB|yBja(g7FnMC zblZNR)Y{`EcNWNZ9&#=!$@W#;-?`_@7{fb;%BTGaNt!jg%h zP{`+<{G!`T5|=OLq>Z*{Z2O&8zMn16ACVB$Qm``DYk?tjJdb2uC7aci<-`J?E%OU+ zGrN5UtA#%|w#4Z;NP?k$>n!<|SrjF%qnK36 z-X#tb9{hRfZswTsPVZBN8H~75sHKLYIz~6u+pKzy#crwlQTpM#$E~+Abk)TD#sz#v zXX8Go`ZaF>B8Zu%M9U<;>RXE zbfFb@39Y9#&~E%DMKl*GIPjFwcNZ7nuMbVEpA0WbvBjM9QA!sp{YiDoe131&NawG0 z)w7{^`zTTBX*b%&r|n~U@dMgnxo!))g;D+Qg=`Xw5@VHk^{hiH?Dbc#u;gsXHzn0i z2)8o6*&Kl>6tpGG-xYvB-r`9coW<<#c<0|E=wQpY(XerrkkfVOt!t*N?wvbI|9F@&~JQ7q2jXe2H zCW^MvkWX8I-=%fo@BdI{A^py@pAB`shd&A{*amKE*X!a7A2Yu?Z%f;af$36@t#hgGI$UAqZQr>(vfUM3&C0L=d07kpTV z65hXXqa6SYLUvQ%beIm#w8HN~d3!4?$?iB2Owr|ut8l>>rMSqaZB}JGncrpN>H)eX z?`{XC$$(nou>9J>y&RJ_GCHrPS%%Jr+GeZ-p;^lV`1YLmyxKN-u#7+}dnx}N%zgXH z$CV1rQyi4eN)t(4&9Ix9{_jMeW*4;LYis@>9EQ2Es^gfy-VKyn0lc8i{7q3yuQV}F zD6Fom;2?qz@ukzYpge~g8?BAWbC}{;E82F=WrGc0;?er)DQ&9VG84bSn{>9B(k zwM%!e%*jQ~?@0DuS;yYC#^~O_E+}d7VN;GP%ockmCFlj4DNZ%yl_X-Hn$v_=+Er1z z)xF^ugN@xFweaki3bVXB3?uwjsn55RD1&YMi6B+jBAEU6|0Y1ne zLxbyOnkM9BHX2f}bHa<7WG>P_pz=aP(B)D(uo1i&yvId9DaA3GTsK?WdG%g5Q5z-% zUfT;wH`Xu@LDvM>F<4<`LiFUdk7UO)oS&1>Rnv!81;V#S1gZ^;byAIw5fmjY3m)nw z?+@SmlmBCWV>bFM8|-jGB{WLeI3o9DaWo<)11@8`kh*v=cN0DNB+st4sz6R#2I0qi z4c&8ZcAexDoiEyzoZJ((D9)8bG%^Z+MCs@_Q)++#Uvn&7#CI<7^ioFM{2qLTEAfMX z#1kD>oACS6EsTK8F}{R&pahvhyt|}$lX5-EzVP=!*jL*U(=7^7%UUF#`g>m(9)4uh zN+-O*&B&PgYQ520)x+!;$#)PXM`Kgq-o1CQLPsDGuSVi?k7|gIEtmv^WewHMkLAio zl1Us*ZM8T5*j_cED4OCIiNDZ{(dj&{3{g&T+~4Y*L((GimlI~v8Q&*2;zNurHxdEX zDgWY5T-u#~Rw6AH53<&eUOA_3sJa+<`S@61`0Z+&gPPC(dA9xY-3vCHs+QQ8y<*H| zq`~2~B6ACGIIhlq0$V=$vE_&HDcwxCpLD6$_1>ZT*h{SQByL1NMw0+fOj?Wz& zFvJdbQkbJBeJ=wX#hUle7%rUXR$4yPWhM|#t(`DrC+d#^K8*!sRn%{Eee5S%bqSan z?Gaxb6y6;Dw^4Ura3@7~UnV3ahsAZxfc!%uwqZbo@PGj7@>ji1sVn}8fiB(aiz~Jo zTDXK*@oVh~gVo^Iu~o8PQNMj6)RalL?o3^H@pnjZNLWoX&@@;gDJHvX&C-&SZCkAF z?Pux@B3eZQ037cWb&FZMuP+XLz1yG`s8)?SoCs!ygWlxG$PB`Eka2i37Fv)TK{|58 zJti;S=?xo)8?eTei(HD#f`Jq8j>vX~5NRzRU9sf_ z>oxtdr~$>ax+OJ;^X)vsSztp0JYJsoQlX{)JP`NN^%4mv6u3oW-hBTdM2W@5-Fze> z9n9nd!;qg7R6d&M#&&}CPAvA|mF^4XPltG`XZl9!t)5o^flxcEGJRDAZjOjF zQ0Iea%DG$E3bP&!(93|2RCY3l5t3s3J*JOik0=hGeaJ@3@H8tD7CVRqHg&`+R3j0a8@kqB}PI}{$m!yRab zvul5lL(>3*TF>n~)*#hsmwUTtKRAA2Fnk0PENdI!9GrZLu@zyKzs+&m-IKFviqv>& kg1Lm#gqI~e;$iYPkmG5c&N-g{UI@TVLkokN>#mRg2V?7pi2wiq literal 4364 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 R{`JtfXJldc{in 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 literal 4364 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 R{`JtfXJldc{ Date: Fri, 27 Jan 2012 08:21:39 -0800 Subject: [PATCH 510/667] 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 68e161051b..3a981f94da 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 9e2e1dc1bf..d2e049de5a 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, From 6075b5dee6c892b991e8a00de70942f28f9a1c14 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 17:32:11 -0500 Subject: [PATCH 511/667] 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 809c2f60e7..c069ed5886 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, From 841e386daf01e06f2eba00725545f3e3315334b3 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 17:32:44 -0500 Subject: [PATCH 512/667] 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 d7f5337832..f18cf9d955 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; From 526d38839332907062cde27727900deb06e0c50b Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 18:03:53 -0500 Subject: [PATCH 513/667] 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 d2e049de5a..55a6463687 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; + } + } } From f51e703ba6a87ad504682c16b6dd747ebcfd2afb Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Fri, 27 Jan 2012 12:16:36 -0500 Subject: [PATCH 514/667] 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 3a981f94da..4fe86c977a 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; From e44a7dd4ff2d505e6bc41ba0a5fdf66650cdf605 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 09:36:49 -0800 Subject: [PATCH 515/667] 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 0f997d3686..5b9f765ab9 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -19,7 +19,7 @@
    +
    + +
    + Some value here +
    +
    @@ -1424,4 +1430,4 @@
    - \ No newline at end of file + From 43f1a42f7f254ad5d776564122bdae6547a4fbcd Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Fri, 27 Jan 2012 13:57:51 -0500 Subject: [PATCH 518/667] 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 5fb0a8e975..fd802cc359 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 55a6463687..52f5063f05 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; From 347a15b69aff9cf3f9bc5c47c9bcadb459eb895b Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Fri, 27 Jan 2012 14:17:06 -0500 Subject: [PATCH 519/667] 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 5f6f0c24b2..06a7d91bdf 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 dd331ebf28..745fe33d95 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 599434b2bc..fac416df33 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); From 8328987b15e0bb9e1c2ee1bd90e8dee9843f0ea7 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Fri, 27 Jan 2012 16:06:58 -0500 Subject: [PATCH 520/667] 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 fd802cc359..a058f03448 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 06114b254d..e73b056e96 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; From e8647c1b118d2c726a8987e9a41aad82da972b57 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 13:20:02 -0800 Subject: [PATCH 521/667] 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 02b5c099ef..6886105cb9 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 4fe86c977a..b772e8bbb5 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 6fa20cf4da..19356df1a6 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 9cad9de017..2cab601dfb 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -30,7 +30,7 @@ - +

    + {{_i}}Refresh{{/i}} + {{_i}}Settings{{/i}} +

    {{_i}}Or, use them in navigation.{{/i}}

    From 1c9db106fadd544d8af93a60c128842f95724f03 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Fri, 27 Jan 2012 16:39:27 -0500 Subject: [PATCH 528/667] 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 06a7d91bdf..843af6c622 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 745fe33d95..bbbba1e025 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 // -------------------------------------------------- From 84b9a1bfb6ff5d1406f5c0393d6556caff6de40c Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Fri, 27 Jan 2012 16:39:38 -0500 Subject: [PATCH 529/667] 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 b2284bc164..e36ec0b3cb 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 9cad9de017..d1399aaffe 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1034,6 +1034,12 @@
    +
    + +
    + Some value here +
    +
    @@ -1491,6 +1497,7 @@
    +
    From 3807a88ee9ba33f27bc8762efd789f7ff710ed1a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 13:56:50 -0800 Subject: [PATCH 530/667] 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 cf2f1b59f2..10faa36c08 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 fa22216ef5..698b68ea19 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 45d359784f..f6504a249a 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}}

    From 6353e5070ae429297bdfb215f17093e4ccbc08f2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 14:03:36 -0800 Subject: [PATCH 531/667] 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 a20760bfde58d1c92cee95116059fba03c68d689..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4352 zcmd6r_dnEu|G?izMxtxU%uI5!l8nr)ZF&&*%FGe4jtO*5mbhJzhV&et11z&&^B?xH$MZ007{+ZK!Jj01(PQ zJBFS4pH$0DefCd1HM@h*JNkcsi%oOXzj>qsEle$eQ7ApHL(XYdn5Y$Lk_3-J9p9d) zFeVfl3J47_g1XaoDXWsnBp9ZzZ74CI9RN-Nw{>+8A&#rBpZgc9WX2H3Ssv6doZP?t zS!g}lGvW1<9%?dj_G_x}3WUMN(8(x{a6_pd0yiUsf^67GGS50uSB*ORe5x6}qAf1z z@Q;2y4G{Lb?f21p)uTpChN&4q%^blZ2IsusUOhk)pe0yxPD6oHKXWSjv8&2pMdnegiQUtoXt1U0MmWAWu2&>3j$eb^qKNV z_(`JQZP&mXLT@U%-2rPy!7r|*Y1oAdlarltaUyq+yq^|d{B9_>t@Rd#@_KW9w_6P$ z^Dv8(Hi8pDJK{r0Iqq*va$cL=isZh0=1)wIoQ^vYPs$(rBz$+DY z`y}1}`M%-da686`}zw_w>8 z!BcqxVTim*F)-}$segV$ON*!Zl~dhX@Rz^K2Xurh<1-vjImult%O z!-WXvkA_agVuhluW};J;#r>)?^uHS;G?a?j;(z?Y^FTwOA?tzLFvQDf&X8}9s7Wh< znEfd_vPyF_V`?>kR`w_h@+%59oKa;NPVGUo52QjisO-|$cYE(VNmm#+`#T5a;gh|Z z8A0^l3UwQMn0J3xXWL7tY~OxAu=_hGvp@_%SZKA)ec-h-dfwIhS3jGBLL6e6Os;1LR zRDG&3TF`HV*n{&*H!oTSsLq!U5xV5!Yr6I_!*VhmwC3a2BOYfWH13AtVY|n5jv49e zcb0xCCZnt0i$>-S$k9J@-c!8wG#siu(Lgy_r1nfy+}!W9g-ucwp=&Hs1=Vs4i_q;dQL$8~Uq2BVA4o4uY!6}S`xH(Qec+{mJD~qgg@6W8 zipi@Z!ZR+Kr_)u&G);pG$tg$8#KPrsl&N3(m($NAU&9ogH9rVfW<4Mw>^7$&96g<9 zHQzekG9T5SS7DVm7EFY%CjChhfRyap4+d;+^0ng^B)~xKFG^7d2oOo|R8uY&S|X0@ znAGMb^rFQwGPTzsFQ8ZK4S@WO(8`6T+$Yt9{jGMd?jrTeb|_!Un`n9xDZu-fW+_aJ z4Uyy_$)`Ot!~doWUHW`(?F!iYvc5+g-(W9X<-tX*h%6(f;+A(OQ@w{WYSiq&pjKnN z)tSH~5g)03sKk)U+&GyP*?86fusX1ttpH1ng8ruC6UOddM~t>0wvZh}1cW%&7{tT$ zze(TwkA~V|_~nL{6YE#^RUC__Mx26zo*w(EfK2Q@R6xo`VkJKs^Eax`&*O*bw~*ap zyaqA_p(~(POY{H5+NIgewtB{|(%ML_wR8o);^XGTQ|{*J>74v>{_iyU;U*NTN}A%` z`8ltg(&furYlb!j%1ra!KPSiGmJ>f4c!bkAtjb_qmQ+aVB(QohO zRo@%)1krVtMPgkT6&3T*u`XO8pE&-!!u((3qVnraj|gN5aDxvqtrPs*MCZcO3i^Qt zI7$&BFr)50exhv11)82?u`ab0FgUSw;dpbnAtmz4k^&Nx`xMQ$5(JW}ry%)ry+DV> zS)TWjtXz7V6iK5$ghFuPiT>;;fAp)oy%%7grs4UwqU5+Ms96%`wU=YU5W-UGw(6iq z2GhB=Zw49;Yu<#7=soc@tZvYFIVNfkRPsCT&;76cYOONMwv!v*e#(X?l7eB- z&pWvVcaO;IKDg7C8bZ-+Hm`g>n_WC6%BL=CZlc``M{0T;%eYQ4t}V%m20okR=HET) z@)@WU_}tJOqiH7w2K%lpe0P z^FhhCX$ufUPCq4?C1A8ZSrVz=$~!VZ>;=kb8eaI;S1TKb|E9j*muthJe2||9pYYI$ zR@lkEo?K76^_v{llrL+?Swi1koJYJqG_-g!v?$ITb=q4#Rk--)fABD zh4Ibu7+f~5HEzy@7xoP^f$=} z+D3gYZ3W>%>m=U)p#UNOPPd&2cD&; zxb{vXTzpCjcJAOEA_~=RX^_BM+_BYW*T{zzM(3TosvFOmf6Kp0IerP4`MuBgFdrkZ zf9X~m0O$toCckMn8klZDxWKr2%FHNk1VLQE)$!{Hz9{*a@TaZjC7kKsC1dIUx*6AQ zJFZc8p~!CewW(VvE@yaTPFt-6n+dZ@TM582m7=-#9JoDOH#zYPe{)-Lza89t+w#Zd zvQ3k$)Q)mPF)g)_+v$Gqgq~*RwGeBn{vhp!IPgkixW8WY)H`S{&~om!keO$Sum=oY zTatGW#*O^aVU<^!#et91z~$IYa;_C@J7+V)`<1b_lh`8FHOAgc=Az}lf)k%5xTMrv zr6uV%eKaU~wvi7pU)MeB7HK z2D;27Dik%)-q@hK-!I|N(cl`lAF^EIv0C-t$d1qtFnKIkcMW<4b%Lzf3Y+~~qB7`< zj);HTQS0Oex%zA170>?kRVA_m_*O?rZRpS3v{+O+cifN7Eb&>$Z==vGKh1V)C`qGu z_u8y<#N3Wp&$V^@T??GnE&RN^IyXM)r0h(gS3;b2pt0O!eNIt4{;3H~V5Ln7vs>8{ ziqqZL4Nwlvj4CtEv0>;Fw~D>LB_+-ecI)tiR%a!^GI3BawvNQGz4#b|_df&`e||2k;K}WnvU!Dx=0#ue(=U# zK&pYNNf5RQZOveUm+;dQ*FIA0&#`?@z*bBhUgr(n9_FpoHPB2pI8iMpW|sF*D{+75 z-k;nba~m^}=b7P$FAF1)S!oDKtNG-`%h{XQi6=SMH5GZ%8j?ugqt~!K zwvA_m(*=EIssFVW0EZ;o=u#R5gBB$CUL+->U32;2PM2O(drij20XBy|hH+=bu!0*KIKBj%c+ z^{)B`3$NB2yp-IHf02C#Fw!(;S&rR%2Pq(!<`Q=u&+_V4eCe z?!d0m@ndhMu%QZ`ERBCD+uU~%h>+E^Qd;Cz=IlGV(IwUrOz(+1Gkd7O z$HME|^+mAGBc4k(2jEj5$g30r-BUoK@Nn!*Td)5USoe+IZ-x9)#yd)sD}2Z?2{4@) zb|)xsK&pqOpB;+H#gbf^Pto29M<2Y>dU5pAF4p{+j=oBZ$2EXA*xI~AM@g20H7o_x z{2-Kc;SRpcxLXzU)a53ZoX%ndB^i8=>Sf&{i6CYkGSkvLj0<@C-!VKm#iX8dws__S zKp`T~rIAfaogJ!tV(~rs5)ctD#A};YXgPNI`<5=nWQjnIf<=1Pzn2y$C8yUkFKhwM z@%Ah?L`DM^@d<2evu->Oo=SVaiR<1GjYwe^G2)XY`l$Q%4H`|PpFA($N_8=6uOr0s zj+)C5xin zwn`&QQOr<`27|~lU*GNfe)r$+;%v`3=Q$VW;ymZMrG+ssw-7e~0K7L%46Ffwh5XNs z<6`?KHS^P-{ZmgZZ@~?jOs2~JH%~nY@PG5j1zTI#0Amn(L8qe2oETm=+B^jogFL!D zS!ISRHW3ybWQ6o&?2=byQi)JhfBSH9PzL~<0B#!S!^50cUq25lRnLyYPq06zWw>~J z`$KJG?wJet%MCZ1y81U)c?UzG;{mBi?no2aAHvt8L__Xy66K$DAupSD_4^VSeG;vA zGhrY7dmCA}Zg<=d*dvUYvYMo40k!iu>o|-n)q^ld6Q(6yBtUWr1GY<4vK2?uoeS|r zT(a}}&NC3;#Lv8{0Y$f=#j|95fZYUrx?foCUQ)KvUf$-LSb+6D%%)z#|1KO+ZTgw~ zNbE_n|4p~xYoc$edOQF-XOS;%evzdNi3 zk@(r9h#R5FpacG)j3VDRRz>g49u-o5A=@X`M=nQQ@W&MqFu3+}8)vIJyezf?(vDF#3iq72Yg1rU0$uCw``L1fzH6tU=MT zJ)FP#7~BMLoosB<>)Y`BnyxN?%PW`qwa_nrmk;P<^+|3lA$cC z!KnRdI-*8rENgl-h*t3^hviocbR?_BCX&(%?-)#H*`RRAUES@w^(0ey@bvFIq^EE0 zYIYPpa4Xz>{9(cUIq~=IuByDHtJskc@OXkoyhOvqjT$BRxhihe#hq<$(TaV?g(bYx zzk*$b_y4xdrKd-u!#@W)7x%!%FE62JOZu)fTpnAUKW94KXQKo9lR9BoI`nN#BVNL^WLc-2PBnDb`!FkQ6Yw zt8#VMCqN`vOx>8A-pqa3!sg7$vF4w|C29%3h5O_{d+D-|gED!U;S&A}5QU_Uz%?vp zmMBIPvj7qQQG74PJJYIU8KAgcJcJvNO0O6=%8w|@chXvpUX6O34cERMj)m?X)jwit zWYksusgx8zcrOv1Kd4Cm%yUoW#?wfM-ee=?*pXt7dUvyZrhI*Zx3!VQzm2&Dk2i(z zv;J?=_W|Z`2Nb*9*m`XJ^1ixr>GY^eNXXM8UzHKbJ%`E&g=nC-&t%U{b2>k}4 zM^eC8z9@VJ)NO6~zgW94x7psn_*GsP&AXPV>|c7+3V*`GDl?NuNHOr8_5jSBY+FrJ zxxFy&omakmacj-wPLUexLeI~s2^i^7jdiy$lDh;U-ze^bf8Wq&_j48xx9sRj~I0?AI|l`&NRKa0xj_M7{QQP8x>W$llZ# z^2}mA)Bep^+iA@Qw-LK1wT3nbnW#j??18HOX9M~EwO_4MW54*U(nB|yBja(g7FnMC zblZNR)Y{`EcNWNZ9&#=!$@W#;-?`_@7{fb;%BTGaNt!jg%h zP{`+<{G!`T5|=OLq>Z*{Z2O&8zMn16ACVB$Qm``DYk?tjJdb2uC7aci<-`J?E%OU+ zGrN5UtA#%|w#4Z;NP?k$>n!<|SrjF%qnK36 z-X#tb9{hRfZswTsPVZBN8H~75sHKLYIz~6u+pKzy#crwlQTpM#$E~+Abk)TD#sz#v zXX8Go`ZaF>B8Zu%M9U<;>RXE zbfFb@39Y9#&~E%DMKl*GIPjFwcNZ7nuMbVEpA0WbvBjM9QA!sp{YiDoe131&NawG0 z)w7{^`zTTBX*b%&r|n~U@dMgnxo!))g;D+Qg=`Xw5@VHk^{hiH?Dbc#u;gsXHzn0i z2)8o6*&Kl>6tpGG-xYvB-r`9coW<<#c<0|E=wQpY(XerrkkfVOt!t*N?wvbI|9F@&~JQ7q2jXe2H zCW^MvkWX8I-=%fo@BdI{A^py@pAB`shd&A{*amKE*X!a7A2Yu?Z%f;af$36@t#hgGI$UAqZQr>(vfUM3&C0L=d07kpTV z65hXXqa6SYLUvQ%beIm#w8HN~d3!4?$?iB2Owr|ut8l>>rMSqaZB}JGncrpN>H)eX z?`{XC$$(nou>9J>y&RJ_GCHrPS%%Jr+GeZ-p;^lV`1YLmyxKN-u#7+}dnx}N%zgXH z$CV1rQyi4eN)t(4&9Ix9{_jMeW*4;LYis@>9EQ2Es^gfy-VKyn0lc8i{7q3yuQV}F zD6Fom;2?qz@ukzYpge~g8?BAWbC}{;E82F=WrGc0;?er)DQ&9VG84bSn{>9B(k zwM%!e%*jQ~?@0DuS;yYC#^~O_E+}d7VN;GP%ockmCFlj4DNZ%yl_X-Hn$v_=+Er1z z)xF^ugN@xFweaki3bVXB3?uwjsn55RD1&YMi6B+jBAEU6|0Y1ne zLxbyOnkM9BHX2f}bHa<7WG>P_pz=aP(B)D(uo1i&yvId9DaA3GTsK?WdG%g5Q5z-% zUfT;wH`Xu@LDvM>F<4<`LiFUdk7UO)oS&1>Rnv!81;V#S1gZ^;byAIw5fmjY3m)nw z?+@SmlmBCWV>bFM8|-jGB{WLeI3o9DaWo<)11@8`kh*v=cN0DNB+st4sz6R#2I0qi z4c&8ZcAexDoiEyzoZJ((D9)8bG%^Z+MCs@_Q)++#Uvn&7#CI<7^ioFM{2qLTEAfMX z#1kD>oACS6EsTK8F}{R&pahvhyt|}$lX5-EzVP=!*jL*U(=7^7%UUF#`g>m(9)4uh zN+-O*&B&PgYQ520)x+!;$#)PXM`Kgq-o1CQLPsDGuSVi?k7|gIEtmv^WewHMkLAio zl1Us*ZM8T5*j_cED4OCIiNDZ{(dj&{3{g&T+~4Y*L((GimlI~v8Q&*2;zNurHxdEX zDgWY5T-u#~Rw6AH53<&eUOA_3sJa+<`S@61`0Z+&gPPC(dA9xY-3vCHs+QQ8y<*H| zq`~2~B6ACGIIhlq0$V=$vE_&HDcwxCpLD6$_1>ZT*h{SQByL1NMw0+fOj?Wz& zFvJdbQkbJBeJ=wX#hUle7%rUXR$4yPWhM|#t(`DrC+d#^K8*!sRn%{Eee5S%bqSan z?Gaxb6y6;Dw^4Ura3@7~UnV3ahsAZxfc!%uwqZbo@PGj7@>ji1sVn}8fiB(aiz~Jo zTDXK*@oVh~gVo^Iu~o8PQNMj6)RalL?o3^H@pnjZNLWoX&@@;gDJHvX&C-&SZCkAF z?Pux@B3eZQ037cWb&FZMuP+XLz1yG`s8)?SoCs!ygWlxG$PB`Eka2i37Fv)TK{|58 zJti;S=?xo)8?eTei(HD#f`Jq8j>vX~5NRzRU9sf_ z>oxtdr~$>ax+OJ;^X)vsSztp0JYJsoQlX{)JP`NN^%4mv6u3oW-hBTdM2W@5-Fze> z9n9nd!;qg7R6d&M#&&}CPAvA|mF^4XPltG`XZl9!t)5o^flxcEGJRDAZjOjF zQ0Iea%DG$E3bP&!(93|2RCY3l5t3s3J*JOik0=hGeaJ@3@H8tD7CVRqHg&`+R3j0a8@kqB}PI}{$m!yRab zvul5lL(>3*TF>n~)*#hsmwUTtKRAA2Fnk0PENdI!9GrZLu@zyKzs+&m-IKFviqv>& kg1Lm#gqI~e;$iYPkmG5c&N-g{UI@TVLkokN>#mRg2V?7pi2wiq diff --git a/docs/assets/img/grid-18px.png b/docs/assets/img/grid-18px.png deleted file mode 100644 index b2f88799b8cd0c5a6aeedd92ae6e000888cc51f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S933?yBTt(*v?cmjMvT!Hj|7_c~Cy#mN*DGBlm zX5eLza?|A53{vjt;uum9_x9pKK?VgLmV?5YJwgU09bTd)j=~yN46RCb&*D?d9`y<5 zZN9UYS>(Vy$4#fxyTc?K{{Ek-7ry@aE7frQpRAjcFE@)Zs0jcKWbkzLb6Mw<&;$Sr CTsI#8 From 003da1e089edf06c528667009fb59189b5f0e4cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 14:21:17 -0800 Subject: [PATCH 532/667] 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 10faa36c08..5ebfba675c 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 9bf651753a..df0e8dba48 100644 --- a/examples/container-app.html +++ b/examples/container-app.html @@ -12,7 +12,7 @@ - + + @@ -31,12 +33,19 @@ @@ -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

    + + + + + + From 48529ad01fa2a60bfc9179743dcb5379e8ff944f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 13:06:57 -0800 Subject: [PATCH 612/667] 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 | 182 ++++++++++++---------- less/grid.less | 73 ++++++++- less/layouts.less | 30 +--- less/mixins.less | 21 +-- less/responsive.less | 93 ++++++++++- less/variables.less | 9 -- 10 files changed, 399 insertions(+), 188 deletions(-) diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index ca03cecde8..44e0125c13 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 c96818a564..60383fba05 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 184b356083..b00f5630b5 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 6d5a66f8da..239d152652 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 ce2d3b6289..1cdfd6568f 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -16,8 +16,13 @@ + @@ -30,98 +35,107 @@
    - 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 b464084dfe..2b9a459c80 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}}

    From 4e5b0e185e8cc9df3a77361380a44b16689fd2f7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 13:12:13 -0800 Subject: [PATCH 615/667] 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 60383fba05..3f36aaa4d6 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 de009afdaa..104e41cab0 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; } From 49d565a6da38359a776f83f31a1f1ccd658c88a7 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 29 Jan 2012 13:15:37 -0800 Subject: [PATCH 616/667] move building zip file into docs/makefile --- Makefile | 51 +++++++++++++++++----------- docs/assets/bootstrap.zip | Bin 0 -> 50335 bytes docs/index.html | 2 +- docs/templates/pages/index.mustache | 2 +- 4 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 docs/assets/bootstrap.zip diff --git a/Makefile b/Makefile index 399b57c6e1..fed5ffca46 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 + echo "Watching less files..."; \ + watchr -e "watch('less/.*\.less') { system 'make' }" -.PHONY: build watch \ No newline at end of file + +.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 0000000000000000000000000000000000000000..0e691e2907d212366df9c011cc7cb0c2353008bc GIT binary patch literal 50335 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 Yq5%C9iva)t^XDD-C!PnS=WpNs7i#}UM*si- literal 0 HcmV?d00001 diff --git a/docs/index.html b/docs/index.html index 89f5accd68..3ecc7718f8 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.

    Feature highlights

    diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 5fa70645a6..7a98afa07d 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}}

    From 9fa8bde44d9bb6f26b16c7633a01bbe5ce7b20a4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 13:15:38 -0800 Subject: [PATCH 617/667] 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 3f36aaa4d6..675446f62d 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 ac820c610c..c3144e1bd7 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); } From 2696c6a4bd5eaea9de1d447da8f24da5cb3f74bd Mon Sep 17 00:00:00 2001 From: Chad Moran Date: Sun, 29 Jan 2012 13:20:39 -0800 Subject: [PATCH 618/667] 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 5935c91259..18ccaea2e5 100644 --- a/docs/less.html +++ b/docs/less.html @@ -345,13 +345,13 @@ @warningText - #f3edd2 - + #c09853 + @warningBackground - #c09853 - + #f3edd2 + @errorText From 278858e70698f0dcf8651cb59b13e48fe756d8bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 13:25:13 -0800 Subject: [PATCH 619/667] 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 675446f62d..5330b5102b 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 0b2c4547ef..0406ff229e 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 2b9a459c80..b47bcf2659 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 6b0f5ec52e..9d94a64b7e 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;
    
    From 9e7f5025b494927e9ffc88119b0b9426f7487a62 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Sun, 29 Jan 2012 14:07:14 -0800
    Subject: [PATCH 620/667] 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 0e691e2907d212366df9c011cc7cb0c2353008bc..ebd162b671ed83749ff08b8e9de8a4bd4c203de8 100644
    GIT binary patch
    delta 28535
    zcma(2V{o9&6Fv&Z*x1R&&c?PjHa50xJ9n_LZQHi(WMkX5b)Mh*|L~qK=hT_1sj05%
    zo|*2Nu9~^JJ0}eMEfySJK^h$52gv{0t8E-SF{w!}x%~gSi#r?$D8w@;2nYoFf0O@r
    zwuDDPKlWXEXccyZeQL
    zIS%BPO44Qb$SB@HMghea?`uu<&tx*yhQ}Joj1`%AQhwMWXu3KYp&c
    zpu}-KUdkPwLzvMF(B})d#&?+C6Tj`}nL`{Ax_NMzJaqdcwdgceO?0Tewo$JLh^`*0
    z_;hG!A25?b?Rr?JcKM~?
    zhu)3meLe@8xm<0OasY2|NdnyHr`yGDo`rnl5fIAbvy}MR(0vB3u`#2z*RnGTomX8<
    z*}J_ShU4h~&djc&$f$RnhOSJ=*P}THx$CqS4MKE;1h3nyPd=Wmm^O?_7s{^6ot|EZv2*l;w!=c;bkjTTd?kWFeDgi~Lzp
    zYl&;*1#w(IEetAr?TMW5Uw{mHo#jgH=((hB!|rf9lR!#6k~>Dc=W-^t-7PB(Qn~4^
    z$AIS4duUQ&c_}w!^I~DUX{veGsNMiceWoF$MEcLIJCB
    z>yBV$acZ9rxBu8uDJ2>tM%HWeoZ#~-yY4gM?DWk2fR75M9kPD;E?KSv^n`yS3`!GdP(KbUhl9>F1
    z_%EHEIA7ec4*Ms_)S#Zg%W{j0aeNH8}nU!X8uV~fJKrC5?Kv|Wg?)tsgp55NW#WqK%})1oq`2S
    z>crygkvsi9`URoUN`zzRCh14yszyHwR@dSBJ6YYi4z5AygW|9Eau%v*6;jD5g0aE3BAdnfXM#
    zh<|av1TC74#;gvk%xF25##s$iTC%QbJ{tj^xntx%=2^TU+#K#ZDISY|ym`dsB|eXJ
    zLG<*gUGR&(i01-2ED4J0=KSY?0WF>C7Da0RTTQr&<{&e$z=`tS>b^?5m#)EaR^skujld`!{R-<4eo9Vy!ywkmssjsGf8DG9A8hM*fKoM_5Saup+BQ38^fv0WGUc55_NeW_Yf)eN~9lw40
    zhIZ1-HOZ1!+!>$a#pSWDHIhqHQ0+`7c|@JC20~0Uo&U7V{whp&Erw#p)Xbclz#&qm
    zNw+WrZ6waM^t$o5>Z%p6Nf7HJz`@3%te3bKBdi+*Peq34V&J*CFzEObCz5K)_@2RK
    z(EddL;k|_ETia5~#3+b_Mt~*Eh0v0M*>robT0|Ht^HRedDA-P}xT#s^nr_MaOOA+3GBnUTrhRk%5Wy(X@g2BhoS6s%;a?M-hFly!h-cq?g^nGgIGW*5^pDfYe=m2D0af!5!^!1=FV<=Mdx8W&*qeWw{
    zzx^dj#SYYg4U1!Y#7TgzzM)K+EYZ-#h?;=aa@Z%?M;1>7n3AbaeJ05Xe;q~h;p@dI
    zZp`*?*R(3B&tM9^meQyjo1$R$s1BPSM|jzqW-l|XI27JMOHa~Bdt1cU65c)C`}1Q?
    zhO}0l>vxy8vF}D67yG2!_8#3OS&&h+o8_C1#A=U+qR#Yloa5aB6q$;MPtv8o>@Gsu
    zz*>YcJry#KmGqOFO@{P3H^s%ZRBM`)uB~0VrJ7Q|Yo!h}8GZvI)$Dpg-E&tsGG*_DaaG+oXLD7LI%y
    z{7|P^m0JaLo_7Z~Ht1P{?riOOc#B0Tk0O<(Kg{yByr1kbY0_&~NCi@KMpb@0Q9BWh
    zLmy>$4MTG4=b5J;Df*siB2o6^7B7USUs@o^)n)^B<7;@!C-?CG?e&V~n2iB_iViC_
    zf-@J1IVHX+wOQVsH90~PAw?TN`MDbZOr~tdLTwO8Ods(*C9szU9PelLN!V@R{fRNyBry`N8U{5Vmi3A3YK%-oDCiKyZP
    zI6s#)%FwQdNw3FvP!fqF3QQ?|l?viNzXAU#OkVE273bMtS@!pjmtIx045S}{Rc0}d
    zA-Z9Utsn!Yww52;vNRRO_~Y`pi|$4OV*T$67!fNdc|>NGxkcmHn&aT|1yG0x9;1T``33s<*Q6TzpVgK#o5meAXF`_~XO24l2w<8-P|BwF0!j1nL-lW{
    z*`1|Dr2>0k${0Rq2r8clQwZEd53mw>k+Eo?rx+>eA-#eH!FDbO(R#GSDqn<8S^Gtf
    z*|#?Y5$;MR+<4(Ub<~~`>7E8Z?||gK;$xnO=FiRAcl3vQrP>TiqV4dqc5SGDM|?ZT
    z;4%+&4GH3R6;CYkh((>mY0OS=Rr5S&o#o9il_9AV!@Y=g=sBu!2BC#$>jI6!}xKHWr~XdABz)XDjhFX05aOdNMYl8^Q1vq9q`r9em(?|
    z>t}&cWGT=Dqa^YNxz-6K53v7TuVI}gi;j?+A~S7PWh4jM)%XXk^a`o7qMAA-q^}F?
    zd>cPqT29!mN*g7|n
    z{#Y8dtuU6>&jQ?G#a0se8xZ+UQoJEG^D^m0R~L)Z|(2ym{lLyhvGeR*pX
    zZ|KHmy_bCx8St7e2FWU`6J_2Wv>}-2cfFw8%
    z%bw#G)w8mS*}xe7wOzXR?!H@+j*-_m!pW+S#mi`CE_pO+y@BV>NFf@%Db+S>n6l>M
    zrEYk%&O(fo0!O2LYIHkDh3NH1u?Wk;j})aRf8V
    zpD4I(|1gHlfD9c2Yj?B%?^pS%KO&*@t}XqD^+3@=w<@<`2m4=lxabkmWDdAAyynC1
    zGB{_1ikN}3nyz0_goCv*Jzeu#*T6i_7r&5^95PTE(R*gU02TFAne$ke3ak8_75pAe
    zbb})Y^;DB6+9^zNt!K-IgTjPlp4v+<_ybt%rKX4P*F{s8kBjg=xETWF#4oLdq5^xF
    zoy1cYW%^k)kX;LgLt`2}S#|>kfl6JpUL?b^$gO-}Ln_-3P9gitL-8F8N-gpFx*$=1
    zDG8v>4wf9#+>QPOGwCRzW=!aIa}^(n-%=-YA`Cta*&5LJmq&XuK1t>PuH9%Fg>-Zq
    zTuZaKoy@H*v~|akK*Z7Qz!_|yoSG>hB{tc(YmS3UrYz;0D}lP>s-MH-XD;7O&)$ZS
    zV$Nmc!LIiL9Zm$(j}p%hvd0iH_9tsv!4xoB_$OL$xr}j!U4$CARG{+rsW;CyaI{fb=&m8qS#tl@
    z`M-#~i&)l$xU^hsPT4QTyf`;D+l`A1A7WYvJv1NujL5OQIds&m5-7|LLF_m$vm^i*
    z96IbezVP2tk_bGN$}rSz+2_NBb&vKRxFu`pjYEnDQV`5A606n^_hMXdsfLn*0o1Ng3jRW?Na32|h
    zW%!~@K1WpfNrE)>dOlHLH)!GDK{cc;SdPb&vFW>B_1SxQQvYqOvus#6;Fx`WBG`3l
    z^~##4AwzoU`S-5uL*@dttE`*+Aw5r@^Q5=azP^P!5*^_t=rm=eTSLU)@Rj>Wjl`?QW$7HeQ;g;7h2wf83a5Uy=ueqFAYUF~T4_az?~O)N~%
    z`)MkE>z~H_Z(1-5Kf(CuJVrPLiG3#YBjO(wOz8C>L92%FL81z=MgSEpIC{Neyf!2i
    zt(c@Eem|7aCA%ffO4U>xtu;%
    z0DJi2wcYO1sxyUB6c7$&)bPASnp)P%;+^460j35kIq$X8H=3%;(8!4j&_W@mI5j#eI}h$L(b#vra3=4V4V}vC`JyFm9)X~(_=uE*V%&VMRQ<|+@U<&UGRZ1
    zm{OczIA&I#0Aur3TMR+|_}P>`#qDF>UcwR&ISlKnbFrk51qjE>VwKKL$rGPoSUPGE
    z{B$$g?oTBzo%K#I`ojg)FP26JlX!$`Ic)8(xpm=6e1k!7Fo}8KVjeqEdboZ>48cF(
    zvw3u!i)vCj`+kHRYeoBr9@(|Sxpyf_rGruayPQqP0yjyXHg^f8$ebX?`p2)-F8l?1
    zq_f;&(#{DB7{E#{w1E2zH;LFqT*5m#&AP%BH?e!cn^u}h4dJXiu*qs-MuX~5e6otMpDk}$OxjC*#sN;sH3j19792+uRmY8cUo44wwCBX+mpD`PDs=CL)-M
    zd+We3xZw|Z4fpziqrm>eKEyy<$gp)pRuv7jA4xrF3YS6zIm}eZ9=!&CiXmJmw#l!8
    zMG9qL!vO9DITP7`>QgP`IYX46^O(OY0-Vd&TvJ^Cs{A%TbkKs-E>gFwZQ2=?|Jb-F
    zxj{zG_Yb{Wjra`?9@k!*7ds4@f77t_dmT)1`kj}G%S4kXzV(a8S}XRU|EuXv3fWD^
    zBi;UGq!Zz1F&l9dzTRlGpsE-YNlae`TK=x@LM`C%o0Cf`7eNbyHl2dig2pL;Y_1X9
    z=1=fnv$_&Ppm4l8U@K|hhNiXfR=mX;F;g0oF@-=?GV`EY{(F>H
    zvm)I3XGuy7K}M0`znD=k*eWn|uh=1tzqY0T6)JMc!U=(ZJa|aWXAQt4A^yz9A^u}Z
    zv3`c99ccWY7SHS40tck5EUMh5mo2K`1yO)ni2WHeQk7g$*Kf`a>Jxnlt3dm4Bx~Zy
    zkA~mU!aFwS6r35noXrkK$$AOKR&2{JqBE^ON=Bj&l$7MU`
    zlkacXv|!n+PJiUQHdque3ma182Yz^<_#W-dzCitB7X%?@_*@-rzpRz7r{XLc+UoGp
    zA_u6F`euwcbm2gwc%5O@n9&^|XoN5uiR!N)Kg&Z~&^W7Omi+yQA-PhU@scLH_kw`;
    zW71sbAIJoU3_2E$1qJE1@=9J(_{Ii^RAQ|+hpmhu>3eXLNBXdcWO`-PHxfADufWam
    zS^Ithf*-%zp$dB^8pvwClr{Vi1zA9iHZb&7`KnsS`Q?t;Eu0=i>Pj063U)xJh1jdq
    z=)U%QqYb~eHM;X?>@29=aG(^h9kA?#hH)bm-KnZNF(t|pOl$PdMUMF@3#cPRx+MHm
    zMrn55p_7cknG3&elw2MVfnEX1>F3MKT>>~+|6JT6f>LUGN-L`}wC-KeR}KF4`jV@Bxc5E>!pG4I`u=vrrU
    zkd7hFGRSIb%S9#JV&X_Zhi2Lcw}sJZnfMG)b9$jwPN;iv%s(Vj5>5ioC%>rh;qhxN
    zI6^Q4k}YRPkD(G)urfZ45hx@JJpE~V@*-l+es*c?Z5RP@&!D#B`5spFi@1(ergm@D
    zzpwjq!{)=3N+_m9X4enTwBx1r$}`bGeN|tjWdlb*vq$>a3VMfoAG-4_wv~e_R(!GD
    z(o~GQTVBsHqfhB8@|1y^7fzdJ!7OnQwgJXKkOw|{%d>iK--<^~PR^>wM!osn6vtrQ
    zta&w=02Z0+DWuKZ=FZQBYr&Fn0Mk0*8Yb|qv}~~4{Hn&BAdvPag%f{;*L+xlttqm=
    zhW~#s5LFKbuPo08WMTz6*9`|qUrTZoVbv0ehFl>dzMBF$m;(@Bv(9_ovBREolVOP9
    zdjP-sJY@5pV7jWa@U6$ILrr6>60yAN^G)}IcjBy7Ixk@kLWZDK$LzeTW);Gt#0T_t
    zz`J{M??hR6=Y!STgb%)+jN%XG{rCR#mQJHp#=vs;UIx$6jBiyLVyq9U)l|YiyZ%L#
    zuDk6qFRe5=n|nY3nLj%{oi(jc-L9R(2*ZG&X6bOLb&SP~MjtXOejCCNU$iSYi;l|0S=X@vDw~wt&z=g-
    ztdbrx8_G=3M+
    z+p`${JORSV2Mx4snls{idU?n3`EyR9j}&}_W9jlUBYE3@--SHsty~_o?--?K$j!g6
    zt(zjvDz@vgmH4~9*e?vuV{NJ*AQu*6w^m4j0x7yrn>-!2kvc~hzb|J
    zb!($9_!F#C+pd+#nx)6M7qyf2!cu1)#V*NZaiIQa{?XxtW4AlDdO{OlCxth1&INYu
    zJL3YgfjqAG*{$IG6Kqqr?mc<(39E4XW4+cJx~K*7MCT;)+ov5TcAa7p9;P3SAZ>g_f5-=x1NkuEyK701
    z3iuhUPWFq&Pz`rBqqGh4k%GJWwLNGu!8}$iGN&(ltQ_BqA`NDh<$GfEO@E>FC}Yab
    zehtN|ks4#h-h%}`h7-vH^$?3#s?-069gq>RH;ImTz!8a%*#RCkxjs4|!X4Yu561l;X+-@IFRQ#TzidU;Bz3{P}|U@3Gc%VjP|
    zZYnunSs3g2?Tr%Kx`Hi#)Oa?{>~EM%uLGW>!W|0vF|p5ukKI&muSHiU7G{a2n$Y4A
    zlYnDmFZ8m!cd{yL-Hf3A2O~jeHZnil{!P+s|Gpa%7QqEViSQC4Aj-4+nK`AKm1^;J
    z)X32Lv9(qKamlyn=c*6ipKjl^r5!&y4NuMbLAtm-_=SJZc$Ef6Wd=)bNlA(c{DaLb
    zckgD#nTieH&a!thKj4nXE)2xD0nqZGZIRM8khM81iuU5I(tqw=J9BaDR$yq056nnp
    zeoHtec|1%Xh%THI^Jea&nT8Nrass=yj^#&T2BP`zzo9b%)9uY72pJ&NUnm&o(V
    z&N`j74g4DIRdFz`#X?1)oTB5U33s9(gy)IKS(>?F<(5uL4q(JJ$IY-AfQa4OdYG7$
    zp_ALanh64ih`#^Gut5$>ky9HZN-EODgz8xHpQOXnv8kg!KNGcw>Rq4xZWZM{b7!8!
    za_DTWK>c-ZZ_cS#)|42mqq>=y^}+P14>4fA7SuRZTd{5|f74Ir=@z;EO
    z>-XR1=A9wRiS!Nkdr4>z>h>Dv(AZZUJo@zQN$CI|mnG|6s0*!#2NV4`+YqwyCNesb
    zONj%QGJ3hSv5f*8z254|q}Jm_5azd}W{@v5gokL_PS5&Z6C`ke`Oefbgvf-(cLYHB
    z5da3DEpOd5Zq+3j*5`+x9tLQaR3tU~&ix`+`=rT;8WYS7d+r-GRIF}+ONq5e!7=+X
    z)szpABEs0Ka5$K+B$)1$udcVvz<^j(V_)P^4{iNhn@6F3-656xPtv!JJ_7%d{mfLW
    z+7&k6aFFP6d1e5h)uX%b@4w1{hnWBAyEsycj-C4B{r$uk`=1_tQ`OYXCKhfy!{#Q3
    z=mUiFCAi^bTZ_QC&%LN6TWkcjDsq4?0o>f2H$nyvPJs)R)D{I`9hTfJl;C=UdKNahu)qW+a!c?sAkCj;#V%@LDYrlG)2MoQnFU6YrsuBgG0rF
    zr{91jxEwPOy8i<{Dfri%TL?-(~{@afDYXyC$
    zO8J@8Az*zw9N!_1@5U9LcTYUPIl73y`v(FKj}GV+&z{9$V&lQCS0M+(EZMrkzv-5p
    zrfq`(=PPUp4Nhun`C4QN>3<$FictvQvQ&hikmhed$JgsqYt~v{bJ5Yk@`CtiRFWj%
    zhx3Uz+RO3_Q=)WXnaP(luN}&!B@E>!9`g(1#8B>Ezb>ItGJQ2sTr$I&pcM_`J8kz9
    z#K_3?WdBg5rcXmxXhy=^jTY-=Da7>-n8i>x@)J+c#GWTwEsgo8X4Swb_<`5*dH>(T
    z^Vbak1jLjvP?XdjNzFz1JnR|lGZc2XU@l&H#JCXUfrs4DlV2!M#;#ZW;LL=2xGl$SvdJs9Mvj$Z+%9q>d7%5y
    zo-PJS5e~;s@lsRrQ3@TWL*^@RT4+x-A1e)v;pysgFDd@_R{&>2a_L?chT>e&YTgs(
    zJ=abjv|}2G({3$bIWa*U-%Cn5|Mec;MQyl9Pkr`XQ#1E7!qOpFylQ)_0A}TbTV%3u
    z!>mVhx{U2-QyxnL4|o|e{&g-^h}Fs%1vmh_IuLSqb{-9}U&a3;F+2Jt!ISlFd
    zS4y}tO3%z|Y2A-{wk>Ja6V+%
    z>zzntRxWm-QhxnYlkg4dAaca@5i3G%+{fU}7!PB}*qsmKXW+vS(_aOr<}wzNUsnh1X7WZ4PmGsDc&`1dzL;8Z1hVO2kRO*`I`7;*(@l#
    zf*WQiPScRlzW=7iqUG<~?zatRNKLUUd+dq_#)EwfCl_}4Go9lvhDqK)-{Emve6b!P
    z$kzzqY5Osivf1s#=0J;tg}?y+{7W^j{hR~*;R7uy|H!OEmu#b~$76PkdmLZhi2y_a
    z_o@8L&;L4I-OwvFtn2QyB%kcAhEVW=1Bj-g;Bk4I)fhLl--Y$9i5zZ6Zb*BwCNz5#
    z4!ZRA?78!+e=QF{sZi)`&dGbdLF(64T>T0Q`+AHC%|^(Rg!YF}ssRA_)1M;^*&5wP
    zBr-rX3T7-xjjmJnhxad)a*xP)wY(QNrJO$
    z!W;J_T_>ZB0<9(woCdIbb`cA7Y(t6Fb%Kmdjy7*ZVEy)k4f40*CwYEuw-9p4k-B_x
    zqA#(hLY|rk?Bquc(k})R6Q%acXn;-cP`L6JY~ECiqpOqedJ$u4B6=>H1o^hI1%wn}xuY7Vz_yH##EbYh=Ji%LrHiOzJ5I|EeQO>i?);aqwYv
    z^hFgWYwqW(4F6vcSj(=qFAH@rk*f`-G*xKcYk%k8h@1#v1P~J|AcKv4*blT(uBg(hyW;^~v=AVuH^cjTs0z7N;ROcLd`6!v+qg
    zJVt@LnBB7g{EVxir96`5V5vgZada0kjT#D6`Had-ubLic)5sS$XOrez0B@d5NN;5&
    zn9(2n*}O6TyU=I5DejkJ%{$G5EI-La{Jj><}=d$-(rHh_pk%fC@Bi#dagIsgP^A?@DMR-EWfS
    z_Jqdx1$+ij$FA~!3o<`qnkOS{ytu4$zuTPYyCjcguP+n{j)K2MgO-h((6s#3a{MC)
    zd&nt?1i%%Q?YO~l{_|gWW4t%nRt9INJ;@?U59}-{20UxNd-(Fb?u~uWG&QRm
    z?Rnz#EWx(pp)lEByMG1~JnW|5V4%%+R$%6U{E?<2aP~@m$pkFTQLuh4m`l{CHgID%
    zoYp%7Jw8xWI0kN0>RJZgTANsfvVlAoa6=*y*W!FmFhy$+GUXpDsiPZxmVuE{)bM@p
    zi#Z7EcIJ!K0ro>+*CuW2eA}o3`dHiJ+O8B-$;aLYCY{S7LP@-75k+=Ak@oU{+}
    znE54NMA-8`!Dc*uFlJYONG~O6*8LCy`ijk-cqY%VDw5KeQLd*JQiqtfmgmlCO*$Jy
    z;dP27)625dpZ2M5#!XL1s9R&uJWZ4cs=FQ&kbRd8>y>?z#RI#>TI~Dj>0a$au>#V*qN@pQ=Z2bK$y|_m52e0&pjXW9;u!AID0vhJ<)rLu{Qdo_2)&$
    z#%mLUa~6&^4As0T%O1L+H;HYQ9TnWenhffGMFRe)E)LynUVeyONK#e+p-bd5xb186
    zr!ZqIZ~a%7te|E?i981)ptP44f&&xC1ovUT0mm3DH(1#esuN_3_yyEUv_NjC=*aR#
    z2zB|#N9sttVg~imJ*7ow-`mw`5#{~q@Zr`9ZZLjmD$+B2P4Ovj{#QQ(hC_5yah1a9
    zxcd%Fk4Ve<*nq7Hc6=Vzavdd&n@Mb|<~_X_oM8zMNqx-$9n_xyT+k7j-)UPh3vRnV
    z&RKR;)CKHvBLkkh^68q**KtobntLajMIRXm3B
    zeplKITwRUC59QWJ8J~c6zh4viCKP*Q_22qBWANOD@HtJI?R`QRVQp25U&Xy_Sa$ea
    zORtjIx*?y=nimeh8C79sBV=ZcANm0-m4a?gOS*8f*`&}2%Xe*T9or;h$9Q-xge8@E
    z=r?7Lz`^+v*)=DvX*!^f!fjI8e-&Vk$RCF2{0GxFgd$jK$f7x9fHs&8B$`4Nsa>fT8~>#8tPsKe`#+e+
    z8>+7+<`2f}_q{Iipt{S{sg!Z(VE{tne$u^ot*r&hBfwD-xg(=5UI&@0@bTrH*
    zz56!2h5uKqDF~6WWtxwZnY@@RTNQrOpEb^Kdnzi~Hu$W3I1z
    zyl;=_@4=t<7R`grJ$JuO{Hn6-*vBv_$?&pw8m8FkrQ$|?x>mJ;NnX_Na9G_x%4nVW
    zp7Rg_@od`=0*L?J7p(Lhld5S51`q7?omY?!Ti29DpX^P6nX4SLXF$H1?Z08WoqY1;
    zXx(NW6T_Qi%R^*Bu+8Ig)@eZm&mrx$hXJK}zG2ADH3LQp`-RX;uu5Jvzt7(dc@qDI
    zAgvWsXhU}7xvfb7yUb?V*puF&{zohX_K=m9y6UI$KceufqS19)nTl#&!QZJJ)?{YN
    zGC^U6`kl90-xPkEKv*S=V753I`~Hp?NSh-}kQ{XTpeK3L_n^|O9}@2^ykthMv59LW
    zieJvvKUpzGR=jl8B#6IdA_ATgXee$&cvqDXQO+601@E{KUsC8~6eoh=DVFO{=c%Nr
    zZ9XOn6}6~|{M|#6vAcY3&uodJGJhK=2d$_YRvjFN)InLZoDa?87uMQb~TgX@mQT9ehElhyd9m+J@zCw25`o(;e9
    z4vs&D^X~`oM&AkB@k;e_9Njl&=z>`E)P=%f+yDI1BLD?;4C9<5^-k8&8m
    z8Clu5^on@zRC7}g`&GbQUP%PjJB^v2I`D`+3Qcde1jN&$4*9GCK*rYMd4=-arLgg*SjP&L?Dn%x68U7^}q5)`yGMt50@xuPq;v^(c#S{Tk=5Ih#08;Jdm9nrqTo
    zKHV?J$MP)R>ND^rI&;5yU8kC|GVh-gq}xjDTk_i*UA`PTDl$H6kaD^wYD5=ho?c&l
    zeA7B92XP_)WSyUB%W)mxX1?7VJr{G?ph+5d*}moYZgCuUTb)fX)L_Ip3Hu57xLwFU
    zUJBNiq?|oFW(?jUAL1Ek|qf=Bv2{%azzck=x6rl@*E8)e
    z{!4fclRP?X&(N;Etg@lUFgb3fInNa0J87<}CnUh$G}7QB@CpzgjoX?4&MkD+VvaBA
    zdlDl<5_P@KGhBJ1%rrdqAU9kKiT}2c(H({@p5D5S3&`Y@=Lo4#zKB+aKVG8FR2bTg5YIw7cFAvSVO
    zP<&TXL3go0?&!+nUTDrOFC6K*XhbuuJeV<@6+rv6zk^gY;@5J
    zMj*G@e5{4sH(FDBXV^(__L
    z7LmfMS$_WnSE5b_p)*t32MQ3$li>IL3C8D&_NG)RF*WL6)H?Ru2nr?FsTxb)|?JC
    zr8YN8Lc1>@UcI!jg~qtYHhT>)m2_WoSbP~#^LCv$+V(ryGR;bBG-tCDV0-P
    z{v`SMqSpm
    zT)cb*AweyGesV$Bif;dLvSko?^BaTXR#Jl9ZE;-bePm}-4#
    zYg`?7O;#3(iF4IzoTsGK>f(ofldCXInkxL5dXonrTM9KrV@WGG76KkFt3r}D@0y^x
    z5dQbiGPjAkMMkZJ%egkONPj-)Pp#scavY~ne_J($!kAKue!(Q0#YX%gl&oLf3kRQN
    zQS^f(BGLgO@@L*3|D+PuF#gcNcBG>GbC1-!I9K|Gja>jXk1=mFV(chGIr4hYnu^yj
    z=3tQuP=R?ZBj3v^2cE;(f;*FEy_Tsg#X>HJC2FU{ELN9SeC-dE81=6UhsP2g-38y7s@6C37b}XWGKZZ({HSlVR`vByqJTHnF?J%jwD+*
    z^W+?8+{DW=1~QCBr;*y=5O7sacpCQUhBjsb&1!}-u3q&Q|GC^0p@q*0mX#cDpqQ(xqPW9$LO
    zc>9+;q=_y38mR(Wgr-#|2$ROoa7SB!dfa(hrf^_POa@%u(ib##qI-b+wKt`li4{iCTh^lWk~FbI7`$jPO3J@^$cy
    z?O4Q_=jxvULF>P%W3E4Hs>**=9Sfx>k-;q^_J)7h7Rvcsk`ebtyYf3W)*uDl6B|u9nY0>jV%^8TVqBY+S?FsnzPyQtK|RlpSphA)_H+BN;Ju
    zJzqj^N0<$>=DeKrTBG%p0`I~sCh-*cvHeV_W%&MZmF5Q`QtD=yfhJ?n%vG0Px}z}V
    z!P0~$S?pzIOn#P1yZc1Q)EUZT>WsI7%T{ONA`5Oh@U~JPdb7f2Mpgn43(_QAk8563
    zhJQ*r1wIBvT7)c~qy}mD1cZ|}tWiHxhhYHeWqgfX9kB@$-
    zpO~bT1`sPhU)*z%pNgWxTNjQ^B9sY1pBrJ);T&cVgiOMeMUcr<-rYV>?I_F@}qHtW%u6SLHF~=5L>y{#&Duz&(
    zDqycd6q;~3;O!2aHZsTaW|3=ogN$(m;)npuDR7b7%paDP7vjJ}y`2fxI92e7ICpwf
    zmBOE#q84~SRya1rL{m%c9T(O={K@vQ1COTe1yg#@77>OkqrXo~G_#S6iI%W}Em3Dj
    zRyOY#5fjFR-BqBNHKS1}6A7C3B38)Xgtl?87cBNZJ}!x10#d&K({y^;piU#5)2XTP
    zmbp0ohqSLc_{^x|=h@&wb?_BN2SNI}t0*g$fjsab6Dd7@CG?9aEB7HqZjY0!%6$4!
    zJg5K-JzA{EGez$%qJ=moP>Zj6Y6YYs>Z$lX*lAqauAUDM_XspdSXi4GVF+|0
    z4n4cnJtmxE7}8D&449YkjPj{AOf`H<-Jh}hlVAoQ#MgMW=#Mq*3#;yQy4POC(?^kv
    zJ#f6Y)md^k3uKvBe%cJ}B4ZUhS7bx;Zn+-XEtk{4)ie9#EUOq)4qtkY`p|Hc>Hy>M
    zljnb#^7gW{!1zn`RWkYXY>zB7A-uk7w`^Q#fSHI7LCjMR&l}dMRoT#pwT@z4LX=I{
    z!(#>g0ZiWzGhN}~xZP&KC^GMEKY7KMtz1BF1x7A32SXevrW@{*_k*5R6W-r4%AK!;Yy
    zWBXK=`Sd01KK_i9j~j-X_)e-nYJk<}WucEGUdb`U8?-x=m8_sAoO#<@<-THIQPcj8xYeWHLae
    zp~XobmCjwyn9Tea&zxjN$EBcLju=UiO`ktya>~m$1~ZCd-8m5fv}(J*kpP&+@pt5S3vAUiUx;J=gsslz}izTw3!*u5Y!j3aN8V)f=
    zm*Er6wLBI&6SLLI9|&{6CY?Or@I*Z3`z0_6e^xp6*&&ga3D)cCVd7X?Dj;`2dDvFx
    z;)xD!%Qy|0QXk)XX<)bIV&(!y74(bcW4bn9{RlF1JHI>7#@-Z*Ltz;kxd1C}yS@jR
    z#HA&eF$a6y*k9`e%plz~hgAiGf>L+fGxdX+M=k6WSFZ(&0oZ+dA1lSTSkl^L&eH6>
    zgyVTUks+@YZ;ih}K#&-{V*XfEBwsUOh~CGcC@2sAEE-k=UG>`HH-)O5Usy=%emG{U
    zm=>r|`MKF4hQ;Q*KEphpa%GiBpQ8H1x1;3$YV0eZ@>sHUf1F^!g1eL8o*+SjySux)
    zOXI;^!;f2VcbDMq4#C|W0xvmt?%aE3-n{jCt?sT`)!(kYcXzL)glf(Te#c>~wZwJAqTXOf_a!Y^)}Ktb4-4wYl8L)&PsT
    z#nW55L`Tslv4YwK{jGec8MO5)heBlEjs?Y-f2ooT
    z?Tw4OWms_41Ti|bPh^gotC7y(eaBkkTIM#K4-#qc7@BZfrpy;Tly`Ns7o>5Ab#B%v
    zZo{zn_FlP%YNVUe5s04YiSt9NOn2
    z7fBzyM`q>_!&?Mq|3XhG0W^;Hx=+wPP1RZMppdL{g91gNa7`6~H$Z)CiZK?ZL154E
    zCzCLk9}9jxZv}*=OA$-1IK{>4phEk$OHqizMc_FEukaBB^X&H~MjQA#p-HD0^7uUi
    zmA06Z&LlrAOS{9*#5irm>YhAVVkg-|$YtCmF3XWXwo5?l)7l{d
    zH1_a|(zHAi^r9(5+g(P%(j!UDBc>q|P%}*g-gC!z!CE%2xiLYy*c;UN7TLby37SFX
    z0%}>OJ$1Kq0YDI$9q9#r4ymwj<@ZXM8((@WJ{YEkMd1WRRc)_12a|@@=gNvJMWQ5v
    z97uFr+eF)7<(DeK@XiV6RL?m`Uo(twUy~hgiDbzlhM|-0%%`IosXELU{Vn
    z<^jQP20zWXQVGWO?fcK4S{cTJTvcth%z)&~@V=TLD!^!!Cii2yMCJ|!1)(AMvfmLm
    z$sre>8TkQbb=JiXGtQY~Bi<+=uo8IhU5Akqg-G_T#d@*M?o6a8#>G&J#r1Sz0&Vm3
    z%T=^I>8(hE!z!8UPym(hAZl>YuTTEXB(Xn*!^+KZkE~^NVz^Jz`bAmlTDx@cr$17W
    zb=FT&CjcCL)ghe?Zw4l)d2ta&F^5?p(B{F6i6J53jT^Rl#qYp@M2wxeuR)(4f3NM7
    z+ixQY2?-%zg)_Llnvj!Ce%a#47$rtgUY-8l?Cd!LpyLAR{S|filO0n=tN_dd)*B8`
    z2knO2NWiIq%vIwVWHjqi4wYqM<55EIh2@O<7l2pmhH1bxFLJ)!OK*&A#!!@?N(}BS
    zuzuyI#;748$kl>qQLP!}LQUZHt%)GX5^(J2
    zl3B!ON^V+a`(~npAEw-*z{W11NoV5_lPT_nIhe$mb|{SC_RP{!xD6}qI!!`-6^<$7
    za{yJ)3o2j2#iwMt2?YW-^IQ)626V9$;>I568NP^O6zs)>@a0Cy$uckAJ`rjH-|N4Or!416rQ
    z$zlQRw)nHY6t69WXYJF`&NCT!EH2`rN&xqLMlI+@|MBP+);vj;Yd%B7%YGpcc4B?h
    z?=xVXNQkR3f#l1X%WQK=9&$tvzSQa6J84-|6i-4|G94nZl%uaUU&A@caIr>Z<(Q;%SMc&g&11(2f>dKu+`HZlnLo1aEeMXFxRkj0^uR@
    z#zE_sAnjoNZvrvdUdDxTfcaF2x-+Z_WL;k%V_}K2mzlx?DYPUW&yv+Q#7!2^MBr6G
    zYW<*vg`@E&9|h@L>pp#u=}PU_sx+wB$JCxm*(U@~CZ}Y{<*=e<2FW7zz9Xad)7;QB
    z4HZT0#v+Ezd6QPDsY~tgv91sY;DO6ece|E9KJ589rA)$O@9=LmZse*V?PtTpGLjC
    z{*o)#vF}9;ZeG9ahKo}a@ZIWHEu87L#4wKczY{D${h0mcW<3x1Zp{*k0%$uvipzQO
    zhCc36i!<|IE-G7OM1CTYb<4g03W)PaYPGM_-YvgAcD#O_`bCTj1KdVitg|QYPK+zz
    z&ipKTm0fB}Zhtz8&Z#A)mUm~6W1&x@cx~W+CdPwg^sz4e!lefNB7Nn|!}O!Ip4?(t
    zT#2Kvp`52?L1I!jS4c-!0w^}&VPTBVI&SQhDHyDjrcs7-bU=8!6H032cL}E0y&4Vv
    zN&_v?38B6n-ebTjq2TWI=2BmEB>6x;A#cr(TTtO6J86;srkQwKt^}Vrp$K90-DTX6
    zWDP}PGA~UL0iD8Y`Ib|xk9VAfYzLXK-g``OH3@eEIkAu2m2MBi4gl%`-4xHLZ%CN<
    zBE+{7ml7*Z36bOjpDL-ruXKZZ>MRl>XPtzkx!`Xx@&fj?5o_|4nGqI;95$1c<&c3Rh($9lV1QN;FO2jhacPL5
    zQQBt#J9nFH`D81H0wA91F=^6_h@0lN6CI!}q}o=JBcLyIRT`u&?D@WRp`#w8#sOYAH4|izPGCbzONFau(q!AFPOd&C8b#WQCe^^wlS;jgM$9GL*
    z)K7Mpo%v)z^I>tJMv7P$f5aY+Y8wE*_+&I*I)6q}6>*eU1-iv9C^Yxv1Q?R9T_Z>k
    zy@Y8tm0+^vhpgEsHK!vB^h=VfC^DjLwQnB1ynDiHuaOy7N^Dmc6$cF|&AU!rfX)n;
    z}C*iG8{M6J;^42FG!;a8iLIQL@Dew_D>4bU~
    znDJz84x_gih77G1BLB*tZd|?}+#n}#C_^4a($j}mryCOTDf85<`1(UM6P=Frj=77)
    zk?$+ZZWW~p;A5=#jcTTYm3ajH3YXiy{6uAr$QE&V7$BSONmeG^oX4}>
    zEGosZZJ{hUsAY?>zEqUS{Jba(k^a_++42-Q;-rU%JR;dUmCiy!(8;>rXs^>IA=%xIx25BcLN%_J?pS9C;Uv
    zoYC%FN3*o$9CxD;Gvi14n-MT$;jx)b$uk{1-Jy2(_68BU!+E2aWBu%ENJE6m^QD_!
    z{W0lss?NUPwljB++Uv~mnnA|(T{$e;{|7|5CXlgyGHlnt_-nPjwPcz1TA+b3V6`2I
    zZE5;}&hZ-coYmiTjD-pMxwNqmo(tN_L=Dr5bON7Q4C7p^SLA)AB&kqPXxQf4r=7t9
    zhv)_eem?mXo^$`w^Y=Ope##WO84p-y;u58kjEyVLxe~7p@1FaRa?HMAr!rHmzJ#pB
    zZUT0=Y)E6+H5LIv&ew+#EY=S>B{h4BUh)QDb(Drj<)e_8JWSNvLbz_ep==#41{#Cs
    z7$xs~&-TM`kJNxYnp9BPN$$1LOQx=q;H}Q`y)nueKq?$Ufp_-z8#U)MRpkDB`HAav(jc
    zVtxspj{qND{s}9H7YpwR+`(z3{?#t^PK#@e`!K_nJ7<_+U);U_mi7tlo+s-^4P*%v
    zWGNQL4SP$~TNTg4J)x?t-g@z*Xpecf
    zM^i1Y%0!eszJXfnjtX{FUpq`$7s#Io>LjEcldCFR-s8?OUn(wVg7@@ODZS&ifK#
    zH(F`gDF%}>KnX!uNKDMWQr+-d_NbGN=zTa_Dtv`MPcz3?XIY2*p1AWy7(ecxRNruf
    zH<;mKa-kBan>;yc9Xlfs83Rm9MS8h?i*;^@D}g=Itfh!-f|Cx3h_y|@>?&n*iE3||
    z0n@1J^+>!6;W7={RG3_={%&!2OtUE#xrnM4N98?pM@*8bIoXPP86VUz-fVbm+eLIQHjPTx+4n%%2lfO>!ae~7#%jwR!P`r
    zdFzj!F`&OCs3g+%5b23_pW(J
    z6|IFGxvi#6v_gc-i{sx*AY3=1&e?Zowr4>y_Sdt%+{N21cuWzWh|YE@V9%$HOCXN>
    ze-=L(d)YqtY^(t9W?;d%9voBXs$A*gxp)3~z08@YIz}!6zuw;|sdgU_(`s3YvOiIk
    zulL>%*|XbRR%VL*`k)f0J1(7J+Pp)3dA|UMT9I*(1`zKs3SMJO;7_EBdNu>i=UK2lD@w+7W+NtFi_ELb75E|q7fMz7O6j~W-3eLL
    zU4wJcS`(JHg;E;d$IMq!mD@2e1aFu)xA-YJh++Y;xX&gsT+C_j_8nV0sqNzxv`>|8
    z*JxHOA#Mg>iOK|9&!rr2Tg5t($SB=I@p9^Tj%KV*es@rw!+wneA!?zJ0`89*^y>!?^ew7(Vr14iI~DAnodX?ZXN(K@)*Na?0>TBmxQvB^Q4OutCTi1Xwj$qD{FUlD@8NSGF43S0EFgW3rD`|4X<
    zaqqGKZ+sVkC(v%;C}zjaIMQh6=Y~^itqiz@KDQvVcPl${f#FfSpzlrDW+S(v7(tQe
    zL25c?3O52-&B@T6vSXW`x6q}mv;bClIeyR3EBBZIah^TKBFqv8y=79cx&{-QpqOqQ
    z$OJ~uY}wrJXC#Gpx4|h5y}@2kaEfkPpYeG=Yo`!^X+lZG0DUhf%%j;d|G~0dOMkz-
    zz~~bB!=u1FU-;sYk^$bpCXNje({fr#jaAY7{dJQ=)g7kvblo01*7^zd2?U{Ar16W!
    zqigDSn<_g|6W>W3a4bz6@8
    zt!_24*6N)?U&nk@k}kH$a5no!l#oI9xp3nP;@r(e}*BFVnFSW$BxaYeSfVAlw>h
    zS;nzYf8I*+VrCPQSeok*m^FczJ4@mEHf}4BoekHvAY>(VYSk4qtX>>_yVRoQASVy6
    z>7yTy3}~SI7@S=;P7=a($4S)9wxl;FZ-Lu$l*x>yggSkD)&i>^q4LRMps4ZiUX&S_
    zwD_8vG$p?>DAuZWPv*szrmrebfa_1qXL#>LSO@By^>EWM`U-B}yWv-PM%4cJMXQcI
    z?gpBk{XVGeWNpher9V`~WdA&7)GZF2ue3cSY_u%#15}w92BG)i9h5I^VufUC*4*%r
    zH(>zr72({8F~&$^25siiXjO=`FaSJHtN;p-)P%Ik>gL1br3mgTy0(C76j
    zgzD0Y$L3mO_hTatBf*vv@7L3eh3{7SFJp%R
    zJ3e6@2KR{uH#)v)M9zyF@5z|EvMy2pi_0;M|Isjlw65NqxT}^vhhL=R$opj=%E??Z$qWZkFKg9VH>1Xd`%P}s-w_!B!YoB^H_Qa*qui}Ik
    zQh5WJ5pZq~TMn-L?1S;nd9LJ>)Vl(D$O@!{hW&)cWO`tA%`~a3rnfthl~)Wj~uQ4=Tf%n`DHPUV{cTAHK`VwW{^EI3%2}{vIv4
    z=VE^#U@PR(xIg_KCwm_(5A<)fwVq#09q(nSFKz{nyF&5U@lyG+RD;yY4qYwai;UOc
    zSL+{{FIGTvQwlo8&S16022S
    zRJpeosMxQA!a2@PSqx}$#jeFej2NbDhMkuep2uxe
    zA?0Aw-B$7POFhkCoE(@+T2LIwtRV%4RJdF^Q$GGsVLkp7)%0p?!s#akpvY|>qC?GY
    zRr5WhG9^kwlv8RXNEC*IlxmhZ&W6*P^DMa`alsAh9iGyDr>Qn#W*|WXZZo_V7WRZ1(pK#YyyI@Z$`5oOeVZo
    z&Dsx>eji^V%lJQhd3X-f%r@DviBHTeFm3-%L0qleKB$uWJ7l4qsMI+4TS~@nxzks_
    z0c;bHmt*&6V9dBnRcw1SzbeBNPf;LtvH8GK=~
    za2RuWYNSz@8XL9YJl(%SSwV|uEu^9{6|leF_7Y9>ioaqybZbq{1iPEhZI28SrGO76
    znmkQ*VZ75)J4Q#=O?E4qDSsbh|Tutl@GqN2H7IaCcOEizUa5fwXe`O*Dh?2|~zM9!-c+nqemb
    zD4%!^W?!Pw;&z^&G*=w{TVA^9mGKA@Y58c5YwWTQ-g3#@zTfmy1VAPED4dFnmgMh<
    zH47);LFe3U*S4SSj1(FVk_+I(9?CKOfS1~kl`s6vtkGzgvV~k|i>s(L2%8zPC4H^T
    z&v>!X<-QPKq;PKel;&qL>KV4%h^SavSC2ucBF{pujP^@9z8kaALw69~mo(1hqIv2nP{{eAU~p);0hqwR)DLrN2$_uVVR-)C&s7q_S(!h%2?
    zSnetGuZEdDwN1x-JSv=f
    zFBNg|87@N8ycnrvMXU>zznY9;u
    zdL6Yh?9ENrW9*W*?xY%_I_fSj;?K5LOQ+AV-qz0VHlL$DlD=@&yYsuAg?@HUuWMAZKkCVT9cDH3E
    zeAevxCG=rzl$9E0XPy^3j~KBVG!auAw|DJ1xvf`N-bW24JOodB1B|Y&ys@{P7P>G)
    z`FDDDb2oshC$;Lm9*Obzm(_!FQr?98qU?IZRln?0|M>6l9UM7^7TPih;-gK4+;yX<
    zH55!(ct{cbaxr~cT{=natv^bJn6#(%Q(MSrn)df2?4-DiFHF@aV`qjR?y}kC}h53DYc?48lE_NDtt~s=*?K4}~iDKicK%As`qgqn7
    zuMQgSrP7NYkl>7p)!*O|@vpRxgkr00TX=9nAP1`$)GoyE(d$I~w2IjJ5kgHacwi7=
    zVrX)VA=}5q!XdFcnq4LT2_M5S*NR0Xy9y0Do*i~KbeH@`Rn@yMSi)29Z=a%WCz|^)
    zQ~8X52a}o=F^+aX=vGK>GC6lxP3Z(5N|F#RuN!tcMp+=DAspmipc!
    z+kpv=7x6Kclo2l}L?iEg_P{-;mM%9P8(E0FO4YJHoZt{Xm(U!n0zC)+=T(}2NX-9BILh#U(%9#{8;
    z{huz@YZ^#i9C%|d8zWE1kTbEDxiM@jJPZ5nc*<<)P{z-SOgH^gZE#JaC1n2AzYQBIVo?otM^n_l3#5+LD{7!2E{E?V=^hDEC>h{VTd34KX
    zjkx%GPQ@?#pAt^M!nl3bx-l?&gg(3ctcws&0mrFIBhC&JSv-_YO#+$gv>&~vD34Je
    zm-@mJ#o%+(tSNLr*Qv4z)om0jJ(hPQFrGL|u!G)H0LL-?eUIh$&Nz*8FgZvnK{m}5
    zEnQ^}F3jy^8&j0Cz`Lo9r(}?a^fMO0Kh>&+Uc&2|qa1JvzMBau10*X?YMsTMWRrXA
    zr{^d`|70w6l(AT~#=#A3xUH(>g;Ny!f2dtihw`9o;BswXbQLMU(>-x^Mm#v#)No!00dqDElg
    z5A+uTfANw0&*C2_lZ3Uk-%W`=5eP)~hh!w4q#FtN&m1FlYQr`w9GI(5A3~rZ;${@Y
    zLOtvvpkcyb_jC5i!WqICXhOG0OVMCL4P_O!*Ci!#vBd|svZPV*v&X#SlUw^gpXcbk
    zyWfNL^>1(%?>ObBeD6|-MdUurs^d^J=drRndY6_N4U}$Rw(?HZ-1Q>5FF=61AD_z=
    zH|MW2+~GtJ=X{|cPhyjd?~F}IJ_x_q&6g#%PTBbYG2FgWkEO{SB|vMj>}5r3p7qnq
    zR!M!qY)OahtjDlKQVXA$OH!@=%*Ehm8Y|bK=s4F*e_JDG3-tQ{xNlG7x
    zhwa?P=~~|Y<|om62yhTT0#|U>ZWt&{wUoPvc*B;_xI^gdx%2H`-Q|4rfSWwG&55gp
    z_9^$_%(*_rw=eFZmYa$|rqAQwdEob+qEjuN*Xv7E0wb#VI?E-vg!<(wk1lb=S)$eV+y!+JrUVwhT=N2;`Fq^Lg+J+t@}%RKYYL-*`W#X&Eu_9jVwNv%F0X?KG9uu!@E>@6V3v6+yv
    zVItD`4dCJ%eYvUw#I-x&7rRiYnW_SCkDB@W7NTH3O2&6?d}F}87bn<2jf){c4<1b8
    z)=cDtYP0{oaxB?%Vm@c9nO_3)#RrH`mXMD@N6)7foGi{;BoNG`prztM@rQmtsi(}s
    zmgY}PmH_)El&mze906~YA~3hX9Mk|E$$(LiTM=WW5iz>P+>GZUu&FGbOE0Wwvc)jq
    zraZN;dXb{`#VO&)ozmnhZo2TNA!mV_j(kM}`)c#4W6y&W^@M$<`76U)Ar>GXYb^Z0
    zi+!ZLUkX#Vf!Ot(_lVin$wTV9$K^h9V;=rgIma>kkKK!5!S8gW8?Np}LW4EAavuVG
    z*j0o2qbl|pA78#ba_aU8Aep-ZrA3wLtRoJlj@
    z%Z^qQP9|4r9r8h%(Y@#>E05NBqp`?i{i+@+mpky1ZvOmhiS5NjD4%Fvrp!Vmpm^B#
    z=w)9=H?ZbfGw3G%3P=ERYbHVoHH{pj$}A}{aT`P
    zTobjqRIT_f*>v(tp=>fw`Acr=>FW&|6DFQ@VHR;GXPa59ic5pO*}^7;{tq
    z(DkMjSet|r^j3umk+!cuE$_sN>9sYgaD(0>g!lF7t$MEn`>W>7YqCj==lx9)-4nj~
    zQ+H+XRra+u)IzhX?w4_+>Pv=G+!i}4^njZSzU#DzXF9K-+5+_%{2qNMQNj<1f=yMgQFMzKOwA+)u08gF>zl6$~Htb|0
    zhcUo>$K4d#3E|{`!9dkDD6I!KF)00I-T|WuYJZyw{ZB3rB`ZFS1SKmijei2h8QWAn
    z9odB}3=M@jSRX(YO%5G3p(fkwd^D^L)J#r`7E4q`r97k#>qb`STIpSwzp?}e2SU@5
    z9Uv~igVE7Nn4;iSdOYqSKamL^j4V2f$48U!bq}(SEqOu9rp+>K-S+{+G`4{Fc%KsO`*MGOD
    z@gL2E-u}x6SxvZ^9V+C5P5du6-hV3-cX#-!tSyw{|4Tk}7}LMW5DHr&`6HjWgzewT
    z3`)u|75>nP{pJ<>=Y{~n`9~TRbT9BHX<%#X2AQ@4Ee|?=STKd=Y~{RDVO`>-<5}qWlNo-}*m)0|p!Y0pkAd54|P*Unc$!
    zt=qr4gW_JG)AE0N(%jng-@N%xjafW;`gKr$y95mcqWee1e{MvjAG{SP9>twJ-r5Z5
    zKWQD9M>?$c5Ac7R`(NM@uRmZ~!M~gPe^>hN&jj*6mH6{aL`24C^0Y;1r8
    z1iEVkfpGukvgt@rJW~k{y2Wpry1y&%PqQg~yOqEFep$-oKp?`ufltf-fJy$Wq=As#?MKp@cmP5xhD3gpcH
    zpRoVJVgBvLCkUE%gGR#u0y4u23WA%MYk~_HJ3FhYz=DAPKbBwkS|_dz)gC{6ptm>`
    z+KkG;fxz-FqN_VOIbBIDNOfiUw5a|(#gO!u!3%`=_DgG&`s0bk{{H?RL9lAE$xbRF
    zUsu*$emdXV%dE|Nv+G6QeKzBGE4_%v-PSK+vv3~pz^S)?zspXa4{h>VcUQ!rw7h>R
    zE;}201&+zwXAed0Lq%p`CIrrJ?Z%EfJIB|mRu>OGbp5K}9_1C?JXN!=uG|*(*aciw
    zozVpJwbWXSH+ok+n;Gte-`|$mQ|CW6m;iUcoxT~5`*led4SnH7<%p0VPj15oc)z^d
    z)Age+JLF$I9Cm+s;rAM*v9_5x)leUH$^#hlj=#~MZ28%x_lqQ9MIa3qy&ZM_rxsYnbH)
    zZY>Tym^J@!edVA>#^{@&&p+zH*lb3-&fhF~{
    zE~;%uix59YLXH(`tMk$?3i&vqu1isL5yXfE{)}}@#%gaa{p!FHlMGL`e~S1XJOpi^
    zp6m*GVwe8ZaVECcGLj;3BZtU#7B1M@9CjG#T3M#-mxgxGWI2eZ^hY45=HQ})vhHQm
    z%nH(Yve_@ncW(bc{$~0CcMlSXj0W<
    zah#4dA9B;axQ597v&l2hqB$BXyumA~Z@L?Myyx>qs(w6dln3v=8>_(YG*@!v*r8?H
    zj3-4k)aCw0ueb`AYq~;1F*~4CsyfkNn1`yvJX4HPRCvqy|HW1=0a$U~>q>d9*z9Qux7ih=th(mgVojaEy`
    zhOAcA>?U4gqqYu9sscdN#QnK{o7!?m6mA=r1fsb@#DYntyG-PaX%gZwsuSmF6-cWS
    zhfv#2CWzer1Jfj6S+|`?X5F}wyMZHD3a5fe1
    z)(Zh$(oQstgq@SBE)|{Z-jEr$*?`*UjFLqonVz@mviJfm;RoPRZV+;bbvagsBO~KJ
    zql3HwPQw}E%Sv;bgxXOwF_&*QEE*~aHy1$p*!71?hp;EEhg{6B+u%7~YvuJxDk!%uWbLwYo~XG%k>nXCCx?
    zuW~Ad&$C`2GYU-d8)|naeQ+3mO|AggZ}x`n@gffMlEw;m+^9el-Au|l2=b$DzuO<^
    zAx&L=wT!Z=Hl#YG73dDDyZMQCRt^Ev!(zzGMoN=BWxi&42Zm`QBNH?D4a}@uMbc(@
    zM=5Tkcp2!C(c~yB3_?yhyQ;CHCluUH$!G$ur$=XjCLpwJwdRt=e$?n(MQuLc80sm_
    zQh_~?VdB%S*+zus@P!)Kr@gy_k%3No>1tTOw?|*seDFViYb`A&c`ZW&@NTWlmj4Xo
    z(#uw5q%U_62cs0G*?bnpU?F}L8-B4KX3NNh+f*o+9GEW}Z-l11Vrw%D5VR0SjM)~l
    z=eiyc0;@87op_KDg+B^*Rd2UY7gBtMoJuV*HhfjkKDi^Ok|j!UHL!b!v?hNq&M|mk
    zRc_ph;>q=ZPCjp4=R9fuab98{mJmoi0F~8SVN)G;b2DNr3Y97LnqQ!MF`M5F?@kFt
    z4$%DRM2D1`R~;d2rP`RWmD;$jb*tQvO)saO2Ut>nQeZcM8r3tFv?Uoz!$Rix-cG1%
    zH((CDGUqR*x|BgcsLWbp`IK2;6A%T^I%rAbLSV`zgNlBG$$lI6o(=NoF%n*O-)
    z#<~Px8}pL#@pdXdSy-vj{-wsx#B(`=hufsSu?zl}tno<4{_nlHo|DgAURx$1iRpgn
    z9(`HZE6tiQM=*zp-I5-evrqu%ux4GiHBdsI>n6LrmCVSZ3bf{1mg&mDZq&Mci(_S6
    zM+?OMIx}?m5u3iA@aUKbpl(T=0`p|v_{VRp-B(8@TjkaA-t0>hM$d%LNqJpzS*!14
    za9H7^MRa$BnpZc#Z;-_@`{MKNsy7ECGdoNz;TOghaDsVV%Ec(ku<(l|S=y}mPt{J<9xhDS^)yv>6%6OLOgyeO?uCT%n)o!lCb6a~
    zjfo}+bK$FaLmp}TxGd}g)>(2nqlh}iD
    zU^Vsons4ie<9x^P7S~racNpUBG3sR+d-_(15Nb%>^X;SDeX0P%OEe=vso$wqpTs(0
    zu3bzT(*p*Fhx$UH)vujeZZ%yoN$BUQ@{sKJC3F?yo`%c(N6+4BtNlYLKu}gHn
    zm4H6)a);!KZ@tGvSs2grb>{b!bmlW7!HeW3JSK=H9vjb1Mtbu37t;H(bp~Oq9H#BE
    zQT=pmtPMx)OAh0*-=hX_9IP=3Z@oGp7yZ?4X_{;!__C3bZht;3sgd1gv{On1u`esv
    zph7J|#QQwM>>);ef}QE9pRPG=FP=)o>@RY&CgZI+Dz
    z?^g-q7obuv3*by+qig|7QNlycUgYR6t}Vj2a7OVZ9K|7YQ}w>2So2lIJeAZ>J%b|(
    zTL5FqWghubp_lPDeIW1fP}ElZ`sh+sy|-mmd1z+kICeYzt1q(!NGw9+6sfxILut~c
    z@O%&A7<4)pUwbh|^?*JfIX
    zlX1`S+Ya!K(;`eh{O;Q=eU)!g+ZH>w@(Za4&eos`x6Rw|qS}R;qN~N1Bs%Y%L^Kyb
    zy)Z=oFt(-rJ!nD>q+pC4&yb3g^Xt+qAuw8HThMt}Ue%OZEbjN5n1i>dv=B$clVS4@8^I2p*M4QnjXskK8=_%eQ
    zb2>?yfv@@8$US-WG^s(ETLGVy@^!JPj!P4<2!WaO2{PLUmhTUoMJ+B#O*}ITtV0z-
    zU`+Xin}D%7;s(JWjDIdi*AX3L*H
    z10KRdo7k3bJ1rl7I1|?d+HJe>o5xXkdr_|tB>ec>mI^J}>l$3fm6aGkLA)Qb)5*@_Wnh(Oo953Z_HZP-^Dn$_Am7rP^bhV#
    zxkSv}I)w%*yCCabyJ*@~74mzYw5AoyKu0J83>b?)XUbOOZqx%4pdHXO*OmeECqo<7r8mxB?uAcHsr
    zW$rq9RnVrH)?x1k^Ml>~f_%B1PIBUtQRe7^Lb|hS)U;38Nt^43h-}@nnJ1uVg}LWh
    zOXXajMQr5{5-5b{suo?GN#-ze3eu_N}%uX6WG6GpZlJ9vl_IV}Sl(3i>qo*UbXfWTa
    zs4kBZ>AFf;b!YRxQe!@Qm$n@6F1YvpV6uYC*L)gxJH^`hp14G+
    z8-%u^Owcxc66wAWq_0A~8iAy{*)4>SS5Coj*}P9SJF6Ft_?Y0hETB8~2!3$E*qrps
    zv7zYC+^*mfIcWDxkQ>4RC?hb3my(&@DDR_;5&dAh)vz$l>sH;={o{SpahfDR0Gy^p
    z5{20hh>Q9_L9T^IgSAK@7FIzal0di43&J)~d`uR(U3y_wif6@;e+>e^72-5rb-9U2
    zt9xH`2=RxavR}0)6@azwFQBy5A99uclRb3+j@z!hd8jM3$U2c<)ej)*d`kdztT1dT
    z@6#GiaLUu^m-{3@D5UH{g?{bBN5JOasl1bI0mF_yCVF|C#Ztac%R48NKUp$iBfOW-
    ziEA&hmQWaylt-GqZOQu)WH&9Y^I_p>$0wTGg18*mb_DHq*VeU3jSC&e-D(Ljj;!f)
    zEY)UcMRnJwmD09oMFD8)^`PtVOh2-U3CG$mbYn3;u%?6(V>0Wj=nK4uaj$E1hWJ+$
    z22Hg3%E+eb`7+{f|B*coJ3$RnX^E=8`Alivq}wj5`w{l5vs%#L{Dyy6V1-D|ed0p@
    z?dBx@*#Ph=*p_XNFx^k}$
    z9sKrAlf8^0Dm`a%^k~QpZ(owdcYAvj5CD6Bp-5NxJQ~@-2^?Y$B!CQG#1JDVZpfHw
    zLIh3Cn92kc4yYf*f{Qeeh{>%%P#6(^*ryRRWGbUvB8JQNQsTmxB}>U~V}_L*TPW$0
    z6`psxxSFtRR5gba^cPhb7ICpWvoD%&Uf8+0F#gzSILbL1<*#<1aPZ}ommeNpI+m>#
    zh&fpM_@v4S-ImZx5PR5j&+RNRj*STWIyAABnDH!m1wNvExmo{=c0}a$YFu>QxJ;-7
    zRctQup$3$5OU--l^Edz2+p=^d`viePOm%L2AeEidtB3Pw6ni3_P-hqR^if}&9JM49
    z)GT6$(@t2W2kF)$%HmG83WJg#fTa4BofNA4L>$B>LD!u*Za@eB_gYt#Q25&VuT|6O
    zJ;8ETFCdA5Mak(>t1aS+_+Zl}7;Wc=AXKf8xOO|!a^m93aSB0h%0tNB5_QhI1ZISw7-1d^nHr
    zuJwe8cH^4CmCWd{FZE)X(29GFn=N*xloBivYrG&8FPIXl0q=#@_B^x|5XF$xbND)TP3I(@Pei229kbR0>Ajy`$g4c%D
    zZ<(ut+adonr%jVq7cZ^cO2aZoXm_y;j*{>%9zZewnSxBzq1`xzmduw
    z7AR4TlT}^2oQs*EfvM!REB7x&lYxc8jd>rqn)E}E2c2bO&zrarC^4`pps%1RaH>^&
    zRz1wIt5uwO<6U-^Zd{fm8FSTW&e?=tTN;Hc5VP@3a57*_sjFM_38mHv}MV7VH=PAw+vvJbNkIZJ2+A+cQ*=12Xd
    zeRKg+_TAjB%Q{1dt{M$Cnx~|nIWP6+!vXKkT6K=NCIf9+Nlc)mbpCRfQ#*GM^+H7S
    z$~$KeIa_4(!+arcBqj@#Lt#X%BT&9qh25uYH6+e!zgEYa^)v~?6LOxl^D*)3GPf3&
    z7}qh8FqA2|sg~)k$uTO!x2#CKN`uCi_~!k}0jqOtl|(ut6fOviFc){BR!+2aMZ6SZ&eI=zS_8NR_DRWD
    z)R>{Bw95llhRQ`aUDHC{ij}sAGIh~e84H?(I1iwkP|O}za*Bwrn_N+Ke7$BI3_yURWN%pi=Ua1ktbL8z+c!W+wxD`iFKW-GC<
    z-u6VPpF+t)m2TbJ&eV+Vxuo_$PniUAQ!#Doh^=K#5Gme3ftby)#l~7$`UI}`Q?Q6C
    zfC^wSIL~sB(Y^IDQ>fZ<(UTUo#5HG8qf){<5stGVeC5+mRD5TK{|&Tx*6Rcv4vCG7
    zmEmaeZ}b~*^JTelL<|xl&N$e2#IP}CMG)QSs=BXh{-~CJd&gCMebc1PZ;Q&<7nn2Q
    z^EQnoI_5m)u#!+H;ozAuC{0ZxgJe@9Gwiq9HD?dsTY6M6kUslGq0wci>lmM9Hg_lA
    zivLS?nPP@q@y`J~EfetKZ9o+6xiH`%m0l3=g#@ly!V
    z__Ydd(E$yEL@KuZ4b6om{-;{n-vBk@tPf>KaDC}>eNGjErUqb-PAZmqE+V@@YQEnC
    zT2L`{rT=g7CnR^8+8j$@wI@bEBcUfk_bj@+$7Jn|R3q24?ZPDm+7U&-&sh5x_brUS
    z3r8qTN-l)BX*p{<)m3>{q<3``mu~3zgG9on12XQu&7K4!q|l-Q<k#nRv8kqK8sA^n-9@Ci3=?r+X!*)X<@ZE@daG1c4W~yb*nDP
    zOLYpzI8nCElZ)nAJ@B?Y@pM?=Y!GDaanm2=lH1`L`dfg}3f{ZUN%bceSvSpZgo(WpD3!d_cV_!3rTZI3@K7#Fy)Ep*6MC2pUY{mEQmp-p9
    z4IM<;;M=v|I|ihlY2#L5oKz_oMXXMB{l_MUO+d#|lmD|J|CU{?dl|8VA3@g~0hH!<
    z)HKhRFGu4m{?*3G9bB=S2fljq?pYP+5&p==L(OA=W5+61@8xQr53NXfjaO~3zx!*e
    z`x@@ED*H73vvIX)vUSB(SsC-`_55>S_-nnf`%7!#^}$z#0RD{SD8Tnq0Pg0Bm(mfz
    zJ>-LIH|KhbRez8^r(Uaz;7%%h;Ts)YED5B^{hLMV($O3WoXqP3hs?QT?gF7}gw&gJ
    zw&xtc;M|dcXEt$?q+OdmXVat?i8fD|D}2+7`QpQ&uTOWuT#NQ*s62sja%p8r7!CwC
    z$V5o5qAz3=_>x)kTM~x)pKW6uymkP+lng~
    zukQav?+tTjINGXO8aw5cb!Z7Ss8if{M`QwIOeUEBYFC=VJaOxiTtU)In6BHm;`)!2
    z`HwX9kF@XekHq!ANTaR)NY4LAT>p{k7nrju{ra7LuH3(_)dW`xkZ7uBhX(7qCH6;=
    zU$_nOOW%1UPZ(2OuD?DBSKn#ejwqbXE{u(07Fne
    zE@fJNQDMGcHNpwcG7gYPX`-}ig>Q;ZE|hT0IxZ~HnPiCtA~1bIyvnLw9J7pyN@l+h
    z9xh+H>04A`5ox5-fTQT-%9Qe2?zMaDhpbn)fwN&xX$doDR
    z9p={iFBdxP6xf|+kvdP4zJZ}h{B(5w-f{>m?70x^(K~0g%tK?Z27NaUs-UEM5^Ei2
    zaFt--$tOeA!J}jTnw$mG*Aci=Rhb>&2M?(2Z@KdlUN-oPyVEHUW*!X735d?dC}77S
    zkLqMA4vd)foBcPQn@mbp3az7zi93|lvBXrB;bE!a
    zA`<#YiIl!k|G?cRI=1=Wb3i~hkvFlg&y(5vcf7d2)lM^tRTbp7{a{yJW&0#+-prPU
    z;>q+LQMS$r9uT#&sG6BTEI%l&^TZQnUX!0pzv#>}uNk>i?*?i}vfpw7CWWHgS+<8|
    zdaEQgUr5gqW>j4Dxb4g}EO!L453a;rB3%yg78p7MIZmMjl;zy6J!`WU(NHHkMTHC&50H`q=!=q9PwDn=Wv#DkDinBVuDKfV$BfBpejSTi5+b}$~t>2lD5ryrG|z&i)dajOc?y@_&)7)D%A
    zMn8n;_{wu6K*=i@An*Yf%iHT*S(o9j&eW+p6N_HBFAhLjXCXYNcw`IHVjOt2JHVzD
    z{VqMQ$M!f^0;8_hizX$+e{eYTl}(ENTR~K^DOC34M!Y*0@{J9&Lx(0nIQ40;jn?gN
    zd3J_v>neE|5OD%UUFSz&_F|QW3DOQAOlyr^^RS6WRJ4}VbjSV-0sS~o5&><}XAX$-
    zX};tq&0ESe{+z03xRz|jg(xlYsTMBsVG=-wdUKEMmNJ|#Gb(gEdF$f_=M3HE3epzRfNntZgEd=
    zn)72E`IhKVN!l&HZ8b;vx3qRC`NWll2yX?tyo8)hDyxi{<)7
    zDyHZ<8$r*ILgN!|I2z2Jgs3xtef2@BAgjpPfK+)Cj7wWZ#(l3yO7Ej?tO$_(TEuM>
    zC8G8KoWUDFkI*HFgc4jmD#DUaajITx+|Y^%J$j6`J)t4K(+pOEjLm5BzGQ!H3BL!R
    zoeQcwkvdwgLHEUk=_2uB8gHHE$GF(#@oxqf;ZG>|565`0a+0%oa=P3f>ZX~jU0NJz
    zGtRkdF#X|yQo@LV>4#i|n&Ug>MJhQA37`l9V*TqZUPC|U@vV6pwJDR+6ZMq{Z0!VZ
    z-$Bjp=Lx|X@wJ<2FQPVdXTv{z#4#as_LGvn8%YRB8|=iBS*hMYjn#)f&zl;BZCirp0M$PVGo-SV`@aKE~
    z_yRP)F=93?8_5~`Das69NE_1?sL`Ez(tYau;dpWiy?EaF+GtTlMzLhZ{%+z#oQ3cA
    z6O7KHB9wse-CxtNpJ&tpr&17+16Rd(fB=tuijnB(y1D`P_G93fe?WRD)Rr}|Hs`Vy
    z6g_d4FTLFElE#iC{rU=a12e4Q&114P^;<+I378co`oq_fI_zQIYUYmS8OJRZSe$-n
    zm}b&jkoq`RqeMQUilpD9*B@Ud-B3i$m(w`T009(?V>M-kgG*^#|0xxBcHOWPv9oxMb`##^?Yj(|Y
    z+)awlnH?gREWs)fGZg}XW7=)5O*x-Zh-~@$`8j3xXF=va>q#1K=^25AaBR-1PO_E9
    z;R2K^n6)1yO-qq-bm{B@bHe<{bE
    z<^3|0w$6KWA6!L`tLo_am6FBn3O99letcpEU0I>?R8qtg4X)%qOcss49;;^hGE2l(
    zraw0m!nR&G$m(~jda$HCbel$QUOBP1u{VeiE5)pl->t6Ke;K)q)U5Oumknxt*+laTH^qzlI%-dR%L^h9SVh4RHEn-`(h~KTcyg%=&j+M0J(vb-tC!c9|4r
    zkKen47^n|^hAq4;2%zx6**l^R-zZ4g*q_bcIUbQ``^*1CA`+e_+o5s%Gjwgyp%JVASBwtj+$-#k8h>0li?^1uo
    zDiAeRt6z)sXw!rv20UY~WRKyP0^x;^EBx`;{@q|`kWt5aXTLu;5}ww66m*jpcsH4O
    zOXp7P4yn=*a33IM+RYcQF0QI|GDL>^{jAZ~A8=
    zCWo(t(H1f;g~jU*+u^bQ=f7Yh*n@dhia^}F0iH*2`hEO7O2^FHW8qO31cZ&>0oKsA
    z2MP$VVd|%F$rd8-Kxrt|h>d?Z@oUHx%Zw8?DMY-GBr;I?<3w@Ym)=m(vC^joqk~OF
    z4$Y`ivp!B1i;co3VY=!OKI-gC`=n~P+K;lFGwqu=7Ep6-tsdQE$JU&nE=FB*9MSr3Zjx``5gR%R!~ZK?XS@b8FzBrh6+8hgw%NAIm1))-($UlBQ#)U=FV4R?c^NTiyP+MCyBl
    z#zFWSliER!xRh$L?6i%+_OQ8jyJW4?%mnqgmLdl`&JRA)|GG@&4+&G!c{0Y1`~)P=
    z1n5gG%JW=i0%%We_fkn&l=;LU
    z`+dRt*o$qaLBy%Z2~S++J8h(5Z*57u`kBL7#0yyzi0~ide#c_GxKWcE%dB`tM_k%QqCs`BF)5e_Bx2Wv-Wz3xf?;Gh}CoF?m)?W!|$g$
    z%X@H1X@jHWMs-jUVcjiAEf>K}OiI?)B`LXp%dN>>5>Pj}dBdWF)?GOBgqnuauwjc6
    z!90WCNcwi*36X+OFz;3w+9r2BRhM#vXJ>2}anLBZ!iyld<{1X}Vk3}H^o#ca^crqT
    z)2f*;NF`RaAn6LAZ%P`p5r7>OO3VJMnjF3d6<4S2;KIl&#(abg3pF=d+>sJw;AqT!
    zL>UxnEf*qFu~Kf#UxvgE+YHJ^87JAS39k{|`1;0Z>?fvF5D|mbEvZPJnt}@U@9QGk
    zAz|2w8}{`vR`6Rg2)#RgIUef$$9tdZ=N`?;XkXmCRLd`yLsx@un}8)*FYmR>_E1Hg
    z$~;zg&XgQ=k`#`1!?Z>v|&5po=ki3fW%Y%SE$`K9hgNJ*K;`5fpw`gN5FD1q}-BY;|D7#73ENS#Xb@M~C(`+U3V)avvB`Ls07fHQq_wCXv@Hg844_6Q@m{AkLbs_NwU
    zN{a2wJwn~tC}4=N$2!0{j&=9k3jNIa;{TD#>+>$J%`^aj2_
    z3Za{=AJudpaj_|zT!Ffe_8;kFy#m!Wm`DnrO?g^(!r)0vu*~6Ct;c+WfTx#gjjw9;
    z2NiXy*m;Q|I1&+uD(05evVZiGkjiPt=w*38
    z^I-Va35yShk~=*z=Bl&p5Mdbq^YBcr_Yce73(aPddgQ(2`wvkqB^8p&l1;KXQq8;Y
    zd(Qg|z(HTKz_c<(Qih-k(^7vZBLHNHarGOz5Jq`+aIMAT(Uq;*$Sw$p<0SolMmIoX
    zpY`oS==U9wBnt!zE!3(7&17uel5~);M#0)kUorCgEtOdOmjEH;H3_de|I;VT?h*te
    zr*r>cU}63bEj@UfrSS%YcZb5Fw2AsW9|T4sK;JpE^*s{_`^rHeAYhlAB2>UbmAjV0
    zXKK<>y=1zD?K1EFh5gXk7S=J3`WsiR{J&e^nKu#45(-4PP~qZCkgM{6E%YVcwNZzC
    zMAxdUvurt`y*x&BiNU%#ck>q{ZXTfz9Id`sJo(+({7N$U+Jen8(%Op+Pdk5*HQ6UR
    z@K{k$a;_=%K;iB7ulVEbhW9Gh!eBBzriJgVb}P72e~E@`NB;#%tR=JGJ+hI6-q-h|Kom8&$D$dN?O
    zxU&uNFVi`BH`g1uYkdBgSQFlgj^?&tR{UXYo@bK=wV!3|J8D
    zAmY}Lh$W7D;{4r(-{g5~qkxBi;&@_9)FeTIK`hYc6U0GsBM!R^ijo9>#^hu3FAEZq
    z+wmR5AnG~Wgy_pXq>p4ON!ghIH2cP;Zz)X0#)pg`3XwIZRKE6+%7|-WhU0c`F}
    zN|kc6C=YFMtDf`K>GM@Xj1acCdg!1iFK5zRl|A0i87VhY@{iex%rwWC*v_B~&fCPJ7oW%%H3*G08kz=;UuNKJwXXBL9I^%vmt~-%MI7AYuUyOHzKdM~D6;X&$|f^LndDhMr;U|$&qldE
    zI9vC<5#7flWOR$No7?MFzizMJb-gAdtm@>a3FpW6NlEowi3VF~r(RTqyZTF!uKdc&
    z=Go`anvTjoZi;(l~3jE>_AOdTQAMln|4Y_t)_LliT
    z0m*kwZ8VzzV#8REmq0sYc%*hyX53N>BlZZmpzqxO6`HB%YhCWe^UYk!F9CAht%5kJ
    znU*dkeDLJPOw=^)0zW$KO;a~}YT3$S^0o#C)_mL4JO$qs_7;TP6c9G;^du1?PvoFR5YaKgZPk8?
    zdPHUqni~C1n?NASg6|n)(uNUbTt)_@F;Cw5E`)VuuS0epp)(ZMm8xVUy}RWXoS8G-
    zN7eR*FkfZSyxBw*iFnbBO|Nl$rKJ)&$Dq9PbsySOY&?zXXOPfQrr!G)s#-^Y;{`iY
    z{C40JvrZv0@p$tk@gs0M`NXU`pIT8d#T!7vJkF4Y?SJs<29Tu-j}q;26W#y$o`8iuovBpnV((eSUn`*~@^maz4s-Y*6&!=5Z2NOi_r*
    zG@D(!2rh>9qu4i1kN!$SV38VkpJNf!vi-o6zvou$CJHVz!cIw>R!FO2E)P;NvwQ%{
    zh(TqS7a~0Tr%vENp|noVFExOMDFCw4HQGQ3H@W2(q*(6HU~;iGDQgXt0^G(~Qz=)1
    z+^lfnB<#Hjwz16o36F4QOe*J?aan~!67e*dq_l0gN(YLn85~o3$6$6UXH!OE(N=4n
    ze3(0n{PKZN6D@}ecrJLM;PdjJqU^BO_^tTkAt0NX7LtNCA$TRX0|U?*b0xoMeI6)-
    zEU%(KAtK`zQ`6V0+01y-ewNd!vs0T=W#fCQdpy
    zEJb~rsuSr73%?@?xyaeLvcp>96`0<>2BhilhK}!9f
    zZ)rUyDSi_#K@SH>YQIXv9M`2_t6&yM{apLOQk~AH4S7whS{&QK@6)*$UPho*t_Ocz
    z2DJ)z38JxDNE1o>%#SGm)$9L&X~i(!osw7v;l_qhOY~DTvdXjvWMwNNu)KR|4(lz~
    z-$YDDV{L8PvT4ZX5j}~3=#{^r9
    z*V;ZsuvSH9PTbAdIlpCtj=#vK6v{K}THig}h2l84GGaPbh3_^Ihbu2yZ2a6}s(a;R
    zY_X0*`F(Dq3Y65gzoEd{Vx=(wet-Lo)|f`D$}h%~nig>D8u)t9YV;If1pCA#cOZZ}
    zASo+Y-2+#O{zOd`;%pF2D2pTFt%g
    zgy+h+%VmAmp#v)l=Egy$)5~ABZ>?rc@-ov92tUCaP>da&<7zyt*0_d4>Xv!
    z#sI@JGNZbncEyQnqoLokjy*AKwXUvm;AW(+%XMMb%WURkbI9At((az6?5}^_(ptBk
    zq=#4y*}m7;l*FpnlBsDgq^PSKZ-AN6?rRb+YAd(CNnUD{7pe?Ys%T(u5JvhbmX{g8
    zEby)UEFkNQ_!Urj{wmufMccH4ShH(S^a79zxa%b9lV4R_04-7@HVwn;%k&$BcOMMx
    zr-`lgV^&(7FDt5qG6siznO?=qlanQJt3;RL&9z*SFQ|2`uhZfiNMfU9n^IPe^s9YX
    z;oNfQbH1(@cv{#v;I@|p^A%nRLzdm;@ZTq|T2}X(EB}xR!b10=*~;JSz_<74_ydDV
    zDhrYUJSbTks<0pPCt6Knx`zTkh(E$371SHbNSK!G^hYLsGOv^4N79bJRFyiCv7rWf
    zFwcwN*%uvOV1S|_8+S_}SOhp;=2^_WHk=32ns`&;G_9@>Mlxsk%gUh~y1O2H{Ps_u
    zDu6rxQT*Kk-BRnQDxW~~t+Tt}Ne!6wAZ_|Ip?0%EMl+{?@S#7{);|a4v0&BLahRY+
    zbtUuRXNQy4&Ej~Xm4YEUTrK;zcgG8g;Sx>1>4$lG5*s}*cVH5iRwW(P>V}r>X%;pW
    zjv;sG4kr?6RZ$A@>N`PIZz-+bXW6AWh}c%L$hD29Mn?e*8?jh_q*}uMCMl5BHvg9oLbBeY*`I)Ho;Z>BrG08a{2`6dqP?KHs
    zXQ*S^JG@D069FO2Qycf|W(B8;_C;%MWtk`t+Bf{EH1b&%t`H0Ak%-*eGJ?Jb)PzH^
    z_|F@L+v{YE!w`pvV9tRHzQ7b1ss<;_vB;2z@pnnafB~T#o;aN}h?L(wbN}3qhTkoH
    z5Ne2EKdkR@%xFDLrkI<4`Hvq$h2KDuCYxs>7JR}IGOIpff*Z7Q;7C6g=)84Nc
    znHvHyoVqQuDEeUc{Ou|_g3iAWG1aQ%HBZ6co8X2R#7$7w?&iE**wh(
    z|6=5CJF<(N`TTAkBY@=c(zUxFdRZAnIAk8}n@z9w;v=uAziy^k7yj{P(=5;4lx%S5
    zU6+ZVrfk2l@9H=83tM|qw!FR`o}Beb`ZPceYAxR$&^V%>%0M5_D6%@PrKs~E{RXz}
    z*tAAFH@K>Z!#8Gv!8c@*#nq=m-14W*#J%@^IbiUOsKeMg5twkliw11SGhQejqv+DE
    zMx7WRy5fTkP8F-CB(z5szQ3o7Sy+g4j8(#M`mxUhY;G+1&@W{a?G
    zqMObgU|5vffc7kC-c9zG>ZQC*97MBVE)D{Dl(dt?54$#etVk2Lk6XGaKEq3Co$!_?&s{!#2}2
    zM{}VuN|tets|HRhXWU+YmAU`jfO&HX-!u@zorYb{P$)C~BE8Oa4p&X&
    zu^E9cN$TT=d;FEigOmr`%u5~qrh~^i1~1{oye<6$A@eA}&mHcFxW=Kvi4e+tF9gFb+n3L--x2h{TS?=prt>U
    zG@$-GlhvaVh9?*~vVdm05HrGEM||<7V`X!tuY%M#5^QSRO(;5{qqbq=EHw|!mb|HU
    zW%+jsY{|G<{)kzx=z)Ao@0Qzkj=i|V+nS6j(3(VV{c|yl@H|F_>
    z3`{p=_K<1E;`s?Q06
    zTip`{PIZ1X73BZe4%yChe<=!Ii`hDiHc+JWPuLjANX8%Joy?&}T7_x~n3%H5sUjvC
    zs#a!_Oc$vhC)7+sII
    z+Z)n@y(@&aDp^iUAvz$af#gU`64Do9(qCcl2!fZ;x8Uw=J4R?;FMwG*3dk|3
    zN{owL*h~dhhb;;=UdPy6$*vn=Z=9A2CfY6~5wv2iMDGSE-GZIEbfS5Gx59BR6BisC
    z#QxT%K|1sP&csm8T^yj!^gkN=%BVb=WnEl?y9a{1y9IZLV8IFQ1PMC0!yBAn!QEY7
    z+}#NhT!OpH<=aQ@{`NlSuKRD+>Z9HT)i
    z-;(7C)H_)F9@GlO2dJpBSb}X_Fx_>6Nxxmuidg12(`0$
    z$`DZWbV50W;W^aKu(S{M|4zuOtM@$dImmyxTl7-|9-Ms%=Vcfk+;~ah+hR#DV<;?}
    z8|#f3%2rVi?`zD{#Cv&&`M$bmU5`ciR;##u@r^Wx@=!#%JUU8c
    zuLO-PwxpAZs2N+{|-T
    z)yrP%3=|(zG2Mc={i>^oCdv^iznktSFrlwvxAJ4E
    zp+Es-m!KN?2?JuPYXlm*)Po@&eHL408R7{M^-X26X5{&A?M_DDjy4C){Z-aZxPqo(
    zq+Y`u`$KL1Xu~l`ihLOQ9193b`c*Ymd0hK3*)qejHvZ~MP*>N}n|C&86nw2?nNdGT
    zCN6*?C&^Q@55YO9?vCu7G|S|l7gIZ7yUKP{1gjmexxD;fs!!41jQ>VtYN%P^Armgx
    zuc~F>ooXV=nXVXP(a~gj=cBv3H`>h5_+e=+Z?DYRHk(d|XShhIa0M{qqmv!LFT6TW
    zf6QN@6;l+q7cE?>`0ic94Cjq)_Z_`Kxw+I$Zq`Xu;p;+u)4Ssp+E3H=QSuwzM@0N`
    zE3%xo_@7K1TuNt|JPTKBpi+=AQrZneweTeP4W$iu+uu1C+Fjob79_bZ+L-bW
    zNMJ8&K7PFDhsVXh@5%sBeCFf9VWQc>SSnLLchthed0#gQVOZxPesqEG)~8-`1Rg@!
    z3RNU{S;F4U=B&btonNXrDJS1ta;J}xqDua{SgbMgQ2;aufFGd_UOYKK@09rq+y#@0
    zErhRn=PymE_`dX{scM|eFLjcN3-mdM*ufj0XFU{z^d61BpJ)R_m3A*==~hhxG5jV|
    zN@Exfd>cxPr!&xaCIo_7t*Arj+^;Ac*`Rj_2WC=flrf)*A8~xnIPnjl^qj-i+}_It
    zH0{f0}9r~JR@pJ}Yc>6~!)Gx|H5c{n{r+p~vx90cXCJoR(K9B}LsSClb5n8$M<`iMk
    zV=x2)$58ttO%lCitsG_h0_)2Kv)gXN@`&|oI2E4{!k7m4_%Z4*@6cn;^0i_ojj%hu
    zQkmT8aM4DhJ-DL8JE-{sG8qKC{2eBc1jB3QMem-_4k)gGg=3Ow#tGhqOewvMt^~OK
    zjx=cCWu9JuwJwVw*{*-9B~KdNUYBpDJz`?ny|yr&iK=OQwz?xr7kj3SZHdIVQ;&!2
    zE`x(%uI1^PACk%tQ*@uID_5#N#$++|dC|$PgMY
    z-VOzJHK|K&93($m3(mQ>_FXuvmU_N-XF^x>6#uAag^_UO505c>Gvd*_zF<`D+n
    zb0i|y9AWw5%po`+94@Zb9595$X_%=HRtADYVI>5W;$$aZ5iJ<#_Ot4UxIj!CoHMjE
    z6d!QaHVZ&{Z0x14(%gm$P+ZsHXpw!suSsIyHexMAyHHw0#im#4*B-lgSx3u~8BoO1
    zvMeyE`O!M!eH=@L+O^5-`L|&t#TSm}JlJgek^%DNmx0&Ej`S1Y&-zhq2hL+bi$SdMI@suU^XpFhNhfH-@qjT}98ur@P0}ghGP7H%V>g;f8L4_|!X>`l7
    z5C|XXznkB&z)+^WlXsLEksqIn65n;jOaMsaj$BevKLx2hLP+JEIcDOE?b3lL*?u~3
    zvon&aK*4-TVn&S|qm@l$!&wZ~=QivQRgLq6KS7X9oK481kI1FEj-hX+bj5cS{Cy~2
    z!Z;SEp>va!Cs&pA=uXlfc?Y5?zPTz@gDVhA49eG__6*jjfsRaWWen&v$0&4yk^nRm
    zhhZ#hmdoQ-X$kcEAN$zNN#kfUXr^ch+M(TpqU5aQq;UGC*gd5a_1O8N_}`yin`tDO
    z4;3+bsYp?2Pd*D6R(9V%pwZ+8p_Ijkl&NQg>}ceB!hX8wMQ2y`fC-muioyMW{>h#}
    z-7)Q|YC>wrs%AM^JUshRC1}h}D#z&Hy
    zI`Pmiy@K0q9P>+^1-FsmU~VDPW%Si1^~Q@7XJ_e7#Ked0)*mX@$Ug~&sv$VO$72d=
    z1f$U`u6vt1os6ON7)tqTnF3kTe)PV>Ri=hJk`Tgt{^8a(6RK*U!BC`?X^fHkFweH5
    z;GA>kh)VgRm=7iHKe?ZhmAC57<2yrXu5^h~2|Bw~YEpJWuXGz43~nQp0l6xLebWFl
    zF=0sdT@*4^z{5;Eje4bngMAe9(v{1#LXp8Hv@!VDEcU8LOXI`$1>ongwv~w@r68{>
    zRdX4>a*SlbpE}O(b{FchhG5D*$RYRKAg)`~{u_);jQ+q{F3T4JDrgh06i<+(LjY7OUX#dIquy)%4JC3fEM+Dm+#HPW8qlwZ*krH<_gkgttK>h3Cx%CuoV4r=
    z6*z+$Yovu$R|L18(KTB?qgO;t9nJhjWc7UDdOBj;GA;)SzOTLBV#
    zG9UEdPy#RK$^hL{6_R%TErrkEgM*_TY{SHqFSr|;9VOuivKdg_FIOUq(tNWF1HmyV
    zf|SSL3!$|W`CGzZMo3GGqlekb70sALB1auHd92cN>l?+9HY;PjF{AMXVViat3i7XN
    zsCIR%(_UR?$E4c=?IV|r9#k~CQx)M)7Q;TSI+sT@1%QNGmiLRTfR-dTs62m-5S!hV
    z)HEI~=*x(At)cEd))QA&>F*8(irV^*nNQT2;~x%0g(G`XgeIQysA)%vFaumP8Uasf
    zbAcF)TE$F~Q5svfM{l1n))N?SH*7xTg;LJLsqI!wl|Q*;zdVh4j47OiXR)rXbqU!*
    z#i2hGtpT}~19GZAXFwr{@`DK;?UI{5>jw7?ug&BBs0r>zsS%{XEL+-bv~Ij)WY%nd
    zz;I9T`)E~RZhDrThf?2j46$VTtqE0FG%!q&_Uv!<@6bg{m024WTE^3a+YGd=B~2GTqeOtwn=q&dN*bJ(U4Q{jMg4@Go%zs_-QrdIu)!m6IODZj
    z*eJno3a5?rc1+Yh{6djM8vN^)i9Kiqan=d~Xihj&&6v$aV!7(#w#W7S)gH+k$xLC~
    zs-je)53pNc&tC5
    zy#O)FjD0x*9)*XO)voekd&zcfAxjZqo6LUKj|AMoio7eFJuM;>*yU>ZB5Cqkrq$M~L9Xau
    z-FIngSBqlxM%<7nYmE{V%aRjB{Hd9Q`tV1DTUcQvaDPx9R6BV|LJ1t;`$>(T3>E}nu9_n^a1G8
    z=0_`A%7z%hBxYaHO3Oa#t;HQI!<3y&i9>Y%rGh@ool(%*R+b56HWiM|2APFzj|rQQ
    zpDVquk@z6$T|85Ja3iemy+y#|Qn)6uAW(#_W7o69V;K$C8H!>_fh-0cSSDabrAY^~
    zq&5HK68mkP*N((%ls}aepPC>;8U@f&NjI{8Eo3MpW$WhV8A!B?UewlaXMO)OwM7KI
    zG}x*jZDiA=177Mm!BONz&sQ;favqzeuK1}lh7$1Schq)kd1FAA)Dz5V
    zhjsq#K(o=Mn8Ury&x00-?l~m=-P7EsPhrB)W03878t<;eVr4nV5j~(wC0^?(_!24F
    zcbFqvK6mVPJkL=CqmM?=Y523M{N$CHI**hYE9l1JGswx0J{n}N0IDVL!UY-G`#FW`
    zC#&28RBb&fo1k$^E>9R`_$@E0GQb>ySo6;YJc1o~+437~VV;6bk^17HHQ_zzr16XA
    znl5Gue+Cb2Ny5c2H^?%Yh0lYV
    zA4p77C=GFLgr`bv0147Ew*+(VFs+mpWR3~LZ%*~78Vb$Ykv~qxCa`Gy3jPFQxO!aH
    ze&sB+2sypLnSZQO`h8FsU+iAd=iG8R`Z2FC=c&!-@~6i=+g`SCV8`CV(^%f4@V$+C
    z-p+P694f^!HvA>~whE_^_`8rzn6AOEBUEh=nWn3>!*eL&4=DT5Pz5qQHm1x^hF!OA?9lHc^lmijfP{Oq(6;9
    z*T~I?SnKV$+du_`sem;QJlP1(cfhG=bGfOW=~Ta5Y7u)yRw&s1Y8`x)5!zp-T;v`c
    zG=?F+cWHq3n5!e=tZ6u+CiDR!c>+JeK|mm~O5|gnBd8@ZouH(PU{R}?yKWg|^?jA3
    zB&I0t_rhDMsk?+qU&2Nb`Hv^6Y#sg2e!Yp3Dy7W34FHC{7JlF}n==n{(=|J>yVgQq
    zbr(oUyf}Mj&092Z+Kc#wzA`nQs#v@`O&IQJ1O8!EqbVFr?h}q4-$wQ<)SlgX8AL-!
    zLhL=9Q6jm+y|~{W{i!gOVyT7Lz7$WQzCLtndfjqBt&!rLlX#GKbIc_MIziZ~2dAR^
    zjg0%(Qs4<~yQ@8)7A|X@t>d)7-#ufO0W_dI2eIb=826pY8(LeHxE<2_
    z?Smxh{Kp3gKrdpPOCeGMG);?T~?!x?`EHF7-?IpK&J-RnRqp=>&CQxIc`NW
    z(s%O7uON00Jv@2T33RW7NIMelzo%Q-IC@kolC!LwzwI-pI&}QA|F!}a8C_S|X09ILTi~lO6GCV-(wd1p!-5`9FBf5N>;nS6
    z0MBCHL~iIoj*9{++q`DcX8A9RPV#_{w8c?&bdQ~I>+<9ufA6)g>b;E4`h6-!pXUf6<+RZ?>qDbV;!
    ze#mJM<}wwLn!U(;g}eG_XR8t&XLK}>>m%x>4rk}_zw|=swru=#z4t0z6-sRmy^+lz
    z!o7+6K;ptlo00@56OG85+sZ&jic5F?PA-?f&TUXi>k~cA$mGP!uD-D{0aH$qvmjtlWcT*rIAO5_R?9%qyaFr06
    zn&U=yPtayrbb#wiYL46WphcVmzaycL{pRWS#lRPlX?S4AK|@s)yC+K;DfIM!m|QW8oZKckxc92in8;>=FV?Ta^_HTl9rxRzff`?
    zcf2DVGhh6qK@+mxK8g;2VF#EX9F0jbPZrP9PCX)&v0vrz?$NdEqQA874Wsy)Im`%L
    z1bGl&40N(hcff#_$?#
    zzqOpbpGk(Bzik6H0^yB){bKBbOBpO7)m>%|66)s9=FDOq)E7?<0ZxX^QI+z(
    z1>wIHW?(`t$d$~)PV~;#oS1P<-tCccKe?wz_OYJe<01XY&eCI~>^o=1?fK-~qK%vr
    zGw}G18Fwie=yt3|H(PVhbzLlchK;%2O5ZiKvZ|n>NjZO%wN^bVgeQl|RQqLw#ySsw
    znhBpH=v&=eAPz>X{g!Yh89Bzh^_y?QgyiHxwcGv8DY6kid(}D=w`sZ2nk&b=K_o>2
    zx_#)Tk*{4-#5Dt92``k}PL$)K4G%&Y)xU-1NM@OU4PpPyaz^+7A8Trf*u(}6<)t+E
    zFK#b=Y5MohLOLSSquVYSviio6mEL_{6R>3=Hvv9}E>n9wNrjaK|KFIMMnLcA`_cB+
    ztT}BXJ?0q{R^uSw6y`Wa;0l|W)I2cub6HRj$FiaknU`4{2iA$t`%}Yux*Nd@mL*KD
    zclQf#=?5KO7{XSWjFrOYqMGncPwamDN~D>|fW~PCD|KEsRVaI!E8wU@)Jq_l9G{_A
    zx!O1}>vB;=OA~=0ODlRnGwLcyR8uB;VF@Q(56>pxpP|8U(f$>^k-i4NBwB2B*+6nBea+yK%@F2`c-%?F;cKVQ5(&@@0XAzuqn)rl!y
    ztWpn2j}1FB4Usk(=BIt(vepDcyZ4qc78mR2s1ge?tf^8hlnMSru!WgUDi^~@4ZOJ-
    zmnYbc#XBvjLviF4N%z7|_a#taQ^N!cN%-ZgI|at9_o;7`K%
    zbkx+p*5vSdDuHw5D)>D9;mw*Ds^PRzN-{$m9rE5sRve6bX+*qV4tlZ^dl7HketVe6
    z_&)OtwywzmLMFn{7j{Z5^C?bsLB6Q<3`!r9!&gD#n6wbG^ot;YlQOWyVs4mC*iD)Z
    z0$giGTJneJ$6$|cfDiEZ8UE%vBu`IH;;acIIZ@S1+?%>%xQB={YG}4`UJ50g&|VBSFy0%Rndn5_Ct@?PB
    zA@1RGe#~AamJ{0CHu*MZ)J*Jefh!!xv(s~2ND)DMh?b$fl$Pi^kJ|DmGt_DKVR9oAQ@G9!gzJg6zjo_z$_vpXJG&2{x9OL0I
    z|AwGkSAyWcup|?*#?H(;WN0OhG+g96;_3QwepX72)7N!NXgC$D`H)cV9^3W;Sc->(
    zU@{OY!rm!4P0prNPZ@Se+{bYYM`^}-CtJ6rhI(4oJE%!
    z{-F_H+8?q0+2h-;pX^ou#%yzI_)WRKBR+q{XaOo-LrbqyUABE0n7
    zg@o=P0hZO1q$C~12Q`bCV0&(64f;X4I>O*YOr~o807fu@iFeY%zR=11r
    z>DmX+)dz1rr@JgMCwo^f1SxB`OxC{Jg*zU4FRMr7XNdpo<2$s;2bI40Z&i{9Ts;~=
    zR9Gkk=r^e4c$}T|Y$|BaAUQ^qDn#Sl>H?Jp&^?0vj6P352oEwx!IDRQ4XunVG8OYB
    zx!>7+!$$fvOY|%X3Kpv)a0G?K>QV>o-VuYlVZR_ysAq^XX%uxlbnO{ObETMziS`um9$t+)VG7r3~FFU-o8i
    zE<)a>qh(l3J3lIor~c+2lh^fOb!w+K&oJ0Itz|g6P_LXq>xbts;JOXD^e{XNU3Zy~
    zmI!Zo%5eLhY<+63pg5HFhHi=aecmFCRqG)ulR}E!FEI^=OQg4(i=Y@>vb59){@9w^
    zMTuE59oX)3dqp{OK>p5GS-uM9L3mLHf7_b%F`6Jz_Mc*~sX!At5@}qIueUM#2
    zEb+%Jvz8k!IJFaJ_}2ZdRkU-iP|e%Mh}E$orsD
    zd5j7szV<*f^IR%}TyOL36I&YOKiY*`4Z8>quWMW63<$R9+o%Hs!u!g)6P40;9);w!
    z#mG)7;#Ks@Cn?A-C!x&O)T41zOtdrf7Dz%TY5E*v*GQwPs60jxiJZToT^Y}AztnoX
    zE2yN60t9``SU*v`c3eDuY`TJHOt9#G5ODA<=PR93skB#1Iz47-OceV%OWNik@aH)#
    z+gQ8X&2pEZQ!hk|`El6frZjZz@0AxyOPfJ7a1aod`0<%vnEuz5MfvGL?xLn
    zvP{ij?3d3;`gOGP^*!%Hpbo`JLxfZ??Xa>X{c}hfC0`#=CG}+@oC&iyzQb(Xo}aCF
    z?ElKdg{7NnWC(hvtAz~w%8Eg3gQ~`a=m^&IQGZJ267Lfh2cSU-yczQ
    z^Nd}=RzaimZ4_OZ>j4OLAQhj^D6TLkk^XNlXC*qObs8=$%OfZe(+6cq9X)7FrMXWu
    z7EKinh8;x=df>ZT)Onk3nG*M~Q)d84LDP-C=tD+T74qCgG4#F&ncWxF`XMn%fHfG&v0e8d@p({#RhUQb>#aZV
    zTwP8oti60t==OXs%*8Dz>U;ZVhIkHVsFj5Np|+nwluAYt81DXwOoFHtpUypQr*N+7
    zEYQB49MR?*dn)?^K~MK%x1|$yryaeV|BIBX6qiMv2+O75>GoKI9&vyW-W3B2mAPe7
    zk71Wi71on>Hc!|_luKfj8SzN=q!b~!#zqbV2sTcO2>XC5aRbuaMa!OStKnj(_VDJ-
    zt0bTcXRXWt9Mud*&FhCpU7tDF;W{$YvDjFY3Uj|}z4$XP`T1%?<*F8%#c?k$VnJgF
    zy79~US+1?mToHTN*FFIgA@JM@>zGwchF!Lms8am^&p--Yu8zJ#+D_C$FZY~ay#Qs^
    z(FofY=(;Mhfy5fSFV;-ed3Kr}UdQyZj|Qci!P)-r03egdGnkfp4*lue*_yVSXuGmN
    z^}@h1H(rUyHgL;snN_3K>cSI4*zCeOw&l-tdY$@>WJ7OXcb6#b!&$07kB-v@$r_l6>#~m6R=J6T@kPsv-`<=?}#?-bPr;U09@}?dY()LVtgr@TRjc
    zxA`$u#X$d+Q+c<&l(QvsW<%!2lj!Qc8O9_u5Y-}1${7^3JUbaCJ*!aUdmA->z}d8;
    z5qRi-?z51A0u(BpaF-jeoI3=?hCH}G7CWFf)Mg`z3r2`F+PINJ1;97jiz?Ucukv}8
    zC}e))VZ;m2f(00%@pD1#%syYp@Q{Dneeh#7u+cJ4$MNLbi|RqXb6)knT4D|6sVz?h
    z2tizwS~MjYwa;0=D*M1Z(dfgcXU_(f`j6aRsKOaH5&f;P?lL#yXHEBl*<1OTS7voI
    z_YdZ*^V(t_U5OOyf4+FGU<+b&I`VsG^L)!@K>aP`g=}AqdT6LmG1$m|
    zyrU>(v`?*`y|P~Z)a6+n$n$uvhBP}1tTCX^!bEz1oKtyFDK8fzy8iLI+;g1N;IsHa
    z_6A9Dt#80iBn;Drff`@lxVTC3#^JZ-Hu0WHN8HsFp`nzp-3gpmK-O)!r;MMyfF)++
    zwrf9oG8kNZCZD`tyL+yXBwCsoAMCTRucYNV?l||cPva44hcvXZY}WdgO6m0hXzI8Y
    z63OAUmPX53UCZqVzqnTtG0CXPIzY-J{N8B2Ln0`PMwQV1BB3}=FlfPqnf=K|C-B)R
    zK_y9u`;^r(G0)JBO3JfPbB70Ve7b~qpCAtMeUS`$6VW9_Pu#w$t`&TbbndU~D@8!cs*Nd6m?6_$mH3cuS;Kn3C=gmXGR^OTjr%(puhtE_2m=dJdcx2aLfYZLJ(
    zmQ-Su`qk@h^TmJ*VdL~mBuF7=zNqwNqgZ$?q)9Y7bwUX~TG8bs=PQ(TLmN&XbJ=P>^jWp+-27{pCeK>utT?K)
    zr%l>q`^w1=tAJ{haVAImKqMr+#r0{ZWbPDgBa=V|B)wlo*8asP6-zm`i@#K`Op6y
    zf8*WO`%hjNLT9tDjt=%;t=!E1)&Bq1;r|{jARx&9Cdb71O%C0Mzh>(HXV7*m{&~Fr
    z<3;*+-T#^&pq~&X&!5RM9&La!{_XJmKbZIz+4(=n&cD5pG5vpNp+7)KaV%OL{?A%i
    z|Iah`m-MOuLfAb2yKsp3vuNV~MFX_Kzi6;Z|DwUiwX?EkwtmB{`WK`02JzuwI{%vY
    F{{ti5QtSW#
    
    diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
    index 44e0125c13..68ccf676fd 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 5330b5102b..9b6217fbd4 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 0406ff229e..291feb6e16 100644
    --- a/docs/base-css.html
    +++ b/docs/base-css.html
    @@ -39,7 +39,7 @@
                 
               
               Bootstrap
    -          
         

    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 +

    Refresh - Checkout - Delete + Checkout + Delete

    - Comment - Settings - More Info + Comment + Settings + More Info

    diff --git a/docs/components.html b/docs/components.html index 1d70ac4766..eb876572d6 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 +
    @@ -239,11 +239,11 @@

    This link and that link should have tooltips on hover.

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


    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 433a18c885..c000c9c88c 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 @@

    View project on GitHub - Download Bootstrap + Download Bootstrap

    - +
    @@ -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}}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 2144789663..e61d83152d 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -122,7 +122,7 @@
    - {{_i}}Info{{/i}} - + {{_i}}Info{{/i}} +
    @@ -163,11 +163,11 @@

    {{_i}}This link and that link should have tooltips on hover.{{/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}}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 aa2a77489f..2812e21527 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 738c520581..57ee5b0918 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 1fa39922f0..f6d97481c9 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 7367103caa..4b0523df29 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 ce725cd4b0..48cfa7560d 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); } From 31911659a200d39d8494f35f8fd71863ac1226d0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 21:29:50 -0800 Subject: [PATCH 656/667] 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 55b71b927eff8660ef284fd2b2883b1dcb1d2ae1..e5a745be6fd8f81937ead84e77340b4177c8e422 100644 GIT binary patch delta 23913 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 delta 23912 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 T`gg#vpN|k^0HCq|@7@0cV_1>* diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ec8a5f3ff6..60e54ce9d8 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 ddbbad174c..0f97a036ac 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.