From cdaaf5945f7a9056900ddd93a6fd1c0ae9d8c967 Mon Sep 17 00:00:00 2001 From: Sal Ferrarello Date: Fri, 8 Apr 2016 14:04:42 -0400 Subject: [PATCH] Upgrade Bootstrap to version 3.3.6 Fixes #118 --- css/sass/supporting/bootstrap.scss | 2 +- css/sass/supporting/bootstrap/_alerts.scss | 0 css/sass/supporting/bootstrap/_badges.scss | 0 .../supporting/bootstrap/_breadcrumbs.scss | 4 +- .../supporting/bootstrap/_button-groups.scss | 4 +- css/sass/supporting/bootstrap/_buttons.scss | 0 css/sass/supporting/bootstrap/_carousel.scss | 13 ++-- css/sass/supporting/bootstrap/_close.scss | 0 css/sass/supporting/bootstrap/_code.scss | 0 .../bootstrap/_component-animations.scss | 0 css/sass/supporting/bootstrap/_dropdowns.scss | 2 +- css/sass/supporting/bootstrap/_forms.scss | 12 +++- .../supporting/bootstrap/_glyphicons.scss | 4 +- css/sass/supporting/bootstrap/_grid.scss | 0 .../supporting/bootstrap/_input-groups.scss | 10 +++- css/sass/supporting/bootstrap/_jumbotron.scss | 2 + css/sass/supporting/bootstrap/_labels.scss | 0 .../supporting/bootstrap/_list-group.scss | 0 css/sass/supporting/bootstrap/_media.scss | 0 css/sass/supporting/bootstrap/_mixins.scss | 0 css/sass/supporting/bootstrap/_modals.scss | 2 +- css/sass/supporting/bootstrap/_navbar.scss | 0 css/sass/supporting/bootstrap/_navs.scss | 0 css/sass/supporting/bootstrap/_normalize.scss | 0 css/sass/supporting/bootstrap/_pager.scss | 0 .../supporting/bootstrap/_pagination.scss | 4 +- css/sass/supporting/bootstrap/_panels.scss | 0 css/sass/supporting/bootstrap/_popovers.scss | 0 css/sass/supporting/bootstrap/_print.scss | 0 .../supporting/bootstrap/_progress-bars.scss | 0 .../bootstrap/_responsive-embed.scss | 0 .../bootstrap/_responsive-utilities.scss | 0 .../supporting/bootstrap/_scaffolding.scss | 0 css/sass/supporting/bootstrap/_tables.scss | 0 css/sass/supporting/bootstrap/_theme.scss | 2 +- .../supporting/bootstrap/_thumbnails.scss | 0 css/sass/supporting/bootstrap/_tooltip.scss | 0 css/sass/supporting/bootstrap/_type.scss | 2 +- css/sass/supporting/bootstrap/_utilities.scss | 0 css/sass/supporting/bootstrap/_variables.scss | 2 + css/sass/supporting/bootstrap/_wells.scss | 0 .../supporting/bootstrap/mixins/_alerts.scss | 0 .../bootstrap/mixins/_background-variant.scss | 0 .../bootstrap/mixins/_border-radius.scss | 0 .../supporting/bootstrap/mixins/_buttons.scss | 5 +- .../bootstrap/mixins/_center-block.scss | 0 .../bootstrap/mixins/_clearfix.scss | 0 .../supporting/bootstrap/mixins/_forms.scss | 0 .../bootstrap/mixins/_gradients.scss | 0 .../bootstrap/mixins/_grid-framework.scss | 0 .../supporting/bootstrap/mixins/_grid.scss | 4 +- .../bootstrap/mixins/_hide-text.scss | 2 +- .../supporting/bootstrap/mixins/_image.scss | 0 .../supporting/bootstrap/mixins/_labels.scss | 0 .../bootstrap/mixins/_list-group.scss | 0 .../bootstrap/mixins/_nav-divider.scss | 0 .../bootstrap/mixins/_nav-vertical-align.scss | 0 .../supporting/bootstrap/mixins/_opacity.scss | 0 .../bootstrap/mixins/_pagination.scss | 0 .../supporting/bootstrap/mixins/_panels.scss | 0 .../bootstrap/mixins/_progress-bar.scss | 0 .../bootstrap/mixins/_reset-filter.scss | 0 .../bootstrap/mixins/_reset-text.scss | 0 .../supporting/bootstrap/mixins/_resize.scss | 0 .../mixins/_responsive-visibility.scss | 0 .../supporting/bootstrap/mixins/_size.scss | 0 .../bootstrap/mixins/_tab-focus.scss | 0 .../bootstrap/mixins/_table-row.scss | 0 .../bootstrap/mixins/_text-emphasis.scss | 0 .../bootstrap/mixins/_text-overflow.scss | 0 .../bootstrap/mixins/_vendor-prefixes.scss | 4 +- .../glyphicons-halflings-regular.eot | Bin .../glyphicons-halflings-regular.svg | 0 .../glyphicons-halflings-regular.ttf | Bin .../glyphicons-halflings-regular.woff | Bin .../glyphicons-halflings-regular.woff2 | Bin js/vendor/bootstrap/bootstrap.js | 56 +++++++++--------- 77 files changed, 75 insertions(+), 61 deletions(-) mode change 100644 => 100755 css/sass/supporting/bootstrap.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_alerts.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_badges.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_breadcrumbs.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_button-groups.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_buttons.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_carousel.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_close.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_code.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_component-animations.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_dropdowns.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_forms.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_glyphicons.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_grid.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_input-groups.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_jumbotron.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_labels.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_list-group.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_media.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_mixins.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_modals.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_navbar.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_navs.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_normalize.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_pager.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_pagination.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_panels.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_popovers.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_print.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_progress-bars.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_responsive-embed.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_responsive-utilities.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_scaffolding.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_tables.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_theme.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_thumbnails.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_tooltip.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_type.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_utilities.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_variables.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/_wells.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_alerts.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_background-variant.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_border-radius.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_buttons.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_center-block.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_clearfix.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_forms.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_gradients.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_grid-framework.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_grid.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_hide-text.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_image.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_labels.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_list-group.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_nav-divider.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_nav-vertical-align.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_opacity.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_pagination.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_panels.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_progress-bar.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_reset-filter.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_reset-text.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_resize.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_responsive-visibility.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_size.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_tab-focus.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_table-row.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_text-emphasis.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_text-overflow.scss mode change 100644 => 100755 css/sass/supporting/bootstrap/mixins/_vendor-prefixes.scss mode change 100644 => 100755 fonts/bootstrap/glyphicons-halflings-regular.eot mode change 100644 => 100755 fonts/bootstrap/glyphicons-halflings-regular.svg mode change 100644 => 100755 fonts/bootstrap/glyphicons-halflings-regular.ttf mode change 100644 => 100755 fonts/bootstrap/glyphicons-halflings-regular.woff mode change 100644 => 100755 fonts/bootstrap/glyphicons-halflings-regular.woff2 mode change 100644 => 100755 js/vendor/bootstrap/bootstrap.js diff --git a/css/sass/supporting/bootstrap.scss b/css/sass/supporting/bootstrap.scss old mode 100644 new mode 100755 index 598b007..c773c8c --- a/css/sass/supporting/bootstrap.scss +++ b/css/sass/supporting/bootstrap.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.3.5 (http://getbootstrap.com) + * Bootstrap v3.3.6 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ diff --git a/css/sass/supporting/bootstrap/_alerts.scss b/css/sass/supporting/bootstrap/_alerts.scss old mode 100644 new mode 100755 diff --git a/css/sass/supporting/bootstrap/_badges.scss b/css/sass/supporting/bootstrap/_badges.scss old mode 100644 new mode 100755 diff --git a/css/sass/supporting/bootstrap/_breadcrumbs.scss b/css/sass/supporting/bootstrap/_breadcrumbs.scss old mode 100644 new mode 100755 index 3641e33..b61f0c7 --- a/css/sass/supporting/bootstrap/_breadcrumbs.scss +++ b/css/sass/supporting/bootstrap/_breadcrumbs.scss @@ -14,7 +14,9 @@ display: inline-block; + li:before { - content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space + // [converter] Workaround for https://github.com/sass/libsass/issues/1115 + $nbsp: "\00a0"; + content: "#{$breadcrumb-separator}#{$nbsp}"; // Unicode space added since inline-block means non-collapsing white-space padding: 0 5px; color: $breadcrumb-color; } diff --git a/css/sass/supporting/bootstrap/_button-groups.scss b/css/sass/supporting/bootstrap/_button-groups.scss old mode 100644 new mode 100755 index 43d235c..baaacc4 --- a/css/sass/supporting/bootstrap/_button-groups.scss +++ b/css/sass/supporting/bootstrap/_button-groups.scss @@ -173,12 +173,12 @@ border-radius: 0; } &:first-child:not(:last-child) { - border-top-right-radius: $btn-border-radius-base; + @include border-top-radius($btn-border-radius-base); @include border-bottom-radius(0); } &:last-child:not(:first-child) { - border-bottom-left-radius: $btn-border-radius-base; @include border-top-radius(0); + @include border-bottom-radius($btn-border-radius-base); } } .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { diff --git a/css/sass/supporting/bootstrap/_buttons.scss b/css/sass/supporting/bootstrap/_buttons.scss old mode 100644 new mode 100755 diff --git a/css/sass/supporting/bootstrap/_carousel.scss b/css/sass/supporting/bootstrap/_carousel.scss old mode 100644 new mode 100755 index f700678..753d881 --- a/css/sass/supporting/bootstrap/_carousel.scss +++ b/css/sass/supporting/bootstrap/_carousel.scss @@ -101,6 +101,7 @@ color: $carousel-control-color; text-align: center; text-shadow: $carousel-text-shadow; + background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug // We can't have this transition here because WebKit cancels the carousel // animation if you trip this while in the middle of another animation. @@ -240,18 +241,18 @@ .glyphicon-chevron-right, .icon-prev, .icon-next { - width: 30px; - height: 30px; - margin-top: -15px; - font-size: 30px; + width: ($carousel-control-font-size * 1.5); + height: ($carousel-control-font-size * 1.5); + margin-top: ($carousel-control-font-size / -2); + font-size: ($carousel-control-font-size * 1.5); } .glyphicon-chevron-left, .icon-prev { - margin-left: -15px; + margin-left: ($carousel-control-font-size / -2); } .glyphicon-chevron-right, .icon-next { - margin-right: -15px; + margin-right: ($carousel-control-font-size / -2); } } diff --git a/css/sass/supporting/bootstrap/_close.scss b/css/sass/supporting/bootstrap/_close.scss old mode 100644 new mode 100755 diff --git a/css/sass/supporting/bootstrap/_code.scss b/css/sass/supporting/bootstrap/_code.scss old mode 100644 new mode 100755 diff --git a/css/sass/supporting/bootstrap/_component-animations.scss b/css/sass/supporting/bootstrap/_component-animations.scss old mode 100644 new mode 100755 diff --git a/css/sass/supporting/bootstrap/_dropdowns.scss b/css/sass/supporting/bootstrap/_dropdowns.scss old mode 100644 new mode 100755 index aac8459..0d2e136 --- a/css/sass/supporting/bootstrap/_dropdowns.scss +++ b/css/sass/supporting/bootstrap/_dropdowns.scss @@ -24,7 +24,7 @@ // Prevent the focus on the dropdown toggle when closing dropdowns .dropdown-toggle:focus { - outline: 0; + // outline: 0; } // The dropdown menu (ul) diff --git a/css/sass/supporting/bootstrap/_forms.scss b/css/sass/supporting/bootstrap/_forms.scss old mode 100644 new mode 100755 index de4befd..11ba109 --- a/css/sass/supporting/bootstrap/_forms.scss +++ b/css/sass/supporting/bootstrap/_forms.scss @@ -132,6 +132,12 @@ output { // Placeholder @include placeholder; + // Unstyle the caret on `