@@ -52,7 +52,7 @@
{{'request.confirm.promotion.table.button.action.accept' | translate}}
-
+
{{'request.confirm.promotion.table.button.action.reject' | translate}}
@@ -61,4 +61,4 @@
-
+
diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.scss b/static/src/app/request/confirm-promotion/confirm-promotion.component.scss
index 07c2b42..76152ca 100644
--- a/static/src/app/request/confirm-promotion/confirm-promotion.component.scss
+++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.scss
@@ -1,7 +1,7 @@
-@import url('../../style/overview.scss');
-
-.overview {
- margin-left: 25px !important;
+div.confirm-promotion-container {
+ margin: 2em auto;
+ width: 95%;
+ min-width: 835px;
}
.decoration-preview {
@@ -10,6 +10,7 @@
.action {
cursor: pointer;
+ line-height: 2em;
}
.table {
@@ -20,14 +21,5 @@
.table-container {
margin-top: 40px;
overflow-x: auto;
- width: 90%;
padding: 5px;
}
-
-.form-group {
- width: 25%;
-}
-
-h3 {
- margin: 80px 0 20px -20px;
-}
diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.ts b/static/src/app/request/confirm-promotion/confirm-promotion.component.ts
index 6bd2e21..886dfb2 100644
--- a/static/src/app/request/confirm-promotion/confirm-promotion.component.ts
+++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.ts
@@ -33,7 +33,7 @@ export class ConfirmPromotionComponent implements OnInit {
});
}
- confirm(promotion: Promotion, decision: boolean, rejectReason: string) {
+ confirm(promotion: Promotion, decision: boolean, rejectReason?: string) {
const updateObject = {
_id: promotion._id,
confirmed: decision ? 1 : 2
diff --git a/static/src/app/request/promotion/req-promotion.component.html b/static/src/app/request/promotion/req-promotion.component.html
index ed5e3ca..be121b6 100644
--- a/static/src/app/request/promotion/req-promotion.component.html
+++ b/static/src/app/request/promotion/req-promotion.component.html
@@ -1,61 +1,63 @@
- |