Skip to content

Commit

Permalink
Merge pull request #65 from su-its/feat/frontend/branding
Browse files Browse the repository at this point in the history
Feat/frontend/branding
  • Loading branch information
KinjiKawaguchi authored Apr 3, 2024
2 parents 22822e7 + 4ce4a21 commit ef091c5
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion typing-app/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { LoginProvider } from "@/state";
const inter = Inter({ subsets: ["latin"] });

export const metadata: Metadata = {
title: "TypeMaster",
title: "TYPE MASTER",
};

export default async function RootLayout({
Expand Down
Binary file modified typing-app/src/assets/images/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added typing-app/src/assets/images/brand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion typing-app/src/components/atoms/Banner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import bannerImage from "@/assets/images/banner.png";
const Banner: React.FC = () => {
return (
<Box>
<Image src={bannerImage.src} alt="Logo" maxH={100} />
<Image src={bannerImage.src} alt="Logo" maxH={54} ml={2} />
</Box>
);
};
Expand Down
12 changes: 3 additions & 9 deletions typing-app/src/components/molecules/BrandText.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
import React from "react";
import { Box, HStack, Text } from "@chakra-ui/react";
import { Box, Image } from "@chakra-ui/react";
import brandImage from "@/assets/images/brand.png";

const BrandText: React.FC = () => {
return (
<Box>
<HStack>
<Text fontSize="50px" color={"white"}>
ITS
</Text>
<Text fontSize="20px" color={"white"}>
静岡大学ITソルーション室
</Text>
</HStack>
<Image src={brandImage.src} alt="Brand" ml={2} />
</Box>
);
};
Expand Down

0 comments on commit ef091c5

Please sign in to comment.