diff --git a/app/assets/javascripts/app/lib/bootstrap/button.js b/app/assets/javascripts/app/lib/bootstrap/button.js index fc73b555f..c9fdde5e4 100644 --- a/app/assets/javascripts/app/lib/bootstrap/button.js +++ b/app/assets/javascripts/app/lib/bootstrap/button.js @@ -1,6 +1,6 @@ /* ======================================================================== - * Bootstrap: button.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#buttons + * Bootstrap: button.js v3.0.3 + * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -54,15 +54,21 @@ Button.prototype.toggle = function () { var $parent = this.$element.closest('[data-toggle="buttons"]') + var changed = true if ($parent.length) { var $input = this.$element.find('input') - .prop('checked', !this.$element.hasClass('active')) - .trigger('change') - if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active') + if ($input.prop('type') === 'radio') { + // see if clicking on current one + if ($input.prop('checked') && this.$element.hasClass('active')) + changed = false + else + $parent.find('.active').removeClass('active') + } + if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change') } - this.$element.toggleClass('active') + if (changed) this.$element.toggleClass('active') } @@ -106,4 +112,4 @@ e.preventDefault() }) -}(window.jQuery); +}(jQuery); diff --git a/app/assets/javascripts/app/lib/bootstrap/collapse.js b/app/assets/javascripts/app/lib/bootstrap/collapse.js index 92cc0bc76..1a079938e 100644 --- a/app/assets/javascripts/app/lib/bootstrap/collapse.js +++ b/app/assets/javascripts/app/lib/bootstrap/collapse.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: collapse.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#collapse + * Bootstrap: collapse.js v3.0.3 + * http://getbootstrap.com/javascript/#collapse * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -176,4 +176,4 @@ $target.collapse(option) }) -}(window.jQuery); +}(jQuery); diff --git a/app/assets/javascripts/app/lib/bootstrap/dropdown.js b/app/assets/javascripts/app/lib/bootstrap/dropdown.js index 6093f11a8..13352ef7c 100644 --- a/app/assets/javascripts/app/lib/bootstrap/dropdown.js +++ b/app/assets/javascripts/app/lib/bootstrap/dropdown.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: dropdown.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#dropdowns + * Bootstrap: dropdown.js v3.0.3 + * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ var backdrop = '.dropdown-backdrop' var toggle = '[data-toggle=dropdown]' var Dropdown = function (element) { - var $el = $(element).on('click.bs.dropdown', this.toggle) + $(element).on('click.bs.dropdown', this.toggle) } Dropdown.prototype.toggle = function (e) { @@ -41,7 +41,7 @@ if (!isActive) { if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { - // if mobile we we use a backdrop because click events don't delegate + // if mobile we use a backdrop because click events don't delegate $('
').insertAfter($(this)).on('click', clearMenus) } @@ -123,9 +123,9 @@ $.fn.dropdown = function (option) { return this.each(function () { var $this = $(this) - var data = $this.data('dropdown') + var data = $this.data('bs.dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (!data) $this.data('bs.dropdown', (data = new Dropdown(this))) if (typeof option == 'string') data[option].call($this) }) } @@ -151,4 +151,4 @@ .on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle) .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) -}(window.jQuery); +}(jQuery); diff --git a/app/assets/javascripts/app/lib/bootstrap/modal.js b/app/assets/javascripts/app/lib/bootstrap/modal.js index 65eba481e..3ead5ee88 100644 --- a/app/assets/javascripts/app/lib/bootstrap/modal.js +++ b/app/assets/javascripts/app/lib/bootstrap/modal.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: modal.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#modals + * Bootstrap: modal.js v3.0.3 + * http://getbootstrap.com/javascript/#modals * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -243,4 +243,4 @@ .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') }) .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) -}(window.jQuery); +}(jQuery); diff --git a/app/assets/javascripts/app/lib/bootstrap/popover.js b/app/assets/javascripts/app/lib/bootstrap/popover.js index ecd37ac23..996962aa2 100644 --- a/app/assets/javascripts/app/lib/bootstrap/popover.js +++ b/app/assets/javascripts/app/lib/bootstrap/popover.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: popover.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#popovers + * Bootstrap: popover.js v3.0.3 + * http://getbootstrap.com/javascript/#popovers * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -114,4 +114,4 @@ return this } -}(window.jQuery); +}(jQuery); diff --git a/app/assets/javascripts/app/lib/bootstrap/tab.js b/app/assets/javascripts/app/lib/bootstrap/tab.js index e1c155920..6b0f5f672 100644 --- a/app/assets/javascripts/app/lib/bootstrap/tab.js +++ b/app/assets/javascripts/app/lib/bootstrap/tab.js @@ -1,8 +1,8 @@ /* ======================================================================== - * Bootstrap: tab.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#tabs + * Bootstrap: tab.js v3.0.3 + * http://getbootstrap.com/javascript/#tabs * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ Tab.prototype.show = function () { var $this = this.element var $ul = $this.closest('ul:not(.dropdown-menu)') - var selector = $this.attr('data-target') + var selector = $this.data('target') if (!selector) { selector = $this.attr('href') @@ -132,4 +132,4 @@ $(this).tab('show') }) -}(window.jQuery); +}(jQuery); diff --git a/app/assets/javascripts/app/lib/bootstrap/tooltip.js b/app/assets/javascripts/app/lib/bootstrap/tooltip.js index 89802287a..4c848f0e2 100644 --- a/app/assets/javascripts/app/lib/bootstrap/tooltip.js +++ b/app/assets/javascripts/app/lib/bootstrap/tooltip.js @@ -1,9 +1,9 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#tooltip + * Bootstrap: tooltip.js v3.0.3 + * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -383,4 +383,4 @@ return this } -}(window.jQuery); +}(jQuery); diff --git a/app/assets/javascripts/app/lib/bootstrap/transition.js b/app/assets/javascripts/app/lib/bootstrap/transition.js index e8f318beb..773dbe693 100644 --- a/app/assets/javascripts/app/lib/bootstrap/transition.js +++ b/app/assets/javascripts/app/lib/bootstrap/transition.js @@ -1,6 +1,6 @@ /* ======================================================================== - * Bootstrap: transition.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#transitions + * Bootstrap: transition.js v3.0.3 + * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -53,4 +53,4 @@ $.support.transition = transitionEnd() }) -}(window.jQuery); +}(jQuery); diff --git a/app/assets/stylesheets/bootstrap.css b/app/assets/stylesheets/bootstrap.css index c5f2d7e96..377dff300 100644 --- a/app/assets/stylesheets/bootstrap.css +++ b/app/assets/stylesheets/bootstrap.css @@ -1,9 +1,7 @@ /*! - * Bootstrap v3.0.1 by @fat and @mdo + * Bootstrap v3.0.3 (http://getbootstrap.com) * Copyright 2013 Twitter, Inc. * Licensed under http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. */ /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ @@ -333,7 +331,7 @@ a:focus { } a:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -387,88 +385,6 @@ hr { 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, @@ -578,6 +494,88 @@ 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-muted { + color: #999999; +} + +.text-primary { + color: #428bca; +} + +.text-primary:hover { + color: #3071a9; +} + +.text-warning { + color: #8a6d3b; +} + +.text-warning:hover { + color: #66512c; +} + +.text-danger { + color: #a94442; +} + +.text-danger:hover { + color: #843534; +} + +.text-success { + color: #3c763d; +} + +.text-success:hover { + color: #2b542c; +} + +.text-info { + color: #31708f; +} + +.text-info:hover { + color: #245269; +} + +.text-left { + text-align: left; +} + +.text-right { + text-align: right; +} + +.text-center { + text-align: center; +} + .page-header { padding-bottom: 9px; margin: 40px 0 20px; @@ -618,6 +616,7 @@ ol ol { } dl { + margin-top: 0; margin-bottom: 20px; } @@ -671,7 +670,7 @@ abbr[data-original-title] { border-bottom: 1px dotted #999999; } -abbr.initialism { +.initialism { font-size: 90%; text-transform: uppercase; } @@ -692,13 +691,15 @@ blockquote p:last-child { margin-bottom: 0; } -blockquote small { +blockquote small, +blockquote .small { display: block; line-height: 1.428571429; color: #999999; } -blockquote small:before { +blockquote small:before, +blockquote .small:before { content: '\2014 \00A0'; } @@ -740,7 +741,7 @@ code, kbd, pre, samp { - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; + font-family: Menlo, Monaco, Consolas, "Courier New", monospace; } code { @@ -807,6 +808,24 @@ pre code { clear: both; } +@media (min-width: 768px) { + .container { + width: 750px; + } +} + +@media (min-width: 992px) { + .container { + width: 970px; + } +} + +@media (min-width: 1200px) { + .container { + width: 1170px; + } +} + .row { margin-right: -15px; margin-left: -15px; @@ -896,7 +915,8 @@ pre code { .col-xs-8, .col-xs-9, .col-xs-10, -.col-xs-11 { +.col-xs-11, +.col-xs-12 { float: left; } @@ -996,6 +1016,10 @@ pre code { right: 8.333333333333332%; } +.col-xs-pull-0 { + right: 0; +} + .col-xs-push-12 { left: 100%; } @@ -1044,6 +1068,10 @@ pre code { left: 8.333333333333332%; } +.col-xs-push-0 { + left: 0; +} + .col-xs-offset-12 { margin-left: 100%; } @@ -1092,10 +1120,11 @@ pre code { margin-left: 8.333333333333332%; } +.col-xs-offset-0 { + margin-left: 0; +} + @media (min-width: 768px) { - .container { - width: 750px; - } .col-sm-1, .col-sm-2, .col-sm-3, @@ -1106,7 +1135,8 @@ pre code { .col-sm-8, .col-sm-9, .col-sm-10, - .col-sm-11 { + .col-sm-11, + .col-sm-12 { float: left; } .col-sm-12 { @@ -1181,6 +1211,9 @@ pre code { .col-sm-pull-1 { right: 8.333333333333332%; } + .col-sm-pull-0 { + right: 0; + } .col-sm-push-12 { left: 100%; } @@ -1217,6 +1250,9 @@ pre code { .col-sm-push-1 { left: 8.333333333333332%; } + .col-sm-push-0 { + left: 0; + } .col-sm-offset-12 { margin-left: 100%; } @@ -1253,12 +1289,12 @@ pre code { .col-sm-offset-1 { margin-left: 8.333333333333332%; } + .col-sm-offset-0 { + margin-left: 0; + } } @media (min-width: 992px) { - .container { - width: 970px; - } .col-md-1, .col-md-2, .col-md-3, @@ -1269,7 +1305,8 @@ pre code { .col-md-8, .col-md-9, .col-md-10, - .col-md-11 { + .col-md-11, + .col-md-12 { float: left; } .col-md-12 { @@ -1344,6 +1381,9 @@ pre code { .col-md-pull-1 { right: 8.333333333333332%; } + .col-md-pull-0 { + right: 0; + } .col-md-push-12 { left: 100%; } @@ -1380,6 +1420,9 @@ pre code { .col-md-push-1 { left: 8.333333333333332%; } + .col-md-push-0 { + left: 0; + } .col-md-offset-12 { margin-left: 100%; } @@ -1416,12 +1459,12 @@ pre code { .col-md-offset-1 { margin-left: 8.333333333333332%; } + .col-md-offset-0 { + margin-left: 0; + } } @media (min-width: 1200px) { - .container { - width: 1170px; - } .col-lg-1, .col-lg-2, .col-lg-3, @@ -1432,7 +1475,8 @@ pre code { .col-lg-8, .col-lg-9, .col-lg-10, - .col-lg-11 { + .col-lg-11, + .col-lg-12 { float: left; } .col-lg-12 { @@ -1507,6 +1551,9 @@ pre code { .col-lg-pull-1 { right: 8.333333333333332%; } + .col-lg-pull-0 { + right: 0; + } .col-lg-push-12 { left: 100%; } @@ -1543,6 +1590,9 @@ pre code { .col-lg-push-1 { left: 8.333333333333332%; } + .col-lg-push-0 { + left: 0; + } .col-lg-offset-12 { margin-left: 100%; } @@ -1579,6 +1629,9 @@ pre code { .col-lg-offset-1 { margin-left: 8.333333333333332%; } + .col-lg-offset-0 { + margin-left: 0; + } } table { @@ -1667,6 +1720,7 @@ th { } table col[class*="col-"] { + position: static; display: table-column; float: none; } @@ -1677,84 +1731,75 @@ table th[class*="col-"] { float: none; } -.table > thead > tr > td.active, -.table > tbody > tr > td.active, -.table > tfoot > tr > td.active, -.table > thead > tr > th.active, -.table > tbody > tr > th.active, -.table > tfoot > tr > th.active, -.table > thead > tr.active > td, -.table > tbody > tr.active > td, -.table > tfoot > tr.active > td, -.table > thead > tr.active > th, -.table > tbody > tr.active > th, -.table > tfoot > tr.active > th { +.table > thead > tr > .active, +.table > tbody > tr > .active, +.table > tfoot > tr > .active, +.table > thead > .active > td, +.table > tbody > .active > td, +.table > tfoot > .active > td, +.table > thead > .active > th, +.table > tbody > .active > th, +.table > tfoot > .active > th { background-color: #f5f5f5; } -.table > thead > tr > td.success, -.table > tbody > tr > td.success, -.table > tfoot > tr > td.success, -.table > thead > tr > th.success, -.table > tbody > tr > th.success, -.table > tfoot > tr > th.success, -.table > thead > tr.success > td, -.table > tbody > tr.success > td, -.table > tfoot > tr.success > td, -.table > thead > tr.success > th, -.table > tbody > tr.success > th, -.table > tfoot > tr.success > th { +.table-hover > tbody > tr > .active:hover, +.table-hover > tbody > .active:hover > td, +.table-hover > tbody > .active:hover > th { + background-color: #e8e8e8; +} + +.table > thead > tr > .success, +.table > tbody > tr > .success, +.table > tfoot > tr > .success, +.table > thead > .success > td, +.table > tbody > .success > td, +.table > tfoot > .success > td, +.table > thead > .success > th, +.table > tbody > .success > th, +.table > tfoot > .success > th { background-color: #dff0d8; } -.table-hover > tbody > tr > td.success:hover, -.table-hover > tbody > tr > th.success:hover, -.table-hover > tbody > tr.success:hover > td, -.table-hover > tbody > tr.success:hover > th { +.table-hover > tbody > tr > .success:hover, +.table-hover > tbody > .success:hover > td, +.table-hover > tbody > .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 { +.table > thead > tr > .danger, +.table > tbody > tr > .danger, +.table > tfoot > tr > .danger, +.table > thead > .danger > td, +.table > tbody > .danger > td, +.table > tfoot > .danger > td, +.table > thead > .danger > th, +.table > tbody > .danger > th, +.table > tfoot > .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 { +.table-hover > tbody > tr > .danger:hover, +.table-hover > tbody > .danger:hover > td, +.table-hover > tbody > .danger:hover > th { background-color: #ebcccc; } -.table > thead > tr > td.warning, -.table > tbody > tr > td.warning, -.table > tfoot > tr > td.warning, -.table > thead > tr > th.warning, -.table > tbody > tr > th.warning, -.table > tfoot > tr > th.warning, -.table > thead > tr.warning > td, -.table > tbody > tr.warning > td, -.table > tfoot > tr.warning > td, -.table > thead > tr.warning > th, -.table > tbody > tr.warning > th, -.table > tfoot > tr.warning > th { +.table > thead > tr > .warning, +.table > tbody > tr > .warning, +.table > tfoot > tr > .warning, +.table > thead > .warning > td, +.table > tbody > .warning > td, +.table > tfoot > .warning > td, +.table > thead > .warning > th, +.table > tbody > .warning > th, +.table > tfoot > .warning > th { background-color: #fcf8e3; } -.table-hover > tbody > tr > td.warning:hover, -.table-hover > tbody > tr > th.warning:hover, -.table-hover > tbody > tr.warning:hover > td, -.table-hover > tbody > tr.warning:hover > th { +.table-hover > tbody > tr > .warning:hover, +.table-hover > tbody > .warning:hover > td, +.table-hover > tbody > .warning:hover > th { background-color: #faf2cc; } @@ -1863,7 +1908,7 @@ select optgroup { 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; } @@ -1882,22 +1927,6 @@ output { vertical-align: middle; } -.form-control:-moz-placeholder { - color: #999999; -} - -.form-control::-moz-placeholder { - color: #999999; -} - -.form-control:-ms-input-placeholder { - color: #999999; -} - -.form-control::-webkit-input-placeholder { - color: #999999; -} - .form-control { display: block; width: 100%; @@ -1924,6 +1953,23 @@ output { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); } +.form-control:-moz-placeholder { + color: #999999; +} + +.form-control::-moz-placeholder { + color: #999999; + opacity: 1; +} + +.form-control:-ms-input-placeholder { + color: #999999; +} + +.form-control::-webkit-input-placeholder { + color: #999999; +} + .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { @@ -2019,7 +2065,7 @@ textarea.input-sm { } .input-lg { - height: 45px; + height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.33; @@ -2027,8 +2073,8 @@ textarea.input-sm { } select.input-lg { - height: 45px; - line-height: 45px; + height: 46px; + line-height: 46px; } textarea.input-lg { @@ -2041,25 +2087,25 @@ 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; + color: #8a6d3b; background-color: #fcf8e3; - border-color: #c09853; + border-color: #8a6d3b; } .has-error .help-block, @@ -2068,25 +2114,25 @@ textarea.input-lg { .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; + color: #a94442; background-color: #f2dede; - border-color: #b94a48; + border-color: #a94442; } .has-success .help-block, @@ -2095,25 +2141,25 @@ textarea.input-lg { .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline { - color: #468847; + color: #3c763d; } .has-success .form-control { - border-color: #468847; + 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: #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; + 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; } .has-success .input-group-addon { - color: #468847; + color: #3c763d; background-color: #dff0d8; - border-color: #468847; + border-color: #3c763d; } .form-control-static { @@ -2136,6 +2182,9 @@ textarea.input-lg { .form-inline .form-control { display: inline-block; } + .form-inline select.form-control { + width: auto; + } .form-inline .radio, .form-inline .checkbox { display: inline-block; @@ -2160,6 +2209,11 @@ textarea.input-lg { margin-bottom: 0; } +.form-horizontal .radio, +.form-horizontal .checkbox { + min-height: 27px; +} + .form-horizontal .form-group { margin-right: -15px; margin-left: -15px; @@ -2217,7 +2271,7 @@ textarea.input-lg { } .btn:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -2288,6 +2342,11 @@ fieldset[disabled] .btn-default.active { border-color: #cccccc; } +.btn-default .badge { + color: #ffffff; + background-color: #fff; +} + .btn-primary { color: #ffffff; background-color: #428bca; @@ -2329,6 +2388,11 @@ fieldset[disabled] .btn-primary.active { border-color: #357ebd; } +.btn-primary .badge { + color: #428bca; + background-color: #fff; +} + .btn-warning { color: #ffffff; background-color: #f0ad4e; @@ -2370,6 +2434,11 @@ fieldset[disabled] .btn-warning.active { border-color: #eea236; } +.btn-warning .badge { + color: #f0ad4e; + background-color: #fff; +} + .btn-danger { color: #ffffff; background-color: #d9534f; @@ -2411,6 +2480,11 @@ fieldset[disabled] .btn-danger.active { border-color: #d43f3a; } +.btn-danger .badge { + color: #d9534f; + background-color: #fff; +} + .btn-success { color: #ffffff; background-color: #5cb85c; @@ -2452,6 +2526,11 @@ fieldset[disabled] .btn-success.active { border-color: #4cae4c; } +.btn-success .badge { + color: #5cb85c; + background-color: #fff; +} + .btn-info { color: #ffffff; background-color: #5bc0de; @@ -2493,6 +2572,11 @@ fieldset[disabled] .btn-info.active { border-color: #46b8da; } +.btn-info .badge { + color: #5bc0de; + background-color: #fff; +} + .btn-link { font-weight: normal; color: #428bca; @@ -2538,8 +2622,7 @@ fieldset[disabled] .btn-link:focus { border-radius: 6px; } -.btn-sm, -.btn-xs { +.btn-sm { padding: 5px 10px; font-size: 12px; line-height: 1.5; @@ -2548,6 +2631,9 @@ fieldset[disabled] .btn-link:focus { .btn-xs { padding: 1px 5px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; } .btn-block { @@ -2595,8 +2681,8 @@ input[type="button"].btn-block { @font-face { font-family: 'Glyphicons Halflings'; - src: url('fonts/glyphicons-halflings-regular.eot'); - src: url('fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('fonts/glyphicons-halflings-regular.woff') format('woff'), url('fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('../fonts/glyphicons-halflings-regular.eot'); + src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); } .glyphicon { @@ -3421,9 +3507,8 @@ 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-bottom: 0 dotted; border-left: 4px solid transparent; } @@ -3541,8 +3626,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: ""; } @@ -3560,30 +3645,6 @@ input[type="button"].btn-block { } } -.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 { position: relative; @@ -3695,7 +3756,6 @@ input[type="button"].btn-block { } .btn-group-xs > .btn { - padding: 5px 10px; padding: 1px 5px; font-size: 12px; line-height: 1.5; @@ -3750,7 +3810,8 @@ input[type="button"].btn-block { } .btn-group-vertical > .btn, -.btn-group-vertical > .btn-group { +.btn-group-vertical > .btn-group, +.btn-group-vertical > .btn-group > .btn { display: block; float: none; width: 100%; @@ -3827,12 +3888,17 @@ input[type="button"].btn-block { table-layout: fixed; } -.btn-group-justified .btn { +.btn-group-justified > .btn, +.btn-group-justified > .btn-group { display: table-cell; float: none; 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; @@ -3844,7 +3910,7 @@ input[type="button"].btn-block { border-collapse: separate; } -.input-group.col { +.input-group[class*="col-"] { float: none; padding-right: 0; padding-left: 0; @@ -3858,7 +3924,7 @@ input[type="button"].btn-block { .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; @@ -3868,8 +3934,8 @@ 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, @@ -4063,13 +4129,6 @@ textarea.input-group-sm > .input-group-btn > .btn { 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; @@ -4182,13 +4241,6 @@ textarea.input-group-sm > .input-group-btn > .btn { 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; } @@ -4261,16 +4313,6 @@ textarea.input-group-sm > .input-group-btn > .btn { 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; @@ -4383,16 +4425,13 @@ textarea.input-group-sm > .input-group-btn > .btn { overflow: visible !important; } .navbar-collapse.in { - overflow-y: auto; + overflow-y: visible; } - .navbar-collapse .navbar-nav.navbar-left:first-child { - margin-left: -15px; - } - .navbar-collapse .navbar-nav.navbar-right:last-child { - margin-right: -15px; - } - .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-right: 0; + padding-left: 0; } } @@ -4473,6 +4512,7 @@ textarea.input-group-sm > .input-group-btn > .btn { margin-right: 15px; margin-bottom: 8px; background-color: transparent; + background-image: none; border: 1px solid transparent; border-radius: 4px; } @@ -4539,6 +4579,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) { @@ -4571,6 +4614,9 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-form .form-control { display: inline-block; } + .navbar-form select.form-control { + width: auto; + } .navbar-form .radio, .navbar-form .checkbox { display: inline-block; @@ -4602,6 +4648,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 { @@ -4626,17 +4675,30 @@ textarea.input-group-sm > .input-group-btn > .btn { 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-right: 15px; margin-left: 15px; } + .navbar-text.navbar-right:last-child { + margin-right: 0; + } } .navbar-default { @@ -4700,12 +4762,6 @@ textarea.input-group-sm > .input-group-btn > .btn { 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 { @@ -4713,18 +4769,6 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #e7e7e7; } -.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; @@ -4824,27 +4868,13 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #080808; } -.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; } @@ -5090,6 +5120,11 @@ textarea.input-group-sm > .input-group-btn > .btn { display: none; } +.btn .label { + position: relative; + top: -1px; +} + .label-default { background-color: #999999; } @@ -5163,6 +5198,11 @@ textarea.input-group-sm > .input-group-btn > .btn { display: none; } +.btn .badge { + position: relative; + top: -1px; +} + a.badge:hover, a.badge:focus { color: #ffffff; @@ -5170,11 +5210,6 @@ a.badge:focus { cursor: pointer; } -.btn .badge { - position: relative; - top: -1px; -} - a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #428bca; @@ -5195,7 +5230,8 @@ a.list-group-item.active > .badge, background-color: #eeeeee; } -.jumbotron h1 { +.jumbotron h1, +.jumbotron .h1 { line-height: 1; color: inherit; } @@ -5208,6 +5244,10 @@ a.list-group-item.active > .badge, border-radius: 6px; } +.jumbotron .container { + max-width: 100%; +} + @media screen and (min-width: 768px) { .jumbotron { padding-top: 48px; @@ -5217,16 +5257,14 @@ a.list-group-item.active > .badge, padding-right: 60px; padding-left: 60px; } - .jumbotron h1 { + .jumbotron h1, + .jumbotron .h1 { font-size: 63px; } } .thumbnail { - display: inline-block; display: block; - height: auto; - max-width: 100%; padding: 4px; margin-bottom: 20px; line-height: 1.428571429; @@ -5237,7 +5275,8 @@ a.list-group-item.active > .badge, transition: all 0.2s ease-in-out; } -.thumbnail > img { +.thumbnail > img, +.thumbnail a > img { display: block; height: auto; max-width: 100%; @@ -5293,7 +5332,7 @@ a.thumbnail.active { } .alert-success { - color: #468847; + color: #3c763d; background-color: #dff0d8; border-color: #d6e9c6; } @@ -5303,11 +5342,11 @@ a.thumbnail.active { } .alert-success .alert-link { - color: #356635; + color: #2b542c; } .alert-info { - color: #3a87ad; + color: #31708f; background-color: #d9edf7; border-color: #bce8f1; } @@ -5317,11 +5356,11 @@ a.thumbnail.active { } .alert-info .alert-link { - color: #2d6987; + color: #245269; } .alert-warning { - color: #c09853; + color: #8a6d3b; background-color: #fcf8e3; border-color: #faebcc; } @@ -5331,11 +5370,11 @@ a.thumbnail.active { } .alert-warning .alert-link { - color: #a47e3c; + color: #66512c; } .alert-danger { - color: #b94a48; + color: #a94442; background-color: #f2dede; border-color: #ebccd1; } @@ -5345,7 +5384,7 @@ a.thumbnail.active { } .alert-danger .alert-link { - color: #953b39; + color: #843534; } @-webkit-keyframes progress-bar-stripes { @@ -5357,24 +5396,6 @@ a.thumbnail.active { } } -@-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; @@ -5410,9 +5431,7 @@ a.thumbnail.active { } .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; } @@ -5427,9 +5446,7 @@ a.thumbnail.active { } .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); } @@ -5438,9 +5455,7 @@ a.thumbnail.active { } .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); } @@ -5449,9 +5464,7 @@ a.thumbnail.active { } .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); } @@ -5460,9 +5473,7 @@ a.thumbnail.active { } .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); } @@ -5635,7 +5646,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel > .table, -.panel > .table-responsive { +.panel > .table-responsive > .table { margin-bottom: 0; } @@ -5644,6 +5655,11 @@ a.list-group-item.active:focus .list-group-item-text { border-top: 1px solid #dddddd; } +.panel > .table > tbody:first-child th, +.panel > .table > tbody:first-child td { + border-top: 0; +} + .panel > .table-bordered, .panel > .table-responsive > .table-bordered { border: 0; @@ -5694,6 +5710,11 @@ a.list-group-item.active:focus .list-group-item-text { border-bottom: 0; } +.panel > .table-responsive { + margin-bottom: 0; + border: 0; +} + .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; @@ -5709,6 +5730,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 { @@ -5763,10 +5785,6 @@ a.list-group-item.active:focus .list-group-item-text { 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; } @@ -5785,10 +5803,6 @@ a.list-group-item.active:focus .list-group-item-text { 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; } @@ -5798,7 +5812,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel-success > .panel-heading { - color: #468847; + color: #3c763d; background-color: #dff0d8; border-color: #d6e9c6; } @@ -5807,10 +5821,6 @@ a.list-group-item.active:focus .list-group-item-text { 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; } @@ -5820,7 +5830,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel-warning > .panel-heading { - color: #c09853; + color: #8a6d3b; background-color: #fcf8e3; border-color: #faebcc; } @@ -5829,10 +5839,6 @@ a.list-group-item.active:focus .list-group-item-text { 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; } @@ -5842,7 +5848,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel-danger > .panel-heading { - color: #b94a48; + color: #a94442; background-color: #f2dede; border-color: #ebccd1; } @@ -5851,10 +5857,6 @@ a.list-group-item.active:focus .list-group-item-text { 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; } @@ -5864,7 +5866,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel-info > .panel-heading { - color: #3a87ad; + color: #31708f; background-color: #d9edf7; border-color: #bce8f1; } @@ -5873,10 +5875,6 @@ a.list-group-item.active:focus .list-group-item-text { 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; } @@ -5971,9 +5969,7 @@ button.close { position: relative; z-index: 1050; width: auto; - padding: 10px; - margin-right: auto; - margin-left: auto; + margin: 10px; } .modal-content { @@ -6071,8 +6067,7 @@ button.close { @media screen and (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); @@ -6409,9 +6404,7 @@ button.close { } .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); @@ -6420,9 +6413,7 @@ button.close { .carousel-control.right { right: 0; left: auto; - 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); @@ -6432,6 +6423,7 @@ button.close { .carousel-control:focus { color: #ffffff; text-decoration: none; + outline: none; opacity: 0.9; filter: alpha(opacity=90); } @@ -6611,6 +6603,9 @@ td.visible-xs { .visible-xs { display: block !important; } + table.visible-xs { + display: table; + } tr.visible-xs { display: table-row !important; } @@ -6624,6 +6619,9 @@ td.visible-xs { .visible-xs.visible-sm { display: block !important; } + table.visible-xs.visible-sm { + display: table; + } tr.visible-xs.visible-sm { display: table-row !important; } @@ -6637,6 +6635,9 @@ td.visible-xs { .visible-xs.visible-md { display: block !important; } + table.visible-xs.visible-md { + display: table; + } tr.visible-xs.visible-md { display: table-row !important; } @@ -6650,6 +6651,9 @@ td.visible-xs { .visible-xs.visible-lg { display: block !important; } + table.visible-xs.visible-lg { + display: table; + } tr.visible-xs.visible-lg { display: table-row !important; } @@ -6670,6 +6674,9 @@ td.visible-sm { .visible-sm.visible-xs { display: block !important; } + table.visible-sm.visible-xs { + display: table; + } tr.visible-sm.visible-xs { display: table-row !important; } @@ -6683,6 +6690,9 @@ td.visible-sm { .visible-sm { display: block !important; } + table.visible-sm { + display: table; + } tr.visible-sm { display: table-row !important; } @@ -6696,6 +6706,9 @@ td.visible-sm { .visible-sm.visible-md { display: block !important; } + table.visible-sm.visible-md { + display: table; + } tr.visible-sm.visible-md { display: table-row !important; } @@ -6709,6 +6722,9 @@ td.visible-sm { .visible-sm.visible-lg { display: block !important; } + table.visible-sm.visible-lg { + display: table; + } tr.visible-sm.visible-lg { display: table-row !important; } @@ -6729,6 +6745,9 @@ td.visible-md { .visible-md.visible-xs { display: block !important; } + table.visible-md.visible-xs { + display: table; + } tr.visible-md.visible-xs { display: table-row !important; } @@ -6742,6 +6761,9 @@ td.visible-md { .visible-md.visible-sm { display: block !important; } + table.visible-md.visible-sm { + display: table; + } tr.visible-md.visible-sm { display: table-row !important; } @@ -6755,6 +6777,9 @@ td.visible-md { .visible-md { display: block !important; } + table.visible-md { + display: table; + } tr.visible-md { display: table-row !important; } @@ -6768,6 +6793,9 @@ td.visible-md { .visible-md.visible-lg { display: block !important; } + table.visible-md.visible-lg { + display: table; + } tr.visible-md.visible-lg { display: table-row !important; } @@ -6788,6 +6816,9 @@ td.visible-lg { .visible-lg.visible-xs { display: block !important; } + table.visible-lg.visible-xs { + display: table; + } tr.visible-lg.visible-xs { display: table-row !important; } @@ -6801,6 +6832,9 @@ td.visible-lg { .visible-lg.visible-sm { display: block !important; } + table.visible-lg.visible-sm { + display: table; + } tr.visible-lg.visible-sm { display: table-row !important; } @@ -6814,6 +6848,9 @@ td.visible-lg { .visible-lg.visible-md { display: block !important; } + table.visible-lg.visible-md { + display: table; + } tr.visible-lg.visible-md { display: table-row !important; } @@ -6827,6 +6864,9 @@ td.visible-lg { .visible-lg { display: block !important; } + table.visible-lg { + display: table; + } tr.visible-lg { display: table-row !important; } @@ -6840,6 +6880,10 @@ td.visible-lg { display: block !important; } +table.hidden-xs { + display: table; +} + tr.hidden-xs { display: table-row !important; } @@ -6889,6 +6933,10 @@ td.hidden-xs { display: block !important; } +table.hidden-sm { + display: table; +} + tr.hidden-sm { display: table-row !important; } @@ -6938,6 +6986,10 @@ td.hidden-sm { display: block !important; } +table.hidden-md { + display: table; +} + tr.hidden-md { display: table-row !important; } @@ -6987,6 +7039,10 @@ td.hidden-md { display: block !important; } +table.hidden-lg { + display: table; +} + tr.hidden-lg { display: table-row !important; } @@ -7043,6 +7099,9 @@ td.visible-print { .visible-print { display: block !important; } + table.visible-print { + display: table; + } tr.visible-print { display: table-row !important; }