diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 35e46730fb..7ec9acc0bd 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.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: Sun Aug 21 20:43:53 PDT 2011 + * Date: Sun Aug 21 20:47:15 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). @@ -129,8 +129,9 @@ aside { color: @textColor; font-size: @fontSize; line-height: @baseline; - border: 1px solid darken(@color, 10%); - border-bottom-color: fadein(@borderColor, 15%); + border: 1px solid; + border-color: #ccc #ccc #bbb; + border-color: borderColor borderColor fadein(@borderColor, 15%); .border-radius(@borderRadius); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); @@ -438,8 +439,6 @@ a:hover { background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); background-image: -webkit-linear-gradient(#049cdb, #0064cd); background-image: -o-linear-gradient(#049cdb, #0064cd); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); background-image: linear-gradient(#049cdb, #0064cd); color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -457,6 +456,8 @@ a:hover { .btn.primary { color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #0064cd #0064cd #003f81; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.primary:hover { color: #fff; @@ -473,7 +474,15 @@ a:hover { padding-left: 9px; font-size: 11px; } -.btn:disabled, .btn.disabled { +.btn.disabled { + background-image: none; + filter: alpha(opacity=65); + -khtml-opacity: 0.65; + -moz-opacity: 0.65; + opacity: 0.65; + cursor: default; +} +.btn:disabled { background-image: none; filter: alpha(opacity=65); -khtml-opacity: 0.65; @@ -684,7 +693,7 @@ form fieldset legend { line-height: 1; color: #404040; } -form div.clearfix { +form .clearfix { margin-bottom: 18px; } form label, @@ -768,7 +777,7 @@ form input[type=text]:focus, form input[type=password]:focus, form textarea:focu -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); } -form div.error { +form .error { background: #fae5e3; padding: 10px 0; margin: -10px 0 10px; @@ -776,22 +785,22 @@ form div.error { -moz-border-radius: 4px; border-radius: 4px; } -form div.error > label, form div.error span.help-inline, form div.error span.help-block { +form .error > label, form .error span.help-inline, form .error span.help-block { color: #9d261d; } -form div.error input[type=text], form div.error input[type=password], form div.error textarea { +form .error input[type=text], form .error input[type=password], form .error textarea { border-color: #c87872; -webkit-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); -moz-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); } -form div.error input[type=text]:focus, form div.error input[type=password]:focus, form div.error textarea:focus { +form .error input[type=text]:focus, form .error input[type=password]:focus, form .error textarea:focus { border-color: #b9554d; -webkit-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); -moz-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); } -form div.error div.input-prepend span.add-on, form div.error div.input-append span.add-on { +form .error .input-prepend span.add-on, form .error .input-append span.add-on { background: #f4c8c5; border-color: #c87872; color: #b9554d; @@ -842,7 +851,7 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled { -moz-box-shadow: none; box-shadow: none; } -div.actions { +.actions { background: #f5f5f5; margin-top: 18px; margin-bottom: 18px; @@ -852,13 +861,13 @@ div.actions { -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; } -div.actions div.secondary-action { +.actions .secondary-action { float: right; } -div.actions div.secondary-action a { +.actions .secondary-action a { line-height: 30px; } -div.actions div.secondary-action a:hover { +.actions .secondary-action a:hover { text-decoration: underline; } .help-inline, .help-block { @@ -873,27 +882,27 @@ div.actions div.secondary-action a:hover { display: block; max-width: 600px; } -div.inline-inputs { +.inline-inputs { color: #808080; } -div.inline-inputs span, div.inline-inputs input[type=text] { +.inline-inputs span, .inline-inputs input[type=text] { display: inline-block; } -div.inline-inputs input.mini { +.inline-inputs input.mini { width: 60px; } -div.inline-inputs input.small { +.inline-inputs input.small { width: 90px; } -div.inline-inputs span { +.inline-inputs span { padding: 0 2px 0 1px; } -div.input-prepend input[type=text], div.input-append input[type=text] { +.input-prepend input[type=text], .input-append input[type=text] { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -div.input-prepend .add-on, div.input-append .add-on { +.input-prepend .add-on, .input-append .add-on { background: #f5f5f5; float: left; display: block; @@ -912,33 +921,33 @@ div.input-prepend .add-on, div.input-append .add-on { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -div.input-prepend .active, div.input-append .active { +.input-prepend .active, .input-append .active { background: #a9dba9; border-color: #46a546; } -div.input-append input[type=text] { +.input-append input[type=text] { float: left; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -div.input-append .add-on { +.input-append .add-on { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; border-right-width: 1px; border-left-width: 0; } -ul.inputs-list { +.inputs-list { margin: 0 0 5px; width: 100%; } -ul.inputs-list li { +.inputs-list li { display: block; padding: 0; width: 100%; } -ul.inputs-list li label { +.inputs-list li label { display: block; float: none; width: auto; @@ -947,22 +956,22 @@ ul.inputs-list li label { text-align: left; white-space: normal; } -ul.inputs-list li label strong { +.inputs-list li label strong { color: #808080; } -ul.inputs-list li label small { +.inputs-list li label small { font-size: 12px; font-weight: normal; } -ul.inputs-list li ul.inputs-list { +.inputs-list li ul.inputs-list { margin-left: 25px; margin-bottom: 10px; padding-top: 0; } -ul.inputs-list li:first-child { +.inputs-list li:first-child { padding-top: 5px; } -ul.inputs-list input[type=radio], ul.inputs-list input[type=checkbox] { +.inputs-list input[type=radio], .inputs-list input[type=checkbox] { margin-bottom: 0; } form.form-stacked { @@ -983,19 +992,19 @@ form.form-stacked label { line-height: 20px; padding-top: 0; } -form.form-stacked div.clearfix { +form.form-stacked .clearfix { margin-bottom: 9px; } -form.form-stacked div.clearfix div.input { +form.form-stacked .clearfix div.input { margin-left: 0; } -form.form-stacked ul.inputs-list { +form.form-stacked .inputs-list { margin-bottom: 0; } -form.form-stacked ul.inputs-list li { +form.form-stacked .inputs-list li { padding-top: 0; } -form.form-stacked ul.inputs-list li label { +form.form-stacked .inputs-list li label { font-weight: normal; padding-top: 0; } @@ -1006,7 +1015,7 @@ form.form-stacked div.error { margin-top: 0; margin-left: -10px; } -form.form-stacked div.actions { +form.form-stacked .actions { margin-left: -20px; padding-left: 20px; } @@ -1018,13 +1027,13 @@ table { width: 100%; margin-bottom: 18px; padding: 0; - text-align: left; border-collapse: separate; font-size: 13px; } table th, table td { padding: 10px 10px 9px; line-height: 13.5px; + text-align: left; vertical-align: middle; border-bottom: 1px solid #ddd; } @@ -1033,16 +1042,16 @@ table th { font-weight: bold; border-bottom-width: 2px; } -table.zebra-striped tbody tr:nth-child(odd) td { +.zebra-striped tbody tr:nth-child(odd) td { background-color: #f9f9f9; } -table.zebra-striped tbody tr:hover td { +.zebra-striped tbody tr:hover td { background-color: #f5f5f5; } -table.zebra-striped th.header { +.zebra-striped .header { cursor: pointer; } -table.zebra-striped th.header:after { +.zebra-striped .header:after { content: ""; float: right; margin-top: 7px; @@ -1051,27 +1060,24 @@ table.zebra-striped th.header:after { border-color: #000 transparent; visibility: hidden; } -table.zebra-striped th.headerSortUp, table.zebra-striped th.headerSortDown { +.zebra-striped .headerSortUp, .zebra-striped .headerSortDown { background-color: rgba(141, 192, 219, 0.25); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); -webkit-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; } -table.zebra-striped th.header:hover:after { +.zebra-striped .header:hover:after { visibility: visible; } -table.zebra-striped th.actions:hover { - background-image: none; -} -table.zebra-striped th.headerSortDown:after, table.zebra-striped th.headerSortDown:hover:after { +.zebra-striped .headerSortDown:after, .zebra-striped .headerSortDown:hover:after { visibility: visible; filter: alpha(opacity=60); -khtml-opacity: 0.6; -moz-opacity: 0.6; opacity: 0.6; } -table.zebra-striped th.headerSortUp:after { +.zebra-striped .headerSortUp:after { border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; @@ -1085,52 +1091,52 @@ table.zebra-striped th.headerSortUp:after { -moz-opacity: 0.6; opacity: 0.6; } -table.zebra-striped th.blue { +table .blue { color: #049cdb; border-bottom-color: #049cdb; } -table.zebra-striped th.headerSortUp.blue, table.zebra-striped th.headerSortDown.blue { +table .headerSortUp.blue, table .headerSortDown.blue { background-color: #ade6fe; } -table.zebra-striped th.green { +table .green { color: #46a546; border-bottom-color: #46a546; } -table.zebra-striped th.headerSortUp.green, table.zebra-striped th.headerSortDown.green { +table .headerSortUp.green, table .headerSortDown.green { background-color: #cdeacd; } -table.zebra-striped th.red { +table .red { color: #9d261d; border-bottom-color: #9d261d; } -table.zebra-striped th.headerSortUp.red, table.zebra-striped th.headerSortDown.red { +table .headerSortUp.red, table .headerSortDown.red { background-color: #f4c8c5; } -table.zebra-striped th.yellow { +table .yellow { color: #ffc40d; border-bottom-color: #ffc40d; } -table.zebra-striped th.headerSortUp.yellow, table.zebra-striped th.headerSortDown.yellow { +table .headerSortUp.yellow, table .headerSortDown.yellow { background-color: #fff6d9; } -table.zebra-striped th.orange { +table .orange { color: #f89406; border-bottom-color: #f89406; } -table.zebra-striped th.headerSortUp.orange, table.zebra-striped th.headerSortDown.orange { +table .headerSortUp.orange, table .headerSortDown.orange { background-color: #fee9cc; } -table.zebra-striped th.purple { +table .purple { color: #7a43b6; border-bottom-color: #7a43b6; } -table.zebra-striped th.headerSortUp.purple, table.zebra-striped th.headerSortDown.purple { +table .headerSortUp.purple, table .headerSortDown.purple { background-color: #e2d5f0; } /* Patterns.less * Repeatable UI elements outside the base styles provided from the scaffolding * ---------------------------------------------------------------------------- */ -div.topbar { +.topbar { background-color: #222222; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); @@ -1139,8 +1145,6 @@ div.topbar { background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); background-image: -webkit-linear-gradient(#333333, #222222); background-image: -o-linear-gradient(#333333, #222222); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); background-image: linear-gradient(#333333, #222222); height: 40px; position: fixed; @@ -1149,21 +1153,36 @@ div.topbar { right: 0; z-index: 10000; overflow: visible; +} +.topbar .fill { + background: #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(#333333, #222222); + background-image: -ms-linear-gradient(#333333, #222222); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); + background-image: -webkit-linear-gradient(#333333, #222222); + background-image: -o-linear-gradient(#333333, #222222); + background-image: linear-gradient(#333333, #222222); -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); } -div.topbar a { +.topbar a { color: #bfbfbf; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -div.topbar a:hover, div.topbar ul li.active a { +.topbar a:hover, .topbar ul li.active a { background-color: #333; background-color: rgba(255, 255, 255, 0.05); color: #ffffff; text-decoration: none; } -div.topbar h3 a { +.topbar h3 { + position: relative; +} +.topbar h3 a { float: left; display: block; padding: 8px 20px 12px; @@ -1173,7 +1192,7 @@ div.topbar h3 a { font-weight: 200; line-height: 1; } -div.topbar form { +.topbar form { float: left; margin: 5px 0 0 0; position: relative; @@ -1182,8 +1201,8 @@ div.topbar form { -moz-opacity: 1; opacity: 1; } -div.topbar form input { - background-color: #bfbfbf; +.topbar form input { + background-color: #444; background-color: rgba(255, 255, 255, 0.3); font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: normal; @@ -1204,18 +1223,18 @@ div.topbar form input { -moz-transition: none; transition: none; } -div.topbar form input:-moz-placeholder { +.topbar form input:-moz-placeholder { color: #e6e6e6; } -div.topbar form input::-webkit-input-placeholder { +.topbar form input::-webkit-input-placeholder { color: #e6e6e6; } -div.topbar form input:hover { - background-color: #444; +.topbar form input:hover { + background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); color: #fff; } -div.topbar form input:focus, div.topbar form input.focused { +.topbar form input:focus, .topbar form input.focused { outline: none; background-color: #fff; color: #404040; @@ -1226,47 +1245,47 @@ div.topbar form input:focus, div.topbar form input.focused { -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); } -div.topbar ul { +.topbar ul { display: block; float: left; margin: 0 10px 0 0; position: relative; } -div.topbar ul.secondary-nav { +.topbar ul.secondary-nav { float: right; margin-left: 10px; margin-right: 0; } -div.topbar ul li { +.topbar ul li { display: block; float: left; font-size: 13px; } -div.topbar ul li a { +.topbar ul li a { display: block; float: none; padding: 10px 10px 11px; line-height: 19px; text-decoration: none; } -div.topbar ul li a:hover { +.topbar ul li a:hover { color: #fff; text-decoration: none; } -div.topbar ul li.active a { +.topbar ul li.active a { background-color: #222; background-color: rgba(0, 0, 0, 0.5); } -div.topbar ul.primary-nav li ul { +.topbar ul.primary-nav li ul { left: 0; } -div.topbar ul.secondary-nav li ul { +.topbar ul.secondary-nav li ul { right: 0; } -div.topbar ul li.menu { +.topbar ul li.menu { position: relative; } -div.topbar ul li.menu a.menu:after { +.topbar ul li.menu a.menu:after { width: 0px; height: 0px; display: inline-block; @@ -1283,27 +1302,27 @@ div.topbar ul li.menu a.menu:after { -moz-opacity: 0.5; opacity: 0.5; } -div.topbar ul li.menu.open a.menu, div.topbar ul li.menu.open a:hover { - background-color: #00b4eb; +.topbar ul li.menu.open a.menu, .topbar ul li.menu.open a:hover { + background-color: #444; background-color: rgba(255, 255, 255, 0.1); color: #fff; } -div.topbar ul li.menu.open ul { +.topbar ul li.menu.open ul { display: block; } -div.topbar ul li.menu.open ul li a { +.topbar ul li.menu.open ul li a { background-color: transparent; font-weight: normal; } -div.topbar ul li.menu.open ul li a:hover { +.topbar ul li.menu.open ul li a:hover { background-color: rgba(255, 255, 255, 0.1); color: #fff; } -div.topbar ul li.menu.open ul li.active a { +.topbar ul li.menu.open ul li.active a { background-color: rgba(255, 255, 255, 0.1); font-weight: bold; } -div.topbar ul li ul { +.topbar ul li ul { background-color: #333; float: left; display: none; @@ -1325,14 +1344,14 @@ div.topbar ul li ul { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); } -div.topbar ul li ul li { +.topbar ul li ul li { float: none; clear: both; display: block; background: none; font-size: 12px; } -div.topbar ul li ul li a { +.topbar ul li ul li a { display: block; padding: 6px 15px; clear: both; @@ -1340,19 +1359,20 @@ div.topbar ul li ul li a { line-height: 19px; color: #bbb; } -div.topbar ul li ul li a:hover { +.topbar ul li ul li a:hover { background-color: #333; background-color: rgba(255, 255, 255, 0.25); color: #fff; } -div.topbar ul li ul li.divider { +.topbar ul li ul li.divider { height: 1px; overflow: hidden; + background: #222; background: rgba(0, 0, 0, 0.2); border-bottom: 1px solid rgba(255, 255, 255, 0.1); margin: 5px 0; } -div.topbar ul li ul li span { +.topbar ul li ul li span { clear: both; display: block; background: rgba(0, 0, 0, 0.2); @@ -1380,17 +1400,17 @@ div.topbar ul li ul li span { font-weight: 200; line-height: 27px; } -div.page-header { +.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); } -div.page-header h1 { +.page-header h1 { margin-bottom: 8px; } -div.alert-message { +.alert-message { background-color: rgba(0, 0, 0, 0.15); background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15))); @@ -1399,131 +1419,164 @@ div.alert-message { background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15))); background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0); background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; + filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; background-color: #e6e6e6; margin-bottom: 18px; padding: 8px 15px; color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-bottom: 1px solid rgba(0, 0, 0, 0.25); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); + border-bottom: 1px solid rgba(0, 0, 0, 0.3); -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -div.alert-message p { +.alert-message p { color: #fff; margin-bottom: 0; } -div.alert-message p + p { +.alert-message p + p { margin-top: 5px; } -div.alert-message.error { - background-color: #e06359; +.alert-message.error { + background-color: #d83a2e; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e)); + background-image: -moz-linear-gradient(#e4776f, #d83a2e); + background-image: -ms-linear-gradient(#e4776f, #d83a2e); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e)); + background-image: -webkit-linear-gradient(#e4776f, #d83a2e); + background-image: -o-linear-gradient(#e4776f, #d83a2e); + background-image: linear-gradient(#e4776f, #d83a2e); + border-bottom-color: #b32b21; } -div.alert-message.warning { - background-color: #ffd75a; +.alert-message.warning { + background-color: #ffd040; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040)); + background-image: -moz-linear-gradient(#ffe38d, #ffd040); + background-image: -ms-linear-gradient(#ffe38d, #ffd040); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040)); + background-image: -webkit-linear-gradient(#ffe38d, #ffd040); + background-image: -o-linear-gradient(#ffe38d, #ffd040); + background-image: linear-gradient(#ffe38d, #ffd040); + border-bottom-color: #ffc40d; } -div.alert-message.success { - background-color: #74c474; +.alert-message.success { + background-color: #62bc62; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62)); + background-image: -moz-linear-gradient(#97d397, #62bc62); + background-image: -ms-linear-gradient(#97d397, #62bc62); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62)); + background-image: -webkit-linear-gradient(#97d397, #62bc62); + background-image: -o-linear-gradient(#97d397, #62bc62); + background-image: linear-gradient(#97d397, #62bc62); + border-bottom-color: #46a546; } -div.alert-message.info { - background-color: #30c0fb; +.alert-message.info { + background-color: #04aef4; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4)); + background-image: -moz-linear-gradient(#62cffc, #04aef4); + background-image: -ms-linear-gradient(#62cffc, #04aef4); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4)); + background-image: -webkit-linear-gradient(#62cffc, #04aef4); + background-image: -o-linear-gradient(#62cffc, #04aef4); + background-image: linear-gradient(#62cffc, #04aef4); + border-bottom-color: #049cdb; } -div.alert-message a.close { +.alert-message .close { float: right; margin-top: -2px; - color: #fff; + color: #000; font-size: 20px; font-weight: bold; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); - filter: alpha(opacity=50); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; - opacity: 0.5; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + text-shadow: 0 1px 0 #ffffff; + filter: alpha(opacity=20); + -khtml-opacity: 0.2; + -moz-opacity: 0.2; + opacity: 0.2; } -div.alert-message a.close:hover { +.alert-message .close:hover { text-decoration: none; - filter: alpha(opacity=50); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; - opacity: 0.5; + filter: alpha(opacity=40); + -khtml-opacity: 0.4; + -moz-opacity: 0.4; + opacity: 0.4; } -div.block-message { +.block-message { margin-bottom: 18px; padding: 14px; color: #404040; color: rgba(0, 0, 0, 0.8); + *color: #404040; + /* IE 6-7 */ + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; } -div.block-message p { +.block-message p { color: #404040; color: rgba(0, 0, 0, 0.8); + *color: #404040; + /* IE 6-7 */ + margin-right: 30px; margin-bottom: 0; } -div.block-message ul { +.block-message ul { margin-bottom: 0; } -div.block-message strong { +.block-message strong { display: block; } -div.block-message a.close { - display: block; - color: #404040; - color: rgba(0, 0, 0, 0.5); - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); -} -div.block-message.error { +.block-message.error { background: #f8dcda; border: 1px solid #f4c8c5; } -div.block-message.warning { +.block-message.warning { background: #fff0c0; border: 1px solid #ffe38d; } -div.block-message.success { +.block-message.success { background: #dff1df; border: 1px solid #bbe2bb; } -div.block-message.info { +.block-message.info { background: #c7eefe; border: 1px solid #ade6fe; } -ul.tabs, ul.pills { +.tabs, .pills { margin: 0 0 20px; padding: 0; zoom: 1; } -ul.tabs:before, -ul.pills:before, -ul.tabs:after, -ul.pills:after { +.tabs:before, +.pills:before, +.tabs:after, +.pills:after { display: table; content: ""; } -ul.tabs:after, ul.pills:after { +.tabs:after, .pills:after { clear: both; } -ul.tabs li, ul.pills li { +.tabs li, .pills li { display: inline; } -ul.tabs li a, ul.pills li a { +.tabs li a, .pills li a { float: left; width: auto; } -ul.tabs { +.tabs { width: 100%; border-bottom: 1px solid #bfbfbf; } -ul.tabs li a { +.tabs li a { margin-bottom: -1px; margin-right: 2px; padding: 0 15px; @@ -1532,18 +1585,18 @@ ul.tabs li a { -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; } -ul.tabs li a:hover { +.tabs li a:hover { background-color: #e6e6e6; border-bottom: 1px solid #bfbfbf; } -ul.tabs li.active a { +.tabs li.active a { background-color: #fff; padding: 0 14px; border: 1px solid #ccc; border-bottom: 0; color: #808080; } -ul.pills li a { +.pills li a { margin: 5px 3px 5px 0; padding: 0 15px; text-shadow: 0 1px 1px #fff; @@ -1552,50 +1605,56 @@ ul.pills li a { -moz-border-radius: 15px; border-radius: 15px; } -ul.pills li a:hover { +.pills li a:hover { background: #0050a3; color: #fff; text-decoration: none; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); } -ul.pills li.active a { +.pills li.active a { background: #0069d6; color: #fff; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); } -div.pagination { +.pagination { height: 36px; margin: 18px 0; } -div.pagination ul { +.pagination ul { float: left; margin: 0; + border: 1px solid #ddd; border: 1px solid rgba(0, 0, 0, 0.15); + border-right: 0\9; + /* IE8 and below don't support last child. TODO: clean this up; */ + -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075); + -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); } -div.pagination ul li { +.pagination ul li { display: inline; } -div.pagination ul li a { +.pagination ul li a { float: left; padding: 0 14px; line-height: 34px; - border-right: 1px solid rgba(0, 0, 0, 0.15); + border-right: 1px solid; + border-right-color: #ddd; + border-right-color: rgba(0, 0, 0, 0.15); text-decoration: none; } -div.pagination ul li a:hover, div.pagination ul li.active a { +.pagination ul li a:hover, .pagination ul li.active a { background-color: #c7eefe; } -div.pagination ul li.disabled a, div.pagination ul li.disabled a:hover { +.pagination ul li.disabled a, .pagination ul li.disabled a:hover { background-color: none; color: #bfbfbf; } -div.pagination ul li.next a, div.pagination ul li:last-child a { +.pagination ul li.next a, .pagination ul li:last-child a { border: 0; } .well { @@ -1612,7 +1671,7 @@ div.pagination ul li.next a, div.pagination ul li:last-child a { -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); } -div.modal-backdrop { +.modal-backdrop { background-color: rgba(0, 0, 0, 0.5); position: fixed; top: 0; @@ -1621,7 +1680,7 @@ div.modal-backdrop { bottom: 0; z-index: 1000; } -div.modal { +.modal { position: fixed; top: 50%; left: 50%; @@ -1629,6 +1688,7 @@ div.modal { width: 560px; margin: -280px 0 0 -250px; background-color: #ffffff; + border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -1640,11 +1700,11 @@ div.modal { -moz-background-clip: padding-box; background-clip: padding-box; } -div.modal .modal-header { +.modal .modal-header { border-bottom: 1px solid #eee; padding: 5px 20px; } -div.modal .modal-header a.close { +.modal .modal-header a.close { position: absolute; right: 10px; top: 10px; @@ -1652,10 +1712,10 @@ div.modal .modal-header a.close { line-height: 10px; font-size: 18px; } -div.modal .modal-body { +.modal .modal-body { padding: 20px; } -div.modal .modal-footer { +.modal .modal-footer { background-color: #f5f5f5; padding: 14px 20px 15px; border-top: 1px solid #ddd; @@ -1667,18 +1727,18 @@ div.modal .modal-footer { box-shadow: inset 0 1px 0 #ffffff; zoom: 1; } -div.modal .modal-footer:before, div.modal .modal-footer:after { +.modal .modal-footer:before, .modal .modal-footer:after { display: table; content: ""; } -div.modal .modal-footer:after { +.modal .modal-footer:after { clear: both; } -div.modal .modal-footer .btn { +.modal .modal-footer .btn { float: right; margin-left: 10px; } -div.twipsy { +.twipsy { display: block; position: absolute; visibility: visible; @@ -1690,7 +1750,7 @@ div.twipsy { -moz-opacity: 0.8; opacity: 0.8; } -div.twipsy.above .twipsy-arrow { +.twipsy.above .twipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; @@ -1698,7 +1758,7 @@ div.twipsy.above .twipsy-arrow { border-right: 5px solid transparent; border-top: 5px solid #000000; } -div.twipsy.left .twipsy-arrow { +.twipsy.left .twipsy-arrow { top: 50%; right: 0; margin-top: -5px; @@ -1706,7 +1766,7 @@ div.twipsy.left .twipsy-arrow { border-bottom: 5px solid transparent; border-left: 5px solid #000000; } -div.twipsy.below .twipsy-arrow { +.twipsy.below .twipsy-arrow { top: 0; left: 50%; margin-left: -5px; @@ -1714,7 +1774,7 @@ div.twipsy.below .twipsy-arrow { border-right: 5px solid transparent; border-bottom: 5px solid #000000; } -div.twipsy.right .twipsy-arrow { +.twipsy.right .twipsy-arrow { top: 50%; left: 0; margin-top: -5px; @@ -1722,7 +1782,7 @@ div.twipsy.right .twipsy-arrow { border-bottom: 5px solid transparent; border-right: 5px solid #000000; } -div.twipsy .twipsy-inner { +.twipsy .twipsy-inner { padding: 3px 8px; background-color: #000; color: white; @@ -1733,7 +1793,7 @@ div.twipsy .twipsy-inner { -moz-border-radius: 4px; border-radius: 4px; } -div.twipsy .twipsy-arrow { +.twipsy .twipsy-arrow { position: absolute; width: 0; height: 0; @@ -1784,7 +1844,8 @@ div.twipsy .twipsy-arrow { height: 0; } .popover .inner { - background: rgba(0, 0, 0, 0.8); + background-color: #333; + background-color: rgba(0, 0, 0, 0.8); padding: 3px; overflow: hidden; width: 280px; @@ -1796,7 +1857,7 @@ div.twipsy .twipsy-arrow { box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); } .popover .title { - background: #f5f5f5; + background-color: #f5f5f5; padding: 9px 15px; line-height: 1; -webkit-border-radius: 3px 3px 0 0; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 79222bbe57..f30ba03326 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -48,11 +48,12 @@ div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;} .btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;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);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} -.primary{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(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;} -.btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} +.primary{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(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;} +.btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} -.btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} +.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} +.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} .btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} @@ -84,7 +85,7 @@ code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospa code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} pre{background-color:#f5f5f5;display:block;padding:17px;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-wrap;} form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;color:#404040;} -form div.clearfix{margin-bottom:18px;} +form .clearfix{margin-bottom:18px;} form label,form input,form select,form textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;} form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} form div.input{margin-left:150px;} @@ -97,9 +98,9 @@ form :-moz-placeholder{color:#bfbfbf;} form ::-webkit-input-placeholder{color:#bfbfbf;} form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-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);} form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;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);} -form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;} -form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} -form div.error div.input-prepend span.add-on,form div.error div.input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} +form .error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form .error>label,form .error span.help-inline,form .error span.help-block{color:#9d261d;} +form .error input[type=text],form .error input[type=password],form .error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form .error input[type=text]:focus,form .error input[type=password]:focus,form .error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} +form .error .input-prepend span.add-on,form .error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;} form .input-small,form input.small,form textarea.small,form select.small{width:90px;} form .input-medium,form input.medium,form textarea.medium,form select.medium{width:150px;} @@ -108,118 +109,117 @@ form .input-xlarge,form input.xlarge,form textarea.xlarge,form select.xlarge{wid form .input-xxlarge,form input.xxlarge,form textarea.xxlarge,form select.xxlarge{width:530px;} form textarea.xxlarge{overflow-y:scroll;} form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -div.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}div.actions div.secondary-action{float:right;}div.actions div.secondary-action a{line-height:30px;}div.actions div.secondary-action a:hover{text-decoration:underline;} +.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;} .help-inline,.help-block{font-size:12px;line-height:18px;color:#bfbfbf;} .help-inline{padding-left:5px;} .help-block{display:block;max-width:600px;} -div.inline-inputs{color:#808080;}div.inline-inputs span,div.inline-inputs input[type=text]{display:inline-block;} -div.inline-inputs input.mini{width:60px;} -div.inline-inputs input.small{width:90px;} -div.inline-inputs span{padding:0 2px 0 1px;} -div.input-prepend input[type=text],div.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -div.input-prepend .add-on,div.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -div.input-prepend .active,div.input-append .active{background:#a9dba9;border-color:#46a546;} -div.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -div.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;} -ul.inputs-list{margin:0 0 5px;width:100%;}ul.inputs-list li{display:block;padding:0;width:100%;}ul.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}ul.inputs-list li label strong{color:#808080;} -ul.inputs-list li label small{font-size:12px;font-weight:normal;} -ul.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} -ul.inputs-list li:first-child{padding-top:5px;} -ul.inputs-list input[type=radio],ul.inputs-list input[type=checkbox]{margin-bottom:0;} +.inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input[type=text]{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[type=text],.input-append input[type=text]{-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{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-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-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;} +.inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;}.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list li label strong{color:#808080;} +.inputs-list li label small{font-size:12px;font-weight:normal;} +.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} +.inputs-list li:first-child{padding-top:5px;} +.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;} form.form-stacked{padding-left:20px;}form.form-stacked fieldset{padding-top:9px;} form.form-stacked legend{margin-left:0;} form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} -form.form-stacked div.clearfix{margin-bottom:9px;}form.form-stacked div.clearfix div.input{margin-left:0;} -form.form-stacked ul.inputs-list{margin-bottom:0;}form.form-stacked ul.inputs-list li{padding-top:0;}form.form-stacked ul.inputs-list li label{font-weight:normal;padding-top:0;} +form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;} +form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} form.form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} -form.form-stacked div.actions{margin-left:-20px;padding-left:20px;} -table{width:100%;margin-bottom:18px;padding:0;text-align:left;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;vertical-align:middle;border-bottom:1px solid #ddd;} +form.form-stacked .actions{margin-left:-20px;padding-left:20px;} +table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;} table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} -table.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} -table.zebra-striped tbody tr:hover td{background-color:#f5f5f5;} -table.zebra-striped th.header{cursor:pointer;}table.zebra-striped th.header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} -table.zebra-striped th.headerSortUp,table.zebra-striped th.headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} -table.zebra-striped th.header:hover:after{visibility:visible;} -table.zebra-striped th.actions:hover{background-image:none;} -table.zebra-striped th.headerSortDown:after,table.zebra-striped th.headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} -table.zebra-striped th.headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} -table.zebra-striped th.blue{color:#049cdb;border-bottom-color:#049cdb;} -table.zebra-striped th.headerSortUp.blue,table.zebra-striped th.headerSortDown.blue{background-color:#ade6fe;} -table.zebra-striped th.green{color:#46a546;border-bottom-color:#46a546;} -table.zebra-striped th.headerSortUp.green,table.zebra-striped th.headerSortDown.green{background-color:#cdeacd;} -table.zebra-striped th.red{color:#9d261d;border-bottom-color:#9d261d;} -table.zebra-striped th.headerSortUp.red,table.zebra-striped th.headerSortDown.red{background-color:#f4c8c5;} -table.zebra-striped th.yellow{color:#ffc40d;border-bottom-color:#ffc40d;} -table.zebra-striped th.headerSortUp.yellow,table.zebra-striped th.headerSortDown.yellow{background-color:#fff6d9;} -table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;} -table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;} -table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} -table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} -div.topbar{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(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-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);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} -div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} -div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} -div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#bfbfbf;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;width:220px;padding:4px 9px;color:#fff;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;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} -div.topbar form input::-webkit-input-placeholder{color:#e6e6e6;} -div.topbar form input:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.5);color:#fff;} -div.topbar form input:focus,div.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;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);} -div.topbar ul{display:block;float:left;margin:0 10px 0 0;position:relative;}div.topbar ul.secondary-nav{float:right;margin-left:10px;margin-right:0;} -div.topbar ul li{display:block;float:left;font-size:13px;}div.topbar ul li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}div.topbar ul li a:hover{color:#fff;text-decoration:none;} -div.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} -div.topbar ul.primary-nav li ul{left:0;} -div.topbar ul.secondary-nav li ul{right:0;} -div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:0px;height:0px;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 #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} -div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:#00b4eb;background-color:rgba(255, 255, 255, 0.1);color:#fff;} -div.topbar ul li.menu.open ul{display:block;}div.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}div.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;} -div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;} -div.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}div.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}div.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}div.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;} -div.topbar ul li ul li.divider{height:1px;overflow:hidden;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;} -div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);} +.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} +.zebra-striped tbody tr:hover td{background-color:#f5f5f5;} +.zebra-striped .header{cursor:pointer;}.zebra-striped .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} +.zebra-striped .headerSortUp,.zebra-striped .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} +.zebra-striped .header:hover:after{visibility:visible;} +.zebra-striped .headerSortDown:after,.zebra-striped .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} +.zebra-striped .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} +table .blue{color:#049cdb;border-bottom-color:#049cdb;} +table .headerSortUp.blue,table .headerSortDown.blue{background-color:#ade6fe;} +table .green{color:#46a546;border-bottom-color:#46a546;} +table .headerSortUp.green,table .headerSortDown.green{background-color:#cdeacd;} +table .red{color:#9d261d;border-bottom-color:#9d261d;} +table .headerSortUp.red,table .headerSortDown.red{background-color:#f4c8c5;} +table .yellow{color:#ffc40d;border-bottom-color:#ffc40d;} +table .headerSortUp.yellow,table .headerSortDown.yellow{background-color:#fff6d9;} +table .orange{color:#f89406;border-bottom-color:#f89406;} +table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;} +table .purple{color:#7a43b6;border-bottom-color:#7a43b6;} +table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;} +.topbar{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(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar .fill{background:#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(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);background-image:linear-gradient(#333333, #222222);-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 a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.topbar a:hover,.topbar ul li.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{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} +.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 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;width:220px;padding:4px 9px;color:#fff;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;transition:none;}.topbar form input:-moz-placeholder{color:#e6e6e6;} +.topbar form input::-webkit-input-placeholder{color:#e6e6e6;} +.topbar form input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#fff;} +.topbar form input:focus,.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;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 ul{display:block;float:left;margin:0 10px 0 0;position:relative;}.topbar ul.secondary-nav{float:right;margin-left:10px;margin-right:0;} +.topbar ul li{display:block;float:left;font-size:13px;}.topbar ul li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar ul li a:hover{color:#fff;text-decoration:none;} +.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} +.topbar ul.primary-nav li ul{left:0;} +.topbar ul.secondary-nav li ul{right:0;} +.topbar ul li.menu{position:relative;}.topbar ul li.menu a.menu:after{width:0px;height:0px;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 #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} +.topbar ul li.menu.open a.menu,.topbar ul li.menu.open a:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.1);color:#fff;} +.topbar ul li.menu.open ul{display:block;}.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;} +.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;} +.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;} +.topbar ul li ul li.divider{height:1px;overflow:hidden;background:#222;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;} +.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);} .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;} -div.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);}div.page-header h1{margin-bottom:8px;} -div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} -div.alert-message.error{background-color:#e06359;} -div.alert-message.warning{background-color:#ffd75a;} -div.alert-message.success{background-color:#74c474;} -div.alert-message.info{background-color:#30c0fb;} -div.alert-message a.close{float:right;margin-top:-2px;color:#fff;font-size:20px;font-weight:bold;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}div.alert-message a.close:hover{text-decoration:none;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} -div.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);margin-right:30px;margin-bottom:0;} -div.block-message ul{margin-bottom:0;} -div.block-message strong{display:block;} -div.block-message a.close{display:block;color:#404040;color:rgba(0, 0, 0, 0.5);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} -div.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;} -div.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;} -div.block-message.success{background:#dff1df;border:1px solid #bbe2bb;} -div.block-message.info{background:#c7eefe;border:1px solid #ade6fe;} -ul.tabs,ul.pills{margin:0 0 20px;padding:0;zoom:1;}ul.tabs:before,ul.pills:before,ul.tabs:after,ul.pills:after{display:table;content:"";} -ul.tabs:after,ul.pills:after{clear:both;} -ul.tabs li,ul.pills li{display:inline;}ul.tabs li a,ul.pills li a{float:left;width:auto;} -ul.tabs{width:100%;border-bottom:1px solid #bfbfbf;}ul.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}ul.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;} -ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} -ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid rgba(0, 0, 0, 0.15);text-decoration:none;} -div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;} -div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} -div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} +.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;} +.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);border-bottom:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.alert-message p{color:#fff;margin-bottom:0;}.alert-message p+p{margin-top:5px;} +.alert-message.error{background-color:#d83a2e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));background-image:-moz-linear-gradient(#e4776f, #d83a2e);background-image:-ms-linear-gradient(#e4776f, #d83a2e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));background-image:-webkit-linear-gradient(#e4776f, #d83a2e);background-image:-o-linear-gradient(#e4776f, #d83a2e);background-image:linear-gradient(#e4776f, #d83a2e);border-bottom-color:#b32b21;} +.alert-message.warning{background-color:#ffd040;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));background-image:-moz-linear-gradient(#ffe38d, #ffd040);background-image:-ms-linear-gradient(#ffe38d, #ffd040);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));background-image:-webkit-linear-gradient(#ffe38d, #ffd040);background-image:-o-linear-gradient(#ffe38d, #ffd040);background-image:linear-gradient(#ffe38d, #ffd040);border-bottom-color:#ffc40d;} +.alert-message.success{background-color:#62bc62;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));background-image:-moz-linear-gradient(#97d397, #62bc62);background-image:-ms-linear-gradient(#97d397, #62bc62);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));background-image:-webkit-linear-gradient(#97d397, #62bc62);background-image:-o-linear-gradient(#97d397, #62bc62);background-image:linear-gradient(#97d397, #62bc62);border-bottom-color:#46a546;} +.alert-message.info{background-color:#04aef4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));background-image:-moz-linear-gradient(#62cffc, #04aef4);background-image:-ms-linear-gradient(#62cffc, #04aef4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));background-image:-webkit-linear-gradient(#62cffc, #04aef4);background-image:-o-linear-gradient(#62cffc, #04aef4);background-image:linear-gradient(#62cffc, #04aef4);border-bottom-color:#049cdb;} +.alert-message .close{float:right;margin-top:-2px;color:#000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} +.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;margin-right:30px;margin-bottom:0;} +.block-message ul{margin-bottom:0;} +.block-message strong{display:block;} +.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;} +.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;} +.block-message.success{background:#dff1df;border:1px solid #bbe2bb;} +.block-message.info{background:#c7eefe;border:1px solid #ade6fe;} +.tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} +.tabs:after,.pills:after{clear:both;} +.tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;} +.tabs{width:100%;border-bottom:1px solid #bfbfbf;}.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;} +.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} +.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} +.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} +.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);border-right:0\9;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}.pagination ul li{display:inline;}.pagination ul li 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);text-decoration:none;} +.pagination ul li a:hover,.pagination ul li.active a{background-color:#c7eefe;} +.pagination ul li.disabled a,.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} +.pagination ul li.next a,.pagination ul li:last-child 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);} -div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} -div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-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;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} -div.modal .modal-body{padding:20px;} -div.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}div.modal .modal-footer:before,div.modal .modal-footer:after{display:table;content:"";} -div.modal .modal-footer:after{clear:both;} -div.modal .modal-footer .btn{float:right;margin-left:10px;} -div.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}div.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} -div.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} -div.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} -div.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -div.twipsy .twipsy-inner{padding:3px 8px;background-color:#000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -div.twipsy .twipsy-arrow{position:absolute;width:0;height:0;} +.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} +.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);-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 .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} +.modal .modal-body{padding:20px;} +.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";} +.modal .modal-footer:after{clear:both;} +.modal .modal-footer .btn{float:right;margin-left:10px;} +.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} +.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} +.twipsy .twipsy-inner{padding:3px 8px;background-color:#000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.twipsy .twipsy-arrow{position:absolute;width:0;height:0;} .popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} -.popover .inner{background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} -.popover .title{background:#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 .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} +.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} .popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2d17370c24..4fbfac9d3e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -195,6 +195,9 @@ div.topbar-wrapper { div.topbar-wrapper div.topbar { position: absolute; margin: 0 -20px; +} + +div.topbar-wrapper div.topbar .fill { padding-left: 20px; padding-right: 20px; -webkit-border-radius: 4px; diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 0de6ca96f6..3319e607db 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -42,25 +42,12 @@ $(document).ready(function(){ // Dropdown example for topbar nav // =============================== - $("body").bind("click", function(e) { - $("ul.menu-dropdown").hide(); - $('a.menu').parent("li").removeClass("open").children("ul.menu-dropdown").hide(); + $("body").bind("click", function (e) { + $('a.menu').parent("li").removeClass("open"); }); - $("a.menu").click(function(e) { - var $target = $(this); - var $parent = $target.parent("li"); - var $siblings = $target.siblings("ul.menu-dropdown"); - var $parentSiblings = $parent.siblings("li"); - if ($parent.hasClass("open")) { - $parent.removeClass("open"); - $siblings.hide(); - } else { - $parent.addClass("open"); - $siblings.show(); - } - $parentSiblings.children("ul.menu-dropdown").hide(); - $parentSiblings.removeClass("open"); + $("a.menu").click(function (e) { + var $li = $(this).parent("li").toggleClass('open'); return false; }); diff --git a/docs/index.html b/docs/index.html index 940478c2de..311edc0934 100644 --- a/docs/index.html +++ b/docs/index.html @@ -34,21 +34,23 @@
-
-

Bootstrap

- +
+
+

Bootstrap

+ +
@@ -377,70 +379,59 @@
-

Lists

Unordered <ul>

Unstyled <ul.unstyled>

Ordered <ol>

    -
  1. Jeremy Bixby
    2. -
  2. Robert Dezure
    3. -
  3. Josh Washington
    4. -
  4. Anton Capresi
    5. -
  5. My Team Mates -
      -
    1. George Castanza
      2. -
    2. Jerry Seinfeld
      3. -
    3. Cosmo Kramer
      4. -
    4. Elaine Bennis
      5. -
    5. Newman
      6. -
    -
    6. -
  6. John Jacob
    7. -
  7. Paul Pierce
    8. -
  8. Kevin Garnett
    9. +
  9. Lorem ipsum dolor sit amet
    10. +
  10. Consectetur adipiscing elit
    11. +
  11. Integer molestie lorem at massa
    12. +
  12. Facilisis in pretium nisl aliquet
    13. +
  13. Nulla volutpat aliquam velit
    14. +
  14. Faucibus porta lacus fringilla vel
    15. +
  15. Aenean sit amet erat nunc
    16. +
  16. Eget porttitor lorem
@@ -794,10 +785,33 @@
+<<<<<<< .merge_file_CXRuoN

Stacked forms

Add .form-stacked to your form’s HTML and you’ll have labels on top of their fields instead of to their left. This works great if your forms are short or you have two columns of inputs for heavier forms.

+======= +
+
+

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 blue .primary class is available. Plus, rolling your own styles is easy peasy.

+
+
+

Example buttons

+

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

+
+
+ + +
+
+

Alternate sizes

+

Fancy larger or smaller buttons? Have at it!

+
+ Primary action + Action +>>>>>>> .merge_file_hNGrGI
@@ -860,6 +874,7 @@
+<<<<<<< .merge_file_CXRuoN
@@ -897,6 +912,22 @@
+======= +

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.

+

Note: If you're developing for older browsers like IE8 or below -- you're going to want to use the .disabled class for <button> elements as well. +

Links

+
+ Primary action + Action +
+

Buttons

+
+
+ + +
+>>>>>>> .merge_file_hNGrGI
@@ -912,6 +943,7 @@

Fixed topbar

+<<<<<<< .merge_file_CXRuoN

Project Name

    @@ -934,6 +966,32 @@
+======= +
+
+

Project Name

+ +
+ +
+ +
+>>>>>>> .merge_file_hNGrGI
@@ -1139,7 +1197,7 @@

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

-
+
@@ -1209,12 +1267,19 @@ Lorem ipsum dolar sit amet illo error ipsum verita
- +<<<<<<< HEAD + +======= + +>>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1
+<<<<<<< .merge_file_CXRuoN +======= +>>>>>>> .merge_file_hNGrGI @@ -1392,4 +1457,4 @@ Lorem ipsum dolar sit amet illo error ipsum verita
- \ No newline at end of file + diff --git a/lib/forms.less b/lib/forms.less index ae67acd009..cd5cffc316 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -23,7 +23,7 @@ form { } // Parent element that clears floats and wraps labels and fields together - div.clearfix { + .clearfix { margin-bottom: @baseline; } @@ -112,7 +112,7 @@ form { } // Error styles - div.error { + .error { background: lighten(@red, 57%); padding: 10px 0; margin: -10px 0 10px; @@ -133,8 +133,8 @@ form { .box-shadow(0 0 6px rgba(171,41,32,.5)); } } - div.input-prepend, - div.input-append { + .input-prepend, + .input-append { span.add-on { background: lighten(@red, 50%); border-color: @error-text; @@ -177,14 +177,14 @@ form { } // Actions (the buttons) -div.actions { +.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); - div.secondary-action { + .secondary-action { float: right; a { line-height: 30px; @@ -213,7 +213,7 @@ div.actions { } // Inline Fields (input fields that appear as inline objects -div.inline-inputs { +.inline-inputs { color: @gray; span, input[type=text] { display: inline-block; @@ -230,8 +230,8 @@ div.inline-inputs { } // Allow us to put symbols and text within the input field for a cleaner look -div.input-prepend, -div.input-append { +.input-prepend, +.input-append { input[type=text] { .border-radius(0 3px 3px 0); } @@ -257,7 +257,7 @@ div.input-append { border-color: @green; } } -div.input-append { +.input-append { input[type=text] { float: left; .border-radius(3px 0 0 3px); @@ -270,7 +270,7 @@ div.input-append { } // Stacked options for forms (radio buttons or checkboxes) -ul.inputs-list { +.inputs-list { margin: 0 0 5px; width: 100%; li { @@ -326,13 +326,13 @@ form.form-stacked { line-height: 20px; padding-top: 0; } - div.clearfix { + .clearfix { margin-bottom: @baseline / 2; div.input { margin-left: 0; } } - ul.inputs-list { + .inputs-list { margin-bottom: 0; li { padding-top: 0; @@ -349,7 +349,7 @@ form.form-stacked { margin-top: 0; margin-left: -10px; } - div.actions { + .actions { margin-left: -20px; padding-left: 20px; } diff --git a/lib/patterns.less b/lib/patterns.less index 0a2ae01580..ce72b300cf 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -7,7 +7,7 @@ // ------ // Topbar for Branding and Nav -div.topbar { +.topbar { #gradient > .vertical(#333, #222); height: 40px; position: fixed; @@ -16,8 +16,14 @@ div.topbar { right: 0; z-index: 10000; overflow: visible; - @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - .box-shadow(@shadow); + + // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present + .fill { + background:#222; + #gradient > .vertical(#333, #222); + @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); + .box-shadow(@shadow); + } // Links get text shadow a { @@ -35,15 +41,18 @@ div.topbar { } // Website name - h3 a { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; // negative indent to left-align the text down the page - color: @white; - font-size: 20px; - font-weight: 200; - line-height: 1; + h3 { + position:relative; + a { + float: left; + display: block; + padding: 8px 20px 12px; + margin-left: -20px; // negative indent to left-align the text down the page + color: @white; + font-size: 20px; + font-weight: 200; + line-height: 1; + } } // Search Form @@ -53,7 +62,7 @@ div.topbar { position: relative; .opacity(100); input { - background-color: @grayLight; + background-color: #444; background-color: rgba(255,255,255,.3); #font > .sans-serif(13px, normal, 1); width: 220px; @@ -73,11 +82,13 @@ div.topbar { &::-webkit-input-placeholder { color: @grayLighter; } + // Hover states &:hover { - background-color: #444; + background-color: @grayLight; background-color: rgba(255,255,255,.5); color: #fff; } + // Focus states (we use .focused since IE8 and down doesn't support :focus) &:focus, &.focused { outline: none; @@ -151,7 +162,7 @@ div.topbar { &.open { a.menu, a:hover { - background-color: lighten(#00a0d1,5); + background-color: #444; background-color: rgba(255,255,255,.1); color: #fff; } @@ -215,6 +226,7 @@ div.topbar { &.divider { height: 1px; overflow: hidden; + background: #222; background: rgba(0,0,0,.2); border-bottom: 1px solid rgba(255,255,255,.1); margin: 5px 0; @@ -261,7 +273,7 @@ div.topbar { // PAGE HEADERS // ------------ -div.page-header { +.page-header { margin-bottom: @baseline - 1; border-bottom: 1px solid #ddd; .box-shadow(0 1px 0 rgba(255,255,255,.5)); @@ -275,14 +287,17 @@ div.page-header { // ------------ // One-liner alert bars -div.alert-message { +.alert-message { + // TODO: Ask cloudhead how to do this fancy filter elegantly. Less eval is returning strings with quotes ;_; #gradient > .vertical(transparent, rgba(0,0,0,0.15)); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; + filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; background-color: @grayLighter; margin-bottom: @baseline; padding: 8px 15px; color: #fff; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - border-bottom: 1px solid rgba(0,0,0,.25); + text-shadow: 0 -1px 0 rgba(0,0,0,.3); + border-bottom: 1px solid rgba(0,0,0,.3); .border-radius(4px); p { color: #fff; @@ -292,44 +307,49 @@ div.alert-message { } } &.error { - background-color: lighten(@red, 25%); + #gradient > .vertical(lighten(@red, 30%), lighten(@red, 15%)); + border-bottom-color: lighten(@red, 5%); } &.warning { - background-color: lighten(@yellow, 15%); + #gradient > .vertical(lighten(@yellow, 25%), lighten(@yellow, 10%)); + border-bottom-color: @yellow; } &.success { - background-color: lighten(@green, 15%); + #gradient > .vertical(lighten(@green, 25%), lighten(@green, 10%)); + border-bottom-color: @green; } &.info { - background-color: lighten(@blue, 15%); + #gradient > .vertical(lighten(@blue, 25%), lighten(@blue, 5%)); + border-bottom-color: @blue; } - a.close { + .close { float: right; margin-top: -2px; - color: #fff; + color: #000; font-size: 20px; font-weight: bold; - text-shadow: 0 1px 0 rgba(0,0,0,.5); - .opacity(50); - .border-radius(3px); + text-shadow: 0 1px 0 rgba(255,255,255,1); + .opacity(20); &:hover { text-decoration: none; - .opacity(50); + .opacity(40); } } } // Block-level Alerts -div.block-message { +.block-message { margin-bottom: @baseline; padding: 14px; color: @grayDark; color: rgba(0,0,0,.8); + *color: @grayDark; /* IE 6-7 */ text-shadow: 0 1px 0 rgba(255,255,255,.25); .border-radius(6px); p { color: @grayDark; color: rgba(0,0,0,.8); + *color: @grayDark; /* IE 6-7 */ margin-right: 30px; margin-bottom: 0; } @@ -339,12 +359,6 @@ div.block-message { strong { display: block; } - a.close { - display: block; - color: @grayDark; - color: rgba(0,0,0,.5); - text-shadow: 0 1px 1px rgba(255,255,255,.75); - } &.error { background: lighten(@red, 55%); border: 1px solid lighten(@red, 50%); @@ -368,8 +382,8 @@ div.block-message { // ---------- // Common tab and pill styles -ul.tabs, -ul.pills { +.tabs, +.pills { margin: 0 0 20px; padding: 0; .clearfix(); @@ -383,7 +397,7 @@ ul.pills { } // Basic Tabs -ul.tabs { +.tabs { width: 100%; border-bottom: 1px solid @grayLight; li { @@ -409,7 +423,7 @@ ul.tabs { } // Basic pill nav -ul.pills { +.pills { li { a { margin: 5px 3px 5px 0; @@ -436,22 +450,26 @@ ul.pills { // PAGINATION // ---------- -div.pagination { +.pagination { height: @baseline * 2; margin: @baseline 0; ul { float: left; margin: 0; + border: 1px solid #ddd; border: 1px solid rgba(0,0,0,.15); + border-right: 0\9; /* IE8 and below don't support last child. TODO: clean this up; */ .border-radius(3px); - .box-shadow(0 1px 2px rgba(0,0,0,.075)); + .box-shadow(0 1px 2px rgba(0,0,0,.05); li { display: inline; a { float: left; padding: 0 14px; line-height: (@baseline * 2) - 2; - border-right: 1px solid rgba(0,0,0,.15); + border-right: 1px solid; + border-right-color: #ddd; + border-right-color: rgba(0,0,0,.15); text-decoration: none; } a:hover, @@ -490,7 +508,7 @@ div.pagination { // MODALS // ------ -div.modal-backdrop { +.modal-backdrop { background-color: rgba(0,0,0,.5); position: fixed; top: 0; @@ -499,7 +517,7 @@ div.modal-backdrop { bottom: 0; z-index: 1000; } -div.modal { +.modal { position: fixed; top: 50%; left: 50%; @@ -507,6 +525,7 @@ div.modal { width: 560px; margin: -280px 0 0 -250px; background-color: @white; + border: 1px solid #999; border: 1px solid rgba(0,0,0,.3); .border-radius(6px); .box-shadow(0 3px 7px rgba(0,0,0,0.3)); @@ -582,7 +601,7 @@ div.modal { // TWIPSY // ------ -div.twipsy { +.twipsy { display: block; position: absolute; visibility: visible; @@ -631,7 +650,8 @@ div.twipsy { height: 0; } .inner { - background: rgba(0,0,0,.8); + background-color: #333; + background-color: rgba(0,0,0,.8); padding: 3px; overflow: hidden; width: 280px; @@ -639,7 +659,7 @@ div.twipsy { .box-shadow(0 3px 7px rgba(0,0,0,0.3)); } .title { - background: #f5f5f5; + background-color: #f5f5f5; padding: 9px 15px; line-height: 1; .border-radius(3px 3px 0 0); diff --git a/lib/preboot.less b/lib/preboot.less index 8b913604a1..bf20b53fe4 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -20,6 +20,7 @@ // Accent Colors @blue: #049CDB; +@blueDark: #0064CD; @green: #46a546; @red: #9d261d; @yellow: #ffc40d; @@ -188,8 +189,9 @@ color: @textColor; font-size: @fontSize; line-height: @baseline; - border: 1px solid darken(@color, 10%); - border-bottom-color: fadein(@borderColor, 15%); + border: 1px solid; + border-color: #ccc #ccc #bbb; + border-color: borderColor borderColor fadein(@borderColor, 15%); .border-radius(@borderRadius); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); @@ -222,8 +224,6 @@ background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+ - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(left, @startColor, @endColor); // Le standard } .vertical (@startColor: #555, @endColor: #333) { @@ -235,8 +235,6 @@ 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 - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+ - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(@startColor, @endColor); // The standard } .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 4d170f78b7..735c2b129f 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -132,6 +132,8 @@ a { //#gradient > .vertical(@blue, @blueDark); color: #fff; text-shadow: 0 -1px 0 rgba(0,0,0,.25); + border-color: @blueDark @blueDark darken(@blueDark, 15%); + border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); &:hover { color: #fff; } @@ -146,12 +148,18 @@ a { padding-left: 9px; font-size: 11px; } - &:disabled, &.disabled { background-image: none; .opacity(65); cursor: default; } + + // this can't be included with the .disabled def because IE8 and below will drop it ;_; + &:disabled { + background-image: none; + .opacity(65); + cursor: default; + } &:active { @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); diff --git a/lib/tables.less b/lib/tables.less index 4c65141a3e..d1af37de81 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -11,12 +11,12 @@ table { width: 100%; margin-bottom: @baseline; padding: 0; - text-align: left; border-collapse: separate; font-size: 13px; th, td { padding: 10px 10px 9px; line-height: @baseline * .75; + text-align: left; vertical-align: middle; border-bottom: 1px solid #ddd; } @@ -32,7 +32,7 @@ table { // -------------- // Default zebra-stripe styles (alternating gray and transparent backgrounds) -table.zebra-striped { +.zebra-striped { tbody { tr:nth-child(odd) td { background-color: #f9f9f9; @@ -43,7 +43,7 @@ table.zebra-striped { } // Tablesorting styles w/ jQuery plugin - th.header { + .header { cursor: pointer; &:after { content: ""; @@ -55,36 +55,29 @@ table.zebra-striped { visibility: hidden; } } - // Style the sorted column headers (THs) - th.headerSortUp, - th.headerSortDown { + .headerSortUp, + .headerSortDown { background-color: rgba(141,192,219,.25); text-shadow: 0 1px 1px rgba(255,255,255,.75); .border-radius(3px 3px 0 0); } - // Style the ascending (reverse alphabetical) column header - th.header:hover { + .header:hover { &:after { visibility:visible; } } - th.actions:hover { - background-image: none; - } - // Style the descending (alphabetical) column header - th.headerSortDown, - th.headerSortDown:hover { + .headerSortDown, + .headerSortDown:hover { &:after { visibility:visible; .opacity(60); } } - // Style the ascending (reverse alphabetical) column header - th.headerSortUp { + .headerSortUp { &:after { border-bottom: none; border-left: 4px solid transparent; @@ -95,58 +88,61 @@ table.zebra-striped { .opacity(60); } } +} +table { // Blue Table Headings - th.blue { + .blue { color: @blue; border-bottom-color: @blue; } - th.headerSortUp.blue, th.headerSortDown.blue { + .headerSortUp.blue, + .headerSortDown.blue { background-color: lighten(@blue, 40%); } - // Green Table Headings - th.green { + .green { color: @green; border-bottom-color: @green; } - th.headerSortUp.green, th.headerSortDown.green { // backround color is 20% of border color + .headerSortUp.green, + .headerSortDown.green { background-color: lighten(@green, 40%); } - // Red Table Headings - th.red { + .red { color: @red; border-bottom-color: @red; } - th.headerSortUp.red, th.headerSortDown.red { + .headerSortUp.red, + .headerSortDown.red { background-color: lighten(@red, 50%); } - // Yellow Table Headings - th.yellow { + .yellow { color: @yellow; border-bottom-color: @yellow; } - th.headerSortUp.yellow, th.headerSortDown.yellow { + .headerSortUp.yellow, + .headerSortDown.yellow { background-color: lighten(@yellow, 40%); } - // Orange Table Headings - th.orange { + .orange { color: @orange; border-bottom-color: @orange; } - th.headerSortUp.orange, th.headerSortDown.orange { + .headerSortUp.orange, + .headerSortDown.orange { background-color: lighten(@orange, 40%); } - // Purple Table Headings - th.purple { + .purple { color: @purple; border-bottom-color: @purple; } - th.headerSortUp.purple, th.headerSortDown.purple { + .headerSortUp.purple, + .headerSortDown.purple { background-color: lighten(@purple, 40%); } -} +} \ No newline at end of file