From f3189e26cff5142e200568a81ef3db608530cc6f Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Fri, 27 Jun 2014 01:07:56 -0400 Subject: 3.1.1 -> 3.2.0 --- bower_components/bootstrap/less/alerts.less | 7 +- bower_components/bootstrap/less/badges.less | 36 +- bower_components/bootstrap/less/bootstrap.less | 5 +- bower_components/bootstrap/less/button-groups.less | 18 +- bower_components/bootstrap/less/buttons.less | 2 - bower_components/bootstrap/less/carousel.less | 19 +- bower_components/bootstrap/less/code.less | 7 +- .../bootstrap/less/component-animations.less | 10 +- bower_components/bootstrap/less/dropdowns.less | 2 + bower_components/bootstrap/less/forms.less | 186 +++- bower_components/bootstrap/less/glyphicons.less | 10 +- bower_components/bootstrap/less/input-groups.less | 8 +- bower_components/bootstrap/less/jumbotron.less | 4 + bower_components/bootstrap/less/labels.less | 2 +- bower_components/bootstrap/less/list-group.less | 23 +- bower_components/bootstrap/less/mixins.less | 960 +-------------------- bower_components/bootstrap/less/mixins/alerts.less | 14 + .../bootstrap/less/mixins/background-variant.less | 8 + .../bootstrap/less/mixins/border-radius.less | 18 + .../bootstrap/less/mixins/buttons.less | 50 ++ .../bootstrap/less/mixins/center-block.less | 7 + .../bootstrap/less/mixins/clearfix.less | 22 + bower_components/bootstrap/less/mixins/forms.less | 81 ++ .../bootstrap/less/mixins/gradients.less | 59 ++ .../bootstrap/less/mixins/grid-framework.less | 91 ++ bower_components/bootstrap/less/mixins/grid.less | 122 +++ .../bootstrap/less/mixins/hide-text.less | 21 + bower_components/bootstrap/less/mixins/image.less | 34 + bower_components/bootstrap/less/mixins/labels.less | 12 + .../bootstrap/less/mixins/list-group.less | 29 + .../bootstrap/less/mixins/nav-divider.less | 10 + .../bootstrap/less/mixins/nav-vertical-align.less | 9 + .../bootstrap/less/mixins/opacity.less | 8 + .../bootstrap/less/mixins/pagination.less | 23 + bower_components/bootstrap/less/mixins/panels.less | 24 + .../bootstrap/less/mixins/progress-bar.less | 10 + .../bootstrap/less/mixins/reset-filter.less | 8 + bower_components/bootstrap/less/mixins/resize.less | 6 + .../less/mixins/responsive-visibility.less | 15 + bower_components/bootstrap/less/mixins/size.less | 10 + .../bootstrap/less/mixins/tab-focus.less | 9 + .../bootstrap/less/mixins/table-row.less | 28 + .../bootstrap/less/mixins/text-emphasis.less | 8 + .../bootstrap/less/mixins/text-overflow.less | 8 + .../bootstrap/less/mixins/vendor-prefixes.less | 224 +++++ bower_components/bootstrap/less/modals.less | 25 +- bower_components/bootstrap/less/navbar.less | 43 +- bower_components/bootstrap/less/navs.less | 2 +- bower_components/bootstrap/less/normalize.less | 40 +- bower_components/bootstrap/less/panels.less | 14 +- bower_components/bootstrap/less/popovers.less | 2 +- bower_components/bootstrap/less/progress-bars.less | 29 +- .../bootstrap/less/responsive-embed.less | 34 + .../bootstrap/less/responsive-utilities.less | 104 ++- bower_components/bootstrap/less/scaffolding.less | 18 +- bower_components/bootstrap/less/tables.less | 8 +- bower_components/bootstrap/less/theme.less | 11 + bower_components/bootstrap/less/type.less | 44 +- bower_components/bootstrap/less/utilities.less | 1 + bower_components/bootstrap/less/variables.less | 63 +- 60 files changed, 1614 insertions(+), 1091 deletions(-) create mode 100644 bower_components/bootstrap/less/mixins/alerts.less create mode 100644 bower_components/bootstrap/less/mixins/background-variant.less create mode 100644 bower_components/bootstrap/less/mixins/border-radius.less create mode 100644 bower_components/bootstrap/less/mixins/buttons.less create mode 100644 bower_components/bootstrap/less/mixins/center-block.less create mode 100644 bower_components/bootstrap/less/mixins/clearfix.less create mode 100644 bower_components/bootstrap/less/mixins/forms.less create mode 100644 bower_components/bootstrap/less/mixins/gradients.less create mode 100644 bower_components/bootstrap/less/mixins/grid-framework.less create mode 100644 bower_components/bootstrap/less/mixins/grid.less create mode 100644 bower_components/bootstrap/less/mixins/hide-text.less create mode 100644 bower_components/bootstrap/less/mixins/image.less create mode 100644 bower_components/bootstrap/less/mixins/labels.less create mode 100644 bower_components/bootstrap/less/mixins/list-group.less create mode 100644 bower_components/bootstrap/less/mixins/nav-divider.less create mode 100644 bower_components/bootstrap/less/mixins/nav-vertical-align.less create mode 100644 bower_components/bootstrap/less/mixins/opacity.less create mode 100644 bower_components/bootstrap/less/mixins/pagination.less create mode 100644 bower_components/bootstrap/less/mixins/panels.less create mode 100644 bower_components/bootstrap/less/mixins/progress-bar.less create mode 100644 bower_components/bootstrap/less/mixins/reset-filter.less create mode 100644 bower_components/bootstrap/less/mixins/resize.less create mode 100644 bower_components/bootstrap/less/mixins/responsive-visibility.less create mode 100644 bower_components/bootstrap/less/mixins/size.less create mode 100644 bower_components/bootstrap/less/mixins/tab-focus.less create mode 100644 bower_components/bootstrap/less/mixins/table-row.less create mode 100644 bower_components/bootstrap/less/mixins/text-emphasis.less create mode 100644 bower_components/bootstrap/less/mixins/text-overflow.less create mode 100644 bower_components/bootstrap/less/mixins/vendor-prefixes.less create mode 100644 bower_components/bootstrap/less/responsive-embed.less (limited to 'bower_components/bootstrap/less') diff --git a/bower_components/bootstrap/less/alerts.less b/bower_components/bootstrap/less/alerts.less index 3eab0662..df070b8a 100644 --- a/bower_components/bootstrap/less/alerts.less +++ b/bower_components/bootstrap/less/alerts.less @@ -33,12 +33,13 @@ } } -// Dismissable alerts +// Dismissible alerts // // Expand the right padding and account for the close button's positioning. -.alert-dismissable { - padding-right: (@alert-padding + 20); +.alert-dismissable, // The misspelled .alert-dismissable was deprecated in 3.2.0. +.alert-dismissible { + padding-right: (@alert-padding + 20); // Adjust close link position .close { diff --git a/bower_components/bootstrap/less/badges.less b/bower_components/bootstrap/less/badges.less index 56828cab..20624f30 100644 --- a/bower_components/bootstrap/less/badges.less +++ b/bower_components/bootstrap/less/badges.less @@ -3,7 +3,7 @@ // -------------------------------------------------- -// Base classes +// Base class .badge { display: inline-block; min-width: 10px; @@ -32,24 +32,24 @@ top: 0; padding: 1px 5px; } -} -// Hover state, but only for links -a.badge { - &:hover, - &:focus { - color: @badge-link-hover-color; - text-decoration: none; - cursor: pointer; + // Hover state, but only for links + a& { + &:hover, + &:focus { + color: @badge-link-hover-color; + text-decoration: none; + cursor: pointer; + } } -} -// Account for counters in navs -a.list-group-item.active > .badge, -.nav-pills > .active > a > .badge { - color: @badge-active-color; - background-color: @badge-active-bg; -} -.nav-pills > li > a > .badge { - margin-left: 3px; + // Account for badges in navs + a.list-group-item.active > &, + .nav-pills > .active > a > & { + color: @badge-active-color; + background-color: @badge-active-bg; + } + .nav-pills > li > a > & { + margin-left: 3px; + } } diff --git a/bower_components/bootstrap/less/bootstrap.less b/bower_components/bootstrap/less/bootstrap.less index b368b871..61b77474 100644 --- a/bower_components/bootstrap/less/bootstrap.less +++ b/bower_components/bootstrap/less/bootstrap.less @@ -2,9 +2,10 @@ @import "variables.less"; @import "mixins.less"; -// Reset +// Reset and dependencies @import "normalize.less"; @import "print.less"; +@import "glyphicons.less"; // Core CSS @import "scaffolding.less"; @@ -17,7 +18,6 @@ // Components @import "component-animations.less"; -@import "glyphicons.less"; @import "dropdowns.less"; @import "button-groups.less"; @import "input-groups.less"; @@ -35,6 +35,7 @@ @import "media.less"; @import "list-group.less"; @import "panels.less"; +@import "responsive-embed.less"; @import "wells.less"; @import "close.less"; diff --git a/bower_components/bootstrap/less/button-groups.less b/bower_components/bootstrap/less/button-groups.less index 27eb796b..7021ecd1 100644 --- a/bower_components/bootstrap/less/button-groups.less +++ b/bower_components/bootstrap/less/button-groups.less @@ -20,7 +20,7 @@ } &:focus { // Remove focus outline when dropdown JS adds it after closing the menu - outline: none; + outline: 0; } } } @@ -216,11 +216,25 @@ > .btn-group .btn { width: 100%; } + + > .btn-group .dropdown-menu { + left: auto; + } } // Checkbox and radio options +// +// In order to support the browser's form validation feedback, powered by the +// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot +// use `display: none;` or `visibility: hidden;` as that also hides the popover. +// This way, we ensure a DOM element is visible to position the popover from. +// +// See https://github.com/twbs/bootstrap/pull/12794 for more. + [data-toggle="buttons"] > .btn > input[type="radio"], [data-toggle="buttons"] > .btn > input[type="checkbox"] { - display: none; + position: absolute; + z-index: -1; + .opacity(0); } diff --git a/bower_components/bootstrap/less/buttons.less b/bower_components/bootstrap/less/buttons.less index d4fc156b..492bdc65 100644 --- a/bower_components/bootstrap/less/buttons.less +++ b/bower_components/bootstrap/less/buttons.less @@ -140,8 +140,6 @@ .btn-block { display: block; width: 100%; - padding-left: 0; - padding-right: 0; } // Vertically space out multiple block buttons diff --git a/bower_components/bootstrap/less/carousel.less b/bower_components/bootstrap/less/carousel.less index e3fb8a2c..1644ddf7 100644 --- a/bower_components/bootstrap/less/carousel.less +++ b/bower_components/bootstrap/less/carousel.less @@ -28,7 +28,9 @@ > .active, > .next, - > .prev { display: block; } + > .prev { + display: block; + } > .active { left: 0; @@ -91,7 +93,7 @@ // Hover/focus state &:hover, &:focus { - outline: none; + outline: 0; color: @carousel-control-color; text-decoration: none; .opacity(.9); @@ -110,20 +112,22 @@ .icon-prev, .glyphicon-chevron-left { left: 50%; + margin-left: -10px; } .icon-next, .glyphicon-chevron-right { right: 50%; + margin-right: -10px; } .icon-prev, .icon-next { width: 20px; height: 20px; margin-top: -10px; - margin-left: -10px; font-family: serif; } + .icon-prev { &:before { content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039) @@ -213,9 +217,16 @@ width: 30px; height: 30px; margin-top: -15px; - margin-left: -15px; font-size: 30px; } + .glyphicon-chevron-left, + .icon-prev { + margin-left: -15px; + } + .glyphicon-chevron-right, + .icon-next { + margin-right: -15px; + } } // Show and left align the captions diff --git a/bower_components/bootstrap/less/code.less b/bower_components/bootstrap/less/code.less index 3eed26c0..baa13df6 100644 --- a/bower_components/bootstrap/less/code.less +++ b/bower_components/bootstrap/less/code.less @@ -17,7 +17,6 @@ code { font-size: 90%; color: @code-color; background-color: @code-bg; - white-space: nowrap; border-radius: @border-radius-base; } @@ -29,6 +28,12 @@ kbd { background-color: @kbd-bg; border-radius: @border-radius-small; box-shadow: inset 0 -1px 0 rgba(0,0,0,.25); + + kbd { + padding: 0; + font-size: 100%; + box-shadow: none; + } } // Blocks of code diff --git a/bower_components/bootstrap/less/component-animations.less b/bower_components/bootstrap/less/component-animations.less index 1efe45e2..9400a0d3 100644 --- a/bower_components/bootstrap/less/component-animations.less +++ b/bower_components/bootstrap/less/component-animations.less @@ -5,7 +5,7 @@ // Heads up! // // We don't use the `.opacity()` mixin here since it causes a bug with text -// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552. +// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552. .fade { opacity: 0; @@ -17,10 +17,12 @@ .collapse { display: none; - &.in { - display: block; - } + + &.in { display: block; } + tr&.in { display: table-row; } + tbody&.in { display: table-row-group; } } + .collapsing { position: relative; height: 0; diff --git a/bower_components/bootstrap/less/dropdowns.less b/bower_components/bootstrap/less/dropdowns.less index f165165e..3eb7fc05 100644 --- a/bower_components/bootstrap/less/dropdowns.less +++ b/bower_components/bootstrap/less/dropdowns.less @@ -38,6 +38,7 @@ margin: 2px 0 0; // override default ul list-style: none; font-size: @font-size-base; + text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) background-color: @dropdown-bg; border: 1px solid @dropdown-fallback-border; // IE8 fallback border: 1px solid @dropdown-border; @@ -154,6 +155,7 @@ font-size: @font-size-small; line-height: @line-height-base; color: @dropdown-header-color; + white-space: nowrap; // as with > li > a } // Backdrop to catch body clicks on mobile, etc. diff --git a/bower_components/bootstrap/less/forms.less b/bower_components/bootstrap/less/forms.less index f607b850..2c5e9bfa 100644 --- a/bower_components/bootstrap/less/forms.less +++ b/bower_components/bootstrap/less/forms.less @@ -11,7 +11,7 @@ fieldset { padding: 0; margin: 0; border: 0; - // Chrome and Firefox set a `min-width: -webkit-min-content;` on fieldsets, + // Chrome and Firefox set a `min-width: min-content;` on fieldsets, // so we reset that to ensure it behaves more like a standard block element. // See https://github.com/twbs/bootstrap/issues/12359. min-width: 0; @@ -31,6 +31,7 @@ legend { label { display: inline-block; + max-width: 100%; // Force IE8 to wrap long content (see https://github.com/twbs/bootstrap/issues/13141) margin-bottom: 5px; font-weight: bold; } @@ -51,7 +52,7 @@ input[type="search"] { input[type="radio"], input[type="checkbox"] { margin: 4px 0 0; - margin-top: 1px \9; /* IE8-9 */ + margin-top: 1px \9; // IE8-9 line-height: normal; } @@ -164,13 +165,28 @@ input[type="search"] { } -// Special styles for iOS date input +// Special styles for iOS temporal inputs // -// In Mobile Safari, date inputs require a pixel line-height that matches the -// given height of the input. - -input[type="date"] { +// In Mobile Safari, setting `display: block` on temporal inputs causes the +// text within the input to become vertically misaligned. +// As a workaround, we set a pixel line-height that matches the +// given height of the input. Since this fucks up everything else, we have to +// appropriately reset it for Internet Explorer and the size variations. + +input[type="date"], +input[type="time"], +input[type="datetime-local"], +input[type="month"] { line-height: @input-height-base; + // IE8+ misaligns the text within date inputs, so we reset + line-height: @line-height-base ~"\0"; + + &.input-sm { + line-height: @input-height-small; + } + &.input-lg { + line-height: @input-height-large; + } } @@ -190,13 +206,15 @@ input[type="date"] { .radio, .checkbox { + position: relative; display: block; min-height: @line-height-computed; // clear the floating input if there is no label text margin-top: 10px; margin-bottom: 10px; - padding-left: 20px; + label { - display: inline; + padding-left: 20px; + margin-bottom: 0; font-weight: normal; cursor: pointer; } @@ -205,9 +223,11 @@ input[type="date"] { .radio-inline input[type="radio"], .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] { - float: left; + position: absolute; margin-left: -20px; + margin-top: 4px \9; } + .radio + .radio, .checkbox + .checkbox { margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing @@ -230,19 +250,55 @@ input[type="date"] { } // Apply same disabled cursor tweak as for inputs +// Some special care is needed because