Skip to content

Commit fbe777f

Browse files
authored
Merge pull request #228 from su-its/cherry-picked-3commits-from-pr223
hotfix: layout fixのfix
2 parents 8acbfa6 + a175797 commit fbe777f

File tree

6 files changed

+23
-11
lines changed

6 files changed

+23
-11
lines changed
-7.96 KB
Binary file not shown.

typing-app/src/assets/images/brand.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
.brand-text {
2-
padding-left: 5px;
2+
margin-top: 3px;
3+
margin-left: 5px;
4+
5+
img {
6+
height: 36px;
7+
}
38
}

typing-app/src/assets/sass/organism/Footer.module.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@
66
position: fixed;
77
left: 0;
88
bottom: 0;
9+
background-color: color.$blue-800;
910

10-
.brand-text {
11-
background-color: color.$blue-800;
11+
.text {
12+
margin-top: -5px;
13+
margin-left: 6px;
14+
color: color.$gray-300;
15+
font-size: 10px;
1216
}
1317
}

typing-app/src/components/molecules/BrandText.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import styles from "@/assets/sass/molecules/BrandText.module.scss";
3-
import brandImage from "@/assets/images/brand.png";
3+
import brandImage from "@/assets/images/brand.svg";
44

55
const BrandText: React.FC = () => {
66
return (

typing-app/src/components/organism/Footer.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ import BrandText from "../molecules/BrandText";
33
import Separator from "../atoms/Separater";
44
import styles from "@/assets/sass/organism/Footer.module.scss";
55

6+
const date = new Date();
7+
68
const Footer: React.FC = () => {
79
return (
8-
<>
9-
<div className={styles.footer}>
10-
<Separator />
11-
<div className={styles["brand-text"]}>
12-
<BrandText />
13-
</div>
10+
<div className={styles.footer}>
11+
<Separator />
12+
<BrandText />
13+
<div className={styles.text}>
14+
(c) 2024-{date.getFullYear()} Faculty of Informatics, Shizuoka University all rights reserved. Developed by IT
15+
Solution Room, Shizuoka University.
1416
</div>
15-
</>
17+
</div>
1618
);
1719
};
1820

0 commit comments

Comments
 (0)