From 8ec57f1ee31abf598d9868800c102da560ad8e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20B=C3=B8gebjerg=20Pedersen?= Date: Sun, 11 Sep 2011 21:50:10 +0200 Subject: [PATCH 01/11] Added dropdown buttons --- bootstrap-1.2.0.css | 229 ++++++++++++++++++++++++++++++++-- bootstrap-1.2.0.min.css | 37 ++++-- docs/assets/js/application.js | 7 +- docs/index.html | 95 ++++++++++++++ lib/patterns.less | 89 ++++++++++++- lib/preboot.less | 5 +- 6 files changed, 433 insertions(+), 29 deletions(-) diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index b0ecc5743915..3e9db32a3331 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Sep 9 20:48:32 PDT 2011 + * Date: Sun Sep 11 21:38:05 CEST 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). @@ -198,26 +198,36 @@ textarea { clear: both; } .btn.danger, +.dropdown .btn.dropdown-toggle.danger, .alert-message.danger, .btn.danger:hover, +.dropdown .btn.dropdown-toggle.danger:hover, .alert-message.danger:hover, .btn.error, +.dropdown .btn.dropdown-toggle.error, .alert-message.error, .btn.error:hover, +.dropdown .btn.dropdown-toggle.error:hover, .alert-message.error:hover, .btn.success, +.dropdown .btn.dropdown-toggle.success, .alert-message.success, .btn.success:hover, +.dropdown .btn.dropdown-toggle.success:hover, .alert-message.success:hover, .btn.info, +.dropdown .btn.dropdown-toggle.info, .alert-message.info, .btn.info:hover, +.dropdown .btn.dropdown-toggle.info:hover, .alert-message.info:hover { color: #ffffff; } .btn.danger, +.dropdown .btn.dropdown-toggle.danger, .alert-message.danger, .btn.error, +.dropdown .btn.dropdown-toggle.error, .alert-message.error { background-color: #c43c35; background-repeat: repeat-x; @@ -233,7 +243,7 @@ textarea { border-color: #c43c35 #c43c35 #882a25; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.success, .alert-message.success { +.btn.success, .dropdown .btn.dropdown-toggle.success, .alert-message.success { background-color: #57a957; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); @@ -248,7 +258,7 @@ textarea { border-color: #57a957 #57a957 #3d773d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.info, .alert-message.info { +.btn.info, .dropdown .btn.dropdown-toggle.info, .alert-message.info { background-color: #339bb9; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); @@ -1395,6 +1405,9 @@ 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, .dropdown.open { + z-index: 100; +} .open .menu, .dropdown.open .menu, .open .dropdown-toggle, @@ -1530,7 +1543,7 @@ footer { .page-header h1 { margin-bottom: 8px; } -.btn { +.btn, .dropdown .btn.dropdown-toggle { cursor: pointer; display: inline-block; background-color: #e6e6e6; @@ -1559,12 +1572,12 @@ footer { -moz-transition: 0.1s linear all; transition: 0.1s linear all; } -.btn:hover { +.btn:hover, .dropdown .btn.dropdown-toggle:hover { background-position: 0 -15px; color: #333; text-decoration: none; } -.btn.primary { +.btn.primary, .dropdown .btn.dropdown-toggle.primary { color: #fff; background-color: #0064cd; background-repeat: repeat-x; @@ -1580,12 +1593,12 @@ footer { border-color: #0064cd #0064cd #003f81; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn:active { +.btn:active, .dropdown .btn.dropdown-toggle:active { -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); } -.btn.disabled { +.btn.disabled, .dropdown .btn.dropdown-toggle.disabled { cursor: default; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -1597,7 +1610,7 @@ footer { -moz-box-shadow: none; box-shadow: none; } -.btn[disabled] { +.btn[disabled], .dropdown .btn.dropdown-toggle[disabled] { cursor: default; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -1609,7 +1622,7 @@ footer { -moz-box-shadow: none; box-shadow: none; } -.btn.large { +.btn.large, .dropdown .btn.dropdown-toggle.large { font-size: 16px; line-height: normal; padding: 9px 14px 9px; @@ -1617,7 +1630,7 @@ footer { -moz-border-radius: 6px; border-radius: 6px; } -.btn.small { +.btn.small, .dropdown .btn.dropdown-toggle.small { padding: 7px 9px 7px; font-size: 11px; } @@ -1628,6 +1641,200 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; border: 0; } +div.dropdown { + display: inline-block; +} +div.dropdown.open .btn.dropdown-toggle { + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); + background-position: 0 -15px; + color: #333; + -webkit-border-radius: 4px 4px 0px 0px; + -moz-border-radius: 4px 4px 0px 0px; + border-radius: 4px 4px 0px 0px; +} +div.dropdown.open .btn.dropdown-toggle.danger, +div.dropdown.open .btn.dropdown-toggle.error, +div.dropdown.open .btn.dropdown-toggle.success, +div.dropdown.open .btn.dropdown-toggle.info, +div.dropdown.open .btn.dropdown-toggle.primary { + color: #ffffff; +} +div.dropdown.open .btn.dropdown-toggle.danger + .dropdown-menu, +div.dropdown.open .btn.dropdown-toggle.error + .dropdown-menu, +div.dropdown.open .btn.dropdown-toggle.success + .dropdown-menu, +div.dropdown.open .btn.dropdown-toggle.info + .dropdown-menu, +div.dropdown.open .btn.dropdown-toggle.primary + .dropdown-menu { + margin: -1px; +} +div.dropdown .btn.dropdown-toggle + .dropdown-menu { + top: 27px; + border-width: 1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +div.dropdown .btn.large.dropdown-toggle + .dropdown-menu { + top: 37px; +} +div.dropdown .btn.large.dropdown-toggle:after { + margin-top: 8px; +} +div.dropdown .btn.dropdown-toggle:after { + margin-top: 6px; + border-top: 4px solid #333; +} +div.dropdown .btn.dropdown-toggle:after.danger, +div.dropdown .btn.dropdown-toggle:after.error, +div.dropdown .btn.dropdown-toggle:after.success, +div.dropdown .btn.dropdown-toggle:after.info { + border-top: 4px solid #333; +} +div.dropdown .primary + .dropdown-menu { + background-color: #0064cd; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#0064cd), to(#0064cd)); + background-image: -moz-linear-gradient(top, #0064cd, #0064cd); + background-image: -ms-linear-gradient(top, #0064cd, #0064cd); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #0064cd), color-stop(100%, #0064cd)); + background-image: -webkit-linear-gradient(top, #0064cd, #0064cd); + background-image: -o-linear-gradient(top, #0064cd, #0064cd); + background-image: linear-gradient(top, #0064cd, #0064cd); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0064cd', endColorstr='#0064cd', GradientType=0); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #0064cd #0064cd #003f81; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +div.dropdown .primary + .dropdown-menu li a { + color: #fff; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); +} +div.dropdown .primary + .dropdown-menu li a:hover { + color: #fff; + background-color: #004b9a; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#004b9a), to(#004b9a)); + background-image: -moz-linear-gradient(top, #004b9a, #004b9a); + background-image: -ms-linear-gradient(top, #004b9a, #004b9a); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #004b9a), color-stop(100%, #004b9a)); + background-image: -webkit-linear-gradient(top, #004b9a, #004b9a); + background-image: -o-linear-gradient(top, #004b9a, #004b9a); + background-image: linear-gradient(top, #004b9a, #004b9a); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004b9a', endColorstr='#004b9a', GradientType=0); +} +div.dropdown .primary + .dropdown-menu .divider { + background-color: #004b9a; + border-color: #0064cd; +} +div.dropdown .danger + .dropdown-menu, div.dropdown .error + .dropdown-menu { + background-color: #c43c35; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#c43c35), to(#c43c35)); + background-image: -moz-linear-gradient(top, #c43c35, #c43c35); + background-image: -ms-linear-gradient(top, #c43c35, #c43c35); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #c43c35), color-stop(100%, #c43c35)); + background-image: -webkit-linear-gradient(top, #c43c35, #c43c35); + background-image: -o-linear-gradient(top, #c43c35, #c43c35); + background-image: linear-gradient(top, #c43c35, #c43c35); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#c43c35', endColorstr='#c43c35', GradientType=0); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #c43c35 #c43c35 #882a25; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +div.dropdown .danger + .dropdown-menu li a, div.dropdown .error + .dropdown-menu li a { + color: #fff; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); +} +div.dropdown .danger + .dropdown-menu li a:hover, div.dropdown .error + .dropdown-menu li a:hover { + color: #fff; + background-color: #9c302a; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#9c302a), to(#9c302a)); + background-image: -moz-linear-gradient(top, #9c302a, #9c302a); + background-image: -ms-linear-gradient(top, #9c302a, #9c302a); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #9c302a), color-stop(100%, #9c302a)); + background-image: -webkit-linear-gradient(top, #9c302a, #9c302a); + background-image: -o-linear-gradient(top, #9c302a, #9c302a); + background-image: linear-gradient(top, #9c302a, #9c302a); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#9c302a', endColorstr='#9c302a', GradientType=0); +} +div.dropdown .danger + .dropdown-menu .divider, div.dropdown .error + .dropdown-menu .divider { + background-color: #9c302a; + border-color: #c43c35; +} +div.dropdown .success + .dropdown-menu { + background-color: #57a957; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#57a957), to(#57a957)); + background-image: -moz-linear-gradient(top, #57a957, #57a957); + background-image: -ms-linear-gradient(top, #57a957, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #57a957), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(top, #57a957, #57a957); + background-image: -o-linear-gradient(top, #57a957, #57a957); + background-image: linear-gradient(top, #57a957, #57a957); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#57a957', endColorstr='#57a957', GradientType=0); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #57a957 #57a957 #3d773d; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +div.dropdown .success + .dropdown-menu li a { + color: #fff; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); +} +div.dropdown .success + .dropdown-menu li a:hover { + color: #fff; + background-color: #458845; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#458845), to(#458845)); + background-image: -moz-linear-gradient(top, #458845, #458845); + background-image: -ms-linear-gradient(top, #458845, #458845); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #458845), color-stop(100%, #458845)); + background-image: -webkit-linear-gradient(top, #458845, #458845); + background-image: -o-linear-gradient(top, #458845, #458845); + background-image: linear-gradient(top, #458845, #458845); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#458845', endColorstr='#458845', GradientType=0); +} +div.dropdown .success + .dropdown-menu .divider { + background-color: #458845; + border-color: #57a957; +} +div.dropdown .info + .dropdown-menu { + background-color: #339bb9; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#339bb9), to(#339bb9)); + background-image: -moz-linear-gradient(top, #339bb9, #339bb9); + background-image: -ms-linear-gradient(top, #339bb9, #339bb9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #339bb9), color-stop(100%, #339bb9)); + background-image: -webkit-linear-gradient(top, #339bb9, #339bb9); + background-image: -o-linear-gradient(top, #339bb9, #339bb9); + background-image: linear-gradient(top, #339bb9, #339bb9); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#339bb9', endColorstr='#339bb9', GradientType=0); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #339bb9 #339bb9 #22697d; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +div.dropdown .info + .dropdown-menu li a { + color: #fff; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); +} +div.dropdown .info + .dropdown-menu li a:hover { + color: #fff; + background-color: #287a91; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#287a91), to(#287a91)); + background-image: -moz-linear-gradient(top, #287a91, #287a91); + background-image: -ms-linear-gradient(top, #287a91, #287a91); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #287a91), color-stop(100%, #287a91)); + background-image: -webkit-linear-gradient(top, #287a91, #287a91); + background-image: -o-linear-gradient(top, #287a91, #287a91); + background-image: linear-gradient(top, #287a91, #287a91); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#287a91', endColorstr='#287a91', GradientType=0); +} +div.dropdown .info + .dropdown-menu .divider { + background-color: #287a91; + border-color: #339bb9; +} .alert-message { background-color: #eedc94; background-repeat: repeat-x; diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css index f423a5a95d2a..67a6e067379b 100644 --- a/bootstrap-1.2.0.min.css +++ b/bootstrap-1.2.0.min.css @@ -24,10 +24,10 @@ textarea{overflow:auto;vertical-align:top;} .center-block{display:block;margin:0 auto;} .container{width:940px;margin:0 auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} -.btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;} -.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.danger,.dropdown .btn.dropdown-toggle.danger,.alert-message.danger,.btn.danger:hover,.dropdown .btn.dropdown-toggle.danger:hover,.alert-message.danger:hover,.btn.error,.dropdown .btn.dropdown-toggle.error,.alert-message.error,.btn.error:hover,.dropdown .btn.dropdown-toggle.error:hover,.alert-message.error:hover,.btn.success,.dropdown .btn.dropdown-toggle.success,.alert-message.success,.btn.success:hover,.dropdown .btn.dropdown-toggle.success:hover,.alert-message.success:hover,.btn.info,.dropdown .btn.dropdown-toggle.info,.alert-message.info,.btn.info:hover,.dropdown .btn.dropdown-toggle.info:hover,.alert-message.info:hover{color:#ffffff;} +.btn.danger,.dropdown .btn.dropdown-toggle.danger,.alert-message.danger,.btn.error,.dropdown .btn.dropdown-toggle.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.success,.dropdown .btn.dropdown-toggle.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.info,.dropdown .btn.dropdown-toggle.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .row{zoom:1;margin-bottom:18px;margin-left:-20px;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} .row [class*="span"]{display:inline;float:left;margin-left:20px;} @@ -198,7 +198,7 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten .menu-dropdown,.dropdown-menu{background-color:#fff;float:left;display:none;position:absolute;top:40px;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 #fff;} .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 #fff;}.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:#fff;background:#ccc;background:rgba(0, 0, 0, 0.3);} +.open,.dropdown.open{z-index:100;}.open .menu,.dropdown.open .menu,.open .dropdown-toggle,.dropdown.open .dropdown-toggle{color:#fff;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;} .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} @@ -214,15 +214,28 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} -.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;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);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} -.btn.primary{color:#fff;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn:active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);} -.btn.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn.large{font-size:16px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.btn.small{padding:7px 9px 7px;font-size:11px;} +.btn,.dropdown .btn.dropdown-toggle{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;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);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover,.dropdown .btn.dropdown-toggle:hover{background-position:0 -15px;color:#333;text-decoration:none;} +.btn.primary,.dropdown .btn.dropdown-toggle.primary{color:#fff;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn:active,.dropdown .btn.dropdown-toggle:active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);} +.btn.disabled,.dropdown .btn.dropdown-toggle.disabled{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn[disabled],.dropdown .btn.dropdown-toggle[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn.large,.dropdown .btn.dropdown-toggle.large{font-size:16px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.btn.small,.dropdown .btn.dropdown-toggle.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;} +div.dropdown{display:inline-block;}div.dropdown.open .btn.dropdown-toggle{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);background-position:0 -15px;color:#333;-webkit-border-radius:4px 4px 0px 0px;-moz-border-radius:4px 4px 0px 0px;border-radius:4px 4px 0px 0px;}div.dropdown.open .btn.dropdown-toggle.danger,div.dropdown.open .btn.dropdown-toggle.error,div.dropdown.open .btn.dropdown-toggle.success,div.dropdown.open .btn.dropdown-toggle.info,div.dropdown.open .btn.dropdown-toggle.primary{color:#ffffff;}div.dropdown.open .btn.dropdown-toggle.danger+.dropdown-menu,div.dropdown.open .btn.dropdown-toggle.error+.dropdown-menu,div.dropdown.open .btn.dropdown-toggle.success+.dropdown-menu,div.dropdown.open .btn.dropdown-toggle.info+.dropdown-menu,div.dropdown.open .btn.dropdown-toggle.primary+.dropdown-menu{margin:-1px;} +div.dropdown .btn.dropdown-toggle+.dropdown-menu{top:27px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} +div.dropdown .btn.large.dropdown-toggle+.dropdown-menu{top:37px;} +div.dropdown .btn.large.dropdown-toggle:after{margin-top:8px;} +div.dropdown .btn.dropdown-toggle:after{margin-top:6px;border-top:4px solid #333;}div.dropdown .btn.dropdown-toggle:after.danger,div.dropdown .btn.dropdown-toggle:after.error,div.dropdown .btn.dropdown-toggle:after.success,div.dropdown .btn.dropdown-toggle:after.info{border-top:4px solid #333;} +div.dropdown .primary+.dropdown-menu{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#0064cd), to(#0064cd));background-image:-moz-linear-gradient(top, #0064cd, #0064cd);background-image:-ms-linear-gradient(top, #0064cd, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #0064cd), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #0064cd, #0064cd);background-image:-o-linear-gradient(top, #0064cd, #0064cd);background-image:linear-gradient(top, #0064cd, #0064cd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0064cd', endColorstr='#0064cd', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}div.dropdown .primary+.dropdown-menu li a{color:#fff;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}div.dropdown .primary+.dropdown-menu li a:hover{color:#fff;background-color:#004b9a;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#004b9a), to(#004b9a));background-image:-moz-linear-gradient(top, #004b9a, #004b9a);background-image:-ms-linear-gradient(top, #004b9a, #004b9a);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #004b9a), color-stop(100%, #004b9a));background-image:-webkit-linear-gradient(top, #004b9a, #004b9a);background-image:-o-linear-gradient(top, #004b9a, #004b9a);background-image:linear-gradient(top, #004b9a, #004b9a);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#004b9a', endColorstr='#004b9a', GradientType=0);} +div.dropdown .primary+.dropdown-menu .divider{background-color:#004b9a;border-color:#0064cd;} +div.dropdown .danger+.dropdown-menu,div.dropdown .error+.dropdown-menu{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#c43c35), to(#c43c35));background-image:-moz-linear-gradient(top, #c43c35, #c43c35);background-image:-ms-linear-gradient(top, #c43c35, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #c43c35), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #c43c35, #c43c35);background-image:-o-linear-gradient(top, #c43c35, #c43c35);background-image:linear-gradient(top, #c43c35, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#c43c35', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}div.dropdown .danger+.dropdown-menu li a,div.dropdown .error+.dropdown-menu li a{color:#fff;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}div.dropdown .danger+.dropdown-menu li a:hover,div.dropdown .error+.dropdown-menu li a:hover{color:#fff;background-color:#9c302a;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#9c302a), to(#9c302a));background-image:-moz-linear-gradient(top, #9c302a, #9c302a);background-image:-ms-linear-gradient(top, #9c302a, #9c302a);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #9c302a), color-stop(100%, #9c302a));background-image:-webkit-linear-gradient(top, #9c302a, #9c302a);background-image:-o-linear-gradient(top, #9c302a, #9c302a);background-image:linear-gradient(top, #9c302a, #9c302a);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9c302a', endColorstr='#9c302a', GradientType=0);} +div.dropdown .danger+.dropdown-menu .divider,div.dropdown .error+.dropdown-menu .divider{background-color:#9c302a;border-color:#c43c35;} +div.dropdown .success+.dropdown-menu{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#57a957), to(#57a957));background-image:-moz-linear-gradient(top, #57a957, #57a957);background-image:-ms-linear-gradient(top, #57a957, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #57a957), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #57a957, #57a957);background-image:-o-linear-gradient(top, #57a957, #57a957);background-image:linear-gradient(top, #57a957, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#57a957', endColorstr='#57a957', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}div.dropdown .success+.dropdown-menu li a{color:#fff;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}div.dropdown .success+.dropdown-menu li a:hover{color:#fff;background-color:#458845;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#458845), to(#458845));background-image:-moz-linear-gradient(top, #458845, #458845);background-image:-ms-linear-gradient(top, #458845, #458845);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #458845), color-stop(100%, #458845));background-image:-webkit-linear-gradient(top, #458845, #458845);background-image:-o-linear-gradient(top, #458845, #458845);background-image:linear-gradient(top, #458845, #458845);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#458845', endColorstr='#458845', GradientType=0);} +div.dropdown .success+.dropdown-menu .divider{background-color:#458845;border-color:#57a957;} +div.dropdown .info+.dropdown-menu{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#339bb9), to(#339bb9));background-image:-moz-linear-gradient(top, #339bb9, #339bb9);background-image:-ms-linear-gradient(top, #339bb9, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #339bb9), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #339bb9, #339bb9);background-image:-o-linear-gradient(top, #339bb9, #339bb9);background-image:linear-gradient(top, #339bb9, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#339bb9', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}div.dropdown .info+.dropdown-menu li a{color:#fff;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}div.dropdown .info+.dropdown-menu li a:hover{color:#fff;background-color:#287a91;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#287a91), to(#287a91));background-image:-moz-linear-gradient(top, #287a91, #287a91);background-image:-ms-linear-gradient(top, #287a91, #287a91);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #287a91), color-stop(100%, #287a91));background-image:-webkit-linear-gradient(top, #287a91, #287a91);background-image:-o-linear-gradient(top, #287a91, #287a91);background-image:linear-gradient(top, #287a91, #287a91);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#287a91', endColorstr='#287a91', GradientType=0);} +div.dropdown .info+.dropdown-menu .divider{background-color:#287a91;border-color:#339bb9;} .alert-message{background-color:#eedc94;background-repeat:repeat-x;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);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);margin-bottom:18px;padding:7px 14px;color:#404040;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 h5{line-height:18px;} .alert-message p{margin-bottom:0;} .alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;} diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index ec4ae3c06e44..bcd6f7c51e3e 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -48,10 +48,13 @@ $(document).ready(function(){ // =============================== $("body").bind("click", function (e) { - $('.dropdown-toggle, .menu').parent("li").removeClass("open"); + $('.dropdown-toggle, .menu').parent("li,div").removeClass("open"); }); $(".dropdown-toggle, .menu").click(function (e) { - var $li = $(this).parent("li").toggleClass('open'); + $('.dropdown-toggle, .menu').not( this ).parent("li,div").removeClass("open"); + + var $li = $(this).parent("li,div").toggleClass('open'); + return false; }); diff --git a/docs/index.html b/docs/index.html index d2e036611834..ce2f1a5be34e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -892,6 +892,101 @@

Links

Buttons

  +
+

Dropdown buttons

+
+
+ Primary + +
+ +
+ Default + +
+ +
+ Info + +
+ +
+ Success + +
+ +
+ Danger + +
+
+ +

Alternate sizes

+
+
+ Primary action + +
+
+ Action + +
+
+
+
+ Primary action + +
+
+ Action + +
+
diff --git a/lib/patterns.less b/lib/patterns.less index 413f82178e5a..c3b2ac780a15 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -292,9 +292,9 @@ a.menu:after, .dropdown-menu { display: block; } + z-index: 100; } - // Tabs and Pills .tabs, .pills { @@ -425,7 +425,7 @@ footer { // ------------- // Base .btn styles -.btn { +.btn, .dropdown .btn.dropdown-toggle { // Button Base cursor: pointer; display: inline-block; @@ -505,6 +505,91 @@ input[type=submit].btn { } } +// Dropdown Buttons +div.dropdown { + display: inline-block; + + &.open .btn.dropdown-toggle { + @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); + background-position: 0 -15px; + color: #333; + .border-radius(4px 4px 0px 0px); + &.danger, + &.error, + &.success, + &.info, + &.primary { + color: @white; + + .dropdown-menu { + margin: -1px; + } + } + } + + .btn.dropdown-toggle + .dropdown-menu { + top: 27px; + border-width: 1px; + .border-radius(0 6px 6px 6px); + } + + .btn.large.dropdown-toggle + .dropdown-menu { + top: 37px; + } + + .btn.large.dropdown-toggle:after { + margin-top: 8px; + } + + .btn.dropdown-toggle:after { + margin-top: 6px; + border-top: 4px solid #333; + + &.danger, + &.error, + &.success, + &.info, { + border-top: 4px solid #333; + } + } + + // Menu Color Mixins, abstracts colors of menus + .menu-color(@background, @foreground: #fff) { + @highlight: darken( @background, 10% ); + + .gradientBar(@background, @background); + + li a { + color: #fff; + text-shadow: 0 1px 0 rgba(0,0,0,.5); + &:hover { + color: #fff; + #gradient > .vertical(@highlight, @highlight); + } + } + .divider { + background-color: @highlight; + border-color: @background; + } + } + + // COLORS + .primary + .dropdown-menu { + .menu-color( @blueDark ); + } + .danger,.error { + + .dropdown-menu { + .menu-color( #c43c35 ); + } + } + .success + .dropdown-menu { + .menu-color( #57a957 ); + } + .info + .dropdown-menu { + .menu-color( #339bb9 ); + } +} + // ERROR STYLES // ------------ diff --git a/lib/preboot.less b/lib/preboot.less index a922f569cef3..b6b2404e77ad 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -181,15 +181,16 @@ } } -// Gradient Bar Colors for buttons and allerts +// Gradient Bar Colors for buttons and alerts .gradientBar(@primaryColor, @secondaryColor) { #gradient > .vertical(@primaryColor, @secondaryColor); text-shadow: 0 -1px 0 rgba(0,0,0,.25); border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); } -// Shared colors for buttons and alerts +// Shared colors for buttons dropdown buttons and alerts .btn, +.dropdown .btn.dropdown-toggle, .alert-message { // Set text color &.danger, From ec8619a9808b9b6e721334af8e6b5248ccbea8b5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Sep 2011 17:21:43 -0700 Subject: [PATCH 02/11] 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 8b6fe3eb42c6..6d3c15390adf 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 aabdf2428b30..4a3b6485bb28 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 f99b756fe1fa..5c5162471a21 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - + @@ -37,22 +37,42 @@ -
+
Bootstrap @@ -718,102 +738,6 @@

Label anything

- -
-
-

Media Displaying images and videos

-
- -
-
-

Media grid

-

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

-
-
-

Example thumbnails

-

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

-

Large

- -

Medium

- -

Small

- -

Coding them

-

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

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

Buttons

+ +
+
+

Media Displaying images and videos

+
+ +
+
+

Media grid

+

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

+
+
+

Example thumbnails

+

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

+

Large

+ +

Medium

+ +

Small

+ +

Coding them

+

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

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