Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion OpenBitFun-Installer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-i18next": "^16.5.3",
"lucide-react": "^0.541.0"
"lucide-react": "^0.560.0"
},
"devDependencies": {
"@tauri-apps/cli": "2.11.4",
Expand Down
10 changes: 10 additions & 0 deletions OpenBitFun-Installer/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ openbitfun-services-core = { path = "../../src/crates/services/services-core", f
winreg = "0.52"
mslnk = "0.1"

[patch.crates-io]
# The installer is a standalone Cargo workspace without a committed lockfile.
# Keep its Tauri runtime family aligned with the main workspace's reviewed fix.
tauri-runtime = { git = "https://github.com/tauri-apps/tauri.git", rev = "7cc68e74ff6981f5c50a52a67d56c5eb2d227188" }
tauri-runtime-wry = { git = "https://github.com/tauri-apps/tauri.git", rev = "7cc68e74ff6981f5c50a52a67d56c5eb2d227188" }
tauri-utils = { git = "https://github.com/tauri-apps/tauri.git", rev = "7cc68e74ff6981f5c50a52a67d56c5eb2d227188" }
tauri-macros = { git = "https://github.com/tauri-apps/tauri.git", rev = "7cc68e74ff6981f5c50a52a67d56c5eb2d227188" }
tauri-codegen = { git = "https://github.com/tauri-apps/tauri.git", rev = "7cc68e74ff6981f5c50a52a67d56c5eb2d227188" }
tauri-plugin = { git = "https://github.com/tauri-apps/tauri.git", rev = "7cc68e74ff6981f5c50a52a67d56c5eb2d227188" }

[dev-dependencies]
tempfile = "3"

Expand Down
4 changes: 2 additions & 2 deletions OpenBitFun-Installer/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { DesignSystemProvider, Select } from '@openbitfun/ui';
import { useTranslation } from 'react-i18next';
import { WindowControls } from './components/WindowControls';
import { StepIndicator } from './components/StepIndicator';
import appIcon from './assets/openbitfun-app-icon-16.png';
import { OpenBitFunAppIcon } from '@openbitfun/ui/brand';
import { LanguageSelect } from './pages/LanguageSelect';
import { Options } from './pages/Options';
import { ModelSetup } from './pages/ModelSetup';
Expand Down Expand Up @@ -128,7 +128,7 @@ function App() {
<div className="installer-app">
<div className="titlebar" data-tauri-drag-region>
<div className="titlebar-brand" data-tauri-drag-region>
<img src={appIcon} width={16} height={16} alt="" data-tauri-drag-region />
<OpenBitFunAppIcon size={16} data-tauri-drag-region />
<span className="titlebar-title" data-tauri-drag-region>{t('shared.product.name')}</span>
</div>
{installer.previewOnly && (
Expand Down
4 changes: 3 additions & 1 deletion OpenBitFun-Installer/src/components/BrandMark.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { OpenBitFunMark } from '@openbitfun/ui/brand';

interface BrandMarkProps {
size?: 'medium' | 'hero';
working?: boolean;
}

/** The canonical fine-line vector is painted with the active surface's text color. */
export function BrandMark({ size = 'medium', working = false }: BrandMarkProps) {
return <span aria-hidden="true" className="brand-mark" data-size={size} data-working={working} />;
return <OpenBitFunMark className="brand-mark" data-size={size} motion="breathe" active={working} />;
}
3 changes: 0 additions & 3 deletions OpenBitFun-Installer/src/styles/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,8 @@ html, body, #root {
width: 112px;
height: 112px;
background-color: currentColor;
-webkit-mask: url('../../../assets/brand/source/openbitfun-mark.svg') center / contain no-repeat;
mask: url('../../../assets/brand/source/openbitfun-mark.svg') center / contain no-repeat;
}
.brand-mark[data-size="hero"] { width: 144px; height: 144px; }
.brand-mark[data-working="true"] { animation: installer-breathe 2400ms ease-in-out infinite; }

.welcome-page { display: flex; flex: 1; min-height: 0; }
.welcome-brand {
Expand Down
3 changes: 2 additions & 1 deletion THIRD_PARTY_NOTICES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ release packages.
- Copyright: Copyright 2021 Huawei Device Co., Ltd.

Non-Apple OpenBitFun GUI distributions bundle unmodified copies of the Base and
Simplified Chinese Regular, Medium, and Bold fonts. They do not bundle the
Simplified Chinese variable fonts (Version 2.040), exposing the design system's
Regular (400), Medium (500), Semibold (600), and Bold (700) weights. They do not bundle the
Traditional Chinese font family. Apple GUI distributions and Traditional
Chinese UI text use platform system fonts instead.

Expand Down
30 changes: 15 additions & 15 deletions assets/brand/exports/openbitfun-mark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading