You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2012/09/11 05:25:59 UTC
svn commit: r1383233 [2/2] - in /incubator/ambari/branches/AMBARI-666: ./
ambari-web/app/ ambari-web/app/controllers/ ambari-web/app/routes/
ambari-web/app/templates/ ambari-web/app/templates/installer/
ambari-web/app/utils/ ambari-web/app/views/instal...
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/vendor/styles/bootstrap.css
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/vendor/styles/bootstrap.css?rev=1383233&r1=1383232&r2=1383233&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/vendor/styles/bootstrap.css (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/vendor/styles/bootstrap.css Tue Sep 11 03:25:58 2012
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.0.4
+ * Bootstrap v2.1.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -67,6 +67,8 @@ sub {
}
img {
+ width: auto\9;
+ height: auto;
max-width: 100%;
vertical-align: middle;
border: 0;
@@ -130,6 +132,7 @@ textarea {
.clearfix:before,
.clearfix:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -148,18 +151,17 @@ textarea {
.input-block-level {
display: block;
width: 100%;
- min-height: 28px;
+ min-height: 30px;
-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;
- font-size: 13px;
- line-height: 18px;
+ font-size: 14px;
+ line-height: 20px;
color: #333333;
background-color: #ffffff;
}
@@ -174,6 +176,28 @@ a:hover {
text-decoration: underline;
}
+.img-rounded {
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+}
+
+.img-polaroid {
+ padding: 4px;
+ background-color: #fff;
+ border: 1px solid #ccc;
+ border: 1px solid rgba(0, 0, 0, 0.2);
+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.img-circle {
+ -webkit-border-radius: 500px;
+ -moz-border-radius: 500px;
+ border-radius: 500px;
+}
+
.row {
margin-left: -20px;
*zoom: 1;
@@ -182,6 +206,7 @@ a:hover {
.row:before,
.row:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -191,10 +216,12 @@ a:hover {
[class*="span"] {
float: left;
+ min-height: 1px;
margin-left: 20px;
}
.container,
+.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 940px;
@@ -304,6 +331,7 @@ a:hover {
.row-fluid:before,
.row-fluid:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -315,12 +343,11 @@ a:hover {
display: block;
float: left;
width: 100%;
- min-height: 28px;
- margin-left: 2.127659574%;
- *margin-left: 2.0744680846382977%;
+ min-height: 30px;
+ margin-left: 2.127659574468085%;
+ *margin-left: 2.074468085106383%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
- -ms-box-sizing: border-box;
box-sizing: border-box;
}
@@ -329,63 +356,193 @@ a:hover {
}
.row-fluid .span12 {
- width: 99.99999998999999%;
- *width: 99.94680850063828%;
+ width: 100%;
+ *width: 99.94680851063829%;
}
.row-fluid .span11 {
- width: 91.489361693%;
- *width: 91.4361702036383%;
+ width: 91.48936170212765%;
+ *width: 91.43617021276594%;
}
.row-fluid .span10 {
- width: 82.97872339599999%;
- *width: 82.92553190663828%;
+ width: 82.97872340425532%;
+ *width: 82.92553191489361%;
}
.row-fluid .span9 {
- width: 74.468085099%;
- *width: 74.4148936096383%;
+ width: 74.46808510638297%;
+ *width: 74.41489361702126%;
}
.row-fluid .span8 {
- width: 65.95744680199999%;
- *width: 65.90425531263828%;
+ width: 65.95744680851064%;
+ *width: 65.90425531914893%;
}
.row-fluid .span7 {
- width: 57.446808505%;
- *width: 57.3936170156383%;
+ width: 57.44680851063829%;
+ *width: 57.39361702127659%;
}
.row-fluid .span6 {
- width: 48.93617020799999%;
- *width: 48.88297871863829%;
+ width: 48.93617021276595%;
+ *width: 48.88297872340425%;
}
.row-fluid .span5 {
- width: 40.425531911%;
- *width: 40.3723404216383%;
+ width: 40.42553191489362%;
+ *width: 40.37234042553192%;
}
.row-fluid .span4 {
- width: 31.914893614%;
- *width: 31.8617021246383%;
+ width: 31.914893617021278%;
+ *width: 31.861702127659576%;
}
.row-fluid .span3 {
- width: 23.404255317%;
- *width: 23.3510638276383%;
+ width: 23.404255319148934%;
+ *width: 23.351063829787233%;
}
.row-fluid .span2 {
- width: 14.89361702%;
- *width: 14.8404255306383%;
+ width: 14.893617021276595%;
+ *width: 14.840425531914894%;
}
.row-fluid .span1 {
- width: 6.382978723%;
- *width: 6.329787233638298%;
+ width: 6.382978723404255%;
+ *width: 6.329787234042553%;
+}
+
+.row-fluid .offset12 {
+ margin-left: 104.25531914893617%;
+ *margin-left: 104.14893617021275%;
+}
+
+.row-fluid .offset12:first-child {
+ margin-left: 102.12765957446808%;
+ *margin-left: 102.02127659574467%;
+}
+
+.row-fluid .offset11 {
+ margin-left: 95.74468085106382%;
+ *margin-left: 95.6382978723404%;
+}
+
+.row-fluid .offset11:first-child {
+ margin-left: 93.61702127659574%;
+ *margin-left: 93.51063829787232%;
+}
+
+.row-fluid .offset10 {
+ margin-left: 87.23404255319149%;
+ *margin-left: 87.12765957446807%;
+}
+
+.row-fluid .offset10:first-child {
+ margin-left: 85.1063829787234%;
+ *margin-left: 84.99999999999999%;
+}
+
+.row-fluid .offset9 {
+ margin-left: 78.72340425531914%;
+ *margin-left: 78.61702127659572%;
+}
+
+.row-fluid .offset9:first-child {
+ margin-left: 76.59574468085106%;
+ *margin-left: 76.48936170212764%;
+}
+
+.row-fluid .offset8 {
+ margin-left: 70.2127659574468%;
+ *margin-left: 70.10638297872339%;
+}
+
+.row-fluid .offset8:first-child {
+ margin-left: 68.08510638297872%;
+ *margin-left: 67.9787234042553%;
+}
+
+.row-fluid .offset7 {
+ margin-left: 61.70212765957446%;
+ *margin-left: 61.59574468085106%;
+}
+
+.row-fluid .offset7:first-child {
+ margin-left: 59.574468085106375%;
+ *margin-left: 59.46808510638297%;
+}
+
+.row-fluid .offset6 {
+ margin-left: 53.191489361702125%;
+ *margin-left: 53.085106382978715%;
+}
+
+.row-fluid .offset6:first-child {
+ margin-left: 51.063829787234035%;
+ *margin-left: 50.95744680851063%;
+}
+
+.row-fluid .offset5 {
+ margin-left: 44.68085106382979%;
+ *margin-left: 44.57446808510638%;
+}
+
+.row-fluid .offset5:first-child {
+ margin-left: 42.5531914893617%;
+ *margin-left: 42.4468085106383%;
+}
+
+.row-fluid .offset4 {
+ margin-left: 36.170212765957444%;
+ *margin-left: 36.06382978723405%;
+}
+
+.row-fluid .offset4:first-child {
+ margin-left: 34.04255319148936%;
+ *margin-left: 33.93617021276596%;
+}
+
+.row-fluid .offset3 {
+ margin-left: 27.659574468085104%;
+ *margin-left: 27.5531914893617%;
+}
+
+.row-fluid .offset3:first-child {
+ margin-left: 25.53191489361702%;
+ *margin-left: 25.425531914893618%;
+}
+
+.row-fluid .offset2 {
+ margin-left: 19.148936170212764%;
+ *margin-left: 19.04255319148936%;
+}
+
+.row-fluid .offset2:first-child {
+ margin-left: 17.02127659574468%;
+ *margin-left: 16.914893617021278%;
+}
+
+.row-fluid .offset1 {
+ margin-left: 10.638297872340425%;
+ *margin-left: 10.53191489361702%;
+}
+
+.row-fluid .offset1:first-child {
+ margin-left: 8.51063829787234%;
+ *margin-left: 8.404255319148938%;
+}
+
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+ display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+ float: right;
}
.container {
@@ -397,6 +554,7 @@ a:hover {
.container:before,
.container:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -413,6 +571,7 @@ a:hover {
.container-fluid:before,
.container-fluid:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -421,19 +580,50 @@ a:hover {
}
p {
- margin: 0 0 9px;
+ margin: 0 0 10px;
}
-p small {
- font-size: 11px;
+.lead {
+ margin-bottom: 20px;
+ font-size: 21px;
+ font-weight: 200;
+ line-height: 30px;
+}
+
+small {
+ font-size: 85%;
+}
+
+strong {
+ font-weight: bold;
+}
+
+em {
+ font-style: italic;
+}
+
+cite {
+ font-style: normal;
+}
+
+.muted {
color: #999999;
}
-.lead {
- margin-bottom: 18px;
- font-size: 20px;
- font-weight: 200;
- line-height: 27px;
+.text-warning {
+ color: #c09853;
+}
+
+.text-error {
+ color: #b94a48;
+}
+
+.text-info {
+ color: #3a87ad;
+}
+
+.text-success {
+ color: #468847;
}
h1,
@@ -442,9 +632,10 @@ h3,
h4,
h5,
h6 {
- margin: 0;
+ margin: 10px 0;
font-family: inherit;
font-weight: bold;
+ line-height: 1;
color: inherit;
text-rendering: optimizelegibility;
}
@@ -456,74 +647,66 @@ h4 small,
h5 small,
h6 small {
font-weight: normal;
+ line-height: 1;
color: #999999;
}
h1 {
- font-size: 30px;
- line-height: 36px;
-}
-
-h1 small {
- font-size: 18px;
+ font-size: 36px;
+ line-height: 40px;
}
h2 {
- font-size: 24px;
- line-height: 36px;
+ font-size: 30px;
+ line-height: 40px;
}
-h2 small {
- font-size: 18px;
+h3 {
+ font-size: 24px;
+ line-height: 40px;
}
-h3 {
+h4 {
font-size: 18px;
- line-height: 27px;
+ line-height: 20px;
}
-h3 small {
+h5 {
font-size: 14px;
+ line-height: 20px;
}
-h4,
-h5,
h6 {
- line-height: 18px;
+ font-size: 12px;
+ line-height: 20px;
}
-h4 {
- font-size: 14px;
+h1 small {
+ font-size: 24px;
}
-h4 small {
- font-size: 12px;
+h2 small {
+ font-size: 18px;
}
-h5 {
- font-size: 12px;
+h3 small {
+ font-size: 14px;
}
-h6 {
- font-size: 11px;
- color: #999999;
- text-transform: uppercase;
+h4 small {
+ font-size: 14px;
}
.page-header {
- padding-bottom: 17px;
- margin: 18px 0;
+ padding-bottom: 9px;
+ margin: 20px 0 30px;
border-bottom: 1px solid #eeeeee;
}
-.page-header h1 {
- line-height: 1;
-}
-
ul,
ol {
padding: 0;
- margin: 0 0 9px 25px;
+ margin: 0 0 10px 25px;
}
ul ul,
@@ -533,16 +716,8 @@ ol ul {
margin-bottom: 0;
}
-ul {
- list-style: disc;
-}
-
-ol {
- list-style: decimal;
-}
-
li {
- line-height: 18px;
+ line-height: 20px;
}
ul.unstyled,
@@ -552,26 +727,40 @@ ol.unstyled {
}
dl {
- margin-bottom: 18px;
+ margin-bottom: 20px;
}
dt,
dd {
- line-height: 18px;
+ line-height: 20px;
}
dt {
font-weight: bold;
- line-height: 17px;
}
dd {
- margin-left: 9px;
+ margin-left: 10px;
+}
+
+.dl-horizontal {
+ *zoom: 1;
+}
+
+.dl-horizontal:before,
+.dl-horizontal:after {
+ display: table;
+ line-height: 0;
+ content: "";
+}
+
+.dl-horizontal:after {
+ clear: both;
}
.dl-horizontal dt {
float: left;
- width: 120px;
+ width: 160px;
overflow: hidden;
clear: left;
text-align: right;
@@ -580,28 +769,16 @@ dd {
}
.dl-horizontal dd {
- margin-left: 130px;
+ margin-left: 180px;
}
hr {
- margin: 18px 0;
+ margin: 20px 0;
border: 0;
border-top: 1px solid #eeeeee;
border-bottom: 1px solid #ffffff;
}
-strong {
- font-weight: bold;
-}
-
-em {
- font-style: italic;
-}
-
-.muted {
- color: #999999;
-}
-
abbr[title] {
cursor: help;
border-bottom: 1px dotted #999999;
@@ -614,7 +791,7 @@ abbr.initialism {
blockquote {
padding: 0 0 0 15px;
- margin: 0 0 18px;
+ margin: 0 0 20px;
border-left: 5px solid #eeeeee;
}
@@ -622,12 +799,12 @@ blockquote p {
margin-bottom: 0;
font-size: 16px;
font-weight: 300;
- line-height: 22.5px;
+ line-height: 25px;
}
blockquote small {
display: block;
- line-height: 18px;
+ line-height: 20px;
color: #999999;
}
@@ -648,6 +825,14 @@ blockquote.pull-right small {
text-align: right;
}
+blockquote.pull-right small:before {
+ content: '';
+}
+
+blockquote.pull-right small:after {
+ content: '\00A0 \2014';
+}
+
q:before,
q:after,
blockquote:before,
@@ -657,23 +842,15 @@ blockquote:after {
address {
display: block;
- margin-bottom: 18px;
- font-style: normal;
- line-height: 18px;
-}
-
-small {
- font-size: 100%;
-}
-
-cite {
+ margin-bottom: 20px;
font-style: normal;
+ line-height: 20px;
}
code,
pre {
padding: 0 3px 2px;
- font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+ font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
font-size: 12px;
color: #333333;
-webkit-border-radius: 3px;
@@ -690,10 +867,10 @@ code {
pre {
display: block;
- padding: 8.5px;
- margin: 0 0 9px;
- font-size: 12.025px;
- line-height: 18px;
+ padding: 9.5px;
+ margin: 0 0 10px;
+ font-size: 13px;
+ line-height: 20px;
word-break: break-all;
word-wrap: break-word;
white-space: pre;
@@ -707,7 +884,7 @@ pre {
}
pre.prettyprint {
- margin-bottom: 18px;
+ margin-bottom: 20px;
}
pre code {
@@ -723,7 +900,7 @@ pre code {
}
form {
- margin: 0 0 18px;
+ margin: 0 0 20px;
}
fieldset {
@@ -736,16 +913,16 @@ legend {
display: block;
width: 100%;
padding: 0;
- margin-bottom: 27px;
- font-size: 19.5px;
- line-height: 36px;
+ margin-bottom: 20px;
+ font-size: 21px;
+ line-height: 40px;
color: #333333;
border: 0;
border-bottom: 1px solid #e5e5e5;
}
legend small {
- font-size: 13.5px;
+ font-size: 15px;
color: #999999;
}
@@ -754,9 +931,9 @@ input,
button,
select,
textarea {
- font-size: 13px;
+ font-size: 14px;
font-weight: normal;
- line-height: 18px;
+ line-height: 20px;
}
input,
@@ -789,17 +966,21 @@ input[type="tel"],
input[type="color"],
.uneditable-input {
display: inline-block;
- height: 18px;
- padding: 4px;
+ height: 20px;
+ padding: 4px 6px;
margin-bottom: 9px;
- font-size: 13px;
- line-height: 18px;
+ font-size: 14px;
+ line-height: 20px;
color: #555555;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
}
input,
-textarea {
- width: 210px;
+textarea,
+.uneditable-input {
+ width: 206px;
}
textarea {
@@ -824,15 +1005,11 @@ input[type="color"],
.uneditable-input {
background-color: #ffffff;
border: 1px solid #cccccc;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-moz-transition: border linear 0.2s, box-shadow linear 0.2s;
- -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
-o-transition: border linear 0.2s, box-shadow linear 0.2s;
transition: border linear 0.2s, box-shadow linear 0.2s;
}
@@ -865,14 +1042,15 @@ input[type="color"]:focus,
input[type="radio"],
input[type="checkbox"] {
- margin: 3px 0;
+ margin: 4px 0 0;
+ margin-top: 1px \9;
*margin-top: 0;
- /* IE7 */
-
line-height: normal;
cursor: pointer;
}
+input[type="file"],
+input[type="image"],
input[type="submit"],
input[type="reset"],
input[type="button"],
@@ -881,25 +1059,21 @@ input[type="checkbox"] {
width: auto;
}
-.uneditable-textarea {
- width: auto;
- height: auto;
-}
-
select,
input[type="file"] {
- height: 28px;
+ height: 30px;
/* In IE7, the height of the select element cannot be changed by height, only font-size */
*margin-top: 4px;
/* For IE7, add top margin to align select with labels */
- line-height: 28px;
+ line-height: 30px;
}
select {
width: 220px;
- border: 1px solid #bbb;
+ background-color: #ffffff;
+ border: 1px solid #cccccc;
}
select[multiple],
@@ -916,17 +1090,53 @@ input[type="checkbox"]:focus {
outline-offset: -2px;
}
-.radio,
-.checkbox {
- min-height: 18px;
- padding-left: 18px;
+.uneditable-input,
+.uneditable-textarea {
+ color: #999999;
+ cursor: not-allowed;
+ background-color: #fcfcfc;
+ border-color: #cccccc;
+ -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+ -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
}
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
- float: left;
- margin-left: -18px;
-}
+.uneditable-input {
+ overflow: hidden;
+ white-space: nowrap;
+}
+
+.uneditable-textarea {
+ width: auto;
+ height: auto;
+}
+
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+ color: #999999;
+}
+
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+ color: #999999;
+}
+
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+ color: #999999;
+}
+
+.radio,
+.checkbox {
+ min-height: 18px;
+ padding-left: 18px;
+}
+
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+ float: left;
+ margin-left: -18px;
+}
.controls > .radio:first-child,
.controls > .checkbox:first-child {
@@ -986,6 +1196,10 @@ textarea[class*="span"],
.input-append .uneditable-input[class*="span"],
.input-prepend input[class*="span"],
.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
.row-fluid .input-prepend [class*="span"],
.row-fluid .input-append [class*="span"] {
display: inline-block;
@@ -997,76 +1211,99 @@ textarea,
margin-left: 0;
}
+.controls-row [class*="span"] + [class*="span"] {
+ margin-left: 20px;
+}
+
input.span12,
textarea.span12,
.uneditable-input.span12 {
- width: 930px;
+ width: 926px;
}
input.span11,
textarea.span11,
.uneditable-input.span11 {
- width: 850px;
+ width: 846px;
}
input.span10,
textarea.span10,
.uneditable-input.span10 {
- width: 770px;
+ width: 766px;
}
input.span9,
textarea.span9,
.uneditable-input.span9 {
- width: 690px;
+ width: 686px;
}
input.span8,
textarea.span8,
.uneditable-input.span8 {
- width: 610px;
+ width: 606px;
}
input.span7,
textarea.span7,
.uneditable-input.span7 {
- width: 530px;
+ width: 526px;
}
input.span6,
textarea.span6,
.uneditable-input.span6 {
- width: 450px;
+ width: 446px;
}
input.span5,
textarea.span5,
.uneditable-input.span5 {
- width: 370px;
+ width: 366px;
}
input.span4,
textarea.span4,
.uneditable-input.span4 {
- width: 290px;
+ width: 286px;
}
input.span3,
textarea.span3,
.uneditable-input.span3 {
- width: 210px;
+ width: 206px;
}
input.span2,
textarea.span2,
.uneditable-input.span2 {
- width: 130px;
+ width: 126px;
}
input.span1,
textarea.span1,
.uneditable-input.span1 {
- width: 50px;
+ width: 46px;
+}
+
+.controls-row {
+ *zoom: 1;
+}
+
+.controls-row:before,
+.controls-row:after {
+ display: table;
+ line-height: 0;
+ content: "";
+}
+
+.controls-row:after {
+ clear: both;
+}
+
+.controls-row [class*="span"] {
+ float: left;
}
input[disabled],
@@ -1077,7 +1314,6 @@ select[readonly],
textarea[readonly] {
cursor: not-allowed;
background-color: #eeeeee;
- border-color: #ddd;
}
input[type="radio"][disabled],
@@ -1099,18 +1335,24 @@ input[type="checkbox"][readonly] {
.control-group.warning select,
.control-group.warning textarea {
color: #c09853;
+}
+
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
border-color: #c09853;
+ -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);
}
-.control-group.warning .checkbox:focus,
-.control-group.warning .radio: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;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
}
.control-group.warning .input-prepend .add-on,
@@ -1132,18 +1374,24 @@ input[type="checkbox"][readonly] {
.control-group.error select,
.control-group.error textarea {
color: #b94a48;
+}
+
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
border-color: #b94a48;
+ -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);
}
-.control-group.error .checkbox:focus,
-.control-group.error .radio: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;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
}
.control-group.error .input-prepend .add-on,
@@ -1165,18 +1413,24 @@ input[type="checkbox"][readonly] {
.control-group.success select,
.control-group.success textarea {
color: #468847;
+}
+
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
border-color: #468847;
+ -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);
}
-.control-group.success .checkbox:focus,
-.control-group.success .radio: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;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
}
.control-group.success .input-prepend .add-on,
@@ -1186,6 +1440,45 @@ input[type="checkbox"][readonly] {
border-color: #468847;
}
+.control-group.info > label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+ color: #3a87ad;
+}
+
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+ color: #3a87ad;
+}
+
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+ border-color: #3a87ad;
+ -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);
+}
+
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+ border-color: #2d6987;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+}
+
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+ color: #3a87ad;
+ background-color: #d9edf7;
+ border-color: #3a87ad;
+}
+
input:focus:required:invalid,
textarea:focus:required:invalid,
select:focus:required:invalid {
@@ -1203,9 +1496,9 @@ select:focus:required:invalid:focus {
}
.form-actions {
- padding: 17px 20px 18px;
- margin-top: 18px;
- margin-bottom: 18px;
+ padding: 19px 20px 20px;
+ margin-top: 20px;
+ margin-bottom: 20px;
background-color: #f5f5f5;
border-top: 1px solid #e5e5e5;
*zoom: 1;
@@ -1214,6 +1507,7 @@ select:focus:required:invalid:focus {
.form-actions:before,
.form-actions:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -1221,37 +1515,14 @@ select:focus:required:invalid:focus {
clear: both;
}
-.uneditable-input {
- overflow: hidden;
- white-space: nowrap;
- cursor: not-allowed;
- background-color: #ffffff;
- border-color: #eee;
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-}
-
-:-moz-placeholder {
- color: #999999;
-}
-
-:-ms-input-placeholder {
- color: #999999;
-}
-
-::-webkit-input-placeholder {
- color: #999999;
-}
-
.help-block,
.help-inline {
- color: #555555;
+ color: #595959;
}
.help-block {
display: block;
- margin-bottom: 9px;
+ margin-bottom: 10px;
}
.help-inline {
@@ -1262,68 +1533,66 @@ select:focus:required:invalid:focus {
*zoom: 1;
}
-.input-prepend,
-.input-append {
+.input-append,
+.input-prepend {
margin-bottom: 5px;
+ font-size: 0;
+ white-space: nowrap;
}
-.input-prepend input,
.input-append input,
-.input-prepend select,
+.input-prepend input,
.input-append select,
-.input-prepend .uneditable-input,
-.input-append .uneditable-input {
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input {
position: relative;
margin-bottom: 0;
*margin-left: 0;
- vertical-align: middle;
+ font-size: 14px;
+ vertical-align: top;
-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-prepend input:focus,
.input-append select:focus,
-.input-prepend .uneditable-input:focus,
-.input-append .uneditable-input:focus {
+.input-prepend select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend .uneditable-input:focus {
z-index: 2;
}
-.input-prepend .uneditable-input,
-.input-append .uneditable-input {
- border-left-color: #ccc;
-}
-
-.input-prepend .add-on,
-.input-append .add-on {
+.input-append .add-on,
+.input-prepend .add-on {
display: inline-block;
width: auto;
- height: 18px;
+ height: 20px;
min-width: 16px;
padding: 4px 5px;
+ font-size: 14px;
font-weight: normal;
- line-height: 18px;
+ line-height: 20px;
text-align: center;
text-shadow: 0 1px 0 #ffffff;
- vertical-align: middle;
background-color: #eeeeee;
border: 1px solid #ccc;
}
-.input-prepend .add-on,
.input-append .add-on,
-.input-prepend .btn,
-.input-append .btn {
- margin-left: -1px;
+.input-prepend .add-on,
+.input-append .btn,
+.input-prepend .btn {
+ vertical-align: top;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
-.input-prepend .active,
-.input-append .active {
+.input-append .active,
+.input-prepend .active {
background-color: #a9dba9;
border-color: #46a546;
}
@@ -1348,9 +1617,9 @@ select:focus:required:invalid:focus {
border-radius: 3px 0 0 3px;
}
-.input-append .uneditable-input {
- border-right-color: #ccc;
- border-left-color: #eee;
+.input-append .add-on,
+.input-append .btn {
+ margin-left: -1px;
}
.input-append .add-on:last-child,
@@ -1384,7 +1653,7 @@ select:focus:required:invalid:focus {
border-radius: 0 3px 3px 0;
}
-.search-query {
+input.search-query {
padding-right: 14px;
padding-right: 4px \9;
padding-left: 14px;
@@ -1392,9 +1661,42 @@ select:focus:required:invalid:focus {
/* IE7-8 doesn't have border-radius, so don't indent the padding */
margin-bottom: 0;
- -webkit-border-radius: 14px;
- -moz-border-radius: 14px;
- border-radius: 14px;
+ -webkit-border-radius: 15px;
+ -moz-border-radius: 15px;
+ border-radius: 15px;
+}
+
+/* Allow for input prepend/append in search forms */
+
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
+}
+
+.form-search .input-append .search-query {
+ -webkit-border-radius: 14px 0 0 14px;
+ -moz-border-radius: 14px 0 0 14px;
+ border-radius: 14px 0 0 14px;
+}
+
+.form-search .input-append .btn {
+ -webkit-border-radius: 0 14px 14px 0;
+ -moz-border-radius: 0 14px 14px 0;
+ border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .search-query {
+ -webkit-border-radius: 0 14px 14px 0;
+ -moz-border-radius: 0 14px 14px 0;
+ border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .btn {
+ -webkit-border-radius: 14px 0 0 14px;
+ -moz-border-radius: 14px 0 0 14px;
+ border-radius: 14px 0 0 14px;
}
.form-search input,
@@ -1421,6 +1723,7 @@ select:focus:required:invalid:focus {
display: inline-block;
*display: inline;
margin-bottom: 0;
+ vertical-align: middle;
*zoom: 1;
}
@@ -1431,7 +1734,9 @@ select:focus:required:invalid:focus {
}
.form-search label,
-.form-inline label {
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
display: inline-block;
}
@@ -1461,22 +1766,23 @@ select:focus:required:invalid:focus {
}
.control-group {
- margin-bottom: 9px;
+ margin-bottom: 10px;
}
legend + .control-group {
- margin-top: 18px;
+ margin-top: 20px;
-webkit-margin-top-collapse: separate;
}
.form-horizontal .control-group {
- margin-bottom: 18px;
+ margin-bottom: 20px;
*zoom: 1;
}
.form-horizontal .control-group:before,
.form-horizontal .control-group:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -1486,7 +1792,7 @@ legend + .control-group {
.form-horizontal .control-label {
float: left;
- width: 140px;
+ width: 160px;
padding-top: 5px;
text-align: right;
}
@@ -1494,21 +1800,26 @@ legend + .control-group {
.form-horizontal .controls {
*display: inline-block;
*padding-left: 20px;
- margin-left: 160px;
+ margin-left: 180px;
*margin-left: 0;
}
.form-horizontal .controls:first-child {
- *padding-left: 160px;
+ *padding-left: 180px;
}
.form-horizontal .help-block {
- margin-top: 9px;
margin-bottom: 0;
}
+.form-horizontal input + .help-block,
+.form-horizontal select + .help-block,
+.form-horizontal textarea + .help-block {
+ margin-top: 10px;
+}
+
.form-horizontal .form-actions {
- padding-left: 160px;
+ padding-left: 180px;
}
table {
@@ -1520,13 +1831,13 @@ table {
.table {
width: 100%;
- margin-bottom: 18px;
+ margin-bottom: 20px;
}
.table th,
.table td {
padding: 8px;
- line-height: 18px;
+ line-height: 20px;
text-align: left;
vertical-align: top;
border-top: 1px solid #dddddd;
@@ -1561,7 +1872,7 @@ table {
.table-bordered {
border: 1px solid #dddddd;
border-collapse: separate;
- *border-collapse: collapsed;
+ *border-collapse: collapse;
border-left: 0;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
@@ -1600,7 +1911,8 @@ table {
}
.table-bordered thead:last-child tr:last-child th:first-child,
-.table-bordered tbody:last-child tr:last-child td:first-child {
+.table-bordered tbody:last-child tr:last-child td:first-child,
+.table-bordered tfoot: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;
@@ -1610,171 +1922,230 @@ table {
}
.table-bordered thead:last-child tr:last-child th:last-child,
-.table-bordered tbody:last-child tr:last-child td:last-child {
+.table-bordered tbody:last-child tr:last-child td:last-child,
+.table-bordered tfoot:last-child tr:last-child td:last-child {
-webkit-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
}
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+ -webkit-border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
+ -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+ -webkit-border-top-right-radius: 4px;
+ border-top-right-radius: 4px;
+ -moz-border-radius-topleft: 4px;
+}
+
.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 {
+.table-hover tbody tr:hover td,
+.table-hover tbody tr:hover th {
background-color: #f5f5f5;
}
-table .span1 {
+table [class*=span],
+.row-fluid table [class*=span] {
+ display: table-cell;
+ float: none;
+ margin-left: 0;
+}
+
+.table .span1 {
float: none;
width: 44px;
margin-left: 0;
}
-table .span2 {
+.table .span2 {
float: none;
width: 124px;
margin-left: 0;
}
-table .span3 {
+.table .span3 {
float: none;
width: 204px;
margin-left: 0;
}
-table .span4 {
+.table .span4 {
float: none;
width: 284px;
margin-left: 0;
}
-table .span5 {
+.table .span5 {
float: none;
width: 364px;
margin-left: 0;
}
-table .span6 {
+.table .span6 {
float: none;
width: 444px;
margin-left: 0;
}
-table .span7 {
+.table .span7 {
float: none;
width: 524px;
margin-left: 0;
}
-table .span8 {
+.table .span8 {
float: none;
width: 604px;
margin-left: 0;
}
-table .span9 {
+.table .span9 {
float: none;
width: 684px;
margin-left: 0;
}
-table .span10 {
+.table .span10 {
float: none;
width: 764px;
margin-left: 0;
}
-table .span11 {
+.table .span11 {
float: none;
width: 844px;
margin-left: 0;
}
-table .span12 {
+.table .span12 {
float: none;
width: 924px;
margin-left: 0;
}
-table .span13 {
+.table .span13 {
float: none;
width: 1004px;
margin-left: 0;
}
-table .span14 {
+.table .span14 {
float: none;
width: 1084px;
margin-left: 0;
}
-table .span15 {
+.table .span15 {
float: none;
width: 1164px;
margin-left: 0;
}
-table .span16 {
+.table .span16 {
float: none;
width: 1244px;
margin-left: 0;
}
-table .span17 {
+.table .span17 {
float: none;
width: 1324px;
margin-left: 0;
}
-table .span18 {
+.table .span18 {
float: none;
width: 1404px;
margin-left: 0;
}
-table .span19 {
+.table .span19 {
float: none;
width: 1484px;
margin-left: 0;
}
-table .span20 {
+.table .span20 {
float: none;
width: 1564px;
margin-left: 0;
}
-table .span21 {
+.table .span21 {
float: none;
width: 1644px;
margin-left: 0;
}
-table .span22 {
+.table .span22 {
float: none;
width: 1724px;
margin-left: 0;
}
-table .span23 {
+.table .span23 {
float: none;
width: 1804px;
margin-left: 0;
}
-table .span24 {
+.table .span24 {
float: none;
width: 1884px;
margin-left: 0;
}
+.table tbody tr.success td {
+ background-color: #dff0d8;
+}
+
+.table tbody tr.error td {
+ background-color: #f2dede;
+}
+
+.table tbody tr.warning td {
+ background-color: #fcf8e3;
+}
+
+.table tbody tr.info td {
+ background-color: #d9edf7;
+}
+
+.table-hover tbody tr.success:hover td {
+ background-color: #d0e9c6;
+}
+
+.table-hover tbody tr.error:hover td {
+ background-color: #ebcccc;
+}
+
+.table-hover tbody tr.warning:hover td {
+ background-color: #faf2cc;
+}
+
+.table-hover tbody tr.info:hover td {
+ background-color: #c4e3f3;
+}
+
[class^="icon-"],
[class*=" icon-"] {
display: inline-block;
width: 14px;
height: 14px;
+ margin-top: 1px;
*margin-right: .3em;
line-height: 14px;
vertical-align: text-top;
@@ -1783,12 +2154,21 @@ table .span24 {
background-repeat: no-repeat;
}
-[class^="icon-"]:last-child,
-[class*=" icon-"]:last-child {
- *margin-left: 0;
-}
+/* White icons with optional class, or on hover/active states of certain elements */
-.icon-white {
+.icon-white,
+.nav-tabs > .active > a > [class^="icon-"],
+.nav-tabs > .active > a > [class*=" icon-"],
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
+.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > .active > a > [class*=" icon-"] {
background-image: url("../img/glyphicons-halflings-white.png");
}
@@ -2229,6 +2609,7 @@ table .span24 {
}
.icon-random {
+ width: 16px;
background-position: -216px -120px;
}
@@ -2261,6 +2642,7 @@ table .span24 {
}
.icon-folder-open {
+ width: 16px;
background-position: -408px -120px;
}
@@ -2375,8 +2757,6 @@ table .span24 {
border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: "";
- opacity: 0.3;
- filter: alpha(opacity=30);
}
.dropdown .caret {
@@ -2384,12 +2764,6 @@ table .span24 {
margin-left: 2px;
}
-.dropdown:hover .caret,
-.open .caret {
- opacity: 1;
- filter: alpha(opacity=100);
-}
-
.dropdown-menu {
position: absolute;
top: 100%;
@@ -2398,17 +2772,17 @@ table .span24 {
display: none;
float: left;
min-width: 160px;
- padding: 4px 0;
- margin: 1px 0 0;
+ padding: 5px 0;
+ margin: 2px 0 0;
list-style: none;
background-color: #ffffff;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.2);
*border-right-width: 2px;
*border-bottom-width: 2px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
@@ -2425,7 +2799,7 @@ table .span24 {
.dropdown-menu .divider {
*width: 100%;
height: 1px;
- margin: 8px 1px;
+ margin: 9px 1px;
*margin: -5px 0 5px;
overflow: hidden;
background-color: #e5e5e5;
@@ -2434,20 +2808,55 @@ table .span24 {
.dropdown-menu a {
display: block;
- padding: 3px 15px;
+ padding: 3px 20px;
clear: both;
font-weight: normal;
- line-height: 18px;
+ line-height: 20px;
color: #333333;
white-space: nowrap;
}
.dropdown-menu li > a:hover,
+.dropdown-menu li > a:focus,
+.dropdown-submenu:hover > a {
+ color: #ffffff;
+ text-decoration: none;
+ background-color: #0088cc;
+ background-color: #0081c2;
+ background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+ background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+ background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+ background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+ background-repeat: repeat-x;
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
.dropdown-menu .active > a,
.dropdown-menu .active > a:hover {
color: #ffffff;
text-decoration: none;
background-color: #0088cc;
+ background-color: #0081c2;
+ background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+ background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+ background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+ background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+ background-repeat: repeat-x;
+ outline: 0;
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
+.dropdown-menu .disabled > a,
+.dropdown-menu .disabled > a:hover {
+ color: #999999;
+}
+
+.dropdown-menu .disabled > a:hover {
+ text-decoration: none;
+ cursor: default;
+ background-color: transparent;
}
.open {
@@ -2467,7 +2876,7 @@ table .span24 {
.navbar-fixed-bottom .dropdown .caret {
border-top: 0;
border-bottom: 4px solid #000000;
- content: "\2191";
+ content: "";
}
.dropup .dropdown-menu,
@@ -2477,23 +2886,63 @@ table .span24 {
margin-bottom: 1px;
}
-.typeahead {
- margin-top: 2px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
+.dropdown-submenu {
+ position: relative;
}
-.well {
- min-height: 20px;
- padding: 19px;
- margin-bottom: 20px;
- background-color: #f5f5f5;
- border: 1px solid #eee;
- border: 1px solid rgba(0, 0, 0, 0.05);
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
+.dropdown-submenu > .dropdown-menu {
+ top: 0;
+ left: 100%;
+ margin-top: -6px;
+ margin-left: -1px;
+ -webkit-border-radius: 0 6px 6px 6px;
+ -moz-border-radius: 0 6px 6px 6px;
+ border-radius: 0 6px 6px 6px;
+}
+
+.dropdown-submenu:hover > .dropdown-menu {
+ display: block;
+}
+
+.dropdown-submenu > a:after {
+ display: block;
+ float: right;
+ width: 0;
+ height: 0;
+ margin-top: 5px;
+ margin-right: -10px;
+ border-color: transparent;
+ border-left-color: #cccccc;
+ border-style: solid;
+ border-width: 5px 0 5px 5px;
+ content: " ";
+}
+
+.dropdown-submenu:hover > a:after {
+ border-left-color: #ffffff;
+}
+
+.dropdown .dropdown-menu .nav-header {
+ padding-right: 20px;
+ padding-left: 20px;
+}
+
+.typeahead {
+ margin-top: 2px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+}
+
+.well {
+ min-height: 20px;
+ padding: 19px;
+ margin-bottom: 20px;
+ background-color: #f5f5f5;
+ border: 1px solid #e3e3e3;
+ -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);
@@ -2522,7 +2971,6 @@ table .span24 {
opacity: 0;
-webkit-transition: opacity 0.15s linear;
-moz-transition: opacity 0.15s linear;
- -ms-transition: opacity 0.15s linear;
-o-transition: opacity 0.15s linear;
transition: opacity 0.15s linear;
}
@@ -2537,7 +2985,6 @@ table .span24 {
overflow: hidden;
-webkit-transition: height 0.35s ease;
-moz-transition: height 0.35s ease;
- -ms-transition: height 0.35s ease;
-o-transition: height 0.35s ease;
transition: height 0.35s ease;
}
@@ -2550,7 +2997,7 @@ table .span24 {
float: right;
font-size: 20px;
font-weight: bold;
- line-height: 18px;
+ line-height: 20px;
color: #000000;
text-shadow: 0 1px 0 #ffffff;
opacity: 0.2;
@@ -2576,11 +3023,11 @@ button.close {
.btn {
display: inline-block;
*display: inline;
- padding: 4px 10px 4px;
+ padding: 4px 14px;
margin-bottom: 0;
*margin-left: .3em;
- font-size: 13px;
- line-height: 18px;
+ font-size: 14px;
+ line-height: 20px;
*line-height: 20px;
color: #333333;
text-align: center;
@@ -2589,22 +3036,21 @@ button.close {
cursor: pointer;
background-color: #f5f5f5;
*background-color: #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-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
background-repeat: repeat-x;
- border: 1px solid #cccccc;
+ border: 1px solid #bbbbbb;
*border: 0;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
- border-bottom-color: #b3b3b3;
+ border-bottom-color: #a2a2a2;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
*zoom: 1;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
@@ -2617,6 +3063,7 @@ button.close {
.btn.active,
.btn.disabled,
.btn[disabled] {
+ color: #333333;
background-color: #e6e6e6;
*background-color: #d9d9d9;
}
@@ -2640,7 +3087,6 @@ button.close {
background-position: 0 -15px;
-webkit-transition: background-position 0.1s linear;
-moz-transition: background-position 0.1s linear;
- -ms-transition: background-position 0.1s linear;
-o-transition: background-position 0.1s linear;
transition: background-position 0.1s linear;
}
@@ -2676,7 +3122,7 @@ button.close {
.btn-large {
padding: 9px 14px;
- font-size: 15px;
+ font-size: 16px;
line-height: normal;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
@@ -2684,39 +3130,43 @@ button.close {
}
.btn-large [class^="icon-"] {
- margin-top: 1px;
+ margin-top: 2px;
}
.btn-small {
- padding: 5px 9px;
- font-size: 11px;
- line-height: 16px;
+ padding: 3px 9px;
+ font-size: 12px;
+ line-height: 18px;
}
.btn-small [class^="icon-"] {
- margin-top: -1px;
+ margin-top: 0;
}
.btn-mini {
padding: 2px 6px;
font-size: 11px;
- line-height: 14px;
+ line-height: 17px;
}
-.btn-primary,
-.btn-primary:hover,
-.btn-warning,
-.btn-warning:hover,
-.btn-danger,
-.btn-danger:hover,
-.btn-success,
-.btn-success:hover,
-.btn-info,
-.btn-info:hover,
-.btn-inverse,
-.btn-inverse:hover {
- color: #ffffff;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+.btn-block {
+ display: block;
+ width: 100%;
+ padding-right: 0;
+ padding-left: 0;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+.btn-block + .btn-block {
+ margin-top: 5px;
+}
+
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+ width: 100%;
}
.btn-primary.active,
@@ -2729,23 +3179,24 @@ button.close {
}
.btn {
- border-color: #ccc;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ border-color: #c5c5c5;
+ border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
}
.btn-primary {
- background-color: #0074cc;
- *background-color: #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: -moz-linear-gradient(top, #0088cc, #0055cc);
- background-image: linear-gradient(top, #0088cc, #0055cc);
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #006dcc;
+ *background-color: #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(to bottom, #0088cc, #0044cc);
+ background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
background-repeat: repeat-x;
- border-color: #0055cc #0055cc #003580;
+ border-color: #0044cc #0044cc #002a80;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
@@ -2754,28 +3205,30 @@ button.close {
.btn-primary.active,
.btn-primary.disabled,
.btn-primary[disabled] {
- background-color: #0055cc;
- *background-color: #004ab3;
+ color: #ffffff;
+ background-color: #0044cc;
+ *background-color: #003bb3;
}
.btn-primary:active,
.btn-primary.active {
- background-color: #004099 \9;
+ background-color: #003399 \9;
}
.btn-warning {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #faa732;
*background-color: #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(to bottom, #fbb450, #f89406);
background-image: -moz-linear-gradient(top, #fbb450, #f89406);
- background-image: linear-gradient(top, #fbb450, #f89406);
background-repeat: repeat-x;
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(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
@@ -2784,6 +3237,7 @@ button.close {
.btn-warning.active,
.btn-warning.disabled,
.btn-warning[disabled] {
+ color: #ffffff;
background-color: #f89406;
*background-color: #df8505;
}
@@ -2794,18 +3248,19 @@ button.close {
}
.btn-danger {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #da4f49;
*background-color: #bd362f;
- background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+ background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
- background-image: linear-gradient(top, #ee5f5b, #bd362f);
background-repeat: repeat-x;
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(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
@@ -2814,6 +3269,7 @@ button.close {
.btn-danger.active,
.btn-danger.disabled,
.btn-danger[disabled] {
+ color: #ffffff;
background-color: #bd362f;
*background-color: #a9302a;
}
@@ -2824,18 +3280,19 @@ button.close {
}
.btn-success {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #5bb75b;
*background-color: #51a351;
- background-image: -ms-linear-gradient(top, #62c462, #51a351);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
background-image: -webkit-linear-gradient(top, #62c462, #51a351);
background-image: -o-linear-gradient(top, #62c462, #51a351);
+ background-image: linear-gradient(to bottom, #62c462, #51a351);
background-image: -moz-linear-gradient(top, #62c462, #51a351);
- background-image: linear-gradient(top, #62c462, #51a351);
background-repeat: repeat-x;
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(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
@@ -2844,6 +3301,7 @@ button.close {
.btn-success.active,
.btn-success.disabled,
.btn-success[disabled] {
+ color: #ffffff;
background-color: #51a351;
*background-color: #499249;
}
@@ -2854,18 +3312,19 @@ button.close {
}
.btn-info {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #49afcd;
*background-color: #2f96b4;
- background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+ background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
- background-image: linear-gradient(top, #5bc0de, #2f96b4);
background-repeat: repeat-x;
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(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
@@ -2874,6 +3333,7 @@ button.close {
.btn-info.active,
.btn-info.disabled,
.btn-info[disabled] {
+ color: #ffffff;
background-color: #2f96b4;
*background-color: #2a85a0;
}
@@ -2884,18 +3344,19 @@ button.close {
}
.btn-inverse {
- background-color: #414141;
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #363636;
*background-color: #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: -moz-linear-gradient(top, #555555, #222222);
- background-image: linear-gradient(top, #555555, #222222);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
+ background-image: -webkit-linear-gradient(top, #444444, #222222);
+ background-image: -o-linear-gradient(top, #444444, #222222);
+ background-image: linear-gradient(to bottom, #444444, #222222);
+ background-image: -moz-linear-gradient(top, #444444, #222222);
background-repeat: repeat-x;
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(startColorstr='#555555', endColorstr='#222222', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
}
@@ -2904,6 +3365,7 @@ button.close {
.btn-inverse.active,
.btn-inverse.disabled,
.btn-inverse[disabled] {
+ color: #ffffff;
background-color: #222222;
*background-color: #151515;
}
@@ -2915,8 +3377,8 @@ button.close {
button.btn,
input[type="submit"].btn {
- *padding-top: 2px;
- *padding-bottom: 2px;
+ *padding-top: 3px;
+ *padding-bottom: 3px;
}
button.btn::-moz-focus-inner,
@@ -2943,20 +3405,42 @@ input[type="submit"].btn.btn-mini {
*padding-bottom: 1px;
}
-.btn-group {
- position: relative;
- *margin-left: .3em;
- *zoom: 1;
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+ background-color: transparent;
+ background-image: none;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
}
-.btn-group:before,
-.btn-group:after {
- display: table;
- content: "";
+.btn-link {
+ color: #0088cc;
+ cursor: pointer;
+ border-color: transparent;
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
}
-.btn-group:after {
- clear: both;
+.btn-link:hover {
+ color: #005580;
+ text-decoration: underline;
+ background-color: transparent;
+}
+
+.btn-link[disabled]:hover {
+ color: #333333;
+ text-decoration: none;
+}
+
+.btn-group {
+ position: relative;
+ *margin-left: .3em;
+ font-size: 0;
+ white-space: nowrap;
+ vertical-align: middle;
}
.btn-group:first-child {
@@ -2968,8 +3452,9 @@ input[type="submit"].btn.btn-mini {
}
.btn-toolbar {
- margin-top: 9px;
- margin-bottom: 9px;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ font-size: 0;
}
.btn-toolbar .btn-group {
@@ -2980,15 +3465,40 @@ input[type="submit"].btn.btn-mini {
*zoom: 1;
}
+.btn-toolbar .btn + .btn,
+.btn-toolbar .btn-group + .btn,
+.btn-toolbar .btn + .btn-group {
+ margin-left: 5px;
+}
+
.btn-group > .btn {
position: relative;
- float: left;
- margin-left: -1px;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
+.btn-group > .btn + .btn {
+ margin-left: -1px;
+}
+
+.btn-group > .btn,
+.btn-group > .dropdown-menu {
+ font-size: 14px;
+}
+
+.btn-group > .btn-mini {
+ font-size: 11px;
+}
+
+.btn-group > .btn-small {
+ font-size: 12px;
+}
+
+.btn-group > .btn-large {
+ font-size: 16px;
+}
+
.btn-group > .btn:first-child {
margin-left: 0;
-webkit-border-bottom-left-radius: 4px;
@@ -3041,28 +3551,32 @@ input[type="submit"].btn.btn-mini {
outline: 0;
}
-.btn-group > .dropdown-toggle {
- *padding-top: 4px;
+.btn-group > .btn + .dropdown-toggle {
+ *padding-top: 5px;
padding-right: 8px;
- *padding-bottom: 4px;
+ *padding-bottom: 5px;
padding-left: 8px;
-webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
}
-.btn-group > .btn-mini.dropdown-toggle {
+.btn-group > .btn-mini + .dropdown-toggle {
+ *padding-top: 2px;
padding-right: 5px;
+ *padding-bottom: 2px;
padding-left: 5px;
}
-.btn-group > .btn-small.dropdown-toggle {
- *padding-top: 4px;
+.btn-group > .btn-small + .dropdown-toggle {
+ *padding-top: 5px;
*padding-bottom: 4px;
}
-.btn-group > .btn-large.dropdown-toggle {
+.btn-group > .btn-large + .dropdown-toggle {
+ *padding-top: 7px;
padding-right: 12px;
+ *padding-bottom: 7px;
padding-left: 12px;
}
@@ -3078,7 +3592,7 @@ input[type="submit"].btn.btn-mini {
}
.btn-group.open .btn-primary.dropdown-toggle {
- background-color: #0055cc;
+ background-color: #0044cc;
}
.btn-group.open .btn-warning.dropdown-toggle {
@@ -3102,26 +3616,17 @@ input[type="submit"].btn.btn-mini {
}
.btn .caret {
- margin-top: 7px;
+ margin-top: 8px;
margin-left: 0;
}
-.btn:hover .caret,
-.open.btn-group .caret {
- opacity: 1;
- filter: alpha(opacity=100);
-}
-
-.btn-mini .caret {
- margin-top: 5px;
-}
-
-.btn-small .caret {
+.btn-mini .caret,
+.btn-small .caret,
+.btn-large .caret {
margin-top: 6px;
}
.btn-large .caret {
- margin-top: 6px;
border-top-width: 5px;
border-right-width: 5px;
border-left-width: 5px;
@@ -3140,13 +3645,57 @@ input[type="submit"].btn.btn-mini {
.btn-inverse .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
- opacity: 0.75;
- filter: alpha(opacity=75);
+}
+
+.btn-group-vertical {
+ display: inline-block;
+ *display: inline;
+ /* IE7 inline-block hack */
+
+ *zoom: 1;
+}
+
+.btn-group-vertical .btn {
+ display: block;
+ float: none;
+ width: 100%;
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
+}
+
+.btn-group-vertical .btn + .btn {
+ margin-top: -1px;
+ margin-left: 0;
+}
+
+.btn-group-vertical .btn:first-child {
+ -webkit-border-radius: 4px 4px 0 0;
+ -moz-border-radius: 4px 4px 0 0;
+ border-radius: 4px 4px 0 0;
+}
+
+.btn-group-vertical .btn:last-child {
+ -webkit-border-radius: 0 0 4px 4px;
+ -moz-border-radius: 0 0 4px 4px;
+ border-radius: 0 0 4px 4px;
+}
+
+.btn-group-vertical .btn-large:first-child {
+ -webkit-border-radius: 6px 6px 0 0;
+ -moz-border-radius: 6px 6px 0 0;
+ border-radius: 6px 6px 0 0;
+}
+
+.btn-group-vertical .btn-large:last-child {
+ -webkit-border-radius: 0 0 6px 6px;
+ -moz-border-radius: 0 0 6px 6px;
+ border-radius: 0 0 6px 6px;
}
.alert {
padding: 8px 35px 8px 14px;
- margin-bottom: 18px;
+ margin-bottom: 20px;
color: #c09853;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3;
@@ -3156,15 +3705,15 @@ input[type="submit"].btn.btn-mini {
border-radius: 4px;
}
-.alert-heading {
- color: inherit;
+.alert h4 {
+ margin: 0;
}
.alert .close {
position: relative;
top: -2px;
right: -21px;
- line-height: 18px;
+ line-height: 20px;
}
.alert-success {
@@ -3201,7 +3750,7 @@ input[type="submit"].btn.btn-mini {
}
.nav {
- margin-bottom: 18px;
+ margin-bottom: 20px;
margin-left: 0;
list-style: none;
}
@@ -3219,12 +3768,12 @@ input[type="submit"].btn.btn-mini {
float: right;
}
-.nav .nav-header {
+.nav-header {
display: block;
padding: 3px 15px;
font-size: 11px;
font-weight: bold;
- line-height: 18px;
+ line-height: 20px;
color: #999999;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
text-transform: uppercase;
@@ -3265,7 +3814,7 @@ input[type="submit"].btn.btn-mini {
.nav-list .divider {
*width: 100%;
height: 1px;
- margin: 8px 1px;
+ margin: 9px 1px;
*margin: -5px 0 5px;
overflow: hidden;
background-color: #e5e5e5;
@@ -3282,6 +3831,7 @@ input[type="submit"].btn.btn-mini {
.nav-tabs:after,
.nav-pills:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -3314,7 +3864,7 @@ input[type="submit"].btn.btn-mini {
.nav-tabs > li > a {
padding-top: 8px;
padding-bottom: 8px;
- line-height: 18px;
+ line-height: 20px;
border: 1px solid transparent;
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
@@ -3370,15 +3920,21 @@ input[type="submit"].btn.btn-mini {
}
.nav-tabs.nav-stacked > li:first-child > a {
- -webkit-border-radius: 4px 4px 0 0;
- -moz-border-radius: 4px 4px 0 0;
- border-radius: 4px 4px 0 0;
+ -webkit-border-top-right-radius: 4px;
+ border-top-right-radius: 4px;
+ -webkit-border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
+ -moz-border-radius-topright: 4px;
+ -moz-border-radius-topleft: 4px;
}
.nav-tabs.nav-stacked > li:last-child > a {
- -webkit-border-radius: 0 0 4px 4px;
- -moz-border-radius: 0 0 4px 4px;
- border-radius: 0 0 4px 4px;
+ -webkit-border-bottom-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ -webkit-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ -moz-border-radius-bottomright: 4px;
+ -moz-border-radius-bottomleft: 4px;
}
.nav-tabs.nav-stacked > li > a:hover {
@@ -3395,38 +3951,45 @@ input[type="submit"].btn.btn-mini {
}
.nav-tabs .dropdown-menu {
- -webkit-border-radius: 0 0 5px 5px;
- -moz-border-radius: 0 0 5px 5px;
- border-radius: 0 0 5px 5px;
+ -webkit-border-radius: 0 0 6px 6px;
+ -moz-border-radius: 0 0 6px 6px;
+ border-radius: 0 0 6px 6px;
}
.nav-pills .dropdown-menu {
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
}
-.nav-tabs .dropdown-toggle .caret,
-.nav-pills .dropdown-toggle .caret {
+.nav .dropdown-toggle .caret {
margin-top: 6px;
border-top-color: #0088cc;
border-bottom-color: #0088cc;
}
-.nav-tabs .dropdown-toggle:hover .caret,
-.nav-pills .dropdown-toggle:hover .caret {
+.nav .dropdown-toggle:hover .caret {
border-top-color: #005580;
border-bottom-color: #005580;
}
-.nav-tabs .active .dropdown-toggle .caret,
-.nav-pills .active .dropdown-toggle .caret {
- border-top-color: #333333;
- border-bottom-color: #333333;
+/* move down carets for tabs */
+
+.nav-tabs .dropdown-toggle .caret {
+ margin-top: 8px;
+}
+
+.nav .active .dropdown-toggle .caret {
+ border-top-color: #fff;
+ border-bottom-color: #fff;
+}
+
+.nav-tabs .active .dropdown-toggle .caret {
+ border-top-color: #555555;
+ border-bottom-color: #555555;
}
.nav > .dropdown.active > a:hover {
- color: #000000;
cursor: pointer;
}
@@ -3458,6 +4021,7 @@ input[type="submit"].btn.btn-mini {
.tabbable:before,
.tabbable:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -3568,72 +4132,98 @@ input[type="submit"].btn.btn-mini {
*border-left-color: #ffffff;
}
+.nav > .disabled > a {
+ color: #999999;
+}
+
+.nav > .disabled > a:hover {
+ text-decoration: none;
+ cursor: default;
+ background-color: transparent;
+}
+
.navbar {
*position: relative;
*z-index: 2;
- margin-bottom: 18px;
+ margin-bottom: 20px;
overflow: visible;
+ color: #777777;
}
.navbar-inner {
min-height: 40px;
padding-right: 20px;
padding-left: 20px;
- background-color: #2c2c2c;
- background-image: -moz-linear-gradient(top, #333333, #222222);
- background-image: -ms-linear-gradient(top, #333333, #222222);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
- background-image: -webkit-linear-gradient(top, #333333, #222222);
- background-image: -o-linear-gradient(top, #333333, #222222);
- background-image: linear-gradient(top, #333333, #222222);
+ background-color: #fafafa;
+ background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
+ background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+ background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+ background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
background-repeat: repeat-x;
+ border: 1px solid #d4d4d4;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
- -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+ *zoom: 1;
+ -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+ -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
}
-.navbar .container {
- width: auto;
+.navbar-inner:before,
+.navbar-inner:after {
+ display: table;
+ line-height: 0;
+ content: "";
}
-.nav-collapse.collapse {
- height: auto;
+.navbar-inner:after {
+ clear: both;
}
-.navbar {
- color: #999999;
+.navbar .container {
+ width: auto;
}
-.navbar .brand:hover {
- text-decoration: none;
+.nav-collapse.collapse {
+ height: auto;
}
.navbar .brand {
display: block;
float: left;
- padding: 8px 20px 12px;
+ padding: 10px 20px 10px;
margin-left: -20px;
font-size: 20px;
font-weight: 200;
- line-height: 1;
- color: #999999;
+ color: #777777;
+ text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .brand:hover {
+ text-decoration: none;
}
-.navbar .navbar-text {
+.navbar-text {
margin-bottom: 0;
line-height: 40px;
}
-.navbar .navbar-link {
- color: #999999;
+.navbar-link {
+ color: #777777;
}
-.navbar .navbar-link:hover {
- color: #ffffff;
+.navbar-link:hover {
+ color: #333333;
+}
+
+.navbar .divider-vertical {
+ height: 40px;
+ margin: 0 9px;
+ border-right: 1px solid #ffffff;
+ border-left: 1px solid #f2f2f2;
}
.navbar .btn,
@@ -3641,8 +4231,10 @@ input[type="submit"].btn.btn-mini {
margin-top: 5px;
}
-.navbar .btn-group .btn {
- margin: 0;
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn {
+ margin-top: 0;
}
.navbar-form {
@@ -3653,6 +4245,7 @@ input[type="submit"].btn.btn-mini {
.navbar-form:before,
.navbar-form:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -3668,7 +4261,8 @@ input[type="submit"].btn.btn-mini {
}
.navbar-form input,
-.navbar-form select {
+.navbar-form select,
+.navbar-form .btn {
display: inline-block;
margin-bottom: 0;
}
@@ -3693,52 +4287,32 @@ input[type="submit"].btn.btn-mini {
.navbar-search {
position: relative;
float: left;
- margin-top: 6px;
+ margin-top: 5px;
margin-bottom: 0;
}
.navbar-search .search-query {
- padding: 4px 9px;
+ padding: 4px 14px;
+ margin-bottom: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
font-weight: normal;
line-height: 1;
- color: #ffffff;
- background-color: #626262;
- border: 1px solid #151515;
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
- -webkit-transition: none;
- -moz-transition: none;
- -ms-transition: none;
- -o-transition: none;
- transition: none;
-}
-
-.navbar-search .search-query:-moz-placeholder {
- color: #cccccc;
-}
-
-.navbar-search .search-query:-ms-input-placeholder {
- color: #cccccc;
+ -webkit-border-radius: 15px;
+ -moz-border-radius: 15px;
+ border-radius: 15px;
}
-.navbar-search .search-query::-webkit-input-placeholder {
- color: #cccccc;
+.navbar-static-top {
+ position: static;
+ width: 100%;
+ margin-bottom: 0;
}
-.navbar-search .search-query:focus,
-.navbar-search .search-query.focused {
- padding: 5px 10px;
- color: #333333;
- text-shadow: 0 1px 0 #ffffff;
- background-color: #ffffff;
- border: 0;
- outline: 0;
- -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
- -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
- box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+.navbar-static-top .navbar-inner {
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
}
.navbar-fixed-top,
@@ -3751,6 +4325,15 @@ input[type="submit"].btn.btn-mini {
}
.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+ border-width: 0 0 1px;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+ border-width: 1px 0 0;
+}
+
+.navbar-fixed-top .navbar-inner,
.navbar-fixed-bottom .navbar-inner {
padding-right: 0;
padding-left: 0;
@@ -3759,6 +4342,7 @@ input[type="submit"].btn.btn-mini {
border-radius: 0;
}
+.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 940px;
@@ -3768,10 +4352,23 @@ input[type="submit"].btn.btn-mini {
top: 0;
}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+ -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+ -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+ box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+}
+
.navbar-fixed-bottom {
bottom: 0;
}
+.navbar-fixed-bottom .navbar-inner {
+ -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
+ -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
+ box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
+}
+
.navbar .nav {
position: relative;
left: 0;
@@ -3782,59 +4379,41 @@ input[type="submit"].btn.btn-mini {
.navbar .nav.pull-right {
float: right;
+ margin-right: 0;
}
.navbar .nav > li {
- display: block;
float: left;
}
.navbar .nav > li > a {
float: none;
- padding: 9px 10px 11px;
- line-height: 19px;
- color: #999999;
+ padding: 10px 15px 10px;
+ color: #777777;
text-decoration: none;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.navbar .btn {
- display: inline-block;
- padding: 4px 10px 4px;
- margin: 5px 5px 6px;
- line-height: 18px;
+ text-shadow: 0 1px 0 #ffffff;
}
-.navbar .btn-group {
- padding: 5px 5px 6px;
- margin: 0;
+.navbar .nav .dropdown-toggle .caret {
+ margin-top: 8px;
}
+.navbar .nav > li > a:focus,
.navbar .nav > li > a:hover {
- color: #ffffff;
+ color: #333333;
text-decoration: none;
background-color: transparent;
}
-.navbar .nav .active > a,
-.navbar .nav .active > a:hover {
- color: #ffffff;
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+ color: #555555;
text-decoration: none;
- background-color: #222222;
-}
-
-.navbar .divider-vertical {
- width: 1px;
- height: 40px;
- margin: 0 9px;
- overflow: hidden;
- background-color: #222222;
- border-right: 1px solid #333333;
-}
-
-.navbar .nav.pull-right {
- margin-right: 0;
- margin-left: 10px;
+ background-color: #e5e5e5;
+ -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+ -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+ box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
}
.navbar .btn-navbar {
@@ -3843,18 +4422,19 @@ input[type="submit"].btn.btn-mini {
padding: 7px 10px;
margin-right: 5px;
margin-left: 5px;
- background-color: #2c2c2c;
- *background-color: #222222;
- background-image: -ms-linear-gradient(top, #333333, #222222);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
- background-image: -webkit-linear-gradient(top, #333333, #222222);
- background-image: -o-linear-gradient(top, #333333, #222222);
- background-image: linear-gradient(top, #333333, #222222);
- background-image: -moz-linear-gradient(top, #333333, #222222);
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #ededed;
+ *background-color: #e5e5e5;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
+ background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
+ background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
+ background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
+ background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
background-repeat: repeat-x;
- border-color: #222222 #222222 #000000;
+ border-color: #e5e5e5 #e5e5e5 #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(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
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);
@@ -3866,13 +4446,14 @@ input[type="submit"].btn.btn-mini {
.navbar .btn-navbar.active,
.navbar .btn-navbar.disabled,
.navbar .btn-navbar[disabled] {
- background-color: #222222;
- *background-color: #151515;
+ color: #ffffff;
+ background-color: #e5e5e5;
+ *background-color: #d9d9d9;
}
.navbar .btn-navbar:active,
.navbar .btn-navbar.active {
- background-color: #080808 \9;
+ background-color: #cccccc \9;
}
.navbar .btn-navbar .icon-bar {
@@ -3892,7 +4473,7 @@ input[type="submit"].btn.btn-mini {
margin-top: 3px;
}
-.navbar .dropdown-menu:before {
+.navbar .nav > li > .dropdown-menu:before {
position: absolute;
top: -7px;
left: 9px;
@@ -3904,7 +4485,7 @@ input[type="submit"].btn.btn-mini {
content: '';
}
-.navbar .dropdown-menu:after {
+.navbar .nav > li > .dropdown-menu:after {
position: absolute;
top: -6px;
left: 10px;
@@ -3915,80 +4496,219 @@ input[type="submit"].btn.btn-mini {
content: '';
}
-.navbar-fixed-bottom .dropdown-menu:before {
- top: auto;
- bottom: -7px;
- border-top: 7px solid #ccc;
- border-bottom: 0;
- border-top-color: rgba(0, 0, 0, 0.2);
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+ top: auto;
+ bottom: -7px;
+ border-top: 7px solid #ccc;
+ border-bottom: 0;
+ border-top-color: rgba(0, 0, 0, 0.2);
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+ top: auto;
+ bottom: -6px;
+ border-top: 6px solid #ffffff;
+ border-bottom: 0;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+ color: #555555;
+ background-color: #e5e5e5;
+}
+
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+ border-top-color: #777777;
+ border-bottom-color: #777777;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+ border-top-color: #555555;
+ border-bottom-color: #555555;
+}
+
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+ right: 0;
+ left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+ right: 12px;
+ left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+ right: 13px;
+ left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+ right: 100%;
+ left: auto;
+ margin-right: -1px;
+ margin-left: 0;
+ -webkit-border-radius: 6px 0 6px 6px;
+ -moz-border-radius: 6px 0 6px 6px;
+ border-radius: 6px 0 6px 6px;
+}
+
+.navbar-inverse {
+ color: #999999;
+}
+
+.navbar-inverse .navbar-inner {
+ background-color: #1b1b1b;
+ background-image: -moz-linear-gradient(top, #222222, #111111);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
+ background-image: -webkit-linear-gradient(top, #222222, #111111);
+ background-image: -o-linear-gradient(top, #222222, #111111);
+ background-image: linear-gradient(to bottom, #222222, #111111);
+ background-repeat: repeat-x;
+ border-color: #252525;
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+}
+
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+ color: #999999;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-inverse .brand:hover,
+.navbar-inverse .nav > li > a:hover {
+ color: #ffffff;
+}
+
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+ color: #ffffff;
+ background-color: transparent;
+}
+
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+ color: #ffffff;
+ background-color: #111111;
+}
+
+.navbar-inverse .navbar-link {
+ color: #999999;
+}
+
+.navbar-inverse .navbar-link:hover {
+ color: #ffffff;
}
-.navbar-fixed-bottom .dropdown-menu:after {
- top: auto;
- bottom: -6px;
- border-top: 6px solid #ffffff;
- border-bottom: 0;
+.navbar-inverse .divider-vertical {
+ border-right-color: #222222;
+ border-left-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+ color: #ffffff;
+ background-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+ border-top-color: #999999;
+ border-bottom-color: #999999;
}
-.navbar .nav li.dropdown .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open .caret {
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}
-.navbar .nav li.dropdown.active .caret {
- opacity: 1;
- filter: alpha(opacity=100);
+.navbar-inverse .navbar-search .search-query {
+ color: #ffffff;
+ background-color: #515151;
+ border-color: #111111;
+ -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+ -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+ -webkit-transition: none;
+ -moz-transition: none;
+ -o-transition: none;
+ transition: none;
}
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle {
- background-color: transparent;
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+ color: #cccccc;
}
-.navbar .nav li.dropdown.active > .dropdown-toggle:hover {
- color: #ffffff;
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+ color: #cccccc;
}
-.navbar .pull-right .dropdown-menu,
-.navbar .dropdown-menu.pull-right {
- right: 0;
- left: auto;
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+ color: #cccccc;
}
-.navbar .pull-right .dropdown-menu:before,
-.navbar .dropdown-menu.pull-right:before {
- right: 12px;
- left: auto;
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+ padding: 5px 15px;
+ color: #333333;
+ text-shadow: 0 1px 0 #ffffff;
+ background-color: #ffffff;
+ border: 0;
+ outline: 0;
+ -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+ -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+ box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
}
-.navbar .pull-right .dropdown-menu:after,
-.navbar .dropdown-menu.pull-right:after {
- right: 13px;
- left: auto;
+.navbar-inverse .btn-navbar {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #0e0e0e;
+ *background-color: #040404;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
+ background-image: -webkit-linear-gradient(top, #151515, #040404);
+ background-image: -o-linear-gradient(top, #151515, #040404);
+ background-image: linear-gradient(to bottom, #151515, #040404);
+ background-image: -moz-linear-gradient(top, #151515, #040404);
+ background-repeat: repeat-x;
+ border-color: #040404 #040404 #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(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+ color: #ffffff;
+ background-color: #040404;
+ *background-color: #000000;
+}
+
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+ background-color: #000000 \9;
}
.breadcrumb {
- padding: 7px 14px;
- margin: 0 0 18px;
+ padding: 8px 15px;
+ margin: 0 0 20px;
list-style: none;
- background-color: #fbfbfb;
- background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
- background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
- background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
- background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
- background-image: linear-gradient(top, #ffffff, #f5f5f5);
- background-repeat: repeat-x;
- border: 1px solid #ddd;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
- -webkit-box-shadow: inset 0 1px 0 #ffffff;
- -moz-box-shadow: inset 0 1px 0 #ffffff;
- box-shadow: inset 0 1px 0 #ffffff;
+ background-color: #f5f5f5;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
}
.breadcrumb li {
@@ -4000,16 +4720,16 @@ input[type="submit"].btn.btn-mini {
.breadcrumb .divider {
padding: 0 5px;
- color: #999999;
+ color: #ccc;
}
-.breadcrumb .active a {
- color: #333333;
+.breadcrumb .active {
+ color: #999999;
}
.pagination {
- height: 36px;
- margin: 18px 0;
+ height: 40px;
+ margin: 20px 0;
}
.pagination ul {
@@ -4026,45 +4746,51 @@ input[type="submit"].btn.btn-mini {
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
-.pagination li {
+.pagination ul > li {
display: inline;
}
-.pagination a {
+.pagination ul > li > a,
+.pagination ul > li > span {
float: left;
padding: 0 14px;
- line-height: 34px;
+ line-height: 38px;
text-decoration: none;
- border: 1px solid #ddd;
+ background-color: #ffffff;
+ border: 1px solid #dddddd;
border-left-width: 0;
}
-.pagination a:hover,
-.pagination .active a {
+.pagination ul > li > a:hover,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
background-color: #f5f5f5;
}
-.pagination .active a {
+.pagination ul > .active > a,
+.pagination ul > .active > span {
color: #999999;
cursor: default;
}
-.pagination .disabled span,
-.pagination .disabled a,
-.pagination .disabled a:hover {
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover {
color: #999999;
cursor: default;
background-color: transparent;
}
-.pagination li:first-child a {
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
border-left-width: 1px;
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
}
-.pagination li:last-child a {
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
@@ -4079,8 +4805,7 @@ input[type="submit"].btn.btn-mini {
}
.pager {
- margin-bottom: 18px;
- margin-left: 0;
+ margin: 20px 0;
text-align: center;
list-style: none;
*zoom: 1;
@@ -4089,6 +4814,7 @@ input[type="submit"].btn.btn-mini {
.pager:before,
.pager:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -4100,7 +4826,8 @@ input[type="submit"].btn.btn-mini {
display: inline;
}
-.pager a {
+.pager a,
+.pager span {
display: inline-block;
padding: 5px 14px;
background-color: #fff;
@@ -4115,7 +4842,8 @@ input[type="submit"].btn.btn-mini {
background-color: #f5f5f5;
}
-.pager .next a {
+.pager .next a,
+.pager .next span {
float: right;
}
@@ -4124,26 +4852,27 @@ input[type="submit"].btn.btn-mini {
}
.pager .disabled a,
-.pager .disabled a:hover {
+.pager .disabled a:hover,
+.pager .disabled span {
color: #999999;
cursor: default;
background-color: #fff;
}
-.modal-open .dropdown-menu {
+.modal-open .modal .dropdown-menu {
z-index: 2050;
}
-.modal-open .dropdown.open {
+.modal-open .modal .dropdown.open {
*z-index: 2050;
}
-.modal-open .popover {
+.modal-open .modal .popover {
z-index: 2060;
}
-.modal-open .tooltip {
- z-index: 2070;
+.modal-open .modal .tooltip {
+ z-index: 2080;
}
.modal-backdrop {
@@ -4193,7 +4922,6 @@ input[type="submit"].btn.btn-mini {
top: -25%;
-webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
-moz-transition: opacity 0.3s linear, top 0.3s ease-out;
- -ms-transition: opacity 0.3s linear, top 0.3s ease-out;
-o-transition: opacity 0.3s linear, top 0.3s ease-out;
transition: opacity 0.3s linear, top 0.3s ease-out;
}
@@ -4211,6 +4939,11 @@ input[type="submit"].btn.btn-mini {
margin-top: 2px;
}
+.modal-header h3 {
+ margin: 0;
+ line-height: 30px;
+}
+
.modal-body {
max-height: 400px;
padding: 15px;
@@ -4239,6 +4972,7 @@ input[type="submit"].btn.btn-mini {
.modal-footer:before,
.modal-footer:after {
display: table;
+ line-height: 0;
content: "";
}
@@ -4257,7 +4991,7 @@ input[type="submit"].btn.btn-mini {
.tooltip {
position: absolute;
- z-index: 1020;
+ z-index: 1030;
display: block;
padding: 5px;
font-size: 11px;
@@ -4272,55 +5006,19 @@ input[type="submit"].btn.btn-mini {
}
.tooltip.top {
- margin-top: -2px;
+ margin-top: -3px;
}
.tooltip.right {
- margin-left: 2px;
+ margin-left: 3px;
}
.tooltip.bottom {
- margin-top: 2px;
+ margin-top: 3px;
}
.tooltip.left {
- margin-left: -2px;
-}
-
-.tooltip.top .tooltip-arrow {
- bottom: 0;
- left: 50%;
- margin-left: -5px;
- border-top: 5px solid #000000;
- border-right: 5px solid transparent;
- border-left: 5px solid transparent;
-}
-
-.tooltip.left .tooltip-arrow {
- top: 50%;
- right: 0;
- margin-top: -5px;
- border-top: 5px solid transparent;
- border-bottom: 5px solid transparent;
- border-left: 5px solid #000000;
-}
-
-.tooltip.bottom .tooltip-arrow {
- top: 0;
- left: 50%;
- margin-left: -5px;
- border-right: 5px solid transparent;
- border-bottom: 5px solid #000000;
[... 610 lines stripped ...]