rayelliott
/
understrap
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master/master'

This commit is contained in:
Dave Mackey 2018-08-04 22:18:54 -04:00
parent c528c96a7c acb4fcb186
commit ee1b4ebe3e
29 changed files with 2821 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CHANGELOG.md
View File

@ -1,3 +1,22 @@
- ** Release 0.8.6 July 26th 2018 **
- Re - Release
- ** Release 0.8.5 July 26th 2018 **
- Update to Bootstrap 4.1.3
- ** Release 0.8.4 July 16th 2018 ** Maintenace Release:
- Update to Bootstrap 4.1.2
- fixing sidebar.php problem
- Revert to Gulp 3.x support
- ** Maintenance Release 0.8.4 July 16th 2018 **
- Update to Bootstrap 4
- fixing sidebar.php problem
- Revert to Gulp 3.x support
- ** Release 0.8.3 July 3rd 2018 **
- Update to Bootstrap 4.1.1
- Update to Gulp 4

2
bower.json
View File

@ -1,6 +1,6 @@
{
"name": "understrap",
"version": "0.8.4",
"version": "0.8.6",
"homepage": "http://understrap.com",
"authors": [
"Holger Koenemann <office@holgerkoenemann.de>"

261
css/theme.css
View File

File diff suppressed because one or more lines are too long

2
css/theme.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
css/theme.min.css.map
View File

File diff suppressed because one or more lines are too long

2
gulpfile.js
View File

@ -139,7 +139,7 @@ gulp.task( 'scripts', function() {
var scripts = [
// Start - All BS4 stuff
paths.dev + '/js/bootstrap4/bootstrap.js',
paths.dev + '/js/bootstrap4/bootstrap.bundle.js',
// End - All BS4 stuff

1
inc/enqueue.php
View File

@ -18,7 +18,6 @@ if ( ! function_exists( 'understrap_scripts' ) ) {
wp_enqueue_style( 'understrap-styles', get_stylesheet_directory_uri() . '/css/theme.min.css', array(), $css_version );
wp_enqueue_script( 'jquery');
wp_enqueue_script( 'popper-scripts', get_template_directory_uri() . '/js/popper.min.js', array(), $theme_version, true);
$js_version = $theme_version . '.' . filemtime(get_template_directory() . '/js/theme.min.js');
wp_enqueue_script( 'understrap-scripts', get_template_directory_uri() . '/js/theme.min.js', array(), $js_version, true );

2576
js/theme.js
View File

File diff suppressed because it is too large Load Diff

2
js/theme.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
package.json
View File

@ -1,6 +1,6 @@
{
"name": "understrap",
"version": "0.8.4",
"version": "0.8.6",
"description": "WordPress Theme framework",
"main": "index.js",
"scripts": {
@ -27,7 +27,7 @@
},
"homepage": "https://understrap.com",
"dependencies": {
"bootstrap": "4.1.2",
"bootstrap": "4.1.3",
"browser-sync": "^2.23.6",
"del": "^3.0.0",
"font-awesome": "^4.7.0",
@ -41,13 +41,13 @@
"gulp-merge": "^0.1.1",
"gulp-plumber": "^1.2.0",
"gulp-rename": "^1.2.2",
"gulp-replace": "^0.6.1",
"gulp-replace": "1.0.0",
"gulp-rimraf": "^0.2.2",
"gulp-sass": "4.0.1",
"gulp-sequence": "1.0.0",
"gulp-sourcemaps": "2.6.4",
"gulp-uglify": "^3.0.0",
"gulp-watch": "5.0.0",
"gulp-watch": "5.0.1",
"merge2": "^1.2.1",
"popper.js": "^1.12.9",
"run-sequence": "^2.2.1",

46
src/js/bootstrap4/bootstrap.bundle.js vendored
View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v4.1.2 (https://getbootstrap.com/)
* Bootstrap v4.1.3 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@ -69,7 +69,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): util.js
* Bootstrap (v4.1.3): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -201,7 +201,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): alert.js
* Bootstrap (v4.1.3): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -213,7 +213,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'alert';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -376,7 +376,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): button.js
* Bootstrap (v4.1.3): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -388,7 +388,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'button';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.button';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -540,7 +540,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): carousel.js
* Bootstrap (v4.1.3): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -552,7 +552,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'carousel';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.carousel';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -1044,7 +1044,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): collapse.js
* Bootstrap (v4.1.3): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -1056,7 +1056,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'collapse';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.collapse';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -3930,7 +3930,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): dropdown.js
* Bootstrap (v4.1.3): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -3942,7 +3942,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'dropdown';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.dropdown';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -4418,7 +4418,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): modal.js
* Bootstrap (v4.1.3): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -4430,7 +4430,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'modal';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.modal';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -4989,7 +4989,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): tooltip.js
* Bootstrap (v4.1.3): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -5001,7 +5001,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'tooltip';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.tooltip';
var EVENT_KEY = "." + DATA_KEY;
var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
@ -5659,7 +5659,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): popover.js
* Bootstrap (v4.1.3): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -5671,7 +5671,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'popover';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.popover';
var EVENT_KEY = "." + DATA_KEY;
var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
@ -5856,7 +5856,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): scrollspy.js
* Bootstrap (v4.1.3): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -5868,7 +5868,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'scrollspy';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.scrollspy';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -6172,7 +6172,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): tab.js
* Bootstrap (v4.1.3): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -6184,7 +6184,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'tab';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.tab';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -6421,7 +6421,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): index.js
* Bootstrap (v4.1.3): index.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/

4
src/js/bootstrap4/bootstrap.bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

46
src/js/bootstrap4/bootstrap.js vendored
View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v4.1.2 (https://getbootstrap.com/)
* Bootstrap v4.1.3 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@ -70,7 +70,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): util.js
* Bootstrap (v4.1.3): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -202,7 +202,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): alert.js
* Bootstrap (v4.1.3): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -214,7 +214,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'alert';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -377,7 +377,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): button.js
* Bootstrap (v4.1.3): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -389,7 +389,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'button';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.button';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -541,7 +541,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): carousel.js
* Bootstrap (v4.1.3): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -553,7 +553,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'carousel';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.carousel';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -1045,7 +1045,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): collapse.js
* Bootstrap (v4.1.3): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -1057,7 +1057,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'collapse';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.collapse';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -1413,7 +1413,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): dropdown.js
* Bootstrap (v4.1.3): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -1425,7 +1425,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'dropdown';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.dropdown';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -1901,7 +1901,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): modal.js
* Bootstrap (v4.1.3): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -1913,7 +1913,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'modal';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.modal';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -2472,7 +2472,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): tooltip.js
* Bootstrap (v4.1.3): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -2484,7 +2484,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'tooltip';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.tooltip';
var EVENT_KEY = "." + DATA_KEY;
var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
@ -3142,7 +3142,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): popover.js
* Bootstrap (v4.1.3): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -3154,7 +3154,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'popover';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.popover';
var EVENT_KEY = "." + DATA_KEY;
var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
@ -3339,7 +3339,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): scrollspy.js
* Bootstrap (v4.1.3): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -3351,7 +3351,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'scrollspy';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.scrollspy';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -3655,7 +3655,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): tab.js
* Bootstrap (v4.1.3): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -3667,7 +3667,7 @@
* ------------------------------------------------------------------------
*/
var NAME = 'tab';
var VERSION = '4.1.2';
var VERSION = '4.1.3';
var DATA_KEY = 'bs.tab';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -3904,7 +3904,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.2): index.js
* Bootstrap (v4.1.3): index.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/

4
src/js/bootstrap4/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

0
src/js/custom-javascript.js
View File

1
src/sass/bootstrap4/_buttons.scss
View File

@ -40,7 +40,6 @@
&:not(:disabled):not(.disabled):active,
&:not(:disabled):not(.disabled).active {
background-image: none;
@include box-shadow($btn-active-box-shadow);
&:focus {

32
src/sass/bootstrap4/_custom-forms.scss
View File

@ -10,7 +10,7 @@
.custom-control {
position: relative;
display: block;
min-height: (1rem * $line-height-base);
min-height: ($font-size-base * $line-height-base);
padding-left: $custom-control-gutter;
}
@ -63,7 +63,7 @@
// Background-color and (when enabled) gradient
&::before {
position: absolute;
top: (($line-height-base - $custom-control-indicator-size) / 2);
top: (($font-size-base * $line-height-base - $custom-control-indicator-size) / 2);
left: -$custom-control-gutter;
display: block;
width: $custom-control-indicator-size;
@ -78,7 +78,7 @@
// Foreground (icon)
&::after {
position: absolute;
top: (($line-height-base - $custom-control-indicator-size) / 2);
top: (($font-size-base * $line-height-base - $custom-control-indicator-size) / 2);
left: -$custom-control-gutter;
display: block;
width: $custom-control-indicator-size;
@ -320,6 +320,12 @@
&:focus {
outline: none;
// Pseudo-elements must be split across multiple rulesets to have an affect.
// No box-shadow() mixin for focus accessibility.
&::-webkit-slider-thumb { box-shadow: $custom-range-thumb-focus-box-shadow; }
&::-moz-range-thumb { box-shadow: $custom-range-thumb-focus-box-shadow; }
&::-ms-thumb { box-shadow: $custom-range-thumb-focus-box-shadow; }
}
&::-moz-focus-outer {
@ -329,7 +335,7 @@
&::-webkit-slider-thumb {
width: $custom-range-thumb-width;
height: $custom-range-thumb-height;
margin-top: -($custom-range-thumb-width * .25); // Webkit specific?
margin-top: (($custom-range-track-height - $custom-range-thumb-height) / 2); // Webkit specific
@include gradient-bg($custom-range-thumb-bg);
border: $custom-range-thumb-border;
@include border-radius($custom-range-thumb-border-radius);
@ -337,11 +343,6 @@
@include transition($custom-forms-transition);
appearance: none;
&:focus {
outline: none;
box-shadow: $custom-range-thumb-focus-box-shadow; // No mixin for focus accessibility
}
&:active {
@include gradient-bg($custom-range-thumb-active-bg);
}
@ -368,11 +369,6 @@
@include transition($custom-forms-transition);
appearance: none;
&:focus {
outline: none;
box-shadow: $custom-range-thumb-focus-box-shadow; // No mixin for focus accessibility
}
&:active {
@include gradient-bg($custom-range-thumb-active-bg);
}
@ -392,6 +388,9 @@
&::-ms-thumb {
width: $custom-range-thumb-width;
height: $custom-range-thumb-height;
margin-top: 0; // Edge specific
margin-right: $custom-range-thumb-focus-box-shadow-width; // Workaround that overflowed box-shadow is hidden.
margin-left: $custom-range-thumb-focus-box-shadow-width; // Workaround that overflowed box-shadow is hidden.
@include gradient-bg($custom-range-thumb-bg);
border: $custom-range-thumb-border;
@include border-radius($custom-range-thumb-border-radius);
@ -399,11 +398,6 @@
@include transition($custom-forms-transition);
appearance: none;
&:focus {
outline: none;
box-shadow: $custom-range-thumb-focus-box-shadow; // No mixin for focus accessibility
}
&:active {
@include gradient-bg($custom-range-thumb-active-bg);
}

28
src/sass/bootstrap4/_forms.scss
View File

@ -7,6 +7,7 @@
.form-control {
display: block;
width: 100%;
height: $input-height;
padding: $input-padding-y $input-padding-x;
font-size: $font-size-base;
line-height: $input-line-height;
@ -57,10 +58,6 @@
}
select.form-control {
&:not([size]):not([multiple]) {
height: $input-height;
}
&:focus::-ms-value {
// Suppress the nested default white text on blue background highlight given to
// the selected option text when the (still closed) <select> receives focus
@ -139,35 +136,36 @@ select.form-control {
// Build on `.form-control` with modifier classes to decrease or increase the
// height and font-size of form controls.
//
// The `.form-group-* form-control` variations are sadly duplicated to avoid the
// issue documented in https://github.com/twbs/bootstrap/issues/15074.
// Repeated in `_input_group.scss` to avoid Sass extend issues.
.form-control-sm {
height: $input-height-sm;
padding: $input-padding-y-sm $input-padding-x-sm;
font-size: $font-size-sm;
line-height: $input-line-height-sm;
@include border-radius($input-border-radius-sm);
}
select.form-control-sm {
&:not([size]):not([multiple]) {
height: $input-height-sm;
}
}
.form-control-lg {
height: $input-height-lg;
padding: $input-padding-y-lg $input-padding-x-lg;
font-size: $font-size-lg;
line-height: $input-line-height-lg;
@include border-radius($input-border-radius-lg);
}
select.form-control-lg {
&:not([size]):not([multiple]) {
height: $input-height-lg;
// stylelint-disable no-duplicate-selectors
select.form-control {
&[size],
&[multiple] {
height: auto;
}
}
textarea.form-control {
height: auto;
}
// stylelint-enable no-duplicate-selectors
// Form groups
//

17
src/sass/bootstrap4/_input-group.scss
View File

@ -35,6 +35,11 @@
z-index: 3;
}
// Bring the custom file input above the label
> .custom-file .custom-file-input:focus {
z-index: 4;
}
> .form-control,
> .custom-select {
&:not(:last-child) { @include border-right-radius(0); }
@ -122,7 +127,11 @@
.input-group-lg > .input-group-append > .input-group-text,
.input-group-lg > .input-group-prepend > .btn,
.input-group-lg > .input-group-append > .btn {
@extend .form-control-lg;
height: $input-height-lg;
padding: $input-padding-y-lg $input-padding-x-lg;
font-size: $font-size-lg;
line-height: $input-line-height-lg;
@include border-radius($input-border-radius-lg);
}
.input-group-sm > .form-control,
@ -130,7 +139,11 @@
.input-group-sm > .input-group-append > .input-group-text,
.input-group-sm > .input-group-prepend > .btn,
.input-group-sm > .input-group-append > .btn {
@extend .form-control-sm;
height: $input-height-sm;
padding: $input-padding-y-sm $input-padding-x-sm;
font-size: $font-size-sm;
line-height: $input-line-height-sm;
@include border-radius($input-border-radius-sm);
}

24
src/sass/bootstrap4/_modal.scss
View File

@ -4,9 +4,14 @@
// .modal-content - actual modal w/ bg and corners and stuff
// Kill the scroll on the body
.modal-open {
// Kill the scroll on the body
overflow: hidden;
.modal {
overflow-x: hidden;
overflow-y: auto;
}
}
// Container that the modal scrolls within
@ -25,11 +30,6 @@
// We deliberately don't use `-webkit-overflow-scrolling: touch;` due to a
// gnarly iOS Safari bug: https://bugs.webkit.org/show_bug.cgi?id=158342
// See also https://github.com/twbs/bootstrap/issues/17695
.modal-open & {
overflow-x: hidden;
overflow-y: auto;
}
}
// Shell div to position the modal with bottom padding
@ -54,6 +54,13 @@
display: flex;
align-items: center;
min-height: calc(100% - (#{$modal-dialog-margin} * 2));
// Ensure `modal-dialog-centered` extends the full height of the view (IE10/11)
&::before {
display: block; // IE10
height: calc(100vh - (#{$modal-dialog-margin} * 2));
content: "";
}
}
// Actual modal
@ -153,6 +160,11 @@
.modal-dialog-centered {
min-height: calc(100% - (#{$modal-dialog-margin-y-sm-up} * 2));
&::before {
height: calc(100vh - (#{$modal-dialog-margin-y-sm-up} * 2));
}
}
.modal-content {

6
src/sass/bootstrap4/_reboot.scss
View File

@ -272,8 +272,10 @@ img {
border-style: none; // Remove the border on images inside links in IE 10-.
}
svg:not(:root) {
overflow: hidden; // Hide the overflow in IE
svg {
// Workaround for the SVG overflow bug in IE10/11 is still required.
// See https://github.com/twbs/bootstrap/issues/26878
overflow: hidden;
vertical-align: middle;
}

1
src/sass/bootstrap4/_tables.scss
View File

@ -4,7 +4,6 @@
.table {
width: 100%;
max-width: 100%;
margin-bottom: $spacer;
background-color: $table-bg; // Reset for nesting within parents with `background-color`.

19
src/sass/bootstrap4/_variables.scss
View File

@ -248,7 +248,7 @@ $transition-collapse: height .35s ease !default;
// Font, line-height, and color for body text, headings, and more.
// stylelint-disable value-keyword-case
$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
$font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
$font-family-base: $font-family-sans-serif !default;
// stylelint-enable value-keyword-case
@ -537,14 +537,15 @@ $custom-range-track-bg: $gray-300 !default;
$custom-range-track-border-radius: 1rem !default;
$custom-range-track-box-shadow: inset 0 .25rem .25rem rgba($black, .1) !default;
$custom-range-thumb-width: 1rem !default;
$custom-range-thumb-height: $custom-range-thumb-width !default;
$custom-range-thumb-bg: $component-active-bg !default;
$custom-range-thumb-border: 0 !default;
$custom-range-thumb-border-radius: 1rem !default;
$custom-range-thumb-box-shadow: 0 .1rem .25rem rgba($black, .1) !default;
$custom-range-thumb-focus-box-shadow: 0 0 0 1px $body-bg, $input-btn-focus-box-shadow !default;
$custom-range-thumb-active-bg: lighten($component-active-bg, 35%) !default;
$custom-range-thumb-width: 1rem !default;
$custom-range-thumb-height: $custom-range-thumb-width !default;
$custom-range-thumb-bg: $component-active-bg !default;
$custom-range-thumb-border: 0 !default;
$custom-range-thumb-border-radius: 1rem !default;
$custom-range-thumb-box-shadow: 0 .1rem .25rem rgba($black, .1) !default;
$custom-range-thumb-focus-box-shadow: 0 0 0 1px $body-bg, $input-btn-focus-box-shadow !default;
$custom-range-thumb-focus-box-shadow-width: $input-btn-focus-width !default; // For focus box shadow issue in IE/Edge
$custom-range-thumb-active-bg: lighten($component-active-bg, 35%) !default;
$custom-file-height: $input-height !default;
$custom-file-height-inner: $input-height-inner !default;

2
src/sass/bootstrap4/bootstrap-grid.scss vendored
View File

@ -1,5 +1,5 @@
/*!
* Bootstrap Grid v4.1.2 (https://getbootstrap.com/)
* Bootstrap Grid v4.1.3 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

2
src/sass/bootstrap4/bootstrap-reboot.scss vendored
View File

@ -1,5 +1,5 @@
/*!
* Bootstrap Reboot v4.1.2 (https://getbootstrap.com/)
* Bootstrap Reboot v4.1.3 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

2
src/sass/bootstrap4/bootstrap.scss vendored
View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v4.1.2 (https://getbootstrap.com/)
* Bootstrap v4.1.3 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

14
src/sass/bootstrap4/mixins/_forms.scss
View File

@ -41,13 +41,13 @@
z-index: 5;
display: none;
max-width: 100%; // Contain to parent when possible
padding: .5rem;
padding: $tooltip-padding-y $tooltip-padding-x;
margin-top: .1rem;
font-size: .875rem;
line-height: 1;
color: $white;
background-color: rgba($color, .8);
border-radius: .2rem;
font-size: $tooltip-font-size;
line-height: $line-height-base;
color: color-yiq($color);
background-color: rgba($color, $tooltip-opacity);
@include border-radius($tooltip-border-radius);
}
.form-control,
@ -129,7 +129,7 @@
~ .custom-file-label {
border-color: $color;
&::before { border-color: inherit; }
&::after { border-color: inherit; }
}
~ .#{$state}-feedback,

10
src/sass/bootstrap4/mixins/_navbar-align.scss
View File

@ -1,10 +0,0 @@
// Navbar vertical align
//
// Vertically center elements in the navbar.
// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);`
// to calculate the appropriate top margin.
// @mixin navbar-vertical-align($element-height) {
// margin-top: (($navbar-height - $element-height) / 2);
// margin-bottom: (($navbar-height - $element-height) / 2);
// }

2
style.css
View File

@ -8,7 +8,7 @@ Description: Combination of Automattic´s _s theme and Bootstrap 4. Made as a so
That downloads everything and moves it in place so that you can recompile your CSS and JS files;
A developer version (with Gulp/node and Sass sources) is available on gitHub: https://github.com/understrap/understrap
A child theme is available on Github, too: https://github.com/understrap/understrap-child;
Version: 0.8.4
Version: 0.8.6
License: UnderStrap WordPress Theme, Copyright 2013-2017 Holger Koenemann
UnderStrap is distributed under the terms of the GNU GPL version 2
License URI: http://www.gnu.org/licenses/gpl-2.0.html