From 8d8780c42716ea9321321f7ad8e4e0defd9966c9 Mon Sep 17 00:00:00 2001 From: LGUG2Z Date: Sun, 21 Dec 2025 19:21:50 -0800 Subject: [PATCH] fix(css): improve spacing consistency Fix visual spacing issues between type badges, references, and other inline elements in the generated documentation. CSS Changes: - Add `margin-left: 0.25rem` to `.badge`, `.type-badge`, and `.type-ref` - Add `:first-child` selectors to remove left margin on first elements - Ensures consistent spacing when multiple badges appear together Template Fixes: - Remove excess whitespace in Tera template conditionals - Fix spacing around optional badges and type badges in `render_type_badge` - Consolidate inline spacing in `render_schema` macro - Clean up wrapper type inner badge rendering whitespace --- src/prepare.rs | 23 +++++++++++++---------- src/templates/macros.html | 23 +++++++---------------- src/templates/style.css | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/prepare.rs b/src/prepare.rs index 50dfcd6b..6ec80d2a 100644 --- a/src/prepare.rs +++ b/src/prepare.rs @@ -84,10 +84,11 @@ fn detect_wrapper_types(value: &mut Value) { Value::Object(map) => { // Check for wrapper type pattern in anyOf if let Some(any_of) = map.get("anyOf").and_then(|v| v.as_array()) - && let Some(inner) = detect_wrapper_pattern(any_of) { - map.insert("_wrapper_type".to_string(), Value::Bool(true)); - map.insert("_wrapper_inner".to_string(), inner); - } + && let Some(inner) = detect_wrapper_pattern(any_of) + { + map.insert("_wrapper_type".to_string(), Value::Bool(true)); + map.insert("_wrapper_inner".to_string(), inner); + } // Recurse into all nested values for v in map.values_mut() { @@ -122,15 +123,17 @@ fn detect_wrapper_pattern(any_of: &[Value]) -> Option { // Try first as map variant, second as inner type if let Some(map_inner) = get_map_inner_type(first) - && types_are_equal(map_inner, second) { - return Some(second.clone()); - } + && types_are_equal(map_inner, second) + { + return Some(second.clone()); + } // Try second as map variant, first as inner type if let Some(map_inner) = get_map_inner_type(second) - && types_are_equal(map_inner, first) { - return Some(first.clone()); - } + && types_are_equal(map_inner, first) + { + return Some(first.clone()); + } None } diff --git a/src/templates/macros.html b/src/templates/macros.html index 4f0f5fc7..82a12cad 100644 --- a/src/templates/macros.html +++ b/src/templates/macros.html @@ -48,10 +48,7 @@ {%- set display = display_names[ref_name] | default(value=ref_name) -%} {%- set ref_def = schema["$defs"][ref_name] -%} {{ display }} - {%- if ref_def._wrapper_inner -%} - {# Show the inner type for wrapper types #} - {{ self::render_type_badge(node=ref_def._wrapper_inner) }} - {%- endif -%} + {%- if ref_def._wrapper_inner %} {{ self::render_type_badge(node=ref_def._wrapper_inner) }}{%- endif -%} {%- elif node.type -%} {%- if node.type is string -%} {%- if node.type == "array" and node.prefixItems -%} @@ -64,7 +61,7 @@ {%- endif -%} {%- endfor -%} {%- if is_homogeneous and first_type.type -%} - array {%- if first_type.type == "number" -%}float; {{ node.prefixItems | length }}{%- else -%}{{ first_type.type }}; {{ node.prefixItems | length }}{%- endif -%} + array {% if first_type.type == "number" %}float; {{ node.prefixItems | length }}{% else %}{{ first_type.type }}; {{ node.prefixItems | length }}{% endif %} {%- else -%} array tuple {%- endif -%} @@ -79,16 +76,11 @@ {%- if node.type | length == 2 and "null" in node.type -%} optional {%- for t in node.type -%} - {%- if t != "null" -%} - {%- if t == "array" and node.items -%} - array {{ self::render_type_badge(node=node.items) }} - {%- else -%} - {{ t }} - {%- endif -%} + {%- if t != "null" %} {% if t == "array" and node.items %}array {{ self::render_type_badge(node=node.items) }}{% else %}{{ t }}{% endif %} {%- endif -%} {%- endfor -%} {%- else -%} - {%- for t in node.type -%}{{ t }}{% endfor -%} + {%- for t in node.type %} {{ t }}{%- endfor -%} {%- endif -%} {%- endif -%} {%- elif node.anyOf -%} @@ -101,9 +93,9 @@ {%- set first = node.anyOf | first -%} {%- set second = node.anyOf | last -%} {%- if second.type and second.type == "null" -%} - optional{{ self::render_type_badge(node=first) }} + optional {{ self::render_type_badge(node=first) }} {%- elif first.type and first.type == "null" -%} - optional{{ self::render_type_badge(node=second) }} + optional {{ self::render_type_badge(node=second) }} {%- else -%} {# Check if all variants are string const (enum pattern) #} {%- set_global is_string_enum = true -%} @@ -352,8 +344,7 @@ {% macro render_schema(node, depth, path) %} {%- if depth < 10 -%}
- {{ self::render_type_badge(node=node) }} - {%- if node.description_html %}
{{ node.description_html | safe }}
{% endif -%} + {{ self::render_type_badge(node=node) }}{%- if node.description_html %}
{{ node.description_html | safe }}
{% endif -%} {{ self::render_constraints(node=node) }} {%- if node.default %}
Default: {{ node.default | json_encode() }}
{% endif -%} {{ self::render_schema_body(node=node, depth=depth, path=path) }} diff --git a/src/templates/style.css b/src/templates/style.css index 4b852da5..a1ddd01d 100644 --- a/src/templates/style.css +++ b/src/templates/style.css @@ -507,6 +507,11 @@ body { text-transform: uppercase; letter-spacing: 0.025em; border-radius: 3px; + margin-left: 0.25rem; +} + +.badge:first-child { + margin-left: 0; } .badge.required { @@ -555,6 +560,11 @@ body { border-radius: 3px; background-color: var(--bg-tertiary); color: var(--text-secondary); + margin-left: 0.25rem; +} + +.type-badge:first-child { + margin-left: 0; } /* Primitive types */ @@ -617,6 +627,11 @@ body { color: white; text-decoration: none; transition: background-color 0.15s; + margin-left: 0.25rem; +} + +.type-ref:first-child { + margin-left: 0; } .type-ref:hover {