Merge branch 'main' into victor/25011-upload-profiles-with-secrets

fleetdm · Dec 26, 2024 · a33e03f · a33e03f
2 parents 4e298ac + e94aa2d
commit a33e03f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/frontend/components/StatusIndicatorWithIcon/_styles.scss b/frontend/components/StatusIndicatorWithIcon/_styles.scss
@@ -8,6 +8,10 @@
     .icon {
       margin-right: $pad-xsmall;
     }
+
+    span {
+      white-space: nowrap;
+    }
   }
 
   // overrides for different layout

diff --git a/frontend/pages/ManageControlsPage/OSSettings/_styles.scss b/frontend/pages/ManageControlsPage/OSSettings/_styles.scss
@@ -15,12 +15,16 @@
     }
   }
 
-  .side-nav__card-container > .custom-settings {
-    max-width: none;
-  }
-  @media (max-width: 1120px) {
-    .side-nav__nav-list {
-      padding-right: 0;
+  .side-nav__card-container {
+    overflow-x: hidden;
+
+    > .custom-settings {
+      max-width: none;
+    }
+    @media (max-width: 1120px) {
+      .side-nav__nav-list {
+        padding-right: 0;
+      }
     }
   }
 }
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/_styles.scss b/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/_styles.scss
@@ -19,4 +19,13 @@
     font-size: inherit;
     color: inherit;
   }
+
+  .data-table {
+    &__wrapper {
+      // Keeps table data within the table container at smaller screen sizes
+      overflow-x: auto;
+      // Prevent border from causing .side-nav__card-container horizontal scroll
+      box-sizing: border-box;
+    }
+  }
 }
diff --git a/...eControlsPage/OSSettings/cards/DiskEncryption/components/DiskEncryptionTable/_styles.scss b/...eControlsPage/OSSettings/cards/DiskEncryption/components/DiskEncryptionTable/_styles.scss
@@ -12,6 +12,13 @@
   .linkToFilteredHosts__header {
     width: auto;
     max-width: 120px;
+    padding-left: 0 !important; // Removes 24px of unnecessary table scroll
+  }
+
+  .linkToFilteredHosts__cell {
+    width: auto;
+    max-width: 120px;
+    padding-left: 0 !important; // Removes 24px of unnecessary table scroll
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,10 @@ @@
         .icon {
           margin-right: $pad-xsmall;
         }
+        span {
+          white-space: nowrap;
+        }
       }
       // overrides for different layout
@@ Expand Down @@