Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(whitelabel): remove carbonio logos from loader #390

Merged
merged 1 commit into from
Mar 20, 2024
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/splash.css → src/boot/splash.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@

@keyframes loader-animation {
0% {
/* width: 15%; */
width: 20%;
left: 0%;
left: 0;
}
50% {
width: 50%;
}

100% {
left: 100%;
/* width: 15%; */
width: 20%;
}
}
Expand Down
18 changes: 2 additions & 16 deletions src/boot/splash.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,13 @@
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
import '../splash.css';
import './splash.css';
import React from 'react';

import styled from 'styled-components';

import Helmet from '../../assets/carbonio-head.svg';
// TODO: change with import from logo component when ready
import Logo from '../../assets/carbonio.svg';
// import { Logo } from '../shell/logo';

const StyledLogo = styled(Logo)`
fill: #a3aebc;
width: 50%;
`;
const LoadingView = (): React.JSX.Element => (
export const LoadingView = (): React.JSX.Element => (
<div className="splash">
<Helmet fill="#A3AEBC" />
<div className="loader">
<div className="bar"></div>
</div>
<StyledLogo />
</div>
);
export default LoadingView;
2 changes: 1 addition & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import React, { lazy, Suspense } from 'react';

import ReactDOM from 'react-dom';

import LoadingView from './boot/splash';
import { LoadingView } from './boot/splash';
import '@fontsource/roboto/300.css';
import '@fontsource/roboto/400.css';
import '@fontsource/roboto/500.css';
Expand Down