Skip to content

Commit

Permalink
Merge pull request #38 from sebgroup/develop
Browse files Browse the repository at this point in the history
cut release
  • Loading branch information
hjalmers authored Oct 1, 2018
2 parents d5b1921 + bad7311 commit 48e845d
Show file tree
Hide file tree
Showing 32 changed files with 1,631 additions and 476 deletions.
1,152 changes: 1,014 additions & 138 deletions package-lock.json

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@
"path": "./node_modules/cz-conventional-changelog"
}
},
"commitlint": {
"extends": [
"@commitlint/config-conventional"
]
},
"husky": {
"hooks": {
"commit-msg": "commitlint --edit"
}
},
"release": {
"pkgRoot": "dist/lib"
},
Expand All @@ -59,7 +69,7 @@
"@fortawesome/pro-light-svg-icons": "^5.3.1",
"@ng-bootstrap/ng-bootstrap": "^3.2.0",
"@sebgroup/fonts": "^1.0.0",
"angular-exemplify": "^3.1.1",
"angular-exemplify": "^3.1.2",
"core-js": "^2.5.4",
"rxjs": "^6.3.1",
"swe-validation": "^1.0.1",
Expand All @@ -70,6 +80,8 @@
"@angular/cli": "^6.1.5",
"@angular/compiler-cli": "^6.1.6",
"@angular/language-service": "^6.1.6",
"@commitlint/cli": "^7.1.2",
"@commitlint/config-conventional": "^7.1.2",
"@fortawesome/fontawesome-pro": "^5.3.1",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
Expand All @@ -91,6 +103,7 @@
"gulp-jsoncombine": "^1.0.4",
"gulp-markdown-to-json": "^1.1.0",
"gulp-rename": "^1.2.2",
"husky": "^1.0.1",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.1",
Expand Down
9 changes: 4 additions & 5 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,6 @@ $custom-select-bg-size: 16px 16px !default; // In pixels because ima
$custom-select-indicator: str-replace(url("data:image/svg+xml;charset=UTF-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M443.5 162.6l-7.1-7.1c-4.7-4.7-12.3-4.7-17 0L224 351 28.5 155.5c-4.7-4.7-12.3-4.7-17 0l-7.1 7.1c-4.7 4.7-4.7 12.3 0 17l211 211.1c4.7 4.7 12.3 4.7 17 0l211-211.1c4.8-4.7 4.8-12.3.1-17z'/%3E%3C/svg%3E"), "#", "%23") !default;
$custom-select-border-radius: 4px !default;

//$custom-select-indicator: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E"), "#", "%23") !default;
//background: url("data:image/svg+xml;charset=UTF-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M443.5 162.6l-7.1-7.1c-4.7-4.7-12.3-4.7-17 0L224 351 28.5 155.5c-4.7-4.7-12.3-4.7-17 0l-7.1 7.1c-4.7 4.7-4.7 12.3 0 17l211 211.1c4.7 4.7 12.3 4.7 17 0l211-211.1c4.8-4.7 4.8-12.3.1-17z'/%3E%3C/svg%3E");
//background: url("data:image/svg+xml;charset=UTF-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'%3E%3Cpath fill='%230092e1' d='M443.5 162.6l-7.1-7.1c-4.7-4.7-12.3-4.7-17 0L224 351 28.5 155.5c-4.7-4.7-12.3-4.7-17 0l-7.1 7.1c-4.7 4.7-4.7 12.3 0 17l211 211.1c4.7 4.7 12.3 4.7 17 0l211-211.1c4.8-4.7 4.8-12.3.1-17z'/%3E%3C/svg%3E");


$custom-file-text: (
en: "Browse"
Expand All @@ -311,6 +307,8 @@ $dropdown-link-active-bg: $blue-dark !default;


$dropdown-item-padding-y: .5rem !default;
$dropdown-chevron-color: $blue !default; // SEB specific
$dropdown-chevron-active-color: $white !default; // SEB specific



Expand All @@ -319,6 +317,7 @@ $dropdown-item-padding-y: .5rem !default;
// Warning: Avoid customizing these values. They're used for a bird's eye view
// of components dependent on the z-axis and are designed to all work together.

$zindex-dropdown-backdrop: 990 !default; // SEB specific
$zindex-dropdown: 1000 !default;
$zindex-sticky: 1020 !default;
$zindex-fixed: 1030 !default;
Expand Down Expand Up @@ -417,4 +416,4 @@ $accordion-border-color: $table-border-color !default; // SEB specific
$accordion-border-width: $table-border-width !default; // SEB specific
$accordion-header-padding: $table-cell-padding !default; // SEB specific
$accordion-body-padding: $table-cell-padding !default; // SEB specific
$accordion-body-bg: transparent !default; // SEB specific
$accordion-body-bg: transparent !default; // SEB specific
6 changes: 3 additions & 3 deletions scss/styles/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ fieldset:disabled a.btn {
}

//
.btn-light:hover {
background: rgba(0, 0, 0, 0.35);
}
// .btn-light:hover {
// background: rgba(0, 0, 0, 0.35);
// }


//
Expand Down
24 changes: 24 additions & 0 deletions scss/styles/_input-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,27 @@
z-index: 2;
position: relative;
}

@include media-breakpoint-down(xs) {
.input-group.active {
color: $input-focus-color;
background-color: $input-focus-bg;
border-color: $input-focus-border-color;
outline: 0;
// Avoid using mixin so we can pass custom focus shadow properly
@if $enable-shadows {
box-shadow: $input-box-shadow, $input-focus-box-shadow;
} @else {
box-shadow: $input-focus-box-shadow;
}
border-radius: $input-border-radius;
.form-control, .btn {
z-index: $zindex-modal - 5;
opacity: 0.35;
border-color: $input-focus-border-color;
}
.form-control {
border-right-color: transparent !important;
}
}
}
File renamed without changes.
257 changes: 0 additions & 257 deletions scss/third-parties/_ng-bootstrap.scss

This file was deleted.

10 changes: 7 additions & 3 deletions scss/third-parties/_third-parties.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
@import "generic-table";
@import "ng-bootstrap";
@import "ng-bootstrap/mixins";

@if ($enable-angular-generic-table) {
@include angular-generic-table;
}
@if ($enable-ng-bootstrap) {
@include ng-bootstrap;
}
@include ngb-animations();
@include ngb-datepicker('ngb-datepicker');
@include ngb-dropdown();
@include ngb-accordion('ngb-accordion');
@include ngb-tooltip('[ngbTooltip]');
}
Loading

0 comments on commit 48e845d

Please sign in to comment.