cleanup

AOT-Technologies · Nov 6, 2023 · 79d868e · 79d868e
1 parent 6f50f25
commit 79d868e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 39 deletions.
diff --git a/forms-flow-nav/src/Navbar.css b/forms-flow-nav/src/Navbar.css
@@ -5,12 +5,12 @@
 .nav-menu-item{
   font-size: var(--navbar-items-font-size);
   font-weight: var(--navbar-items-font-weight);
-  transition: 0.2s ease-in-out;
+  /* transition: 0.2s ease-in-out; */
   position: relative;
 }
 
 .nav-menu-item.active {
-  font-size: 18px !important;
+  /* font-size: 18px !important; */
   border-bottom: 3px solid var(--color-primary) !important;
   color: var(--color-primary) !important;
   font-weight: calc(var(--navbar-items-font-weight) + 100) !important;
@@ -19,7 +19,7 @@
 
 
 .custom-app-name {
-  font-size: 30px;
+  font-size: 24px;
   font-weight: 700;
   color: var(--navbar-app-name);
   margin-left: var(--appname-margin-left);

diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx
@@ -170,8 +170,8 @@ const NavBar = React.memo(({ props }) => {
     <BrowserRouter>
       <header className="navbar-background shadow">
         <Container>
-          <Navbar collapseOnSelect expand="lg" className={`navbar-background p-0 ${!isAuthenticated ? 'justify-content-between':''}`}>
-            <Navbar.Brand href={`${baseUrl}`} className="d-flex col-3">
+          <Navbar  collapseOnSelect expand="lg" className={`navbar-background p-0 m-0 ${!isAuthenticated ? 'justify-content-between':''}`}>
+            <Navbar.Brand href={`${baseUrl}`} className="d-flex mr-4">
               <img
                 className="custom-logo"
                 src={logoPath}

diff --git a/forms-flow-theme/src/baseStyle.scss b/forms-flow-theme/src/baseStyle.scss
@@ -3,7 +3,7 @@
 body {
     font-size: 16px;
     font-family: Nunito Sans, SemiBold;
-    overflow: hidden;
+    overflow: hidden; 
   }
 
   .main-container{
@@ -12,6 +12,6 @@ body {
     background-color: var(--color-main-bg);
   }
 
-  .min-hightcontainer{
+  .min-container-height{
     min-height: calc(100vh - 164px);
   }
diff --git a/forms-flow-theme/src/bootstrapOverride.scss b/forms-flow-theme/src/bootstrapOverride.scss
@@ -8,11 +8,9 @@
 }
 
 .table th {
-  padding: 8px 20px;
   vertical-align: inherit !important;
 }
 
 .table td {
-  padding: 8px 20px;
   vertical-align: inherit !important;
 }
diff --git a/forms-flow-theme/src/components/custom-table.scss b/forms-flow-theme/src/components/custom-table.scss
@@ -16,12 +16,8 @@
     }
 
     th {
-      padding-top: 12px;
-      padding-bottom: 12px;
       text-align: left;
       background-color: #f0f6fb;
-      padding-left: 8px; // Adjust the padding to your liking
-      padding-right: 8px; // Adjust the padding to your liking
       margin: 0;
       border: none;
     }

diff --git a/forms-flow-theme/src/global.scss b/forms-flow-theme/src/global.scss
@@ -1,6 +1,8 @@
 @import "./utils/cursor.scss";
 @import "./utils/overflow.scss";
 @import "./bootstrapOverride.scss";
+@import "./baseStyle.scss";
+@import "./components/custom-table.scss";
 
 :root {
   --color-primary: #0072ed;
@@ -33,7 +35,7 @@
   --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;
@@ -52,6 +54,8 @@
   --navbar-logo-path: var(--logo-path);
 }
 
+
+
 .overflow-x-auto {
   overflow-x: auto;
   overflow-y: hidden;
@@ -100,20 +104,8 @@ h4 {
 }
 
 
-body {
-  font-size: 16px;
-  font-family: Nunito Sans, SemiBold;
-  overflow: hidden;
-}
-
-.main-container{
-  max-height: calc(100vh - 59px);
-  overflow-y: auto;
-}
-
-.min-hightcontainer{
-  min-height: calc(100vh - 164px);
-}
+
+
 
 .loader-container {
   display: flex;
@@ -321,8 +313,7 @@ i.fa.fa-question-circle.text-muted {
   max-width: 104px;
 }
 
-.main-header {
-  margin-left: 15px !important;
+.main-header { 
   display: flex;
   margin-top: 10px;
   margin-bottom: 25px;
@@ -654,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 {
@@ -707,13 +698,7 @@ div.upload input[type="file"] {
   cursor: pointer !important;
 }
 
-@media (max-width: 768px) {
-  .main-header {
-    height: 70px;
-    flex-direction: row;
-    flex-wrap: wrap;
-  }
-}
+
 
 hr {
   border-top: 2px solid rgba(0,0,0,.1);