Merge pull request #7330 from masudul-tikweb/master

fix navigation menu scroll

Author: renemadsen

eform-client/src/app/components/navigation/navigation.component.html

@@ -43,7 +43,7 @@
             <span style="">{{node.name}}</span>
           </a>
         </mat-expansion-panel-header>
-        <div style="overflow-x: auto;">
+        <div style="overflow-x: hidden;">
           <ng-container matTreeNodeOutlet></ng-container>
         </div>
       </mat-expansion-panel>

eform-client/src/app/components/navigation/navigation.component.scss

@@ -16,6 +16,14 @@ mat-tree {
       }
     }
 
+
+    &:hover{
+      border-radius: var(--rounded-full)!important;
+    }
+    &:focus{
+      border-radius: var(--rounded-full)!important;
+    }
+
     .selected-node {
       background-color: var(--mdc-theme-primary) !important;
       color: var(--mdc-theme-on-primary) !important;
@@ -60,6 +68,9 @@ mat-tree {
         }
       }
     }
+    .selected-node {
+      width: calc(100% - 20px)!important;
+    }
   }
 }
 

eform-client/src/scss/styles.scss

@@ -457,6 +457,15 @@ ngx-material-timepicker-container {
   cursor: pointer;
   color: var(--text-header)!important;
 
+  &:disabled,
+  &[disabled] {
+    background-color: var(--border) !important;
+    color: var(--tp-text) !important;
+    opacity: 0.5;
+    cursor: not-allowed !important;
+    pointer-events: none;
+  }
+
   &--icon-rounded-border{
     display: flex;
     padding: var(--3514-px, 14px);
@@ -492,6 +501,15 @@ ngx-material-timepicker-container {
   font-style: normal;
   //font-weight: 600;
   line-height: var(--Text-line-height-sm, 22px); /* 157.143% */
+
+  &:disabled,
+  &[disabled] {
+    background-color: var(--border) !important;
+    color: var(--tp-text) !important;
+    opacity: 0.5;
+    cursor: not-allowed !important;
+    pointer-events: none;
+  }
 }
 
 
@@ -514,4 +532,13 @@ ngx-material-timepicker-container {
   font-style: normal;
   //font-weight: 600;
   line-height: var(--Text-line-height-sm, 22px); /* 157.143% */
+
+  &:disabled,
+  &[disabled] {
+    background-color: var(--border) !important;
+    color: var(--tp-text) !important;
+    opacity: 0.5;
+    cursor: not-allowed !important;
+    pointer-events: none;
+  }
 }