Skip to content

Commit 6032f77

Browse files
authored
Merge branch 'dev' into French_translation
2 parents 325a606 + e5e49cc commit 6032f77

File tree

6 files changed

+336
-131
lines changed

6 files changed

+336
-131
lines changed

web-app/index.html

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,76 @@
2121
/>
2222
<title>Jan</title>
2323
<!-- INJECT_GOOGLE_ANALYTICS -->
24+
<style>
25+
#initial-loader {
26+
position: fixed;
27+
inset: 0;
28+
display: flex;
29+
flex-direction: column;
30+
align-items: center;
31+
justify-content: center;
32+
gap: 1rem;
33+
background: hsl(var(--background, 0 0% 100%));
34+
z-index: 9999;
35+
opacity: 1;
36+
transition: opacity 0.3s ease-in-out;
37+
}
38+
39+
/* Light mode (default) */
40+
@media (prefers-color-scheme: light) {
41+
#initial-loader {
42+
background: rgb(255, 255, 255);
43+
}
44+
}
45+
46+
/* Dark mode */
47+
@media (prefers-color-scheme: dark) {
48+
#initial-loader {
49+
background: rgb(25, 25, 25);
50+
}
51+
}
52+
53+
#initial-loader img {
54+
width: 5rem;
55+
height: 5rem;
56+
animation: wave 2s ease-in-out infinite;
57+
transform-origin: 70% 70%;
58+
}
59+
60+
@keyframes wave {
61+
0%,
62+
100% {
63+
transform: rotate(0deg);
64+
}
65+
10%,
66+
30% {
67+
transform: rotate(14deg);
68+
}
69+
20% {
70+
transform: rotate(-8deg);
71+
}
72+
40%,
73+
60% {
74+
transform: rotate(14deg);
75+
}
76+
50% {
77+
transform: rotate(-8deg);
78+
}
79+
70% {
80+
transform: rotate(0deg);
81+
}
82+
}
83+
84+
.loaded #initial-loader {
85+
opacity: 0;
86+
pointer-events: none;
87+
}
88+
</style>
2489
</head>
2590
<body>
91+
<div id="initial-loader">
92+
<img src="/images/jan-logo.png" alt="Jan Logo" />
93+
</div>
2694
<div id="root"></div>
2795
<script type="module" src="/src/main.tsx"></script>
2896
</body>

web-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@tauri-apps/plugin-deep-link": "2.4.3",
4545
"@tauri-apps/plugin-dialog": "2.2.2",
4646
"@tauri-apps/plugin-http": "2.5.0",
47-
"@tauri-apps/plugin-opener": "2.3.0",
47+
"@tauri-apps/plugin-opener": "2.5.2",
4848
"@tauri-apps/plugin-os": "2.2.1",
4949
"@tauri-apps/plugin-updater": "2.8.1",
5050
"@types/react-syntax-highlighter": "15.5.13",

0 commit comments

Comments
 (0)