From 54b9eacd09b139dc62d06ea66b9fc6eb2cf14f6f Mon Sep 17 00:00:00 2001 From: James Kolpack Date: Mon, 1 Feb 2016 10:56:56 -0500 Subject: [PATCH] Update bootstrap --- Web/Content/bootstrap/bootstrap.less | 2 +- Web/Content/bootstrap/button-groups.less | 4 +- Web/Content/bootstrap/carousel.less | 13 +++-- Web/Content/bootstrap/forms.less | 12 +++- Web/Content/bootstrap/glyphicons.less | 4 +- Web/Content/bootstrap/input-groups.less | 10 +++- Web/Content/bootstrap/jumbotron.less | 2 + Web/Content/bootstrap/mixins/buttons.less | 5 +- Web/Content/bootstrap/mixins/grid.less | 4 +- Web/Content/bootstrap/mixins/hide-text.less | 2 +- .../bootstrap/mixins/vendor-prefixes.less | 4 +- Web/Content/bootstrap/modals.less | 2 +- Web/Content/bootstrap/pagination.less | 4 +- Web/Content/bootstrap/theme.less | 2 +- Web/Content/bootstrap/type.less | 2 +- Web/Content/bootstrap/variables.less | 2 + Web/Scripts/bootstrap.js | 56 +++++++++---------- Web/Scripts/bootstrap.min.js | 6 +- Web/packages.config | 7 ++- 19 files changed, 78 insertions(+), 65 deletions(-) diff --git a/Web/Content/bootstrap/bootstrap.less b/Web/Content/bootstrap/bootstrap.less index 4b9916e..1c04778 100644 --- a/Web/Content/bootstrap/bootstrap.less +++ b/Web/Content/bootstrap/bootstrap.less @@ -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/Web/Content/bootstrap/button-groups.less b/Web/Content/bootstrap/button-groups.less index 6a0c5a8..293245a 100644 --- a/Web/Content/bootstrap/button-groups.less +++ b/Web/Content/bootstrap/button-groups.less @@ -173,12 +173,12 @@ border-radius: 0; } &:first-child:not(:last-child) { - border-top-right-radius: @btn-border-radius-base; + .border-top-radius(@btn-border-radius-base); .border-bottom-radius(0); } &:last-child:not(:first-child) { - border-bottom-left-radius: @btn-border-radius-base; .border-top-radius(0); + .border-bottom-radius(@btn-border-radius-base); } } .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { diff --git a/Web/Content/bootstrap/carousel.less b/Web/Content/bootstrap/carousel.less index 87ed696..252011e 100644 --- a/Web/Content/bootstrap/carousel.less +++ b/Web/Content/bootstrap/carousel.less @@ -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/Web/Content/bootstrap/forms.less b/Web/Content/bootstrap/forms.less index b064ede..e8b071a 100644 --- a/Web/Content/bootstrap/forms.less +++ b/Web/Content/bootstrap/forms.less @@ -132,6 +132,12 @@ output { // Placeholder .placeholder(); + // Unstyle the caret on `