diff --git a/assets/css/theme.css b/assets/css/theme.css index 7a82c27..d9fe365 100644 --- a/assets/css/theme.css +++ b/assets/css/theme.css @@ -9,7 +9,15 @@ * !! YOU HAVE BEEN WARNED !! MODIFY THIS FILE AT YOUR OWN RISK !! * */ -/*! normalize.css v2.1.3 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ +html { + font-family: sans-serif; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; +} +body { + margin: 0; +} article, aside, details, @@ -26,8 +34,10 @@ summary { } audio, canvas, +progress, video { display: inline-block; + vertical-align: baseline; } audio:not([controls]) { display: none; @@ -37,28 +47,13 @@ audio:not([controls]) { template { display: none; } -html { - font-family: sans-serif; - -ms-text-size-adjust: 100%; - -webkit-text-size-adjust: 100%; -} -body { - margin: 0; -} a { background: transparent; } -a:focus { - outline: thin dotted; -} a:active, a:hover { outline: 0; } -h1 { - font-size: 2em; - margin: 0.67em 0; -} abbr[title] { border-bottom: 1px dotted; } @@ -69,28 +64,14 @@ strong { dfn { font-style: italic; } -hr { - -moz-box-sizing: content-box; - box-sizing: content-box; - height: 0; +h1 { + font-size: 2em; + margin: 0.67em 0; } mark { background: #ff0; color: #000; } -code, -kbd, -pre, -samp { - font-family: monospace, serif; - font-size: 1em; -} -pre { - white-space: pre-wrap; -} -q { - quotes: "\201C" "\201D" "\2018" "\2019"; -} small { font-size: 80%; } @@ -114,28 +95,34 @@ svg:not(:root) { overflow: hidden; } figure { - margin: 0; + margin: 1em 40px; } -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; } -legend { - border: 0; - padding: 0; +pre { + overflow: auto; +} +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; } button, input, +optgroup, select, textarea { - font-family: inherit; - font-size: 100%; + color: inherit; + font: inherit; margin: 0; } -button, -input { - line-height: normal; +button { + overflow: visible; } button, select { @@ -152,11 +139,23 @@ button[disabled], html input[disabled] { cursor: default; } +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} +input { + line-height: normal; +} input[type="checkbox"], input[type="radio"] { box-sizing: border-box; padding: 0; } +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} input[type="search"] { -webkit-appearance: textfield; -moz-box-sizing: content-box; @@ -167,19 +166,29 @@ input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } -button::-moz-focus-inner, -input::-moz-focus-inner { +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} +legend { border: 0; padding: 0; } textarea { overflow: auto; - vertical-align: top; +} +optgroup { + font-weight: bold; } table { border-collapse: collapse; border-spacing: 0; } +td, +th { + padding: 0; +} @media print { * { text-shadow: none !important; @@ -216,9 +225,6 @@ table { img { max-width: 100% !important; } - @page { - margin: 2cm .5cm; - } p, h2, h3 { @@ -254,7 +260,11 @@ table { border: 1px solid #ddd !important; } } -*, +* { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} *:before, *:after { -webkit-box-sizing: border-box; @@ -290,10 +300,13 @@ a:focus { text-decoration: underline; } a:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } +figure { + margin: 0; +} img { vertical-align: middle; } @@ -336,69 +349,6 @@ hr { clip: rect(0, 0, 0, 0); border: 0; } -p { - margin: 0 0 10px; -} -.lead { - margin-bottom: 20px; - font-size: 16px; - font-weight: 200; - line-height: 1.4; -} -@media (min-width: 768px) { - .lead { - font-size: 21px; - } -} -small, -.small { - font-size: 85%; -} -cite { - font-style: normal; -} -.text-muted { - color: #999999; -} -.text-primary { - color: #428bca; -} -.text-primary:hover { - color: #3071a9; -} -.text-warning { - color: #c09853; -} -.text-warning:hover { - color: #a47e3c; -} -.text-danger { - color: #b94a48; -} -.text-danger:hover { - color: #953b39; -} -.text-success { - color: #468847; -} -.text-success:hover { - color: #356635; -} -.text-info { - color: #3a87ad; -} -.text-info:hover { - color: #2d6987; -} -.text-left { - text-align: left; -} -.text-right { - text-align: right; -} -.text-center { - text-align: center; -} h1, h2, h3, @@ -411,7 +361,7 @@ h6, .h4, .h5, .h6 { - font-family: "lato", sans-serif; + font-family: inherit; font-weight: 500; line-height: 1.1; color: inherit; @@ -445,31 +395,49 @@ h6 .small, color: #999999; } h1, +.h1, h2, -h3 { +.h2, +h3, +.h3 { margin-top: 20px; margin-bottom: 10px; } h1 small, +.h1 small, h2 small, +.h2 small, h3 small, +.h3 small, h1 .small, +.h1 .small, h2 .small, -h3 .small { +.h2 .small, +h3 .small, +.h3 .small { font-size: 65%; } h4, +.h4, h5, -h6 { +.h5, +h6, +.h6 { margin-top: 10px; margin-bottom: 10px; } h4 small, +.h4 small, h5 small, +.h5 small, h6 small, +.h6 small, h4 .small, +.h4 .small, h5 .small, -h6 .small { +.h5 .small, +h6 .small, +.h6 .small { font-size: 75%; } h1, @@ -496,6 +464,103 @@ h6, .h6 { font-size: 12px; } +p { + margin: 0 0 10px; +} +.lead { + margin-bottom: 20px; + font-size: 16px; + font-weight: 200; + line-height: 1.4; +} +@media (min-width: 768px) { + .lead { + font-size: 21px; + } +} +small, +.small { + font-size: 85%; +} +cite { + font-style: normal; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; +} +.text-justify { + text-align: justify; +} +.text-muted { + color: #999999; +} +.text-primary { + color: #428bca; +} +a.text-primary:hover { + color: #3071a9; +} +.text-success { + color: #3c763d; +} +a.text-success:hover { + color: #2b542c; +} +.text-info { + color: #31708f; +} +a.text-info:hover { + color: #245269; +} +.text-warning { + color: #8a6d3b; +} +a.text-warning:hover { + color: #66512c; +} +.text-danger { + color: #a94442; +} +a.text-danger:hover { + color: #843534; +} +.bg-primary { + color: #fff; + background-color: #428bca; +} +a.bg-primary:hover { + background-color: #3071a9; +} +.bg-success { + background-color: #dff0d8; +} +a.bg-success:hover { + background-color: #c1e2b3; +} +.bg-info { + background-color: #d9edf7; +} +a.bg-info:hover { + background-color: #afd9ee; +} +.bg-warning { + background-color: #fcf8e3; +} +a.bg-warning:hover { + background-color: #f7ecb5; +} +.bg-danger { + background-color: #f2dede; +} +a.bg-danger:hover { + background-color: #e4b9b9; +} .page-header { padding-bottom: 9px; margin: 40px 0 20px; @@ -529,6 +594,7 @@ ol ol { padding-left: 0; } dl { + margin-top: 0; margin-bottom: 20px; } dt, @@ -554,77 +620,61 @@ dd { .dl-horizontal dd { margin-left: 180px; } - .dl-horizontal dd:before, - .dl-horizontal dd:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - - } - .dl-horizontal dd:after { - clear: both; - } - .dl-horizontal dd:before, - .dl-horizontal dd:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - - } - .dl-horizontal dd:after { - clear: both; - } } abbr[title], abbr[data-original-title] { cursor: help; border-bottom: 1px dotted #999999; } -abbr.initialism { +.initialism { font-size: 90%; text-transform: uppercase; } blockquote { padding: 10px 20px; margin: 0 0 20px; - border-left: 5px solid #eeeeee; -} -blockquote p { font-size: 17.5px; - font-weight: 300; - line-height: 1.25; + border-left: 5px solid #eeeeee; } -blockquote p:last-child { +blockquote p:last-child, +blockquote ul:last-child, +blockquote ol:last-child { margin-bottom: 0; } -blockquote small { +blockquote footer, +blockquote small, +blockquote .small { display: block; + font-size: 80%; line-height: 1.428571429; color: #999999; } -blockquote small:before { +blockquote footer:before, +blockquote small:before, +blockquote .small:before { content: '\2014 \00A0'; } +.blockquote-reverse, blockquote.pull-right { padding-right: 15px; padding-left: 0; border-right: 5px solid #eeeeee; border-left: 0; -} -blockquote.pull-right p, -blockquote.pull-right small, -blockquote.pull-right .small { text-align: right; } +.blockquote-reverse footer:before, +blockquote.pull-right footer:before, +.blockquote-reverse small:before, blockquote.pull-right small:before, +.blockquote-reverse .small:before, blockquote.pull-right .small:before { content: ''; } +.blockquote-reverse footer:after, +blockquote.pull-right footer:after, +.blockquote-reverse small:after, blockquote.pull-right small:after, +.blockquote-reverse .small:after, blockquote.pull-right .small:after { content: '\00A0 \2014'; } @@ -641,7 +691,7 @@ code, kbd, pre, samp { - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; + font-family: Menlo, Monaco, Consolas, "Courier New", monospace; } code { padding: 2px 4px; @@ -651,6 +701,14 @@ code { white-space: nowrap; border-radius: 4px; } +kbd { + padding: 2px 4px; + font-size: 90%; + color: #ffffff; + background-color: #333333; + border-radius: 3px; + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); +} pre { display: block; padding: 9.5px; @@ -682,65 +740,38 @@ pre code { padding-left: 15px; padding-right: 15px; } -.container:before, -.container:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - +@media (min-width: 768px) { + .container { + width: 750px; + } } -.container:after { - clear: both; +@media (min-width: 992px) { + .container { + width: 970px; + } } -.container:before, -.container:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - +@media (min-width: 1200px) { + .container { + width: 1170px; + } } -.container:after { - clear: both; +.container-fluid { + margin-right: auto; + margin-left: auto; + padding-left: 15px; + padding-right: 15px; } .row { margin-left: -15px; margin-right: -15px; } -.row:before, -.row:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.row:after { - clear: both; -} -.row:before, -.row:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.row:after { - clear: both; -} .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { position: relative; min-height: 1px; padding-left: 15px; padding-right: 15px; } -.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11 { +.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { float: left; } .col-xs-12 { @@ -897,10 +928,7 @@ pre code { margin-left: 0%; } @media (min-width: 768px) { - .container { - width: 750px; - } - .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11 { + .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { float: left; } .col-sm-12 { @@ -1058,10 +1086,7 @@ pre code { } } @media (min-width: 992px) { - .container { - width: 970px; - } - .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11 { + .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { float: left; } .col-md-12 { @@ -1219,10 +1244,7 @@ pre code { } } @media (min-width: 1200px) { - .container { - width: 1170px; - } - .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11 { + .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { float: left; } .col-lg-12 { @@ -1451,11 +1473,13 @@ th { background-color: #f5f5f5; } table col[class*="col-"] { + position: static; float: none; display: table-column; } table td[class*="col-"], table th[class*="col-"] { + position: static; float: none; display: table-cell; } @@ -1473,6 +1497,12 @@ table th[class*="col-"] { .table > tfoot > tr.active > th { background-color: #f5f5f5; } +.table-hover > tbody > tr > td.active:hover, +.table-hover > tbody > tr > th.active:hover, +.table-hover > tbody > tr.active:hover > td, +.table-hover > tbody > tr.active:hover > th { + background-color: #e8e8e8; +} .table > thead > tr > td.success, .table > tbody > tr > td.success, .table > tfoot > tr > td.success, @@ -1493,25 +1523,25 @@ table th[class*="col-"] { .table-hover > tbody > tr.success:hover > th { background-color: #d0e9c6; } -.table > thead > tr > td.danger, -.table > tbody > tr > td.danger, -.table > tfoot > tr > td.danger, -.table > thead > tr > th.danger, -.table > tbody > tr > th.danger, -.table > tfoot > tr > th.danger, -.table > thead > tr.danger > td, -.table > tbody > tr.danger > td, -.table > tfoot > tr.danger > td, -.table > thead > tr.danger > th, -.table > tbody > tr.danger > th, -.table > tfoot > tr.danger > th { - background-color: #f2dede; +.table > thead > tr > td.info, +.table > tbody > tr > td.info, +.table > tfoot > tr > td.info, +.table > thead > tr > th.info, +.table > tbody > tr > th.info, +.table > tfoot > tr > th.info, +.table > thead > tr.info > td, +.table > tbody > tr.info > td, +.table > tfoot > tr.info > td, +.table > thead > tr.info > th, +.table > tbody > tr.info > th, +.table > tfoot > tr.info > th { + background-color: #d9edf7; } -.table-hover > tbody > tr > td.danger:hover, -.table-hover > tbody > tr > th.danger:hover, -.table-hover > tbody > tr.danger:hover > td, -.table-hover > tbody > tr.danger:hover > th { - background-color: #ebcccc; +.table-hover > tbody > tr > td.info:hover, +.table-hover > tbody > tr > th.info:hover, +.table-hover > tbody > tr.info:hover > td, +.table-hover > tbody > tr.info:hover > th { + background-color: #c4e3f3; } .table > thead > tr > td.warning, .table > tbody > tr > td.warning, @@ -1533,6 +1563,26 @@ table th[class*="col-"] { .table-hover > tbody > tr.warning:hover > th { background-color: #faf2cc; } +.table > thead > tr > td.danger, +.table > tbody > tr > td.danger, +.table > tfoot > tr > td.danger, +.table > thead > tr > th.danger, +.table > tbody > tr > th.danger, +.table > tfoot > tr > th.danger, +.table > thead > tr.danger > td, +.table > tbody > tr.danger > td, +.table > tfoot > tr.danger > td, +.table > thead > tr.danger > th, +.table > tbody > tr.danger > th, +.table > tfoot > tr.danger > th { + background-color: #f2dede; +} +.table-hover > tbody > tr > td.danger:hover, +.table-hover > tbody > tr > th.danger:hover, +.table-hover > tbody > tr.danger:hover > td, +.table-hover > tbody > tr.danger:hover > th { + background-color: #ebcccc; +} @media (max-width: 767px) { .table-responsive { width: 100%; @@ -1584,6 +1634,7 @@ fieldset { padding: 0; margin: 0; border: 0; + min-width: 0; } legend { display: block; @@ -1611,39 +1662,32 @@ input[type="checkbox"] { margin: 4px 0 0; margin-top: 1px \9; /* IE8-9 */ - line-height: normal; } input[type="file"] { display: block; } +input[type="range"] { + display: block; + width: 100%; +} select[multiple], select[size] { height: auto; } -select optgroup { - font-size: inherit; - font-style: inherit; - font-family: inherit; -} input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -input[type="number"]::-webkit-outer-spin-button, -input[type="number"]::-webkit-inner-spin-button { - height: auto; -} output { display: block; padding-top: 7px; font-size: 14px; line-height: 1.428571429; color: #555555; - vertical-align: middle; } .form-control { display: block; @@ -1653,7 +1697,6 @@ output { font-size: 14px; line-height: 1.428571429; color: #555555; - vertical-align: middle; background-color: #ffffff; background-image: none; border: 1px solid #cccccc; @@ -1674,6 +1717,7 @@ output { } .form-control::-moz-placeholder { color: #999999; + opacity: 1; } .form-control:-ms-input-placeholder { color: #999999; @@ -1686,10 +1730,14 @@ output { fieldset[disabled] .form-control { cursor: not-allowed; background-color: #eeeeee; + opacity: 1; } textarea.form-control { height: auto; } +input[type="date"] { + line-height: 34px; +} .form-group { margin-bottom: 15px; } @@ -1700,12 +1748,10 @@ textarea.form-control { margin-top: 10px; margin-bottom: 10px; padding-left: 20px; - vertical-align: middle; } .radio label, .checkbox label { display: inline; - margin-bottom: 0; font-weight: normal; cursor: pointer; } @@ -1759,22 +1805,66 @@ select.input-sm { height: 30px; line-height: 30px; } -textarea.input-sm { +textarea.input-sm, +select[multiple].input-sm { height: auto; } .input-lg { - height: 45px; + height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.33; border-radius: 6px; } -select.input-lg { - height: 45px; - line-height: 45px; +select.input-lg { + height: 46px; + line-height: 46px; +} +textarea.input-lg, +select[multiple].input-lg { + height: auto; +} +.has-feedback { + position: relative; +} +.has-feedback .form-control { + padding-right: 42.5px; +} +.has-feedback .form-control-feedback { + position: absolute; + top: 25px; + right: 0; + display: block; + width: 34px; + height: 34px; + line-height: 34px; + text-align: center; +} +.has-success .help-block, +.has-success .control-label, +.has-success .radio, +.has-success .checkbox, +.has-success .radio-inline, +.has-success .checkbox-inline { + color: #3c763d; +} +.has-success .form-control { + border-color: #3c763d; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.has-success .form-control:focus { + border-color: #2b542c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168; } -textarea.input-lg { - height: auto; +.has-success .input-group-addon { + color: #3c763d; + border-color: #3c763d; + background-color: #dff0d8; +} +.has-success .form-control-feedback { + color: #3c763d; } .has-warning .help-block, .has-warning .control-label, @@ -1782,68 +1872,51 @@ textarea.input-lg { .has-warning .checkbox, .has-warning .radio-inline, .has-warning .checkbox-inline { - color: #c09853; + color: #8a6d3b; } .has-warning .form-control { - border-color: #c09853; + border-color: #8a6d3b; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-warning .form-control:focus { - border-color: #a47e3c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + border-color: #66512c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; } .has-warning .input-group-addon { - color: #c09853; - border-color: #c09853; + color: #8a6d3b; + border-color: #8a6d3b; background-color: #fcf8e3; } +.has-warning .form-control-feedback { + color: #8a6d3b; +} .has-error .help-block, .has-error .control-label, .has-error .radio, .has-error .checkbox, .has-error .radio-inline, .has-error .checkbox-inline { - color: #b94a48; + color: #a94442; } .has-error .form-control { - border-color: #b94a48; + border-color: #a94442; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-error .form-control:focus { - border-color: #953b39; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; + border-color: #843534; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; } .has-error .input-group-addon { - color: #b94a48; - border-color: #b94a48; + color: #a94442; + border-color: #a94442; background-color: #f2dede; } -.has-success .help-block, -.has-success .control-label, -.has-success .radio, -.has-success .checkbox, -.has-success .radio-inline, -.has-success .checkbox-inline { - color: #468847; -} -.has-success .form-control { - border-color: #468847; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} -.has-success .form-control:focus { - border-color: #356635; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -} -.has-success .input-group-addon { - color: #468847; - border-color: #468847; - background-color: #dff0d8; +.has-error .form-control-feedback { + color: #a94442; } .form-control-static { margin-bottom: 0; @@ -1862,6 +1935,12 @@ textarea.input-lg { } .form-inline .form-control { display: inline-block; + width: auto; + vertical-align: middle; + } + .form-inline .control-label { + margin-bottom: 0; + vertical-align: middle; } .form-inline .radio, .form-inline .checkbox { @@ -1869,12 +1948,16 @@ textarea.input-lg { margin-top: 0; margin-bottom: 0; padding-left: 0; + vertical-align: middle; } .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] { float: none; margin-left: 0; } + .form-inline .has-feedback .form-control-feedback { + top: 0; + } } .form-horizontal .control-label, .form-horizontal .radio, @@ -1885,34 +1968,14 @@ textarea.input-lg { margin-bottom: 0; padding-top: 7px; } +.form-horizontal .radio, +.form-horizontal .checkbox { + min-height: 27px; +} .form-horizontal .form-group { margin-left: -15px; margin-right: -15px; } -.form-horizontal .form-group:before, -.form-horizontal .form-group:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.form-horizontal .form-group:after { - clear: both; -} -.form-horizontal .form-group:before, -.form-horizontal .form-group:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.form-horizontal .form-group:after { - clear: both; -} .form-horizontal .form-control-static { padding-top: 7px; } @@ -1921,6 +1984,10 @@ textarea.input-lg { text-align: right; } } +.form-horizontal .has-feedback .form-control-feedback { + top: 0; + right: 15px; +} .btn { display: inline-block; margin-bottom: 0; @@ -1942,7 +2009,7 @@ textarea.input-lg { user-select: none; } .btn:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -2005,6 +2072,10 @@ fieldset[disabled] .btn-default.active { background-color: #ffffff; border-color: #cccccc; } +.btn-default .badge { + color: #ffffff; + background-color: #333333; +} .btn-primary { color: #ffffff; background-color: #428bca; @@ -2042,79 +2113,9 @@ fieldset[disabled] .btn-primary.active { background-color: #428bca; border-color: #357ebd; } -.btn-warning { - color: #ffffff; - background-color: #f0ad4e; - border-color: #eea236; -} -.btn-warning:hover, -.btn-warning:focus, -.btn-warning:active, -.btn-warning.active, -.open .dropdown-toggle.btn-warning { - color: #ffffff; - background-color: #ed9c28; - border-color: #d58512; -} -.btn-warning:active, -.btn-warning.active, -.open .dropdown-toggle.btn-warning { - background-image: none; -} -.btn-warning.disabled, -.btn-warning[disabled], -fieldset[disabled] .btn-warning, -.btn-warning.disabled:hover, -.btn-warning[disabled]:hover, -fieldset[disabled] .btn-warning:hover, -.btn-warning.disabled:focus, -.btn-warning[disabled]:focus, -fieldset[disabled] .btn-warning:focus, -.btn-warning.disabled:active, -.btn-warning[disabled]:active, -fieldset[disabled] .btn-warning:active, -.btn-warning.disabled.active, -.btn-warning[disabled].active, -fieldset[disabled] .btn-warning.active { - background-color: #f0ad4e; - border-color: #eea236; -} -.btn-danger { - color: #ffffff; - background-color: #d9534f; - border-color: #d43f3a; -} -.btn-danger:hover, -.btn-danger:focus, -.btn-danger:active, -.btn-danger.active, -.open .dropdown-toggle.btn-danger { - color: #ffffff; - background-color: #d2322d; - border-color: #ac2925; -} -.btn-danger:active, -.btn-danger.active, -.open .dropdown-toggle.btn-danger { - background-image: none; -} -.btn-danger.disabled, -.btn-danger[disabled], -fieldset[disabled] .btn-danger, -.btn-danger.disabled:hover, -.btn-danger[disabled]:hover, -fieldset[disabled] .btn-danger:hover, -.btn-danger.disabled:focus, -.btn-danger[disabled]:focus, -fieldset[disabled] .btn-danger:focus, -.btn-danger.disabled:active, -.btn-danger[disabled]:active, -fieldset[disabled] .btn-danger:active, -.btn-danger.disabled.active, -.btn-danger[disabled].active, -fieldset[disabled] .btn-danger.active { - background-color: #d9534f; - border-color: #d43f3a; +.btn-primary .badge { + color: #428bca; + background-color: #ffffff; } .btn-success { color: #ffffff; @@ -2153,6 +2154,10 @@ fieldset[disabled] .btn-success.active { background-color: #5cb85c; border-color: #4cae4c; } +.btn-success .badge { + color: #5cb85c; + background-color: #ffffff; +} .btn-info { color: #ffffff; background-color: #5bc0de; @@ -2190,6 +2195,92 @@ fieldset[disabled] .btn-info.active { background-color: #5bc0de; border-color: #46b8da; } +.btn-info .badge { + color: #5bc0de; + background-color: #ffffff; +} +.btn-warning { + color: #ffffff; + background-color: #f0ad4e; + border-color: #eea236; +} +.btn-warning:hover, +.btn-warning:focus, +.btn-warning:active, +.btn-warning.active, +.open .dropdown-toggle.btn-warning { + color: #ffffff; + background-color: #ed9c28; + border-color: #d58512; +} +.btn-warning:active, +.btn-warning.active, +.open .dropdown-toggle.btn-warning { + background-image: none; +} +.btn-warning.disabled, +.btn-warning[disabled], +fieldset[disabled] .btn-warning, +.btn-warning.disabled:hover, +.btn-warning[disabled]:hover, +fieldset[disabled] .btn-warning:hover, +.btn-warning.disabled:focus, +.btn-warning[disabled]:focus, +fieldset[disabled] .btn-warning:focus, +.btn-warning.disabled:active, +.btn-warning[disabled]:active, +fieldset[disabled] .btn-warning:active, +.btn-warning.disabled.active, +.btn-warning[disabled].active, +fieldset[disabled] .btn-warning.active { + background-color: #f0ad4e; + border-color: #eea236; +} +.btn-warning .badge { + color: #f0ad4e; + background-color: #ffffff; +} +.btn-danger { + color: #ffffff; + background-color: #d9534f; + border-color: #d43f3a; +} +.btn-danger:hover, +.btn-danger:focus, +.btn-danger:active, +.btn-danger.active, +.open .dropdown-toggle.btn-danger { + color: #ffffff; + background-color: #d2322d; + border-color: #ac2925; +} +.btn-danger:active, +.btn-danger.active, +.open .dropdown-toggle.btn-danger { + background-image: none; +} +.btn-danger.disabled, +.btn-danger[disabled], +fieldset[disabled] .btn-danger, +.btn-danger.disabled:hover, +.btn-danger[disabled]:hover, +fieldset[disabled] .btn-danger:hover, +.btn-danger.disabled:focus, +.btn-danger[disabled]:focus, +fieldset[disabled] .btn-danger:focus, +.btn-danger.disabled:active, +.btn-danger[disabled]:active, +fieldset[disabled] .btn-danger:active, +.btn-danger.disabled.active, +.btn-danger[disabled].active, +fieldset[disabled] .btn-danger.active { + background-color: #d9534f; + border-color: #d43f3a; +} +.btn-danger .badge { + color: #d9534f; + background-color: #ffffff; +} .btn-link { color: #428bca; font-weight: normal; @@ -2229,8 +2320,7 @@ fieldset[disabled] .btn-link:focus { line-height: 1.33; border-radius: 6px; } -.btn-sm, -.btn-xs { +.btn-sm { padding: 5px 10px; font-size: 12px; line-height: 1.5; @@ -2238,6 +2328,9 @@ fieldset[disabled] .btn-link:focus { } .btn-xs { padding: 1px 5px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; } .btn-block { display: block; @@ -2280,10 +2373,9 @@ input[type="button"].btn-block { height: 0; margin-left: 2px; vertical-align: middle; - border-top: 4px solid #000000; + border-top: 4px solid; border-right: 4px solid transparent; border-left: 4px solid transparent; - border-bottom: 0 dotted; } .dropdown { position: relative; @@ -2363,6 +2455,14 @@ input[type="button"].btn-block { .open > a { outline: 0; } +.dropdown-menu-right { + left: auto; + right: 0; +} +.dropdown-menu-left { + left: 0; + right: auto; +} .dropdown-header { display: block; padding: 3px 20px; @@ -2384,8 +2484,8 @@ input[type="button"].btn-block { } .dropup .caret, .navbar-fixed-bottom .dropdown .caret { - border-top: 0 dotted; - border-bottom: 4px solid #000000; + border-top: 0; + border-bottom: 4px solid; content: ""; } .dropup .dropdown-menu, @@ -2396,29 +2496,13 @@ input[type="button"].btn-block { } @media (min-width: 768px) { .navbar-right .dropdown-menu { - right: 0; left: auto; + right: 0; + } + .navbar-right .dropdown-menu-left { + left: 0; + right: auto; } -} -.btn-default .caret { - border-top-color: #333333; -} -.btn-primary .caret, -.btn-success .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret { - border-top-color: #fff; -} -.dropup .btn-default .caret { - border-bottom-color: #333333; -} -.dropup .btn-primary .caret, -.dropup .btn-success .caret, -.dropup .btn-warning .caret, -.dropup .btn-danger .caret, -.dropup .btn-info .caret { - border-bottom-color: #fff; } .btn-group, .btn-group-vertical { @@ -2451,37 +2535,16 @@ input[type="button"].btn-block { .btn-group .btn-group + .btn-group { margin-left: -1px; } -.btn-toolbar:before, -.btn-toolbar:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.btn-toolbar:after { - clear: both; -} -.btn-toolbar:before, -.btn-toolbar:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.btn-toolbar:after { - clear: both; +.btn-toolbar { + margin-left: -5px; } -.btn-toolbar .btn-group { +.btn-toolbar .btn-group, +.btn-toolbar .input-group { float: left; } -.btn-toolbar > .btn + .btn, -.btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group, -.btn-toolbar > .btn-group + .btn-group { +.btn-toolbar > .btn, +.btn-toolbar > .btn-group, +.btn-toolbar > .input-group { margin-left: 5px; } .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { @@ -2519,11 +2582,10 @@ input[type="button"].btn-block { outline: 0; } .btn-group-xs > .btn { - padding: 5px 10px; + padding: 1px 5px; font-size: 12px; line-height: 1.5; border-radius: 3px; - padding: 1px 5px; } .btn-group-sm > .btn { padding: 5px 10px; @@ -2560,39 +2622,16 @@ input[type="button"].btn-block { border-width: 5px 5px 0; border-bottom-width: 0; } -.dropup .btn-lg .caret { - border-width: 0 5px 5px; -} -.btn-group-vertical > .btn, -.btn-group-vertical > .btn-group { - display: block; - float: none; - width: 100%; - max-width: 100%; -} -.btn-group-vertical > .btn-group:before, -.btn-group-vertical > .btn-group:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.btn-group-vertical > .btn-group:after { - clear: both; -} -.btn-group-vertical > .btn-group:before, -.btn-group-vertical > .btn-group:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - +.dropup .btn-lg .caret { + border-width: 0 5px 5px; } -.btn-group-vertical > .btn-group:after { - clear: both; +.btn-group-vertical > .btn, +.btn-group-vertical > .btn-group, +.btn-group-vertical > .btn-group > .btn { + display: block; + float: none; + width: 100%; + max-width: 100%; } .btn-group-vertical > .btn-group > .btn { float: none; @@ -2620,12 +2659,12 @@ input[type="button"].btn-block { .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; } -.btn-group-vertical > .btn-group:first-child > .btn:last-child, -.btn-group-vertical > .btn-group:first-child > .dropdown-toggle { +.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child, +.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-bottom-left-radius: 0; } -.btn-group-vertical > .btn-group:last-child > .btn:first-child { +.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { border-top-right-radius: 0; border-top-left-radius: 0; } @@ -2635,11 +2674,15 @@ input[type="button"].btn-block { table-layout: fixed; border-collapse: separate; } -.btn-group-justified .btn { +.btn-group-justified > .btn, +.btn-group-justified > .btn-group { float: none; display: table-cell; width: 1%; } +.btn-group-justified > .btn-group .btn { + width: 100%; +} [data-toggle="buttons"] > .btn > input[type="radio"], [data-toggle="buttons"] > .btn > input[type="checkbox"] { display: none; @@ -2649,19 +2692,20 @@ input[type="button"].btn-block { display: table; border-collapse: separate; } -.input-group.col { +.input-group[class*="col-"] { float: none; padding-left: 0; padding-right: 0; } .input-group .form-control { + float: left; width: 100%; margin-bottom: 0; } .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { - height: 45px; + height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.33; @@ -2670,12 +2714,15 @@ input[type="button"].btn-block { select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { - height: 45px; - line-height: 45px; + height: 46px; + line-height: 46px; } textarea.input-group-lg > .form-control, textarea.input-group-lg > .input-group-addon, -textarea.input-group-lg > .input-group-btn > .btn { +textarea.input-group-lg > .input-group-btn > .btn, +select[multiple].input-group-lg > .form-control, +select[multiple].input-group-lg > .input-group-addon, +select[multiple].input-group-lg > .input-group-btn > .btn { height: auto; } .input-group-sm > .form-control, @@ -2695,7 +2742,10 @@ select.input-group-sm > .input-group-btn > .btn { } textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-addon, -textarea.input-group-sm > .input-group-btn > .btn { +textarea.input-group-sm > .input-group-btn > .btn, +select[multiple].input-group-sm > .form-control, +select[multiple].input-group-sm > .input-group-addon, +select[multiple].input-group-sm > .input-group-btn > .btn { height: auto; } .input-group-addon, @@ -2742,8 +2792,10 @@ textarea.input-group-sm > .input-group-btn > .btn { .input-group .form-control:first-child, .input-group-addon:first-child, .input-group-btn:first-child > .btn, +.input-group-btn:first-child > .btn-group > .btn, .input-group-btn:first-child > .dropdown-toggle, -.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { +.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), +.input-group-btn:last-child > .btn-group:not(:last-child) > .btn { border-bottom-right-radius: 0; border-top-right-radius: 0; } @@ -2753,8 +2805,10 @@ textarea.input-group-sm > .input-group-btn > .btn { .input-group .form-control:last-child, .input-group-addon:last-child, .input-group-btn:last-child > .btn, +.input-group-btn:last-child > .btn-group > .btn, .input-group-btn:last-child > .dropdown-toggle, -.input-group-btn:first-child > .btn:not(:first-child) { +.input-group-btn:first-child > .btn:not(:first-child), +.input-group-btn:first-child > .btn-group:not(:first-child) > .btn { border-bottom-left-radius: 0; border-top-left-radius: 0; } @@ -2763,53 +2817,33 @@ textarea.input-group-sm > .input-group-btn > .btn { } .input-group-btn { position: relative; + font-size: 0; white-space: nowrap; } -.input-group-btn:first-child > .btn { - margin-right: -1px; -} -.input-group-btn:last-child > .btn { - margin-left: -1px; -} .input-group-btn > .btn { position: relative; } .input-group-btn > .btn + .btn { - margin-left: -4px; + margin-left: -1px; } .input-group-btn > .btn:hover, +.input-group-btn > .btn:focus, .input-group-btn > .btn:active { z-index: 2; } +.input-group-btn:first-child > .btn, +.input-group-btn:first-child > .btn-group { + margin-right: -1px; +} +.input-group-btn:last-child > .btn, +.input-group-btn:last-child > .btn-group { + margin-left: -1px; +} .nav { margin-bottom: 0; padding-left: 0; list-style: none; } -.nav:before, -.nav:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.nav:after { - clear: both; -} -.nav:before, -.nav:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.nav:after { - clear: both; -} .nav > li { position: relative; display: block; @@ -2840,12 +2874,6 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #eeeeee; border-color: #428bca; } -.nav .open > a .caret, -.nav .open > a:hover .caret, -.nav .open > a:focus .caret { - border-top-color: #2a6496; - border-bottom-color: #2a6496; -} .nav .nav-divider { height: 1px; margin: 9px 0; @@ -2939,12 +2967,6 @@ textarea.input-group-sm > .input-group-btn > .btn { color: #ffffff; background-color: #428bca; } -.nav-pills > li.active > a .caret, -.nav-pills > li.active > a:hover .caret, -.nav-pills > li.active > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} .nav-stacked > li { float: none; } @@ -3004,14 +3026,6 @@ textarea.input-group-sm > .input-group-btn > .btn { .tab-content > .active { display: block; } -.nav .caret { - border-top-color: #428bca; - border-bottom-color: #428bca; -} -.nav a:hover .caret { - border-top-color: #2a6496; - border-bottom-color: #2a6496; -} .nav-tabs .dropdown-menu { margin-top: -1px; border-top-right-radius: 0; @@ -3023,59 +3037,11 @@ textarea.input-group-sm > .input-group-btn > .btn { margin-bottom: 20px; border: 1px solid transparent; } -.navbar:before, -.navbar:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.navbar:after { - clear: both; -} -.navbar:before, -.navbar:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.navbar:after { - clear: both; -} @media (min-width: 768px) { .navbar { border-radius: 4px; } } -.navbar-header:before, -.navbar-header:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.navbar-header:after { - clear: both; -} -.navbar-header:before, -.navbar-header:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.navbar-header:after { - clear: both; -} @media (min-width: 768px) { .navbar-header { float: left; @@ -3090,30 +3056,6 @@ textarea.input-group-sm > .input-group-btn > .btn { box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); -webkit-overflow-scrolling: touch; } -.navbar-collapse:before, -.navbar-collapse:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.navbar-collapse:after { - clear: both; -} -.navbar-collapse:before, -.navbar-collapse:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.navbar-collapse:after { - clear: both; -} .navbar-collapse.in { overflow-y: auto; } @@ -3130,26 +3072,27 @@ textarea.input-group-sm > .input-group-btn > .btn { overflow: visible !important; } .navbar-collapse.in { - overflow-y: auto; - } - .navbar-collapse .navbar-nav.navbar-left:first-child { - margin-left: -15px; - } - .navbar-collapse .navbar-nav.navbar-right:last-child { - margin-right: -15px; + overflow-y: visible; } - .navbar-collapse .navbar-text:last-child { - margin-right: 0; + .navbar-fixed-top .navbar-collapse, + .navbar-static-top .navbar-collapse, + .navbar-fixed-bottom .navbar-collapse { + padding-left: 0; + padding-right: 0; } } .container > .navbar-header, -.container > .navbar-collapse { +.container-fluid > .navbar-header, +.container > .navbar-collapse, +.container-fluid > .navbar-collapse { margin-right: -15px; margin-left: -15px; } @media (min-width: 768px) { .container > .navbar-header, - .container > .navbar-collapse { + .container-fluid > .navbar-header, + .container > .navbar-collapse, + .container-fluid > .navbar-collapse { margin-right: 0; margin-left: 0; } @@ -3190,13 +3133,15 @@ textarea.input-group-sm > .input-group-btn > .btn { padding: 15px 15px; font-size: 18px; line-height: 20px; + height: 50px; } .navbar-brand:hover, .navbar-brand:focus { text-decoration: none; } @media (min-width: 768px) { - .navbar > .container .navbar-brand { + .navbar > .container .navbar-brand, + .navbar > .container-fluid .navbar-brand { margin-left: -15px; } } @@ -3208,9 +3153,13 @@ textarea.input-group-sm > .input-group-btn > .btn { margin-top: 8px; margin-bottom: 8px; background-color: transparent; + background-image: none; border: 1px solid transparent; border-radius: 4px; } +.navbar-toggle:focus { + outline: none; +} .navbar-toggle .icon-bar { display: block; width: 22px; @@ -3267,6 +3216,9 @@ textarea.input-group-sm > .input-group-btn > .btn { padding-top: 15px; padding-bottom: 15px; } + .navbar-nav.navbar-right:last-child { + margin-right: -15px; + } } @media (min-width: 768px) { .navbar-left { @@ -3297,6 +3249,12 @@ textarea.input-group-sm > .input-group-btn > .btn { } .navbar-form .form-control { display: inline-block; + width: auto; + vertical-align: middle; + } + .navbar-form .control-label { + margin-bottom: 0; + vertical-align: middle; } .navbar-form .radio, .navbar-form .checkbox { @@ -3304,12 +3262,16 @@ textarea.input-group-sm > .input-group-btn > .btn { margin-top: 0; margin-bottom: 0; padding-left: 0; + vertical-align: middle; } .navbar-form .radio input[type="radio"], .navbar-form .checkbox input[type="checkbox"] { float: none; margin-left: 0; } + .navbar-form .has-feedback .form-control-feedback { + top: 0; + } } @media (max-width: 767px) { .navbar-form .form-group { @@ -3327,6 +3289,9 @@ textarea.input-group-sm > .input-group-btn > .btn { -webkit-box-shadow: none; box-shadow: none; } + .navbar-form.navbar-right:last-child { + margin-right: -15px; + } } .navbar-nav > li > .dropdown-menu { margin-top: 0; @@ -3337,25 +3302,31 @@ textarea.input-group-sm > .input-group-btn > .btn { border-bottom-right-radius: 0; border-bottom-left-radius: 0; } -.navbar-nav.pull-right > li > .dropdown-menu, -.navbar-nav > li > .dropdown-menu.pull-right { - left: auto; - right: 0; -} .navbar-btn { margin-top: 8px; margin-bottom: 8px; } +.navbar-btn.btn-sm { + margin-top: 10px; + margin-bottom: 10px; +} +.navbar-btn.btn-xs { + margin-top: 14px; + margin-bottom: 14px; +} .navbar-text { - float: left; margin-top: 15px; margin-bottom: 15px; } @media (min-width: 768px) { .navbar-text { + float: left; margin-left: 15px; margin-right: 15px; } + .navbar-text.navbar-right:last-child { + margin-right: 0; + } } .navbar-default { background-color: #f8f8f8; @@ -3400,33 +3371,18 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #dddddd; } .navbar-default .navbar-toggle .icon-bar { - background-color: #cccccc; + background-color: #888888; } .navbar-default .navbar-collapse, .navbar-default .navbar-form { border-color: #e7e7e7; } -.navbar-default .navbar-nav > .dropdown > a:hover .caret, -.navbar-default .navbar-nav > .dropdown > a:focus .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { background-color: #e7e7e7; color: #555555; } -.navbar-default .navbar-nav > .open > a .caret, -.navbar-default .navbar-nav > .open > a:hover .caret, -.navbar-default .navbar-nav > .open > a:focus .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} -.navbar-default .navbar-nav > .dropdown > a .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #777777; @@ -3510,24 +3466,13 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #080808; color: #ffffff; } -.navbar-inverse .navbar-nav > .dropdown > a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar-inverse .navbar-nav > .dropdown > a .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} -.navbar-inverse .navbar-nav > .open > a .caret, -.navbar-inverse .navbar-nav > .open > a:hover .caret, -.navbar-inverse .navbar-nav > .open > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808; } + .navbar-inverse .navbar-nav .open .dropdown-menu .divider { + background-color: #080808; + } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { color: #999999; } @@ -3589,6 +3534,7 @@ textarea.input-group-sm > .input-group-btn > .btn { padding: 6px 12px; line-height: 1.428571429; text-decoration: none; + color: #428bca; background-color: #ffffff; border: 1px solid #dddddd; margin-left: -1px; @@ -3608,7 +3554,9 @@ textarea.input-group-sm > .input-group-btn > .btn { .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { + color: #2a6496; background-color: #eeeeee; + border-color: #dddddd; } .pagination > .active > a, .pagination > .active > span, @@ -3669,30 +3617,6 @@ textarea.input-group-sm > .input-group-btn > .btn { list-style: none; text-align: center; } -.pager:before, -.pager:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.pager:after { - clear: both; -} -.pager:before, -.pager:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.pager:after { - clear: both; -} .pager li { display: inline; } @@ -3746,6 +3670,10 @@ textarea.input-group-sm > .input-group-btn > .btn { .label:empty { display: none; } +.btn .label { + position: relative; + top: -1px; +} .label-default { background-color: #999999; } @@ -3805,16 +3733,20 @@ textarea.input-group-sm > .input-group-btn > .btn { .badge:empty { display: none; } +.btn .badge { + position: relative; + top: -1px; +} +.btn-xs .badge { + top: 0; + padding: 1px 5px; +} a.badge:hover, a.badge:focus { color: #ffffff; text-decoration: none; cursor: pointer; } -.btn .badge { - position: relative; - top: -1px; -} a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #428bca; @@ -3826,22 +3758,24 @@ a.list-group-item.active > .badge, .jumbotron { padding: 30px; margin-bottom: 30px; - font-size: 21px; - font-weight: 200; - line-height: 2.1428571435; color: inherit; background-color: #eeeeee; } -.jumbotron h1 { - line-height: 1; +.jumbotron h1, +.jumbotron .h1 { color: inherit; } .jumbotron p { - line-height: 1.4; + margin-bottom: 15px; + font-size: 21px; + font-weight: 200; } .container .jumbotron { border-radius: 6px; } +.jumbotron .container { + max-width: 100%; +} @media screen and (min-width: 768px) { .jumbotron { padding-top: 48px; @@ -3851,25 +3785,24 @@ a.list-group-item.active > .badge, padding-left: 60px; padding-right: 60px; } - .jumbotron h1 { + .jumbotron h1, + .jumbotron .h1 { font-size: 63px; } } .thumbnail { + display: block; padding: 4px; + margin-bottom: 20px; line-height: 1.428571429; background-color: #ffffff; border: 1px solid #dddddd; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; - display: inline-block; - max-width: 100%; - height: auto; - display: block; - margin-bottom: 20px; } -.thumbnail > img { +.thumbnail > img, +.thumbnail a > img { display: block; max-width: 100%; height: auto; @@ -3917,46 +3850,46 @@ a.thumbnail.active { .alert-success { background-color: #dff0d8; border-color: #d6e9c6; - color: #468847; + color: #3c763d; } .alert-success hr { border-top-color: #c9e2b3; } .alert-success .alert-link { - color: #356635; + color: #2b542c; } .alert-info { background-color: #d9edf7; border-color: #bce8f1; - color: #3a87ad; + color: #31708f; } .alert-info hr { border-top-color: #a6e1ec; } .alert-info .alert-link { - color: #2d6987; + color: #245269; } .alert-warning { background-color: #fcf8e3; border-color: #faebcc; - color: #c09853; + color: #8a6d3b; } .alert-warning hr { border-top-color: #f7e1b5; } .alert-warning .alert-link { - color: #a47e3c; + color: #66512c; } .alert-danger { background-color: #f2dede; border-color: #ebccd1; - color: #b94a48; + color: #a94442; } .alert-danger hr { border-top-color: #e4b9c0; } .alert-danger .alert-link { - color: #953b39; + color: #843534; } @-webkit-keyframes progress-bar-stripes { from { @@ -3966,22 +3899,6 @@ a.thumbnail.active { background-position: 0 0; } } -@-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} -@-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} @keyframes progress-bar-stripes { from { background-position: 40px 0; @@ -4014,9 +3931,7 @@ a.thumbnail.active { transition: width 0.6s ease; } .progress-striped .progress-bar { - 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: 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-size: 40px 40px; } @@ -4028,36 +3943,28 @@ a.thumbnail.active { background-color: #5cb85c; } .progress-striped .progress-bar-success { - 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: 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-bar-info { background-color: #5bc0de; } .progress-striped .progress-bar-info { - 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: 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-bar-warning { background-color: #f0ad4e; } .progress-striped .progress-bar-warning { - 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: 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-bar-danger { background-color: #d9534f; } .progress-striped .progress-bar-danger { - 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: 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); } .media, @@ -4144,6 +4051,94 @@ a.list-group-item.active:hover .list-group-item-text, a.list-group-item.active:focus .list-group-item-text { color: #e1edf7; } +.list-group-item-success { + color: #3c763d; + background-color: #dff0d8; +} +a.list-group-item-success { + color: #3c763d; +} +a.list-group-item-success .list-group-item-heading { + color: inherit; +} +a.list-group-item-success:hover, +a.list-group-item-success:focus { + color: #3c763d; + background-color: #d0e9c6; +} +a.list-group-item-success.active, +a.list-group-item-success.active:hover, +a.list-group-item-success.active:focus { + color: #fff; + background-color: #3c763d; + border-color: #3c763d; +} +.list-group-item-info { + color: #31708f; + background-color: #d9edf7; +} +a.list-group-item-info { + color: #31708f; +} +a.list-group-item-info .list-group-item-heading { + color: inherit; +} +a.list-group-item-info:hover, +a.list-group-item-info:focus { + color: #31708f; + background-color: #c4e3f3; +} +a.list-group-item-info.active, +a.list-group-item-info.active:hover, +a.list-group-item-info.active:focus { + color: #fff; + background-color: #31708f; + border-color: #31708f; +} +.list-group-item-warning { + color: #8a6d3b; + background-color: #fcf8e3; +} +a.list-group-item-warning { + color: #8a6d3b; +} +a.list-group-item-warning .list-group-item-heading { + color: inherit; +} +a.list-group-item-warning:hover, +a.list-group-item-warning:focus { + color: #8a6d3b; + background-color: #faf2cc; +} +a.list-group-item-warning.active, +a.list-group-item-warning.active:hover, +a.list-group-item-warning.active:focus { + color: #fff; + background-color: #8a6d3b; + border-color: #8a6d3b; +} +.list-group-item-danger { + color: #a94442; + background-color: #f2dede; +} +a.list-group-item-danger { + color: #a94442; +} +a.list-group-item-danger .list-group-item-heading { + color: inherit; +} +a.list-group-item-danger:hover, +a.list-group-item-danger:focus { + color: #a94442; + background-color: #ebcccc; +} +a.list-group-item-danger.active, +a.list-group-item-danger.active:hover, +a.list-group-item-danger.active:focus { + color: #fff; + background-color: #a94442; + border-color: #a94442; +} .list-group-item-heading { margin-top: 0; margin-bottom: 5px; @@ -4163,54 +4158,82 @@ a.list-group-item.active:focus .list-group-item-text { .panel-body { padding: 15px; } -.panel-body:before, -.panel-body:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.panel-body:after { - clear: both; -} -.panel-body:before, -.panel-body:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.panel-body:after { - clear: both; -} .panel > .list-group { margin-bottom: 0; } .panel > .list-group .list-group-item { border-width: 1px 0; + border-radius: 0; } .panel > .list-group .list-group-item:first-child { - border-top-right-radius: 0; - border-top-left-radius: 0; + border-top: 0; } .panel > .list-group .list-group-item:last-child { border-bottom: 0; } +.panel > .list-group:first-child .list-group-item:first-child { + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} +.panel > .list-group:last-child .list-group-item:last-child { + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0; } .panel > .table, -.panel > .table-responsive { +.panel > .table-responsive > .table { margin-bottom: 0; } +.panel > .table:first-child > thead:first-child > tr:first-child td:first-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, +.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, +.panel > .table:first-child > thead:first-child > tr:first-child th:first-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, +.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { + border-top-left-radius: 3px; +} +.panel > .table:first-child > thead:first-child > tr:first-child td:last-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, +.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, +.panel > .table:first-child > thead:first-child > tr:first-child th:last-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, +.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { + border-top-right-radius: 3px; +} +.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, +.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { + border-bottom-left-radius: 3px; +} +.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, +.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { + border-bottom-right-radius: 3px; +} .panel > .panel-body + .table, .panel > .panel-body + .table-responsive { border-top: 1px solid #dddddd; } +.panel > .table > tbody:first-child > tr:first-child th, +.panel > .table > tbody:first-child > tr:first-child td { + border-top: 0; +} .panel > .table-bordered, .panel > .table-responsive > .table-bordered { border: 0; @@ -4243,6 +4266,20 @@ a.list-group-item.active:focus .list-group-item-text { .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0; } +.panel > .table-bordered > thead > tr:first-child > th, +.panel > .table-responsive > .table-bordered > thead > tr:first-child > th, +.panel > .table-bordered > tbody > tr:first-child > th, +.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th, +.panel > .table-bordered > tfoot > tr:first-child > th, +.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th, +.panel > .table-bordered > thead > tr:first-child > td, +.panel > .table-responsive > .table-bordered > thead > tr:first-child > td, +.panel > .table-bordered > tbody > tr:first-child > td, +.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td, +.panel > .table-bordered > tfoot > tr:first-child > td, +.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td { + border-top: 0; +} .panel > .table-bordered > thead > tr:last-child > th, .panel > .table-responsive > .table-bordered > thead > tr:last-child > th, .panel > .table-bordered > tbody > tr:last-child > th, @@ -4257,6 +4294,10 @@ a.list-group-item.active:focus .list-group-item-text { .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td { border-bottom: 0; } +.panel > .table-responsive { + border: 0; + margin-bottom: 0; +} .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; @@ -4270,6 +4311,7 @@ a.list-group-item.active:focus .list-group-item-text { margin-top: 0; margin-bottom: 0; font-size: 16px; + color: inherit; } .panel-title > a { color: inherit; @@ -4281,6 +4323,9 @@ a.list-group-item.active:focus .list-group-item-text { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; } +.panel-group { + margin-bottom: 20px; +} .panel-group .panel { margin-bottom: 0; border-radius: 4px; @@ -4312,9 +4357,6 @@ a.list-group-item.active:focus .list-group-item-text { .panel-default > .panel-heading + .panel-collapse .panel-body { border-top-color: #dddddd; } -.panel-default > .panel-heading > .dropdown .caret { - border-color: #333333 transparent; -} .panel-default > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #dddddd; } @@ -4329,9 +4371,6 @@ a.list-group-item.active:focus .list-group-item-text { .panel-primary > .panel-heading + .panel-collapse .panel-body { border-top-color: #428bca; } -.panel-primary > .panel-heading > .dropdown .caret { - border-color: #ffffff transparent; -} .panel-primary > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #428bca; } @@ -4339,33 +4378,41 @@ a.list-group-item.active:focus .list-group-item-text { border-color: #d6e9c6; } .panel-success > .panel-heading { - color: #468847; + color: #3c763d; background-color: #dff0d8; border-color: #d6e9c6; } .panel-success > .panel-heading + .panel-collapse .panel-body { border-top-color: #d6e9c6; } -.panel-success > .panel-heading > .dropdown .caret { - border-color: #468847 transparent; -} .panel-success > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #d6e9c6; } +.panel-info { + border-color: #bce8f1; +} +.panel-info > .panel-heading { + color: #31708f; + background-color: #d9edf7; + border-color: #bce8f1; +} +.panel-info > .panel-heading + .panel-collapse .panel-body { + border-top-color: #bce8f1; +} +.panel-info > .panel-footer + .panel-collapse .panel-body { + border-bottom-color: #bce8f1; +} .panel-warning { border-color: #faebcc; } .panel-warning > .panel-heading { - color: #c09853; + color: #8a6d3b; background-color: #fcf8e3; border-color: #faebcc; } .panel-warning > .panel-heading + .panel-collapse .panel-body { border-top-color: #faebcc; } -.panel-warning > .panel-heading > .dropdown .caret { - border-color: #c09853 transparent; -} .panel-warning > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #faebcc; } @@ -4373,36 +4420,16 @@ a.list-group-item.active:focus .list-group-item-text { border-color: #ebccd1; } .panel-danger > .panel-heading { - color: #b94a48; + color: #a94442; background-color: #f2dede; border-color: #ebccd1; } .panel-danger > .panel-heading + .panel-collapse .panel-body { border-top-color: #ebccd1; } -.panel-danger > .panel-heading > .dropdown .caret { - border-color: #b94a48 transparent; -} .panel-danger > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #ebccd1; } -.panel-info { - border-color: #bce8f1; -} -.panel-info > .panel-heading { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} -.panel-info > .panel-heading + .panel-collapse .panel-body { - border-top-color: #bce8f1; -} -.panel-info > .panel-heading > .dropdown .caret { - border-color: #3a87ad transparent; -} -.panel-info > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #bce8f1; -} .well { min-height: 20px; padding: 19px; @@ -4462,7 +4489,9 @@ button.close { right: 0; bottom: 0; left: 0; - z-index: 1040; + z-index: 1050; + -webkit-overflow-scrolling: touch; + outline: 0; } .modal.fade .modal-dialog { -webkit-transform: translate(0, -25%); @@ -4480,11 +4509,8 @@ button.close { } .modal-dialog { position: relative; - margin-left: auto; - margin-right: auto; width: auto; - padding: 10px; - z-index: 1050; + margin: 10px; } .modal-content { position: relative; @@ -4503,7 +4529,7 @@ button.close { right: 0; bottom: 0; left: 0; - z-index: 1030; + z-index: 1040; background-color: #000000; } .modal-backdrop.fade { @@ -4536,30 +4562,6 @@ button.close { text-align: right; border-top: 1px solid #e5e5e5; } -.modal-footer:before, -.modal-footer:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.modal-footer:after { - clear: both; -} -.modal-footer:before, -.modal-footer:after { - content: " "; - /* 1 */ - - display: table; - /* 2 */ - -} -.modal-footer:after { - clear: both; -} .modal-footer .btn + .btn { margin-left: 5px; margin-bottom: 0; @@ -4570,16 +4572,21 @@ button.close { .modal-footer .btn-block + .btn-block { margin-left: 0; } -@media screen and (min-width: 768px) { +@media (min-width: 768px) { .modal-dialog { width: 600px; - padding-top: 30px; - padding-bottom: 30px; + margin: 30px auto; } .modal-content { -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); } + .modal-sm { + width: 300px; + } + .modal-lg { + width: 900px; + } } .tooltip { position: absolute; @@ -4863,9 +4870,7 @@ button.close { text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); } .carousel-control.left { - background-image: -webkit-gradient(linear, 0% top, 100% top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0%), color-stop(rgba(0, 0, 0, 0.0001) 100%)); - background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); @@ -4873,15 +4878,14 @@ button.close { .carousel-control.right { left: auto; right: 0; - background-image: -webkit-gradient(linear, 0% top, 100% top, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0%), color-stop(rgba(0, 0, 0, 0.5) 100%)); - background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); } .carousel-control:hover, .carousel-control:focus { + outline: none; color: #ffffff; text-decoration: none; opacity: 0.9; @@ -4983,15 +4987,50 @@ button.close { } } .clearfix:before, -.clearfix:after { +.clearfix:after, +.container:before, +.container:after, +.container-fluid:before, +.container-fluid:after, +.row:before, +.row:after, +.form-horizontal .form-group:before, +.form-horizontal .form-group:after, +.btn-toolbar:before, +.btn-toolbar:after, +.btn-group-vertical > .btn-group:before, +.btn-group-vertical > .btn-group:after, +.nav:before, +.nav:after, +.navbar:before, +.navbar:after, +.navbar-header:before, +.navbar-header:after, +.navbar-collapse:before, +.navbar-collapse:after, +.pager:before, +.pager:after, +.panel-body:before, +.panel-body:after, +.modal-footer:before, +.modal-footer:after { content: " "; - /* 1 */ - display: table; - /* 2 */ - } -.clearfix:after { +.clearfix:after, +.container:after, +.container-fluid:after, +.row:after, +.form-horizontal .form-group:after, +.btn-toolbar:after, +.btn-group-vertical > .btn-group:after, +.nav:after, +.navbar:after, +.navbar-header:after, +.navbar-collapse:after, +.pager:after, +.panel-body:after, +.modal-footer:after { clear: both; } .center-block { @@ -5041,6 +5080,9 @@ td.visible-xs { .visible-xs { display: block !important; } + table.visible-xs { + display: table; + } tr.visible-xs { display: table-row !important; } @@ -5049,64 +5091,19 @@ td.visible-xs { display: table-cell !important; } } -@media (min-width: 768px) and (max-width: 991px) { - .visible-xs.visible-sm { - display: block !important; - } - tr.visible-xs.visible-sm { - display: table-row !important; - } - th.visible-xs.visible-sm, - td.visible-xs.visible-sm { - display: table-cell !important; - } -} -@media (min-width: 992px) and (max-width: 1199px) { - .visible-xs.visible-md { - display: block !important; - } - tr.visible-xs.visible-md { - display: table-row !important; - } - th.visible-xs.visible-md, - td.visible-xs.visible-md { - display: table-cell !important; - } -} -@media (min-width: 1200px) { - .visible-xs.visible-lg { - display: block !important; - } - tr.visible-xs.visible-lg { - display: table-row !important; - } - th.visible-xs.visible-lg, - td.visible-xs.visible-lg { - display: table-cell !important; - } -} .visible-sm, tr.visible-sm, th.visible-sm, td.visible-sm { display: none !important; } -@media (max-width: 767px) { - .visible-sm.visible-xs { - display: block !important; - } - tr.visible-sm.visible-xs { - display: table-row !important; - } - th.visible-sm.visible-xs, - td.visible-sm.visible-xs { - display: table-cell !important; - } -} @media (min-width: 768px) and (max-width: 991px) { .visible-sm { display: block !important; } + table.visible-sm { + display: table; + } tr.visible-sm { display: table-row !important; } @@ -5115,64 +5112,19 @@ td.visible-sm { display: table-cell !important; } } -@media (min-width: 992px) and (max-width: 1199px) { - .visible-sm.visible-md { - display: block !important; - } - tr.visible-sm.visible-md { - display: table-row !important; - } - th.visible-sm.visible-md, - td.visible-sm.visible-md { - display: table-cell !important; - } -} -@media (min-width: 1200px) { - .visible-sm.visible-lg { - display: block !important; - } - tr.visible-sm.visible-lg { - display: table-row !important; - } - th.visible-sm.visible-lg, - td.visible-sm.visible-lg { - display: table-cell !important; - } -} .visible-md, tr.visible-md, th.visible-md, td.visible-md { display: none !important; } -@media (max-width: 767px) { - .visible-md.visible-xs { - display: block !important; - } - tr.visible-md.visible-xs { - display: table-row !important; - } - th.visible-md.visible-xs, - td.visible-md.visible-xs { - display: table-cell !important; - } -} -@media (min-width: 768px) and (max-width: 991px) { - .visible-md.visible-sm { - display: block !important; - } - tr.visible-md.visible-sm { - display: table-row !important; - } - th.visible-md.visible-sm, - td.visible-md.visible-sm { - display: table-cell !important; - } -} @media (min-width: 992px) and (max-width: 1199px) { .visible-md { display: block !important; } + table.visible-md { + display: table; + } tr.visible-md { display: table-row !important; } @@ -5181,64 +5133,19 @@ td.visible-md { display: table-cell !important; } } -@media (min-width: 1200px) { - .visible-md.visible-lg { - display: block !important; - } - tr.visible-md.visible-lg { - display: table-row !important; - } - th.visible-md.visible-lg, - td.visible-md.visible-lg { - display: table-cell !important; - } -} .visible-lg, tr.visible-lg, th.visible-lg, td.visible-lg { display: none !important; } -@media (max-width: 767px) { - .visible-lg.visible-xs { - display: block !important; - } - tr.visible-lg.visible-xs { - display: table-row !important; - } - th.visible-lg.visible-xs, - td.visible-lg.visible-xs { - display: table-cell !important; - } -} -@media (min-width: 768px) and (max-width: 991px) { - .visible-lg.visible-sm { - display: block !important; - } - tr.visible-lg.visible-sm { - display: table-row !important; - } - th.visible-lg.visible-sm, - td.visible-lg.visible-sm { - display: table-cell !important; - } -} -@media (min-width: 992px) and (max-width: 1199px) { - .visible-lg.visible-md { - display: block !important; - } - tr.visible-lg.visible-md { - display: table-row !important; - } - th.visible-lg.visible-md, - td.visible-lg.visible-md { - display: table-cell !important; - } -} @media (min-width: 1200px) { .visible-lg { display: block !important; } + table.visible-lg { + display: table; + } tr.visible-lg { display: table-row !important; } @@ -5247,16 +5154,6 @@ td.visible-lg { display: table-cell !important; } } -.hidden-xs { - display: block !important; -} -tr.hidden-xs { - display: table-row !important; -} -th.hidden-xs, -td.hidden-xs { - display: table-cell !important; -} @media (max-width: 767px) { .hidden-xs, tr.hidden-xs, @@ -5265,48 +5162,6 @@ td.hidden-xs { display: none !important; } } -@media (min-width: 768px) and (max-width: 991px) { - .hidden-xs.hidden-sm, - tr.hidden-xs.hidden-sm, - th.hidden-xs.hidden-sm, - td.hidden-xs.hidden-sm { - display: none !important; - } -} -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-xs.hidden-md, - tr.hidden-xs.hidden-md, - th.hidden-xs.hidden-md, - td.hidden-xs.hidden-md { - display: none !important; - } -} -@media (min-width: 1200px) { - .hidden-xs.hidden-lg, - tr.hidden-xs.hidden-lg, - th.hidden-xs.hidden-lg, - td.hidden-xs.hidden-lg { - display: none !important; - } -} -.hidden-sm { - display: block !important; -} -tr.hidden-sm { - display: table-row !important; -} -th.hidden-sm, -td.hidden-sm { - display: table-cell !important; -} -@media (max-width: 767px) { - .hidden-sm.hidden-xs, - tr.hidden-sm.hidden-xs, - th.hidden-sm.hidden-xs, - td.hidden-sm.hidden-xs { - display: none !important; - } -} @media (min-width: 768px) and (max-width: 991px) { .hidden-sm, tr.hidden-sm, @@ -5315,48 +5170,6 @@ td.hidden-sm { display: none !important; } } -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-sm.hidden-md, - tr.hidden-sm.hidden-md, - th.hidden-sm.hidden-md, - td.hidden-sm.hidden-md { - display: none !important; - } -} -@media (min-width: 1200px) { - .hidden-sm.hidden-lg, - tr.hidden-sm.hidden-lg, - th.hidden-sm.hidden-lg, - td.hidden-sm.hidden-lg { - display: none !important; - } -} -.hidden-md { - display: block !important; -} -tr.hidden-md { - display: table-row !important; -} -th.hidden-md, -td.hidden-md { - display: table-cell !important; -} -@media (max-width: 767px) { - .hidden-md.hidden-xs, - tr.hidden-md.hidden-xs, - th.hidden-md.hidden-xs, - td.hidden-md.hidden-xs { - display: none !important; - } -} -@media (min-width: 768px) and (max-width: 991px) { - .hidden-md.hidden-sm, - tr.hidden-md.hidden-sm, - th.hidden-md.hidden-sm, - td.hidden-md.hidden-sm { - display: none !important; - } -} @media (min-width: 992px) and (max-width: 1199px) { .hidden-md, tr.hidden-md, @@ -5365,48 +5178,6 @@ td.hidden-md { display: none !important; } } -@media (min-width: 1200px) { - .hidden-md.hidden-lg, - tr.hidden-md.hidden-lg, - th.hidden-md.hidden-lg, - td.hidden-md.hidden-lg { - display: none !important; - } -} -.hidden-lg { - display: block !important; -} -tr.hidden-lg { - display: table-row !important; -} -th.hidden-lg, -td.hidden-lg { - display: table-cell !important; -} -@media (max-width: 767px) { - .hidden-lg.hidden-xs, - tr.hidden-lg.hidden-xs, - th.hidden-lg.hidden-xs, - td.hidden-lg.hidden-xs { - display: none !important; - } -} -@media (min-width: 768px) and (max-width: 991px) { - .hidden-lg.hidden-sm, - tr.hidden-lg.hidden-sm, - th.hidden-lg.hidden-sm, - td.hidden-lg.hidden-sm { - display: none !important; - } -} -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-lg.hidden-md, - tr.hidden-lg.hidden-md, - th.hidden-lg.hidden-md, - td.hidden-lg.hidden-md { - display: none !important; - } -} @media (min-width: 1200px) { .hidden-lg, tr.hidden-lg, @@ -5425,6 +5196,9 @@ td.visible-print { .visible-print { display: block !important; } + table.visible-print { + display: table; + } tr.visible-print { display: table-row !important; } @@ -5432,6 +5206,8 @@ td.visible-print { td.visible-print { display: table-cell !important; } +} +@media print { .hidden-print, tr.hidden-print, th.hidden-print, @@ -6921,6 +6697,11 @@ a .icon-flip-vertical:before { font-weight: 300; font-style: normal; } +@media screen and (-webkit-min-device-pixel-ratio: 0) { + select { + font-family: sans-serif; + } +} body { padding-top: 50px; } @@ -6935,7 +6716,6 @@ header#layout-header .navbar-brand { margin-bottom: 20px; padding: 20px; border-left: 3px solid #eeeeee; - border-radius: 4px; } .callout h4 { margin-top: 0; @@ -6949,19 +6729,26 @@ header#layout-header .navbar-brand { border-color: #ebccd1; } .callout-danger h4 { - color: #b94a48; + color: #a94442; } .callout-warning { background-color: #faf8f0; border-color: #faebcc; } .callout-warning h4 { - color: #c09853; + color: #8a6d3b; } .callout-info { background-color: #f4f8fa; border-color: #bce8f1; } .callout-info h4 { - color: #3a87ad; + color: #31708f; +} +.callout-success { + background-color: #f9fdf7; + border-color: #d6e9c6; +} +.callout-success h4 { + color: #3c763d; } diff --git a/assets/less/theme/fonts.less b/assets/less/theme/fonts.less index 370fbe0..9e2a2aa 100644 --- a/assets/less/theme/fonts.less +++ b/assets/less/theme/fonts.less @@ -46,4 +46,14 @@ url('../fonts/lato-light-webfont.ttf') format('truetype'); font-weight: 300; font-style: normal; +} + +// +// Chrome exhibits strange behavior when custom fonts are used +// on select inputs. This fixes the garbled text. +// +@media screen and (-webkit-min-device-pixel-ratio:0) { + select { + font-family: sans-serif; + } } \ No newline at end of file diff --git a/layouts/default.htm b/layouts/default.htm index d89c081..6826036 100644 --- a/layouts/default.htm +++ b/layouts/default.htm @@ -31,9 +31,9 @@ @@ -53,7 +53,7 @@ {% framework extras %} diff --git a/partials/calcresult.htm b/partials/calcresult.htm index da24555..5551575 100644 --- a/partials/calcresult.htm +++ b/partials/calcresult.htm @@ -1,9 +1,9 @@ {% if result %} - - The result is {{ result }} - + + The result is {{ result }} + {% else %} - - Click the Calculate button to find the answer. - + + Click the Calculate button to find the answer. + {% endif %} \ No newline at end of file