mirror of
https://github.com/LGUG2Z/komorebi.git
synced 2026-11-22 00:21:43 +01:00
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
This commit is contained in:
1 parent
7d4b7857bb
commit
8d8780c427
3 files changed
+35
-26
No files matched your search
+13
-10
@@ -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<Value> {
|
||||
|
||||
// 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
|
||||
}
|
||||
|
||||
@@ -48,10 +48,7 @@
|
||||
{%- set display = display_names[ref_name] | default(value=ref_name) -%}
|
||||
{%- set ref_def = schema["$defs"][ref_name] -%}
|
||||
<a href="#{{ ref_name | lower }}" class="type-ref">{{ display }}</a>
|
||||
{%- 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 -%}
|
||||
<span class="type-badge type-array">array</span> {%- if first_type.type == "number" -%}<span class="type-badge type-float">float; {{ node.prefixItems | length }}</span>{%- else -%}<span class="type-badge type-{{ first_type.type }}">{{ first_type.type }}; {{ node.prefixItems | length }}</span>{%- endif -%}
|
||||
<span class="type-badge type-array">array</span> {% if first_type.type == "number" %}<span class="type-badge type-float">float; {{ node.prefixItems | length }}</span>{% else %}<span class="type-badge type-{{ first_type.type }}">{{ first_type.type }}; {{ node.prefixItems | length }}</span>{% endif %}
|
||||
{%- else -%}
|
||||
<span class="type-badge type-array">array</span> <span class="type-badge type-array">tuple</span>
|
||||
{%- endif -%}
|
||||
@@ -79,16 +76,11 @@
|
||||
{%- if node.type | length == 2 and "null" in node.type -%}
|
||||
<span class="badge optional">optional</span>
|
||||
{%- for t in node.type -%}
|
||||
{%- if t != "null" -%}
|
||||
{%- if t == "array" and node.items -%}
|
||||
<span class="type-badge type-array">array</span> {{ self::render_type_badge(node=node.items) }}
|
||||
{%- else -%}
|
||||
<span class="type-badge type-{{ t }}">{{ t }}</span>
|
||||
{%- endif -%}
|
||||
{%- if t != "null" %} {% if t == "array" and node.items %}<span class="type-badge type-array">array</span> {{ self::render_type_badge(node=node.items) }}{% else %}<span class="type-badge type-{{ t }}">{{ t }}</span>{% endif %}
|
||||
{%- endif -%}
|
||||
{%- endfor -%}
|
||||
{%- else -%}
|
||||
{%- for t in node.type -%}<span class="type-badge type-{{ t }}">{{ t }}</span>{% endfor -%}
|
||||
{%- for t in node.type %} <span class="type-badge type-{{ t }}">{{ t }}</span>{%- 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" -%}
|
||||
<span class="badge optional">optional</span>{{ self::render_type_badge(node=first) }}
|
||||
<span class="badge optional">optional</span> {{ self::render_type_badge(node=first) }}
|
||||
{%- elif first.type and first.type == "null" -%}
|
||||
<span class="badge optional">optional</span>{{ self::render_type_badge(node=second) }}
|
||||
<span class="badge optional">optional</span> {{ 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 -%}
|
||||
<div class="schema-inline">
|
||||
{{ self::render_type_badge(node=node) }}
|
||||
{%- if node.description_html %}<div class="description">{{ node.description_html | safe }}</div>{% endif -%}
|
||||
{{ self::render_type_badge(node=node) }}{%- if node.description_html %} <div class="description">{{ node.description_html | safe }}</div>{% endif -%}
|
||||
{{ self::render_constraints(node=node) }}
|
||||
{%- if node.default %}<div class="default-value"><span class="label">Default:</span> <code>{{ node.default | json_encode() }}</code></div>{% endif -%}
|
||||
{{ self::render_schema_body(node=node, depth=depth, path=path) }}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in new issue
Block a user