Merge branch 'ui' into develop
This commit is contained in:
@@ -73,6 +73,7 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
&.sent_message {
|
&.sent_message {
|
||||||
align-items: end;
|
align-items: end;
|
||||||
|
text-align: end;
|
||||||
}
|
}
|
||||||
&.received_message {
|
&.received_message {
|
||||||
align-items: start;
|
align-items: start;
|
||||||
|
|||||||
@@ -3,13 +3,16 @@ import styles from "./SplashComponent.module.scss";
|
|||||||
import { StartUpProgressContainer } from "./start_up_progress_container/StartUpProgressContainer/";
|
import { StartUpProgressContainer } from "./start_up_progress_container/StartUpProgressContainer/";
|
||||||
import { DownloadModelsContainer } from "./download_models_container/DownloadModelsContainer/";
|
import { DownloadModelsContainer } from "./download_models_container/DownloadModelsContainer/";
|
||||||
import MegaphoneSvg from "@images/megaphone.svg?react";
|
import MegaphoneSvg from "@images/megaphone.svg?react";
|
||||||
|
import XMarkSvg from "@images/cancel.svg?react";
|
||||||
|
import { appWindow } from "@tauri-apps/api/window";
|
||||||
|
|
||||||
export const SplashComponent = () => {
|
export const SplashComponent = () => {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div className={styles.container}>
|
||||||
<StartUpProgressContainer />
|
<StartUpProgressContainer />
|
||||||
<DownloadModelsContainer />
|
<DownloadModelsContainer />
|
||||||
<AnnouncementsContainer />
|
<AnnouncementsContainer />
|
||||||
|
<CloseButtonContainer />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -39,3 +42,18 @@ const AnnouncementsContainer = () => {
|
|||||||
</a>
|
</a>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
const CloseButtonContainer = () => {
|
||||||
|
const close = () => {
|
||||||
|
appWindow.close();
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button className={styles.close_button_wrapper} onClick={close}>
|
||||||
|
<div className={styles.close_button}>
|
||||||
|
<XMarkSvg className={styles.x_mark_svg}/>
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,3 +1,10 @@
|
|||||||
|
.container {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
.announcements_button {
|
.announcements_button {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 16px;
|
top: 16px;
|
||||||
@@ -24,3 +31,40 @@
|
|||||||
.announcements_link_svg {
|
.announcements_link_svg {
|
||||||
width: 20px;
|
width: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.close_button_wrapper {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 100%;
|
||||||
|
transform: translate(-50%, -50%) rotate(45deg);
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: end;
|
||||||
|
width: 68px;
|
||||||
|
aspect-ratio: 1 / 1;
|
||||||
|
&:hover {
|
||||||
|
background-color: #bb4448;
|
||||||
|
& .x_mark_svg {
|
||||||
|
color: var(--dark_200_color);
|
||||||
|
transform: rotate(45deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&:active {
|
||||||
|
background-color: #9c3938;
|
||||||
|
}
|
||||||
|
transition: all 0.1s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.close_button {
|
||||||
|
// width: 100%;
|
||||||
|
// height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.x_mark_svg {
|
||||||
|
width: 24px;
|
||||||
|
transform: rotate(-45deg);
|
||||||
|
color: var(--dark_700_color);
|
||||||
|
transition: transform 0.3s ease;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user