diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.css b/src/app/appmarket/appinstance/appinstance/appinstance.component.css
index 77a5be710f9d54a07eee03a21eee3b19838063a4..96f3d93cb7b3cb432509395a983316d14c8ba532 100644
--- a/src/app/appmarket/appinstance/appinstance/appinstance.component.css
+++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.css
@@ -78,6 +78,6 @@
:host ::ng-deep .p-dropdown {
width: 200px;
}
-.p-dropdown-items {
+:host ::ng-deep.p-dropdown-panel .p-dropdown-items {
max-height: 150px;
}
diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.html b/src/app/appmarket/appinstance/appinstance/appinstance.component.html
index 35a1a2a1aba53896f8dd9959defc24925816b35a..330151db9ebe9fe0c3741dec40f339e289153372 100644
--- a/src/app/appmarket/appinstance/appinstance/appinstance.component.html
+++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.html
@@ -68,16 +68,16 @@
<!-- Deployment buttons -->
<!-- if application is still being deployed -->
- <div class="btn-group pull-right"
+ <div class=" pull-right"
*ngIf="getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.FAILURE
&& getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.RUNNING
&& getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.REMOVED
&& getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.DONE">
<button *ngIf="getStateAsEnum(appInstanceStatus?.state) == AppInstanceState.CONFIGURATION_AWAITING"
- role="button" class="btn btn-primary" (click)="applyConfig.show()">
+ role="button" class="btn btn-primary m-1" (click)="applyConfig.show()">
{{'APP_INSTANCE.CONFIGURE' | translate}}
</button>
- <button class="btn btn-danger"
+ <button class="btn btn-danger m-1"
*roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN']"
(click)="this.appAbortModal.show()">{{'APP_INSTANCE.ABORT_BUTTON' | translate}}</button>
</div>
@@ -241,7 +241,7 @@
<button type="button" class="btn btn-primary "
[disabled]="appVersions.length === 0 || selectedVersion === ''"
(click)="this.manualUpdateVersion()">{{'APP_INSTANCES.MANUAL_UPDATE.YES_BUTTON' | translate}}</button>
- <button type="button" class="btn btn-danger"
+ <button type="button" class="btn btn-secondary"
(click)="this.manualUpdateModal.hide()">{{'UNDEPLOY_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/appinstance/modals/app-abort-modal/app-abort-modal.component.html b/src/app/appmarket/appinstance/modals/app-abort-modal/app-abort-modal.component.html
index 766a484610ff218f59ea69a0443dedcc622f092e..8962f2c199b9c7e793734403037aedf4c5d97161 100644
--- a/src/app/appmarket/appinstance/modals/app-abort-modal/app-abort-modal.component.html
+++ b/src/app/appmarket/appinstance/modals/app-abort-modal/app-abort-modal.component.html
@@ -8,7 +8,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-danger" (click)="abort()">{{'ABORT_MODAL.YES_BUTTON' | translate}}</button>
- <button type="button" class="btn btn-primary" (click)="modal.hide()">{{'ABORT_MODAL.CANCEL_BUTTON' | translate}}</button>
+ <button type="button" class="btn btn-primary" (click)="abort()">{{'ABORT_MODAL.YES_BUTTON' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'ABORT_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/appinstance/modals/app-restart-modal/app-restart-modal.component.html b/src/app/appmarket/appinstance/modals/app-restart-modal/app-restart-modal.component.html
index 3b9c50b7294f7e33ca83a550e240fdc381db967b..5d190e5a8ad41f413e5cce8ad1cadfbd19843263 100644
--- a/src/app/appmarket/appinstance/modals/app-restart-modal/app-restart-modal.component.html
+++ b/src/app/appmarket/appinstance/modals/app-restart-modal/app-restart-modal.component.html
@@ -8,7 +8,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-danger" (click)="restart()">{{'RESTART_MODAL.YES_BUTTON' | translate}}</button>
- <button type="button" class="btn btn-primary" (click)="modal.hide()">{{'RESTART_MODAL.CANCEL_BUTTON' | translate}}</button>
+ <button type="button" class="btn btn-primary" (click)="restart()">{{'RESTART_MODAL.YES_BUTTON' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'RESTART_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/appinstance/modals/app-upgrade-modal/app-upgrade-modal.component.html b/src/app/appmarket/appinstance/modals/app-upgrade-modal/app-upgrade-modal.component.html
index f7c0c2c4021498a7d0f8feb817d2ce0d55cf8849..483f76fa4fbdd7475f00bd34ec248c28b0f60b37 100644
--- a/src/app/appmarket/appinstance/modals/app-upgrade-modal/app-upgrade-modal.component.html
+++ b/src/app/appmarket/appinstance/modals/app-upgrade-modal/app-upgrade-modal.component.html
@@ -14,7 +14,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-danger" (click)="upgrade()">{{'UPGRADE_MODAL.YES_BUTTON' | translate}}</button>
- <button type="button" class="btn btn-primary" (click)="modal.hide()">{{'UPGRADE_MODAL.CANCEL_BUTTON' | translate}}</button>
+ <button type="button" class="btn btn-primary" (click)="upgrade()">{{'UPGRADE_MODAL.YES_BUTTON' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'UPGRADE_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/appinstance/ssh-shell/ssh-shell.component.html b/src/app/appmarket/appinstance/ssh-shell/ssh-shell.component.html
index 08d112143205c6fdfa1e1a22b74cbec27da6128b..9bbce9c2bba4bad721ca94d9fde41d50e4bb97d1 100644
--- a/src/app/appmarket/appinstance/ssh-shell/ssh-shell.component.html
+++ b/src/app/appmarket/appinstance/ssh-shell/ssh-shell.component.html
@@ -1,6 +1,6 @@
<div class="upper-button-container">
<div class="btn-group" role="group">
- <button type="button" class="btn btn-warning" (click)="reconnect()">{{'SHELL.RECONNECT_BUTTON' | translate}}</button>
+ <button type="button" class="btn btn-primary" (click)="reconnect()">{{'SHELL.RECONNECT_BUTTON' | translate}}</button>
<button type="button" class="btn btn-danger" (click)="disconnectWithModal()">{{'SHELL.DISCONNECT_BUTTON' | translate}}</button>
</div>
</div>
diff --git a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
index 1e8d9408d3a34ef3129c565b7d319709c63fcaa2..72fd4db5ee3d8ae828654970a253fc669cc7b7ca 100644
--- a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
+++ b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
@@ -626,7 +626,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button type="submit" class="btn btn-danger center-block"
+ <button type="submit" class="btn btn-primary center-block"
[routerLink]="['/admin/apps']">{{'APPS_WIZARD.NEW_APP_MODAL.BACK_TO_APP_MANAGEMENT_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
index 2ab7728bbcc7926c992d6a14c9a25960430c5a9d..4ecb475209d8a5cb576f57ba8a5b554ca43acb2a 100644
--- a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
+++ b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
@@ -349,6 +349,6 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button type="submit" class="btn btn-danger center-block" [routerLink]="['/admin/apps']">{{'APPS_WIZARD.NEW_APP_MODAL.BACK_TO_APP_MANAGEMENT_BUTTON' | translate}}</button>
+ <button type="submit" class="btn btn-primary center-block" [routerLink]="['/admin/apps']">{{'APPS_WIZARD.NEW_APP_MODAL.BACK_TO_APP_MANAGEMENT_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/domains/domain/domain.component.html b/src/app/appmarket/domains/domain/domain.component.html
index 110fee5f7ec7c8547801b82bdfaa430334c7ac9f..f3f5cdafb74f396c179ca1788b0689d6d8e18a00 100644
--- a/src/app/appmarket/domains/domain/domain.component.html
+++ b/src/app/appmarket/domains/domain/domain.component.html
@@ -273,7 +273,7 @@
</div>
</div>
<div class="nmaas-modal-footer text-center">
- <button class="btn btn-danger" style="display: inline-block" (click)="updateDcnConfigured()">{{ 'DOMAIN_DETAILS.YES_BUTTON' | translate }}</button>
- <button class="btn btn-primary" style="display: inline-block" (click)="this.modal.hide()">{{ 'DOMAIN_DETAILS.CANCEL_BUTTON' | translate }}</button>
+ <button class="btn btn-primary" style="display: inline-block" (click)="updateDcnConfigured()">{{ 'DOMAIN_DETAILS.YES_BUTTON' | translate }}</button>
+ <button class="btn btn-secondary" style="display: inline-block" (click)="this.modal.hide()">{{ 'DOMAIN_DETAILS.CANCEL_BUTTON' | translate }}</button>
</div>
</nmaas-modal>
diff --git a/src/app/shared/users/privileges/userprivileges.component.html b/src/app/shared/users/privileges/userprivileges.component.html
index b632b0f83d907779ecb6fdd269c99accdfe22c9f..dbb956d453c4d3176a71e8a2b093ac7c6b926cff 100644
--- a/src/app/shared/users/privileges/userprivileges.component.html
+++ b/src/app/shared/users/privileges/userprivileges.component.html
@@ -24,7 +24,7 @@
</select>
</div>
<div class="col-lg-3">
- <button type="submit" class="btn btn-danger">{{'USER_PRIVILEGES.ADD_BUTTON' | translate}}</button>
+ <button type="submit" class="btn btn-primary">{{'USER_PRIVILEGES.ADD_BUTTON' | translate}}</button>
</div>
</form>
<hr>
diff --git a/src/app/welcome/complete/complete.component.html b/src/app/welcome/complete/complete.component.html
index 3cc266739165c09c843bd1ef7e6bc715d4ef35f0..46cef36fa39df40e49ed75893af4cca1c04f3485 100644
--- a/src/app/welcome/complete/complete.component.html
+++ b/src/app/welcome/complete/complete.component.html
@@ -89,8 +89,8 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button class="btn btn-danger center-block" (click)="this.hide()">{{'COMPLETE_REGISTRATION.MODAL.RETURN_BUTTON' | translate}}</button>
+ <button class="btn btn-secondary center-block" (click)="this.hide()">{{'COMPLETE_REGISTRATION.MODAL.RETURN_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
<modal-info-terms></modal-info-terms>
-<modal-info-policy></modal-info-policy>
\ No newline at end of file
+<modal-info-policy></modal-info-policy>