diff --git a/.htmlhintrc b/.htmlhintrc index 395a91aab..007af1f90 100644 --- a/.htmlhintrc +++ b/.htmlhintrc @@ -10,8 +10,8 @@ "title-require": true, "tag-self-close": false, "head-script-disabled": true, - "doctype-html5": true, - "id-class-value": "dash", + "DOCTYPE-html5": true, + "id-class-value": false, "style-disabled": true, "inline-style-disabled": true, "inline-script-disabled": true, diff --git a/docs/coding-guides/html.md b/docs/coding-guides/html.md index e2ec7101e..9b100a83a 100644 --- a/docs/coding-guides/html.md +++ b/docs/coding-guides/html.md @@ -8,7 +8,7 @@ ## Coding rules -- Use HTML5 doctype: `` +- Use HTML5 DOCTYPE: `` - Use HTML [semantic elements](https://developer.mozilla.org/docs/Web/HTML/Sections_and_Outlines_of_an_HTML5_document) - Use double quotes `"` around attribute values in tags - Use a new line for every block, list, or table element, and indent every such child element diff --git a/src/app/clients/clients-view/charges/view-charge/view-charge.component.html b/src/app/clients/clients-view/charges/view-charge/view-charge.component.html index 511dac8c5..477f24210 100644 --- a/src/app/clients/clients-view/charges/view-charge/view-charge.component.html +++ b/src/app/clients/clients-view/charges/view-charge/view-charge.component.html @@ -69,7 +69,7 @@ -
+

{{ 'labels.heading.Transactions' | translate }}

@@ -110,7 +110,7 @@ {{ 'labels.inputs.Actions' | translate }} - diff --git a/src/app/clients/clients-view/charges/view-charge/view-charge.component.scss b/src/app/clients/clients-view/charges/view-charge/view-charge.component.scss index 2ebe1bc70..35d893e99 100644 --- a/src/app/clients/clients-view/charges/view-charge/view-charge.component.scss +++ b/src/app/clients/clients-view/charges/view-charge/view-charge.component.scss @@ -1,4 +1,4 @@ -.delBtn { +.del-btn { width: 20px !important; height: 25px; min-width: 20px !important; @@ -17,3 +17,7 @@ display: flex; justify-content: space-between; } + +.content { + padding-top: 10px; +} diff --git a/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html b/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html index 5cbf95cf1..723a77839 100644 --- a/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html +++ b/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html @@ -1,7 +1,7 @@
-
-
- {{ 'labels.inputs.Survey Name' | translate }} +
+
+ {{ 'labels.inputs.Survey Name' | translate }} {{ surveyData.name }} @@ -15,17 +15,16 @@

component[0].componentKey

-
+
- {{ question.text }} + {{ question.text }} diff --git a/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.scss b/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.scss index 30d0517e5..4029367e1 100644 --- a/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.scss +++ b/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.scss @@ -3,7 +3,7 @@ padding: 5px; } -.displayQuestions { +.display-questions { margin-top: 20px; } @@ -15,16 +15,16 @@ white-space: normal; } -.questionText { +.question-text { font-weight: bold; } -.surveySelect { +.survey-select { height: 40px; margin-bottom: 20px; } -.nameLabel { +.name-label { width: 25%; } @@ -39,3 +39,9 @@ .button-submit { margin-left: 2%; } + +.radio-button { + margin-bottom: 5px; + align-items: normal; + white-space: normal; +} diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html index c01409fab..d7e0d78d0 100644 --- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html +++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html @@ -594,7 +594,7 @@
-
+

{{ 'labels.heading.Collaterals Data' | translate }}

diff --git a/src/app/organization/fund-mapping/fund-mapping.component.html b/src/app/organization/fund-mapping/fund-mapping.component.html index 581e7b1a1..d028def1e 100644 --- a/src/app/organization/fund-mapping/fund-mapping.component.html +++ b/src/app/organization/fund-mapping/fund-mapping.component.html @@ -48,7 +48,6 @@ [min]="minDate" [max]="maxDate" [matDatepicker]="fromDatePicker" - required formControlName="loanFromDate" required /> @@ -67,7 +66,6 @@ [min]="minDate" [max]="maxDate" [matDatepicker]="toDatePicker" - required formControlName="loanToDate" required /> @@ -99,10 +97,10 @@ {{ 'labels.inputs.Comparison Condition' | translate }} {{ 'labels.inputs.between' | translate }} - <= - >= - < - > + <= + >= + < + > = @@ -154,10 +152,10 @@ {{ 'labels.inputs.Comparison Condition' | translate }} {{ 'labels.inputs.between' | translate }} - <= - >= - < - > + <= + >= + < + > = diff --git a/src/app/products/charges/charges.component.html b/src/app/products/charges/charges.component.html index 0aec8986c..61ba9e278 100644 --- a/src/app/products/charges/charges.component.html +++ b/src/app/products/charges/charges.component.html @@ -9,11 +9,11 @@
- + {{ 'labels.inputs.Filter' | translate }} - +

{{ 'labels.text.Create Charge' | translate }}

-

{{ 'labels.text.Supports Loan charges, Savings & deposits' | translate }}

+

{{ 'labels.text.Supports Loan charges, Savings & deposits' | translate }}

-
+
{{ 'labels.inputs.Name' | translate }} @@ -192,7 +192,7 @@
-
+
{{ 'labels.status.Active' | translate }} diff --git a/src/app/products/charges/edit-charge/edit-charge.component.scss b/src/app/products/charges/edit-charge/edit-charge.component.scss index 67f3585da..24f0ad087 100644 --- a/src/app/products/charges/edit-charge/edit-charge.component.scss +++ b/src/app/products/charges/edit-charge/edit-charge.component.scss @@ -1,3 +1,7 @@ .checkbox { padding-top: 10px; } + +.form-section { + margin-top: 10px; +} diff --git a/src/app/savings/gsim-account/gsim-account.component.html b/src/app/savings/gsim-account/gsim-account.component.html index f7734931b..3580ed525 100644 --- a/src/app/savings/gsim-account/gsim-account.component.html +++ b/src/app/savings/gsim-account/gsim-account.component.html @@ -1,5 +1,5 @@
-
+

{{ 'labels.heading.GSIM Account Overview' | translate }}

diff --git a/src/app/savings/gsim-account/gsim-account.component.scss b/src/app/savings/gsim-account/gsim-account.component.scss index 36e5f0498..616bb9534 100644 --- a/src/app/savings/gsim-account/gsim-account.component.scss +++ b/src/app/savings/gsim-account/gsim-account.component.scss @@ -6,6 +6,10 @@ margin: 1% auto; } + .content-container { + margin-top: 5px; + } + .group-details-container { border: 1px solid; padding: 1%; diff --git a/src/app/shared/dropdown/dropdown.component.html b/src/app/shared/dropdown/dropdown.component.html index a6ae8c376..87f06849c 100644 --- a/src/app/shared/dropdown/dropdown.component.html +++ b/src/app/shared/dropdown/dropdown.component.html @@ -1,4 +1,4 @@ - + {{ getLabelText() }} diff --git a/src/app/shared/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.component.html b/src/app/shared/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.component.html index e7a63c925..d64dff521 100644 --- a/src/app/shared/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.component.html +++ b/src/app/shared/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.component.html @@ -7,16 +7,16 @@
- {{ 'labels.inputs.Ctrl' | translate }} + + {{ 'labels.inputs.Ctrl' | translate }} + - {{ 'labels.inputs.Shift' | translate }} + + {{ 'labels.inputs.Shift' | translate }} + - {{ 'labels.inputs.Alt' | translate }} + + {{ 'labels.inputs.Alt' | translate }} + - {{ item.key }}{{ item.key }} {{ item.title }} diff --git a/src/app/shared/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.component.scss b/src/app/shared/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.component.scss index 33c1adfaf..88c3d9396 100644 --- a/src/app/shared/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.component.scss +++ b/src/app/shared/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.component.scss @@ -1,4 +1,4 @@ -.modifierKey { +.modifier-key { border: 1px solid #0000004d; padding: 0.3rem; background: #f8f8f8; diff --git a/src/app/shared/notifications-tray/notifications-tray.component.html b/src/app/shared/notifications-tray/notifications-tray.component.html index 83a7954d3..56e6cca23 100644 --- a/src/app/shared/notifications-tray/notifications-tray.component.html +++ b/src/app/shared/notifications-tray/notifications-tray.component.html @@ -13,8 +13,13 @@ -
- +
+ {{ 'labels.menus.Notifications' | translate }}

{{ 'labels.text.No notifications' | translate }}

diff --git a/src/app/shared/notifications-tray/notifications-tray.component.scss b/src/app/shared/notifications-tray/notifications-tray.component.scss index 9ac1a5410..c53b9122e 100644 --- a/src/app/shared/notifications-tray/notifications-tray.component.scss +++ b/src/app/shared/notifications-tray/notifications-tray.component.scss @@ -2,6 +2,15 @@ max-height: 20rem !important; width: 12.5rem !important; + .no-notifications { + padding: 16px; + } + + .notification-icon { + font-size: 24px; + opacity: 0.8; + } + .mat-menu-content { padding: 0 !important; } diff --git a/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.html b/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.html index 8a89f730e..231cba998 100644 --- a/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.html +++ b/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.html @@ -49,7 +49,7 @@ cdkTextareaAutosize="true" cdkAutosizeMaxRows="20" cdkAutosizeMinRows="1" - style="width: 100%; height: 100%" + class="json-textarea" [innerHTML]="dataObject.data[0].row[i].value | prettyPrint" > diff --git a/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.scss b/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.scss index 4994614b9..67aba906a 100644 --- a/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.scss +++ b/src/app/shared/tabs/entity-datatable-tab/datatable-single-row/datatable-single-row.component.scss @@ -33,3 +33,8 @@ width: 30px; height: 30px; } + +.json-textarea { + width: 100%; + height: 100%; +} diff --git a/src/app/system/manage-surveys/view-survey/view-survey.component.html b/src/app/system/manage-surveys/view-survey/view-survey.component.html index d813affeb..f392ccc51 100644 --- a/src/app/system/manage-surveys/view-survey/view-survey.component.html +++ b/src/app/system/manage-surveys/view-survey/view-survey.component.html @@ -56,11 +56,11 @@ -
+
{{ 'labels.heading.Question' | translate }}: {{ i + 1 }}
-
+
{{ 'labels.inputs.Key' | translate }}:
diff --git a/src/app/system/manage-surveys/view-survey/view-survey.component.scss b/src/app/system/manage-surveys/view-survey/view-survey.component.scss index b7839915d..a72ccf6ea 100644 --- a/src/app/system/manage-surveys/view-survey/view-survey.component.scss +++ b/src/app/system/manage-surveys/view-survey/view-survey.component.scss @@ -2,11 +2,11 @@ margin: 5px; } -.survey_questions { +.survey-questions { margin-bottom: 10px; } -#key_text { +#key-text { margin: 10px; } diff --git a/src/app/system/roles-and-permissions/view-role/view-role.component.html b/src/app/system/roles-and-permissions/view-role/view-role.component.html index 373aea5bc..97fcb3ff6 100644 --- a/src/app/system/roles-and-permissions/view-role/view-role.component.html +++ b/src/app/system/roles-and-permissions/view-role/view-role.component.html @@ -69,7 +69,7 @@
-
+

{{ 'labels.buttons.Permissions' | translate }}: {{ formatName(previousGrouping) }} @@ -83,7 +83,7 @@ fxLayoutAlign="end" fxLayoutGap="5px" *ngIf="!isDisabled" - class="selectDeselect" + class="select-deselect" >