Skip to content

Commit

Permalink
Merge pull request #372 from sebgroup/develop
Browse files Browse the repository at this point in the history
cut release
  • Loading branch information
hjalmers authored May 26, 2020
2 parents cf640a1 + a6118f4 commit 600adf7
Show file tree
Hide file tree
Showing 60 changed files with 4,979 additions and 2,361 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dist: trusty
dist: xenial
sudo: false
addons:
chrome: stable
Expand Down
5 changes: 4 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,8 @@
"@schematics/angular:component": {
"styleext": "scss"
}
},
"cli": {
"analytics": false
}
}
}
6,595 changes: 4,423 additions & 2,172 deletions package-lock.json

Large diffs are not rendered by default.

48 changes: 22 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,51 +67,47 @@
"@angular/platform-browser": "^8.2.14",
"@angular/platform-browser-dynamic": "^8.2.14",
"@angular/router": "^8.2.14",
"@fortawesome/angular-fontawesome": "^0.1.1",
"@fortawesome/fontawesome-svg-core": "^1.2.26",
"@fortawesome/pro-light-svg-icons": "^5.12.0",
"@sebgroup/fonts": "^1.0.0",
"@sebgroup/ng-bootstrap": "^1.0.1",
"@sebgroup/ngx-toastr": "^1.0.0",
"angular-exemplify": "^3.1.3",
"core-js": "^2.6.11",
"rxjs": "^6.5.4",
"rxjs": "^6.5.5",
"scrollingelement": "^1.5.2",
"swe-validation": "^1.0.1",
"tslib": "^1.9.0",
"tslib": "^1.11.2",
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.803.21",
"@angular/cli": "^8.3.21",
"@angular-devkit/build-angular": "^0.803.26",
"@angular/cli": "^8.3.26",
"@angular/compiler-cli": "^8.2.14",
"@angular/language-service": "^8.2.14",
"@commitlint/cli": "^7.5.2",
"@commitlint/config-conventional": "^7.5.0",
"@fortawesome/fontawesome-pro": "^5.12.0",
"@types/jasmine": "^3.5.3",
"@types/jasmine": "^3.5.10",
"@types/jasminewd2": "^2.0.8",
"@types/node": "^8.10.59",
"autoprefixer": "^9.7.3",
"@types/node": "^8.10.60",
"autoprefixer": "^9.7.6",
"babel-core": "^6.26.3",
"babel-preset-env": "^1.7.0",
"babel-register": "^6.26.0",
"backstopjs": "^3.8.8",
"body-scroll-lock": "^2.6.4",
"bootstrap": "^4.4.1",
"backstopjs": "^5.0.1",
"body-scroll-lock": "^2.7.1",
"bootstrap": "^4.5.0",
"clean-css-cli": "^4.2.1",
"codelyzer": "^5.2.1",
"codelyzer": "^5.2.2",
"commitizen": "^2.10.1",
"copyfiles": "^2.1.0",
"cz-conventional-changelog": "^3.1.0",
"copyfiles": "^2.2.0",
"cz-conventional-changelog": "^3.2.0",
"eyes.selenium": "0.0.83",
"fancy-log": "^1.3.3",
"gulp": "^4.0.0",
"gulp-json-format": "^2.0.0",
"gulp-jsoncombine": "^1.0.4",
"gulp-markdown-to-json": "^1.1.0",
"gulp-rename": "^1.2.2",
"husky": "^4.2.3",
"gulp-rename": "^2.0.0",
"husky": "^4.2.5",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.0.0",
Expand All @@ -120,21 +116,21 @@
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"mobile-detect": "^1.4.4",
"node-sass": "^4.13.0",
"node-sass": "^4.14.1",
"node-sass-tilde-importer": "^1.0.2",
"package-lock-sanitizer": "^1.0.0",
"package-lock-sanitizer": "^1.0.1",
"postcss-cli": "^6.1.1",
"prismjs": "^1.17.1",
"protractor": "^5.4.2",
"prismjs": "^1.20.0",
"protractor": "^5.4.4",
"raw-loader": "^0.5.1",
"renamer": "^1.1.4",
"replace": "^1.1.3",
"replace": "^1.2.0",
"rimraf": "^2.7.1",
"semantic-release": "^15.14.0",
"start-server-and-test": "^1.10.6",
"start-server-and-test": "^1.11.0",
"travis-deploy-once": "^5.0.11",
"ts-node": "~7.0.0",
"tslint": "~5.9.1",
"tslint": "~6.1.2",
"typescript": "~3.5.3"
},
"repository": {
Expand Down
25 changes: 14 additions & 11 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ $gray-400: #cecece !default;
$gray-500: #adadad !default;
$gray-600: #868686 !default;
$gray-700: #494949 !default;
$gray-800: #343434 !default;
$gray-900: #212121 !default;
$gray-800: #333333 !default;
$gray-900: #1a1a1a !default;
$black: #000 !default;


Expand Down Expand Up @@ -59,7 +59,7 @@ $purple-darker: #3F2587; // SEB specific
$primary: $blue !default;
$secondary: $gray-300 !default;
$success: $green-darker !default;
$info: $purple !default;
$info: $gray-300 !default;
$warning: $yellow !default;
$danger: $red-dark !default;
$light: $gray-100 !default;
Expand Down Expand Up @@ -151,8 +151,8 @@ $sizes: map-merge(
// Body
//
// Settings for the `<body>` element.

$body-color: #444 !default;
$body-bg: $gray-100 !default;
$body-color: $dark !default;


// Paragraphs
Expand Down Expand Up @@ -270,7 +270,7 @@ $table-cell-padding: .625rem .75rem !default;
$table-cell-padding-sm: .275rem .3rem !default;

$table-accent-bg: $gray-100 !default;
$table-hover-bg: rgba($blue, .075) !default;
$table-hover-bg: $gray-200 !default;

$table-head-color: $headings-color !default;

Expand Down Expand Up @@ -318,10 +318,13 @@ $input-box-shadow: 0 0 0 0 !default;
//
// Dropdown menu container and contents.


$dropdown-border-color: $blue !default;
$dropdown-padding-y: 0 !default;
$dropdown-border-color: $blue-darker !default;
$dropdown-border-radius: 4px !default;

$dropdown-toggle-active-bg: $blue-darker !default; // SEB specific
$dropdown-toggle-active-color: $white !default; // SEB specific

$dropdown-link-hover-color: $white !default;
$dropdown-link-hover-bg: $blue !default;

Expand Down Expand Up @@ -434,7 +437,7 @@ $pagination-border-color: $input-border-color !default;
// Jumbotron

// Cards
$card-box-shadow: 0 1px 2px 0 rgba($black, .05) !default; // SEB specific
$card-box-shadow: 0 2px 6px rgba($black, .15) !default; // SEB specific
$card-columns-margin: $spacer !default;

// Tooltips
Expand Down Expand Up @@ -494,10 +497,10 @@ $toast-transition: color .15s ease-in-out, background-color .15
$list-group-bullet-icon: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1 1'%3E%3Crect width='1' height='1' style='fill:#{$dark};' /%3E%3C/svg%3E"), "#", "%23") !default; // SEB Specific
$list-group-check-icon: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3E%3Cpath d='M435.848 83.466L172.804 346.51l-96.652-96.652c-4.686-4.686-12.284-4.686-16.971 0l-28.284 28.284c-4.686 4.686-4.686 12.284 0 16.971l133.421 133.421c4.686 4.686 12.284 4.686 16.971 0l299.813-299.813c4.686-4.686 4.686-12.284 0-16.971l-28.284-28.284c-4.686-4.686-12.284-4.686-16.97 0z' fill='#{$green}'/%3E%3C/svg%3E"), "#", "%23") !default; // SEB Specific
$list-group-margin-bottom: 1rem !default; // SEB Specific
$list-group-bg: $gray-400 !default;
$list-group-bg: transparent !default;
$list-group-hover-bg: $blue !default;
$list-group-action-hover-color: $white !default;
$list-group-action-hover-bg: $gray-100 !default;
$list-group-action-hover-bg: $gray-200 !default;
$list-group-action-active-bg: $blue-dark !default;
$list-group-action-active-color: $white !default;
$list-group-active-bg: $dark !default;
Expand Down
2 changes: 2 additions & 0 deletions scss/bootstrap-core/_breadcrumb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
}

.breadcrumb-item {
display: flex;

// The separator between breadcrumbs (by default, a forward-slash: "/")
+ .breadcrumb-item {
padding-left: $breadcrumb-item-padding;
Expand Down
17 changes: 10 additions & 7 deletions scss/bootstrap-core/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
font-weight: $btn-font-weight;
color: $body-color;
text-align: center;
text-decoration: if($link-decoration == none, null, none);
white-space: $btn-white-space;
vertical-align: middle;
cursor: if($enable-pointer-cursor-for-buttons, pointer, null);
user-select: none;
background-color: transparent;
border: $btn-border-width solid transparent;
Expand All @@ -37,12 +37,16 @@
@include box-shadow(none);
}

&:not(:disabled):not(.disabled):active,
&:not(:disabled):not(.disabled).active {
@include box-shadow($btn-active-box-shadow);
&:not(:disabled):not(.disabled) {
cursor: if($enable-pointer-cursor-for-buttons, pointer, null);

&:focus {
@include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow);
&:active,
&.active {
@include box-shadow($btn-active-box-shadow);

&:focus {
@include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow);
}
}
}
}
Expand Down Expand Up @@ -89,7 +93,6 @@ fieldset:disabled a.btn {
&:focus,
&.focus {
text-decoration: $link-hover-decoration;
box-shadow: none;
}

&:disabled,
Expand Down
18 changes: 11 additions & 7 deletions scss/bootstrap-core/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,18 @@
margin-left: 0;
}

> .list-group:first-child {
.list-group-item:first-child {
@include border-top-radius($card-border-radius);
> .list-group {
border-top: inherit;
border-bottom: inherit;

&:first-child {
border-top-width: 0;
@include border-top-radius($card-inner-border-radius);
}
}

> .list-group:last-child {
.list-group-item:last-child {
@include border-bottom-radius($card-border-radius);
&:last-child {
border-bottom-width: 0;
@include border-bottom-radius($card-inner-border-radius);
}
}
}
Expand Down Expand Up @@ -90,6 +93,7 @@

.card-footer {
padding: $card-spacer-y $card-spacer-x;
color: $card-cap-color;
background-color: $card-cap-bg;
border-top: $card-border-width solid $card-border-color;

Expand Down
1 change: 0 additions & 1 deletion scss/bootstrap-core/_close.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ button.close {
padding: 0;
background-color: transparent;
border: 0;
appearance: none;
}

// Future-proof disabling of clicks on `<a>` elements
Expand Down
3 changes: 2 additions & 1 deletion scss/bootstrap-core/_custom-forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,9 @@
border-color: $custom-select-focus-border-color;
outline: 0;
@if $enable-shadows {
box-shadow: $custom-select-box-shadow, $custom-select-focus-box-shadow;
@include box-shadow($custom-select-box-shadow, $custom-select-focus-box-shadow);
} @else {
// Avoid using mixin so we can pass custom focus shadow properly
box-shadow: $custom-select-focus-box-shadow;
}

Expand Down
3 changes: 2 additions & 1 deletion scss/bootstrap-core/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
font-weight: $font-weight-normal;
color: $dropdown-link-color;
text-align: inherit; // For `<button>`s
text-decoration: if($link-decoration == none, null, none);
white-space: nowrap; // prevent links from randomly breaking onto new lines
background-color: transparent; // For `<button>`s
border: 0; // For `<button>`s
Expand Down Expand Up @@ -176,7 +177,7 @@
// Dropdown section headers
.dropdown-header {
display: block;
padding: $dropdown-padding-y $dropdown-item-padding-x;
padding: $dropdown-header-padding;
margin-bottom: 0; // for use with heading elements
@include font-size($font-size-sm);
color: $dropdown-header-color;
Expand Down
9 changes: 9 additions & 0 deletions scss/bootstrap-core/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,15 @@
}
}

input[type="date"],
input[type="time"],
input[type="datetime-local"],
input[type="month"] {
&.form-control {
appearance: none; // Fix appearance for date inputs in Safari
}
}

select.form-control {
&:focus::-ms-value {
// Suppress the nested default white text on blue background highlight given to
Expand Down
17 changes: 12 additions & 5 deletions scss/bootstrap-core/_functions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@
// Starts at zero
// Used to ensure the min-width of the lowest breakpoint starts at 0.
@mixin _assert-starts-at-zero($map, $map-name: "$grid-breakpoints") {
$values: map-values($map);
$first-value: nth($values, 1);
@if $first-value != 0 {
@warn "First breakpoint in #{$map-name} must start at 0, but starts at #{$first-value}.";
@if length($map) > 0 {
$values: map-values($map);
$first-value: nth($values, 1);
@if $first-value != 0 {
@warn "First breakpoint in #{$map-name} must start at 0, but starts at #{$first-value}.";
}
}
}

Expand All @@ -52,7 +54,12 @@
@function escape-svg($string) {
@if str-index($string, "data:image/svg+xml") {
@each $char, $encoded in $escaped-characters {
$string: str-replace($string, $char, $encoded);
// Do not escape the url brackets
@if str-index($string, "url(") == 1 {
$string: url("#{str-replace(str-slice($string, 6, -3), $char, $encoded)}");
} @else {
$string: str-replace($string, $char, $encoded);
}
}
}

Expand Down
10 changes: 9 additions & 1 deletion scss/bootstrap-core/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,19 @@
max-width: $container-max-width;
}

// Extend each breakpoint which is smaller or equal to the current breakpoint
$extend-breakpoint: true;

@each $name, $width in $grid-breakpoints {
@if ($container-max-width > $width or $breakpoint == $name) {
@if ($extend-breakpoint) {
.container#{breakpoint-infix($name, $grid-breakpoints)} {
@extend %responsive-container-#{$breakpoint};
}

// Once the current breakpoint is reached, stop extending
@if ($breakpoint == $name) {
$extend-breakpoint: false;
}
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion scss/bootstrap-core/_input-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
> .custom-select,
> .custom-file {
position: relative; // For focus state's z-index
flex: 1 1 0%;
flex: 1 1 auto;
width: 1%;
min-width: 0; // https://stackoverflow.com/questions/36247140/why-dont-flex-items-shrink-past-content-size
margin-bottom: 0;

Expand Down
Loading

0 comments on commit 600adf7

Please sign in to comment.