Today
diff --git a/client/src/features/viewers/foh/Public.module.css b/client/src/features/viewers/foh/Public.module.css
index 3ca997d69..97518aca7 100644
--- a/client/src/features/viewers/foh/Public.module.css
+++ b/client/src/features/viewers/foh/Public.module.css
@@ -112,47 +112,6 @@
border-radius: 0 2vw 2vw 0;
}
-.nowTitle,
-.nextTitle {
- color: #ddd;
- font-weight: 400;
-}
-
-.nowSubtitle,
-.nowPresenter,
-.nextSubtitle,
-.nextPresenter {
- color: #aaa;
-}
-
-.nowTitle {
- font-size: 2.5vw;
-}
-
-.nowSubtitle,
-.nowPresenter {
- font-size: 2vw;
-}
-
-.nextTitle {
- font-size: 2vw;
-}
-
-.nextSubtitle,
-.nextPresenter {
- color: #aaa;
- font-size: 1.5vw;
-}
-
-.nowTitle:after,
-.nowSubtitle:after,
-.nowPresenter:after,
-.nextTitle:after,
-.nextSubtitle:after,
-.nextPresenter:after {
- content: '\200b';
-}
-
/* =================== SCHEDULE ===================*/
.todayContainer {
diff --git a/client/src/features/viewers/presenter/PresenterView.jsx b/client/src/features/viewers/presenter/PresenterView.jsx
index c7b8aea07..406fb322d 100644
--- a/client/src/features/viewers/presenter/PresenterView.jsx
+++ b/client/src/features/viewers/presenter/PresenterView.jsx
@@ -1,6 +1,8 @@
+import { AnimatePresence, motion } from 'framer-motion';
import Countdown from '../../../common/components/countdown/Countdown';
import MyProgressBar from '../../../common/components/myProgressBar/MyProgressBar';
import NavLogo from '../../../common/components/nav/NavLogo';
+import TitleCard from '../../../common/components/views/TitleCard';
import style from './PresenterView.module.css';
export default function PresenterView(props) {
@@ -9,6 +11,22 @@ export default function PresenterView(props) {
const showOverlay = pres.text !== '' && pres.visible;
const isPlaying = time.playstate === 'start';
+ // motion
+ const titleVariants = {
+ hidden: {
+ y: 500,
+ },
+ visible: {
+ y: 0,
+ transition: {
+ duration: 1,
+ },
+ },
+ exit: {
+ y: 500,
+ },
+ };
+
return (
)}
- {title.showNow && (
-
-
Now
-
{title.titleNow}
-
{title.subtitleNow}
-
{title.presenterNow}
-
- )}
+
+ {title.showNow && (
+
+
+
+ )}
+
- {title.showNext && (
-
-
Next
-
{title.titleNext}
-
{title.subtitleNext}
-
{title.presenterNext}
-
- )}
+
+ {title.showNext && (
+
+
+
+ )}
+
);
}
diff --git a/client/src/features/viewers/presenter/PresenterView.module.css b/client/src/features/viewers/presenter/PresenterView.module.css
index ffc353d1f..2f4be9bae 100644
--- a/client/src/features/viewers/presenter/PresenterView.module.css
+++ b/client/src/features/viewers/presenter/PresenterView.module.css
@@ -57,32 +57,6 @@
grid-area: next;
}
-.title,
-.subtitle,
-.presenter {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
-.title {
- color: #ddd;
- font-size: 2.5vw;
- flex: 1;
-}
-
-.subtitle,
-.presenter {
- color: #aaa;
- font-size: 2vw;
-}
-
-.title:after,
-.presenter:after,
-.subtitle:after {
- content: '\200b';
-}
-
/* =================== MAIN ===================*/
.timerContainer,
@@ -111,11 +85,13 @@
width: 80%;
margin: 0 auto;
opacity: 1;
+ transition: 0.5s;
}
.countdownPaused,
.progressContainerPaused {
opacity: 0.6;
+ transition: 0.5s;
}
.container__grayFinished {