Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Moved to bootstrap 2.2.2.

Browse source
This commit is contained in:
Martin Edenhofer 2013-01-07 19:20:48 +01:00
parent 4f10d35bad
commit 877d41b7b4
8 changed files with 351 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/javascripts/app/lib/bootstrap/bootstrap-button.js vendored
View file

@ -1,5 +1,5 @@
/* ============================================================ /* ============================================================
* bootstrap-button.js v2.2.1 * bootstrap-button.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#buttons * http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@ -64,6 +64,8 @@
/* BUTTON PLUGIN DEFINITION /* BUTTON PLUGIN DEFINITION
* ======================== */ * ======================== */
var old = $.fn.button
$.fn.button = function (option) { $.fn.button = function (option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
@ -82,6 +84,15 @@
$.fn.button.Constructor = Button $.fn.button.Constructor = Button
/* BUTTON NO CONFLICT
* ================== */
$.fn.button.noConflict = function () {
$.fn.button = old
return this
}
/* BUTTON DATA-API /* BUTTON DATA-API
* =============== */ * =============== */

19
app/assets/javascripts/app/lib/bootstrap/bootstrap-dropdown.js vendored
View file

@ -1,5 +1,5 @@
/* ============================================================ /* ============================================================
* bootstrap-dropdown.js v2.2.1 * bootstrap-dropdown.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#dropdowns * http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@ -53,9 +53,10 @@
if (!isActive) { if (!isActive) {
$parent.toggleClass('open') $parent.toggleClass('open')
$this.focus()
} }
$this.focus()
return false return false
} }
@ -82,7 +83,7 @@
if (!isActive || (isActive && e.keyCode == 27)) return $this.click() if (!isActive || (isActive && e.keyCode == 27)) return $this.click()
$items = $('[role=menu] li:not(.divider) a', $parent) $items = $('[role=menu] li:not(.divider):visible a', $parent)
if (!$items.length) return if (!$items.length) return
@ -124,6 +125,8 @@
/* DROPDOWN PLUGIN DEFINITION /* DROPDOWN PLUGIN DEFINITION
* ========================== */ * ========================== */
var old = $.fn.dropdown
$.fn.dropdown = function (option) { $.fn.dropdown = function (option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
@ -136,12 +139,22 @@
$.fn.dropdown.Constructor = Dropdown $.fn.dropdown.Constructor = Dropdown
/* DROPDOWN NO CONFLICT
* ==================== */
$.fn.dropdown.noConflict = function () {
$.fn.dropdown = old
return this
}
/* APPLY TO STANDARD DROPDOWN ELEMENTS /* APPLY TO STANDARD DROPDOWN ELEMENTS
* =================================== */ * =================================== */
$(document) $(document)
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)

13
app/assets/javascripts/app/lib/bootstrap/bootstrap-modal.js vendored
View file

@ -1,5 +1,5 @@
/* ========================================================= /* =========================================================
* bootstrap-modal.js v2.2.1 * bootstrap-modal.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#modals * http://twitter.github.com/bootstrap/javascript.html#modals
* ========================================================= * =========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@ -193,6 +193,8 @@
/* MODAL PLUGIN DEFINITION /* MODAL PLUGIN DEFINITION
* ======================= */ * ======================= */
var old = $.fn.modal
$.fn.modal = function (option) { $.fn.modal = function (option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
@ -213,6 +215,15 @@
$.fn.modal.Constructor = Modal $.fn.modal.Constructor = Modal
/* MODAL NO CONFLICT
* ================= */
$.fn.modal.noConflict = function () {
$.fn.modal = old
return this
}
/* MODAL DATA-API /* MODAL DATA-API
* ============== */ * ============== */

17
app/assets/javascripts/app/lib/bootstrap/bootstrap-popover.js vendored
View file

@ -1,5 +1,5 @@
/* =========================================================== /* ===========================================================
* bootstrap-popover.js v2.2.1 * bootstrap-popover.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#popovers * http://twitter.github.com/bootstrap/javascript.html#popovers
* =========================================================== * ===========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@ -44,7 +44,7 @@
, content = this.getContent() , content = this.getContent()
$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
$tip.find('.popover-content > *')[this.options.html ? 'html' : 'text'](content) $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
$tip.removeClass('fade top bottom left right in') $tip.removeClass('fade top bottom left right in')
} }
@ -81,6 +81,8 @@
/* POPOVER PLUGIN DEFINITION /* POPOVER PLUGIN DEFINITION
* ======================= */ * ======================= */
var old = $.fn.popover
$.fn.popover = function (option) { $.fn.popover = function (option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
@ -97,7 +99,16 @@
placement: 'right' placement: 'right'
, trigger: 'click' , trigger: 'click'
, content: '' , content: ''
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>' , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"></div></div></div>'
}) })
/* POPOVER NO CONFLICT
* =================== */
$.fn.popover.noConflict = function () {
$.fn.popover = old
return this
}
}(window.jQuery); }(window.jQuery);

13
app/assets/javascripts/app/lib/bootstrap/bootstrap-tab.js vendored
View file

@ -1,5 +1,5 @@
/* ======================================================== /* ========================================================
* bootstrap-tab.js v2.2.1 * bootstrap-tab.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#tabs * http://twitter.github.com/bootstrap/javascript.html#tabs
* ======================================================== * ========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@ -110,6 +110,8 @@
/* TAB PLUGIN DEFINITION /* TAB PLUGIN DEFINITION
* ===================== */ * ===================== */
var old = $.fn.tab
$.fn.tab = function ( option ) { $.fn.tab = function ( option ) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
@ -122,6 +124,15 @@
$.fn.tab.Constructor = Tab $.fn.tab.Constructor = Tab
/* TAB NO CONFLICT
* =============== */
$.fn.tab.noConflict = function () {
$.fn.tab = old
return this
}
/* TAB DATA-API /* TAB DATA-API
* ============ */ * ============ */

13
app/assets/javascripts/app/lib/bootstrap/bootstrap-tooltip.js vendored
View file

@ -1,5 +1,5 @@
/* =========================================================== /* ===========================================================
* bootstrap-tooltip.js v2.2.1 * bootstrap-tooltip.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#tooltips * http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* =========================================================== * ===========================================================
@ -250,6 +250,8 @@
/* TOOLTIP PLUGIN DEFINITION /* TOOLTIP PLUGIN DEFINITION
* ========================= */ * ========================= */
var old = $.fn.tooltip
$.fn.tooltip = function ( option ) { $.fn.tooltip = function ( option ) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
@ -273,4 +275,13 @@
, html: false , html: false
} }
/* TOOLTIP NO CONFLICT
* =================== */
$.fn.tooltip.noConflict = function () {
$.fn.tooltip = old
return this
}
}(window.jQuery); }(window.jQuery);

2
app/assets/javascripts/app/lib/bootstrap/bootstrap-transition.js vendored
View file

@ -1,5 +1,5 @@
/* =================================================== /* ===================================================
* bootstrap-transition.js v2.2.1 * bootstrap-transition.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#transitions * http://twitter.github.com/bootstrap/javascript.html#transitions
* =================================================== * ===================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

398
app/assets/stylesheets/bootstrap.css vendored
View file

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v2.2.1 * Bootstrap v2.2.2
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
@ -109,6 +109,17 @@ input[type="submit"] {
-webkit-appearance: button; -webkit-appearance: button;
} }
label,
select,
button,
input[type="button"],
input[type="reset"],
input[type="submit"],
input[type="radio"],
input[type="checkbox"] {
cursor: pointer;
}
input[type="search"] { input[type="search"] {
-webkit-box-sizing: content-box; -webkit-box-sizing: content-box;
-moz-box-sizing: content-box; -moz-box-sizing: content-box;
@ -126,6 +137,58 @@ textarea {
vertical-align: top; vertical-align: top;
} }
@media print {
* {
color: #000 !important;
text-shadow: none !important;
background: transparent !important;
box-shadow: none !important;
}
a,
a:visited {
text-decoration: underline;
}
a[href]:after {
content: " (" attr(href) ")";
}
abbr[title]:after {
content: " (" attr(title) ")";
}
.ir a:after,
a[href^="javascript:"]:after,
a[href^="#"]:after {
content: "";
}
pre,
blockquote {
border: 1px solid #999;
page-break-inside: avoid;
}
thead {
display: table-header-group;
}
tr,
img {
page-break-inside: avoid;
}
img {
max-width: 100% !important;
}
@page {
margin: 0.5cm;
}
p,
h2,
h3 {
orphans: 3;
widows: 3;
}
h2,
h3 {
page-break-after: avoid;
}
}
.clearfix { .clearfix {
*zoom: 1; *zoom: 1;
} }
@ -615,6 +678,10 @@ cite {
color: #999999; color: #999999;
} }
a.muted:hover {
color: #808080;
}
.text-warning { .text-warning {
color: #c09853; color: #c09853;
} }
@ -747,6 +814,19 @@ ol.unstyled {
list-style: none; list-style: none;
} }
ul.inline,
ol.inline {
margin-left: 0;
list-style: none;
}
ul.inline > li,
ol.inline > li {
display: inline-block;
padding-right: 5px;
padding-left: 5px;
}
dl { dl {
margin-bottom: 20px; margin-bottom: 20px;
} }
@ -883,6 +963,7 @@ pre {
code { code {
padding: 2px 4px; padding: 2px 4px;
color: #d14; color: #d14;
white-space: nowrap;
background-color: #f7f7f9; background-color: #f7f7f9;
border: 1px solid #e1e1e8; border: 1px solid #e1e1e8;
} }
@ -912,6 +993,8 @@ pre.prettyprint {
pre code { pre code {
padding: 0; padding: 0;
color: inherit; color: inherit;
white-space: pre;
white-space: pre-wrap;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
} }
@ -1069,7 +1152,6 @@ input[type="checkbox"] {
margin-top: 1px \9; margin-top: 1px \9;
*margin-top: 0; *margin-top: 0;
line-height: normal; line-height: normal;
cursor: pointer;
} }
input[type="file"], input[type="file"],
@ -1352,7 +1434,7 @@ input[type="checkbox"][readonly] {
background-color: transparent; background-color: transparent;
} }
.control-group.warning > label, .control-group.warning .control-label,
.control-group.warning .help-block, .control-group.warning .help-block,
.control-group.warning .help-inline { .control-group.warning .help-inline {
color: #c09853; color: #c09853;
@ -1391,7 +1473,7 @@ input[type="checkbox"][readonly] {
border-color: #c09853; border-color: #c09853;
} }
.control-group.error > label, .control-group.error .control-label,
.control-group.error .help-block, .control-group.error .help-block,
.control-group.error .help-inline { .control-group.error .help-inline {
color: #b94a48; color: #b94a48;
@ -1430,7 +1512,7 @@ input[type="checkbox"][readonly] {
border-color: #b94a48; border-color: #b94a48;
} }
.control-group.success > label, .control-group.success .control-label,
.control-group.success .help-block, .control-group.success .help-block,
.control-group.success .help-inline { .control-group.success .help-inline {
color: #468847; color: #468847;
@ -1469,7 +1551,7 @@ input[type="checkbox"][readonly] {
border-color: #468847; border-color: #468847;
} }
.control-group.info > label, .control-group.info .control-label,
.control-group.info .help-block, .control-group.info .help-block,
.control-group.info .help-inline { .control-group.info .help-inline {
color: #3a87ad; color: #3a87ad;
@ -1508,16 +1590,16 @@ input[type="checkbox"][readonly] {
border-color: #3a87ad; border-color: #3a87ad;
} }
input:focus:required:invalid, input:focus:invalid,
textarea:focus:required:invalid, textarea:focus:invalid,
select:focus:required:invalid { select:focus:invalid {
color: #b94a48; color: #b94a48;
border-color: #ee5f5b; border-color: #ee5f5b;
} }
input:focus:required:invalid:focus, input:focus:invalid:focus,
textarea:focus:required:invalid:focus, textarea:focus:invalid:focus,
select:focus:required:invalid:focus { select:focus:invalid:focus {
border-color: #e9322d; border-color: #e9322d;
-webkit-box-shadow: 0 0 6px #f8b9b7; -webkit-box-shadow: 0 0 6px #f8b9b7;
-moz-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7;
@ -1623,7 +1705,9 @@ select:focus:required:invalid:focus {
.input-append .add-on, .input-append .add-on,
.input-prepend .add-on, .input-prepend .add-on,
.input-append .btn, .input-append .btn,
.input-prepend .btn { .input-prepend .btn,
.input-append .btn-group > .dropdown-toggle,
.input-prepend .btn-group > .dropdown-toggle {
vertical-align: top; vertical-align: top;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
@ -1656,9 +1740,9 @@ select:focus:required:invalid:focus {
border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px;
} }
.input-append input + .btn-group .btn, .input-append input + .btn-group .btn:last-child,
.input-append select + .btn-group .btn, .input-append select + .btn-group .btn:last-child,
.input-append .uneditable-input + .btn-group .btn { .input-append .uneditable-input + .btn-group .btn:last-child {
-webkit-border-radius: 0 4px 4px 0; -webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0;
@ -1671,7 +1755,8 @@ select:focus:required:invalid:focus {
} }
.input-append .add-on:last-child, .input-append .add-on:last-child,
.input-append .btn:last-child { .input-append .btn:last-child,
.input-append .btn-group:last-child > .dropdown-toggle {
-webkit-border-radius: 0 4px 4px 0; -webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0;
@ -1874,7 +1959,10 @@ legend + .control-group {
.form-horizontal input + .help-block, .form-horizontal input + .help-block,
.form-horizontal select + .help-block, .form-horizontal select + .help-block,
.form-horizontal textarea + .help-block { .form-horizontal textarea + .help-block,
.form-horizontal .uneditable-input + .help-block,
.form-horizontal .input-prepend + .help-block,
.form-horizontal .input-append + .help-block {
margin-top: 10px; margin-top: 10px;
} }
@ -1924,6 +2012,10 @@ table {
border-top: 2px solid #dddddd; border-top: 2px solid #dddddd;
} }
.table .table {
background-color: #ffffff;
}
.table-condensed th, .table-condensed th,
.table-condensed td { .table-condensed td {
padding: 4px 5px; padding: 4px 5px;
@ -1956,39 +2048,48 @@ table {
border-top: 0; border-top: 0;
} }
.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered thead:first-child tr:first-child > th:first-child,
.table-bordered tbody:first-child tr:first-child td:first-child { .table-bordered tbody:first-child tr:first-child > td:first-child {
-webkit-border-top-left-radius: 4px; -webkit-border-top-left-radius: 4px;
border-top-left-radius: 4px; border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px; -moz-border-radius-topleft: 4px;
} }
.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered thead:first-child tr:first-child > th:last-child,
.table-bordered tbody:first-child tr:first-child td:last-child { .table-bordered tbody:first-child tr:first-child > td:last-child {
-webkit-border-top-right-radius: 4px; -webkit-border-top-right-radius: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
-moz-border-radius-topright: 4px; -moz-border-radius-topright: 4px;
} }
.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered thead:last-child tr:last-child > th:first-child,
.table-bordered tbody:last-child tr:last-child td:first-child, .table-bordered tbody:last-child tr:last-child > td:first-child,
.table-bordered tfoot:last-child tr:last-child td:first-child { .table-bordered tfoot:last-child tr:last-child > td:first-child {
-webkit-border-radius: 0 0 0 4px;
-moz-border-radius: 0 0 0 4px;
border-radius: 0 0 0 4px;
-webkit-border-bottom-left-radius: 4px; -webkit-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px; -moz-border-radius-bottomleft: 4px;
} }
.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered thead:last-child tr:last-child > th:last-child,
.table-bordered tbody:last-child tr:last-child td:last-child, .table-bordered tbody:last-child tr:last-child > td:last-child,
.table-bordered tfoot:last-child tr:last-child td:last-child { .table-bordered tfoot:last-child tr:last-child > td:last-child {
-webkit-border-bottom-right-radius: 4px; -webkit-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px; -moz-border-radius-bottomright: 4px;
} }
.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
-webkit-border-bottom-left-radius: 0;
border-bottom-left-radius: 0;
-moz-border-radius-bottomleft: 0;
}
.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
-webkit-border-bottom-right-radius: 0;
border-bottom-right-radius: 0;
-moz-border-radius-bottomright: 0;
}
.table-bordered caption + thead tr:first-child th:first-child, .table-bordered caption + thead tr:first-child th:first-child,
.table-bordered caption + tbody tr:first-child td:first-child, .table-bordered caption + tbody tr:first-child td:first-child,
.table-bordered colgroup + thead tr:first-child th:first-child, .table-bordered colgroup + thead tr:first-child th:first-child,
@ -2007,8 +2108,8 @@ table {
-moz-border-radius-topright: 4px; -moz-border-radius-topright: 4px;
} }
.table-striped tbody tr:nth-child(odd) td, .table-striped tbody > tr:nth-child(odd) > td,
.table-striped tbody tr:nth-child(odd) th { .table-striped tbody > tr:nth-child(odd) > th {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
@ -2835,7 +2936,7 @@ table th[class*="span"],
.dropdown-menu .active > a, .dropdown-menu .active > a,
.dropdown-menu .active > a:hover { .dropdown-menu .active > a:hover {
color: #333333; color: #ffffff;
text-decoration: none; text-decoration: none;
background-color: #0081c2; background-color: #0081c2;
background-image: -moz-linear-gradient(top, #0088cc, #0077b3); background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
@ -2858,6 +2959,7 @@ table th[class*="span"],
cursor: default; cursor: default;
background-color: transparent; background-color: transparent;
background-image: none; background-image: none;
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
} }
.open { .open {
@ -2951,6 +3053,7 @@ table th[class*="span"],
} }
.typeahead { .typeahead {
z-index: 1051;
margin-top: 2px; margin-top: 2px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
@ -3051,7 +3154,6 @@ button.close {
*margin-left: .3em; *margin-left: .3em;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
*line-height: 20px;
color: #333333; color: #333333;
text-align: center; text-align: center;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
@ -3103,10 +3205,6 @@ button.close {
.btn:hover { .btn:hover {
color: #333333; color: #333333;
text-decoration: none; text-decoration: none;
background-color: #e6e6e6;
*background-color: #d9d9d9;
/* Buttons in IE7 don't get borders, so darken on hover */
background-position: 0 -15px; background-position: 0 -15px;
-webkit-transition: background-position 0.1s linear; -webkit-transition: background-position 0.1s linear;
-moz-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear;
@ -3122,8 +3220,6 @@ button.close {
.btn.active, .btn.active,
.btn:active { .btn:active {
background-color: #e6e6e6;
background-color: #d9d9d9 \9;
background-image: none; background-image: none;
outline: 0; outline: 0;
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
@ -3134,7 +3230,6 @@ button.close {
.btn.disabled, .btn.disabled,
.btn[disabled] { .btn[disabled] {
cursor: default; cursor: default;
background-color: #e6e6e6;
background-image: none; background-image: none;
opacity: 0.65; opacity: 0.65;
filter: alpha(opacity=65); filter: alpha(opacity=65);
@ -3153,7 +3248,7 @@ button.close {
.btn-large [class^="icon-"], .btn-large [class^="icon-"],
.btn-large [class*=" icon-"] { .btn-large [class*=" icon-"] {
margin-top: 2px; margin-top: 4px;
} }
.btn-small { .btn-small {
@ -3169,8 +3264,13 @@ button.close {
margin-top: 0; margin-top: 0;
} }
.btn-mini [class^="icon-"],
.btn-mini [class*=" icon-"] {
margin-top: -1px;
}
.btn-mini { .btn-mini {
padding: 1px 6px; padding: 0 6px;
font-size: 10.5px; font-size: 10.5px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
@ -3488,9 +3588,9 @@ input[type="submit"].btn.btn-mini {
font-size: 0; font-size: 0;
} }
.btn-toolbar .btn + .btn, .btn-toolbar > .btn + .btn,
.btn-toolbar .btn-group + .btn, .btn-toolbar > .btn-group + .btn,
.btn-toolbar .btn + .btn-group { .btn-toolbar > .btn + .btn-group {
margin-left: 5px; margin-left: 5px;
} }
@ -3506,20 +3606,21 @@ input[type="submit"].btn.btn-mini {
} }
.btn-group > .btn, .btn-group > .btn,
.btn-group > .dropdown-menu { .btn-group > .dropdown-menu,
.btn-group > .popover {
font-size: 14px; font-size: 14px;
} }
.btn-group > .btn-mini { .btn-group > .btn-mini {
font-size: 11px; font-size: 10.5px;
} }
.btn-group > .btn-small { .btn-group > .btn-small {
font-size: 12px; font-size: 11.9px;
} }
.btn-group > .btn-large { .btn-group > .btn-large {
font-size: 16px; font-size: 17.5px;
} }
.btn-group > .btn:first-child { .btn-group > .btn:first-child {
@ -3677,39 +3778,39 @@ input[type="submit"].btn.btn-mini {
*zoom: 1; *zoom: 1;
} }
.btn-group-vertical .btn { .btn-group-vertical > .btn {
display: block; display: block;
float: none; float: none;
width: 100%; max-width: 100%;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
} }
.btn-group-vertical .btn + .btn { .btn-group-vertical > .btn + .btn {
margin-top: -1px; margin-top: -1px;
margin-left: 0; margin-left: 0;
} }
.btn-group-vertical .btn:first-child { .btn-group-vertical > .btn:first-child {
-webkit-border-radius: 4px 4px 0 0; -webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
} }
.btn-group-vertical .btn:last-child { .btn-group-vertical > .btn:last-child {
-webkit-border-radius: 0 0 4px 4px; -webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
} }
.btn-group-vertical .btn-large:first-child { .btn-group-vertical > .btn-large:first-child {
-webkit-border-radius: 6px 6px 0 0; -webkit-border-radius: 6px 6px 0 0;
-moz-border-radius: 6px 6px 0 0; -moz-border-radius: 6px 6px 0 0;
border-radius: 6px 6px 0 0; border-radius: 6px 6px 0 0;
} }
.btn-group-vertical .btn-large:last-child { .btn-group-vertical > .btn-large:last-child {
-webkit-border-radius: 0 0 6px 6px; -webkit-border-radius: 0 0 6px 6px;
-moz-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px;
@ -3718,7 +3819,6 @@ input[type="submit"].btn.btn-mini {
.alert { .alert {
padding: 8px 35px 8px 14px; padding: 8px 35px 8px 14px;
margin-bottom: 20px; margin-bottom: 20px;
color: #c09853;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3; background-color: #fcf8e3;
border: 1px solid #fbeed5; border: 1px solid #fbeed5;
@ -3727,6 +3827,11 @@ input[type="submit"].btn.btn-mini {
border-radius: 4px; border-radius: 4px;
} }
.alert,
.alert h4 {
color: #c09853;
}
.alert h4 { .alert h4 {
margin: 0; margin: 0;
} }
@ -3744,6 +3849,10 @@ input[type="submit"].btn.btn-mini {
border-color: #d6e9c6; border-color: #d6e9c6;
} }
.alert-success h4 {
color: #468847;
}
.alert-danger, .alert-danger,
.alert-error { .alert-error {
color: #b94a48; color: #b94a48;
@ -3751,12 +3860,21 @@ input[type="submit"].btn.btn-mini {
border-color: #eed3d7; border-color: #eed3d7;
} }
.alert-danger h4,
.alert-error h4 {
color: #b94a48;
}
.alert-info { .alert-info {
color: #3a87ad; color: #3a87ad;
background-color: #d9edf7; background-color: #d9edf7;
border-color: #bce8f1; border-color: #bce8f1;
} }
.alert-info h4 {
color: #3a87ad;
}
.alert-block { .alert-block {
padding-top: 14px; padding-top: 14px;
padding-bottom: 14px; padding-bottom: 14px;
@ -3786,6 +3904,10 @@ input[type="submit"].btn.btn-mini {
background-color: #eeeeee; background-color: #eeeeee;
} }
.nav > li > a > img {
max-width: none;
}
.nav > .pull-right { .nav > .pull-right {
float: right; float: right;
} }
@ -4170,7 +4292,6 @@ input[type="submit"].btn.btn-mini {
*z-index: 2; *z-index: 2;
margin-bottom: 20px; margin-bottom: 20px;
overflow: visible; overflow: visible;
color: #777777;
} }
.navbar-inner { .navbar-inner {
@ -4233,6 +4354,7 @@ input[type="submit"].btn.btn-mini {
.navbar-text { .navbar-text {
margin-bottom: 0; margin-bottom: 0;
line-height: 40px; line-height: 40px;
color: #777777;
} }
.navbar-link { .navbar-link {
@ -4299,7 +4421,7 @@ input[type="submit"].btn.btn-mini {
.navbar-form .input-append, .navbar-form .input-append,
.navbar-form .input-prepend { .navbar-form .input-prepend {
margin-top: 6px; margin-top: 5px;
white-space: nowrap; white-space: nowrap;
} }
@ -4534,6 +4656,11 @@ input[type="submit"].btn.btn-mini {
border-bottom: 0; border-bottom: 0;
} }
.navbar .nav li.dropdown > a:hover .caret {
border-top-color: #555555;
border-bottom-color: #555555;
}
.navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.open > .dropdown-toggle,
.navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle,
.navbar .nav li.dropdown.open.active > .dropdown-toggle { .navbar .nav li.dropdown.open.active > .dropdown-toggle {
@ -4582,10 +4709,6 @@ input[type="submit"].btn.btn-mini {
border-radius: 6px 0 6px 6px; border-radius: 6px 0 6px 6px;
} }
.navbar-inverse {
color: #999999;
}
.navbar-inverse .navbar-inner { .navbar-inverse .navbar-inner {
background-color: #1b1b1b; background-color: #1b1b1b;
background-image: -moz-linear-gradient(top, #222222, #111111); background-image: -moz-linear-gradient(top, #222222, #111111);
@ -4609,6 +4732,14 @@ input[type="submit"].btn.btn-mini {
color: #ffffff; color: #ffffff;
} }
.navbar-inverse .brand {
color: #999999;
}
.navbar-inverse .navbar-text {
color: #999999;
}
.navbar-inverse .nav > li > a:focus, .navbar-inverse .nav > li > a:focus,
.navbar-inverse .nav > li > a:hover { .navbar-inverse .nav > li > a:hover {
color: #ffffff; color: #ffffff;
@ -4642,6 +4773,11 @@ input[type="submit"].btn.btn-mini {
background-color: #111111; background-color: #111111;
} }
.navbar-inverse .nav li.dropdown > a:hover .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}
.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
border-top-color: #999999; border-top-color: #999999;
border-bottom-color: #999999; border-bottom-color: #999999;
@ -4734,19 +4870,19 @@ input[type="submit"].btn.btn-mini {
border-radius: 4px; border-radius: 4px;
} }
.breadcrumb li { .breadcrumb > li {
display: inline-block; display: inline-block;
*display: inline; *display: inline;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #ffffff;
*zoom: 1; *zoom: 1;
} }
.breadcrumb .divider { .breadcrumb > li > .divider {
padding: 0 5px; padding: 0 5px;
color: #ccc; color: #ccc;
} }
.breadcrumb .active { .breadcrumb > .active {
color: #999999; color: #999999;
} }
@ -4890,7 +5026,7 @@ input[type="submit"].btn.btn-mini {
.pagination-mini ul > li > a, .pagination-mini ul > li > a,
.pagination-mini ul > li > span { .pagination-mini ul > li > span {
padding: 1px 6px; padding: 0 6px;
font-size: 10.5px; font-size: 10.5px;
} }
@ -4972,11 +5108,11 @@ input[type="submit"].btn.btn-mini {
.modal { .modal {
position: fixed; position: fixed;
top: 50%; top: 10%;
left: 50%; left: 50%;
z-index: 1050; z-index: 1050;
width: 560px; width: 560px;
margin: -250px 0 0 -280px; margin-left: -280px;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #999; border: 1px solid #999;
border: 1px solid rgba(0, 0, 0, 0.3); border: 1px solid rgba(0, 0, 0, 0.3);
@ -5002,7 +5138,7 @@ input[type="submit"].btn.btn-mini {
} }
.modal.fade.in { .modal.fade.in {
top: 50%; top: 10%;
} }
.modal-header { .modal-header {
@ -5020,6 +5156,7 @@ input[type="submit"].btn.btn-mini {
} }
.modal-body { .modal-body {
position: relative;
max-height: 400px; max-height: 400px;
padding: 15px; padding: 15px;
overflow-y: auto; overflow-y: auto;
@ -5160,6 +5297,8 @@ input[type="submit"].btn.btn-mini {
display: none; display: none;
width: 236px; width: 236px;
padding: 1px; padding: 1px;
text-align: left;
white-space: normal;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #ccc; border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.2); border: 1px solid rgba(0, 0, 0, 0.2);
@ -5207,85 +5346,87 @@ input[type="submit"].btn.btn-mini {
padding: 9px 14px; padding: 9px 14px;
} }
.popover-content p,
.popover-content ul,
.popover-content ol {
margin-bottom: 0;
}
.popover .arrow, .popover .arrow,
.popover .arrow:after { .popover .arrow:after {
position: absolute; position: absolute;
display: inline-block; display: block;
width: 0; width: 0;
height: 0; height: 0;
border-color: transparent; border-color: transparent;
border-style: solid; border-style: solid;
} }
.popover .arrow {
border-width: 11px;
}
.popover .arrow:after { .popover .arrow:after {
z-index: -1; border-width: 10px;
content: ""; content: "";
} }
.popover.top .arrow { .popover.top .arrow {
bottom: -10px; bottom: -11px;
left: 50%; left: 50%;
margin-left: -10px; margin-left: -11px;
border-top-color: #ffffff; border-top-color: #999;
border-width: 10px 10px 0; border-top-color: rgba(0, 0, 0, 0.25);
border-bottom-width: 0;
} }
.popover.top .arrow:after { .popover.top .arrow:after {
bottom: -1px; bottom: 1px;
left: -11px; margin-left: -10px;
border-top-color: rgba(0, 0, 0, 0.25); border-top-color: #ffffff;
border-width: 11px 11px 0; border-bottom-width: 0;
} }
.popover.right .arrow { .popover.right .arrow {
top: 50%; top: 50%;
left: -10px; left: -11px;
margin-top: -10px; margin-top: -11px;
border-right-color: #ffffff; border-right-color: #999;
border-width: 10px 10px 10px 0; border-right-color: rgba(0, 0, 0, 0.25);
border-left-width: 0;
} }
.popover.right .arrow:after { .popover.right .arrow:after {
bottom: -11px; bottom: -10px;
left: -1px; left: 1px;
border-right-color: rgba(0, 0, 0, 0.25); border-right-color: #ffffff;
border-width: 11px 11px 11px 0; border-left-width: 0;
} }
.popover.bottom .arrow { .popover.bottom .arrow {
top: -10px; top: -11px;
left: 50%; left: 50%;
margin-left: -10px; margin-left: -11px;
border-bottom-color: #ffffff; border-bottom-color: #999;
border-width: 0 10px 10px; border-bottom-color: rgba(0, 0, 0, 0.25);
border-top-width: 0;
} }
.popover.bottom .arrow:after { .popover.bottom .arrow:after {
top: -1px; top: 1px;
left: -11px; margin-left: -10px;
border-bottom-color: rgba(0, 0, 0, 0.25); border-bottom-color: #ffffff;
border-width: 0 11px 11px; border-top-width: 0;
} }
.popover.left .arrow { .popover.left .arrow {
top: 50%; top: 50%;
right: -10px; right: -11px;
margin-top: -10px; margin-top: -11px;
border-left-color: #ffffff; border-left-color: #999;
border-width: 10px 0 10px 10px; border-left-color: rgba(0, 0, 0, 0.25);
border-right-width: 0;
} }
.popover.left .arrow:after { .popover.left .arrow:after {
right: -1px; right: 1px;
bottom: -11px; bottom: -10px;
border-left-color: rgba(0, 0, 0, 0.25); border-left-color: #ffffff;
border-width: 11px 0 11px 11px; border-right-width: 0;
} }
.thumbnails { .thumbnails {
@ -5416,6 +5557,11 @@ a.thumbnail:hover {
border-radius: 9px; border-radius: 9px;
} }
.label:empty,
.badge:empty {
display: none;
}
a.label:hover, a.label:hover,
a.badge:hover { a.badge:hover {
color: #ffffff; color: #ffffff;
@ -5734,7 +5880,7 @@ a.badge:hover {
overflow: hidden; overflow: hidden;
} }
.carousel .item { .carousel-inner > .item {
position: relative; position: relative;
display: none; display: none;
-webkit-transition: 0.6s ease-in-out left; -webkit-transition: 0.6s ease-in-out left;
@ -5743,46 +5889,46 @@ a.badge:hover {
transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left;
} }
.carousel .item > img { .carousel-inner > .item > img {
display: block; display: block;
line-height: 1; line-height: 1;
} }
.carousel .active, .carousel-inner > .active,
.carousel .next, .carousel-inner > .next,
.carousel .prev { .carousel-inner > .prev {
display: block; display: block;
} }
.carousel .active { .carousel-inner > .active {
left: 0; left: 0;
} }
.carousel .next, .carousel-inner > .next,
.carousel .prev { .carousel-inner > .prev {
position: absolute; position: absolute;
top: 0; top: 0;
width: 100%; width: 100%;
} }
.carousel .next { .carousel-inner > .next {
left: 100%; left: 100%;
} }
.carousel .prev { .carousel-inner > .prev {
left: -100%; left: -100%;
} }
.carousel .next.left, .carousel-inner > .next.left,
.carousel .prev.right { .carousel-inner > .prev.right {
left: 0; left: 0;
} }
.carousel .active.left { .carousel-inner > .active.left {
left: -100%; left: -100%;
} }
.carousel .active.right { .carousel-inner > .active.right {
left: 100%; left: 100%;
} }