From 8090149a64e7e7a7b1bbedab639a8a0ddc733383 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 18 Dec 2024 09:41:09 -0800 Subject: [PATCH 1/7] Summary bars for docs --- assets/css/styles.css | 2 + assets/css/summary-bar.css | 26 +++++++++ .../configure-admin-console.md | 9 +++ layouts/shortcodes/summary-bar.html | 55 +++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 assets/css/summary-bar.css create mode 100644 layouts/shortcodes/summary-bar.html diff --git a/assets/css/styles.css b/assets/css/styles.css index b0861321544..0dc7715aa2e 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -14,3 +14,5 @@ @import "/assets/css/syntax-light"; @import "/assets/css/syntax-dark"; @import "/assets/css/icons"; + +@import "/assets/css/summary-bar"; diff --git a/assets/css/summary-bar.css b/assets/css/summary-bar.css new file mode 100644 index 00000000000..458680a5db5 --- /dev/null +++ b/assets/css/summary-bar.css @@ -0,0 +1,26 @@ +.summary-bar { + display: flex; + gap: 1rem; + padding: 1rem; + background-color: theme("colors.blue.light.500"); + border: 1px solid theme("colors.blue.light.500"); + border-radius: 5px; + margin-bottom: 1rem; + align-items: center; +} + +.summary-icon { + display: flex; + align-items: center; + gap: 0.5rem; +} + +.summary-icon .material-symbols-outlined { + font-size: 24px; + color: theme("colors.white"); +} + +.summary-label { + font-size: 14px; + color: theme("colors.white"); +} diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md index 11a6f052970..fdf8096663e 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md @@ -11,6 +11,15 @@ params: text: EA --- +{{< summary-bar + subscription="domain" + subscriptionText="Business" + lifecycle="rocket_launch" + lifecycleText="EA" + admin="admin_panel_settings" + adminText="Admin" +>}} + {{% restricted title="Early Access" %}} Settings Management in the Docker Admin Console is an [early access](/release-lifecycle#early-access-ea) feature and is available to Docker Business customers only. {{% /restricted %}} diff --git a/layouts/shortcodes/summary-bar.html b/layouts/shortcodes/summary-bar.html new file mode 100644 index 00000000000..33b8498755e --- /dev/null +++ b/layouts/shortcodes/summary-bar.html @@ -0,0 +1,55 @@ + + +{{ $styles := resources.Get "css/summary-bar.css" | resources.Minify }} + + + +
+ Available for: + {{ if .Get "subscription" }} +
+ {{ .Get "subscription" }} + {{ .Get "subscriptionText" }} +
+ {{ end }} + {{ if .Get "lifecycle" }} +
+ {{ .Get "lifecycle" }} + {{ .Get "lifecycleText" }} +
+ {{ end }} + {{ if .Get "version" }} +
+ {{ .Get "version" }} + {{ .Get "versionText" }} +
+ {{ end }} + {{ if .Get "admin" }} +
+ {{ .Get "admin" }} + {{ .Get "adminText" }} +
+ {{ end }} +
\ No newline at end of file From d898e3ce20723739890129f23b1fbde568d73883 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 18 Dec 2024 11:39:33 -0800 Subject: [PATCH 2/7] Remove .css files to move styling inline --- assets/css/styles.css | 2 -- assets/css/summary-bar.css | 26 -------------------------- 2 files changed, 28 deletions(-) delete mode 100644 assets/css/summary-bar.css diff --git a/assets/css/styles.css b/assets/css/styles.css index 0dc7715aa2e..b0861321544 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -14,5 +14,3 @@ @import "/assets/css/syntax-light"; @import "/assets/css/syntax-dark"; @import "/assets/css/icons"; - -@import "/assets/css/summary-bar"; diff --git a/assets/css/summary-bar.css b/assets/css/summary-bar.css deleted file mode 100644 index 458680a5db5..00000000000 --- a/assets/css/summary-bar.css +++ /dev/null @@ -1,26 +0,0 @@ -.summary-bar { - display: flex; - gap: 1rem; - padding: 1rem; - background-color: theme("colors.blue.light.500"); - border: 1px solid theme("colors.blue.light.500"); - border-radius: 5px; - margin-bottom: 1rem; - align-items: center; -} - -.summary-icon { - display: flex; - align-items: center; - gap: 0.5rem; -} - -.summary-icon .material-symbols-outlined { - font-size: 24px; - color: theme("colors.white"); -} - -.summary-label { - font-size: 14px; - color: theme("colors.white"); -} From 074572476e441f5db900da06b12ac71a683deaef Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 18 Dec 2024 11:58:35 -0800 Subject: [PATCH 3/7] First pass inline styles --- layouts/shortcodes/summary-bar.html | 40 +++++++++++++++++------------ 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/layouts/shortcodes/summary-bar.html b/layouts/shortcodes/summary-bar.html index 33b8498755e..1f17aa555db 100644 --- a/layouts/shortcodes/summary-bar.html +++ b/layouts/shortcodes/summary-bar.html @@ -22,34 +22,40 @@ - Label: Admin | Icon: admin_panel_settings --> -{{ $styles := resources.Get "css/summary-bar.css" | resources.Minify }} - - + -
- Available for: +
+ Available for: {{ if .Get "subscription" }} -
- {{ .Get "subscription" }} - {{ .Get "subscriptionText" }} +
+ + {{ .Get "subscription" }} + + {{ .Get "subscriptionText" }}
{{ end }} {{ if .Get "lifecycle" }} -
- {{ .Get "lifecycle" }} - {{ .Get "lifecycleText" }} +
+ + {{ .Get "lifecycle" }} + + {{ .Get "lifecycleText" }}
{{ end }} {{ if .Get "version" }} -
- {{ .Get "version" }} - {{ .Get "versionText" }} +
+ + {{ .Get "version" }} + + {{ .Get "versionText" }}
{{ end }} {{ if .Get "admin" }} -
- {{ .Get "admin" }} - {{ .Get "adminText" }} +
+ + {{ .Get "admin" }} + + {{ .Get "adminText" }}
{{ end }}
\ No newline at end of file From cb05ad483bbf46c79f41be8c5eb6d2a72a5d0ae5 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 18 Dec 2024 12:04:46 -0800 Subject: [PATCH 4/7] Remove EA callout --- .../settings-management/configure-admin-console.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md index fdf8096663e..5179c93592a 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md @@ -20,10 +20,6 @@ params: adminText="Admin" >}} -{{% restricted title="Early Access" %}} -Settings Management in the Docker Admin Console is an [early access](/release-lifecycle#early-access-ea) feature and is available to Docker Business customers only. -{{% /restricted %}} - This page contains information for administrators on how to configure Settings Management with the Docker Admin Console. You can specify and lock configuration parameters to create a standardized Docker Desktop environment across your Docker company or organization. ## Prerequisites From d189bdbaaa9f2509108c79c8eea47ec078023e7b Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 18 Dec 2024 12:08:27 -0800 Subject: [PATCH 5/7] Remove bold --- layouts/shortcodes/summary-bar.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/layouts/shortcodes/summary-bar.html b/layouts/shortcodes/summary-bar.html index 1f17aa555db..494c32042c8 100644 --- a/layouts/shortcodes/summary-bar.html +++ b/layouts/shortcodes/summary-bar.html @@ -28,34 +28,34 @@ Available for: {{ if .Get "subscription" }}
- + {{ .Get "subscription" }} - {{ .Get "subscriptionText" }} + {{ .Get "subscriptionText" }}
{{ end }} {{ if .Get "lifecycle" }}
- + {{ .Get "lifecycle" }} - {{ .Get "lifecycleText" }} + {{ .Get "lifecycleText" }}
{{ end }} {{ if .Get "version" }}
- + {{ .Get "version" }} - {{ .Get "versionText" }} + {{ .Get "versionText" }}
{{ end }} {{ if .Get "admin" }}
- + {{ .Get "admin" }} - {{ .Get "adminText" }} + {{ .Get "adminText" }}
{{ end }}
\ No newline at end of file From 760983b6fda970277ca097a61dce02250bab8213 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 18 Dec 2024 12:10:23 -0800 Subject: [PATCH 6/7] Remove bold --- layouts/shortcodes/summary-bar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/shortcodes/summary-bar.html b/layouts/shortcodes/summary-bar.html index 494c32042c8..6b0b4ba0e6f 100644 --- a/layouts/shortcodes/summary-bar.html +++ b/layouts/shortcodes/summary-bar.html @@ -25,7 +25,7 @@
- Available for: + Available for: {{ if .Get "subscription" }}
From 51c70d6fabcf3a5751419e70a212bcf12f0447a0 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 18 Dec 2024 14:05:43 -0800 Subject: [PATCH 7/7] Remove border radius --- layouts/shortcodes/summary-bar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/shortcodes/summary-bar.html b/layouts/shortcodes/summary-bar.html index 6b0b4ba0e6f..ddeed0d19aa 100644 --- a/layouts/shortcodes/summary-bar.html +++ b/layouts/shortcodes/summary-bar.html @@ -24,7 +24,7 @@ -
+
Available for: {{ if .Get "subscription" }}