Skip to content

Commit

Permalink
Merge pull request #163 from sebgroup/develop
Browse files Browse the repository at this point in the history
Cut release
  • Loading branch information
hjalmers authored Nov 26, 2019
2 parents 76d1754 + 904b357 commit 9f6864a
Show file tree
Hide file tree
Showing 45 changed files with 5,124 additions and 4,099 deletions.
File renamed without changes.
7,355 changes: 4,030 additions & 3,325 deletions package-lock.json

Large diffs are not rendered by default.

75 changes: 37 additions & 38 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,49 +59,48 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^7.2.5",
"@angular/common": "^7.2.5",
"@angular/compiler": "^7.2.5",
"@angular/core": "^7.2.5",
"@angular/forms": "^7.2.5",
"@angular/http": "^7.2.5",
"@angular/platform-browser": "^7.2.5",
"@angular/platform-browser-dynamic": "^7.2.5",
"@angular/router": "^7.2.5",
"@angular/animations": "^8.2.13",
"@angular/common": "^8.2.13",
"@angular/compiler": "^8.2.13",
"@angular/core": "^8.2.13",
"@angular/forms": "^8.2.13",
"@angular/platform-browser": "^8.2.13",
"@angular/platform-browser-dynamic": "^8.2.13",
"@angular/router": "^8.2.13",
"@fortawesome/angular-fontawesome": "^0.1.1",
"@fortawesome/fontawesome-svg-core": "^1.2.15",
"@fortawesome/pro-light-svg-icons": "^5.7.2",
"@ng-bootstrap/ng-bootstrap": "^4.1.1",
"@fortawesome/fontawesome-svg-core": "^1.2.25",
"@fortawesome/pro-light-svg-icons": "^5.11.2",
"@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.5",
"ngx-toastr": "^9.1.2",
"rxjs": "^6.4.0",
"core-js": "^2.6.10",
"rxjs": "^6.5.3",
"scrollingelement": "^1.5.2",
"swe-validation": "^1.0.1",
"tslib": "^1.9.0",
"zone.js": "^0.8.29"
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.11.4",
"@angular/cli": "^7.3.2",
"@angular/compiler-cli": "^7.2.5",
"@angular/language-service": "^7.2.5",
"@angular-devkit/build-angular": "~0.803.18",
"@angular/cli": "^8.3.18",
"@angular/compiler-cli": "^8.2.13",
"@angular/language-service": "^8.2.13",
"@commitlint/cli": "^7.5.2",
"@commitlint/config-conventional": "^7.5.0",
"@fortawesome/fontawesome-pro": "^5.7.2",
"@fortawesome/fontawesome-pro": "^5.11.2",
"@types/jasmine": "^2.8.16",
"@types/jasminewd2": "^2.0.6",
"@types/node": "^8.10.40",
"autoprefixer": "^9.4.8",
"@types/jasminewd2": "^2.0.8",
"@types/node": "^8.10.59",
"autoprefixer": "^9.7.1",
"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.1",
"body-scroll-lock": "^2.6.4",
"bootstrap": "^4.3.1",
"clean-css-cli": "^4.2.1",
"codelyzer": "~4.2.1",
"codelyzer": "^5.0.1",
"commitizen": "^2.10.1",
"copyfiles": "^2.1.0",
"cz-conventional-changelog": "^2.1.0",
Expand All @@ -115,28 +114,28 @@
"husky": "^1.3.1",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.1",
"karma": "~3.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^2.0.5",
"karma-coverage-istanbul-reporter": "^2.1.0",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"mobile-detect": "^1.4.3",
"node-sass": "^4.12.0",
"mobile-detect": "^1.4.4",
"node-sass": "^4.13.0",
"node-sass-tilde-importer": "^1.0.2",
"package-lock-sanitizer": "^1.0.0",
"postcss-cli": "^6.1.1",
"prismjs": "^1.15.0",
"prismjs": "^1.17.1",
"protractor": "^5.4.2",
"raw-loader": "^0.5.1",
"renamer": "^1.1.1",
"replace": "^1.0.1",
"rimraf": "^2.6.3",
"semantic-release": "^15.13.3",
"start-server-and-test": "^1.7.11",
"renamer": "^1.1.4",
"replace": "^1.1.1",
"rimraf": "^2.7.1",
"semantic-release": "^15.13.30",
"start-server-and-test": "^1.10.6",
"travis-deploy-once": "^5.0.11",
"ts-node": "~5.0.1",
"ts-node": "~7.0.0",
"tslint": "~5.9.1",
"typescript": "~3.1.6"
"typescript": "~3.5.3"
},
"repository": {
"type": "git",
Expand Down
3 changes: 3 additions & 0 deletions scss/_core.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import 'styles/functions';
@import 'variables';
@import 'mixins/mixins';
47 changes: 43 additions & 4 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ $theme-icons: map-merge(

$enable-caret: true !default;
$enable-rounded: true !default;
$enable-shadows: false !default;
$enable-shadows: true !default;
$enable-gradients: false !default;
$enable-transitions: true !default;
$enable-grid-classes: true !default;
Expand Down Expand Up @@ -191,6 +191,9 @@ $responsive-gutters: (
$border-radius: 0 !default;
$border-radius-lg: 0 !default;
$border-radius-sm: 0 !default;
$border-radius-utility: .25rem !default; // SEB Specific
$border-radius-utility-lg: .3rem !default; // SEB Specific
$border-radius-utility-sm: .2rem !default; // SEB Specific

$transition-slide-in-duration:.4s ease-in-out !default; // SEB Specific
$transition-fade-duration: .15s linear !default; // SEB Specific
Expand Down Expand Up @@ -276,15 +279,22 @@ $table-head-color: $headings-color !default;

$table-expand-bg: transparent !default; // SEB Specific

$table-sort-active-color: $blue-dark !default; // SEB Specific
$table-sort-active-hover-color: $link-hover-color !default; // SEB Specific
$table-sort-hover-color: $gray-400 !default; // SEB Specific
$table-sort-disabled-color: $gray-300 !default; // SEB Specific
$table-sort-color: $gray-500 !default; // SEB Specific

// Buttons + Forms
//
// Shared variables that are reassigned to `$input-` and `$btn-` specific variables.

$input-btn-padding-y: .5625rem !default;
$input-btn-padding-x: 1rem !default;
$input-btn-padding-y-sm: .28125rem !default;
$input-btn-padding-x-sm: .5rem !default;
$input-btn-padding-y-lg: .75rem !default;

$input-btn-padding-x-lg: 1rem !default;

// Buttons
//
Expand All @@ -294,10 +304,18 @@ $btn-font-weight: $font-weight-medium !default;
$btn-disabled-opacity: 1 !default;
$btn-disabled-color: $gray-500 !default; // SEB specific

$btn-box-shadow: 0 0 0 0 !default;
$btn-active-box-shadow: 0 0 0 0 !default;


$btn-border-radius: 4px !default;
$btn-border-radius-lg: 4px !default;
$btn-border-radius-sm: 4px !default;

// Forms
$input-box-shadow: 0 0 0 0 !default;


// Dropdowns
//
// Dropdown menu container and contents.
Expand All @@ -316,12 +334,14 @@ $dropdown-item-padding-y: .625rem !default;
$dropdown-icon: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'%3E%3Cpath d='M441.9 167.3l-19.8-19.8c-4.7-4.7-12.3-4.7-17 0L224 328.2 42.9 147.5c-4.7-4.7-12.3-4.7-17 0L6.1 167.3c-4.7 4.7-4.7 12.3 0 17l209.4 209.4c4.7 4.7 12.3 4.7 17 0l209.4-209.4c4.7-4.7 4.7-12.3 0-17z' fill='#{$blue}'/%3E%3C/svg%3E"), "#", "%23") !default;
$dropdown-icon-active: str-replace($dropdown-icon, str-replace(#{'fill=\'' + $blue + '\''}, "#", "%23"), str-replace(#{'fill=\'' + $white + '\''}, "#", "%23")) !default; // SEB specific

$dropdown-box-shadow: 0 .5rem 1rem rgba($black, .1) !default;

// Forms

$label-color: $headings-color !default; // SEB Specific

$input-bg: $white !default;
$input-border-color: $gray-400 !default;

$input-border-radius: 4px !default;
$input-border-radius-lg: 4px !default;
Expand All @@ -346,6 +366,7 @@ $custom-select-bg-size: 16px 16px !default; // In pixels because ima
$custom-select-indicator: str-replace($dropdown-icon, str-replace(#{'fill=\'' + $blue + '\''}, "#", "%23"), str-replace(#{'fill=\'' + $custom-select-indicator-color + '\''}, "#", "%23")) !default; // SEB specific
$custom-select-border-radius: 4px !default;

$custom-select-box-shadow: $input-box-shadow !default;

$custom-file-text: (
en: "Browse"
Expand Down Expand Up @@ -392,6 +413,13 @@ $navbar-brand-font-size: $font-size-base !default;
$navbar-brand-font-weight: $font-weight-medium !default; // SEB specific

// Pagination
$pagination-padding-y: $input-btn-padding-y !default;// .5rem !default;
$pagination-padding-x: $input-btn-padding-x !default;
$pagination-padding-y-sm: $input-btn-padding-y-sm !default;//.25rem !default;
$pagination-padding-x-sm: $input-btn-padding-x-sm !default;
$pagination-padding-y-lg: $input-btn-padding-y-lg !default;//.75rem !default;
$pagination-padding-x-lg: $input-btn-padding-x-lg !default;
$pagination-line-height: 1.5 !default;

$pagination-hover-color: $white !default;
$pagination-hover-bg: $blue !default;
Expand All @@ -400,11 +428,15 @@ $pagination-hover-border-color: $blue !default;
$pagination-active-bg: $blue-dark !default;
$pagination-active-border-color: $blue-dark !default;

$pagination-border-radius: 4px !default; // SEB Specific
$pagination-border-color: $input-border-color !default;



// Jumbotron

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

// Tooltips
$tooltip-bg: $gray-900 !default;
Expand All @@ -422,11 +454,18 @@ $badge-border-radius: 0 !default;

$modal-content-border-color: $white !default;
$modal-content-border-radius: 0 !default;
$modal-content-border-width: 0 !default;
$modal-header-border-width: 1px !default;
$modal-footer-border-width: 0 !default;



$modal-footer-border-width: 0 !default;
$modal-aside-width: 320px !default; // SEB Specific
$modal-aside-lg-width: map_get($grid-breakpoints, 'md'); // 800px !default; // SEB Specific

$modal-content-box-shadow-xs: 0 0 0 0 !default;
$modal-content-box-shadow-sm-up: 0 .5rem 1rem rgba($black, .1) !default;

// Alerts
//
Expand All @@ -436,7 +475,7 @@ $alert-padding-x: 1rem !default;
$alert-border-radius: $border-radius !default;
$alert-link-font-weight: $font-weight-medium !default; //500
$alert-border-width: 0 !default;
$alert-icon-width: 1.125rem !default; // SEB Specific
$alert-icon-width: 1rem !default; // SEB Specific
$alert-icon-height: 1rem !default; // SEB Specific
$alert-icon-padding: $alert-icon-width + ($alert-padding-x*2); // SEB Specific

Expand All @@ -446,7 +485,7 @@ $toast-border-radius: $alert-border-radius !default; // SEB Specif
$toast-margin-bottom: .5rem !default; // SEB Specific
$toast-padding: $alert-padding-x !default; // SEB Specific
$toast-width: 300px !default; // SEB Specific
$toast-shadow: 0 0 .5rem rgba(0, 0, 0, 0.15) !default; // SEB Specific
$toast-box-shadow: 0 0 .5rem rgba($black, .2) !default;
$toast-transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default; // SEB Specific


Expand Down
1 change: 1 addition & 0 deletions scss/mixins/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
@import "../bootstrap-core/mixins/nav-divider";
@import "forms"; //"../../mixins/forms";
@import "../bootstrap-core/mixins/table-row";
@import "table-sort"; // SEB Specific
@import "cards"; // SEB Specific
@import "tooltip"; // SEB Specific
@import "close"; // SEB Specific
Expand Down
44 changes: 44 additions & 0 deletions scss/mixins/_table-sort.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
@mixin table-sort($selector: '.sort', $asc-selector: '.sort-asc', $desc-selector: '.sort-desc', $disabled-selector: '.disabled') {
#{$selector} {
cursor: pointer;
white-space: nowrap;
&::after {
content: '';
display: inline-block;
background-image: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 644'%3E%3Cpath fill='#{$table-sort-color}' transform='translate(0 240)' d='M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z'/%3E%3Cpath fill='#{$table-sort-color}' transform='translate(0 -100)' d='M240.971 130.524l194.343 194.343c9.373 9.373 9.373 24.569 0 33.941l-22.667 22.667c-9.357 9.357-24.522 9.375-33.901.04L224 227.495 69.255 381.516c-9.379 9.335-24.544 9.317-33.901-.04l-22.667-22.667c-9.373-9.373-9.373-24.569 0-33.941L207.03 130.525c9.372-9.373 24.568-9.373 33.941-.001z'/%3E%3C/svg%3E"), "#", "%23");
background-repeat: no-repeat;
margin-left: 6px;
width: 16px;
height: 16px;
}
&:hover {
color: $table-sort-active-hover-color;
&::after {
background-image: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 644'%3E%3Cpath fill='#{$table-sort-hover-color}' transform='translate(0 240)' d='M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z'/%3E%3Cpath fill='#{$table-sort-hover-color}' transform='translate(0 -100)' d='M240.971 130.524l194.343 194.343c9.373 9.373 9.373 24.569 0 33.941l-22.667 22.667c-9.357 9.357-24.522 9.375-33.901.04L224 227.495 69.255 381.516c-9.379 9.335-24.544 9.317-33.901-.04l-22.667-22.667c-9.373-9.373-9.373-24.569 0-33.941L207.03 130.525c9.372-9.373 24.568-9.373 33.941-.001z'/%3E%3C/svg%3E"), "#", "%23");
}
}
&#{$asc-selector} {
&::after {
background-image: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 644'%3E%3Cpath fill='#{$table-sort-color}' transform='translate(0 240)' d='M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z'/%3E%3Cpath fill='#{$table-sort-active-color}' transform='translate(0 -100)' d='M240.971 130.524l194.343 194.343c9.373 9.373 9.373 24.569 0 33.941l-22.667 22.667c-9.357 9.357-24.522 9.375-33.901.04L224 227.495 69.255 381.516c-9.379 9.335-24.544 9.317-33.901-.04l-22.667-22.667c-9.373-9.373-9.373-24.569 0-33.941L207.03 130.525c9.372-9.373 24.568-9.373 33.941-.001z'/%3E%3C/svg%3E"), "#", "%23");
}
&:hover::after {
background-image: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 644'%3E%3Cpath fill='#{$table-sort-hover-color}' transform='translate(0 240)' d='M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z'/%3E%3Cpath fill='#{$table-sort-active-hover-color}' transform='translate(0 -100)' d='M240.971 130.524l194.343 194.343c9.373 9.373 9.373 24.569 0 33.941l-22.667 22.667c-9.357 9.357-24.522 9.375-33.901.04L224 227.495 69.255 381.516c-9.379 9.335-24.544 9.317-33.901-.04l-22.667-22.667c-9.373-9.373-9.373-24.569 0-33.941L207.03 130.525c9.372-9.373 24.568-9.373 33.941-.001z'/%3E%3C/svg%3E"), "#", "%23");
}
}
&#{$desc-selector} {
&::after {
background-image: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 644'%3E%3Cpath fill='#{$table-sort-active-color}' transform='translate(0 240)' d='M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z'/%3E%3Cpath fill='#{$table-sort-color}' transform='translate(0 -100)' d='M240.971 130.524l194.343 194.343c9.373 9.373 9.373 24.569 0 33.941l-22.667 22.667c-9.357 9.357-24.522 9.375-33.901.04L224 227.495 69.255 381.516c-9.379 9.335-24.544 9.317-33.901-.04l-22.667-22.667c-9.373-9.373-9.373-24.569 0-33.941L207.03 130.525c9.372-9.373 24.568-9.373 33.941-.001z'/%3E%3C/svg%3E"), "#", "%23");
}
&:hover::after {
background-image: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 644'%3E%3Cpath fill='#{$table-sort-active-hover-color}' transform='translate(0 240)' d='M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z'/%3E%3Cpath fill='#{$table-sort-hover-color}' transform='translate(0 -100)' d='M240.971 130.524l194.343 194.343c9.373 9.373 9.373 24.569 0 33.941l-22.667 22.667c-9.357 9.357-24.522 9.375-33.901.04L224 227.495 69.255 381.516c-9.379 9.335-24.544 9.317-33.901-.04l-22.667-22.667c-9.373-9.373-9.373-24.569 0-33.941L207.03 130.525c9.372-9.373 24.568-9.373 33.941-.001z'/%3E%3C/svg%3E"), "#", "%23");
}
}
&#{$disabled-selector} {
color: $text-muted;
cursor: not-allowed;
&::after {
background-image: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 644'%3E%3Cpath fill='#{$table-sort-disabled-color}' transform='translate(0 240)' d='M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z'/%3E%3Cpath fill='#{$table-sort-disabled-color}' transform='translate(0 -100)' d='M240.971 130.524l194.343 194.343c9.373 9.373 9.373 24.569 0 33.941l-22.667 22.667c-9.357 9.357-24.522 9.375-33.901.04L224 227.495 69.255 381.516c-9.379 9.335-24.544 9.317-33.901-.04l-22.667-22.667c-9.373-9.373-9.373-24.569 0-33.941L207.03 130.525c9.372-9.373 24.568-9.373 33.941-.001z'/%3E%3C/svg%3E"), "#", "%23");
}
}
}
}
2 changes: 1 addition & 1 deletion scss/styles/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
// SEB Specific styles for card

.card {
box-shadow: rgba(0,0,0,.05) 0 1px 2px 0;
@include box-shadow($card-box-shadow);//rgba(0,0,0,.05) 0 1px 2px 0;
border: none;
border-bottom: 1px solid rgba(0,0,0,.1);
}
Expand Down
Loading

0 comments on commit 9f6864a

Please sign in to comment.