Skip to content

Commit

Permalink
Merge branch 'master' into feature/716-create-tags-angular
Browse files Browse the repository at this point in the history
  • Loading branch information
yvespp authored Dec 18, 2023
2 parents e278392 + 3f2f8ff commit b5fc33e
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 16 deletions.
8 changes: 4 additions & 4 deletions AMW_angular/io/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion AMW_angular/io/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@angular/platform-browser-dynamic": "^17.0.2",
"@angular/router": "^17.0.2",
"@ctrl/ngx-codemirror": "^7.0.0",
"@ng-bootstrap/ng-bootstrap": "^16.0.0-rc.1",
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
"@ng-select/ng-select": "^12.0.4",
"@popperjs/core": "^2.11.8",
"bootstrap": "5.3.2",
Expand Down
4 changes: 2 additions & 2 deletions AMW_angular/io/src/app/app.component.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/';

@import 'auditview/auditview.scss';
@import 'deployments/deployments.scss';
@import './auditview/auditview.scss';
@import './deployments/deployments.scss';

/* Move down content because we have a fixed navbar that is 50px tall */
/*
Expand Down
18 changes: 9 additions & 9 deletions AMW_angular/io/src/app/deployments/deployments.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@ span.reject:hover {

span.confirm,
span.confirm:hover {
color: #008400;
color: var(--bs-success)
}

span.delayed,
span.delayed:hover {
color: #db4a4a;
color: var(--bs-danger);
}

span.reject,
span.reject:hover {
color: #db4a4a;
color: var(--bs-danger);
}

tr.deploy-pre_deploy,
tr.deploy-progress {
background-color: #e9ecef;
tr.deploy-progress > td {
background-color: var(--bs-light)
}

tr.deploy-failed {
background-color: #f2dede;
tr.deploy-failed > td {
background-color: var(--bs-danger-bg-subtle);
}

tr.deploy-success {
background-color: #dff0d8;
tr.deploy-success > td {
background-color: var(--bs-success-bg-subtle)
}
span.action,
span.delayed,
Expand Down
7 changes: 7 additions & 0 deletions release-changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# v1.17.32
* Update to Angular 17 and update JS deps [#705](https://github.com/liimaorg/liima/issues/705) [#715](https://github.com/liimaorg/liima/pull/715)
* Angular deployments page: Clipboard button doesn't work [#699](https://github.com/liimaorg/liima/issues/699)
* Exception when deleting resources with functions [#681](https://github.com/liimaorg/liima/issues/681)
* NullPointerException on editTemplateView.xhtml after remove of relation [#704](https://github.com/liimaorg/liima/issues/704)
* Duplicate resource names via renaming [#682](https://github.com/liimaorg/liima/issues/682)

# v1.17.31
* fix several permission related issues [#701](https://github.com/liimaorg/liima/pull/701)
* runtime resource type is now an normal default resource type. Permissions for default resource types now apply to runtimes also.
Expand Down

0 comments on commit b5fc33e

Please sign in to comment.