Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Bootstrap to version 3.3.6 #159

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion css/sass/supporting/bootstrap.scss
100644 → 100755
Original file line number Diff line number Diff line change
@@ -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)
*/
Expand Down
Empty file modified css/sass/supporting/bootstrap/_alerts.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_badges.scss
100644 → 100755
Empty file.
4 changes: 3 additions & 1 deletion css/sass/supporting/bootstrap/_breadcrumbs.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions css/sass/supporting/bootstrap/_button-groups.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Empty file modified css/sass/supporting/bootstrap/_buttons.scss
100644 → 100755
Empty file.
13 changes: 7 additions & 6 deletions css/sass/supporting/bootstrap/_carousel.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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);
}
}

Expand Down
Empty file modified css/sass/supporting/bootstrap/_close.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_code.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_component-animations.scss
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion css/sass/supporting/bootstrap/_dropdowns.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 9 additions & 3 deletions css/sass/supporting/bootstrap/_forms.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,12 @@ output {
// Placeholder
@include 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
Expand Down Expand Up @@ -431,10 +437,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;
}
}

Expand Down Expand Up @@ -595,7 +601,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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions css/sass/supporting/bootstrap/_glyphicons.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,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"; } }
Expand Down
Empty file modified css/sass/supporting/bootstrap/_grid.scss
100644 → 100755
Empty file.
10 changes: 7 additions & 3 deletions css/sass/supporting/bootstrap/_input-groups.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@

width: 100%;
margin-bottom: 0;

&:focus {
z-index: 3;
}
}
}

Expand Down Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions css/sass/supporting/bootstrap/_jumbotron.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Empty file modified css/sass/supporting/bootstrap/_labels.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_list-group.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_media.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_mixins.scss
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion css/sass/supporting/bootstrap/_modals.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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);
@include clearfix;
}
// Close icon
.modal-header .close {
Expand Down
Empty file modified css/sass/supporting/bootstrap/_navbar.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_navs.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_normalize.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_pager.scss
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions css/sass/supporting/bootstrap/_pagination.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Empty file modified css/sass/supporting/bootstrap/_panels.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_popovers.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_print.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_progress-bars.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_responsive-embed.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_responsive-utilities.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_scaffolding.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_tables.scss
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion css/sass/supporting/bootstrap/_theme.scss
100644 → 100755
Original file line number Diff line number Diff line change
@@ -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)
*/
Expand Down
Empty file modified css/sass/supporting/bootstrap/_thumbnails.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/_tooltip.scss
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion css/sass/supporting/bootstrap/_type.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ dd {
@include clearfix; // 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);
Expand Down
Empty file modified css/sass/supporting/bootstrap/_utilities.scss
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions css/sass/supporting/bootstrap/_variables.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -868,5 +868,7 @@ $blockquote-border-color: $gray-lighter !default;
$page-header-border-color: $gray-lighter !default;
//** Width of horizontal description list titles
$dl-horizontal-offset: $component-offset-horizontal !default;
//** Point at which .dl-horizontal becomes horizontal
$dl-horizontal-breakpoint: $grid-float-breakpoint !default;
//** Horizontal line color.
$hr-border: $gray-lighter !default;
Empty file modified css/sass/supporting/bootstrap/_wells.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_alerts.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_background-variant.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_border-radius.scss
100644 → 100755
Empty file.
5 changes: 1 addition & 4 deletions css/sass/supporting/bootstrap/mixins/_buttons.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,9 @@
&.disabled,
&[disabled],
fieldset[disabled] & {
&,
&:hover,
&:focus,
&.focus,
&:active,
&.active {
&.focus {
background-color: $background;
border-color: $border;
}
Expand Down
Empty file modified css/sass/supporting/bootstrap/mixins/_center-block.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_clearfix.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_forms.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_gradients.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_grid-framework.scss
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions css/sass/supporting/bootstrap/mixins/_grid.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
@mixin 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));
@include clearfix;
}

Expand Down
2 changes: 1 addition & 1 deletion css/sass/supporting/bootstrap/mixins/_hide-text.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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)
@mixin hide-text() {
font: 0/0 a;
color: transparent;
Expand Down
Empty file modified css/sass/supporting/bootstrap/mixins/_image.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_labels.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_list-group.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_nav-divider.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_nav-vertical-align.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_opacity.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_pagination.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_panels.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_progress-bar.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_reset-filter.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_reset-text.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_resize.scss
100644 → 100755
Empty file.
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_size.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_tab-focus.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_table-row.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_text-emphasis.scss
100644 → 100755
Empty file.
Empty file modified css/sass/supporting/bootstrap/mixins/_text-overflow.scss
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions css/sass/supporting/bootstrap/mixins/_vendor-prefixes.scss
100644 → 100755
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -54,7 +54,7 @@
// Prevent browsers from flickering when using CSS 3D transforms.
// Default value is `visible`, but can be changed to `hidden`

@mixin backface-visibility($visibility){
@mixin backface-visibility($visibility) {
-webkit-backface-visibility: $visibility;
-moz-backface-visibility: $visibility;
backface-visibility: $visibility;
Expand Down
Empty file modified fonts/bootstrap/glyphicons-halflings-regular.eot
100644 → 100755
Empty file.
Empty file modified fonts/bootstrap/glyphicons-halflings-regular.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified fonts/bootstrap/glyphicons-halflings-regular.ttf
100644 → 100755
Empty file.
Empty file modified fonts/bootstrap/glyphicons-halflings-regular.woff
100644 → 100755
Empty file.
Empty file modified fonts/bootstrap/glyphicons-halflings-regular.woff2
100644 → 100755
Empty file.
Loading