From e9789116d20d0cb2a1e38c91165acf0e2ce8f68c Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Mon, 25 Feb 2013 18:28:23 -0800 Subject: [PATCH] upgraded to bootstrap v2.3.0. --- .../Content/Bootstrap/bootstrap.less | 8 +- .../Content/Bootstrap/button-groups.less | 6 +- .../Content/Bootstrap/buttons.less | 18 +- .../Content/Bootstrap/carousel.less | 41 ++- .../Content/Bootstrap/close.less | 3 +- .../Content/Bootstrap/dropdowns.less | 28 +- .../Content/Bootstrap/forms.less | 7 +- .../Content/Bootstrap/labels-badges.less | 6 +- .../Content/Bootstrap/media.less | 4 +- .../Content/Bootstrap/mixins.less | 107 ++++--- .../Content/Bootstrap/modals.less | 6 +- .../Content/Bootstrap/navbar.less | 33 ++- NzbDrone.Backbone/Content/Bootstrap/navs.less | 60 ++-- .../Content/Bootstrap/pager.less | 4 +- .../Content/Bootstrap/pagination.less | 4 +- .../Content/Bootstrap/popovers.less | 6 +- .../Content/Bootstrap/scaffolding.less | 3 +- .../Content/Bootstrap/sprites.less | 10 +- .../Content/Bootstrap/tables.less | 41 +-- .../Content/Bootstrap/thumbnails.less | 5 +- .../Content/Bootstrap/tooltip.less | 12 +- NzbDrone.Backbone/Content/Bootstrap/type.less | 26 +- .../Content/Bootstrap/variables.less | 16 +- NzbDrone.Backbone/JsLibraries/bootstrap.js | 269 ++++++++++++------ 24 files changed, 471 insertions(+), 252 deletions(-) diff --git a/NzbDrone.Backbone/Content/Bootstrap/bootstrap.less b/NzbDrone.Backbone/Content/Bootstrap/bootstrap.less index 1fde055bc..ca89418d8 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/bootstrap.less +++ b/NzbDrone.Backbone/Content/Bootstrap/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.2.2 + * Bootstrap v2.3.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -8,13 +8,13 @@ * Designed and built with all the love in the world @twitter by @mdo and @fat. */ -// CSS Reset -@import "reset.less"; - // Core variables and mixins @import "variables.less"; // Modify this for custom colors, font-sizes, etc @import "mixins.less"; +// CSS Reset +@import "reset.less"; + // Grid system and page structure @import "scaffolding.less"; @import "grid.less"; diff --git a/NzbDrone.Backbone/Content/Bootstrap/button-groups.less b/NzbDrone.Backbone/Content/Bootstrap/button-groups.less index d6054c808..55cdc6033 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/button-groups.less +++ b/NzbDrone.Backbone/Content/Bootstrap/button-groups.less @@ -164,8 +164,6 @@ margin-left: 0; } // Carets in other button sizes -.btn-mini .caret, -.btn-small .caret, .btn-large .caret { margin-top: 6px; } @@ -174,6 +172,10 @@ border-right-width: 5px; border-top-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} // Upside down carets for .dropup .dropup .btn-large .caret { border-bottom-width: 5px; diff --git a/NzbDrone.Backbone/Content/Bootstrap/buttons.less b/NzbDrone.Backbone/Content/Bootstrap/buttons.less index 6f565b73c..4cd4d862b 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/buttons.less +++ b/NzbDrone.Backbone/Content/Bootstrap/buttons.less @@ -25,13 +25,14 @@ .ie7-restore-left-whitespace(); // Give IE7 some love .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); - // Hover state - &:hover { + // Hover/focus state + &:hover, + &:focus { color: @grayDark; text-decoration: none; background-position: 0 -15px; - // transition is only when going to hover, otherwise the background + // transition is only when going to hover/focus, otherwise the background // behind the gradient (there for IE<=9 fallback) gets mismatched .transition(background-position .1s linear); } @@ -141,11 +142,6 @@ input[type="button"] { // Set the backgrounds // ------------------------- -.btn { - // reset here as of 2.0.3 due to Recess property order - border-color: #c5c5c5; - border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25); -} .btn-primary { .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight); } @@ -219,12 +215,14 @@ input[type="submit"].btn { color: @linkColor; .border-radius(0); } -.btn-link:hover { +.btn-link:hover, +.btn-link:focus { color: @linkColorHover; text-decoration: underline; background-color: transparent; } -.btn-link[disabled]:hover { +.btn-link[disabled]:hover, +.btn-link[disabled]:focus { color: @grayDark; text-decoration: none; } diff --git a/NzbDrone.Backbone/Content/Bootstrap/carousel.less b/NzbDrone.Backbone/Content/Bootstrap/carousel.less index 2dc050603..55bc05014 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/carousel.less +++ b/NzbDrone.Backbone/Content/Bootstrap/carousel.less @@ -21,12 +21,13 @@ display: none; position: relative; .transition(.6s ease-in-out left); - } - // Account for jankitude on images - > .item > img { - display: block; - line-height: 1; + // Account for jankitude on images + > img, + > a > img { + display: block; + line-height: 1; + } } > .active, @@ -97,14 +98,40 @@ right: 15px; } - // Hover state - &:hover { + // Hover/focus state + &:hover, + &:focus { color: @white; text-decoration: none; .opacity(90); } } +// Carousel indicator pips +// ----------------------------- +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; + + li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255,255,255,.25); + border-radius: 5px; + } + .active { + background-color: #fff; + } +} // Caption for text below images // ----------------------------- diff --git a/NzbDrone.Backbone/Content/Bootstrap/close.less b/NzbDrone.Backbone/Content/Bootstrap/close.less index c71a508f3..4c626bda6 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/close.less +++ b/NzbDrone.Backbone/Content/Bootstrap/close.less @@ -11,7 +11,8 @@ color: @black; text-shadow: 0 1px 0 rgba(255,255,255,1); .opacity(20); - &:hover { + &:hover, + &:focus { color: @black; text-decoration: none; cursor: pointer; diff --git a/NzbDrone.Backbone/Content/Bootstrap/dropdowns.less b/NzbDrone.Backbone/Content/Bootstrap/dropdowns.less index 484bd3dda..bbfe3fd3e 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/dropdowns.less +++ b/NzbDrone.Backbone/Content/Bootstrap/dropdowns.less @@ -72,7 +72,7 @@ } // Links within the dropdown menu - li > a { + > li > a { display: block; padding: 3px 20px; clear: both; @@ -83,11 +83,12 @@ } } -// Hover state +// Hover/Focus state // ----------- -.dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, -.dropdown-submenu:hover > a { +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a { text-decoration: none; color: @dropdownLinkColorHover; #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%)); @@ -95,8 +96,9 @@ // Active state // ------------ -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { color: @dropdownLinkColorActive; text-decoration: none; outline: 0; @@ -105,13 +107,15 @@ // Disabled state // -------------- -// Gray out text and ensure the hover state remains gray -.dropdown-menu .disabled > a, -.dropdown-menu .disabled > a:hover { +// Gray out text and ensure the hover/focus state remains gray +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { color: @grayLight; } -// Nuke hover effects -.dropdown-menu .disabled > a:hover { +// Nuke hover/focus effects +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { text-decoration: none; background-color: transparent; background-image: none; // Remove CSS gradient diff --git a/NzbDrone.Backbone/Content/Bootstrap/forms.less b/NzbDrone.Backbone/Content/Bootstrap/forms.less index 2dff22919..06767bdd3 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/forms.less +++ b/NzbDrone.Backbone/Content/Bootstrap/forms.less @@ -422,7 +422,9 @@ select:focus:invalid { // Allow us to put symbols and text within the input field for a cleaner look .input-append, .input-prepend { - margin-bottom: 5px; + display: inline-block; + margin-bottom: @baseLineHeight / 2; + vertical-align: middle; font-size: 0; // white space collapse hack white-space: nowrap; // Prevent span and input from separating @@ -430,7 +432,8 @@ select:focus:invalid { input, select, .uneditable-input, - .dropdown-menu { + .dropdown-menu, + .popover { font-size: @baseFontSize; } diff --git a/NzbDrone.Backbone/Content/Bootstrap/labels-badges.less b/NzbDrone.Backbone/Content/Bootstrap/labels-badges.less index 9c3a40bfb..bc321fe5c 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/labels-badges.less +++ b/NzbDrone.Backbone/Content/Bootstrap/labels-badges.less @@ -35,10 +35,12 @@ } } -// Hover state, but only for links +// Hover/focus state, but only for links a { &.label:hover, - &.badge:hover { + &.label:focus, + &.badge:hover, + &.badge:focus { color: @white; text-decoration: none; cursor: pointer; diff --git a/NzbDrone.Backbone/Content/Bootstrap/media.less b/NzbDrone.Backbone/Content/Bootstrap/media.less index 1decab71d..e461e446d 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/media.less +++ b/NzbDrone.Backbone/Content/Bootstrap/media.less @@ -37,10 +37,10 @@ // Media image alignment // ------------------------- -.media .pull-left { +.media > .pull-left { margin-right: 10px; } -.media .pull-right { +.media > .pull-right { margin-left: 10px; } diff --git a/NzbDrone.Backbone/Content/Bootstrap/mixins.less b/NzbDrone.Backbone/Content/Bootstrap/mixins.less index a35492a28..79d889219 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/mixins.less +++ b/NzbDrone.Backbone/Content/Bootstrap/mixins.less @@ -268,6 +268,12 @@ -o-transition-delay: @transition-delay; transition-delay: @transition-delay; } +.transition-duration(@transition-duration) { + -webkit-transition-duration: @transition-duration; + -moz-transition-duration: @transition-duration; + -o-transition-duration: @transition-duration; + transition-duration: @transition-duration; +} // Transformations .rotate(@degrees) { @@ -409,59 +415,70 @@ // Gradients #gradient { - .horizontal(@startColor: #555, @endColor: #555) { + .horizontal(@startColor: #555, @endColor: #333) { background-color: @endColor; - //background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+ - //background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ - //background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - //background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 - //background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10 - //background-repeat: repeat-x; - //filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down + background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+ + background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10 + background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down } .vertical(@startColor: #555, @endColor: #333) { background-color: mix(@startColor, @endColor, 60%); - //background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ - //background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ - //background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - //background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 - //background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10 - //background-repeat: repeat-x; - //filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down + background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10 + background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down } .directional(@startColor: #555, @endColor: #333, @deg: 45deg) { background-color: @endColor; - //background-repeat: repeat-x; - //background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ - //background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - //background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10 - //background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10 + background-repeat: repeat-x; + background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ + background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10 + } + .horizontal-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { + background-color: mix(@midColor, @endColor, 80%); + background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); + background-image: -webkit-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); + background-image: -moz-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); + background-image: -o-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); + background-image: linear-gradient(to right, @startColor, @midColor @colorStop, @endColor); + background-repeat: no-repeat; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback } + .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { background-color: mix(@midColor, @endColor, 80%); - //background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); - //background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); - //background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor); - //background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); - //background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); - //background-repeat: no-repeat; - //filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); + background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor); + background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-repeat: no-repeat; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback } .radial(@innerColor: #555, @outerColor: #333) { background-color: @outerColor; - //background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor)); - //background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor); - //background-image: -moz-radial-gradient(circle, @innerColor, @outerColor); - //background-image: -o-radial-gradient(circle, @innerColor, @outerColor); - //background-repeat: no-repeat; + background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor)); + background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor); + background-image: -moz-radial-gradient(circle, @innerColor, @outerColor); + background-image: -o-radial-gradient(circle, @innerColor, @outerColor); + background-repeat: no-repeat; } .striped(@color: #555, @angle: 45deg) { background-color: @color; - //background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); - //background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - //background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - //background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - //background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); } } // Reset filters for IE @@ -500,7 +517,7 @@ .reset-filter(); // in these cases the gradient won't cover the background, so we override - &:hover, &:active, &.active, &.disabled, &[disabled] { + &:hover, &:focus, &:active, &.active, &.disabled, &[disabled] { color: @textColor; background-color: @endColor; *background-color: darken(@endColor, 5%); @@ -558,13 +575,13 @@ .core (@gridColumnWidth, @gridGutterWidth) { .spanX (@index) when (@index > 0) { - (~".span@{index}") { .span(@index); } + .span@{index} { .span(@index); } .spanX(@index - 1); } .spanX (0) {} .offsetX (@index) when (@index > 0) { - (~".offset@{index}") { .offset(@index); } + .offset@{index} { .offset(@index); } .offsetX(@index - 1); } .offsetX (0) {} @@ -579,7 +596,6 @@ .row { margin-left: @gridGutterWidth * -1; - margin-right: @gridGutterWidth * -1; .clearfix(); } @@ -604,14 +620,14 @@ .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) { .spanX (@index) when (@index > 0) { - (~".span@{index}") { .span(@index); } + .span@{index} { .span(@index); } .spanX(@index - 1); } .spanX (0) {} .offsetX (@index) when (@index > 0) { - (~'.offset@{index}') { .offset(@index); } - (~'.offset@{index}:first-child') { .offsetFirstChild(@index); } + .offset@{index} { .offset(@index); } + .offset@{index}:first-child { .offsetFirstChild(@index); } .offsetX(@index - 1); } .offsetX (0) {} @@ -659,7 +675,7 @@ .input(@gridColumnWidth, @gridGutterWidth) { .spanX (@index) when (@index > 0) { - (~"input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index}") { .span(@index); } + input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index} { .span(@index); } .spanX(@index - 1); } .spanX (0) {} @@ -683,5 +699,4 @@ .spanX (@gridColumns); } - } diff --git a/NzbDrone.Backbone/Content/Bootstrap/modals.less b/NzbDrone.Backbone/Content/Bootstrap/modals.less index 957a3209a..8e272d409 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/modals.less +++ b/NzbDrone.Backbone/Content/Bootstrap/modals.less @@ -26,8 +26,8 @@ top: 10%; left: 50%; z-index: @zindexModal; - width: 660px; - margin-left: -330px; + width: 560px; + margin-left: -280px; background-color: @white; border: 1px solid #999; border: 1px solid rgba(0,0,0,.3); @@ -60,7 +60,7 @@ .modal-body { position: relative; overflow-y: auto; - max-height: 450px; + max-height: 400px; padding: 15px; } // Remove bottom margin if need be diff --git a/NzbDrone.Backbone/Content/Bootstrap/navbar.less b/NzbDrone.Backbone/Content/Bootstrap/navbar.less index b292b72bb..93d09bcad 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/navbar.less +++ b/NzbDrone.Backbone/Content/Bootstrap/navbar.less @@ -56,7 +56,8 @@ font-weight: 200; color: @navbarBrandColor; text-shadow: 0 1px 0 @navbarBackgroundHighlight; - &:hover { + &:hover, + &:focus { text-decoration: none; } } @@ -73,7 +74,8 @@ // ------------------------- .navbar-link { color: @navbarLinkColor; - &:hover { + &:hover, + &:focus { color: @navbarLinkColorHover; } } @@ -95,7 +97,9 @@ } .navbar .btn-group .btn, .navbar .input-prepend .btn, -.navbar .input-append .btn { +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { margin-top: 0; // then undo the margin here so we don't accidentally double it } @@ -245,13 +249,12 @@ } .navbar .nav .dropdown-toggle .caret { margin-top: 8px; - } -// Hover +// Hover/focus .navbar .nav > li > a:focus, .navbar .nav > li > a:hover { - background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active + background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover/:focus from .active color: @navbarLinkColorHover; text-decoration: none; } @@ -335,10 +338,11 @@ } } -// Caret should match text color on hover -.navbar .nav li.dropdown > a:hover .caret { - border-top-color: @navbarLinkColorActive; - border-bottom-color: @navbarLinkColorActive; +// Caret should match text color on hover/focus +.navbar .nav li.dropdown > a:hover .caret, +.navbar .nav li.dropdown > a:focus .caret { + border-top-color: @navbarLinkColorHover; + border-bottom-color: @navbarLinkColorHover; } // Remove background color from open dropdown @@ -396,7 +400,8 @@ .nav > li > a { color: @navbarInverseLinkColor; text-shadow: 0 -1px 0 rgba(0,0,0,.25); - &:hover { + &:hover, + &:focus { color: @navbarInverseLinkColorHover; } } @@ -425,7 +430,8 @@ // Inline text links .navbar-link { color: @navbarInverseLinkColor; - &:hover { + &:hover, + &:focus { color: @navbarInverseLinkColorHover; } } @@ -443,7 +449,8 @@ background-color: @navbarInverseLinkBackgroundActive; color: @navbarInverseLinkColorActive; } - .nav li.dropdown > a:hover .caret { + .nav li.dropdown > a:hover .caret, + .nav li.dropdown > a:focus .caret { border-top-color: @navbarInverseLinkColorActive; border-bottom-color: @navbarInverseLinkColorActive; } diff --git a/NzbDrone.Backbone/Content/Bootstrap/navs.less b/NzbDrone.Backbone/Content/Bootstrap/navs.less index 2d08e79da..01cd805bd 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/navs.less +++ b/NzbDrone.Backbone/Content/Bootstrap/navs.less @@ -16,7 +16,8 @@ .nav > li > a { display: block; } -.nav > li > a:hover { +.nav > li > a:hover, +.nav > li > a:focus { text-decoration: none; background-color: @grayLighter; } @@ -68,7 +69,8 @@ padding: 3px 15px; } .nav-list > .active > a, -.nav-list > .active > a:hover { +.nav-list > .active > a:hover, +.nav-list > .active > a:focus { color: @white; text-shadow: 0 -1px 0 rgba(0,0,0,.2); background-color: @linkColor; @@ -122,13 +124,15 @@ line-height: @baseLineHeight; border: 1px solid transparent; .border-radius(4px 4px 0 0); - &:hover { + &:hover, + &:focus { border-color: @grayLighter @grayLighter #ddd; } } -// Active state, and it's :hover to override normal :hover +// Active state, and it's :hover/:focus to override normal :hover/:focus .nav-tabs > .active > a, -.nav-tabs > .active > a:hover { +.nav-tabs > .active > a:hover, +.nav-tabs > .active > a:focus { color: @gray; background-color: @bodyBackground; border: 1px solid #ddd; @@ -151,7 +155,8 @@ // Active state .nav-pills > .active > a, -.nav-pills > .active > a:hover { +.nav-pills > .active > a:hover, +.nav-pills > .active > a:focus { color: @white; background-color: @linkColor; } @@ -183,7 +188,8 @@ .nav-tabs.nav-stacked > li:last-child > a { .border-bottom-radius(4px); } -.nav-tabs.nav-stacked > li > a:hover { +.nav-tabs.nav-stacked > li > a:hover, +.nav-tabs.nav-stacked > li > a:focus { border-color: #ddd; z-index: 2; } @@ -216,7 +222,8 @@ border-bottom-color: @linkColor; margin-top: 6px; } -.nav .dropdown-toggle:hover .caret { +.nav .dropdown-toggle:hover .caret, +.nav .dropdown-toggle:focus .caret { border-top-color: @linkColorHover; border-bottom-color: @linkColorHover; } @@ -236,9 +243,10 @@ border-bottom-color: @gray; } -// Active:hover dropdown links +// Active:hover/:focus dropdown links // ------------------------- -.nav > .dropdown.active > a:hover { +.nav > .dropdown.active > a:hover, +.nav > .dropdown.active > a:focus { cursor: pointer; } @@ -246,21 +254,24 @@ // ------------------------- .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { +.nav > li.dropdown.open.active > a:hover, +.nav > li.dropdown.open.active > a:focus { color: @white; background-color: @grayLight; border-color: @grayLight; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { +.nav li.dropdown.open a:hover .caret, +.nav li.dropdown.open a:focus .caret { border-top-color: @white; border-bottom-color: @white; .opacity(100); } // Dropdowns in stacked tabs -.tabs-stacked .open > a:hover { +.tabs-stacked .open > a:hover, +.tabs-stacked .open > a:focus { border-color: @grayLight; } @@ -311,13 +322,15 @@ } .tabs-below > .nav-tabs > li > a { .border-radius(0 0 4px 4px); - &:hover { + &:hover, + &:focus { border-bottom-color: transparent; border-top-color: #ddd; } } .tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { +.tabs-below > .nav-tabs > .active > a:hover, +.tabs-below > .nav-tabs > .active > a:focus { border-color: transparent #ddd #ddd #ddd; } @@ -346,11 +359,13 @@ margin-right: -1px; .border-radius(4px 0 0 4px); } -.tabs-left > .nav-tabs > li > a:hover { +.tabs-left > .nav-tabs > li > a:hover, +.tabs-left > .nav-tabs > li > a:focus { border-color: @grayLighter #ddd @grayLighter @grayLighter; } .tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { +.tabs-left > .nav-tabs .active > a:hover, +.tabs-left > .nav-tabs .active > a:focus { border-color: #ddd transparent #ddd #ddd; *border-right-color: @white; } @@ -365,11 +380,13 @@ margin-left: -1px; .border-radius(0 4px 4px 0); } -.tabs-right > .nav-tabs > li > a:hover { +.tabs-right > .nav-tabs > li > a:hover, +.tabs-right > .nav-tabs > li > a:focus { border-color: @grayLighter @grayLighter @grayLighter #ddd; } .tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { +.tabs-right > .nav-tabs .active > a:hover, +.tabs-right > .nav-tabs .active > a:focus { border-color: #ddd #ddd #ddd transparent; *border-left-color: @white; } @@ -383,8 +400,9 @@ .nav > .disabled > a { color: @grayLight; } -// Nuke hover effects -.nav > .disabled > a:hover { +// Nuke hover/focus effects +.nav > .disabled > a:hover, +.nav > .disabled > a:focus { text-decoration: none; background-color: transparent; cursor: default; diff --git a/NzbDrone.Backbone/Content/Bootstrap/pager.less b/NzbDrone.Backbone/Content/Bootstrap/pager.less index da2425367..147618829 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/pager.less +++ b/NzbDrone.Backbone/Content/Bootstrap/pager.less @@ -20,7 +20,8 @@ border: 1px solid #ddd; .border-radius(15px); } -.pager li > a:hover { +.pager li > a:hover, +.pager li > a:focus { text-decoration: none; background-color: #f5f5f5; } @@ -34,6 +35,7 @@ } .pager .disabled > a, .pager .disabled > a:hover, +.pager .disabled > a:focus, .pager .disabled > span { color: @grayLight; background-color: #fff; diff --git a/NzbDrone.Backbone/Content/Bootstrap/pagination.less b/NzbDrone.Backbone/Content/Bootstrap/pagination.less index e35d3f4a8..a789db2d2 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/pagination.less +++ b/NzbDrone.Backbone/Content/Bootstrap/pagination.less @@ -32,6 +32,7 @@ border-left-width: 0; } .pagination ul > li > a:hover, +.pagination ul > li > a:focus, .pagination ul > .active > a, .pagination ul > .active > span { background-color: @paginationActiveBackground; @@ -43,7 +44,8 @@ } .pagination ul > .disabled > span, .pagination ul > .disabled > a, -.pagination ul > .disabled > a:hover { +.pagination ul > .disabled > a:hover, +.pagination ul > .disabled > a:focus { color: @grayLight; background-color: transparent; cursor: default; diff --git a/NzbDrone.Backbone/Content/Bootstrap/popovers.less b/NzbDrone.Backbone/Content/Bootstrap/popovers.less index b5b2a7eb5..aae35c8cd 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/popovers.less +++ b/NzbDrone.Backbone/Content/Bootstrap/popovers.less @@ -9,7 +9,7 @@ left: 0; z-index: @zindexPopover; display: none; - width: 236px; + max-width: 276px; padding: 1px; text-align: left; // Reset given new insertion method background-color: @popoverBackground; @@ -40,6 +40,10 @@ background-color: @popoverTitleBackground; border-bottom: 1px solid darken(@popoverTitleBackground, 5%); .border-radius(5px 5px 0 0); + + &:empty { + display: none; + } } .popover-content { diff --git a/NzbDrone.Backbone/Content/Bootstrap/scaffolding.less b/NzbDrone.Backbone/Content/Bootstrap/scaffolding.less index 7a7496a64..f17e8cadb 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/scaffolding.less +++ b/NzbDrone.Backbone/Content/Bootstrap/scaffolding.less @@ -23,7 +23,8 @@ a { color: @linkColor; text-decoration: none; } -a:hover { +a:hover, +a:focus { color: @linkColorHover; text-decoration: underline; } diff --git a/NzbDrone.Backbone/Content/Bootstrap/sprites.less b/NzbDrone.Backbone/Content/Bootstrap/sprites.less index 9cd2ae3bf..1812bf71a 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/sprites.less +++ b/NzbDrone.Backbone/Content/Bootstrap/sprites.less @@ -28,7 +28,7 @@ margin-top: 1px; } -/* White icons with optional class, or on hover/active states of certain elements */ +/* White icons with optional class, or on hover/focus/active states of certain elements */ .icon-white, .nav-pills > .active > a > [class^="icon-"], .nav-pills > .active > a > [class*=" icon-"], @@ -37,11 +37,15 @@ .navbar-inverse .nav > .active > a > [class^="icon-"], .navbar-inverse .nav > .active > a > [class*=" icon-"], .dropdown-menu > li > a:hover > [class^="icon-"], +.dropdown-menu > li > a:focus > [class^="icon-"], .dropdown-menu > li > a:hover > [class*=" icon-"], +.dropdown-menu > li > a:focus > [class*=" icon-"], .dropdown-menu > .active > a > [class^="icon-"], .dropdown-menu > .active > a > [class*=" icon-"], .dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { +.dropdown-submenu:focus > a > [class^="icon-"], +.dropdown-submenu:hover > a > [class*=" icon-"], +.dropdown-submenu:focus > a > [class*=" icon-"] { background-image: url("@{iconWhiteSpritePath}"); } @@ -166,7 +170,7 @@ .icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off .icon-retweet { background-position: -336px -120px; } .icon-shopping-cart { background-position: -360px -120px; } -.icon-folder-close { background-position: -384px -120px; } +.icon-folder-close { background-position: -384px -120px; width: 16px; } .icon-folder-open { background-position: -408px -120px; width: 16px; } .icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off .icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off diff --git a/NzbDrone.Backbone/Content/Bootstrap/tables.less b/NzbDrone.Backbone/Content/Bootstrap/tables.less index f3b9967f0..0e35271e1 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/tables.less +++ b/NzbDrone.Backbone/Content/Bootstrap/tables.less @@ -93,24 +93,32 @@ table { tbody:first-child tr:first-child td { border-top: 0; } - // For first th or td in the first row in the first thead or tbody + // For first th/td in the first row in the first thead or tbody thead:first-child tr:first-child > th:first-child, - tbody:first-child tr:first-child > td:first-child { + tbody:first-child tr:first-child > td:first-child, + tbody:first-child tr:first-child > th:first-child { .border-top-left-radius(@baseBorderRadius); } + // For last th/td in the first row in the first thead or tbody thead:first-child tr:first-child > th:last-child, - tbody:first-child tr:first-child > td:last-child { + tbody:first-child tr:first-child > td:last-child, + tbody:first-child tr:first-child > th:last-child { .border-top-right-radius(@baseBorderRadius); } - // For first th or td in the last row in the last thead or tbody + // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot thead:last-child tr:last-child > th:first-child, tbody:last-child tr:last-child > td:first-child, - tfoot:last-child tr:last-child > td:first-child { + tbody:last-child tr:last-child > th:first-child, + tfoot:last-child tr:last-child > td:first-child, + tfoot:last-child tr:last-child > th:first-child { .border-bottom-left-radius(@baseBorderRadius); } + // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot thead:last-child tr:last-child > th:last-child, tbody:last-child tr:last-child > td:last-child, - tfoot:last-child tr:last-child > td:last-child { + tbody:last-child tr:last-child > th:last-child, + tfoot:last-child tr:last-child > td:last-child, + tfoot:last-child tr:last-child > th:last-child { .border-bottom-right-radius(@baseBorderRadius); } @@ -122,7 +130,6 @@ table { .border-bottom-right-radius(0); } - // Special fixes to round the left border on the first td/th caption + thead tr:first-child th:first-child, caption + tbody tr:first-child td:first-child, @@ -161,8 +168,8 @@ table { // Placed here since it has to come after the potential zebra striping .table-hover { tbody { - tr:hover td, - tr:hover th { + tr:hover > td, + tr:hover > th { background-color: @tableBackgroundHover; } } @@ -206,32 +213,32 @@ table th[class*="span"], // Exact selectors below required to override .table-striped .table tbody tr { - &.success td { + &.success > td { background-color: @successBackground; } - &.error td { + &.error > td { background-color: @errorBackground; } - &.warning td { + &.warning > td { background-color: @warningBackground; } - &.info td { + &.info > td { background-color: @infoBackground; } } // Hover states for .table-hover .table-hover tbody tr { - &.success:hover td { + &.success:hover > td { background-color: darken(@successBackground, 5%); } - &.error:hover td { + &.error:hover > td { background-color: darken(@errorBackground, 5%); } - &.warning:hover td { + &.warning:hover > td { background-color: darken(@warningBackground, 5%); } - &.info:hover td { + &.info:hover > td { background-color: darken(@infoBackground, 5%); } } diff --git a/NzbDrone.Backbone/Content/Bootstrap/thumbnails.less b/NzbDrone.Backbone/Content/Bootstrap/thumbnails.less index a84a7d37d..4fd07d253 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/thumbnails.less +++ b/NzbDrone.Backbone/Content/Bootstrap/thumbnails.less @@ -33,8 +33,9 @@ .box-shadow(0 1px 3px rgba(0,0,0,.055)); .transition(all .2s ease-in-out); } -// Add a hover state for linked versions only -a.thumbnail:hover { +// Add a hover/focus state for linked versions only +a.thumbnail:hover, +a.thumbnail:focus { border-color: @linkColor; .box-shadow(0 1px 4px rgba(0,105,214,.25)); } diff --git a/NzbDrone.Backbone/Content/Bootstrap/tooltip.less b/NzbDrone.Backbone/Content/Bootstrap/tooltip.less index 93fac8d6b..83d5f2bd7 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/tooltip.less +++ b/NzbDrone.Backbone/Content/Bootstrap/tooltip.less @@ -9,20 +9,20 @@ z-index: @zindexTooltip; display: block; visibility: visible; - padding: 5px; font-size: 11px; + line-height: 1.4; .opacity(0); &.in { .opacity(80); } - &.top { margin-top: -3px; } - &.right { margin-left: 3px; } - &.bottom { margin-top: 3px; } - &.left { margin-left: -3px; } + &.top { margin-top: -3px; padding: 5px 0; } + &.right { margin-left: 3px; padding: 0 5px; } + &.bottom { margin-top: 3px; padding: 5px 0; } + &.left { margin-left: -3px; padding: 0 5px; } } // Wrapper for the tooltip content .tooltip-inner { max-width: 200px; - padding: 3px 8px; + padding: 8px; color: @tooltipColor; text-align: center; text-decoration: none; diff --git a/NzbDrone.Backbone/Content/Bootstrap/type.less b/NzbDrone.Backbone/Content/Bootstrap/type.less index 683a30772..337138ac8 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/type.less +++ b/NzbDrone.Backbone/Content/Bootstrap/type.less @@ -29,19 +29,28 @@ cite { font-style: normal; } // Utility classes .muted { color: @grayLight; } -a.muted:hover { color: darken(@grayLight, 10%); } +a.muted:hover, +a.muted:focus { color: darken(@grayLight, 10%); } .text-warning { color: @warningText; } -a.text-warning:hover { color: darken(@warningText, 10%); } +a.text-warning:hover, +a.text-warning:focus { color: darken(@warningText, 10%); } .text-error { color: @errorText; } -a.text-error:hover { color: darken(@errorText, 10%); } +a.text-error:hover, +a.text-error:focus { color: darken(@errorText, 10%); } .text-info { color: @infoText; } -a.text-info:hover { color: darken(@infoText, 10%); } +a.text-info:hover, +a.text-info:focus { color: darken(@infoText, 10%); } .text-success { color: @successText; } -a.text-success:hover { color: darken(@successText, 10%); } +a.text-success:hover, +a.text-success:focus { color: darken(@successText, 10%); } + +.text-left { text-align: left; } +.text-right { text-align: right; } +.text-center { text-align: center; } // Headings @@ -119,8 +128,9 @@ ul.inline, ol.inline { margin-left: 0; list-style: none; - & > li { + > li { display: inline-block; + .ie7-inline-block(); padding-left: 5px; padding-right: 5px; } @@ -185,7 +195,9 @@ blockquote { border-left: 5px solid @grayLighter; p { margin-bottom: 0; - #font > .shorthand(16px,300,@baseLineHeight * 1.25); + font-size: @baseFontSize * 1.25; + font-weight: 300; + line-height: 1.25; } small { display: block; diff --git a/NzbDrone.Backbone/Content/Bootstrap/variables.less b/NzbDrone.Backbone/Content/Bootstrap/variables.less index 0eda9473c..9652eaac1 100644 --- a/NzbDrone.Backbone/Content/Bootstrap/variables.less +++ b/NzbDrone.Backbone/Content/Bootstrap/variables.less @@ -20,7 +20,7 @@ // Accent colors // ------------------------- -@blue: #065EFE; +@blue: #049cdb; @blueDark: #0064cd; @green: #46a546; @red: #9d261d; @@ -86,7 +86,7 @@ // ------------------------- @btnBackground: @white; @btnBackgroundHighlight: darken(@white, 10%); -@btnBorder: #bbb; +@btnBorder: #ccc; @btnPrimaryBackground: @linkColor; @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%); @@ -195,13 +195,13 @@ @navbarBrandColor: @navbarLinkColor; // Inverted navbar -@navbarInverseBackground: @grayDarker; -@navbarInverseBackgroundHighlight: @grayDarker; -@navbarInverseBorder: @grayDarker; +@navbarInverseBackground: #111111; +@navbarInverseBackgroundHighlight: #222222; +@navbarInverseBorder: #252525; -@navbarInverseText: @blue; -@navbarInverseLinkColor: @blue; -@navbarInverseLinkColorHover: @blue; +@navbarInverseText: @grayLight; +@navbarInverseLinkColor: @grayLight; +@navbarInverseLinkColorHover: @white; @navbarInverseLinkColorActive: @navbarInverseLinkColorHover; @navbarInverseLinkBackgroundHover: transparent; @navbarInverseLinkBackgroundActive: @navbarInverseBackground; diff --git a/NzbDrone.Backbone/JsLibraries/bootstrap.js b/NzbDrone.Backbone/JsLibraries/bootstrap.js index 6c15a5832..a81171b42 100644 --- a/NzbDrone.Backbone/JsLibraries/bootstrap.js +++ b/NzbDrone.Backbone/JsLibraries/bootstrap.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.2.2 + * bootstrap-transition.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. @@ -58,7 +58,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.2.2 + * bootstrap-alert.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. @@ -156,7 +156,7 @@ $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) }(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.2.2 + * bootstrap-button.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. @@ -260,7 +260,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.2.2 + * bootstrap-carousel.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. @@ -289,6 +289,7 @@ var Carousel = function (element, options) { this.$element = $(element) + this.$indicators = this.$element.find('.carousel-indicators') this.options = options this.options.pause == 'hover' && this.$element .on('mouseenter', $.proxy(this.pause, this)) @@ -299,19 +300,24 @@ cycle: function (e) { if (!e) this.paused = false + if (this.interval) clearInterval(this.interval); this.options.interval && !this.paused && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) return this } + , getActiveIndex: function () { + this.$active = this.$element.find('.item.active') + this.$items = this.$active.parent().children() + return this.$items.index(this.$active) + } + , to: function (pos) { - var $active = this.$element.find('.item.active') - , children = $active.parent().children() - , activePos = children.index($active) + var activeIndex = this.getActiveIndex() , that = this - if (pos > (children.length - 1) || pos < 0) return + if (pos > (this.$items.length - 1) || pos < 0) return if (this.sliding) { return this.$element.one('slid', function () { @@ -319,11 +325,11 @@ }) } - if (activePos == pos) { + if (activeIndex == pos) { return this.pause().cycle() } - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) + return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) } , pause: function (e) { @@ -364,10 +370,19 @@ e = $.Event('slide', { relatedTarget: $next[0] + , direction: direction }) if ($next.hasClass('active')) return + if (this.$indicators.length) { + this.$indicators.find('.active').removeClass('active') + this.$element.one('slid', function () { + var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) + $nextIndicator && $nextIndicator.addClass('active') + }) + } + if ($.support.transition && this.$element.hasClass('slide')) { this.$element.trigger(e) if (e.isDefaultPrevented()) return @@ -412,7 +427,7 @@ if (!data) $this.data('carousel', (data = new Carousel(this, options))) if (typeof option == 'number') data.to(option) else if (action) data[action]() - else if (options.interval) data.cycle() + else if (options.interval) data.pause().cycle() }) } @@ -435,16 +450,23 @@ /* CAROUSEL DATA-API * ================= */ - $(document).on('click.carousel.data-api', '[data-slide]', function (e) { + $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { var $this = $(this), href , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 , options = $.extend({}, $target.data(), $this.data()) + , slideIndex + $target.carousel(options) + + if (slideIndex = $this.attr('data-slide-to')) { + $target.data('carousel').pause().to(slideIndex).cycle() + } + e.preventDefault() }) }(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.2.2 + * bootstrap-collapse.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. @@ -497,7 +519,7 @@ , actives , hasData - if (this.transitioning) return + if (this.transitioning || this.$element.hasClass('in')) return dimension = this.dimension() scroll = $.camelCase(['scroll', dimension].join('-')) @@ -517,7 +539,7 @@ , hide: function () { var dimension - if (this.transitioning) return + if (this.transitioning || !this.$element.hasClass('in')) return dimension = this.dimension() this.reset(this.$element[dimension]()) this.transition('removeClass', $.Event('hide'), 'hidden') @@ -574,7 +596,7 @@ return this.each(function () { var $this = $(this) , data = $this.data('collapse') - , options = typeof option == 'object' && option + , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) if (!data) $this.data('collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) @@ -610,7 +632,7 @@ }) }(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.2.2 + * bootstrap-dropdown.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -692,7 +714,10 @@ isActive = $parent.hasClass('open') - if (!isActive || (isActive && e.keyCode == 27)) return $this.click() + if (!isActive || (isActive && e.keyCode == 27)) { + if (e.which == 27) $parent.find(toggle).focus() + return $this.click() + } $items = $('[role=menu] li:not(.divider):visible a', $parent) @@ -726,8 +751,9 @@ selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 } - $parent = $(selector) - $parent.length || ($parent = $this.parent()) + $parent = selector && $(selector) + + if (!$parent || !$parent.length) $parent = $this.parent() return $parent } @@ -763,14 +789,15 @@ * =================================== */ $(document) - .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) - .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('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) - -}(window.jQuery);/* ========================================================= - * bootstrap-modal.js v2.2.2 + .on('click.dropdown.data-api', clearMenus) + .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('.dropdown-menu', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) + +}(window.jQuery); +/* ========================================================= + * bootstrap-modal.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. @@ -831,8 +858,7 @@ that.$element.appendTo(document.body) //don't move modals dom position } - that.$element - .show() + that.$element.show() if (transition) { that.$element[0].offsetWidth // force reflow @@ -910,12 +936,13 @@ }) } - , hideModal: function (that) { - this.$element - .hide() - .trigger('hidden') - - this.backdrop() + , hideModal: function () { + var that = this + this.$element.hide() + this.backdrop(function () { + that.removeBackdrop() + that.$element.trigger('hidden') + }) } , removeBackdrop: function () { @@ -943,6 +970,8 @@ this.$backdrop.addClass('in') + if (!callback) return + doAnimate ? this.$backdrop.one($.support.transition.end, callback) : callback() @@ -951,8 +980,8 @@ this.$backdrop.removeClass('in') $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) : - this.removeBackdrop() + this.$backdrop.one($.support.transition.end, callback) : + callback() } else if (callback) { callback() @@ -1015,7 +1044,7 @@ }(window.jQuery); /* =========================================================== - * bootstrap-tooltip.js v2.2.2 + * bootstrap-tooltip.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -1054,19 +1083,27 @@ , init: function (type, element, options) { var eventIn , eventOut + , triggers + , trigger + , i this.type = type this.$element = $(element) this.options = this.getOptions(options) this.enabled = true - if (this.options.trigger == 'click') { - this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) - } else if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + triggers = this.options.trigger.split(' ') + + for (i = triggers.length; i--;) { + trigger = triggers[i] + if (trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (trigger != 'manual') { + eventIn = trigger == 'hover' ? 'mouseenter' : 'focus' + eventOut = trigger == 'hover' ? 'mouseleave' : 'blur' + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } } this.options.selector ? @@ -1075,7 +1112,7 @@ } , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) + options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options) if (options.delay && typeof options.delay == 'number') { options.delay = { @@ -1113,14 +1150,16 @@ , show: function () { var $tip - , inside , pos , actualWidth , actualHeight , placement , tp + , e = $.Event('show') if (this.hasContent() && this.enabled) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return $tip = this.tip() this.setContent() @@ -1132,19 +1171,18 @@ this.options.placement.call(this, $tip[0], this.$element[0]) : this.options.placement - inside = /in/.test(placement) - $tip .detach() .css({ top: 0, left: 0, display: 'block' }) - .insertAfter(this.$element) - pos = this.getPosition(inside) + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) + + pos = this.getPosition() actualWidth = $tip[0].offsetWidth actualHeight = $tip[0].offsetHeight - switch (inside ? placement.split(' ')[1] : placement) { + switch (placement) { case 'bottom': tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} break @@ -1159,11 +1197,56 @@ break } - $tip - .offset(tp) - .addClass(placement) - .addClass('in') + this.applyPlacement(tp, placement) + this.$element.trigger('shown') + } + } + + , applyPlacement: function(offset, placement){ + var $tip = this.tip() + , width = $tip[0].offsetWidth + , height = $tip[0].offsetHeight + , actualWidth + , actualHeight + , delta + , replace + + $tip + .offset(offset) + .addClass(placement) + .addClass('in') + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + + if (placement == 'top' && actualHeight != height) { + offset.top = offset.top + height - actualHeight + replace = true } + + if (placement == 'bottom' || placement == 'top') { + delta = 0 + + if (offset.left < 0){ + delta = offset.left * -2 + offset.left = 0 + $tip.offset(offset) + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + } + + this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') + } else { + this.replaceArrow(actualHeight - height, actualHeight, 'top') + } + + if (replace) $tip.offset(offset) + } + + , replaceArrow: function(delta, dimension, position){ + this + .arrow() + .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') } , setContent: function () { @@ -1177,6 +1260,10 @@ , hide: function () { var that = this , $tip = this.tip() + , e = $.Event('hide') + + this.$element.trigger(e) + if (e.isDefaultPrevented()) return $tip.removeClass('in') @@ -1195,13 +1282,15 @@ removeWithAnimation() : $tip.detach() + this.$element.trigger('hidden') + return this } , fixTitle: function () { var $e = this.$element if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') } } @@ -1209,11 +1298,12 @@ return this.getTitle() } - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) + , getPosition: function () { + var el = this.$element[0] + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { + width: el.offsetWidth + , height: el.offsetHeight + }, this.$element.offset()) } , getTitle: function () { @@ -1231,6 +1321,10 @@ return this.$tip = this.$tip || $(this.options.template) } + , arrow: function(){ + return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow") + } + , validate: function () { if (!this.$element[0].parentNode) { this.hide() @@ -1252,8 +1346,8 @@ } , toggle: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - self[self.tip().hasClass('in') ? 'hide' : 'show']() + var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this + self.tip().hasClass('in') ? self.hide() : self.show() } , destroy: function () { @@ -1285,10 +1379,11 @@ , placement: 'top' , selector: false , template: '
' - , trigger: 'hover' + , trigger: 'hover focus' , title: '' , delay: 0 , html: false + , container: false } @@ -1300,8 +1395,9 @@ return this } -}(window.jQuery);/* =========================================================== - * bootstrap-popover.js v2.2.2 +}(window.jQuery); +/* =========================================================== + * bootstrap-popover.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. @@ -1360,8 +1456,8 @@ , $e = this.$element , o = this.options - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) + content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) + || $e.attr('data-content') return content } @@ -1401,7 +1497,7 @@ placement: 'right' , trigger: 'click' , content: '' - , template: '

' + , template: '

' }) @@ -1413,8 +1509,9 @@ return this } -}(window.jQuery);/* ============================================================= - * bootstrap-scrollspy.js v2.2.2 +}(window.jQuery); +/* ============================================================= + * bootstrap-scrollspy.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1474,7 +1571,7 @@ , $href = /^#\w/.test(href) && $(href) return ( $href && $href.length - && [[ $href.position().top + self.$scrollElement.scrollTop(), href ]] ) || null + && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null }) .sort(function (a, b) { return a[0] - b[0] }) .each(function () { @@ -1575,7 +1672,7 @@ }) }(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.2.2 + * bootstrap-tab.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. @@ -1718,7 +1815,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.2.2 + * bootstrap-typeahead.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1891,6 +1988,7 @@ , listen: function () { this.$element + .on('focus', $.proxy(this.focus, this)) .on('blur', $.proxy(this.blur, this)) .on('keypress', $.proxy(this.keypress, this)) .on('keyup', $.proxy(this.keyup, this)) @@ -1902,6 +2000,7 @@ this.$menu .on('click', $.proxy(this.click, this)) .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) + .on('mouseleave', 'li', $.proxy(this.mouseleave, this)) } , eventSupported: function(eventName) { @@ -1975,22 +2074,33 @@ e.preventDefault() } + , focus: function (e) { + this.focused = true + } + , blur: function (e) { - var that = this - setTimeout(function () { that.hide() }, 150) + this.focused = false + if (!this.mousedover && this.shown) this.hide() } , click: function (e) { e.stopPropagation() e.preventDefault() this.select() + this.$element.focus() } , mouseenter: function (e) { + this.mousedover = true this.$menu.find('.active').removeClass('active') $(e.currentTarget).addClass('active') } + , mouseleave: function (e) { + this.mousedover = false + if (!this.focused && this.shown) this.hide() + } + } @@ -2035,13 +2145,12 @@ $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { var $this = $(this) if ($this.data('typeahead')) return - e.preventDefault() $this.typeahead($this.data()) }) }(window.jQuery); /* ========================================================== - * bootstrap-affix.js v2.2.2 + * bootstrap-affix.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc.