Skip to content

Commit

Permalink
Merge pull request #78 from sebgroup/develop
Browse files Browse the repository at this point in the history
Cut release
  • Loading branch information
hjalmers authored Dec 20, 2018
2 parents 3017993 + 33047a4 commit 3710df1
Show file tree
Hide file tree
Showing 22 changed files with 7,502 additions and 5,787 deletions.
12,654 changes: 7,029 additions & 5,625 deletions package-lock.json

Large diffs are not rendered by default.

31 changes: 16 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^6.1.6",
"@angular/common": "^6.1.6",
"@angular/compiler": "^6.1.6",
"@angular/core": "^6.1.6",
"@angular/forms": "^6.1.6",
"@angular/http": "^6.1.6",
"@angular/platform-browser": "^6.1.6",
"@angular/platform-browser-dynamic": "^6.1.6",
"@angular/router": "^6.1.6",
"@angular/animations": "^7.1.4",
"@angular/common": "^7.1.4",
"@angular/compiler": "^7.1.4",
"@angular/core": "^7.1.4",
"@angular/forms": "^7.1.4",
"@angular/http": "^7.1.4",
"@angular/platform-browser": "^7.1.4",
"@angular/platform-browser-dynamic": "^7.1.4",
"@angular/router": "^7.1.4",
"@fortawesome/angular-fontawesome": "^0.1.1",
"@fortawesome/fontawesome-svg-core": "^1.2.4",
"@fortawesome/pro-light-svg-icons": "^5.3.1",
Expand All @@ -74,16 +74,17 @@
"angular-exemplify": "^3.1.2",
"core-js": "^2.5.4",
"ngx-toastr": "^9.1.1",
"rxjs": "^6.3.1",
"rxjs": "^6.3.3",
"scrollingelement": "^1.5.2",
"swe-validation": "^1.0.1",
"tslib": "^1.9.0",
"zone.js": "~0.8.26"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.7.5",
"@angular/cli": "^6.1.5",
"@angular/compiler-cli": "^6.1.6",
"@angular/language-service": "^6.1.6",
"@angular-devkit/build-angular": "~0.11.0",
"@angular/cli": "^7.1.3",
"@angular/compiler-cli": "^7.1.4",
"@angular/language-service": "^7.1.4",
"@commitlint/cli": "^7.1.2",
"@commitlint/config-conventional": "^7.1.2",
"@fortawesome/fontawesome-pro": "^5.3.1",
Expand Down Expand Up @@ -129,7 +130,7 @@
"travis-deploy-once": "^5.0.7",
"ts-node": "~5.0.1",
"tslint": "~5.9.1",
"typescript": "~2.7.2"
"typescript": "~3.1.6"
},
"repository": {
"type": "git",
Expand Down
24 changes: 22 additions & 2 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ $primary: $blue !default;
$secondary: $gray-300 !default;
$success: $green !default;
$info: $purple !default;
$warning: $yellow-darker !default;
$warning: $yellow !default;
$danger: $red !default;
$light: $gray-100 !default;
$dark: $gray-800 !default;
Expand Down Expand Up @@ -175,6 +175,11 @@ $border-radius: 0 !default;
$border-radius-lg: 0 !default;
$border-radius-sm: 0 !default;

$transition-slide-in-duration:.4s ease-in-out !default; // SEB Specific
$transition-fade-duration: .15s linear !default; // SEB Specific
$transition-fade: opacity $transition-fade-duration !default;



// Fonts
//
Expand Down Expand Up @@ -212,7 +217,7 @@ $h3-sm-font-size: $font-size-base * 1.25 !default; // SEB specifi
$headings-font-weight: $font-weight-medium !default;
$headings-color: #222 !default;

$small-font-size: 75% !default;
$small-font-size: $font-size-sm !default;

// Links
//
Expand Down Expand Up @@ -292,6 +297,7 @@ $custom-file-text: (


// Form validation
$form-feedback-font-size: $font-size-sm !default;

// Dropdowns
//
Expand Down Expand Up @@ -371,6 +377,7 @@ $modal-content-border-color: $white !default;
$modal-content-border-radius: 0 !default;

$modal-footer-border-width: 0 !default;
$modal-aside-lg-width: 800px !default; // SEB Specific


// Alerts
Expand All @@ -396,6 +403,19 @@ $toast-transition: color .15s ease-in-out, background-color .15
// Progress bars

// List group
$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 448 512'%3E%3Cpath fill='#{$green}' d='M413.505 91.951L133.49 371.966l-98.995-98.995c-4.686-4.686-12.284-4.686-16.971 0L6.211 284.284c-4.686 4.686-4.686 12.284 0 16.971l118.794 118.794c4.686 4.686 12.284 4.686 16.971 0l299.813-299.813c4.686-4.686 4.686-12.284 0-16.971l-11.314-11.314c-4.686-4.686-12.284-4.686-16.97 0z' class='st0'/%3E%3C/svg%3E"), "#", "%23") !default; // SEB Specific
$list-group-margin-bottom: 1rem !default; // SEB Specific
$list-group-bg: $gray-400 !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-active-bg: $blue-dark !default;
$list-group-action-active-color: $white !default;
$list-group-active-bg: $green !default;
$list-group-disabled-color: $gray-500 !default;
$list-group-disabled-bg: $gray-200 !default;


// Image thumbnails

Expand Down
3 changes: 2 additions & 1 deletion scss/load-bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
@import "styles/functions";
@import "variables";
@import "mixins/mixins";
@import "styles/animations";
@import "styles/root";
@import "styles/print";
@import "styles/reboot";
Expand Down Expand Up @@ -43,4 +44,4 @@
@import "styles/skeleton-loader"; // SEB Specific
@import "styles/scroll"; // SEB Specific
@import "third-parties/third-parties"; // SEB Specific
@import '~@sebgroup/fonts/scss/seb-fonts'; // SEB Specific
@import '~@sebgroup/fonts/scss/seb-fonts'; // SEB Specific
82 changes: 82 additions & 0 deletions scss/mixins/_animations.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
$animations: (
slideInLeft: slideInLeft $transition-slide-in-duration,
slideInRight: slideInRight $transition-slide-in-duration,
slideInUp: slideInUp $transition-slide-in-duration,
fadeIn: fadeIn $transition-fade-duration,
fadeInUp: fadeInUp $transition-fade-duration,
);

@mixin animations() {
@if $enable-transitions {
@keyframes fadeIn {
0% {
opacity: 0;
}
100% {
opacity: 1;
}
}
@keyframes fadeInUp {
0% {
opacity: 0;
transform: translate3d(0,30px,0);
}
100% {
opacity: 1;
transform: translate3d(0,0,0);
}
}
@keyframes slideInRight {
0% {
transform: translate3d(100%,0,0);
}
100% {
transform: translate3d(0,0,0);
}
}
@keyframes slideInLeft {
0% {
transform: translate3d(-100%,0,0);
}
100% {
transform: translate3d(0,0,0);
}
}
@keyframes slideInUp {
0% {
transform: translate3d(0,100%,0);
}
100% {
transform: translate3d(0,0,0);
}
}
}
}
/**
* Add one or more transitions
*
* @example
* @include add-transition('slideInUp');
* @include add-transition(('slideInUp','fadeIn'))
*/
@mixin add-transition($list) {
$combined: '';
@if type-of($list) == 'string' {
animation: map_get($animations, $list);
} @else if type-of($list) == 'list' {
@for $i from 1 through length($list) {
$anim: map_get($animations, nth($list, $i));
@if $anim == null {
@warn nth($list, $i) unquote('not found, please use one of the following animations:') to-list($animations, 'keys');
}

@if $i == length($list) {
$combined: $combined + $anim;
}
@else {
$combined: $combined + $anim + ',';
}
}
animation: unquote($combined);
}
}
3 changes: 3 additions & 0 deletions scss/mixins/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@
@import "../bootstrap-core/mixins/grid-framework";
@import "../bootstrap-core/mixins/grid";
@import "../bootstrap-core/mixins/float";

// Animations
@import "animations"; // SEB Specific
3 changes: 3 additions & 0 deletions scss/styles/_animations.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@if $enable-transitions {
@include animations();
}
3 changes: 1 addition & 2 deletions scss/styles/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

// SEB Specific styles for labels
label:not(.form-check-label,.custom-checkbox,.custom-radio,.custom-control-label), legend.col-form-legend {
font-size: $font-size-xs;
font-weight: $font-weight-bold;
font-weight: $font-weight-medium;
margin-bottom: 0.25rem;
}
label:not(.form-check-label) {
Expand Down
25 changes: 25 additions & 0 deletions scss/styles/_functions.scss
Original file line number Diff line number Diff line change
@@ -1 +1,26 @@
@import "../bootstrap-core/functions";

// convert map to list
@function to-list($value, $keep: 'both') {
$keep: if(index('keys' 'values', $keep), $keep, 'both');

@if type-of($value) == 'map' {
$keys: ();
$values: ();

@each $key, $val in $value {
$keys: append($keys, $key);
$values: append($values, $val);
}

@if $keep == 'keys' {
@return $keys;
} @else if $keep == 'values' {
@return $values;
} @else {
@return zip($keys, $values);
}
}

@return if(type-of($value) != 'list', ($value,), $value);
}
Loading

0 comments on commit 3710df1

Please sign in to comment.