Master dev sync 040124 (#392)

* SW fixes * SW fixes * SM-3646: UI UX AUDIT * SM-3646: UI UX AUDIT * merge * resolving commit SM-3646 * resolving commit SM-3646 * Merge pull request #389 from egovernments/SM-3646-dev Sm 3646 dev --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>
egovernments · Jan 4, 2024 · 30e5b27 · 30e5b27
1 parent 1221d9d
commit 30e5b27
Show file tree

Hide file tree

Showing 25 changed files with 254 additions and 115 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -11,7 +11,7 @@
   <meta name="theme-color" content="#00bcd1" />
   <title>Sanitation</title>
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-beta.14/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-fsm-css@0.1.16/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-fsm-css@0.1.17/dist/index.css" />
 
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
   <script src="https://egov-dev-assets.s3.ap-south-1.amazonaws.com/globalConfigsFSMpg.js"></script>

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-fsm-css",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "license": "MIT",
   "main": "dist/index.css",
   "engines": {

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/src/components/DetailsCard.scss b/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/src/components/DetailsCard.scss
@@ -18,8 +18,7 @@
       }
       th:first-child {
         border: 0.5px solid #d6d5d4;
-        min-width: fit-content;
-        width: fit-content;
+        min-width: 6rem;
       }
       .underline {
         width: 370%;

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/src/components/Notification.scss b/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/src/components/Notification.scss
@@ -1,70 +1,132 @@
 .button-container {
-    display: flex;
-    justify-content: flex-end;
-    margin-right: 1rem;
-
+  display: flex;
+  justify-content: flex-end;
+  margin-right: 4rem;
 }
 
 .headerContainer {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .clear-all-link {
-    color: #F47738;
-    text-decoration: underline;
-    margin-left: auto;
-    margin-top: 10px;
-    cursor: pointer;
+  color: #f47738;
+  text-decoration: underline;
+  margin-left: auto;
+  margin-top: 10px;
+  cursor: pointer;
 }
 
 .bell-icon {
-    margin-top: 8px;
-    margin-right: 10px;
+  margin-top: 8px;
+  margin-right: 10px;
+}
+@media (max-width: 700px) {
+  .bell-icon {
+    margin-top: 4px;
+    margin-bottom: 8px;
+  }
 }
 
 .notificationContent {
-    display: flex;
-    justify-content: space-between;
+  display: flex;
+  justify-content: space-between;
+  p {
+    font-size: 0.875rem;
+  }
 }
 
 .WhatsNewCard {
-    margin-bottom: 15px;
-    padding-left: 1rem;
+  margin-bottom: 15px;
+  padding-left: 1rem;
 }
 
 .NotificationHeader {
-    display: flex;
-    justify-content: space-between;
-    font-size: x-large;
-    font-weight: 700;
+  display: flex;
+  justify-content: space-between;
+  font-size: 1rem;
+  margin-bottom: 0.25rem;
+  font-weight: 700;
 }
 
 .viewDetailsButton {
-    h2 {
-        color: #F47738;
-        padding: 5px 10px;
-        margin: 10px 20px;
-        overflow: inherit;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-    }
+  h2 {
+    color: #f47738;
+    padding: 5px 10px;
+    margin: 10px 20px;
+    overflow: inherit;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
 }
 
 .view-all-button {
-    color: #F47738;
-    text-decoration: underline;
-    margin-left: auto;
-    cursor: pointer;
+  color: #f47738;
+  text-decoration: underline;
+  margin-left: auto;
+  cursor: pointer;
 }
 
 .view-all-button-container {
-    text-align: right;
+  text-align: right;
 }
 
 .view-all-button:active {
-    border: none;
+  border: none;
+}
+.Container {
+  padding-left: 1.25rem;
+  padding-right: 0.5rem;
+  .no-results-found {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .text {
+      margin-top: 1.25rem;
+      font-size: 1rem;
+      line-height: 1.5rem;
+      color: #505a5f;
+    }
+  }
+}
+
+@media (max-width: 700px) {
+  .WhatsNewCard {
+    padding-left: 1rem;
+    padding-right: 1rem;
+  }
+  .WhatsNewCard p {
+    font-size: 0.875rem;
+  }
+  .Container {
+    padding-left: 0;
+    padding-right: 0;
+    margin: 1rem;
+    .headerContainer {
+      .h1 {
+        margin-left: 0;
+      }
+    }
+    .NotificationItem {
+      .Notification {
+        .WhatsNewCard {
+          .NotificationHeader {
+            font-size: 1rem;
+            font-weight: 700;
+            margin-bottom: 0.44rem;
+          }
+          .notificationContent {
+            flex-direction: column;
+            .button-container {
+              margin-right: 0;
+              display: block;
+              button {
+                width: 100%;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 }
-.Container{
-    padding-left: 1.25rem;
-}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/src/index.scss b/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/src/index.scss
@@ -302,6 +302,7 @@ input::-webkit-calendar-picker-indicator {
     bottom: 0rem;
     border-radius: 0;
     margin: 0;
+    z-index: 1000;
   }
 }
 
@@ -317,6 +318,8 @@ input::-webkit-calendar-picker-indicator {
 .employee-select-wrap {
   .options-card {
     top: 100%;
+    border-left-width: 0 !important;
+    border-right-width: 0 !important;
   }
 }
 .employee-select-wrap.fsm-registry-dropdown {
@@ -327,6 +330,7 @@ input::-webkit-calendar-picker-indicator {
 .inbox-search-links-container {
   .header {
     grid-template-columns: 12% 1fr;
+    grid-gap: 0.81rem;
   }
 }
 
@@ -337,4 +341,4 @@ input::-webkit-calendar-picker-indicator {
       bottom: 100%;
     }
   }
-}
+}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/src/pages/employee/inboxv2.scss b/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/src/pages/employee/inboxv2.scss
@@ -25,6 +25,9 @@
 }
 
 .inbox-search-wrapper {
+  .search-wrapper{
+    border-radius: 4px;
+  }
   .sections-parent.search {
     .searchBox {
       margin-bottom: 0;
@@ -70,4 +73,4 @@
   .server {
     overflow: auto;
   }
-}
+}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/src/pages/employee/index.scss b/frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/src/pages/employee/index.scss
@@ -557,6 +557,10 @@
       }
     }
   }
+  .sidebar-list:last-child{
+    position: fixed;
+    bottom: 0;
+  }
 }
 .sections-parent.inbox {
   .details-container {
@@ -615,3 +619,16 @@ video::-webkit-media-controls-play-button {
   align-items: center;
   margin-left: 10px;
 }
+.inbox-search-links-container {
+  border-radius: 4px;
+  .contents {
+    .link {
+      padding-left: 0;
+    }
+  }
+}
+.inbox-search-component-wrapper {
+  .search-component-table {
+    border-radius: 4px;
+  }
+}