Skip to content
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
21 changes: 21 additions & 0 deletions apps/web/src/App.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
padding: 0;
}

.screen {
width: 100%;
height: 100%;
border-radius: 36px;
overflow: hidden;
position: relative;
}

.phone-container {
width: 375px;
height: 812px;
Expand All @@ -20,6 +28,19 @@
overflow-x: hidden;
}

@media (max-width: 460px) {
.phone-container {
width: 100vw;
height: 100vh;
margin: 0;
border-radius: 0;
}

.screen {
border-radius: 0;
}
}

/* テスト用の結果画面 */
.testResult {
padding: 20px;
Expand Down
18 changes: 2 additions & 16 deletions apps/web/src/components/home/HomeScreen.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,6 @@
}
}

.screen {
width: 100%;
height: 100%;
border-radius: 36px;
overflow: hidden;
position: relative;
display: none;
}

.screen.active {
display: block;
animation: fadeIn 0.4s ease-out;
}

.home-screen {
background: linear-gradient(
180deg,
Expand Down Expand Up @@ -130,7 +116,7 @@
font-size: 20px;
color: var(--text-secondary);
margin-top: 0px;
margin-bottom: 40px;
margin-bottom: 60px;
line-height: 1.5;
opacity: 0;
transform: translateY(20px);
Expand All @@ -140,7 +126,7 @@
.character-area {
width: 85%;
height: 85%;
margin-bottom: 60px;
margin-bottom: 80px;
opacity: 0;
position: relative;
transform: scale(0.8);
Expand Down
4 changes: 3 additions & 1 deletion apps/web/src/components/home/HomeScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { motion } from 'framer-motion';
import huntoru from '../../assets/huntoru.png';
import styles from './HomeScreen.module.css';

import components from '@/web/App.module.css';

export const HomeScreen = () => {
const navigate = useNavigate();

Expand All @@ -16,7 +18,7 @@ export const HomeScreen = () => {

return (
<motion.div
className={clsx(styles.screen, styles['home-screen'], styles.active)}
className={clsx(components.screen, styles['home-screen'], styles.active)}
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
exit={{ opacity: 0, x: -100 }}
Expand Down
29 changes: 21 additions & 8 deletions apps/web/src/components/mode/ModeScreen.module.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
.screen {
width: 100%;
height: 100%;
border-radius: 36px;
overflow: hidden;
position: relative;
}

.content {
height: 100%;
position: relative;
Expand All @@ -25,6 +17,12 @@
padding: 40px 20px 30px;
}

@media (max-width: 460px) {
.difficulty-header {
padding: 80px 20px 30px;
}
}

.pixel-bubble {
position: absolute;
width: 220px;
Expand All @@ -45,6 +43,21 @@
font-family: 'Courier New', Courier;
}

@media (max-width: 460px) {
.pixel-bubble {
position: absolute;
width: 220px;
height: 220px;
top: 10px;
left: 60px;
color: var(--primary-bg);
}
.pixel-bubble-text {
top: 77px;
left: 85px;
}
}

.huntoru-icon {
width: 80px;
position: relative;
Expand Down
3 changes: 2 additions & 1 deletion apps/web/src/components/mode/ModeScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import huntoru from '../../assets/huntoru.png';
import { PixelBubble } from '../ui/PixelBubble';
import styles from './ModeScreen.module.css';

import components from '@/web/App.module.css';
import { API_CONFIG } from '@/web/lib/api';
import type { Theme } from '@/web/types';

Expand Down Expand Up @@ -37,7 +38,7 @@ export const ModeScreen = () => {

return (
<motion.div
className={clsx(styles.screen, styles['difficulty-screen'])}
className={clsx(components.screen, styles['difficulty-screen'])}
initial={{ opacity: 0, x: 100 }}
animate={{ opacity: 1, x: 0 }}
exit={{ opacity: 0, x: -100 }}
Expand Down
20 changes: 9 additions & 11 deletions apps/web/src/components/photo/PhotoPreview.module.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
.screen {
width: 100%;
height: 100%;
border-radius: 36px;
overflow: hidden;
position: relative;
/* display: none; */
}

/* Screen 3.5: Photo Preview Screen */
.preview-screen {
background: linear-gradient(
Expand All @@ -27,6 +18,7 @@
display: flex;
flex-direction: column;
padding: 20px;
box-sizing: border-box;
}

.time-info {
Expand Down Expand Up @@ -83,8 +75,8 @@
font-size: 16px;
font-weight: 500;
text-align: center;
min-height: 300px;
max-height: 400px;
/* min-height: 300px; */
max-height: calc(100vh - 460px);
border: 3px solid var(--warm-brown);
box-shadow: 0 8px 25px rgba(139, 69, 19, 0.15);
overflow: hidden;
Expand All @@ -96,6 +88,12 @@
}
}

@media (max-width: 460px) {
.photo-preview-area {
max-height: calc(100vh - 420px);
}
}

.preview-actions {
display: flex;
flex-direction: column;
Expand Down
3 changes: 2 additions & 1 deletion apps/web/src/components/photo/PhotoPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { motion } from 'framer-motion';

import styles from './PhotoPreview.module.css';

import components from '@/web/App.module.css';
import { API_CONFIG } from '@/web/lib/api';

interface PhotoPreviewProps {
Expand Down Expand Up @@ -82,7 +83,7 @@ export const PhotoPreview = (props: PhotoPreviewProps) => {

return (
<motion.div
className={clsx(styles['screen'], styles['preview-screen'])}
className={clsx(components.screen, styles['preview-screen'])}
initial={{ opacity: 0, x: 100 }}
animate={{ opacity: 1, x: 0 }}
exit={{ opacity: 0, x: -100 }}
Expand Down
15 changes: 9 additions & 6 deletions apps/web/src/components/photo/PhotoScreen.module.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
.screen {
width: 100%;
.content {
height: 100%;
border-radius: 36px;
overflow: hidden;
position: relative;
/* display: none; */
overflow-y: auto;
}

.photo-screen {
Expand All @@ -15,7 +12,7 @@
);
}

.photo-Content {
.photo-content {
height: 100%;
position: relative;
display: flex;
Expand Down Expand Up @@ -93,6 +90,12 @@
transition: all 0.3s ease;
}

@media (max-width: 460px) {
.camera-main {
flex: 1;
}
}

/* Camera UI Elements */
.camera-overlay {
position: absolute;
Expand Down
3 changes: 2 additions & 1 deletion apps/web/src/components/photo/PhotoScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { motion } from 'framer-motion';
import { Camera } from '../camera';
import styles from './PhotoScreen.module.css';

import components from '@/web/App.module.css';
import type { CameraRef } from '@/web/components/camera/types';
import type { Theme } from '@/web/types';

Expand Down Expand Up @@ -140,7 +141,7 @@ export const PhotoScreen = () => {

return (
<motion.div
className={clsx(styles['screen'], styles['photo-screen'])}
className={clsx(components.screen, styles['photo-screen'])}
initial={{ opacity: 0, x: 100 }}
animate={{ opacity: 1, x: 0 }}
exit={{ opacity: 0, x: -100 }}
Expand Down
8 changes: 0 additions & 8 deletions apps/web/src/components/result/ResultScreen.module.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
.screen {
width: 100%;
height: 100%;
border-radius: 36px;
overflow: hidden;
position: relative;
}

.result-screen {
background: linear-gradient(
180deg,
Expand Down
3 changes: 2 additions & 1 deletion apps/web/src/components/result/ResultScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { motion } from 'framer-motion';
import { PixelBubble } from '../ui/PixelBubble';
import styles from './ResultScreen.module.css';

import components from '@/web/App.module.css';
import huntoru_angry from '@/web/assets/huntoru_angry.gif';
import huntoru_happy from '@/web/assets/huntoru_happy.gif';

Expand Down Expand Up @@ -107,7 +108,7 @@ export const ResultScreen = () => {

return (
<motion.div
className={clsx(styles.screen, styles['result-screen'])}
className={clsx(components.screen, styles['result-screen'])}
initial={{ opacity: 0, x: 100 }}
animate={{ opacity: 1, x: 0 }}
exit={{ opacity: 0, x: -100 }}
Expand Down