Skip to content

Commit 850e454

Browse files
committed
Upgrade to Bootstrap 4 beta. Close #196
1 parent 0149905 commit 850e454

File tree

122 files changed

+406
-422
lines changed

Some content is hidden

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

122 files changed

+406
-422
lines changed

AJAX_Full_Project_GULP/scss/bootstrap/_buttons.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ fieldset[disabled] a.btn {
8484
&:focus,
8585
&:active {
8686
border-color: transparent;
87+
box-shadow: none;
8788
}
8889
@include hover {
8990
border-color: transparent;

AJAX_Full_Project_GULP/scss/bootstrap/_custom-forms.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@
7676

7777
.custom-checkbox {
7878
.custom-control-indicator {
79-
@include border-radius($custom-checkbox-border-radius);
79+
@include border-radius($custom-checkbox-indicator-border-radius);
8080
}
8181

8282
.custom-control-input:checked ~ .custom-control-indicator {
83-
background-image: $custom-checkbox-icon-checked;
83+
background-image: $custom-checkbox-indicator-icon-checked;
8484
}
8585

8686
.custom-control-input:indeterminate ~ .custom-control-indicator {
87-
background-color: $custom-checkbox-indeterminate-bg;
88-
background-image: $custom-checkbox-icon-indeterminate;
89-
@include box-shadow($custom-checkbox-indeterminate-box-shadow);
87+
background-color: $custom-checkbox-indicator-indeterminate-bg;
88+
background-image: $custom-checkbox-indicator-icon-indeterminate;
89+
@include box-shadow($custom-checkbox-indicator-indeterminate-box-shadow);
9090
}
9191
}
9292

@@ -96,11 +96,11 @@
9696

9797
.custom-radio {
9898
.custom-control-indicator {
99-
border-radius: $custom-radio-border-radius;
99+
border-radius: $custom-radio-indicator-border-radius;
100100
}
101101

102102
.custom-control-input:checked ~ .custom-control-indicator {
103-
background-image: $custom-radio-icon-checked;
103+
background-image: $custom-radio-indicator-icon-checked;
104104
}
105105
}
106106

AJAX_Full_Project_GULP/scss/bootstrap/_dropdown.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
// Allow for dropdowns to go bottom up (aka, dropup-menu)
2727
// Just add .dropup after the standard .dropdown class and you're set.
2828
.dropup {
29+
.dropdown-menu {
30+
margin-top: 0;
31+
margin-bottom: $dropdown-spacer;
32+
}
33+
2934
.dropdown-toggle {
3035
&::after {
3136
border-top: 0;
@@ -44,7 +49,7 @@
4449
float: left;
4550
min-width: $dropdown-min-width;
4651
padding: $dropdown-padding-y 0;
47-
margin: $dropdown-margin-top 0 0; // override default ul
52+
margin: $dropdown-spacer 0 0; // override default ul
4853
font-size: $font-size-base; // Redeclare because nesting can cause inheritance issues
4954
color: $body-color;
5055
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)

AJAX_Full_Project_GULP/scss/bootstrap/_navbar.scss

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@
3131
flex-wrap: wrap;
3232
align-items: center;
3333
justify-content: space-between;
34-
35-
@include media-breakpoint-down(nth(map-keys($grid-breakpoints), 1)) {
36-
width: 100%; // prevent flex parent container from collapsing
37-
margin-right: 0;
38-
margin-left: 0;
39-
}
4034
}
4135
}
4236

@@ -104,6 +98,9 @@
10498
// on the `.navbar` parent.
10599
.navbar-collapse {
106100
flex-basis: 100%;
101+
// For always expanded or extra full navbars, ensure content aligns itself
102+
// properly vertically. Can be easily overridden with flex utilities.
103+
align-items: center;
107104
}
108105

109106
// Button for toggling the navbar when in its collapsed state

AJAX_Full_Project_GULP/scss/bootstrap/_print.scss

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,7 @@
1212
@media print {
1313
*,
1414
*::before,
15-
*::after,
16-
p::first-letter,
17-
div::first-letter,
18-
blockquote::first-letter,
19-
li::first-letter,
20-
p::first-line,
21-
div::first-line,
22-
blockquote::first-line,
23-
li::first-line {
15+
*::after {
2416
// Bootstrap specific; comment out `color` and `background`
2517
//color: #000 !important; // Black prints faster:
2618
// http://www.sanbeiji.com/archives/953

AJAX_Full_Project_GULP/scss/bootstrap/_variables.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -422,16 +422,16 @@ $custom-control-indicator-active-color: $white !default;
422422
$custom-control-indicator-active-bg: lighten(theme-color("primary"), 35%) !default;
423423
$custom-control-indicator-active-box-shadow: none !default;
424424

425-
$custom-checkbox-border-radius: $border-radius !default;
426-
$custom-checkbox-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-indicator-checked-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), "#", "%23") !default;
425+
$custom-checkbox-indicator-border-radius: $border-radius !default;
426+
$custom-checkbox-indicator-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-indicator-checked-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), "#", "%23") !default;
427427

428-
$custom-checkbox-indeterminate-bg: theme-color("primary") !default;
428+
$custom-checkbox-indicator-indeterminate-bg: theme-color("primary") !default;
429429
$custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color !default;
430-
$custom-checkbox-icon-indeterminate: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/%3E%3C/svg%3E"), "#", "%23") !default;
431-
$custom-checkbox-indeterminate-box-shadow: none !default;
430+
$custom-checkbox-indicator-icon-indeterminate: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/%3E%3C/svg%3E"), "#", "%23") !default;
431+
$custom-checkbox-indicator-indeterminate-box-shadow: none !default;
432432

433-
$custom-radio-border-radius: 50% !default;
434-
$custom-radio-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-indicator-checked-color}'/%3E%3C/svg%3E"), "#", "%23") !default;
433+
$custom-radio-indicator-border-radius: 50% !default;
434+
$custom-radio-indicator-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-indicator-checked-color}'/%3E%3C/svg%3E"), "#", "%23") !default;
435435

436436
$custom-select-padding-y: .375rem !default;
437437
$custom-select-padding-x: .75rem !default;
@@ -491,7 +491,7 @@ $form-feedback-invalid-color: theme-color("danger") !default;
491491

492492
$dropdown-min-width: 10rem !default;
493493
$dropdown-padding-y: .5rem !default;
494-
$dropdown-margin-top: .125rem !default;
494+
$dropdown-spacer: .125rem !default;
495495
$dropdown-bg: $white !default;
496496
$dropdown-border-color: rgba($black,.15) !default;
497497
$dropdown-border-width: $border-width !default;

AJAX_Full_Project_GULP/scss/bootstrap/bootstrap.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap v4.0.0-alpha.6 (https://getbootstrap.com)
2+
* Bootstrap v4.0.0-beta (https://getbootstrap.com)
33
* Copyright 2011-2017 The Bootstrap Authors
44
* Copyright 2011-2017 Twitter, Inc.
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

AJAX_Full_Project_GULP/scss/bootstrap/mixins/_breakpoints.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
// Media that spans multiple breakpoint widths.
7979
// Makes the @content apply between the min and max breakpoints
8080
@mixin media-breakpoint-between($lower, $upper, $breakpoints: $grid-breakpoints) {
81-
$min: breakpoint-max($lower, $breakpoints);
81+
$min: breakpoint-min($lower, $breakpoints);
8282
$max: breakpoint-max($upper, $breakpoints);
8383

8484
@media (min-width: $min) and (max-width: $max) {

AJAX_Full_Project_GULP/scss/bootstrap/mixins/_grid.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
margin-left: auto;
88
padding-right: ($grid-gutter-width / 2);
99
padding-left: ($grid-gutter-width / 2);
10+
width: 100%;
1011
}
1112

1213

1314
// For each breakpoint, define the maximum width of the container in a media query
1415
@mixin make-container-max-widths($max-widths: $container-max-widths, $breakpoints: $grid-breakpoints) {
1516
@each $breakpoint, $container-max-width in $max-widths {
1617
@include media-breakpoint-up($breakpoint, $breakpoints) {
17-
width: $container-max-width;
18-
max-width: 100%;
18+
max-width: $container-max-width;
1919
}
2020
}
2121
}

AJAX_Full_Project_GULP/scss/bootstrap/utilities/_background.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
@include bg-variant('.bg-#{$color}', $value);
33
}
44

5+
.bg-white { background-color: $white !important; }
56
.bg-transparent { background-color: transparent !important; }

0 commit comments

Comments
 (0)