diff options
Diffstat (limited to 'bower_components/bootstrap/less')
-rw-r--r-- | bower_components/bootstrap/less/bootstrap.less | 2 | ||||
-rw-r--r-- | bower_components/bootstrap/less/button-groups.less | 4 | ||||
-rw-r--r-- | bower_components/bootstrap/less/carousel.less | 13 | ||||
-rw-r--r-- | bower_components/bootstrap/less/forms.less | 12 | ||||
-rw-r--r-- | bower_components/bootstrap/less/glyphicons.less | 4 | ||||
-rw-r--r-- | bower_components/bootstrap/less/input-groups.less | 10 | ||||
-rw-r--r-- | bower_components/bootstrap/less/jumbotron.less | 2 | ||||
-rw-r--r-- | bower_components/bootstrap/less/mixins/buttons.less | 5 | ||||
-rw-r--r-- | bower_components/bootstrap/less/mixins/grid.less | 4 | ||||
-rw-r--r-- | bower_components/bootstrap/less/mixins/hide-text.less | 2 | ||||
-rw-r--r-- | bower_components/bootstrap/less/mixins/vendor-prefixes.less | 4 | ||||
-rw-r--r-- | bower_components/bootstrap/less/modals.less | 2 | ||||
-rw-r--r-- | bower_components/bootstrap/less/pagination.less | 4 | ||||
-rw-r--r-- | bower_components/bootstrap/less/theme.less | 2 | ||||
-rw-r--r-- | bower_components/bootstrap/less/type.less | 2 | ||||
-rw-r--r-- | bower_components/bootstrap/less/variables.less | 2 |
16 files changed, 43 insertions, 31 deletions
diff --git a/bower_components/bootstrap/less/bootstrap.less b/bower_components/bootstrap/less/bootstrap.less index 4b9916e6..1c047780 100644 --- a/bower_components/bootstrap/less/bootstrap.less +++ b/bower_components/bootstrap/less/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/bower_components/bootstrap/less/button-groups.less b/bower_components/bootstrap/less/button-groups.less index 6a0c5a86..293245a6 100644 --- a/bower_components/bootstrap/less/button-groups.less +++ b/bower_components/bootstrap/less/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/bower_components/bootstrap/less/carousel.less b/bower_components/bootstrap/less/carousel.less index 87ed6961..252011e9 100644 --- a/bower_components/bootstrap/less/carousel.less +++ b/bower_components/bootstrap/less/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/bower_components/bootstrap/less/forms.less b/bower_components/bootstrap/less/forms.less index b064ede4..e8b071a1 100644 --- a/bower_components/bootstrap/less/forms.less +++ b/bower_components/bootstrap/less/forms.less @@ -132,6 +132,12 @@ output { // Placeholder .placeholder(); + // Unstyle the caret on `<select>`s in IE10+. + &::-ms-expand { + border: 0; + background-color: transparent; + } + // Disabled and read-only inputs // // HTML5 says that controls under a fieldset > legend:first-child won't be @@ -433,10 +439,10 @@ input[type="checkbox"] { .has-feedback label { & ~ .form-control-feedback { - top: (@line-height-computed + 5); // Height of the `label` and its margin + top: (@line-height-computed + 5); // Height of the `label` and its margin } &.sr-only ~ .form-control-feedback { - top: 0; + top: 0; } } @@ -591,7 +597,7 @@ input[type="checkbox"] { .form-group-lg { @media (min-width: @screen-sm-min) { .control-label { - padding-top: ((@padding-large-vertical * @line-height-large) + 1); + padding-top: (@padding-large-vertical + 1); font-size: @font-size-large; } } diff --git a/bower_components/bootstrap/less/glyphicons.less b/bower_components/bootstrap/less/glyphicons.less index 335d80aa..7bc5852d 100644 --- a/bower_components/bootstrap/less/glyphicons.less +++ b/bower_components/bootstrap/less/glyphicons.less @@ -32,8 +32,8 @@ } // Individual icons -.glyphicon-asterisk { &:before { content: "\2a"; } } -.glyphicon-plus { &:before { content: "\2b"; } } +.glyphicon-asterisk { &:before { content: "\002a"; } } +.glyphicon-plus { &:before { content: "\002b"; } } .glyphicon-euro, .glyphicon-eur { &:before { content: "\20ac"; } } .glyphicon-minus { &:before { content: "\2212"; } } diff --git a/bower_components/bootstrap/less/input-groups.less b/bower_components/bootstrap/less/input-groups.less index 457ea60b..5f73eec4 100644 --- a/bower_components/bootstrap/less/input-groups.less +++ b/bower_components/bootstrap/less/input-groups.less @@ -29,6 +29,10 @@ width: 100%; margin-bottom: 0; + + &:focus { + z-index: 3; + } } } @@ -79,18 +83,18 @@ text-align: center; background-color: @input-group-addon-bg; border: 1px solid @input-group-addon-border-color; - border-radius: @border-radius-base; + border-radius: @input-border-radius; // Sizing &.input-sm { padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; - border-radius: @border-radius-small; + border-radius: @input-border-radius-small; } &.input-lg { padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; - border-radius: @border-radius-large; + border-radius: @input-border-radius-large; } // Nuke default margins from checkboxes and radios to vertically center within. diff --git a/bower_components/bootstrap/less/jumbotron.less b/bower_components/bootstrap/less/jumbotron.less index fa80a38c..1d9b515b 100644 --- a/bower_components/bootstrap/less/jumbotron.less +++ b/bower_components/bootstrap/less/jumbotron.less @@ -28,6 +28,8 @@ .container &, .container-fluid & { border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container + padding-left: (@grid-gutter-width / 2); + padding-right: (@grid-gutter-width / 2); } .container { diff --git a/bower_components/bootstrap/less/mixins/buttons.less b/bower_components/bootstrap/less/mixins/buttons.less index 6875a97c..b294d8c2 100644 --- a/bower_components/bootstrap/less/mixins/buttons.less +++ b/bower_components/bootstrap/less/mixins/buttons.less @@ -42,12 +42,9 @@ &.disabled, &[disabled], fieldset[disabled] & { - &, &:hover, &:focus, - &.focus, - &:active, - &.active { + &.focus { background-color: @background; border-color: @border; } diff --git a/bower_components/bootstrap/less/mixins/grid.less b/bower_components/bootstrap/less/mixins/grid.less index f144c15f..df496d0b 100644 --- a/bower_components/bootstrap/less/mixins/grid.less +++ b/bower_components/bootstrap/less/mixins/grid.less @@ -6,8 +6,8 @@ .container-fixed(@gutter: @grid-gutter-width) { margin-right: auto; margin-left: auto; - padding-left: (@gutter / 2); - padding-right: (@gutter / 2); + padding-left: floor((@gutter / 2)); + padding-right: ceil((@gutter / 2)); &:extend(.clearfix all); } diff --git a/bower_components/bootstrap/less/mixins/hide-text.less b/bower_components/bootstrap/less/mixins/hide-text.less index bc701185..2bb84a3b 100644 --- a/bower_components/bootstrap/less/mixins/hide-text.less +++ b/bower_components/bootstrap/less/mixins/hide-text.less @@ -6,7 +6,7 @@ // // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757 -// Deprecated as of v3.0.1 (will be removed in v4) +// Deprecated as of v3.0.1 (has been removed in v4) .hide-text() { font: ~"0/0" a; color: transparent; diff --git a/bower_components/bootstrap/less/mixins/vendor-prefixes.less b/bower_components/bootstrap/less/mixins/vendor-prefixes.less index afd3331c..2b5e74b9 100644 --- a/bower_components/bootstrap/less/mixins/vendor-prefixes.less +++ b/bower_components/bootstrap/less/mixins/vendor-prefixes.less @@ -1,7 +1,7 @@ // Vendor Prefixes // // All vendor mixins are deprecated as of v3.2.0 due to the introduction of -// Autoprefixer in our Gruntfile. They will be removed in v4. +// Autoprefixer in our Gruntfile. They have been removed in v4. // - Animations // - Backface visibility @@ -54,7 +54,7 @@ // Prevent browsers from flickering when using CSS 3D transforms. // Default value is `visible`, but can be changed to `hidden` -.backface-visibility(@visibility){ +.backface-visibility(@visibility) { -webkit-backface-visibility: @visibility; -moz-backface-visibility: @visibility; backface-visibility: @visibility; diff --git a/bower_components/bootstrap/less/modals.less b/bower_components/bootstrap/less/modals.less index 1de62205..767ce36b 100644 --- a/bower_components/bootstrap/less/modals.less +++ b/bower_components/bootstrap/less/modals.less @@ -79,7 +79,7 @@ .modal-header { padding: @modal-title-padding; border-bottom: 1px solid @modal-header-border-color; - min-height: (@modal-title-padding + @modal-title-line-height); + &:extend(.clearfix all); } // Close icon .modal-header .close { diff --git a/bower_components/bootstrap/less/pagination.less b/bower_components/bootstrap/less/pagination.less index 31a23bf7..31f77aae 100644 --- a/bower_components/bootstrap/less/pagination.less +++ b/bower_components/bootstrap/less/pagination.less @@ -40,7 +40,7 @@ > li > span { &:hover, &:focus { - z-index: 3; + z-index: 2; color: @pagination-hover-color; background-color: @pagination-hover-bg; border-color: @pagination-hover-border; @@ -52,7 +52,7 @@ &, &:hover, &:focus { - z-index: 2; + z-index: 3; color: @pagination-active-color; background-color: @pagination-active-bg; border-color: @pagination-active-border; diff --git a/bower_components/bootstrap/less/theme.less b/bower_components/bootstrap/less/theme.less index 8371872b..8f51d913 100644 --- a/bower_components/bootstrap/less/theme.less +++ b/bower_components/bootstrap/less/theme.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/bower_components/bootstrap/less/type.less b/bower_components/bootstrap/less/type.less index 68ba6017..0d4fee48 100644 --- a/bower_components/bootstrap/less/type.less +++ b/bower_components/bootstrap/less/type.less @@ -211,7 +211,7 @@ dd { &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present } - @media (min-width: @grid-float-breakpoint) { + @media (min-width: @dl-horizontal-breakpoint) { dt { float: left; width: (@dl-horizontal-offset - 20); diff --git a/bower_components/bootstrap/less/variables.less b/bower_components/bootstrap/less/variables.less index c1861a8e..b057ef5b 100644 --- a/bower_components/bootstrap/less/variables.less +++ b/bower_components/bootstrap/less/variables.less @@ -863,5 +863,7 @@ @page-header-border-color: @gray-lighter; //** Width of horizontal description list titles @dl-horizontal-offset: @component-offset-horizontal; +//** Point at which .dl-horizontal becomes horizontal +@dl-horizontal-breakpoint: @grid-float-breakpoint; //** Horizontal line color. @hr-border: @gray-lighter; |