Skip to content

Commit 4ed6937

Browse files
authored
Merge pull request #111 from Daemonite/backfilling-bootstrap-v4.0.0-alpha.5
Backfilling bootstrap v4.0.0 alpha.5
2 parents 88cb358 + 3cea463 commit 4ed6937

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1468
-895
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Because these components will require additional markup (some may require additi
2323

2424
## Supported Bootstrap 4 Components
2525

26-
Currently based on __Bootstrap v4.0.0-alpha.4__.
26+
Currently based on __Bootstrap v4.0.0-alpha.5__.
2727

2828
| Bootstrap 4 Components | Equivalent Material Design Components |
2929
| --- | --- |

assets/js/src.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ var FloatingLabel = function ($) {
121121

122122
/*!
123123
* navigation drawer
124-
* based on bootstrap's (v4.0.0-alpha.4) modal.js
124+
* based on bootstrap's (v4.0.0-alpha.5) modal.js
125125
*/
126126
var NavDrawer = function ($) {
127127
// constants >>>
@@ -476,7 +476,7 @@ var NavDrawer = function ($) {
476476

477477
/*!
478478
* tab indicator animation
479-
* requires bootstrap's (v4.0.0-alpha.4) tab.js
479+
* requires bootstrap's (v4.0.0-alpha.5) tab.js
480480
*/
481481
var TabSwitch = function ($) {
482482
// constants >>>
@@ -620,7 +620,7 @@ var TabSwitch = function ($) {
620620

621621
/*!
622622
* global util js
623-
* based on bootstrap's (v4.0.0-alpha.4) util.js
623+
* based on bootstrap's (v4.0.0-alpha.5) util.js
624624
*/
625625
var Util = function ($) {
626626
var transition = false;
@@ -712,7 +712,7 @@ var Util = function ($) {
712712
},
713713
getUID: function getUID(prefix) {
714714
do {
715-
prefix += ~~(Math.random() * 1000000);
715+
prefix += ~ ~(Math.random() * 1000000);
716716
} while (document.getElementById(prefix));
717717
return prefix;
718718
},

assets/js/src/navdrawer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* navigation drawer
3-
* based on bootstrap's (v4.0.0-alpha.4) modal.js
3+
* based on bootstrap's (v4.0.0-alpha.5) modal.js
44
*/
55
const NavDrawer = (($) => {
66
// constants >>>

assets/js/src/tab-switch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* tab indicator animation
3-
* requires bootstrap's (v4.0.0-alpha.4) tab.js
3+
* requires bootstrap's (v4.0.0-alpha.5) tab.js
44
*/
55
const TabSwitch = (($) => {
66
// constants >>>

assets/js/src/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* global util js
3-
* based on bootstrap's (v4.0.0-alpha.4) util.js
3+
* based on bootstrap's (v4.0.0-alpha.5) util.js
44
*/
55
const Util = (($) => {
66
let transition = false;

assets/sass/_mixins.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import "mixins/background-variant";
2+
@import "mixins/border-radius";
23
@import "mixins/breakpoint";
34
@import "mixins/clearfix";
45
@import "mixins/form";

assets/sass/_utilities.scss

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
@import "utilities/material-icons";
2-
@import "utilities/utility-background";
3-
@import "utilities/utility-clearfix";
4-
@import "utilities/utility-display";
5-
@import "utilities/utility-pull";
6-
@import "utilities/utility-screenreader";
7-
@import "utilities/utility-spacing";
8-
@import "utilities/utility-text";
9-
@import "utilities/utility-visibility";
10-
@import "utilities/waves";
1+
// bootstrap
2+
@import "utilities/align";
3+
@import "utilities/border";
4+
@import "utilities/background";
5+
@import "utilities/clearfix";
6+
@import "utilities/display";
7+
@import "utilities/float";
8+
@import "utilities/screenreader";
9+
@import "utilities/spacing";
10+
@import "utilities/text";
11+
@import "utilities/visibility";
12+
13+
// material
14+
@import "utilities/material-icons";
15+
@import "utilities/waves";

assets/sass/_variables.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
@mixin _assert-ascending($map, $map-name) {
2+
$prev-key: null;
3+
$prev-num: null;
4+
5+
@each $key, $num in $map {
6+
@if $prev-num == null {
7+
} @else if not comparable($num, $prev-num) {
8+
@warn "Potentially invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} whose unit makes it incomparable to #{$prev-num}, the value of the previous key '#{$prev-key}' !";
9+
} @else if $num <= $prev-num {
10+
@warn "Invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} which isn't greater than #{$prev-num}, the value of the previous key '#{$prev-key}' !";
11+
}
12+
13+
$prev-key: $key;
14+
$prev-num: $num;
15+
}
16+
}
17+
118
@import "variables/animation";
219
@import "variables/colour";
320
@import "variables/elevation-shadow";

assets/sass/base/_base.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* includes normalize and reboot from bootstrap's (v4.0.0-alpha.4)
2+
* includes normalize and reboot from bootstrap's (v4.0.0-alpha.5)
33
*/
44

55
/*! normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css */

assets/sass/bootstrap/_alert.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
.alert {
22
background-color: $card-bg;
33
border: 0;
4-
border-radius: $border-radius;
54
box-shadow: map-get($card-elevation-shadow, shadow);
65
display: block;
76
margin-bottom: $card-margin-bottom;
87
padding: $card-spacer-inner-y $card-spacer-inner-x;
98
position: relative;
109
z-index: map-get($card-elevation-shadow, elevation);
10+
@include border-radius($border-radius);
1111
}
1212

1313
// colour

0 commit comments

Comments
 (0)