Merge branch 'main' into docs-v4.58.0

fleetdm · Oct 7, 2024 · 8df9c16 · 8df9c16
2 parents 1feb70f + 25c5e0c
commit 8df9c16
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 17 deletions.
diff --git a/docs/Configuration/yaml-files.md b/docs/Configuration/yaml-files.md
@@ -253,7 +253,7 @@ controls:
         labels_include_all:
           - Label 2
   windows_settings:
-    custom_settings
+    custom_settings:
       - path: ../lib/windows-profile.xml
   macos_setup: # Available in Fleet Premium
     bootstrap_package: https://example.org/bootstrap_package.pkg

diff --git a/website/assets/styles/bootstrap-overrides.less b/website/assets/styles/bootstrap-overrides.less
@@ -28,7 +28,7 @@ img {
 h1, h2, h3, h4, h5, h6 {
   font-family: @header-font;
 }
-h1, h2, h3, h4, h5 {
+h1, h2, h3, h4, h5, h6 {
   font-weight: 800;
   color: @core-fleet-black;
 }

diff --git a/website/assets/styles/pages/docs/basic-documentation.less b/website/assets/styles/pages/docs/basic-documentation.less
@@ -1,26 +1,34 @@
 #basic-documentation {
 
   h1 {
-    font-size: 28px;
-    line-height: 34px;
+    font-size: 30px;
   }
 
   h2 {
-    font-size: 24px;
-    line-height: 28px;
+    font-size: 28px;
   }
 
   h3 {
-    font-size: 20px;
-    line-height: 24px;
+    font-size: 24px;
   }
 
   h4 {
-    margin-top: 24px;
+    font-size: 20px;
+  }
+
+  h5 {
     font-size: 18px;
-    line-height: 24px;
   }
 
+  h6 {
+    font-size: 16px;
+  }
+
+  h1, h2, h3, h4, h5, h6 {
+    line-height: 1.2;
+  }
+
+
 
   a:not(.btn) {
     color: @core-vibrant-blue;
@@ -532,25 +540,33 @@
 
       h3 {
         padding-bottom: 16px;
-        margin-top: 24px;
-        margin-bottom: 40px;
-        border-bottom: 1px dashed @core-fleet-black-25;
+        margin-top: 40px;
         scroll-margin-top: 104px;
       }
 
       h4 {
         padding-bottom: 24px;
+        margin-top: 24px;
         margin-bottom: 0px;
         scroll-margin-top: 104px;
       }
 
       h5 {
-        font-size: 16px;
         font-weight: 700;
         font-family: @main-font;
-        margin-bottom: 16px;
+        margin-top: 16px;
+        margin-bottom: 24px;
+        scroll-margin-top: 104px;
+      }
+
+      h6 {
+        font-weight: 700;
+        font-family: @main-font;
+        margin-top: 16px;
+        margin-bottom: 24px;
         scroll-margin-top: 104px;
       }
+
       pre + hr + h3 {
         padding-top: 0px;
       }
@@ -750,7 +766,7 @@
         border-collapse: collapse;
         font-size: 16px;
         line-height: 24px;
-        margin-bottom: 16px;
+        margin-bottom: 0;
         word-wrap: break-word;
 
         th {
@@ -767,6 +783,11 @@
           padding: 8px 7px 7px 8px;
         }
       }
+
+      .table-responsive {
+        margin-bottom: 32px;
+      }
+
       .note {
         background-color: @core-vibrant-blue-10;
         border-radius: 12px;

diff --git a/website/views/pages/homepage.ejs b/website/views/pages/homepage.ejs
@@ -42,7 +42,7 @@
           <strong>Debunk the cross-platform myth</strong>
           <p>Fleet exposes familiar concepts like custom attributes and dynamic grouping, but in a way that lets you work directly with data and events from each native operating system.</p>
           <strong>Less friction</strong>
-          <p>Fork the CIS benchmarks or easily build your own compliance framework. 100% source available.</p>
+          <p>Automatically manage updates and patches for apps on macOS, Windows, and Linux computers.</p>
           <div>
             <a purpose="category-button" class="text-nowrap btn btn-primary" href="/device-management">Start with device management</a>
           </div>