From 479c3bbd93fe452bcc5e6d0c8bf7d6646bb85725 Mon Sep 17 00:00:00 2001 From: Orhun Ucak Date: Wed, 29 Oct 2025 16:55:29 +0100 Subject: [PATCH 01/17] style: Update sidebar styles for consistency Signed-off-by: Orhun Ucak --- docs-gen/assets/scss/common/_custom.scss | 65 ++++++++----------- .../approach-overview/actively-developed.md | 1 - .../docs/approach-overview/automated.md | 1 - .../approach-overview/optional-extensions.md | 1 - docs-gen/layouts/_default/baseof.html | 17 +++++ 5 files changed, 45 insertions(+), 40 deletions(-) create mode 100644 docs-gen/layouts/_default/baseof.html diff --git a/docs-gen/assets/scss/common/_custom.scss b/docs-gen/assets/scss/common/_custom.scss index a3472965..e8a549c2 100644 --- a/docs-gen/assets/scss/common/_custom.scss +++ b/docs-gen/assets/scss/common/_custom.scss @@ -1,55 +1,46 @@ // Put your custom SCSS code here -/* Custom CSS fixes for sidebar layout */ +/* DEBUG: Visualize sidebar boundaries */ .docs-sidebar { - padding-left: 1rem !important; - padding-right: 1rem !important; + background-color: rgba(255, 0, 0, 0.05) !important; + outline: 2px solid red !important; } -.docs-sidebar .section-nav { - width: 100% !important; - padding-left: 0 !important; +.docs-links { + background-color: rgba(0, 255, 0, 0.05) !important; + outline: 2px solid green !important; } -.docs-sidebar .list-unstyled { - margin-left: 0 !important; - padding-left: 0 !important; +.section-nav { + background-color: rgba(0, 0, 255, 0.05) !important; + outline: 2px solid blue !important; } -.docs-sidebar .list-unstyled li { - margin-left: 0 !important; - padding-left: 0 !important; +.section-nav ul { + background-color: rgba(255, 255, 0, 0.05) !important; + outline: 2px solid yellow !important; } -.docs-sidebar .list-unstyled li a { - display: block; - padding: 0.375rem 0.75rem; - text-decoration: none; - border-radius: 0.25rem; -} - -/* Nested navigation styling */ -.docs-sidebar .list-nested { - margin-top: 0.5rem !important; - margin-bottom: 1rem !important; - padding-left: 1rem !important; -} - -.docs-sidebar .list-nested li a { - padding: 0.25rem 0.5rem; - font-size: 0.9rem; - color: #6c757d; +/* Fix sidebar width consistency across page types */ +@include media-breakpoint-up(xl) { + .docs-sidebar { + /* Override theme's flex: 0 1 320px which allows shrinking */ + /* Use Bootstrap's col-xl-3 width (25%) consistently */ + flex: 0 0 25% !important; + max-width: 25% !important; + } } -.docs-sidebar .list-nested li.active a { - background-color: #e9ecef; - color: #495057; - font-weight: 600; +/* Fix vertical alignment - normalize content padding across page types */ +.content { + padding-top: 1rem !important; } -.docs-sidebar .list-nested li a:hover { - background-color: #f8f9fa; - color: #495057; +/* Keep the same bottom padding for both */ +.list.section .content, +.single.section .content { + padding-top: 1rem !important; + padding-bottom: 3rem !important; } .list.section.showcase { diff --git a/docs-gen/content/docs/approach-overview/actively-developed.md b/docs-gen/content/docs/approach-overview/actively-developed.md index c28f9913..bea7987a 100644 --- a/docs-gen/content/docs/approach-overview/actively-developed.md +++ b/docs-gen/content/docs/approach-overview/actively-developed.md @@ -1,7 +1,6 @@ --- title: Actively Developed (SME) weight: 10 -chapter: false --- {{< img src="images/actively_developed.png" alt="Frame 1: Actively Developed" >}} diff --git a/docs-gen/content/docs/approach-overview/automated.md b/docs-gen/content/docs/approach-overview/automated.md index 752f4693..74531983 100644 --- a/docs-gen/content/docs/approach-overview/automated.md +++ b/docs-gen/content/docs/approach-overview/automated.md @@ -1,7 +1,6 @@ --- title: Automated (CI Tooling) weight: 20 -chapter: false --- {{< img src="images/automated.png" alt="Frame 2: Automated" >}} diff --git a/docs-gen/content/docs/approach-overview/optional-extensions.md b/docs-gen/content/docs/approach-overview/optional-extensions.md index 3addd7a6..0fa8dac5 100644 --- a/docs-gen/content/docs/approach-overview/optional-extensions.md +++ b/docs-gen/content/docs/approach-overview/optional-extensions.md @@ -1,7 +1,6 @@ --- title: Optional Extensions (Modelers) weight: 60 -chapter: false --- {{< img src="images/optional_extensions.png" alt="Frame 3: Optional Extensions" >}} diff --git a/docs-gen/layouts/_default/baseof.html b/docs-gen/layouts/_default/baseof.html new file mode 100644 index 00000000..b9ff56f8 --- /dev/null +++ b/docs-gen/layouts/_default/baseof.html @@ -0,0 +1,17 @@ + + + {{ partial "head/head" . }} + {{ partial "head/body-class" . }} + + {{ partial "header/header" . }} +
+
+ {{- /* Remove the extra container wrapper that causes layout issues */ -}} + {{ block "main" . }}{{ end }} +
+
+ {{ if site.Params.doks.toTopButton -}} + {{ partial "footer/to-top" . }} + {{ end }} + + From a04259ae47bf78d3bba7028dcc7d09fdd39b6054 Mon Sep 17 00:00:00 2001 From: Orhun Ucak Date: Fri, 7 Nov 2025 14:43:11 +0100 Subject: [PATCH 02/17] refactor: Update sidebar rendering and adjust weight values for navigation buttons Signed-off-by: Orhun Ucak --- docs-gen/assets/scss/common/_custom.scss | 21 ------------------- docs-gen/config/_default/hugo.toml | 5 +++++ docs-gen/content/docs/_index.md | 2 +- .../approach-overview/actively-developed.md | 2 +- .../docs/approach-overview/automated.md | 2 +- .../approach-overview/optional-extensions.md | 2 +- .../docs/data-modeling-guideline/_index.md | 2 +- .../docs/data-modeling-guideline/how-to.md | 2 +- .../pre-defined-elements.md | 2 +- docs-gen/content/docs/tools/_index.md | 2 +- docs-gen/content/docs/tools/automation.md | 2 +- docs-gen/content/docs/tools/cli.md | 2 +- docs-gen/content/docs/tools/units-cli.md | 2 +- .../partials/sidebar/section-menu.html | 4 ++-- 14 files changed, 18 insertions(+), 34 deletions(-) diff --git a/docs-gen/assets/scss/common/_custom.scss b/docs-gen/assets/scss/common/_custom.scss index e8a549c2..3f4566c1 100644 --- a/docs-gen/assets/scss/common/_custom.scss +++ b/docs-gen/assets/scss/common/_custom.scss @@ -1,26 +1,5 @@ // Put your custom SCSS code here -/* DEBUG: Visualize sidebar boundaries */ -.docs-sidebar { - background-color: rgba(255, 0, 0, 0.05) !important; - outline: 2px solid red !important; -} - -.docs-links { - background-color: rgba(0, 255, 0, 0.05) !important; - outline: 2px solid green !important; -} - -.section-nav { - background-color: rgba(0, 0, 255, 0.05) !important; - outline: 2px solid blue !important; -} - -.section-nav ul { - background-color: rgba(255, 255, 0, 0.05) !important; - outline: 2px solid yellow !important; -} - /* Fix sidebar width consistency across page types */ @include media-breakpoint-up(xl) { .docs-sidebar { diff --git a/docs-gen/config/_default/hugo.toml b/docs-gen/config/_default/hugo.toml index bfa4c01e..67a51159 100644 --- a/docs-gen/config/_default/hugo.toml +++ b/docs-gen/config/_default/hugo.toml @@ -11,6 +11,11 @@ enableEmoji = true enableGitInfo = false enableRobotsTXT = true languageCode = "en-us" + +[page] + nextPrevSortOrder = "asc" + nextPrevInSectionSortOrder = "asc" + [pagination] pagerSize = 10 rssLimit = 10 diff --git a/docs-gen/content/docs/_index.md b/docs-gen/content/docs/_index.md index eb5078e0..2528d0ab 100644 --- a/docs-gen/content/docs/_index.md +++ b/docs-gen/content/docs/_index.md @@ -1,7 +1,7 @@ --- title: Documentation description: Complete documentation for the Simplified Semantic Data Modeling (S2DM) approach -weight: 30 +weight: 1 --- # S2DM Documentation diff --git a/docs-gen/content/docs/approach-overview/actively-developed.md b/docs-gen/content/docs/approach-overview/actively-developed.md index bea7987a..4415f083 100644 --- a/docs-gen/content/docs/approach-overview/actively-developed.md +++ b/docs-gen/content/docs/approach-overview/actively-developed.md @@ -1,6 +1,6 @@ --- title: Actively Developed (SME) -weight: 10 +weight: 20 --- {{< img src="images/actively_developed.png" alt="Frame 1: Actively Developed" >}} diff --git a/docs-gen/content/docs/approach-overview/automated.md b/docs-gen/content/docs/approach-overview/automated.md index 74531983..80a57448 100644 --- a/docs-gen/content/docs/approach-overview/automated.md +++ b/docs-gen/content/docs/approach-overview/automated.md @@ -1,6 +1,6 @@ --- title: Automated (CI Tooling) -weight: 20 +weight: 30 --- {{< img src="images/automated.png" alt="Frame 2: Automated" >}} diff --git a/docs-gen/content/docs/approach-overview/optional-extensions.md b/docs-gen/content/docs/approach-overview/optional-extensions.md index 0fa8dac5..22195ada 100644 --- a/docs-gen/content/docs/approach-overview/optional-extensions.md +++ b/docs-gen/content/docs/approach-overview/optional-extensions.md @@ -1,6 +1,6 @@ --- title: Optional Extensions (Modelers) -weight: 60 +weight: 40 --- {{< img src="images/optional_extensions.png" alt="Frame 3: Optional Extensions" >}} diff --git a/docs-gen/content/docs/data-modeling-guideline/_index.md b/docs-gen/content/docs/data-modeling-guideline/_index.md index 17e1559a..119f3458 100644 --- a/docs-gen/content/docs/data-modeling-guideline/_index.md +++ b/docs-gen/content/docs/data-modeling-guideline/_index.md @@ -1,5 +1,5 @@ --- title: Data modeling guideline -weight: 20 +weight: 50 --- Under construction... diff --git a/docs-gen/content/docs/data-modeling-guideline/how-to.md b/docs-gen/content/docs/data-modeling-guideline/how-to.md index 595f77d5..d5ae4083 100644 --- a/docs-gen/content/docs/data-modeling-guideline/how-to.md +++ b/docs-gen/content/docs/data-modeling-guideline/how-to.md @@ -1,6 +1,6 @@ --- title: How to...? -weight: 20 +weight: 60 chapter: false --- diff --git a/docs-gen/content/docs/data-modeling-guideline/pre-defined-elements.md b/docs-gen/content/docs/data-modeling-guideline/pre-defined-elements.md index 60f72ad3..9c5adcae 100644 --- a/docs-gen/content/docs/data-modeling-guideline/pre-defined-elements.md +++ b/docs-gen/content/docs/data-modeling-guideline/pre-defined-elements.md @@ -1,6 +1,6 @@ --- title: Pre-defined elements -weight: 10 +weight: 70 chapter: false --- diff --git a/docs-gen/content/docs/tools/_index.md b/docs-gen/content/docs/tools/_index.md index f895cbc8..d65f8223 100644 --- a/docs-gen/content/docs/tools/_index.md +++ b/docs-gen/content/docs/tools/_index.md @@ -1,6 +1,6 @@ --- title: Tools -weight: 30 +weight: 80 --- Under construction... diff --git a/docs-gen/content/docs/tools/automation.md b/docs-gen/content/docs/tools/automation.md index f01a47e2..dbd1eae9 100644 --- a/docs-gen/content/docs/tools/automation.md +++ b/docs-gen/content/docs/tools/automation.md @@ -1,6 +1,6 @@ --- title: Automation -weight: 2 +weight: 90 chapter: false --- Under construction... diff --git a/docs-gen/content/docs/tools/cli.md b/docs-gen/content/docs/tools/cli.md index 4a1bb4e7..fd65a630 100644 --- a/docs-gen/content/docs/tools/cli.md +++ b/docs-gen/content/docs/tools/cli.md @@ -1,6 +1,6 @@ --- title: Command Line Interface (CLI) -weight: 1 +weight: 100 chapter: false --- diff --git a/docs-gen/content/docs/tools/units-cli.md b/docs-gen/content/docs/tools/units-cli.md index 5978f562..9396eec9 100644 --- a/docs-gen/content/docs/tools/units-cli.md +++ b/docs-gen/content/docs/tools/units-cli.md @@ -1,6 +1,6 @@ --- title: Units CLI -weight: 20 +weight: 110 chapter: false --- diff --git a/docs-gen/layouts/partials/sidebar/section-menu.html b/docs-gen/layouts/partials/sidebar/section-menu.html index 669f1918..a56f49e3 100644 --- a/docs-gen/layouts/partials/sidebar/section-menu.html +++ b/docs-gen/layouts/partials/sidebar/section-menu.html @@ -15,7 +15,7 @@ {{ if $section }}
  • {{ $section.Title }} - {{ with $section.RegularPages }} + {{ with $section.RegularPages.ByWeight }}