Skip to content

Commit

Permalink
rake update[v4-dev]
Browse files Browse the repository at this point in the history
  • Loading branch information
glebm committed Nov 2, 2015
1 parent 6014a8d commit 73d7b26
Show file tree
Hide file tree
Showing 11 changed files with 242 additions and 18 deletions.
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if (typeof jQuery === 'undefined') {

'use strict';

var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };

var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();

Expand Down
217 changes: 215 additions & 2 deletions assets/javascripts/bootstrap.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/popover.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions assets/stylesheets/bootstrap/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
// Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214.
background-image: none;
border: $border-width solid $input-border;
// Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
// Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
@include border-radius($input-border-radius);
@include box-shadow($input-box-shadow);
@include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);

// Make inputs at least the height of their button counterpart (base line-height + padding + border).
// Only apply the height to textual inputs and some selcts.
// Only apply the height to textual inputs and some selects.
// &:not(textarea),
// &:not(select[size]),
// &:not(select[multiple]) {
Expand Down
1 change: 0 additions & 1 deletion assets/stylesheets/bootstrap/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,4 @@
.col-#{$breakpoint}-bottom { align-self: flex-end; }
}
}

}
2 changes: 2 additions & 0 deletions assets/stylesheets/bootstrap/_progress.scss
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
@include gradient-striped();
background-size: $spacer-y $spacer-y;
}
// IE9
@media screen and (min-width:0\0) {
.progress-bar-striped {
@include gradient-striped();
Expand All @@ -129,6 +130,7 @@
.progress-animated[value]::-moz-progress-bar {
animation: progress-bar-stripes 2s linear infinite;
}
// IE9
@media screen and (min-width:0\0) {
.progress-animated .progress-bar-striped {
animation: progress-bar-stripes 2s linear infinite;
Expand Down
6 changes: 3 additions & 3 deletions assets/stylesheets/bootstrap/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@
.table-responsive {
display: block;
width: 100%;
min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
overflow-x: auto;

// Todo: find out if we need this still.
// TODO: find out if we need this still.
//
// border: 1px solid $table-border-color;
// -ms-overflow-style: -ms-autohiding-scrollbar;
// min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
// -ms-overflow-style: -ms-autohiding-scrollbar; // See https://github.com/twbs/bootstrap/pull/10057
}


Expand Down
22 changes: 16 additions & 6 deletions assets/stylesheets/bootstrap/_type.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,22 @@ h6, .h6 {
margin-bottom: $headings-margin-bottom;
}

h1, .h1 { font-size: $font-size-h1; }
h2, .h2 { font-size: $font-size-h2; }
h3, .h3 { font-size: $font-size-h3; }
h4, .h4 { font-size: $font-size-h4; }
h5, .h5 { font-size: $font-size-h5; }
h6, .h6 { font-size: $font-size-h6; }
h1 { font-size: $font-size-h1; }
h2 { font-size: $font-size-h2; }
h3 { font-size: $font-size-h3; }
h4 { font-size: $font-size-h4; }
h5 { font-size: $font-size-h5; }
h6 { font-size: $font-size-h6; }

// These declarations are kept separate from and placed after
// the previous tag-based declarations so that the classes beat the tags in
// the CSS cascade, and thus <h1 class="h2"> will be styled like an h2.
.h1 { font-size: $font-size-h1; }
.h2 { font-size: $font-size-h2; }
.h3 { font-size: $font-size-h3; }
.h4 { font-size: $font-size-h4; }
.h5 { font-size: $font-size-h5; }
.h6 { font-size: $font-size-h6; }

.lead {
font-size: $lead-font-size;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Contextual backgrounds

// [converter] $parent hack
@mixin bg-variant($parent, $color) {
#{$parent} {
color: #fff;
Expand Down
1 change: 1 addition & 0 deletions assets/stylesheets/bootstrap/mixins/_progress.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
background-color: $color;
}

// IE9
@media screen and (min-width:0\0) {
.progress-bar {
background-color: $color;
Expand Down
2 changes: 1 addition & 1 deletion lib/bootstrap/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Bootstrap
VERSION = '4.0.0.dev'
BOOTSTRAP_SHA = '3c24bd89f7cc1ffd3327a2de74fa928b5f8a9d1d'
BOOTSTRAP_SHA = '43b130022b333c25d9fa810ab2666059ed699f7a'
end

0 comments on commit 73d7b26

Please sign in to comment.