Fix: Feedback Improvements (#653)

corona-school · Sep 13, 2024 · 5839e77 · 5839e77
1 parent 01d7bd6
commit 5839e77
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/src/assets/icons/loki.svg b/src/assets/icons/loki.svg
diff --git a/src/components/BackButton.tsx b/src/components/BackButton.tsx
@@ -42,7 +42,7 @@ const BackButton: React.FC<Props> = ({ onPress, previousFallbackRoute: fallback
     };
     return (
         <Button variant="none" size="icon" onClick={handleOnBack}>
-            <IconArrowLeft size={24} />
+            <IconArrowLeft size={26} style={{ strokeWidth: '1.5px' }} />
         </Button>
     );
 };

diff --git a/src/components/HeaderCard.tsx b/src/components/HeaderCard.tsx
@@ -1,5 +1,6 @@
 import { ReactNode } from 'react';
 import BackButton from './BackButton';
+import { NavLink } from 'react-router-dom';
 import Loki from '../assets/icons/loki.svg';
 
 type Props = {
@@ -23,17 +24,19 @@ const HeaderCard: React.FC<Props> = ({ children, leftContent, rightContent, onBa
             <div className="h-14 bg-primary-light fixed py-4 z-50 top-0 left-0 right-0">
                 <div className="flex items-center justify-between h-full px-4">
                     <div className="flex items-center">
-                        {showBack && <BackButton onPress={onBack} previousFallbackRoute={previousFallbackRoute} />}
-                        <Loki className="hidden lg:block" />
+                        <div className={showBack ? '' : 'invisible'}>
+                            <BackButton onPress={onBack} previousFallbackRoute={previousFallbackRoute} />
+                        </div>
+                        <NavLink to="/start" className="ml-1">
+                            <Loki className="w-[106px] h-[34px] lg:w-[125px] lg:h-[40px]" />
+                        </NavLink>
                     </div>
-                    <div className="flex flex-row items-center justify-between w-full lg:hidden">
-                        <div className="flex items-center">
-                            {rightContent}
-                            {!showBack && <Loki className="lg:hidden" />}
+                    <div className="flex flex-row items-center justify-end w-full md:hidden">
+                        <div className="flex flex-row items-center">
+                            {leftContent} {rightContent}
                         </div>
-                        <div className="flex flex-row items-center">{leftContent}</div>
                     </div>
-                    <div className="flex-row justify-end hidden lg:flex">
+                    <div className="flex-row justify-end hidden md:flex">
                         <div>{leftContent}</div>
                         <div>{rightContent}</div>
                     </div>

diff --git a/src/pages/pupil/single-course/PupilCourseButtons.tsx b/src/pages/pupil/single-course/PupilCourseButtons.tsx
@@ -187,7 +187,7 @@ const PupilCourseButtons: React.FC<ActionButtonProps> = ({ subcourse, refresh, i
                     {t(`lernfair.reason.course.pupil.${subcourse.canJoin.reason as CanJoinReason}`)}
                 </Alert>
             )}
-            <div className="flex flex-col items-center gap-y-4 md:flex-row md:gap-x-4 md:flex-wrap lg:w-1/2">
+            <div className="flex flex-col items-stretch lg:items-center gap-y-4 md:flex-row md:gap-x-4 md:flex-wrap lg:w-1/2">
                 {!subcourse.isParticipant && subcourse.canJoin?.allowed && (
                     <Button
                         disabled={loadingSubcourseJoined}

diff --git a/src/widgets/AppointmentCard.tsx b/src/widgets/AppointmentCard.tsx
@@ -402,6 +402,7 @@ const AppointmentCard: React.FC<Props> = ({
                                             duration={duration}
                                             isInstructor={isOrganizer}
                                             canJoin={isCurrent}
+                                            className="w-full h-[47px] rounded-[4px]"
                                         />
                                     </VStack>
                                 )}