From 278b81d7f5889d8a2ed2c1e05151f8a51b374df9 Mon Sep 17 00:00:00 2001
From: Allen Houchins <32207388+allenhouchins@users.noreply.github.com>
Date: Mon, 7 Oct 2024 10:48:34 -0700
Subject: [PATCH 1/3] Fixed minor typo in yaml-files.md (#22698)
# Checklist for submitter
If some of the following don't apply, delete the relevant line.
- [ ] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.
See [Changes
files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files)
for more information.
- [ ] Input data is properly validated, `SELECT *` is avoided, SQL
injection is prevented (using placeholders for values in statements)
- [ ] Added support on fleet's osquery simulator `cmd/osquery-perf` for
new osquery data ingestion features.
- [ ] Added/updated tests
- [ ] If paths of existing endpoints are modified without backwards
compatibility, checked the frontend/CLI for any necessary changes
- [ ] If database migrations are included, checked table schema to
confirm autoupdate
- For database migrations:
- [ ] Checked schema for all modified table for columns that will
auto-update timestamps during migration.
- [ ] Confirmed that updating the timestamps is acceptable, and will not
cause unwanted side effects.
- [ ] Ensured the correct collation is explicitly set for character
columns (`COLLATE utf8mb4_unicode_ci`).
- [ ] Manual QA for all new/changed functionality
- For Orbit and Fleet Desktop changes:
- [ ] Orbit runs on macOS, Linux and Windows. Check if the orbit
feature/bugfix should only apply to one platform (`runtime.GOOS`).
- [ ] Manual QA must be performed in the three main OSs, macOS, Windows
and Linux.
- [ ] Auto-update manual QA, from released version of component to new
version (see [tools/tuf/test](../tools/tuf/test/README.md)).
---
docs/Configuration/yaml-files.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/Configuration/yaml-files.md b/docs/Configuration/yaml-files.md
index fae1c212c192..6a9a93e352ad 100644
--- a/docs/Configuration/yaml-files.md
+++ b/docs/Configuration/yaml-files.md
@@ -251,7 +251,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
From f510946d80215ff1f5890326a011c7dd6227eb7f Mon Sep 17 00:00:00 2001
From: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com>
Date: Tue, 8 Oct 2024 04:10:38 +0900
Subject: [PATCH 2/3] Website "Less friction" text update (#22685)
Closes https://github.com/fleetdm/fleet/issues/21965
---
website/views/pages/homepage.ejs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/views/pages/homepage.ejs b/website/views/pages/homepage.ejs
index 7b113f4a1379..9f030b6f8781 100644
--- a/website/views/pages/homepage.ejs
+++ b/website/views/pages/homepage.ejs
@@ -42,7 +42,7 @@
Debunk the cross-platform myth
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.
Less friction
- Fork the CIS benchmarks or easily build your own compliance framework. 100% source available.
+ Automatically manage updates and patches for apps on macOS, Windows, and Linux computers.
From 25c5e0c7605f1b6743df1ac09f34ff1b0e7a8eed Mon Sep 17 00:00:00 2001
From: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com>
Date: Tue, 8 Oct 2024 04:38:32 +0900
Subject: [PATCH 3/3] Update basic-documentation.less (#22688)
- Fixed spaces and sizes of headings
- Table margin-bottom so scroll sits correctly on narrow widths
Closes https://github.com/fleetdm/confidential/issues/8071
---------
Co-authored-by: Eric
---
.../assets/styles/bootstrap-overrides.less | 2 +-
.../pages/docs/basic-documentation.less | 49 +++++++++++++------
2 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/website/assets/styles/bootstrap-overrides.less b/website/assets/styles/bootstrap-overrides.less
index 2cb92fbd3bb0..22637dec60ee 100644
--- 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
index bb15db3efded..0f9283105fa0 100644
--- 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;