Skip to content

Commit e3c4d23

Browse files
rjdbcmrjdbcm
authored
Merge pull request #612 from OZI-Project/main
Release
2 parents 11997ae + da5fc69 commit e3c4d23

6 files changed

Lines changed: 39 additions & 14 deletions

File tree

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "ozi_core/ui/brand"]
2-
path = ozi_core/ui/brand
3-
url = https://github.com/OZI-Project/brand

‎ozi_core/ui/brand‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎ozi_core/ui/meson.build‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,9 @@ configure_file(
99
install_dir: python.get_install_dir() / 'ozi_core' / 'ui',
1010
configuration: configuration_data({
1111
'OZI_NEW_HTML': fs.read(meson.project_source_root() / 'ozi_core' / 'ui' / 'ozi-new.html'),
12-
'OZI_LOGO_SVG': fs.read(meson.project_source_root() / 'ozi_core' / 'ui' / 'brand' / 'images' / 'ozi_logo_v2.svg'),
1312
}),
1413
)
1514
python.install_sources('style.css', subdir: 'ozi_core' / 'ui' / 'css')
16-
python.install_sources('brand/css/fonts-en.css', subdir: 'ozi_core' / 'ui' / 'brand' / 'css')
17-
python.install_sources('brand/fonts/atkinsonhyperlegible/AtkinsonHyperlegible-Bold.ttf', subdir: 'ozi_core' / 'ui' / 'brand' / 'fonts' / 'atkinsonhyperlegible')
18-
python.install_sources('brand/fonts/atkinsonhyperlegible/AtkinsonHyperlegible-BoldItalic.ttf', subdir: 'ozi_core' / 'ui' / 'brand' / 'fonts' / 'atkinsonhyperlegible')
19-
python.install_sources('brand/fonts/atkinsonhyperlegible/AtkinsonHyperlegible-Italic.ttf', subdir: 'ozi_core' / 'ui' / 'brand' / 'fonts' / 'atkinsonhyperlegible')
20-
python.install_sources('brand/fonts/atkinsonhyperlegible/AtkinsonHyperlegible-Regular.ttf', subdir: 'ozi_core' / 'ui' / 'brand' / 'fonts' / 'atkinsonhyperlegible')
21-
python.install_sources('brand/fonts/martianmono/MartianMono[wdth,wght].ttf', subdir: 'ozi_core' / 'ui' / 'brand' / 'fonts' / 'martianmono')
22-
python.install_sources('brand/fonts/notoserifhk/NotoSerifHK[wght].ttf', subdir: 'ozi_core' / 'ui' / 'brand' / 'fonts' / 'notoserifhk')
2315
source_ui_files = [
2416
'__init__.py',
2517
'menu.py',

‎ozi_core/ui/ozi-new.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<title>ozi-new webui</title>
66
<script src="webui.js"></script>
77
<link href="css/style.css" rel="stylesheet"></head>
8-
<link href="brand/css/fonts-en.css" rel="stylesheet"></head>
98
</head>
109
<body>
1110
<!-- The Modal - Hidden by default but immediately shown by the backend -->

‎ozi_core/ui/style.css‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
@font-face {
2+
font-family: 'AtkinsonHyperlegible' sans-serif;
3+
font-weight: normal;
4+
/* Chrome 4+, Firefox 3.5, Opera 10+, Safari 3—5 */
5+
src: url('https://oziproject.dev/assets/brand/fonts/atkinsonhyperlegible/AtkinsonHyperlegible-Regular.ttf') format('truetype');
6+
}
7+
@font-face {
8+
font-family: 'AtkinsonHyperlegible' sans-serif;
9+
font-weight: bold;
10+
/* Chrome 4+, Firefox 3.5, Opera 10+, Safari 3—5 */
11+
src: url('https://oziproject.dev/assets/brand/fonts/atkinsonhyperlegible/AtkinsonHyperlegible-Bold.ttf') format('truetype');
12+
}
13+
@font-face {
14+
font-family: 'AtkinsonHyperlegible' sans-serif;
15+
font-weight: normal;
16+
font-style: italic;
17+
/* Chrome 4+, Firefox 3.5, Opera 10+, Safari 3—5 */
18+
src: url('https://oziproject.dev/assets/brand/fonts/atkinsonhyperlegible/AtkinsonHyperlegible-Italic.ttf') format('truetype');
19+
}
20+
@font-face {
21+
font-family: 'AtkinsonHyperlegible' sans-serif;
22+
font-weight: bold;
23+
font-style: italic;
24+
/* Chrome 4+, Firefox 3.5, Opera 10+, Safari 3—5 */
25+
src: url('https://oziproject.dev/assets/brand/fonts/atkinsonhyperlegible/AtkinsonHyperlegible-BoldItalic.ttf') format('truetype');
26+
}
27+
@font-face {
28+
font-family: 'NotoSerifHK' serif;
29+
font-weight: 200 900;
30+
/* Chrome 4+, Firefox 3.5, Opera 10+, Safari 3—5 */
31+
src: url('https://oziproject.dev/assets/brand/fonts/notoserifhk/NotoSerifHK[wght].ttf') format('truetype supports variations');
32+
}
33+
@font-face {
34+
font-family: 'MartianMono' monospace;
35+
font-weight: 100 800;
36+
font-stretch: 75% 112.5%;
37+
/* Chrome 4+, Firefox 3.5, Opera 10+, Safari 3—5 */
38+
src: url('https://oziproject.dev/assets/brand/fonts/martianmono/MartianMono[wdth\,wght].ttf') format('truetype supports variations');
39+
}
140
@media only screen and (min-width: 768px) {
241
.row {
342
display: flex;

‎ozi_core/ui/web.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,6 @@ def __call__(self, config: dict[str, Any], show: str) -> None:
712712
def main(mode: str) -> Namespace:
713713
window = webui.window()
714714
config = asdict(read_user_config())
715-
window.set_icon("""@OZI_LOGO_SVG@""", 'image/svg+xml')
716715
if mode == 'new':
717716
window.bind('CloseDisclaimer', hide_disclaimer)
718717
window.bind('Name', validate_name)

0 commit comments

Comments
 (0)