+
+
);
diff --git a/forms-flow-admin/src/components/roles/roles.scss b/forms-flow-admin/src/components/roles/roles.scss
index 95074f913..d211abe8b 100644
--- a/forms-flow-admin/src/components/roles/roles.scss
+++ b/forms-flow-admin/src/components/roles/roles.scss
@@ -1,9 +1,6 @@
.table-container{
- min-height: 28.125rem !important;
- margin-left: 3.938rem;
- margin-right: 4.188rem !important;
- padding-left: 1.938rem;
- padding-right: 1.938rem;
+ min-height: 24rem !important;
+
background: #FFFFFF;
border: 1px solid #ECECEC;
box-shadow: 0px 2px 8px rgba(66, 66, 66, 0.07);
@@ -15,11 +12,7 @@
color: #646464;
border: none;
}
-.table-container .table td{
- padding-top: 1.563rem;
- padding-bottom: 1.75rem;
- font-weight: 600;
-}
+
.search-role {
width: 33.625rem !important;
@@ -27,18 +20,8 @@
margin-top: 1.875rem;
display: flex;
}
-.sub-container{
- margin-left: 3.938rem !important;
- margin-right: 4.188rem;
- padding-left: 1.938rem;
- padding-right: 1.938rem;
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-.btn-primary{
- background-color: #2F45F3 !important;
-}
+
+
.user-list{
text-decoration: none;
cursor: pointer;
@@ -66,8 +49,6 @@
}
.container-admin {
.row{
- margin-left: 2.98rem;
- margin-right: 3.188rem;
align-items: center;
}
tbody{
@@ -148,8 +129,5 @@
white-space: nowrap;
margin-top: 2px;
}
- .sub-container{
- margin-left: 1rem !important;
- margin-right: 2.188rem;
- }
+
}
\ No newline at end of file
diff --git a/forms-flow-admin/src/components/roles/roles.tsx b/forms-flow-admin/src/components/roles/roles.tsx
index 0c91546d7..fbec370be 100644
--- a/forms-flow-admin/src/components/roles/roles.tsx
+++ b/forms-flow-admin/src/components/roles/roles.tsx
@@ -366,7 +366,7 @@ const Roles = React.memo((props: any) => {
);
const customTotal = (from, to, size) => (
-
+
+
+
+ {(t) => t("Powered by ")} {" "}
+
+ formsflow.ai
+
+ {` v${version_org}`}
+
{
setSelectedRoleIdentifier(KEYCLOAK_ENABLE_CLIENT_AUTH ? rowData.name : rowData.id)
@@ -495,7 +496,7 @@ const Roles = React.memo((props: any) => {
}}
/>
{
setDeleteCandidate(rowData);
@@ -510,8 +511,8 @@ const Roles = React.memo((props: any) => {
return (
<>
-
-
+
+
select {
border: none;
diff --git a/forms-flow-admin/src/components/users/users.tsx b/forms-flow-admin/src/components/users/users.tsx
index 4d65d09e7..52082382d 100644
--- a/forms-flow-admin/src/components/users/users.tsx
+++ b/forms-flow-admin/src/components/users/users.tsx
@@ -92,7 +92,7 @@ const Users = React.memo((props: any) => {
setSizePerPage(sizePerPage);
};
const customTotal = (from, to, size) => (
-
+
{(t) => t("Showing")} {from}{" "}
{(t) => t("to")} {to}{" "}
{(t) => t("of")} {size}{" "}
@@ -196,17 +196,17 @@ const Users = React.memo((props: any) => {
text: {(t) => t("Role")} ,
formatter: (cell, rowData) => {
return (
-
+
{cell?.map((item, i) => (
-
+
{item?.path} : <>}
>
-
- {item?.name}{" "}
+
+ {item?.name}
removePermission(rowData, item)}
>
@@ -326,8 +326,8 @@ const Users = React.memo((props: any) => {
return (
<>
-
-
+
-
-
-
-
-
- 
-
+
+
+
+
+
-
-
-
-
+
) : (
- !MULTITENANCY_ENABLED &&
- Login
-
+ !MULTITENANCY_ENABLED && (
+
+ Login
+
+ )
)}
-
-
+
+
);
diff --git a/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts b/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts
index 794150ee7..138a996e4 100644
--- a/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts
+++ b/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts
@@ -1,5 +1,18 @@
/* eslint-disable max-len */
export const RESOURCE_BUNDLES_BG = {
+ "View Submitted Form": "Преглед на представен формуляр",
+ "View Draft Details": "Преглед на детайлите на черновата",
+ "Edit Draft": "Редактиране на черновата",
+ "Draft Title": "Заглавие на черновата",
+ "Filter": "Филтър",
+ "Advanced Options": "Разширени опции",
+ "Enter the path name": "Въведете името на пътя",
+ "Search by form title": "Търсене по заглавие на формуляра",
+ "Associate Workflow": "Свързване с работен процес",
+ "Search by workflow name": "Търсене по име на работен процес",
+ "View Details": "Преглед на детайлите",
+ "Visibility": "Видимост",
+ "Form Title":"Заглавие на формуляра",
"Access restricted by its designer..!": "Достъпът е ограничен от дизайнера..!",
"and you will no longer have the access to this form in bundles": "и няма да имате достъп до тази форма в пакети",
"You will no longer have the access to this form in bundles": "Вече няма да имате достъп до тази форма в пакети",
diff --git a/forms-flow-service/src/resourceBundles/de/resourceBundles.ts b/forms-flow-service/src/resourceBundles/de/resourceBundles.ts
index fe0b2460f..b69a6b454 100644
--- a/forms-flow-service/src/resourceBundles/de/resourceBundles.ts
+++ b/forms-flow-service/src/resourceBundles/de/resourceBundles.ts
@@ -1,5 +1,18 @@
/* eslint-disable max-len */
export const RESOURCE_BUNDLES_DE = {
+ "View Submitted Form": "Eingereichtes Formular anzeigen",
+ "View Draft Details": "Entwurfsdetails anzeigen",
+ "Edit Draft": "Entwurf bearbeiten",
+ "Draft Title": "Titel des Entwurfs",
+ "Filter": "Filter",
+ "Advanced Options": "Erweiterte Optionen",
+ "Enter the path name": "Geben Sie den Pfadnamen ein",
+ "Search by form title": "Nach Formulartitel suchen",
+ "Associate Workflow": "Workflow verknüpfen",
+ "Search by workflow name": "Nach Workflow-Namen suchen",
+ "View Details": "Details anzeigen",
+ "Visibility": "Sichtbarkeit",
+ "Form Title": "Formulartitel",
"Access restricted by its designer..!": "Zugriff durch den Designer eingeschränkt..!",
"and you will no longer have the access to this form in bundles": "und Sie haben keinen Zugriff mehr auf dieses Formular in Bündeln",
"You will no longer have the access to this form in bundles": "Sie haben keinen Zugriff mehr auf dieses Formular in Bündel",
diff --git a/forms-flow-service/src/resourceBundles/en/resourceBundles.ts b/forms-flow-service/src/resourceBundles/en/resourceBundles.ts
index 410ee082f..f89e63bec 100644
--- a/forms-flow-service/src/resourceBundles/en/resourceBundles.ts
+++ b/forms-flow-service/src/resourceBundles/en/resourceBundles.ts
@@ -1,5 +1,18 @@
/* eslint-disable max-len */
export const RESOURCE_BUNDLES_EN = {
+ "View Submitted Form": "View Submitted Form",
+ "View Draft Details": "View Draft Details",
+ "Edit Draft": "Edit Draft",
+ "Draft Title": "Draft Title",
+ "Filter": "Filter",
+ "Advanced Options": "Advanced Options",
+ "Enter the path name": "Enter the path name",
+ "Search by form title": "Search by form title",
+ "Associate Workflow": "Associate Workflow",
+ "Search by workflow name": "Search by workflow name",
+ "View Details": "View Details",
+ "Visibility": "Visibility",
+ "Form Title": "Form Title",
"Access restricted by its designer..!": "Access restricted by its designer..!",
"and you will no longer have the access to this form in bundles": "and you will no longer have the access to this form in bundles",
"You will no longer have the access to this form in bundles": "You will no longer have access to this form in bundles",
diff --git a/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts b/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts
index 65edb9056..d94f09af4 100644
--- a/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts
+++ b/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts
@@ -1,5 +1,18 @@
/* eslint-disable max-len */
export const RESOURCE_BUNDLES_FR = {
+ "View Submitted Form": "Voir le formulaire soumis",
+ "View Draft Details": "Voir les détails du brouillon",
+ "Edit Draft": "Éditer le brouillon",
+ "Draft Title": "Titre du brouillon",
+ "Filter": "Filtre",
+ "Advanced Options": "Options avancées",
+ "Enter the path name": "Entrer le nom du chemin",
+ "Search by form title": "Rechercher par titre de formulaire",
+ "Associate Workflow": "Associer le flux de travail",
+ "Search by workflow name": "Rechercher par nom de flux de travail",
+ "View Details": "Voir les détails",
+ "Visibility": "Visibilité",
+ "Form Title": "Titre du formulaire",
"Access restricted by its designer..!": "Accès restreint par son concepteur..!",
"and you will no longer have the access to this form in bundles": "et vous n'aurez plus accès à ce formulaire dans les bundles",
"You will no longer have the access to this form in bundles": "Vous n'aurez plus accès à ce formulaire dans les bundles",
diff --git a/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts b/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts
index b6b9a69c5..220513dec 100644
--- a/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts
+++ b/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts
@@ -1,5 +1,18 @@
/* eslint-disable max-len */
export const RESOURCE_BUNDLES_PT = {
+ "View Submitted Form": "Ver Formulário Enviado",
+ "View Draft Details": "Ver Detalhes do Rascunho",
+ "Edit Draft": "Editar Rascunho",
+ "Draft Title": "Título do Rascunho",
+ "Filter": "Filtro",
+ "Advanced Options": "Opções Avançadas",
+ "Enter the path name": "Digite o nome do caminho",
+ "Search by form title": "Buscar por título de formulário",
+ "Associate Workflow": "Associar Fluxo de Trabalho",
+ "Search by workflow name": "Buscar por nome de fluxo de trabalho",
+ "View Details": "Ver Detalhes",
+ "Visibility": "Visibilidade",
+ "Form Title": "Título do Formulário",
"Access restricted by its designer..!": "Acesso restrito pelo designer..!",
"and you will no longer have the access to this form in bundles": "e você não terá mais acesso a este formulário em pacotes",
"You will no longer have the access to this form in bundles": "Você não terá mais acesso a este formulário em pacotes",
@@ -173,7 +186,7 @@ export const RESOURCE_BUNDLES_PT = {
"Details": "Detalhes",
"example":"exemplo",
"Path":"Caminho",
- "Status": "Status",
+ "Status": "Estado",
"Submissions": "Submissões",
"No Application History found": "Nenhum histórico de aplicativo encontrado",
"Link To Form Submission": "Link para o envio do formulário",
diff --git a/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts b/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts
index f0c3494b3..4b5235cb5 100644
--- a/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts
+++ b/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts
@@ -1,5 +1,18 @@
/* eslint-disable max-len */
export const RESOURCE_BUNDLES_ZH = {
+ "View Submitted Form": "查看已提交的表单",
+ "View Draft Details": "查看草稿详情",
+ "Edit Draft": "编辑草稿",
+ "Draft Title": "草稿标题",
+ "Filter": "过滤器",
+ "Advanced Options": "高级选项",
+ "Enter the path name": "输入路径名称",
+ "Search by form title": "按表单标题搜索",
+ "Associate Workflow": "关联工作流程",
+ "Search by workflow name": "按工作流程名称搜索",
+ "View Details": "查看详细信息",
+ "Visibility": "可见性",
+ "Form Title": "表单标题",
"Access restricted by its designer..!": "访问受设计者限制..!",
"and you will no longer have the access to this form in bundles": "而且您将不再能够在包裹中访问此表单",
"You will no longer have the access to this form in bundles": "您将不再能够在包裹中访问此表单",
diff --git a/forms-flow-theme/src/baseStyle.scss b/forms-flow-theme/src/baseStyle.scss
new file mode 100644
index 000000000..da9b18491
--- /dev/null
+++ b/forms-flow-theme/src/baseStyle.scss
@@ -0,0 +1,18 @@
+/* This file contains style for the main classes of application */
+
+body {
+ font-size: 16px;
+ font-family: Nunito Sans, SemiBold;
+ overflow: hidden;
+ background-color: var(--color-main-bg);
+ }
+
+ .main-container{
+ max-height: calc(100vh - 52px);
+ overflow-y: auto;
+
+ }
+
+ .min-container-height{
+ min-height: calc(100vh - 170px);
+ }
\ No newline at end of file
diff --git a/forms-flow-theme/src/bootstrapOverride.scss b/forms-flow-theme/src/bootstrapOverride.scss
new file mode 100644
index 000000000..606252d45
--- /dev/null
+++ b/forms-flow-theme/src/bootstrapOverride.scss
@@ -0,0 +1,16 @@
+@media (min-width: 1400px) {
+ .container {
+ max-width: 1320px;
+ }
+}
+.table {
+ border-collapse: inherit;
+}
+
+.table th {
+ vertical-align: inherit !important;
+}
+
+.table td {
+ vertical-align: inherit !important;
+}
\ No newline at end of file
diff --git a/forms-flow-theme/src/components/custom-table.scss b/forms-flow-theme/src/components/custom-table.scss
new file mode 100644
index 000000000..00c6c1f3f
--- /dev/null
+++ b/forms-flow-theme/src/components/custom-table.scss
@@ -0,0 +1,25 @@
+.custom-table {
+ font-family: Arial, Helvetica, sans-serif;
+ border-collapse: separate !important;
+ border-spacing: 0 15px;
+ width: 100%;
+ border: none;
+ margin: 0;
+
+ td, th {
+ padding: 20px;
+ }
+
+ tr {
+ background-color: #FFFFFF;
+ box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+ border: none;
+ }
+
+ th {
+ text-align: left;
+ background-color: #f0f6fb;
+ margin: 0;
+ border: none;
+ }
+ }
\ No newline at end of file
diff --git a/forms-flow-theme/src/components/toastifyOverride.scss b/forms-flow-theme/src/components/toastifyOverride.scss
new file mode 100644
index 000000000..696c87686
--- /dev/null
+++ b/forms-flow-theme/src/components/toastifyOverride.scss
@@ -0,0 +1,7 @@
+.Toastify__toast--success{
+ background: var(--color-primary) !important;
+}
+
+.Toastify__progress-bar--success{
+ background: var(--color-white) !important;
+}
\ No newline at end of file
diff --git a/forms-flow-theme/src/formsflow-theme.js b/forms-flow-theme/src/formsflow-theme.js
index 41781f8de..c385b392c 100644
--- a/forms-flow-theme/src/formsflow-theme.js
+++ b/forms-flow-theme/src/formsflow-theme.js
@@ -1,3 +1,3 @@
// Anything exported from this file is importable by other in-browser modules.
-import "./global.css?modules=false";
+import "./global.scss?modules=false";
export function publicApiFunction() {}
diff --git a/forms-flow-theme/src/global.css b/forms-flow-theme/src/global.scss
similarity index 81%
rename from forms-flow-theme/src/global.css
rename to forms-flow-theme/src/global.scss
index 116e504b3..a55c31970 100644
--- a/forms-flow-theme/src/global.css
+++ b/forms-flow-theme/src/global.scss
@@ -1,3 +1,10 @@
+@import "./utils/cursor.scss";
+@import "./utils/overflow.scss";
+@import "./components/toastifyOverride.scss";
+@import "./bootstrapOverride.scss";
+@import "./baseStyle.scss";
+@import "./components/custom-table.scss";
+
:root {
--color-primary: #0072ed;
--color-secondary: #6c757d;
@@ -25,18 +32,17 @@
--color-gray-700: #495057;
--color-gray-800: #373a3c;
--color-gray-900: #212529;
-
+ --color-main-bg: #F7F7F7;
--head-inactive: #909090;
--logo-path: "./logo.svg";
-
- --logo-width: 50px;
+ --logo-width: 40px;
--appname-margin-left: 0px;
--appname-margin-right: 0px;
--appname-margin-top: 0px;
--appname-margin-bottom: 0px;
--navbar-items-font-size: 16px;
- --navbar-items-font-weight: 600;
+ --navbar-items-font-weight: 400;
--navbar-background: var(--color-white);
--navbar-items: var(--color-black);
@@ -47,21 +53,8 @@
--navbar-logo-path: var(--logo-path);
}
-
-.container,
-.container-sm,
-.container-md,
-.container-lg,
-.container-xl {
- max-width: 100vw;
-}
-
-.container {
- margin-top: 3px;
- padding-left: 0;
- padding-right: 0;
- height: 100%;
-}
+
+
.overflow-x-auto {
overflow-x: auto;
@@ -77,19 +70,7 @@
color: var(--color-primary) !important;
}
-.table {
- border-collapse: inherit;
-}
-
-.table th {
- padding: 8px 34px;
- vertical-align: inherit !important;
-}
-.table td {
- padding: 8px 34px;
- vertical-align: inherit !important;
-}
.footer-text {
font-size: 18px;
@@ -121,19 +102,10 @@
h4 {
font-size: 1.2rem;
}
+
-#main {
- min-height: 84vh;
- padding-bottom: 1.5rem;
- overflow-x: hidden;
- overflow-y: auto;
-}
-
-body {
- font-size: 16px;
- font-family: Nunito Sans, SemiBold;
- overflow: hidden;
-}
+
+
.loader-container {
display: flex;
@@ -341,66 +313,7 @@ i.fa.fa-question-circle.text-muted {
max-width: 104px;
}
-/* .d-md-none {
- .dropup,
- .dropright,
- .dropdown,
- .dropleft {
- position: initial;
- }
- .nav-dropdown .dropdown-menu {
- position: absolute;
- }
- .dropdown-menu:before {
- position: absolute;
- top: -6px;
- right: 4px;
- display: inline-block;
- border-right: 7px solid transparent;
- border-bottom: 7px solid #ccc;
- border-left: 7px solid transparent;
- border-bottom-color: rgba(0, 0, 0, 0.2);
- content: "";
- }
-
- .dropdown-menu:after {
- position: absolute;
- top: -5px;
- right: 5px;
- display: inline-block;
- border-right: 6px solid transparent;
- border-bottom: 6px solid #ffffff;
- border-left: 6px solid transparent;
- content: "";
- }
-}
-.lbl-app-nanme {
- font-size: 20px;
- color: #ffff;
- margin-bottom: 0;
- font-weight: bold;
- margin-left: 20px;
-}
-.app-name {
- color: $yellow;
- margin: 0;
-}
-.nav-icons {
- vertical-align: text-top;
- margin-right: 3px;
-}
-.nav-dropdown .dropdown-menu {
- height: auto !important;
-}
-.table-bordered thead th,
-.table-bordered thead td {
- background-color: #f2f2f2 !important;
-}
-.navbar-dark.navbar-toggler {
- border-color: white;
-} */
-.main-header {
- margin-left: 15px !important;
+.main-header {
display: flex;
margin-top: 10px;
margin-bottom: 25px;
@@ -419,10 +332,7 @@ i.fa.fa-question-circle.text-muted {
.back-icon {
display: flex;
}
-
-.sub-container {
- margin-left: 15px;
-}
+
.task-head {
font-weight: bold;
@@ -447,7 +357,7 @@ i.fa.fa-question-circle.text-muted {
.task-head-details {
font-weight: bold;
- font-size: 30px;
+ font-size: 25px;
margin-left: 10px !important;
}
@@ -508,20 +418,12 @@ select option:hover {
margin: 8.75rem auto !important;
}
-#main {
- background-color: #fff;
- padding: 10px;
- box-shadow: 0 3px 3px -2px rgba(0, 0, 0, 0.2),
- 0px 3px 4px 0px rgba(0, 0, 0, 0.14), 0px 1px 8px 0px rgba(0, 0, 0, 0.12);
-}
+
#sidebar {
background: #fff;
}
-
-.content {
- background-color: #f8f8f8;
-}
+
#sidebar ul li.active>a,
#sidebar a[aria-expanded="true"] {
@@ -615,7 +517,6 @@ div[disabled] {
}
.delete_button {
- font-size: 25px;
color: red;
cursor: pointer;
transition: transform 0.5s, color 0.5s;
@@ -744,8 +645,8 @@ div.upload input[type="file"] {
}
.head-active {
- color: #212529;
- border-bottom: 4px solid #4d61fc;
+ color: var(--color-black);
+ border-bottom: 4px solid var(--color-primary);
}
.padding-left-60 {
@@ -758,7 +659,6 @@ div.upload input[type="file"] {
.head-rule {
margin-top: -10px;
- padding-top: -10px;
}
.application-head {
@@ -789,14 +689,7 @@ div.upload input[type="file"] {
margin-left: 5px;
}
-.main-header {
- margin-left: 15px !important;
- display: flex;
- margin-top: 10px;
- margin-bottom: 25px;
- height: 30px;
- width: 100%;
-}
+
.cursor-default {
cursor: default !important;
}
@@ -805,10 +698,11 @@ div.upload input[type="file"] {
cursor: pointer !important;
}
-@media (max-width: 768px) {
- .main-header {
- height: 70px;
- flex-direction: row;
- flex-wrap: wrap;
- }
+.application-head-details{
+ font-size: 25px;
+}
+
+
+hr {
+ border-top: 2px solid rgba(0,0,0,.1);
}
\ No newline at end of file
diff --git a/forms-flow-theme/src/utils/cursor.scss b/forms-flow-theme/src/utils/cursor.scss
new file mode 100644
index 000000000..33d03d6f0
--- /dev/null
+++ b/forms-flow-theme/src/utils/cursor.scss
@@ -0,0 +1,9 @@
+@mixin generate-cursor($value) {
+ .cursor-#{$value} {
+ cursor: #{$value} !important;
+ }
+}
+
+@include generate-cursor("default");
+@include generate-cursor("pointer");
+
\ No newline at end of file
diff --git a/forms-flow-theme/src/utils/overflow.scss b/forms-flow-theme/src/utils/overflow.scss
new file mode 100644
index 000000000..620b63366
--- /dev/null
+++ b/forms-flow-theme/src/utils/overflow.scss
@@ -0,0 +1,10 @@
+@mixin generate-overflow($axis, $value) {
+ .overflow-#{$axis}-#{$value} {
+ overflow-#{$axis}: #{$value} !important;
+ }
+ }
+
+ @include generate-overflow(x, auto);
+ @include generate-overflow(y, auto);
+ @include generate-overflow(x, hidden);
+ @include generate-overflow(y, hidden);
\ No newline at end of file
+
{
-
+
);
});
diff --git a/forms-flow-admin/src/index.scss b/forms-flow-admin/src/index.scss
index 9f218afaf..6150f0bd1 100644
--- a/forms-flow-admin/src/index.scss
+++ b/forms-flow-admin/src/index.scss
@@ -1,6 +1,4 @@
-.admin-container{
- background-color: #F9F9F9;
-}
+
.loader-container{
display: flex;
height: 50vh !important;
diff --git a/forms-flow-admin/src/index.tsx b/forms-flow-admin/src/index.tsx
index aa0107f46..d3a856e81 100644
--- a/forms-flow-admin/src/index.tsx
+++ b/forms-flow-admin/src/index.tsx
@@ -39,7 +39,7 @@ const Admin = React.memo(({ props }: any) => {
}, []);
React.useEffect(()=>{
- StorageService.save("tenantKey", tenantId)
+ StorageService.save("tenantKey", tenantId || '')
},[tenantId])
React.useEffect(() => {
@@ -93,7 +93,9 @@ const Admin = React.memo(({ props }: any) => {
return (
<>
{isAdmin && (
-
{t("Filter By:")}
-
+
diff --git a/forms-flow-admin/src/containers/head.tsx b/forms-flow-admin/src/containers/head.tsx
index 63eb70f4b..ad3001487 100644
--- a/forms-flow-admin/src/containers/head.tsx
+++ b/forms-flow-admin/src/containers/head.tsx
@@ -28,7 +28,7 @@ const Head = React.memo((props: any) => {
))}
+
+
)}
diff --git a/forms-flow-nav/src/Navbar.css b/forms-flow-nav/src/Navbar.css
index 5a0ce59ca..5510940af 100644
--- a/forms-flow-nav/src/Navbar.css
+++ b/forms-flow-nav/src/Navbar.css
@@ -1,95 +1,26 @@
-.btn-primary {
- background-color: var(--button-primary-background);
-}
-.logo {
- height: 1.9em;
-}
-h4 {
- font-size: 1.2rem;
-}
-body {
- font-size: var(--navbar-items-font-size);
- font-family: Nunito Sans, SemiBold;
-}
-h5,
-.h5 {
- font-size: 16px !important;
-}
-
-.navbar {
+.navbar-background{
background-color: var(--navbar-background);
}
-.nav-dropdown .dropdown-menu {
- width: 15rem;
- height: 14rem;
- padding: 15px 20px 0 20px;
- right: 0;
- top: 2rem;
- left: auto;
- box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2);
-}
-
-.nav-dropdown :hover {
- text-decoration: none !important;
-}
-.nav-custom-tab {
- padding-left: 60px !important;
-}
-.main-nav {
- text-decoration: none !important;
- /* font-size: var(--navbar-items-font-size) !important; */
+.nav-menu-item{
+ font-size: var(--navbar-items-font-size);
font-weight: var(--navbar-items-font-weight);
+ /* transition: 0.2s ease-in-out; */
+ position: relative;
}
-.inactive-tab {
- color: var(--navbar-items) !important;
-}
-.active-tab {
- color: var(--navbar-active) !important;
-}
-
-.active-tab-dropdown > #dashboard-dropdown {
- background-color: transparent;
- filter: invert(36%) sepia(38%) saturate(7152%) hue-rotate(227deg)
- brightness(101%) contrast(98%);
-}
-.active-tab-dropdown > #task-dropdown {
- background-color: transparent;
- filter: invert(36%) sepia(38%) saturate(7152%) hue-rotate(227deg)
- brightness(101%) contrast(98%);
-}
-
-.nav-dropdown .dropdown-menu {
- height: auto !important;
-}
-.navbar-dark .navbar-toggler {
- border-color: white;
-}
-.navbar-brand {
- align-items: center;
-}
-
-.navbar-brand .img-fluid,
-.navbar-brand .img-thumbnail {
- max-width: 100%;
- height: 100%;
-}
-
-header nav {
- border-bottom: var(--color-white);
-}
-
-.topheading-border-bottom {
- z-index: 2000;
- border-bottom: 2px solid var(--color-primary) !important;
- padding: 0 0.5rem !important;
- box-shadow: 0 3px 3px -2px rgba(0, 0, 0, 0.2),
- 0px 3px 4px 0px rgba(0, 0, 0, 0.14), 0px 1px 8px 0px rgba(0, 0, 0, 0.12);
+
+.nav-menu-item.active {
+ /* font-size: 18px !important; */
+ border-bottom: 3px solid var(--color-primary) !important;
+ color: var(--color-primary) !important;
+ font-weight: bold !important;
}
+
+
.custom-app-name {
- font-size: 30px;
- font-weight: 600;
+ font-size: 24px;
+ font-weight: 700;
color: var(--navbar-app-name);
margin-left: var(--appname-margin-left);
margin-right: var(--appname-margin-right);
@@ -97,46 +28,6 @@ header nav {
margin-bottom: var(--appname-margin-bottom);
}
-.navbar-light .navbar-nav .nav-link {
- color: var(--navbar-items);
-}
-
-.navbar-collapse{
- justify-content: space-evenly !important;
-
-}
-.nav-user {
- margin-left: auto;
-}
-
-.navbar-nav .nav-link:hover,
-.navbar-nav .nav-link:focus {
- text-decoration: none !important;
-}
.custom-logo{
width: var(--navbar-logo-width);
-}
-@media (max-width: 768px) {
- .head-item {
- padding-bottom: 0rem;
- }
- .padding-left-60 {
- margin-left: 0px;
- }
- .main-header {
- flex-wrap: nowrap;
- }
- .admin-container > .header-container {
- margin-left: -1rem;
- }
- .head-rule {
- margin-top: -25px;
- margin-left: -15px;
- margin-right: -86px;
-}
-}
-@media (max-width: 992px) and (max-height: 590px) {
- .nav-user {
- margin-left: inherit;
- }
}
\ No newline at end of file
diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx
index 6719baebd..bc508b262 100644
--- a/forms-flow-nav/src/Navbar.jsx
+++ b/forms-flow-nav/src/Navbar.jsx
@@ -34,16 +34,18 @@ const NavBar = React.memo(({ props }) => {
const [selectLanguages, setSelectLanguages] = React.useState([]);
const [applicationTitle, setApplicationTitle] = React.useState("");
const [tenantLogo, setTenantLogo] = React.useState("/logo_skeleton.svg");
- const defaultLogoPath = document.documentElement.style.getPropertyValue("--navbar-logo-path") || "/logo.svg";
+ const defaultLogoPath =
+ document.documentElement.style.getPropertyValue("--navbar-logo-path") ||
+ "/logo.svg";
React.useEffect(() => {
props.subscribe("FF_AUTH", (msg, data) => {
setInstance(data);
});
props.subscribe("FF_PUBLIC", () => {
- if(MULTITENANCY_ENABLED){
- setApplicationTitle(APPLICATION_NAME)
- setTenantLogo(defaultLogoPath)
+ if (MULTITENANCY_ENABLED) {
+ setApplicationTitle(APPLICATION_NAME);
+ setTenantLogo(defaultLogoPath);
}
});
@@ -84,8 +86,7 @@ const NavBar = React.memo(({ props }) => {
const isAuthenticated = instance?.isAuthenticated();
const { pathname } = location;
const [userDetail, setUserDetail] = React.useState({});
-
- const [lang, setLang] = React.useState(userDetail?.locale);
+ const [lang, setLang] = React.useState(userDetail?.locale);
const userRoles = JSON.parse(
StorageService.get(StorageService.User.USER_ROLE)
);
@@ -102,9 +103,7 @@ const NavBar = React.memo(({ props }) => {
const [loginUrl, setLoginUrl] = useState(baseUrl);
- const logoPath = MULTITENANCY_ENABLED
- ? tenantLogo
- : defaultLogoPath;
+ const logoPath = MULTITENANCY_ENABLED ? tenantLogo : defaultLogoPath;
const getAppName = useMemo(
() => () => {
if (!MULTITENANCY_ENABLED) {
@@ -137,6 +136,8 @@ const NavBar = React.memo(({ props }) => {
localStorage.setItem("lang", language);
}, [lang]);
+
+
React.useEffect(() => {
setUserDetail(
JSON.parse(StorageService.get(StorageService.User.USER_DETAILS))
@@ -162,57 +163,55 @@ const NavBar = React.memo(({ props }) => {
return (
+
+
@@ -132,7 +134,9 @@ const Admin = React.memo(({ props }: any) => {
/>
+
+ {appName}