SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.
Themes: Okibi (dark) and Akari (light), from the Okibi design system (#5730) (#5731)
Kai Evans0870d6474a87
diff --git a/ATTRIBUTION.md b/ATTRIBUTION.mdindex 0675708d3c..cec5b298fa 100644--- a/ATTRIBUTION.md+++ b/ATTRIBUTION.md@@ -199,6 +199,8 @@ Editable drawing code, native projects and shipped exports are collected under `| assets/styles/ui/themes/graphite.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 || assets/styles/ui/themes/nosferatu.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Dracula by Zeno Rocha and the Dracula Theme contributors, https://github.com/dracula/dracula-theme, MIT) | MIT OR Apache-2.0 || assets/styles/ui/themes/catppuccin-mocha.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Catppuccin by the Catppuccin organisation, https://github.com/catppuccin/catppuccin, MIT) | MIT OR Apache-2.0 |+| assets/styles/ui/themes/okibi.json | SolidCraft contributors (Kai Evans) | original SolidCraft theme file mapping SolidCraft's UI colours to the Okibi palette (dark) of the Okibi design system by Kai Evans (https://kaievns.github.io/okibi-akiri-design-system-spec/) | MIT OR Apache-2.0 |+| assets/styles/ui/themes/akari.json | SolidCraft contributors (Kai Evans) | original SolidCraft theme file mapping SolidCraft's UI colours to the Akari palette (light) of the Okibi design system by Kai Evans (https://kaievns.github.io/okibi-akiri-design-system-spec/) | MIT OR Apache-2.0 || assets/styles/web/loading-logo.svg | SolidCraft contributors | Animation of the SolidCraft mark, built from the paths and gradients of assets/icons/app/macos/source/SolidCraft.icon/Assets/03-solid-blue-cutout.svg; original animation | MIT OR Apache-2.0 || assets/styles/web/loading.css | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 || crates/io/src/native_cad/fixtures/block.FCStd | SolidCraft contributors | original 10 × 20 × 30 mm test box saved by FreeCAD 1.1.4 run as an external program (`make_block_fcstd.py` beside it); no third-party geometry | MIT OR Apache-2.0 |diff --git a/assets/styles/ui/themes/akari.json b/assets/styles/ui/themes/akari.jsonnew file mode 100644index 0000000000..8ad8d37474--- /dev/null+++ b/assets/styles/ui/themes/akari.json@@ -0,0 +1,245 @@+{+ "base": "light",+ "colors": {+ "accent": "#c63a00",+ "accent_soft": "#e8d0c3",+ "agent_busy": "#015ba6",+ "agent_ok": "#257231",+ "app_bar": "#e1ddd8",+ "app_bar_hover": "#13110e14",+ "app_bar_hover_button": "#13110e18",+ "app_bar_hover_strong": "#13110e22",+ "app_bar_hover_subtle": "#13110e0c",+ "app_bar_icon": [+ "#403d38",+ "#b5b0a9",+ "#c63a00"+ ],+ "app_bar_separator": "#b5b0a9",+ "app_bar_tab_active": "#f9f6f2",+ "app_bar_text": "#403d38",+ "axis_x": "#c71529",+ "axis_y": "#257231",+ "axis_z": "#015ba6",+ "bend_down": "#705e91",+ "bend_up": "#257231",+ "body": "#c2beb8",+ "body_edge": "#403d38",+ "body_selected": "#de8d6b",+ "border": "#d9d5d0",+ "box_crossing": "#257231",+ "box_window": "#015ba6",+ "chip": "#c63a00",+ "construction_geom": "#7d6535",+ "construction_plane": "#7d653540",+ "continuity": [+ "#257231",+ "#015ba6",+ "#c08a1a",+ "#b14578"+ ],+ "control_border": "#d4d0ca",+ "control_fill": "#fffdfa",+ "cube_border": "#b5b0a9",+ "cube_face": "#fffdfa",+ "cube_hover": "#d4d0ca",+ "cube_text": "#13110e",+ "dialog_bg": "#f9f6f2",+ "dialog_body": "#f9f6f2",+ "dialog_border": "#d4d0ca",+ "dialog_footer": "#efece8",+ "dialog_label": "#403d38",+ "dialog_rule": "#d9d5d0",+ "dimension": "#403d38",+ "dimension_driven": "#6c6863",+ "error": "#c71529",+ "field": "#fffdfa",+ "form_accent": "#5844bc",+ "form_dim": "#6c6863",+ "form_error": "#c71529",+ "form_error_fill": "#f4e0de",+ "form_fill": "#5844bc",+ "form_ink": "#13110e",+ "form_primary": "#c63a00",+ "form_soft": "#e4e0e5",+ "form_success": "#257231",+ "form_success_fill": "#e4e9df",+ "form_tab_ink": "#5844bc",+ "gizmo": [+ "#b00018",+ "#096125",+ "#004c9b"+ ],+ "glyph_bg": "#fffdfa",+ "glyph_edge": "#d4d0ca",+ "glyph_text": "#604b83",+ "grid": "#edeae5",+ "grid_major": "#e1ddd8",+ "heading_bg": "#ebe7e2",+ "hover": "#e1ddd7",+ "hover_edge": "#13110e",+ "hover_edge_halo": "#fffdfa",+ "hover_profile": "#13110e22",+ "hover_profile_edge": "#403d38",+ "icon": "#403d38",+ "icon_fill": "#d4d0ca",+ "icons.access": [+ "#257231",+ "#c71529"+ ],+ "icons.agent": "#5844bc",+ "icons.axes": [+ "#c71529",+ "#257231",+ "#015ba6"+ ],+ "icons.curvature": [+ "#015ba6",+ "#257231",+ "#c71529"+ ],+ "icons.draft": [+ "#257231",+ "#e6af2b"+ ],+ "icons.floor": "#6c6863",+ "icons.fold": "#8d8982",+ "icons.folder": "#c9a96a",+ "icons.glint": "#ffffffa0",+ "icons.highlight": "#fffdfa",+ "icons.interference": "#c71529",+ "icons.marker_halo": "#13110e96",+ "icons.paint": [+ "#c71529",+ "#015ba6",+ "#e6af2b"+ ],+ "icons.plane": "#e3cf9f",+ "icons.sheet": "#b9cde2",+ "icons.sheet_2": "#a5bfd9",+ "icons.sheet_light": "#dbe6f0",+ "icons.sheet_line": "#015ba6",+ "icons.sky": "#b9cde2",+ "icons.stripe": "#13110e",+ "icons.warning": "#e6af2b",+ "interference": "#c71529",+ "logo": [+ "#bb461e",+ "#c63a00",+ "#902e04"+ ],+ "manipulator": "#004c9b",+ "mesh_accent": "#7e6900",+ "mesh_fill": "#7e6900",+ "mesh_ink": "#6b5903",+ "mesh_soft": "#e7e3d8",+ "on_accent": "#fffbed",+ "origin_plane": "#6c686338",+ "origin_plane_edge": "#6c6863c8",+ "origin_plane_hover": "#015ba670",+ "origin_point": "#403d38",+ "overlay": "#fffdfaeb",+ "panel": "#efece8",+ "panel_header": "#ebe7e2",+ "preview_add": "#4f8fd6",+ "preview_cut": "#c715296e",+ "preview_new": "#e6af2b",+ "preview_sketch": "#2d713b",+ "profile_fill": "#015ba614",+ "render_accent": "#ac1f6a",+ "render_fill": "#ac1f6a",+ "render_ink": "#ac1f6a",+ "render_soft": "#eadedf",+ "rubber_band": "#004c9b",+ "section_cap": "#7d6535",+ "sel_edge": "#c63a00",+ "sel_edge_rim": "#e29c80",+ "sel_face": "#d67147",+ "sel_profile": "#c63a00a0",+ "sel_profile_edge": "#c63a00",+ "sel_vertex": "#c63a00",+ "selected_bg": "#f1d8cb",+ "selected_ink": "#13110e",+ "sheet_fill": "#015ba6",+ "sheet_ink": "#015ba6",+ "sheet_soft": "#dee2e3",+ "sketch": "#015ba6",+ "sketch_accent": "#2d713b",+ "sketch_centerline": "#403d38",+ "sketch_construction": "#7d6535",+ "sketch_fixed": "#13110e",+ "sketch_ink": "#2d713b",+ "sketch_locked": "#257231",+ "sketch_lost": "#c71529",+ "sketch_point": "#13110e",+ "sketch_point_free": "#015ba6",+ "sketch_projected": "#705e91",+ "sketch_soft": "#e1e3dc",+ "subheading_bg": "#efece8",+ "surface_accent": "#7d6535",+ "surface_fill": "#7d6535",+ "surface_ink": "#6a562e",+ "surface_soft": "#e7e3db",+ "tab_on_fill_dark": "#13110e",+ "text": "#13110e",+ "text_dim": "#6c6863",+ "timeline": "#efece8",+ "timeline_item": "#fffdfa",+ "timeline_item_error": "#f2c5c8",+ "timeline_marker": "#c63a00",+ "toolbar": "#efece8",+ "triad": [+ "#c71529",+ "#257231",+ "#015ba6"+ ],+ "viewport_bottom": "#f1ede8",+ "viewport_top": "#f9f6f2",+ "warning": "#956000"+ },+ "format": "solidcraft-theme/1",+ "name": "Akari",+ "icon_palette": {+ "ink": "#13110e",+ "line": "#505054",+ "passive-1": "#dee5ee",+ "passive-2": "#aeb5bd",+ "passive-3": "#81878f",+ "guide": "#6e6e73",+ "solid": [+ "#dbe9fe",+ "#81b3fa",+ "#1875eb"+ ],+ "surface": [+ "#fde3c4",+ "#daa662",+ "#a06f28"+ ],+ "mesh": [+ "#fee7a2",+ "#d1ad37",+ "#937717"+ ],+ "form": [+ "#ede2ff",+ "#c39afc",+ "#8b62bf"+ ],+ "sketch": [+ "#b1fdc5",+ "#72c78b",+ "#388e56"+ ],+ "constraint": [+ "#fee0dd",+ "#f98e87",+ "#d73339"+ ],+ "construction": [+ "#fde3c4",+ "#daa662",+ "#a06f28"+ ]+ }+}diff --git a/assets/styles/ui/themes/okibi.json b/assets/styles/ui/themes/okibi.jsonnew file mode 100644index 0000000000..2b8d334814--- /dev/null+++ b/assets/styles/ui/themes/okibi.json@@ -0,0 +1,245 @@+{+ "base": "dark",+ "colors": {+ "accent": "#ff7c50",+ "accent_soft": "#3a2723",+ "agent_busy": "#6daff7",+ "agent_ok": "#89cf8e",+ "app_bar": "#0f1113",+ "app_bar_hover": "#e1e3e514",+ "app_bar_hover_button": "#e1e3e518",+ "app_bar_hover_strong": "#e1e3e522",+ "app_bar_hover_subtle": "#e1e3e50c",+ "app_bar_icon": [+ "#bbbec1",+ "#585b5f",+ "#ff7c50"+ ],+ "app_bar_separator": "#474b4f",+ "app_bar_tab_active": "#1b1e20",+ "app_bar_text": "#bbbec1",+ "axis_x": "#f85052",+ "axis_y": "#89cf8e",+ "axis_z": "#6daff7",+ "bend_down": "#ab9acd",+ "bend_up": "#89cf8e",+ "body": "#74777b",+ "body_edge": "#0f1113",+ "body_selected": "#c56241",+ "border": "#2f3235",+ "box_crossing": "#89cf8e",+ "box_window": "#6daff7",+ "chip": "#ff7c50",+ "construction_geom": "#ceb687",+ "construction_plane": "#ceb68740",+ "continuity": [+ "#89cf8e",+ "#6daff7",+ "#e6af2b",+ "#f38bb7"+ ],+ "control_border": "#474b4f",+ "control_fill": "#2c2e31",+ "cube_border": "#585b5f",+ "cube_face": "#2c2e31",+ "cube_hover": "#474b4f",+ "cube_text": "#e1e3e5",+ "dialog_bg": "#222527",+ "dialog_body": "#222527",+ "dialog_border": "#383b3e",+ "dialog_footer": "#1b1e20",+ "dialog_label": "#bbbec1",+ "dialog_rule": "#2f3235",+ "dimension": "#bbbec1",+ "dimension_driven": "#8f9296",+ "error": "#f85052",+ "field": "#2c2e31",+ "form_accent": "#a6a2fc",+ "form_dim": "#8f9296",+ "form_error": "#ff6060",+ "form_error_fill": "#37292b",+ "form_fill": "#a6a2fc",+ "form_ink": "#e1e3e5",+ "form_primary": "#ff7c50",+ "form_soft": "#2f3043",+ "form_success": "#89cf8e",+ "form_success_fill": "#2c3631",+ "form_tab_ink": "#a6a2fc",+ "gizmo": [+ "#ff6060",+ "#98dfa2",+ "#7abfff"+ ],+ "glyph_bg": "#222527",+ "glyph_edge": "#474b4f",+ "glyph_text": "#ab9acd",+ "grid": "#27292c",+ "grid_major": "#2c2e31",+ "heading_bg": "#15171a",+ "hover": "#383b3e",+ "hover_edge": "#0f1113",+ "hover_edge_halo": "#e1e3e5",+ "hover_profile": "#e1e3e522",+ "hover_profile_edge": "#bbbec1",+ "icon": "#bbbec1",+ "icon_fill": "#474b4f",+ "icons.access": [+ "#89cf8e",+ "#f85052"+ ],+ "icons.agent": "#aba3ff",+ "icons.axes": [+ "#f85052",+ "#89cf8e",+ "#6daff7"+ ],+ "icons.curvature": [+ "#6daff7",+ "#89cf8e",+ "#f85052"+ ],+ "icons.draft": [+ "#89cf8e",+ "#e6af2b"+ ],+ "icons.floor": "#383b3e",+ "icons.fold": "#707376",+ "icons.folder": "#ceb687",+ "icons.glint": "#ffffffa0",+ "icons.highlight": "#e1e3e5",+ "icons.interference": "#f85052",+ "icons.marker_halo": "#0f111396",+ "icons.paint": [+ "#f85052",+ "#6daff7",+ "#e6af2b"+ ],+ "icons.plane": "#dcc9a0",+ "icons.sheet": "#a2bedb",+ "icons.sheet_2": "#8fb0d2",+ "icons.sheet_light": "#c9d9ea",+ "icons.sheet_line": "#6daff7",+ "icons.sky": "#a2bedb",+ "icons.stripe": "#0f1113",+ "icons.warning": "#e6af2b",+ "interference": "#f85052",+ "logo": [+ "#ff9c7c",+ "#ff7c50",+ "#b75c3e"+ ],+ "manipulator": "#7abfff",+ "mesh_accent": "#cfc152",+ "mesh_fill": "#cfc152",+ "mesh_ink": "#cfc152",+ "mesh_soft": "#363624",+ "on_accent": "#0f1113",+ "origin_plane": "#8f929638",+ "origin_plane_edge": "#8f9296c8",+ "origin_plane_hover": "#6daff770",+ "origin_point": "#bbbec1",+ "overlay": "#15171af0",+ "panel": "#15171a",+ "panel_header": "#222527",+ "preview_add": "#4c78a7",+ "preview_cut": "#f850526e",+ "preview_new": "#e6af2b",+ "preview_sketch": "#8eca96",+ "profile_fill": "#6daff71c",+ "render_accent": "#f38bb7",+ "render_fill": "#f38bb7",+ "render_ink": "#f38bb7",+ "render_soft": "#3d2c36",+ "rubber_band": "#7abfff",+ "section_cap": "#ceb687",+ "sel_edge": "#ff7c50",+ "sel_edge_rim": "#ffbea8",+ "sel_face": "#dd6d47",+ "sel_profile": "#ff7c50b0",+ "sel_profile_edge": "#ff7c50",+ "sel_vertex": "#ff7c50",+ "selected_bg": "#45332e",+ "selected_ink": "#e1e3e5",+ "sheet_fill": "#6daff7",+ "sheet_ink": "#6daff7",+ "sheet_soft": "#253242",+ "sketch": "#6daff7",+ "sketch_accent": "#8eca96",+ "sketch_centerline": "#bbbec1",+ "sketch_construction": "#ceb687",+ "sketch_fixed": "#e1e3e5",+ "sketch_ink": "#8eca96",+ "sketch_locked": "#89cf8e",+ "sketch_lost": "#f85052",+ "sketch_point": "#e1e3e5",+ "sketch_point_free": "#6daff7",+ "sketch_projected": "#998cb3",+ "sketch_soft": "#2b3730",+ "subheading_bg": "#1b1e20",+ "surface_accent": "#ceb687",+ "surface_fill": "#ceb687",+ "surface_ink": "#ceb687",+ "surface_soft": "#36342e",+ "tab_on_fill_dark": "#0f1113",+ "text": "#e1e3e5",+ "text_dim": "#8f9296",+ "timeline": "#15171a",+ "timeline_item": "#222527",+ "timeline_item_error": "#552f31",+ "timeline_marker": "#ff7c50",+ "toolbar": "#15171a",+ "triad": [+ "#f85052",+ "#89cf8e",+ "#6daff7"+ ],+ "viewport_bottom": "#1b1e20",+ "viewport_top": "#222527",+ "warning": "#e6af2b"+ },+ "format": "solidcraft-theme/1",+ "name": "Okibi",+ "icon_palette": {+ "ink": "#15171a",+ "line": "#e1e3e5",+ "passive-1": "#bfc1c5",+ "passive-2": "#939599",+ "passive-3": "#6a6c6f",+ "guide": "#a0a6b0",+ "solid": [+ "#a0d7fb",+ "#65bdf3",+ "#4aa3d8"+ ],+ "surface": [+ "#fcc28e",+ "#dea572",+ "#c38c59"+ ],+ "mesh": [+ "#e8cd7d",+ "#cab060",+ "#b19747"+ ],+ "form": [+ "#d5c4fd",+ "#b9a7df",+ "#a08fc4"+ ],+ "sketch": [+ "#b0dbc0",+ "#94bea4",+ "#7ba58b"+ ],+ "constraint": [+ "#febbb9",+ "#fb8e8d",+ "#e57071"+ ],+ "construction": [+ "#fcc28e",+ "#dea572",+ "#c38c59"+ ]+ }+}diff --git a/crates/ui-egui/src/theme_files.rs b/crates/ui-egui/src/theme_files.rsindex 3a2aafb422..6fedcef9b6 100644--- a/crates/ui-egui/src/theme_files.rs+++ b/crates/ui-egui/src/theme_files.rs@@ -524,8 +524,8 @@ pub fn export(name: &str, base: Base, t: &Tokens) -> Value {json!({"format": FORMAT, "name": name, "base": base, "colors": colors, "radii": radii, "borders": borders, "icon_palette": icon_palette})}-/// The theme files that come with SolidCraft (original files; Gruvbox, Tokyo Night, Solarized, Nord, Nosferatu and Catppuccin map open-source palettes, MIT).-const BUILTIN: [(&str, &str); 20] = [+/// The theme files that come with SolidCraft (original files; Gruvbox, Tokyo Night, Solarized, Nord, Nosferatu and Catppuccin map open-source palettes, MIT; Okibi and Akari map the Okibi design system).+const BUILTIN: [(&str, &str); 22] = [("gruvbox-dark", include_str!("../../../assets/styles/ui/themes/gruvbox-dark.json")),("gruvbox-dark-hard", include_str!("../../../assets/styles/ui/themes/gruvbox-dark-hard.json")),("gruvbox-dark-soft", include_str!("../../../assets/styles/ui/themes/gruvbox-dark-soft.json")),@@ -546,6 +546,8 @@ const BUILTIN: [(&str, &str); 20] = [("graphite", include_str!("../../../assets/styles/ui/themes/graphite.json")),("nosferatu", include_str!("../../../assets/styles/ui/themes/nosferatu.json")),("catppuccin-mocha", include_str!("../../../assets/styles/ui/themes/catppuccin-mocha.json")),+ ("okibi", include_str!("../../../assets/styles/ui/themes/okibi.json")),+ ("akari", include_str!("../../../assets/styles/ui/themes/akari.json")),];/// The built-in themes, read once (one that fails to read is left out; a test reads them all).diff --git a/crates/ui-egui/tests/scenarios/prefs_theme_files.json b/crates/ui-egui/tests/scenarios/prefs_theme_files.jsonindex 8dff61bb49..d93995b093 100644--- a/crates/ui-egui/tests/scenarios/prefs_theme_files.json+++ b/crates/ui-egui/tests/scenarios/prefs_theme_files.json@@ -10,5 +10,10 @@{"click": {"handle": "prefs:theme:light"}},{"expect": {"prefs": {"theme": "light", "dark": false}}},{"widget": "Cancel"},- {"expect": {"prefs": {"dialog": null, "theme": "dark", "dark": true}}}+ {"expect": {"prefs": {"dialog": null, "theme": "dark", "dark": true}}},+ {"note": "Okibi (dark) and Akari (light) are built in by id."},+ {"call": "ui.prefs", "params": {"theme": "akari"}},+ {"expect": {"prefs": {"theme": "akari", "dark": false}}},+ {"call": "ui.prefs", "params": {"theme": "okibi"}},+ {"expect": {"prefs": {"theme": "okibi", "dark": true}}}]diff --git a/docs/book/src/guide/ui-tour.md b/docs/book/src/guide/ui-tour.mdindex 0547c6c320..634535f43c 100644--- a/docs/book/src/guide/ui-tour.md+++ b/docs/book/src/guide/ui-tour.md@@ -117,9 +117,12 @@ and command menus remain available.### Colour themes-General › **Theme** lists Dark, Light and System (follows the operating system), the built-in-Gruvbox themes (dark and light, each in hard, normal and soft contrast) and any themes you have-imported. A choice applies at once.+Interface › **Theme** lists Dark, Light and System (follows the operating system), the built-in+themes and any themes you have imported. A choice applies at once. The built-in themes are Gruvbox+(dark and light, each in hard, normal and soft contrast), SolidCraft 95, Platinum 9, Cupertino,+Green Phosphor, Amber Phosphor, Blueprint, One Dark, Tokyo Night, Solarized Light, Nord, High+Contrast, Graphite, Nosferatu, Catppuccin Mocha, and Okibi and Akari (dark and light, from the+[Okibi design system](https://kaievns.github.io/okibi-akiri-design-system-spec/)).A theme is a small JSON file that starts from the Dark or Light palette and changes any of itscolours and corner radii by name: