diff options
Diffstat (limited to 'spacelab/bootstrap.css')
| -rw-r--r-- | spacelab/bootstrap.css | 2095 |
1 files changed, 1337 insertions, 758 deletions
diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css index 16260691..7a7b092c 100644 --- a/spacelab/bootstrap.css +++ b/spacelab/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.0.4 + * Bootstrap v2.1.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -58,6 +58,7 @@ sub { } img { max-width: 100%; + height: auto; vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; @@ -111,6 +112,7 @@ textarea { .clearfix:after { display: table; content: ""; + line-height: 0; } .clearfix:after { clear: both; @@ -125,17 +127,16 @@ 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; } @@ -147,6 +148,25 @@ a:hover { color: #4183c4; 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; @@ -155,6 +175,7 @@ a:hover { .row:after { display: table; content: ""; + line-height: 0; } .row:after { clear: both; @@ -164,6 +185,7 @@ a:hover { margin-left: 20px; } .container, +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -248,6 +270,7 @@ a:hover { .row-fluid:after { display: table; content: ""; + line-height: 0; } .row-fluid:after { clear: both; @@ -255,65 +278,168 @@ a:hover { .row-fluid [class*="span"] { 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; float: left; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; + margin-left: 2.127659574468085%; + *margin-left: 2.074468085106383%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } .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 { margin-right: auto; @@ -324,6 +450,7 @@ a:hover { .container:after { display: table; content: ""; + line-height: 0; } .container:after { clear: both; @@ -337,22 +464,34 @@ a:hover { .container-fluid:after { display: table; content: ""; + line-height: 0; } .container-fluid:after { clear: both; } p { - margin: 0 0 9px; -} -p small { - font-size: 11px; - color: #999999; + margin: 0 0 10px; } .lead { - margin-bottom: 18px; + margin-bottom: 20px; font-size: 20px; font-weight: 200; - line-height: 27px; + line-height: 30px; +} +small { + font-size: 85%; +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} +.muted { + color: #999999; } h1, h2, @@ -360,9 +499,10 @@ h3, h4, h5, h6 { - margin: 0; + margin: 10px 0; font-family: inherit; font-weight: bold; + line-height: 1; color: inherit; text-rendering: optimizelegibility; } @@ -373,60 +513,54 @@ 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; -} -h2 small { - font-size: 18px; + font-size: 30px; + line-height: 40px; } h3 { + font-size: 24px; + line-height: 40px; +} +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; - border-bottom: 1px solid #f5f5f5; -} -.page-header h1 { - line-height: 1; + padding-bottom: 9px; + margin: 20px 0 30px; + border-bottom: 1px solid #dddddd; } ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, ul ol, @@ -434,14 +568,8 @@ ol ol, ol ul { margin-bottom: 0; } -ul { - list-style: disc; -} -ol { - list-style: decimal; -} li { - line-height: 18px; + line-height: 20px; } ul.unstyled, ol.unstyled { @@ -449,18 +577,17 @@ ol.unstyled { list-style: none; } 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 dt { float: left; @@ -475,20 +602,11 @@ dd { margin-left: 130px; } hr { - margin: 18px 0; + margin: 20px 0; border: 0; - border-top: 1px solid #f5f5f5; + border-top: 1px solid #dddddd; 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; @@ -499,18 +617,18 @@ abbr.initialism { } blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; - border-left: 5px solid #f5f5f5; + margin: 0 0 20px; + border-left: 5px solid #dddddd; } 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; } blockquote small:before { @@ -520,13 +638,19 @@ blockquote.pull-right { float: right; padding-right: 15px; padding-left: 0; - border-right: 5px solid #f5f5f5; + border-right: 5px solid #dddddd; border-left: 0; } blockquote.pull-right p, 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, @@ -535,15 +659,9 @@ 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 { @@ -563,10 +681,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; @@ -579,7 +697,7 @@ pre { border-radius: 4px; } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { padding: 0; @@ -592,7 +710,7 @@ pre code { overflow-y: scroll; } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { padding: 0; @@ -603,15 +721,15 @@ 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; } label, @@ -619,9 +737,9 @@ input, button, select, textarea { - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, button, @@ -651,12 +769,15 @@ 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 { @@ -683,17 +804,13 @@ 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; + -webkit-transition: border linear .2s, box-shadow linear .2s; + -moz-transition: border linear .2s, box-shadow linear .2s; + -o-transition: border linear .2s, box-shadow linear .2s; + transition: border linear .2s, box-shadow linear .2s; } textarea:focus, input[type="text"]:focus, @@ -722,13 +839,18 @@ input[type="color"]:focus, } input[type="radio"], input[type="checkbox"] { - margin: 3px 0; + margin: 4px 0 0; *margin-top: 0; /* IE7 */ + margin-top: 1px \9; + /* IE8-9 */ + line-height: normal; cursor: pointer; } +input[type="file"], +input[type="image"], input[type="submit"], input[type="reset"], input[type="button"], @@ -736,23 +858,20 @@ input[type="radio"], 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; } select[multiple], select[size] { @@ -766,6 +885,36 @@ input[type="checkbox"]:focus { outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } +.uneditable-input, +.uneditable-textarea { + color: #999999; + 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); + cursor: not-allowed; +} +.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; @@ -824,6 +973,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; @@ -833,41 +986,59 @@ textarea, .uneditable-input { 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; + content: ""; + line-height: 0; +} +.controls-row:after { + clear: both; +} +.controls-row [class*="span"] { + float: left; } input[disabled], select[disabled], @@ -876,8 +1047,7 @@ input[readonly], select[readonly], textarea[readonly] { cursor: not-allowed; - background-color: #f5f5f5; - border-color: #ddd; + background-color: #dddddd; } input[type="radio"][disabled], input[type="checkbox"][disabled], @@ -897,6 +1067,9 @@ input[type="checkbox"][readonly] { .control-group.warning textarea { color: #393939; border-color: #393939; + -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, @@ -904,9 +1077,9 @@ input[type="checkbox"][readonly] { .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #202020; - -webkit-box-shadow: 0 0 6px #6c6c6c; - -moz-box-shadow: 0 0 6px #6c6c6c; - box-shadow: 0 0 6px #6c6c6c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -926,6 +1099,9 @@ input[type="checkbox"][readonly] { .control-group.error textarea { color: #393939; border-color: #393939; + -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, @@ -933,9 +1109,9 @@ input[type="checkbox"][readonly] { .control-group.error select:focus, .control-group.error textarea:focus { border-color: #202020; - -webkit-box-shadow: 0 0 6px #6c6c6c; - -moz-box-shadow: 0 0 6px #6c6c6c; - box-shadow: 0 0 6px #6c6c6c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -955,6 +1131,9 @@ input[type="checkbox"][readonly] { .control-group.success textarea { color: #333333; border-color: #333333; + -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, @@ -962,9 +1141,9 @@ input[type="checkbox"][readonly] { .control-group.success select:focus, .control-group.success textarea:focus { border-color: #1a1a1a; - -webkit-box-shadow: 0 0 6px #666666; - -moz-box-shadow: 0 0 6px #666666; - box-shadow: 0 0 6px #666666; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #666666; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #666666; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #666666; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -987,9 +1166,9 @@ select:focus:required:invalid:focus { box-shadow: 0 0 6px #f8b9b7; } .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; @@ -998,36 +1177,18 @@ select:focus:required:invalid:focus { .form-actions:after { display: table; content: ""; + line-height: 0; } .form-actions:after { 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 { display: inline-block; @@ -1038,62 +1199,62 @@ select:focus:required:invalid:focus { vertical-align: middle; padding-left: 5px; } -.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: #f5f5f5; + background-color: #dddddd; border: 1px solid #ccc; } -.input-prepend .add-on, .input-append .add-on, -.input-prepend .btn, -.input-append .btn { +.input-prepend .add-on, +.input-append .btn, +.input-prepend .btn { margin-left: -1px; + 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: #fafefa; border-color: #84de81; } @@ -1114,10 +1275,6 @@ select:focus:required:invalid:focus { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; -} .input-append .add-on:last-child, .input-append .btn:last-child { -webkit-border-radius: 0 3px 3px 0; @@ -1145,7 +1302,7 @@ select:focus:required:invalid:focus { -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.search-query { +input.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; @@ -1153,9 +1310,36 @@ 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, .form-inline input, @@ -1184,6 +1368,7 @@ select:focus:required:invalid:focus { *zoom: 1; margin-bottom: 0; + vertical-align: middle; } .form-search .hide, .form-inline .hide, @@ -1191,7 +1376,9 @@ select:focus:required:invalid:focus { display: none; } .form-search label, -.form-inline label { +.form-inline label, +.form-search .btn-group, +.form-inline .btn-group { display: inline-block; } .form-search .input-append, @@ -1217,20 +1404,21 @@ select:focus:required:invalid:focus { margin-left: 0; } .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; content: ""; + line-height: 0; } .form-horizontal .control-group:after { clear: both; @@ -1251,7 +1439,7 @@ legend + .control-group { *padding-left: 160px; } .form-horizontal .help-block { - margin-top: 9px; + margin-top: 10px; margin-bottom: 0; } .form-horizontal .form-actions { @@ -1265,12 +1453,12 @@ 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; @@ -1299,7 +1487,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; @@ -1333,7 +1521,8 @@ table { -moz-border-radius-topright: 4px; } .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; @@ -1342,19 +1531,42 @@ table { -moz-border-radius-bottomleft: 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 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-right-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 [class*=span], +.row-fluid table [class*=span] { + display: table-cell; + float: none; + margin-left: 0; +} table .span1 { float: none; width: 44px; @@ -1475,6 +1687,15 @@ table .span24 { width: 1884px; margin-left: 0; } +.table tbody tr.success td { + background-color: #bedebe; +} +.table tbody tr.error td { + background-color: #ffe9e9; +} +.table tbody tr.info td { + background-color: #e4f0ff; +} [class^="icon-"], [class*=" icon-"] { display: inline-block; @@ -1486,12 +1707,16 @@ table .span24 { background-image: url("../img/glyphicons-halflings.png"); background-position: 14px 14px; background-repeat: no-repeat; + margin-top: 1px; } -[class^="icon-"]:last-child, -[class*=" icon-"]:last-child { - *margin-left: 0; -} -.icon-white { +/* White icons with optional class, or on hover/active states of certain elements */ +.icon-white, +.nav > .active > a > [class^="icon-"], +.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"); } .icon-glass { @@ -1823,6 +2048,7 @@ table .span24 { } .icon-random { background-position: -216px -120px; + width: 16px; } .icon-comment { background-position: -240px -120px; @@ -1847,6 +2073,7 @@ table .span24 { } .icon-folder-open { background-position: -408px -120px; + width: 16px; } .icon-resize-vertical { background-position: -432px -119px; @@ -1934,18 +2161,11 @@ table .span24 { border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; - opacity: 0.3; - filter: alpha(opacity=30); } .dropdown .caret { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} .dropdown-menu { position: absolute; top: 100%; @@ -1954,17 +2174,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); @@ -1979,7 +2199,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; @@ -1987,19 +2207,51 @@ 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 { + text-decoration: none; + color: #ffffff; + background-color: #4183c4; + background-color: #3d7ebd; + background-image: -moz-linear-gradient(top, #4183c4, #3876b4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4183c4), to(#3876b4)); + background-image: -webkit-linear-gradient(top, #4183c4, #3876b4); + background-image: -o-linear-gradient(top, #4183c4, #3876b4); + background-image: linear-gradient(to bottom, #4183c4, #3876b4); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4183c4', endColorstr='#ff3876b4', GradientType=0); +} .dropdown-menu .active > a, .dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; + outline: 0; background-color: #4183c4; + background-color: #3d7ebd; + background-image: -moz-linear-gradient(top, #4183c4, #3876b4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4183c4), to(#3876b4)); + background-image: -webkit-linear-gradient(top, #4183c4, #3876b4); + background-image: -o-linear-gradient(top, #4183c4, #3876b4); + background-image: linear-gradient(to bottom, #4183c4, #3876b4); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4183c4', endColorstr='#ff3876b4', GradientType=0); +} +.dropdown-menu .disabled > a, +.dropdown-menu .disabled > a:hover { + color: #999999; +} +.dropdown-menu .disabled > a:hover { + text-decoration: none; + background-color: transparent; + cursor: default; } .open { *z-index: 1000; @@ -2023,6 +2275,41 @@ table .span24 { bottom: 100%; margin-bottom: 1px; } +.dropdown-submenu { + position: relative; +} +.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; + content: " "; + float: right; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 0 5px 5px; + border-left-color: #cccccc; + margin-top: 5px; + margin-right: -10px; +} +.dropdown-submenu:hover > a:after { + border-left-color: #ffffff; +} +.dropdown .dropdown-menu .nav-header { + padding-left: 20px; + padding-right: 20px; +} .typeahead { margin-top: 2px; -webkit-border-radius: 4px; @@ -2034,8 +2321,7 @@ table .span24 { padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); + border: 1px solid #e3e3e3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -2063,7 +2349,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; } @@ -2074,9 +2359,9 @@ table .span24 { position: relative; height: 0; overflow: hidden; + overflow: visible \9; -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; } @@ -2087,7 +2372,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; @@ -2113,25 +2398,24 @@ button.close { /* IE7 inline-block hack */ *zoom: 1; - padding: 4px 10px 4px; + padding: 4px 14px; margin-bottom: 0; - font-size: 13px; - line-height: 18px; + font-size: 14px; + line-height: 20px; *line-height: 20px; - color: #333333; text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); 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-image: linear-gradient(to bottom, #ffffff, #e6e6e6); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); 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); *background-color: #e6e6e6; @@ -2154,6 +2438,7 @@ button.close { .btn.active, .btn.disabled, .btn[disabled] { + color: #333333; background-color: #e6e6e6; *background-color: #d9d9d9; } @@ -2174,7 +2459,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; } @@ -2206,42 +2490,39 @@ button.close { } .btn-large { padding: 9px 14px; - font-size: 15px; + font-size: 16px; line-height: normal; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; } .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: 16px; } -.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-left: 0; + padding-right: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.btn-block + .btn-block { + margin-top: 5px; } .btn-primary.active, .btn-warning.active, @@ -2252,19 +2533,20 @@ button.close { color: rgba(255, 255, 255, 0.75); } .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 { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #4176c4; background-image: -moz-linear-gradient(top, #4183c4, #4162c4); - background-image: -ms-linear-gradient(top, #4183c4, #4162c4); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4183c4), to(#4162c4)); background-image: -webkit-linear-gradient(top, #4183c4, #4162c4); background-image: -o-linear-gradient(top, #4183c4, #4162c4); - background-image: linear-gradient(top, #4183c4, #4162c4); + background-image: linear-gradient(to bottom, #4183c4, #4162c4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4183c4', endColorstr='#4162c4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4183c4', endColorstr='#ff4162c4', GradientType=0); border-color: #4162c4 #4162c4 #2c448d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #4162c4; @@ -2277,6 +2559,7 @@ button.close { .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { + color: #ffffff; background-color: #4162c4; *background-color: #3857b4; } @@ -2285,15 +2568,16 @@ button.close { background-color: #324ea0 \9; } .btn-warning { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #ff942e; background-image: -moz-linear-gradient(top, #ffa44d, #ff7d00); - background-image: -ms-linear-gradient(top, #ffa44d, #ff7d00); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffa44d), to(#ff7d00)); background-image: -webkit-linear-gradient(top, #ffa44d, #ff7d00); background-image: -o-linear-gradient(top, #ffa44d, #ff7d00); - background-image: linear-gradient(top, #ffa44d, #ff7d00); + background-image: linear-gradient(to bottom, #ffa44d, #ff7d00); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa44d', endColorstr='#ff7d00', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffa44d', endColorstr='#ffff7d00', GradientType=0); border-color: #ff7d00 #ff7d00 #b35800; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #ff7d00; @@ -2306,6 +2590,7 @@ button.close { .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { + color: #ffffff; background-color: #ff7d00; *background-color: #e67100; } @@ -2314,15 +2599,16 @@ button.close { background-color: #cc6400 \9; } .btn-danger { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #da4f49; background-image: -moz-linear-gradient(top, #ee5f5b, #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(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', 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); *background-color: #bd362f; @@ -2335,6 +2621,7 @@ button.close { .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { + color: #ffffff; background-color: #bd362f; *background-color: #a9302a; } @@ -2343,15 +2630,16 @@ button.close { background-color: #942a25 \9; } .btn-success { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #5bb75b; background-image: -moz-linear-gradient(top, #62c462, #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(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', 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); *background-color: #51a351; @@ -2364,6 +2652,7 @@ button.close { .btn-success.active, .btn-success.disabled, .btn-success[disabled] { + color: #ffffff; background-color: #51a351; *background-color: #499249; } @@ -2372,15 +2661,16 @@ button.close { background-color: #408140 \9; } .btn-info { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #49afcd; background-image: -moz-linear-gradient(top, #5bc0de, #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(top, #5bc0de, #2f96b4); + background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', 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); *background-color: #2f96b4; @@ -2393,6 +2683,7 @@ button.close { .btn-info.active, .btn-info.disabled, .btn-info[disabled] { + color: #ffffff; background-color: #2f96b4; *background-color: #2a85a0; } @@ -2401,15 +2692,16 @@ button.close { background-color: #24748c \9; } .btn-inverse { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); 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-image: linear-gradient(to bottom, #555555, #222222); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff222222', 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); *background-color: #222222; @@ -2422,6 +2714,7 @@ button.close { .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { + color: #ffffff; background-color: #222222; *background-color: #151515; } @@ -2431,8 +2724,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, input[type="submit"].btn::-moz-focus-inner { @@ -2454,19 +2747,33 @@ input[type="submit"].btn.btn-mini { *padding-top: 1px; *padding-bottom: 1px; } +.btn-link, +.btn-link:active { + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn-link { + border-color: transparent; + cursor: pointer; + color: #4183c4; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-link:hover { + color: #4183c4; + text-decoration: underline; + background-color: transparent; +} .btn-group { position: relative; - *zoom: 1; + font-size: 0; + white-space: nowrap; *margin-left: .3em; } -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} .btn-group:first-child { *margin-left: 0; } @@ -2474,8 +2781,9 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + font-size: 0; + margin-top: 10px; + margin-bottom: 10px; } .btn-toolbar .btn-group { display: inline-block; @@ -2484,14 +2792,33 @@ 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-top-left-radius: 4px; @@ -2538,26 +2865,30 @@ input[type="submit"].btn.btn-mini { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group > .dropdown-toggle { +.btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - *padding-top: 4px; - *padding-bottom: 4px; + *padding-top: 5px; + *padding-bottom: 5px; } -.btn-group > .btn-mini.dropdown-toggle { +.btn-group > .btn-mini + .dropdown-toggle { padding-left: 5px; padding-right: 5px; + *padding-top: 2px; + *padding-bottom: 2px; } -.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-left: 12px; padding-right: 12px; + *padding-top: 7px; + *padding-bottom: 7px; } .btn-group.open .dropdown-toggle { background-image: none; @@ -2587,22 +2918,15 @@ input[type="submit"].btn.btn-mini { background-color: #222222; } .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-left-width: 5px; border-right-width: 5px; border-top-width: 5px; @@ -2619,12 +2943,49 @@ 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-left: 0; + margin-top: -1px; +} +.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; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #f5f3b4; border: 1px solid #f3e4a7; @@ -2633,14 +2994,14 @@ input[type="submit"].btn.btn-mini { border-radius: 4px; color: #393939; } -.alert-heading { - color: inherit; +.alert h4 { + margin: 0; } .alert .close { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: 20px; } .alert-success { background-color: #bedebe; @@ -2671,7 +3032,7 @@ input[type="submit"].btn.btn-mini { } .nav { margin-left: 0; - margin-bottom: 18px; + margin-bottom: 20px; list-style: none; } .nav > li > a { @@ -2679,17 +3040,17 @@ input[type="submit"].btn.btn-mini { } .nav > li > a:hover { text-decoration: none; - background-color: #f5f5f5; + background-color: #dddddd; } .nav > .pull-right { 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; @@ -2723,7 +3084,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; @@ -2739,6 +3100,7 @@ input[type="submit"].btn.btn-mini { .nav-pills:after { display: table; content: ""; + line-height: 0; } .nav-tabs:after, .nav-pills:after { @@ -2764,14 +3126,14 @@ 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; border-radius: 4px 4px 0 0; } .nav-tabs > li > a:hover { - border-color: #f5f5f5 #f5f5f5 #dddddd; + border-color: #dddddd #dddddd #dddddd; } .nav-tabs > .active > a, .nav-tabs > .active > a:hover { @@ -2811,14 +3173,20 @@ input[type="submit"].btn.btn-mini { border-radius: 0; } .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; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 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; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } .nav-tabs.nav-stacked > li > a:hover { border-color: #ddd; @@ -2831,33 +3199,37 @@ input[type="submit"].btn.btn-mini { margin-bottom: 1px; } .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 { border-top-color: #4183c4; border-bottom-color: #4183c4; margin-top: 6px; } -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { +.nav .dropdown-toggle:hover .caret { border-top-color: #4183c4; border-bottom-color: #4183c4; } -.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; } .nav-tabs .open .dropdown-toggle, @@ -2885,6 +3257,7 @@ input[type="submit"].btn.btn-mini { .tabbable:after { display: table; content: ""; + line-height: 0; } .tabbable:after { clear: both; @@ -2947,7 +3320,7 @@ input[type="submit"].btn.btn-mini { border-radius: 4px 0 0 4px; } .tabs-left > .nav-tabs > li > a:hover { - border-color: #f5f5f5 #dddddd #f5f5f5 #f5f5f5; + border-color: #dddddd #dddddd #dddddd #dddddd; } .tabs-left > .nav-tabs .active > a, .tabs-left > .nav-tabs .active > a:hover { @@ -2966,18 +3339,27 @@ input[type="submit"].btn.btn-mini { border-radius: 0 4px 4px 0; } .tabs-right > .nav-tabs > li > a:hover { - border-color: #f5f5f5 #f5f5f5 #f5f5f5 #dddddd; + border-color: #dddddd #dddddd #dddddd #dddddd; } .tabs-right > .nav-tabs .active > a, .tabs-right > .nav-tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } +.nav > .disabled > a { + color: #999999; +} +.nav > .disabled > a:hover { + text-decoration: none; + background-color: transparent; + cursor: default; +} .navbar { + overflow: visible; + margin-bottom: 20px; + color: #333333; *position: relative; *z-index: 2; - overflow: visible; - margin-bottom: 18px; } .navbar-inner { min-height: 40px; @@ -2985,19 +3367,19 @@ input[type="submit"].btn.btn-mini { padding-right: 20px; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); - background-image: -ms-linear-gradient(top, #ffffff, #eaeaea); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); background-image: -o-linear-gradient(top, #ffffff, #eaeaea); - background-image: linear-gradient(top, #ffffff, #eaeaea); + background-image: linear-gradient(to bottom, #ffffff, #eaeaea); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaeaea', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeaeaea', GradientType=0); + border: 1px solid #cbcbcb; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.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; @@ -3005,35 +3387,38 @@ input[type="submit"].btn.btn-mini { .nav-collapse.collapse { height: auto; } -.navbar { - color: #333333; -} -.navbar .brand:hover { - text-decoration: none; -} .navbar .brand { float: left; display: block; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; - line-height: 1; color: #333333; + text-shadow: 0 1px 0 #ffffff; } -.navbar .navbar-text { +.navbar .brand:hover { + text-decoration: none; +} +.navbar-text { margin-bottom: 0; line-height: 40px; } -.navbar .navbar-link { +.navbar-link { color: #333333; } -.navbar .navbar-link:hover { +.navbar-link:hover { color: #4183c4; } +.navbar .divider-vertical { + height: 40px; + margin: 0 9px; + border-left: 1px solid #eaeaea; + border-right: 1px solid #ffffff; +} .navbar .btn, .navbar .btn-group { - margin-top: 5px; + margin-top: 6px; } .navbar .btn-group .btn { margin: 0; @@ -3046,6 +3431,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:after { display: table; content: ""; + line-height: 0; } .navbar-form:after { clear: both; @@ -3057,7 +3443,8 @@ input[type="submit"].btn.btn-mini { margin-top: 5px; } .navbar-form input, -.navbar-form select { +.navbar-form select, +.navbar-form .btn { display: inline-block; margin-bottom: 0; } @@ -3078,47 +3465,29 @@ 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; + margin-bottom: 0; + padding: 4px 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - color: #ffffff; - background-color: #ffffff; - border: 1px solid #b3b3b3; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); - box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.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; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; +.navbar-static-top .navbar-inner { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-fixed-top, .navbar-fixed-bottom { @@ -3129,6 +3498,11 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } .navbar-fixed-top .navbar-inner, +.navbar-fixed-bottom .navbar-inner, +.navbar-static-top .navbar-inner { + border: 0; +} +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; @@ -3136,6 +3510,7 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0; border-radius: 0; } +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -3143,9 +3518,20 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top { top: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1); + box-shadow: inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(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,.1), 0 -1px 10px rgba(0,0,0,.1); + -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1); + box-shadow: inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1); +} .navbar .nav { position: relative; left: 0; @@ -3157,49 +3543,33 @@ input[type="submit"].btn.btn-mini { float: right; } .navbar .nav > li { - display: block; float: left; } .navbar .nav > li > a { float: none; - padding: 9px 10px 11px; - line-height: 19px; + padding: 10px 15px 10px; color: #333333; 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 { - margin: 0; - padding: 5px 5px 6px; +.navbar .nav .dropdown-toggle .caret { + margin-top: 8px; } +.navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: transparent; color: #4183c4; text-decoration: none; } -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #4183c4; +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > .active > a:focus { + color: #333333; text-decoration: none; background-color: transparent; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #eaeaea; - border-right: 1px solid #ffffff; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; + -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 { display: none; @@ -3207,18 +3577,19 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-left: 5px; margin-right: 5px; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); - background-image: -ms-linear-gradient(top, #ffffff, #eaeaea); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); - background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); - background-image: -o-linear-gradient(top, #ffffff, #eaeaea); - background-image: linear-gradient(top, #ffffff, #eaeaea); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #eaeaea; + background-image: -moz-linear-gradient(top, #f2f2f2, #dddddd); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#dddddd)); + background-image: -webkit-linear-gradient(top, #f2f2f2, #dddddd); + background-image: -o-linear-gradient(top, #f2f2f2, #dddddd); + background-image: linear-gradient(to bottom, #f2f2f2, #dddddd); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaeaea', GradientType=0); - border-color: #eaeaea #eaeaea #c4c4c4; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffdddddd', GradientType=0); + border-color: #dddddd #dddddd #b7b7b7; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #eaeaea; + *background-color: #dddddd; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -3231,12 +3602,13 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #eaeaea; - *background-color: #dddddd; + color: #ffffff; + background-color: #dddddd; + *background-color: #d0d0d0; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #d1d1d1 \9; + background-color: #c4c4c4 \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -3253,7 +3625,7 @@ input[type="submit"].btn.btn-mini { .btn-navbar .icon-bar + .icon-bar { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { content: ''; display: inline-block; border-left: 7px solid transparent; @@ -3264,7 +3636,7 @@ input[type="submit"].btn.btn-mini { top: -7px; left: 9px; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { content: ''; display: inline-block; border-left: 6px solid transparent; @@ -3274,71 +3646,192 @@ input[type="submit"].btn.btn-mini { top: -6px; left: 10px; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .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 { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; top: auto; } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); -} .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; + color: #333333; } -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; +.navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #333333; + border-bottom-color: #333333; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.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: #333333; + border-bottom-color: #333333; +} +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { left: auto; right: 13px; } +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { + left: auto; + right: 100%; + margin-left: 0; + margin-right: -1px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.navbar-inverse { + color: #dddddd; +} +.navbar-inverse .navbar-inner { + background-color: #5d5d5d; + background-image: -moz-linear-gradient(top, #626262, #555555); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#626262), to(#555555)); + background-image: -webkit-linear-gradient(top, #626262, #555555); + background-image: -o-linear-gradient(top, #626262, #555555); + background-image: linear-gradient(to bottom, #626262, #555555); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff626262', endColorstr='#ff555555', GradientType=0); + border-color: #252525; +} +.navbar-inverse .brand, +.navbar-inverse .nav > li > a { + color: #dddddd; + 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 { + background-color: transparent; + color: #ffffff; +} +.navbar-inverse .nav .active > a, +.navbar-inverse .nav .active > a:hover, +.navbar-inverse .nav .active > a:focus { + color: #ffffff; + background-color: #555555; +} +.navbar-inverse .navbar-link { + color: #dddddd; +} +.navbar-inverse .navbar-link:hover { + color: #ffffff; +} +.navbar-inverse .divider-vertical { + border-left-color: #555555; + border-right-color: #626262; +} +.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 { + background-color: #555555; + color: #ffffff; +} +.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #dddddd; + border-bottom-color: #dddddd; +} +.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-inverse .navbar-search .search-query { + color: #ffffff; + background-color: #959595; + border-color: #555555; + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; +} +.navbar-inverse .navbar-search .search-query:-moz-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { + color: #cccccc; +} +.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; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-inverse .btn-navbar { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #505050; + background-image: -moz-linear-gradient(top, #555555, #484848); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#484848)); + background-image: -webkit-linear-gradient(top, #555555, #484848); + background-image: -o-linear-gradient(top, #555555, #484848); + background-image: linear-gradient(to bottom, #555555, #484848); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff484848', GradientType=0); + border-color: #484848 #484848 #222222; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #484848; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + 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: #484848; + *background-color: #3c3c3c; +} +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active { + background-color: #2f2f2f \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; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; + background-color: #f5f5f5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .breadcrumb li { display: inline-block; @@ -3350,14 +3843,14 @@ 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 { display: inline-block; @@ -3377,19 +3870,23 @@ input[type="submit"].btn.btn-mini { .pagination li { display: inline; } -.pagination a { +.pagination a, +.pagination 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 .active a, +.pagination .active span { background-color: #f5f5f5; } -.pagination .active a { +.pagination .active a, +.pagination .active span { color: #999999; cursor: default; } @@ -3400,13 +3897,15 @@ input[type="submit"].btn.btn-mini { background-color: transparent; cursor: default; } -.pagination li:first-child a { +.pagination li:first-child a, +.pagination 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 li:last-child a, +.pagination li:last-child span { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -3418,8 +3917,7 @@ input[type="submit"].btn.btn-mini { text-align: right; } .pager { - margin-left: 0; - margin-bottom: 18px; + margin: 20px 0; list-style: none; text-align: center; *zoom: 1; @@ -3428,6 +3926,7 @@ input[type="submit"].btn.btn-mini { .pager:after { display: table; content: ""; + line-height: 0; } .pager:after { clear: both; @@ -3470,7 +3969,7 @@ input[type="submit"].btn.btn-mini { z-index: 2060; } .modal-open .tooltip { - z-index: 2070; + z-index: 2080; } .modal-backdrop { position: fixed; @@ -3516,7 +4015,6 @@ input[type="submit"].btn.btn-mini { .modal.fade { -webkit-transition: opacity .3s linear, top .3s ease-out; -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; -o-transition: opacity .3s linear, top .3s ease-out; transition: opacity .3s linear, top .3s ease-out; top: -25%; @@ -3531,6 +4029,10 @@ input[type="submit"].btn.btn-mini { .modal-header .close { margin-top: 2px; } +.modal-header h3 { + margin: 0; + line-height: 30px; +} .modal-body { overflow-y: auto; max-height: 400px; @@ -3557,6 +4059,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:after { display: table; content: ""; + line-height: 0; } .modal-footer:after { clear: both; @@ -3570,7 +4073,7 @@ input[type="submit"].btn.btn-mini { } .tooltip { position: absolute; - z-index: 1020; + z-index: 1030; display: block; visibility: visible; padding: 5px; @@ -3583,48 +4086,16 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=80); } .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-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; + margin-left: -3px; } .tooltip-inner { max-width: 200px; @@ -3641,6 +4112,36 @@ input[type="submit"].btn.btn-mini { position: absolute; width: 0; height: 0; + border-color: transparent; + border-style: solid; +} +.tooltip.top .tooltip-arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-width: 5px 5px 0; + border-top-color: #000000; +} +.tooltip.right .tooltip-arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-width: 5px 5px 5px 0; + border-right-color: #000000; +} +.tooltip.left .tooltip-arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-width: 5px 0 5px 5px; + border-left-color: #000000; +} +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; } .popover { position: absolute; @@ -3648,93 +4149,117 @@ input[type="submit"].btn.btn-mini { left: 0; z-index: 1010; display: none; - padding: 5px; + width: 236px; + padding: 1px; + background-color: #ffffff; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -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); } .popover.top { - margin-top: -5px; + margin-bottom: 10px; } .popover.right { - margin-left: 5px; + margin-left: 10px; } .popover.bottom { - margin-top: 5px; + margin-top: 10px; } .popover.left { - margin-left: -5px; + margin-right: 10px; +} +.popover-title { + margin: 0; + padding: 8px 14px; + font-size: 14px; + font-weight: normal; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.popover-content { + padding: 9px 14px; +} +.popover-content p, +.popover-content ul, +.popover-content ol { + margin-bottom: 0; +} +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: inline-block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.popover .arrow:after { + content: ""; + z-index: -1; } .popover.top .arrow { - bottom: 0; + bottom: -10px; left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; + margin-left: -10px; + border-width: 10px 10px 0; + border-top-color: #ffffff; +} +.popover.top .arrow:after { + border-width: 11px 11px 0; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -1px; + left: -11px; } .popover.right .arrow { top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; + left: -10px; + margin-top: -10px; + border-width: 10px 10px 10px 0; + border-right-color: #ffffff; +} +.popover.right .arrow:after { + border-width: 11px 11px 11px 0; + border-right-color: rgba(0, 0, 0, 0.25); + bottom: -11px; + left: -1px; } .popover.bottom .arrow { - top: 0; + top: -10px; left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; + margin-left: -10px; + border-width: 0 10px 10px; + border-bottom-color: #ffffff; +} +.popover.bottom .arrow:after { + border-width: 0 11px 11px; + border-bottom-color: rgba(0, 0, 0, 0.25); + top: -1px; + left: -11px; } .popover.left .arrow { top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; + right: -10px; + margin-top: -10px; + border-width: 10px 0 10px 10px; + border-left-color: #ffffff; } -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; +.popover.left .arrow:after { + border-width: 11px 0 11px 11px; + border-left-color: rgba(0, 0, 0, 0.25); + bottom: -11px; + right: -1px; } .thumbnails { margin-left: -20px; @@ -3745,6 +4270,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:after { display: table; content: ""; + line-height: 0; } .thumbnails:after { clear: both; @@ -3754,20 +4280,24 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } .thumbnail { display: block; padding: 4px; - line-height: 1; + line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; } a.thumbnail:hover { border-color: #4183c4; @@ -3783,10 +4313,11 @@ a.thumbnail:hover { } .thumbnail .caption { padding: 9px; + color: #555555; } .label, .badge { - font-size: 10.998px; + font-size: 11.844px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -3853,6 +4384,15 @@ a.badge:hover { .badge-inverse[href] { background-color: #1a1a1a; } +.btn .label, +.btn .badge { + position: relative; + top: -1px; +} +.btn-mini .label, +.btn-mini .badge { + top: 0; +} @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0; @@ -3895,17 +4435,16 @@ a.badge:hover { } .progress { overflow: hidden; - height: 18px; - margin-bottom: 18px; + height: 20px; + margin-bottom: 20px; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); @@ -3915,41 +4454,43 @@ a.badge:hover { } .progress .bar { width: 0%; - height: 18px; + height: 100%; color: #ffffff; + float: left; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e90d2; background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; } +.progress .bar + .bar { + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); +} .progress-striped .bar { 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); - 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); + 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: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; -o-background-size: 40px 40px; @@ -3962,88 +4503,88 @@ a.badge:hover { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-danger .bar { +.progress-danger .bar, +.progress .bar-danger { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, +.progress-striped .bar-danger { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + 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: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-success .bar { +.progress-success .bar, +.progress .bar-success { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, +.progress-striped .bar-success { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + 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: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-info .bar { +.progress-info .bar, +.progress .bar-info { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, +.progress-striped .bar-info { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + 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: -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 { +.progress-warning .bar, +.progress .bar-warning { background-color: #ff942e; background-image: -moz-linear-gradient(top, #ffa44d, #ff7d00); - background-image: -ms-linear-gradient(top, #ffa44d, #ff7d00); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffa44d), to(#ff7d00)); background-image: -webkit-linear-gradient(top, #ffa44d, #ff7d00); background-image: -o-linear-gradient(top, #ffa44d, #ff7d00); - background-image: linear-gradient(top, #ffa44d, #ff7d00); + background-image: linear-gradient(to bottom, #ffa44d, #ff7d00); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa44d', endColorstr='#ff7d00', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffa44d', endColorstr='#ffff7d00', GradientType=0); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, +.progress-striped .bar-warning { background-color: #ffa44d; 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); + 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: -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; + margin-bottom: 20px; } .accordion-group { margin-bottom: 2px; @@ -4068,7 +4609,7 @@ a.badge:hover { } .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } .carousel-inner { @@ -4081,7 +4622,6 @@ a.badge:hover { position: relative; -webkit-transition: 0.6s ease-in-out left; -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } @@ -4154,18 +4694,25 @@ a.badge:hover { left: 0; right: 0; bottom: 0; - padding: 10px 15px 5px; + padding: 15px; background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { color: #ffffff; + line-height: 20px; +} +.carousel-caption h4 { + margin: 0 0 5px; +} +.carousel-caption p { + margin-bottom: 0; } .hero-unit { padding: 60px; margin-bottom: 30px; - background-color: #f5f5f5; + background-color: #dddddd; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -4180,7 +4727,7 @@ a.badge:hover { .hero-unit p { font-size: 18px; font-weight: 200; - line-height: 27px; + line-height: 30px; color: inherit; } .pull-right { @@ -4198,6 +4745,9 @@ a.badge:hover { .invisible { visibility: hidden; } +.affix { + position: fixed; +} .navbar .navbar-inner { border-bottom: 1px solid #CACACA; -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) , 0 0 10px rgba(0, 0, 0, 0.1); @@ -4210,37 +4760,16 @@ a.badge:hover { .navbar .brand:hover { color: #4183c4; } -.navbar .nav > li.active > a, -.navbar .nav > li.dropdown > .dropdown-toggle, -.navbar .nav > li.dropdown.active > .dropdown-toggle, -.navbar .nav > li.dropdown.open > .dropdown-toggle, -.navbar .nav > li.dropdown.open.active > .dropdown-toggle { - color: #333333; -} -.navbar .nav > li.active > a:hover, -.navbar .nav > li.dropdown > .dropdown-toggle:hover, -.navbar .nav > li.dropdown.active > .dropdown-toggle:hover, -.navbar .nav > li.dropdown.open > .dropdown-toggle:hover, -.navbar .nav > li.dropdown.open.active > .dropdown-toggle:hover { - color: #4183c4; -} -.navbar .nav > li.active > a .caret, -.navbar .nav > li.dropdown > .dropdown-toggle .caret, -.navbar .nav > li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav > li.dropdown.open > .dropdown-toggle .caret, -.navbar .nav > li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #333333; +.navbar .nav > li > a { + padding: 11px 10px 9px; + font-weight: bold; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } .navbar .navbar-text { margin-top: 2px; padding: 0 10px; line-height: 38px; } -.navbar .nav > li > a { - padding: 11px 10px 9px; - font-weight: bold; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} .navbar .navbar-search .search-query, .navbar .navbar-search .search-query:hover { margin-bottom: 0; @@ -4270,17 +4799,32 @@ a.badge:hover { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5); color: #333333; } -.navbar .nav-collapse.in .navbar-search { +.navbar .nav-collapse.collapse .navbar-search { border-top: none; border-bottom: none; } -.navbar .nav-collapse.in > .nav li > a { - color: #333333; -} -.navbar .nav-collapse.in > .nav li > a:hover { +.navbar .nav-collapse.collapse > .nav li > a:hover { + background-color: #4183c4; + color: #ffffff; text-shadow: none; - color: #4183c4; - background-color: transparent; +} +.navbar-inverse .brand { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5); +} +.navbar-inverse .brand:hover { + color: #ffffff; +} +.navbar-inverse .nav > li > a { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5); +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown:hover > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.open:hover > .dropdown-toggle .caret { + border-top-color: #ffffff; +} +.navbar-inverse .nav-collapse.collapse .nav li > a, +.navbar-inverse .nav-collapse.collapse .nav-header { + color: #dddddd; } div.subnav .nav > li > a { font-weight: bold; @@ -4322,27 +4866,31 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { border-top-color: #4183c4; } .btn { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #f1f1f1; background-image: -moz-linear-gradient(top, #f4f4f4, #ececec); - background-image: -ms-linear-gradient(top, #f4f4f4, #ececec); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f4f4f4), to(#ececec)); background-image: -webkit-linear-gradient(top, #f4f4f4, #ececec); background-image: -o-linear-gradient(top, #f4f4f4, #ececec); - background-image: linear-gradient(top, #f4f4f4, #ececec); + background-image: linear-gradient(to bottom, #f4f4f4, #ececec); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#ececec', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff4f4f4', endColorstr='#ffececec', GradientType=0); border-color: #ececec #ececec #c6c6c6; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #ececec; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + color: #333333; + text-shadow: none; } .btn:hover, .btn:active, .btn.active, .btn.disabled, .btn[disabled] { + color: #ffffff; background-color: #ececec; *background-color: #dfdfdf; } @@ -4350,16 +4898,24 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .btn.active { background-color: #d3d3d3 \9; } +.btn:hover, +.btn:active, +.btn.active, +.btn.disabled, +.btn[disabled] { + color: #333333; +} .btn-primary { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #707070; background-image: -moz-linear-gradient(top, #909090, #3f3f3f); - background-image: -ms-linear-gradient(top, #909090, #3f3f3f); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#909090), to(#3f3f3f)); background-image: -webkit-linear-gradient(top, #909090, #3f3f3f); background-image: -o-linear-gradient(top, #909090, #3f3f3f); - background-image: linear-gradient(top, #909090, #3f3f3f); + background-image: linear-gradient(to bottom, #909090, #3f3f3f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#909090', endColorstr='#3f3f3f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff909090', endColorstr='#ff3f3f3f', GradientType=0); border-color: #3f3f3f #3f3f3f #191919; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #3f3f3f; @@ -4372,6 +4928,7 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { + color: #ffffff; background-color: #3f3f3f; *background-color: #323232; } @@ -4380,15 +4937,16 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { background-color: #262626 \9; } .btn-warning { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #fbd627; background-image: -moz-linear-gradient(top, #ffde42, #f4ca00); - background-image: -ms-linear-gradient(top, #ffde42, #f4ca00); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffde42), to(#f4ca00)); background-image: -webkit-linear-gradient(top, #ffde42, #f4ca00); background-image: -o-linear-gradient(top, #ffde42, #f4ca00); - background-image: linear-gradient(top, #ffde42, #f4ca00); + background-image: linear-gradient(to bottom, #ffde42, #f4ca00); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffde42', endColorstr='#f4ca00', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffde42', endColorstr='#fff4ca00', GradientType=0); border-color: #f4ca00 #f4ca00 #a88b00; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #f4ca00; @@ -4401,6 +4959,7 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { + color: #ffffff; background-color: #f4ca00; *background-color: #dbb500; } @@ -4409,15 +4968,16 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { background-color: #c1a000 \9; } .btn-danger { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #e15454; background-image: -moz-linear-gradient(top, #e56e6e, #da2d2d); - background-image: -ms-linear-gradient(top, #e56e6e, #da2d2d); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e56e6e), to(#da2d2d)); background-image: -webkit-linear-gradient(top, #e56e6e, #da2d2d); background-image: -o-linear-gradient(top, #e56e6e, #da2d2d); - background-image: linear-gradient(top, #e56e6e, #da2d2d); + background-image: linear-gradient(to bottom, #e56e6e, #da2d2d); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e56e6e', endColorstr='#da2d2d', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe56e6e', endColorstr='#ffda2d2d', GradientType=0); border-color: #da2d2d #da2d2d #9f1c1c; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #da2d2d; @@ -4430,6 +4990,7 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { + color: #ffffff; background-color: #da2d2d; *background-color: #ca2424; } @@ -4438,15 +4999,16 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { background-color: #b42020 \9; } .btn-success { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #79cb5d; background-image: -moz-linear-gradient(top, #8add6d, #60b044); - background-image: -ms-linear-gradient(top, #8add6d, #60b044); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#8add6d), to(#60b044)); background-image: -webkit-linear-gradient(top, #8add6d, #60b044); background-image: -o-linear-gradient(top, #8add6d, #60b044); - background-image: linear-gradient(top, #8add6d, #60b044); + background-image: linear-gradient(to bottom, #8add6d, #60b044); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#8add6d', endColorstr='#60b044', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8add6d', endColorstr='#ff60b044', GradientType=0); border-color: #60b044 #60b044 #42792f; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #60b044; @@ -4459,6 +5021,7 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .btn-success.active, .btn-success.disabled, .btn-success[disabled] { + color: #ffffff; background-color: #60b044; *background-color: #569e3d; } @@ -4467,15 +5030,16 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { background-color: #4c8b36 \9; } .btn-info { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #669dc7; background-image: -moz-linear-gradient(top, #7caccf, #4488bb); - background-image: -ms-linear-gradient(top, #7caccf, #4488bb); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#7caccf), to(#4488bb)); background-image: -webkit-linear-gradient(top, #7caccf, #4488bb); background-image: -o-linear-gradient(top, #7caccf, #4488bb); - background-image: linear-gradient(top, #7caccf, #4488bb); + background-image: linear-gradient(to bottom, #7caccf, #4488bb); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7caccf', endColorstr='#4488bb', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff7caccf', endColorstr='#ff4488bb', GradientType=0); border-color: #4488bb #4488bb #305f83; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #4488bb; @@ -4488,6 +5052,7 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .btn-info.active, .btn-info.disabled, .btn-info[disabled] { + color: #ffffff; background-color: #4488bb; *background-color: #3d7aa8; } @@ -4496,15 +5061,16 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { background-color: #366d96 \9; } .btn-inverse { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #466274; background-image: -moz-linear-gradient(top, #4a687a, #405a6a); - background-image: -ms-linear-gradient(top, #4a687a, #405a6a); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4a687a), to(#405a6a)); background-image: -webkit-linear-gradient(top, #4a687a, #405a6a); background-image: -o-linear-gradient(top, #4a687a, #405a6a); - background-image: linear-gradient(top, #4a687a, #405a6a); + background-image: linear-gradient(to bottom, #4a687a, #405a6a); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4a687a', endColorstr='#405a6a', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4a687a', endColorstr='#ff405a6a', GradientType=0); border-color: #405a6a #405a6a #23323a; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #405a6a; @@ -4517,6 +5083,7 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { + color: #ffffff; background-color: #405a6a; *background-color: #364d5a; } @@ -4536,6 +5103,9 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .control-group.warning textarea { color: #e29235; border-color: #e29235; + -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, @@ -4543,9 +5113,9 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #c7781d; - -webkit-box-shadow: 0 0 6px #efc28e; - -moz-box-shadow: 0 0 6px #efc28e; - box-shadow: 0 0 6px #efc28e; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #efc28e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #efc28e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #efc28e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -4565,6 +5135,9 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .control-group.error textarea { color: #cc0000; border-color: #cc0000; + -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, @@ -4572,9 +5145,9 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .control-group.error select:focus, .control-group.error textarea:focus { border-color: #990000; - -webkit-box-shadow: 0 0 6px #ff3333; - -moz-box-shadow: 0 0 6px #ff3333; - box-shadow: 0 0 6px #ff3333; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ff3333; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ff3333; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ff3333; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -4594,6 +5167,9 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .control-group.success textarea { color: #2ba949; border-color: #2ba949; + -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, @@ -4601,9 +5177,9 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .control-group.success select:focus, .control-group.success textarea:focus { border-color: #218037; - -webkit-box-shadow: 0 0 6px #63d77e; - -moz-box-shadow: 0 0 6px #63d77e; - box-shadow: 0 0 6px #63d77e; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #63d77e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #63d77e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #63d77e; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -4648,3 +5224,6 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .invisible { visibility: hidden; } +.affix { + position: fixed; +} |