Skip to content

Commit

Permalink
Merge pull request #44 from su-its/chore/bg-color
Browse files Browse the repository at this point in the history
feat:背景を黒に変更
  • Loading branch information
KinjiKawaguchi authored Mar 29, 2024
2 parents d164a11 + 1eacd69 commit 62dfc5d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion typing-app/src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@tailwind utilities;

:root {
--foreground-rgb: 255, 255, 255;
--foreground-rgb: 0, 0, 0;
--background-start-rgb: 0, 0, 0;
--background-end-rgb: 0, 0, 0;
}
Expand Down
4 changes: 2 additions & 2 deletions typing-app/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ export default function RootLayout({
<html lang="en">
<body className={inter.className}>
<ChakraProvider>
<Box minH="100vh" display="flex" flexDirection="column">
<Box minH="100vh" display="flex" flexDirection="column" bg="black">
<Header />
<Box flex="1" bg="gray.100" py={2}>
<Box flex="1" py={2}>
{children}
</Box>
<Footer />
Expand Down
8 changes: 6 additions & 2 deletions typing-app/src/components/molecules/BrandText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ const BrandText: React.FC = () => {
return (
<Box>
<HStack>
<Text fontSize="50px">ITS</Text>
<Text fontSize="sm">静岡大学ITソルーション室</Text>
<Text fontSize="50px" color={"white"}>
ITS
</Text>
<Text fontSize="20px" color={"white"}>
静岡大学ITソルーション室
</Text>
</HStack>
</Box>
);
Expand Down
9 changes: 4 additions & 5 deletions typing-app/src/components/molecules/UserCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React from "react";
import { Avatar, Box, Text, HStack, VStack } from "@chakra-ui/react";

const UserCard: React.FC = () => {
const bgColor = "#0000cd"; // 濃い青の背景色

// モックのユーザー情報
const user = {
Expand All @@ -13,14 +12,14 @@ const UserCard: React.FC = () => {

return (
user && (
<Box bg={bgColor} p={4} maxH="120px">
<Box bg={ "blue.600" } p={5} >
<HStack spacing={4}>
<Avatar src={user.avatarUrl} maxW="100px" borderRadius="9" />
<VStack align="start" spacing={1}>
<Text fontSize="lg" fontWeight="bold">
<VStack align="start">
<Text fontSize="lg" fontWeight="bold" color={"white"}>
名前: {user.name}
</Text>
<Text>学籍番号: {user.studentId}</Text>
<Text color={"white"}>学籍番号: {user.studentId}</Text>
</VStack>
</HStack>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion typing-app/src/components/organism/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Footer: React.FC = () => {
return (
<>
<Separator />
<Flex alignItems="center" justifyContent="space-between">
<Flex alignItems="center" justifyContent="space-between" bg={ "blue.600" }>
<BrandText />
</Flex>
</>
Expand Down

0 comments on commit 62dfc5d

Please sign in to comment.