You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2012/03/22 23:34:38 UTC
svn commit: r1304111 [2/3] - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging:
css/bootstrap-responsive.css css/bootstrap.css js/bootstrap/bootstrap.js
js/tomee/mock/
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/css/bootstrap.css
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/css/bootstrap.css?rev=1304111&r1=1304110&r2=1304111&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/css/bootstrap.css (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/css/bootstrap.css Thu Mar 22 22:34:37 2012
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.0.0
+ * Bootstrap v2.0.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -19,7 +19,9 @@ nav,
section {
display: block;
}
-audio, canvas, video {
+audio,
+canvas,
+video {
display: inline-block;
*display: inline;
*zoom: 1;
@@ -33,14 +35,16 @@ html {
-ms-text-size-adjust: 100%;
}
a:focus {
- outline: thin dotted;
+ outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
-a:hover, a:active {
+a:hover,
+a:active {
outline: 0;
}
-sub, sup {
+sub,
+sup {
position: relative;
font-size: 75%;
line-height: 0;
@@ -53,10 +57,10 @@ sub {
bottom: -0.25em;
}
img {
- max-width: 100%;
height: auto;
border: 0;
-ms-interpolation-mode: bicubic;
+ vertical-align: middle;
}
button,
input,
@@ -66,11 +70,13 @@ textarea {
font-size: 100%;
vertical-align: middle;
}
-button, input {
+button,
+input {
*overflow: visible;
line-height: normal;
}
-button::-moz-focus-inner, input::-moz-focus-inner {
+button::-moz-focus-inner,
+input::-moz-focus-inner {
padding: 0;
border: 0;
}
@@ -87,13 +93,43 @@ input[type="search"] {
-moz-box-sizing: content-box;
box-sizing: content-box;
}
-input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: none;
}
textarea {
overflow: auto;
vertical-align: top;
}
+.clearfix {
+ *zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+ display: table;
+ content: "";
+}
+.clearfix:after {
+ clear: both;
+}
+.hide-text {
+ overflow: hidden;
+ text-indent: 100%;
+ white-space: nowrap;
+}
+.input-block-level {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ /* Make inputs at least the height of their button counterpart */
+
+ /* Makes inputs behave like true block-level elements */
+
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+}
body {
margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -114,7 +150,8 @@ a:hover {
margin-left: -20px;
*zoom: 1;
}
-.row:before, .row:after {
+.row:before,
+.row:after {
display: table;
content: "";
}
@@ -125,80 +162,89 @@ a:hover {
float: left;
margin-left: 20px;
}
-.span1 {
- width: 60px;
+.container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+ width: 940px;
}
-.span2 {
- width: 140px;
+.span12 {
+ width: 940px;
}
-.span3 {
- width: 220px;
+.span11 {
+ width: 860px;
}
-.span4 {
- width: 300px;
+.span10 {
+ width: 780px;
}
-.span5 {
- width: 380px;
+.span9 {
+ width: 700px;
}
-.span6 {
- width: 460px;
+.span8 {
+ width: 620px;
}
.span7 {
width: 540px;
}
-.span8 {
- width: 620px;
+.span6 {
+ width: 460px;
}
-.span9 {
- width: 700px;
+.span5 {
+ width: 380px;
}
-.span10 {
- width: 780px;
+.span4 {
+ width: 300px;
}
-.span11 {
- width: 860px;
+.span3 {
+ width: 220px;
}
-.span12, .container {
- width: 940px;
+.span2 {
+ width: 140px;
}
-.offset1 {
- margin-left: 100px;
+.span1 {
+ width: 60px;
}
-.offset2 {
- margin-left: 180px;
+.offset12 {
+ margin-left: 980px;
}
-.offset3 {
- margin-left: 260px;
+.offset11 {
+ margin-left: 900px;
}
-.offset4 {
- margin-left: 340px;
+.offset10 {
+ margin-left: 820px;
}
-.offset5 {
- margin-left: 420px;
+.offset9 {
+ margin-left: 740px;
}
-.offset6 {
- margin-left: 500px;
+.offset8 {
+ margin-left: 660px;
}
.offset7 {
margin-left: 580px;
}
-.offset8 {
- margin-left: 660px;
+.offset6 {
+ margin-left: 500px;
}
-.offset9 {
- margin-left: 740px;
+.offset5 {
+ margin-left: 420px;
}
-.offset10 {
- margin-left: 820px;
+.offset4 {
+ margin-left: 340px;
}
-.offset11 {
- margin-left: 900px;
+.offset3 {
+ margin-left: 260px;
+}
+.offset2 {
+ margin-left: 180px;
+}
+.offset1 {
+ margin-left: 100px;
}
.row-fluid {
width: 100%;
*zoom: 1;
}
-.row-fluid:before, .row-fluid:after {
+.row-fluid:before,
+.row-fluid:after {
display: table;
content: "";
}
@@ -212,49 +258,49 @@ a:hover {
.row-fluid > [class*="span"]:first-child {
margin-left: 0;
}
-.row-fluid .span1 {
- width: 6.382978723%;
-}
-.row-fluid .span2 {
- width: 14.89361702%;
+.row-fluid > .span12 {
+ width: 99.99999998999999%;
}
-.row-fluid .span3 {
- width: 23.404255317%;
+.row-fluid > .span11 {
+ width: 91.489361693%;
}
-.row-fluid .span4 {
- width: 31.914893614%;
+.row-fluid > .span10 {
+ width: 82.97872339599999%;
}
-.row-fluid .span5 {
- width: 40.425531911%;
+.row-fluid > .span9 {
+ width: 74.468085099%;
}
-.row-fluid .span6 {
- width: 48.93617020799999%;
+.row-fluid > .span8 {
+ width: 65.95744680199999%;
}
-.row-fluid .span7 {
+.row-fluid > .span7 {
width: 57.446808505%;
}
-.row-fluid .span8 {
- width: 65.95744680199999%;
+.row-fluid > .span6 {
+ width: 48.93617020799999%;
}
-.row-fluid .span9 {
- width: 74.468085099%;
+.row-fluid > .span5 {
+ width: 40.425531911%;
}
-.row-fluid .span10 {
- width: 82.97872339599999%;
+.row-fluid > .span4 {
+ width: 31.914893614%;
}
-.row-fluid .span11 {
- width: 91.489361693%;
+.row-fluid > .span3 {
+ width: 23.404255317%;
}
-.row-fluid .span12 {
- width: 99.99999998999999%;
+.row-fluid > .span2 {
+ width: 14.89361702%;
+}
+.row-fluid > .span1 {
+ width: 6.382978723%;
}
.container {
- width: 940px;
margin-left: auto;
margin-right: auto;
*zoom: 1;
}
-.container:before, .container:after {
+.container:before,
+.container:after {
display: table;
content: "";
}
@@ -266,7 +312,8 @@ a:hover {
padding-right: 20px;
*zoom: 1;
}
-.container-fluid:before, .container-fluid:after {
+.container-fluid:before,
+.container-fluid:after {
display: table;
content: "";
}
@@ -296,8 +343,9 @@ h4,
h5,
h6 {
margin: 0;
+ font-family: inherit;
font-weight: bold;
- color: #333333;
+ color: inherit;
text-rendering: optimizelegibility;
}
h1 small,
@@ -330,7 +378,9 @@ h3 {
h3 small {
font-size: 14px;
}
-h4, h5, h6 {
+h4,
+h5,
+h6 {
line-height: 18px;
}
h4 {
@@ -355,7 +405,8 @@ h6 {
.page-header h1 {
line-height: 1;
}
-ul, ol {
+ul,
+ol {
padding: 0;
margin: 0 0 9px 25px;
}
@@ -374,26 +425,38 @@ ol {
li {
line-height: 18px;
}
-ul.unstyled {
+ul.unstyled,
+ol.unstyled {
margin-left: 0;
list-style: none;
}
dl {
margin-bottom: 18px;
}
-dt, dd {
+dt,
+dd {
line-height: 18px;
}
dt {
font-weight: bold;
+ line-height: 17px;
}
dd {
margin-left: 9px;
}
+.dl-horizontal dt {
+ float: left;
+ clear: left;
+ width: 120px;
+ text-align: right;
+}
+.dl-horizontal dd {
+ margin-left: 130px;
+}
hr {
margin: 18px 0;
border: 0;
- border-top: 1px solid #e5e5e5;
+ border-top: 1px solid #eeeeee;
border-bottom: 1px solid #ffffff;
}
strong {
@@ -405,12 +468,14 @@ em {
.muted {
color: #999999;
}
-abbr {
- font-size: 90%;
- text-transform: uppercase;
+abbr[title] {
border-bottom: 1px dotted #ddd;
cursor: help;
}
+abbr.initialism {
+ font-size: 90%;
+ text-transform: uppercase;
+}
blockquote {
padding: 0 0 0 15px;
margin: 0 0 18px;
@@ -437,7 +502,8 @@ blockquote.pull-right {
border-left: 0;
border-right: 5px solid #eeeeee;
}
-blockquote.pull-right p, blockquote.pull-right small {
+blockquote.pull-right p,
+blockquote.pull-right small {
text-align: right;
}
q:before,
@@ -458,7 +524,8 @@ small {
cite {
font-style: normal;
}
-code, pre {
+code,
+pre {
padding: 0 3px 2px;
font-family: Menlo, Monaco, "Courier New", monospace;
font-size: 12px;
@@ -468,7 +535,7 @@ code, pre {
border-radius: 3px;
}
code {
- padding: 3px 4px;
+ padding: 2px 4px;
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
@@ -477,7 +544,7 @@ pre {
display: block;
padding: 8.5px;
margin: 0 0 9px;
- font-size: 12px;
+ font-size: 12.025px;
line-height: 18px;
background-color: #f5f5f5;
border: 1px solid #ccc;
@@ -488,13 +555,20 @@ pre {
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
+ word-wrap: break-word;
}
pre.prettyprint {
margin-bottom: 18px;
}
pre code {
padding: 0;
+ color: inherit;
background-color: transparent;
+ border: 0;
+}
+.pre-scrollable {
+ max-height: 340px;
+ overflow-y: scroll;
}
form {
margin: 0 0 18px;
@@ -515,16 +589,25 @@ legend {
border: 0;
border-bottom: 1px solid #eee;
}
+legend small {
+ font-size: 13.5px;
+ color: #999999;
+}
label,
input,
button,
select,
textarea {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
font-weight: normal;
line-height: 18px;
}
+input,
+button,
+select,
+textarea {
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
label {
display: block;
margin-bottom: 5px;
@@ -542,7 +625,7 @@ select,
font-size: 13px;
line-height: 18px;
color: #555555;
- border: 1px solid #ccc;
+ border: 1px solid #cccccc;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
@@ -551,10 +634,14 @@ select,
width: auto;
height: auto;
}
-label input, label textarea, label select {
+label input,
+label textarea,
+label select {
display: block;
}
-input[type="image"], input[type="checkbox"], input[type="radio"] {
+input[type="image"],
+input[type="checkbox"],
+input[type="radio"] {
width: auto;
height: auto;
padding: 0;
@@ -563,13 +650,19 @@ input[type="image"], input[type="checkbo
/* IE7 */
line-height: normal;
- border: 0;
cursor: pointer;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
+ border: 0 \9;
+ /* IE9 and down */
+
+}
+input[type="image"] {
+ border: 0;
}
input[type="file"] {
+ width: auto;
padding: initial;
line-height: initial;
border: initial;
@@ -579,11 +672,14 @@ input[type="file"] {
-moz-box-shadow: none;
box-shadow: none;
}
-input[type="button"], input[type="reset"], input[type="submit"] {
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
width: auto;
height: auto;
}
-select, input[type="file"] {
+select,
+input[type="file"] {
height: 28px;
/* In IE7, the height of the select element cannot be changed by height, only font-size */
@@ -592,11 +688,15 @@ select, input[type="file"] {
line-height: 28px;
}
+input[type="file"] {
+ line-height: 18px \9;
+}
select {
width: 220px;
background-color: #ffffff;
}
-select[multiple], select[size] {
+select[multiple],
+select[size] {
height: auto;
}
input[type="image"] {
@@ -610,28 +710,32 @@ textarea {
input[type="hidden"] {
display: none;
}
-.radio, .checkbox {
+.radio,
+.checkbox {
padding-left: 18px;
}
-.radio input[type="radio"], .checkbox input[type="checkbox"] {
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
float: left;
margin-left: -18px;
}
-.controls > .radio:first-child, .controls > .checkbox:first-child {
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
padding-top: 5px;
}
-.radio.inline, .checkbox.inline {
+.radio.inline,
+.checkbox.inline {
display: inline-block;
+ padding-top: 5px;
margin-bottom: 0;
vertical-align: middle;
}
-.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
margin-left: 10px;
}
-.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child {
- padding-top: 0;
-}
-input, textarea {
+input,
+textarea {
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -641,21 +745,25 @@ input, textarea {
-o-transition: border linear 0.2s, box-shadow linear 0.2s;
transition: border linear 0.2s, box-shadow linear 0.2s;
}
-input:focus, textarea:focus {
+input:focus,
+textarea:focus {
border-color: rgba(82, 168, 236, 0.8);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
outline: 0;
outline: thin dotted \9;
- /* IE6-8 */
+ /* IE6-9 */
}
-input[type="file"]:focus, input[type="checkbox"]:focus, select:focus {
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus,
+select:focus {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
- outline: thin dotted;
+ outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -684,41 +792,46 @@ textarea[class*="span"],
float: none;
margin-left: 0;
}
-input.span1, textarea.span1, .uneditable-input.span1 {
- width: 50px;
+input,
+textarea,
+.uneditable-input {
+ margin-left: 0;
}
-input.span2, textarea.span2, .uneditable-input.span2 {
- width: 130px;
+input.span12, textarea.span12, .uneditable-input.span12 {
+ width: 930px;
}
-input.span3, textarea.span3, .uneditable-input.span3 {
- width: 210px;
+input.span11, textarea.span11, .uneditable-input.span11 {
+ width: 850px;
}
-input.span4, textarea.span4, .uneditable-input.span4 {
- width: 290px;
+input.span10, textarea.span10, .uneditable-input.span10 {
+ width: 770px;
}
-input.span5, textarea.span5, .uneditable-input.span5 {
- width: 370px;
+input.span9, textarea.span9, .uneditable-input.span9 {
+ width: 690px;
}
-input.span6, textarea.span6, .uneditable-input.span6 {
- width: 450px;
+input.span8, textarea.span8, .uneditable-input.span8 {
+ width: 610px;
}
input.span7, textarea.span7, .uneditable-input.span7 {
width: 530px;
}
-input.span8, textarea.span8, .uneditable-input.span8 {
- width: 610px;
+input.span6, textarea.span6, .uneditable-input.span6 {
+ width: 450px;
}
-input.span9, textarea.span9, .uneditable-input.span9 {
- width: 690px;
+input.span5, textarea.span5, .uneditable-input.span5 {
+ width: 370px;
}
-input.span10, textarea.span10, .uneditable-input.span10 {
- width: 770px;
+input.span4, textarea.span4, .uneditable-input.span4 {
+ width: 290px;
}
-input.span11, textarea.span11, .uneditable-input.span11 {
- width: 850px;
+input.span3, textarea.span3, .uneditable-input.span3 {
+ width: 210px;
}
-input.span12, textarea.span12, .uneditable-input.span12 {
- width: 930px;
+input.span2, textarea.span2, .uneditable-input.span2 {
+ width: 130px;
+}
+input.span1, textarea.span1, .uneditable-input.span1 {
+ width: 50px;
}
input[disabled],
select[disabled],
@@ -726,69 +839,94 @@ textarea[disabled],
input[readonly],
select[readonly],
textarea[readonly] {
- background-color: #f5f5f5;
+ background-color: #eeeeee;
border-color: #ddd;
cursor: not-allowed;
}
-.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline {
+.control-group.warning > label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
color: #c09853;
}
-.control-group.warning input, .control-group.warning select, .control-group.warning textarea {
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
color: #c09853;
border-color: #c09853;
}
-.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
border-color: #a47e3c;
-webkit-box-shadow: 0 0 6px #dbc59e;
-moz-box-shadow: 0 0 6px #dbc59e;
box-shadow: 0 0 6px #dbc59e;
}
-.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on {
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
color: #c09853;
background-color: #fcf8e3;
border-color: #c09853;
}
-.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline {
+.control-group.error > label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
color: #b94a48;
}
-.control-group.error input, .control-group.error select, .control-group.error textarea {
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
color: #b94a48;
border-color: #b94a48;
}
-.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
border-color: #953b39;
-webkit-box-shadow: 0 0 6px #d59392;
-moz-box-shadow: 0 0 6px #d59392;
box-shadow: 0 0 6px #d59392;
}
-.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on {
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
color: #b94a48;
background-color: #f2dede;
border-color: #b94a48;
}
-.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline {
+.control-group.success > label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
color: #468847;
}
-.control-group.success input, .control-group.success select, .control-group.success textarea {
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
color: #468847;
border-color: #468847;
}
-.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
border-color: #356635;
-webkit-box-shadow: 0 0 6px #7aba7b;
-moz-box-shadow: 0 0 6px #7aba7b;
box-shadow: 0 0 6px #7aba7b;
}
-.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on {
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
color: #468847;
background-color: #dff0d8;
border-color: #468847;
}
-input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid {
+input:focus:required:invalid,
+textarea:focus:required:invalid,
+select:focus:required:invalid {
color: #b94a48;
border-color: #ee5f5b;
}
-input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus {
+input:focus:required:invalid:focus,
+textarea:focus:required:invalid:focus,
+select:focus:required:invalid:focus {
border-color: #e9322d;
-webkit-box-shadow: 0 0 6px #f8b9b7;
-moz-box-shadow: 0 0 6px #f8b9b7;
@@ -798,8 +936,17 @@ input:focus:required:invalid:focus, text
padding: 17px 20px 18px;
margin-top: 18px;
margin-bottom: 18px;
- background-color: #f5f5f5;
+ background-color: #eeeeee;
border-top: 1px solid #ddd;
+ *zoom: 1;
+}
+.form-actions:before,
+.form-actions:after {
+ display: table;
+ content: "";
+}
+.form-actions:after {
+ clear: both;
}
.uneditable-input {
display: block;
@@ -816,10 +963,13 @@ input:focus:required:invalid:focus, text
::-webkit-input-placeholder {
color: #999999;
}
+.help-block,
+.help-inline {
+ color: #555555;
+}
.help-block {
- margin-top: 5px;
- margin-bottom: 0;
- color: #999999;
+ display: block;
+ margin-bottom: 9px;
}
.help-inline {
display: inline-block;
@@ -827,91 +977,106 @@ input:focus:required:invalid:focus, text
/* IE7 inline-block hack */
*zoom: 1;
- margin-bottom: 9px;
vertical-align: middle;
padding-left: 5px;
}
-.input-prepend, .input-append {
+.input-prepend,
+.input-append {
margin-bottom: 5px;
- *zoom: 1;
-}
-.input-prepend:before,
-.input-append:before,
-.input-prepend:after,
-.input-append:after {
- display: table;
- content: "";
-}
-.input-prepend:after, .input-append:after {
- clear: both;
}
.input-prepend input,
.input-append input,
+.input-prepend select,
+.input-append select,
.input-prepend .uneditable-input,
.input-append .uneditable-input {
+ *margin-left: 0;
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
}
.input-prepend input:focus,
.input-append input:focus,
+.input-prepend select:focus,
+.input-append select:focus,
.input-prepend .uneditable-input:focus,
.input-append .uneditable-input:focus {
position: relative;
z-index: 2;
}
-.input-prepend .uneditable-input, .input-append .uneditable-input {
+.input-prepend .uneditable-input,
+.input-append .uneditable-input {
border-left-color: #ccc;
}
-.input-prepend .add-on, .input-append .add-on {
- float: left;
- display: block;
+.input-prepend .add-on,
+.input-append .add-on {
+ display: inline-block;
width: auto;
min-width: 16px;
height: 18px;
- margin-right: -1px;
padding: 4px 5px;
font-weight: normal;
line-height: 18px;
- color: #999999;
text-align: center;
text-shadow: 0 1px 0 #ffffff;
- background-color: #f5f5f5;
+ vertical-align: middle;
+ background-color: #eeeeee;
border: 1px solid #ccc;
+}
+.input-prepend .add-on,
+.input-append .add-on,
+.input-prepend .btn,
+.input-append .btn {
-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 {
+.input-prepend .active,
+.input-append .active {
background-color: #a9dba9;
border-color: #46a546;
}
-.input-prepend .add-on {
- *margin-top: 1px;
- /* IE6-7 */
-
+.input-prepend .add-on,
+.input-prepend .btn {
+ margin-right: -1px;
}
-.input-append input, .input-append .uneditable-input {
- float: left;
+.input-append input,
+.input-append select .uneditable-input {
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
}
.input-append .uneditable-input {
+ border-left-color: #eee;
border-right-color: #ccc;
}
-.input-append .add-on {
- margin-right: 0;
+.input-append .add-on,
+.input-append .btn {
margin-left: -1px;
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
}
-.input-append input:first-child {
- *margin-left: -160px;
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
}
-.input-append input:first-child + .add-on {
- *margin-left: -21px;
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+ margin-right: -1px;
+ -webkit-border-radius: 3px 0 0 3px;
+ -moz-border-radius: 3px 0 0 3px;
+ border-radius: 3px 0 0 3px;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+ margin-left: -1px;
+ -webkit-border-radius: 0 3px 3px 0;
+ -moz-border-radius: 0 3px 3px 0;
+ border-radius: 0 3px 3px 0;
}
.search-query {
padding-left: 14px;
@@ -935,28 +1100,51 @@ input:focus:required:invalid:focus, text
.form-horizontal .help-inline,
.form-search .uneditable-input,
.form-inline .uneditable-input,
-.form-horizontal .uneditable-input {
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
display: inline-block;
margin-bottom: 0;
}
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+ display: none;
+}
.form-search label,
-.form-inline label,
+.form-inline label {
+ display: inline-block;
+}
.form-search .input-append,
.form-inline .input-append,
.form-search .input-prepend,
.form-inline .input-prepend {
- display: inline-block;
+ margin-bottom: 0;
}
-.form-search .input-append .add-on,
-.form-inline .input-prepend .add-on,
-.form-search .input-append .add-on,
-.form-inline .input-prepend .add-on {
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+ padding-left: 0;
+ margin-bottom: 0;
vertical-align: middle;
}
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+ float: left;
+ margin-left: 0;
+ margin-right: 3px;
+}
.control-group {
margin-bottom: 9px;
}
-.form-horizontal legend + .control-group {
+legend + .control-group {
margin-top: 18px;
-webkit-margin-top-collapse: separate;
}
@@ -964,14 +1152,15 @@ input:focus:required:invalid:focus, text
margin-bottom: 18px;
*zoom: 1;
}
-.form-horizontal .control-group:before, .form-horizontal .control-group:after {
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
display: table;
content: "";
}
.form-horizontal .control-group:after {
clear: both;
}
-.form-horizontal .control-group > label {
+.form-horizontal .control-label {
float: left;
width: 140px;
padding-top: 5px;
@@ -979,6 +1168,15 @@ input:focus:required:invalid:focus, text
}
.form-horizontal .controls {
margin-left: 160px;
+ /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */
+
+ *display: inline-block;
+ *margin-left: 0;
+ *padding-left: 20px;
+}
+.form-horizontal .help-block {
+ margin-top: 9px;
+ margin-bottom: 0;
}
.form-horizontal .form-actions {
padding-left: 160px;
@@ -987,73 +1185,89 @@ table {
max-width: 100%;
border-collapse: collapse;
border-spacing: 0;
+ background-color: transparent;
}
.table {
width: 100%;
margin-bottom: 18px;
}
-.table th, .table td {
+.table th,
+.table td {
padding: 8px;
line-height: 18px;
text-align: left;
- border-top: 1px solid #ddd;
+ vertical-align: top;
+ border-top: 1px solid #dddddd;
}
.table th {
font-weight: bold;
- vertical-align: bottom;
}
-.table td {
- vertical-align: top;
+.table thead th {
+ vertical-align: bottom;
}
-.table thead:first-child tr th, .table thead:first-child tr td {
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
border-top: 0;
}
.table tbody + tbody {
- border-top: 2px solid #ddd;
+ border-top: 2px solid #dddddd;
}
-.table-condensed th, .table-condensed td {
+.table-condensed th,
+.table-condensed td {
padding: 4px 5px;
}
.table-bordered {
- border: 1px solid #ddd;
+ border: 1px solid #dddddd;
+ border-left: 0;
border-collapse: separate;
*border-collapse: collapsed;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
-.table-bordered th + th,
-.table-bordered td + td,
-.table-bordered th + td,
-.table-bordered td + th {
- border-left: 1px solid #ddd;
-}
-.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td {
+.table-bordered th,
+.table-bordered td {
+ border-left: 1px solid #dddddd;
+}
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
border-top: 0;
}
-.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child {
+.table-bordered thead:first-child tr:first-child th:first-child,
+.table-bordered tbody:first-child tr:first-child td:first-child {
-webkit-border-radius: 4px 0 0 0;
-moz-border-radius: 4px 0 0 0;
border-radius: 4px 0 0 0;
}
-.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child {
+.table-bordered thead:first-child tr:first-child th:last-child,
+.table-bordered tbody:first-child tr:first-child td:last-child {
-webkit-border-radius: 0 4px 0 0;
-moz-border-radius: 0 4px 0 0;
border-radius: 0 4px 0 0;
}
-.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child {
+.table-bordered thead:last-child tr:last-child th:first-child,
+.table-bordered tbody:last-child tr:last-child td:first-child {
-webkit-border-radius: 0 0 0 4px;
-moz-border-radius: 0 0 0 4px;
border-radius: 0 0 0 4px;
}
-.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child {
+.table-bordered thead:last-child tr:last-child th:last-child,
+.table-bordered tbody:last-child tr:last-child td:last-child {
-webkit-border-radius: 0 0 4px 0;
-moz-border-radius: 0 0 4px 0;
border-radius: 0 0 4px 0;
}
-.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th {
+.table-striped tbody tr:nth-child(odd) td,
+.table-striped tbody tr:nth-child(odd) th {
background-color: #f9f9f9;
}
+.table tbody tr:hover td,
+.table tbody tr:hover th {
+ background-color: #f5f5f5;
+}
table .span1 {
float: none;
width: 44px;
@@ -1114,21 +1328,84 @@ table .span12 {
width: 924px;
margin-left: 0;
}
-[class^="icon-"] {
+table .span13 {
+ float: none;
+ width: 1004px;
+ margin-left: 0;
+}
+table .span14 {
+ float: none;
+ width: 1084px;
+ margin-left: 0;
+}
+table .span15 {
+ float: none;
+ width: 1164px;
+ margin-left: 0;
+}
+table .span16 {
+ float: none;
+ width: 1244px;
+ margin-left: 0;
+}
+table .span17 {
+ float: none;
+ width: 1324px;
+ margin-left: 0;
+}
+table .span18 {
+ float: none;
+ width: 1404px;
+ margin-left: 0;
+}
+table .span19 {
+ float: none;
+ width: 1484px;
+ margin-left: 0;
+}
+table .span20 {
+ float: none;
+ width: 1564px;
+ margin-left: 0;
+}
+table .span21 {
+ float: none;
+ width: 1644px;
+ margin-left: 0;
+}
+table .span22 {
+ float: none;
+ width: 1724px;
+ margin-left: 0;
+}
+table .span23 {
+ float: none;
+ width: 1804px;
+ margin-left: 0;
+}
+table .span24 {
+ float: none;
+ width: 1884px;
+ margin-left: 0;
+}
+[class^="icon-"],
+[class*=" icon-"] {
display: inline-block;
width: 14px;
height: 14px;
+ line-height: 14px;
vertical-align: text-top;
- background-image: url(../img/glyphicons-halflings.png);
+ background-image: url("../img/glyphicons-halflings.png");
background-position: 14px 14px;
background-repeat: no-repeat;
*margin-right: .3em;
}
-[class^="icon-"]:last-child {
+[class^="icon-"]:last-child,
+[class*=" icon-"]:last-child {
*margin-left: 0;
}
.icon-white {
- background-image: url(../img/glyphicons-halflings-white.png);
+ background-image: url("../img/glyphicons-halflings-white.png");
}
.icon-glass {
background-position: 0 0;
@@ -1496,28 +1773,28 @@ table .span12 {
.dropdown-toggle {
*margin-bottom: -3px;
}
-.dropdown-toggle:active, .open .dropdown-toggle {
+.dropdown-toggle:active,
+.open .dropdown-toggle {
outline: 0;
}
.caret {
display: inline-block;
width: 0;
height: 0;
- text-indent: -99999px;
- *text-indent: 0;
vertical-align: top;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid #000000;
opacity: 0.3;
filter: alpha(opacity=30);
- content: "\2193";
+ content: "";
}
.dropdown .caret {
margin-top: 8px;
margin-left: 2px;
}
-.dropdown:hover .caret, .open.dropdown .caret {
+.dropdown:hover .caret,
+.open.dropdown .caret {
opacity: 1;
filter: alpha(opacity=100);
}
@@ -1529,8 +1806,6 @@ table .span12 {
float: left;
display: none;
min-width: 160px;
- max-width: 220px;
- _width: 160px;
padding: 4px 0;
margin: 0;
list-style: none;
@@ -1551,14 +1826,13 @@ table .span12 {
*border-right-width: 2px;
*border-bottom-width: 2px;
}
-.dropdown-menu.bottom-up {
- top: auto;
- bottom: 100%;
- margin-bottom: 2px;
-}
+.dropdown-menu.pull-right {
+ right: 0;
+ left: auto;
+}
.dropdown-menu .divider {
height: 1px;
- margin: 5px 1px;
+ margin: 8px 1px;
overflow: hidden;
background-color: #e5e5e5;
border-bottom: 1px solid #ffffff;
@@ -1571,10 +1845,12 @@ table .span12 {
clear: both;
font-weight: normal;
line-height: 18px;
- color: #555555;
+ color: #333333;
white-space: nowrap;
}
-.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
+.dropdown-menu li > a:hover,
+.dropdown-menu .active > a,
+.dropdown-menu .active > a:hover {
color: #ffffff;
text-decoration: none;
background-color: #0088cc;
@@ -1590,6 +1866,22 @@ table .span12 {
.dropdown.open .dropdown-menu {
display: block;
}
+.pull-right .dropdown-menu {
+ left: auto;
+ right: 0;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+ border-top: 0;
+ border-bottom: 4px solid #000000;
+ content: "\2191";
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+ top: auto;
+ bottom: 100%;
+ margin-bottom: 1px;
+}
.typeahead {
margin-top: 2px;
-webkit-border-radius: 4px;
@@ -1614,6 +1906,18 @@ table .span12 {
border-color: #ddd;
border-color: rgba(0, 0, 0, 0.15);
}
+.well-large {
+ padding: 24px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+}
+.well-small {
+ padding: 9px;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
.fade {
-webkit-transition: opacity 0.15s linear;
-moz-transition: opacity 0.15s linear;
@@ -1657,23 +1961,32 @@ table .span12 {
}
.btn {
display: inline-block;
+ *display: inline;
+ /* IE7 inline-block hack */
+
+ *zoom: 1;
padding: 4px 10px 4px;
+ margin-bottom: 0;
font-size: 13px;
line-height: 18px;
color: #333333;
text-align: center;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
- background-color: #fafafa;
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
- background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
- background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-repeat: no-repeat;
+ vertical-align: middle;
+ background-color: #f5f5f5;
+ background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+ background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: linear-gradient(top, #ffffff, #e6e6e6);
+ background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
- border: 1px solid #ccc;
- border-bottom-color: #bbb;
+ border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ border: 1px solid #cccccc;
+ border-bottom-color: #b3b3b3;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -1683,6 +1996,17 @@ table .span12 {
cursor: pointer;
*margin-left: .3em;
}
+.btn:hover,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+ background-color: #e6e6e6;
+}
+.btn:active,
+.btn.active {
+ background-color: #cccccc \9;
+}
.btn:first-child {
*margin-left: 0;
}
@@ -1698,21 +2022,22 @@ table .span12 {
transition: background-position 0.1s linear;
}
.btn:focus {
- outline: thin dotted;
+ outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
-.btn.active, .btn:active {
+.btn.active,
+.btn:active {
background-image: none;
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
background-color: #e6e6e6;
background-color: #d9d9d9 \9;
- color: rgba(0, 0, 0, 0.5);
outline: 0;
}
-.btn.disabled, .btn[disabled] {
+.btn.disabled,
+.btn[disabled] {
cursor: default;
background-image: none;
background-color: #e6e6e6;
@@ -1730,7 +2055,7 @@ table .span12 {
-moz-border-radius: 5px;
border-radius: 5px;
}
-.btn-large .icon {
+.btn-large [class^="icon-"] {
margin-top: 1px;
}
.btn-small {
@@ -1738,9 +2063,14 @@ table .span12 {
font-size: 11px;
line-height: 16px;
}
-.btn-small .icon {
+.btn-small [class^="icon-"] {
margin-top: -1px;
}
+.btn-mini {
+ padding: 2px 6px;
+ font-size: 11px;
+ line-height: 14px;
+}
.btn-primary,
.btn-primary:hover,
.btn-warning,
@@ -1750,7 +2080,9 @@ table .span12 {
.btn-success,
.btn-success:hover,
.btn-info,
-.btn-info:hover {
+.btn-info:hover,
+.btn-inverse,
+.btn-inverse:hover {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
color: #ffffff;
}
@@ -1758,32 +2090,34 @@ table .span12 {
.btn-warning.active,
.btn-danger.active,
.btn-success.active,
-.btn-info.active {
+.btn-info.active,
+.btn-inverse.active {
color: rgba(255, 255, 255, 0.75);
}
.btn-primary {
- background-color: #006dcc;
- background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
- background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
- background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
- background-image: -o-linear-gradient(top, #0088cc, #0044cc);
- background-image: linear-gradient(top, #0088cc, #0044cc);
+ background-color: #0074cc;
+ background-image: -moz-linear-gradient(top, #0088cc, #0055cc);
+ background-image: -ms-linear-gradient(top, #0088cc, #0055cc);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));
+ background-image: -webkit-linear-gradient(top, #0088cc, #0055cc);
+ background-image: -o-linear-gradient(top, #0088cc, #0055cc);
+ background-image: linear-gradient(top, #0088cc, #0055cc);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
- border-color: #0044cc #0044cc #002a80;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);
+ border-color: #0055cc #0055cc #003580;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
.btn-primary:hover,
.btn-primary:active,
.btn-primary.active,
.btn-primary.disabled,
.btn-primary[disabled] {
- background-color: #0044cc;
+ background-color: #0055cc;
}
-.btn-primary:active, .btn-primary.active {
- background-color: #003399 \9;
+.btn-primary:active,
+.btn-primary.active {
+ background-color: #004099 \9;
}
.btn-warning {
background-color: #faa732;
@@ -1797,7 +2131,7 @@ table .span12 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
border-color: #f89406 #f89406 #ad6704;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
.btn-warning:hover,
.btn-warning:active,
@@ -1806,7 +2140,8 @@ table .span12 {
.btn-warning[disabled] {
background-color: #f89406;
}
-.btn-warning:active, .btn-warning.active {
+.btn-warning:active,
+.btn-warning.active {
background-color: #c67605 \9;
}
.btn-danger {
@@ -1821,7 +2156,7 @@ table .span12 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
border-color: #bd362f #bd362f #802420;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
.btn-danger:hover,
.btn-danger:active,
@@ -1830,7 +2165,8 @@ table .span12 {
.btn-danger[disabled] {
background-color: #bd362f;
}
-.btn-danger:active, .btn-danger.active {
+.btn-danger:active,
+.btn-danger.active {
background-color: #942a25 \9;
}
.btn-success {
@@ -1845,7 +2181,7 @@ table .span12 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
border-color: #51a351 #51a351 #387038;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
.btn-success:hover,
.btn-success:active,
@@ -1854,7 +2190,8 @@ table .span12 {
.btn-success[disabled] {
background-color: #51a351;
}
-.btn-success:active, .btn-success.active {
+.btn-success:active,
+.btn-success.active {
background-color: #408140 \9;
}
.btn-info {
@@ -1869,7 +2206,7 @@ table .span12 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
border-color: #2f96b4 #2f96b4 #1f6377;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
.btn-info:hover,
.btn-info:active,
@@ -1878,31 +2215,67 @@ table .span12 {
.btn-info[disabled] {
background-color: #2f96b4;
}
-.btn-info:active, .btn-info.active {
+.btn-info:active,
+.btn-info.active {
background-color: #24748c \9;
}
-button.btn, input[type="submit"].btn {
+.btn-inverse {
+ background-color: #414141;
+ background-image: -moz-linear-gradient(top, #555555, #222222);
+ background-image: -ms-linear-gradient(top, #555555, #222222);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));
+ background-image: -webkit-linear-gradient(top, #555555, #222222);
+ background-image: -o-linear-gradient(top, #555555, #222222);
+ background-image: linear-gradient(top, #555555, #222222);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);
+ border-color: #222222 #222222 #000000;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+.btn-inverse:hover,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+ background-color: #222222;
+}
+.btn-inverse:active,
+.btn-inverse.active {
+ background-color: #080808 \9;
+}
+button.btn,
+input[type="submit"].btn {
*padding-top: 2px;
*padding-bottom: 2px;
}
-button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner {
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
padding: 0;
border: 0;
}
-button.btn.large, input[type="submit"].btn.large {
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
*padding-top: 7px;
*padding-bottom: 7px;
}
-button.btn.small, input[type="submit"].btn.small {
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
*padding-top: 3px;
*padding-bottom: 3px;
}
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+ *padding-top: 1px;
+ *padding-bottom: 1px;
+}
.btn-group {
position: relative;
*zoom: 1;
*margin-left: .3em;
}
-.btn-group:before, .btn-group:after {
+.btn-group:before,
+.btn-group:after {
display: table;
content: "";
}
@@ -1943,7 +2316,8 @@ button.btn.small, input[type="submit"].b
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px;
}
-.btn-group .btn:last-child, .btn-group .dropdown-toggle {
+.btn-group .btn:last-child,
+.btn-group .dropdown-toggle {
-webkit-border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
border-top-right-radius: 4px;
@@ -1960,7 +2334,8 @@ button.btn.small, input[type="submit"].b
-moz-border-radius-bottomleft: 6px;
border-bottom-left-radius: 6px;
}
-.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle {
+.btn-group .btn.large:last-child,
+.btn-group .large.dropdown-toggle {
-webkit-border-top-right-radius: 6px;
-moz-border-radius-topright: 6px;
border-top-right-radius: 6px;
@@ -1974,7 +2349,8 @@ button.btn.small, input[type="submit"].b
.btn-group .btn.active {
z-index: 2;
}
-.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle {
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
outline: 0;
}
.btn-group .dropdown-toggle {
@@ -1983,8 +2359,22 @@ button.btn.small, input[type="submit"].b
-webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- *padding-top: 5px;
- *padding-bottom: 5px;
+ *padding-top: 3px;
+ *padding-bottom: 3px;
+}
+.btn-group .btn-mini.dropdown-toggle {
+ padding-left: 5px;
+ padding-right: 5px;
+ *padding-top: 1px;
+ *padding-bottom: 1px;
+}
+.btn-group .btn-small.dropdown-toggle {
+ *padding-top: 4px;
+ *padding-bottom: 4px;
+}
+.btn-group .btn-large.dropdown-toggle {
+ padding-left: 12px;
+ padding-right: 12px;
}
.btn-group.open {
*z-index: 1000;
@@ -2006,21 +2396,34 @@ button.btn.small, input[type="submit"].b
margin-top: 7px;
margin-left: 0;
}
-.btn:hover .caret, .open.btn-group .caret {
+.btn:hover .caret,
+.open.btn-group .caret {
opacity: 1;
filter: alpha(opacity=100);
}
+.btn-mini .caret {
+ margin-top: 5px;
+}
+.btn-small .caret {
+ margin-top: 6px;
+}
+.btn-large .caret {
+ margin-top: 6px;
+ border-left: 5px solid transparent;
+ border-right: 5px solid transparent;
+ border-top: 5px solid #000000;
+}
.btn-primary .caret,
+.btn-warning .caret,
.btn-danger .caret,
.btn-info .caret,
-.btn-success .caret {
+.btn-success .caret,
+.btn-inverse .caret {
border-top-color: #ffffff;
+ border-bottom-color: #ffffff;
opacity: 0.75;
filter: alpha(opacity=75);
}
-.btn-small .caret {
- margin-top: 4px;
-}
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: 18px;
@@ -2030,10 +2433,11 @@ button.btn.small, input[type="submit"].b
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-}
-.alert, .alert-heading {
color: #c09853;
}
+.alert-heading {
+ color: inherit;
+}
.alert .close {
position: relative;
top: -2px;
@@ -2043,32 +2447,25 @@ button.btn.small, input[type="submit"].b
.alert-success {
background-color: #dff0d8;
border-color: #d6e9c6;
-}
-.alert-success, .alert-success .alert-heading {
color: #468847;
}
-.alert-danger, .alert-error {
+.alert-danger,
+.alert-error {
background-color: #f2dede;
border-color: #eed3d7;
-}
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
color: #b94a48;
}
.alert-info {
background-color: #d9edf7;
border-color: #bce8f1;
-}
-.alert-info, .alert-info .alert-heading {
color: #3a87ad;
}
.alert-block {
padding-top: 14px;
padding-bottom: 14px;
}
-.alert-block > p, .alert-block > ul {
+.alert-block > p,
+.alert-block > ul {
margin-bottom: 0;
}
.alert-block p + p {
@@ -2086,29 +2483,35 @@ button.btn.small, input[type="submit"].b
text-decoration: none;
background-color: #eeeeee;
}
-.nav-list {
- padding-left: 14px;
- padding-right: 14px;
- margin-bottom: 0;
-}
-.nav-list > li > a, .nav-list .nav-header {
+.nav .nav-header {
display: block;
padding: 3px 15px;
- margin-left: -15px;
- margin-right: -15px;
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
-.nav-list .nav-header {
font-size: 11px;
font-weight: bold;
line-height: 18px;
color: #999999;
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
text-transform: uppercase;
}
-.nav-list > li + .nav-header {
+.nav li + .nav-header {
margin-top: 9px;
}
-.nav-list .active > a, .nav-list .active > a:hover {
+.nav-list {
+ padding-left: 15px;
+ padding-right: 15px;
+ margin-bottom: 0;
+}
+.nav-list > li > a,
+.nav-list .nav-header {
+ margin-left: -15px;
+ margin-right: -15px;
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+.nav-list > li > a {
+ padding: 3px 15px;
+}
+.nav-list > .active > a,
+.nav-list > .active > a:hover {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
background-color: #0088cc;
@@ -2116,7 +2519,17 @@ button.btn.small, input[type="submit"].b
.nav-list [class^="icon-"] {
margin-right: 2px;
}
-.nav-tabs, .nav-pills {
+.nav-list .divider {
+ height: 1px;
+ margin: 8px 1px;
+ overflow: hidden;
+ background-color: #e5e5e5;
+ border-bottom: 1px solid #ffffff;
+ *width: 100%;
+ *margin: -5px 0 5px;
+}
+.nav-tabs,
+.nav-pills {
*zoom: 1;
}
.nav-tabs:before,
@@ -2126,13 +2539,16 @@ button.btn.small, input[type="submit"].b
display: table;
content: "";
}
-.nav-tabs:after, .nav-pills:after {
+.nav-tabs:after,
+.nav-pills:after {
clear: both;
}
-.nav-tabs > li, .nav-pills > li {
+.nav-tabs > li,
+.nav-pills > li {
float: left;
}
-.nav-tabs > li > a, .nav-pills > li > a {
+.nav-tabs > li > a,
+.nav-pills > li > a {
padding-right: 12px;
padding-left: 12px;
margin-right: 2px;
@@ -2145,8 +2561,9 @@ button.btn.small, input[type="submit"].b
margin-bottom: -1px;
}
.nav-tabs > li > a {
- padding-top: 9px;
- padding-bottom: 9px;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ line-height: 18px;
border: 1px solid transparent;
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
@@ -2155,7 +2572,8 @@ button.btn.small, input[type="submit"].b
.nav-tabs > li > a:hover {
border-color: #eeeeee #eeeeee #dddddd;
}
-.nav-tabs > .active > a, .nav-tabs > .active > a:hover {
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover {
color: #555555;
background-color: #ffffff;
border: 1px solid #ddd;
@@ -2171,7 +2589,8 @@ button.btn.small, input[type="submit"].b
-moz-border-radius: 5px;
border-radius: 5px;
}
-.nav-pills .active > a, .nav-pills .active > a:hover {
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover {
color: #ffffff;
background-color: #0088cc;
}
@@ -2210,7 +2629,8 @@ button.btn.small, input[type="submit"].b
.nav-pills.nav-stacked > li:last-child > a {
margin-bottom: 1px;
}
-.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu {
+.nav-tabs .dropdown-menu,
+.nav-pills .dropdown-menu {
margin-top: 1px;
border-width: 1px;
}
@@ -2219,27 +2639,38 @@ button.btn.small, input[type="submit"].b
-moz-border-radius: 4px;
border-radius: 4px;
}
-.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret {
+.nav-tabs .dropdown-toggle .caret,
+.nav-pills .dropdown-toggle .caret {
border-top-color: #0088cc;
+ border-bottom-color: #0088cc;
margin-top: 6px;
}
-.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret {
+.nav-tabs .dropdown-toggle:hover .caret,
+.nav-pills .dropdown-toggle:hover .caret {
border-top-color: #005580;
+ border-bottom-color: #005580;
}
-.nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret {
+.nav-tabs .active .dropdown-toggle .caret,
+.nav-pills .active .dropdown-toggle .caret {
border-top-color: #333333;
+ border-bottom-color: #333333;
}
.nav > .dropdown.active > a:hover {
color: #000000;
cursor: pointer;
}
-.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover {
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > .open.active > a:hover {
color: #ffffff;
background-color: #999999;
border-color: #999999;
}
-.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
+.nav .open .caret,
+.nav .open.active .caret,
+.nav .open a:hover .caret {
border-top-color: #ffffff;
+ border-bottom-color: #ffffff;
opacity: 1;
filter: alpha(opacity=100);
}
@@ -2249,20 +2680,29 @@ button.btn.small, input[type="submit"].b
.tabbable {
*zoom: 1;
}
-.tabbable:before, .tabbable:after {
+.tabbable:before,
+.tabbable:after {
display: table;
content: "";
}
.tabbable:after {
clear: both;
}
-.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
+.tab-content {
+ display: table;
+ width: 100%;
+}
+.tabs-below .nav-tabs,
+.tabs-right .nav-tabs,
+.tabs-left .nav-tabs {
border-bottom: 0;
}
-.tab-content > .tab-pane, .pill-content > .pill-pane {
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
display: none;
}
-.tab-content > .active, .pill-content > .active {
+.tab-content > .active,
+.pill-content > .active {
display: block;
}
.tabs-below .nav-tabs {
@@ -2281,13 +2721,16 @@ button.btn.small, input[type="submit"].b
border-bottom-color: transparent;
border-top-color: #ddd;
}
-.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover {
+.tabs-below .nav-tabs .active > a,
+.tabs-below .nav-tabs .active > a:hover {
border-color: transparent #ddd #ddd #ddd;
}
-.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li {
+.tabs-left .nav-tabs > li,
+.tabs-right .nav-tabs > li {
float: none;
}
-.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a {
+.tabs-left .nav-tabs > li > a,
+.tabs-right .nav-tabs > li > a {
min-width: 74px;
margin-right: 0;
margin-bottom: 3px;
@@ -2306,7 +2749,8 @@ button.btn.small, input[type="submit"].b
.tabs-left .nav-tabs > li > a:hover {
border-color: #eeeeee #dddddd #eeeeee #eeeeee;
}
-.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover {
+.tabs-left .nav-tabs .active > a,
+.tabs-left .nav-tabs .active > a:hover {
border-color: #ddd transparent #ddd #ddd;
*border-right-color: #ffffff;
}
@@ -2324,11 +2768,14 @@ button.btn.small, input[type="submit"].b
.tabs-right .nav-tabs > li > a:hover {
border-color: #eeeeee #eeeeee #eeeeee #dddddd;
}
-.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover {
+.tabs-right .nav-tabs .active > a,
+.tabs-right .nav-tabs .active > a:hover {
border-color: #ddd #ddd #ddd transparent;
*border-left-color: #ffffff;
}
.navbar {
+ *position: relative;
+ *z-index: 2;
overflow: visible;
margin-bottom: 18px;
}
@@ -2351,6 +2798,9 @@ button.btn.small, input[type="submit"].b
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
}
+.navbar .container {
+ width: auto;
+}
.btn-navbar {
display: none;
float: right;
@@ -2368,7 +2818,7 @@ button.btn.small, input[type="submit"].b
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
border-color: #222222 #222222 #000000;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
@@ -2380,7 +2830,8 @@ button.btn.small, input[type="submit"].b
.btn-navbar[disabled] {
background-color: #222222;
}
-.btn-navbar:active, .btn-navbar.active {
+.btn-navbar:active,
+.btn-navbar.active {
background-color: #080808 \9;
}
.btn-navbar .icon-bar {
@@ -2401,6 +2852,9 @@ button.btn.small, input[type="submit"].b
.nav-collapse.collapse {
height: auto;
}
+.navbar {
+ color: #999999;
+}
.navbar .brand:hover {
text-decoration: none;
}
@@ -2417,13 +2871,9 @@ button.btn.small, input[type="submit"].b
.navbar .navbar-text {
margin-bottom: 0;
line-height: 40px;
- color: #999999;
}
-.navbar .navbar-text a:hover {
- color: #ffffff;
- background-color: transparent;
-}
-.navbar .btn, .navbar .btn-group {
+.navbar .btn,
+.navbar .btn-group {
margin-top: 5px;
}
.navbar .btn-group .btn {
@@ -2433,24 +2883,39 @@ button.btn.small, input[type="submit"].b
margin-bottom: 0;
*zoom: 1;
}
-.navbar-form:before, .navbar-form:after {
+.navbar-form:before,
+.navbar-form:after {
display: table;
content: "";
}
.navbar-form:after {
clear: both;
}
-.navbar-form input, .navbar-form select {
- display: inline-block;
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
margin-top: 5px;
- margin-bottom: 0;
}
-.navbar-form .radio, .navbar-form .checkbox {
- margin-top: 5px;
+.navbar-form input,
+.navbar-form select {
+ display: inline-block;
+ margin-bottom: 0;
}
-.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] {
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
margin-top: 3px;
}
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+ margin-top: 6px;
+ white-space: nowrap;
+}
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+ margin-top: 0;
+}
.navbar-search {
position: relative;
float: left;
@@ -2464,10 +2929,8 @@ button.btn.small, input[type="submit"].b
font-weight: normal;
line-height: 1;
color: #ffffff;
- color: rgba(255, 255, 255, 0.75);
- background: #666;
- background: rgba(255, 255, 255, 0.3);
- border: 1px solid #111;
+ background-color: #626262;
+ border: 1px solid #151515;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
@@ -2477,18 +2940,14 @@ button.btn.small, input[type="submit"].b
-o-transition: none;
transition: none;
}
-.navbar-search .search-query :-moz-placeholder {
- color: #eeeeee;
+.navbar-search .search-query:-moz-placeholder {
+ color: #cccccc;
}
.navbar-search .search-query::-webkit-input-placeholder {
- color: #eeeeee;
-}
-.navbar-search .search-query:hover {
- color: #ffffff;
- background-color: #999999;
- background-color: rgba(255, 255, 255, 0.5);
+ color: #cccccc;
}
-.navbar-search .search-query:focus, .navbar-search .search-query.focused {
+.navbar-search .search-query:focus,
+.navbar-search .search-query.focused {
padding: 5px 10px;
color: #333333;
text-shadow: 0 1px 0 #ffffff;
@@ -2499,20 +2958,32 @@ button.btn.small, input[type="submit"].b
box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
outline: 0;
}
-.navbar-fixed-top {
+.navbar-fixed-top,
+.navbar-fixed-bottom {
position: fixed;
- top: 0;
right: 0;
left: 0;
z-index: 1030;
+ margin-bottom: 0;
}
-.navbar-fixed-top .navbar-inner {
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
padding-left: 0;
padding-right: 0;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+ width: 940px;
+}
+.navbar-fixed-top {
+ top: 0;
+}
+.navbar-fixed-bottom {
+ bottom: 0;
+}
.navbar .nav {
position: relative;
left: 0;
@@ -2540,11 +3011,11 @@ button.btn.small, input[type="submit"].b
color: #ffffff;
text-decoration: none;
}
-.navbar .nav .active > a, .navbar .nav .active > a:hover {
+.navbar .nav .active > a,
+.navbar .nav .active > a:hover {
color: #ffffff;
text-decoration: none;
background-color: #222222;
- background-color: rgba(0, 0, 0, 0.5);
}
.navbar .divider-vertical {
height: 40px;
@@ -2585,34 +3056,55 @@ button.btn.small, input[type="submit"].b
top: -6px;
left: 10px;
}
-.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
+.navbar-fixed-bottom .dropdown-menu:before {
+ border-top: 7px solid #ccc;
+ border-top-color: rgba(0, 0, 0, 0.2);
+ border-bottom: 0;
+ bottom: -7px;
+ top: auto;
+}
+.navbar-fixed-bottom .dropdown-menu:after {
+ border-top: 6px solid #ffffff;
+ border-bottom: 0;
+ bottom: -6px;
+ top: auto;
+}
+.navbar .nav .dropdown-toggle .caret,
+.navbar .nav .open.dropdown .caret {
border-top-color: #ffffff;
+ border-bottom-color: #ffffff;
}
.navbar .nav .active .caret {
opacity: 1;
filter: alpha(opacity=100);
}
-.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
+.navbar .nav .open > .dropdown-toggle,
+.navbar .nav .active > .dropdown-toggle,
+.navbar .nav .open.active > .dropdown-toggle {
background-color: transparent;
}
.navbar .nav .active > .dropdown-toggle:hover {
color: #ffffff;
}
-.navbar .nav.pull-right .dropdown-menu {
+.navbar .nav.pull-right .dropdown-menu,
+.navbar .nav .dropdown-menu.pull-right {
left: auto;
right: 0;
}
-.navbar .nav.pull-right .dropdown-menu:before {
+.navbar .nav.pull-right .dropdown-menu:before,
+.navbar .nav .dropdown-menu.pull-right:before {
left: auto;
right: 12px;
}
-.navbar .nav.pull-right .dropdown-menu:after {
+.navbar .nav.pull-right .dropdown-menu:after,
+.navbar .nav .dropdown-menu.pull-right:after {
left: auto;
right: 13px;
}
.breadcrumb {
padding: 7px 14px;
margin: 0 0 18px;
+ list-style: none;
background-color: #fbfbfb;
background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
@@ -2631,7 +3123,11 @@ button.btn.small, input[type="submit"].b
box-shadow: inset 0 1px 0 #ffffff;
}
.breadcrumb li {
- display: inline;
+ display: inline-block;
+ *display: inline;
+ /* IE7 inline-block hack */
+
+ *zoom: 1;
text-shadow: 0 1px 0 #ffffff;
}
.breadcrumb .divider {
@@ -2671,14 +3167,17 @@ button.btn.small, input[type="submit"].b
border: 1px solid #ddd;
border-left-width: 0;
}
-.pagination a:hover, .pagination .active a {
+.pagination a:hover,
+.pagination .active a {
background-color: #f5f5f5;
}
.pagination .active a {
color: #999999;
cursor: default;
}
-.pagination .disabled a, .pagination .disabled a:hover {
+.pagination .disabled span,
+.pagination .disabled a,
+.pagination .disabled a:hover {
color: #999999;
background-color: transparent;
cursor: default;
@@ -2707,7 +3206,8 @@ button.btn.small, input[type="submit"].b
text-align: center;
*zoom: 1;
}
-.pager:before, .pager:after {
+.pager:before,
+.pager:after {
display: table;
content: "";
}
@@ -2736,6 +3236,12 @@ button.btn.small, input[type="submit"].b
.pager .previous a {
float: left;
}
+.pager .disabled a,
+.pager .disabled a:hover {
+ color: #999999;
+ background-color: #fff;
+ cursor: default;
+}
.modal-open .dropdown-menu {
z-index: 2050;
}
@@ -2760,7 +3266,8 @@ button.btn.small, input[type="submit"].b
.modal-backdrop.fade {
opacity: 0;
}
-.modal-backdrop, .modal-backdrop.fade.in {
+.modal-backdrop,
+.modal-backdrop.fade.in {
opacity: 0.8;
filter: alpha(opacity=80);
}
@@ -2769,7 +3276,6 @@ button.btn.small, input[type="submit"].b
top: 50%;
left: 50%;
z-index: 1050;
- max-height: 500px;
overflow: auto;
width: 560px;
margin: -250px 0 0 -280px;
@@ -2808,11 +3314,17 @@ button.btn.small, input[type="submit"].b
margin-top: 2px;
}
.modal-body {
+ overflow-y: auto;
+ max-height: 400px;
padding: 15px;
}
+.modal-form {
+ margin-bottom: 0;
+}
.modal-footer {
padding: 14px 15px 15px;
margin-bottom: 0;
+ text-align: right;
background-color: #f5f5f5;
border-top: 1px solid #ddd;
-webkit-border-radius: 0 0 6px 6px;
@@ -2823,18 +3335,21 @@ button.btn.small, input[type="submit"].b
box-shadow: inset 0 1px 0 #ffffff;
*zoom: 1;
}
-.modal-footer:before, .modal-footer:after {
+.modal-footer:before,
+.modal-footer:after {
display: table;
content: "";
}
.modal-footer:after {
clear: both;
}
-.modal-footer .btn {
- float: right;
+.modal-footer .btn + .btn {
margin-left: 5px;
margin-bottom: 0;
}
+.modal-footer .btn-group .btn + .btn {
+ margin-left: -1px;
+}
.tooltip {
position: absolute;
z-index: 1020;
@@ -2998,7 +3513,9 @@ button.btn.small, input[type="submit"].b
-moz-background-clip: padding-box;
background-clip: padding-box;
}
-.popover-content p, .popover-content ul, .popover-content ol {
+.popover-content p,
+.popover-content ul,
+.popover-content ol {
margin-bottom: 0;
}
.thumbnails {
@@ -3006,7 +3523,8 @@ button.btn.small, input[type="submit"].b
list-style: none;
*zoom: 1;
}
-.thumbnails:before, .thumbnails:after {
+.thumbnails:before,
+.thumbnails:after {
display: table;
content: "";
}
@@ -3045,28 +3563,99 @@ a.thumbnail:hover {
padding: 9px;
}
.label {
- padding: 1px 3px 2px;
- font-size: 9.75px;
+ padding: 1px 4px 2px;
+ font-size: 10.998px;
font-weight: bold;
+ line-height: 13px;
color: #ffffff;
- text-transform: uppercase;
+ vertical-align: middle;
+ white-space: nowrap;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #999999;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
+.label:hover {
+ color: #ffffff;
+ text-decoration: none;
+}
.label-important {
background-color: #b94a48;
}
+.label-important:hover {
+ background-color: #953b39;
+}
.label-warning {
background-color: #f89406;
}
+.label-warning:hover {
+ background-color: #c67605;
+}
.label-success {
background-color: #468847;
}
+.label-success:hover {
+ background-color: #356635;
+}
.label-info {
background-color: #3a87ad;
}
+.label-info:hover {
+ background-color: #2d6987;
+}
+.label-inverse {
+ background-color: #333333;
+}
+.label-inverse:hover {
+ background-color: #1a1a1a;
+}
+.badge {
+ padding: 1px 9px 2px;
+ font-size: 12.025px;
+ font-weight: bold;
+ white-space: nowrap;
+ color: #ffffff;
+ background-color: #999999;
+ -webkit-border-radius: 9px;
+ -moz-border-radius: 9px;
+ border-radius: 9px;
+}
+.badge:hover {
+ color: #ffffff;
+ text-decoration: none;
+ cursor: pointer;
+}
+.badge-error {
+ background-color: #b94a48;
+}
+.badge-error:hover {
+ background-color: #953b39;
+}
+.badge-warning {
+ background-color: #f89406;
+}
+.badge-warning:hover {
+ background-color: #c67605;
+}
+.badge-success {
+ background-color: #468847;
+}
+.badge-success:hover {
+ background-color: #356635;
+}
+.badge-info {
+ background-color: #3a87ad;
+}
+.badge-info:hover {
+ background-color: #2d6987;
+}
+.badge-inverse {
+ background-color: #333333;
+}
+.badge-inverse:hover {
+ background-color: #1a1a1a;
+}
@-webkit-keyframes progress-bar-stripes {
from {
background-position: 0 0;
@@ -3083,6 +3672,14 @@ a.thumbnail:hover {
background-position: 40px 0;
}
}
+@-ms-keyframes progress-bar-stripes {
+ from {
+ background-position: 0 0;
+ }
+ to {
+ background-position: 40px 0;
+ }
+}
@keyframes progress-bar-stripes {
from {
background-position: 0 0;
@@ -3132,6 +3729,7 @@ a.thumbnail:hover {
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
box-sizing: border-box;
-webkit-transition: width 0.6s ease;
-moz-transition: width 0.6s ease;
@@ -3140,7 +3738,7 @@ a.thumbnail:hover {
transition: width 0.6s ease;
}
.progress-striped .bar {
- background-color: #62c462;
+ background-color: #149bdf;
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -3217,6 +3815,26 @@ a.thumbnail:hover {
background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
+.progress-warning .bar {
+ background-color: #faa732;
+ background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+ background-image: -ms-linear-gradient(top, #fbb450, #f89406);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+ background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+ background-image: -o-linear-gradient(top, #fbb450, #f89406);
+ background-image: linear-gradient(top, #fbb450, #f89406);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
+}
+.progress-warning.progress-striped .bar {
+ background-color: #fbb450;
+ background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+ background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
.accordion {
margin-bottom: 18px;
}
@@ -3261,13 +3879,16 @@ a.thumbnail:hover {
display: block;
line-height: 1;
}
-.carousel .active, .carousel .next, .carousel .prev {
+.carousel .active,
+.carousel .next,
+.carousel .prev {
display: block;
}
.carousel .active {
left: 0;
}
-.carousel .next, .carousel .prev {
+.carousel .next,
+.carousel .prev {
position: absolute;
top: 0;
width: 100%;
@@ -3278,7 +3899,8 @@ a.thumbnail:hover {
.carousel .prev {
left: -100%;
}
-.carousel .next.left, .carousel .prev.right {
+.carousel .next.left,
+.carousel .prev.right {
left: 0;
}
.carousel .active.left {
@@ -3326,13 +3948,14 @@ a.thumbnail:hover {
background: #333333;
background: rgba(0, 0, 0, 0.75);
}
-.carousel-caption h4, .carousel-caption p {
+.carousel-caption h4,
+.carousel-caption p {
color: #ffffff;
}
.hero-unit {
padding: 60px;
margin-bottom: 30px;
- background-color: #f5f5f5;
+ background-color: #eeeeee;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
@@ -3341,12 +3964,14 @@ a.thumbnail:hover {
margin-bottom: 0;
font-size: 60px;
line-height: 1;
+ color: inherit;
letter-spacing: -1px;
}
.hero-unit p {
font-size: 18px;
font-weight: 200;
line-height: 27px;
+ color: inherit;
}
.pull-right {
float: right;