Skip to content

Commit

Permalink
Merge branch 'master' into master-ysds-input-group-flex-basis
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed May 27, 2019
2 parents e7c4f62 + 1110246 commit 29cbd1f
Show file tree
Hide file tree
Showing 43 changed files with 962 additions and 454 deletions.
6 changes: 3 additions & 3 deletions build/vnu-jar.js
Expand Up @@ -36,16 +36,16 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
'The “time” input type is not supported in all browsers.*',
// IE11 doesn't recognise <main> / give the element an implicit "main" landmark.
// Explicit role="main" is redundant for other modern browsers, but still valid.
'The “main” role is unnecessary for element “main”.',
// Ignore the wrong lanuage code warnings for now; they happen randomly.
'This document appears to be written in.*'
'The “main” role is unnecessary for element “main”.'
].join('|')

const args = [
'-jar',
vnu,
'--asciiquotes',
'--skip-non-html',
// Ignore the language code warnings
'--no-langdetect',
'--Werror',
`--filterpattern "${ignores}"`,
'_gh_pages/',
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -165,11 +165,11 @@
"bundlesize": [
{
"path": "./dist/css/bootstrap-grid.css",
"maxSize": "7 kB"
"maxSize": "8 kB"
},
{
"path": "./dist/css/bootstrap-grid.min.css",
"maxSize": "6 kB"
"maxSize": "7.2 kB"
},
{
"path": "./dist/css/bootstrap-reboot.css",
Expand Down
24 changes: 24 additions & 0 deletions scss/_functions.scss
Expand Up @@ -30,6 +30,30 @@
}
}

// Internal Bootstrap function to turn maps into its negative variant.
// It prefixes the keys with `n` and makes the value negative.
@function negativify-map($map) {
$result: ();
@each $key, $value in $map {
@if $key != 0 {
$result: map-merge($result, ("n" + $key: (-$value)));
}
}
@return $result;
}

// Get multiple keys from a sass map
@function map-get-multiple($map, $values) {
$result: ();
@each $key, $value in $map {
@if (index($values, $key) != null) {
$result: map-merge($result, ($key: $value));
}
}
@return $map;
}


// Replace `$search` with `$replace` in `$string`
// Used on our SVG icon backgrounds for custom forms.
//
Expand Down
7 changes: 7 additions & 0 deletions scss/_helpers.scss
@@ -0,0 +1,7 @@
@import "helpers/background";
@import "helpers/clearfix";
@import "helpers/embed";
@import "helpers/position";
@import "helpers/screenreaders";
@import "helpers/stretched-link";
@import "helpers/text";
5 changes: 4 additions & 1 deletion scss/_mixins.scss
Expand Up @@ -8,7 +8,7 @@
// Deprecate
@import "mixins/deprecate";

// Utilities
// Helpers
@import "mixins/breakpoints";
@import "mixins/image";
@import "mixins/resize";
Expand All @@ -17,6 +17,9 @@
@import "mixins/text-emphasis";
@import "mixins/text-truncate";

// Utilities
@import "mixins/utilities";

// Components
@import "mixins/alert";
@import "mixins/buttons";
Expand Down
2 changes: 1 addition & 1 deletion scss/_modal.scss
Expand Up @@ -158,7 +158,7 @@
.modal-body {
position: relative;
// Enable `flex-grow: 1` so that the body take up as much space as possible
// when should there be a fixed height on `.modal-dialog`.
// when there should be a fixed height on `.modal-dialog`.
flex: 1 1 auto;
padding: $modal-inner-padding;
}
Expand Down

0 comments on commit 29cbd1f

Please sign in to comment.