diff --git a/packages/frontend/app/(dashboard)/course/[cid]/components/AsyncCentreCard.tsx b/packages/frontend/app/(dashboard)/course/[cid]/components/AsyncCentreCard.tsx index 4a8a6d243..0afe769d6 100644 --- a/packages/frontend/app/(dashboard)/course/[cid]/components/AsyncCentreCard.tsx +++ b/packages/frontend/app/(dashboard)/course/[cid]/components/AsyncCentreCard.tsx @@ -31,13 +31,14 @@ const AsyncCentreCard: React.FC = ({ > 0 && ( - +
{unreadCount} {` updated`} diff --git a/packages/frontend/app/(dashboard)/course/[cid]/components/CreateQueueModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/components/CreateQueueModal.tsx index a058d220c..e332c15c9 100644 --- a/packages/frontend/app/(dashboard)/course/[cid]/components/CreateQueueModal.tsx +++ b/packages/frontend/app/(dashboard)/course/[cid]/components/CreateQueueModal.tsx @@ -203,7 +203,7 @@ const CreateQueueModal: React.FC = ({ onClick={() => confirmLoadConfig('lab')} onMouseEnter={() => setHoveredConfig('lab')} > - Load Example Lab Config + Load Example Task Lab Config } diff --git a/packages/frontend/app/(dashboard)/course/[cid]/components/QueueCard.tsx b/packages/frontend/app/(dashboard)/course/[cid]/components/QueueCard.tsx index 4baa2f3aa..e7973e8b3 100644 --- a/packages/frontend/app/(dashboard)/course/[cid]/components/QueueCard.tsx +++ b/packages/frontend/app/(dashboard)/course/[cid]/components/QueueCard.tsx @@ -85,46 +85,46 @@ const QueueCard: React.FC = ({ }} // make the card glow if there are staff members in the queue className={cn( - 'my-4 rounded-md', + 'group my-4 rounded-md', queue.staffList.length >= 1 ? 'glowy' : '', isLinkEnabled ? 'cursor-pointer' : '', 'queueCard', )} title={ - -
+
+
{queue.room} -
- {queue?.type && ( - - {getQueueTypeLabel(queue.type)} - - )} - {queue?.isProfessorQueue && ( +
+
+ {queue?.type && ( + + {getQueueTypeLabel(queue.type)} + + )} + {queue?.isProfessorQueue && ( + + Professor Queue + + )} + {!queue.allowQuestions && ( + } + color="#591e40" + className="m-0 leading-4 text-gray-300" > - Professor Queue + Not Accepting Questions - )} - {!queue.allowQuestions && ( - - } - color="#591e40" - className="m-0 leading-4 text-gray-300" - > - Not Accepting Questions - - - )} -
+ + )}
- +
} extra={
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EditQueueModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EditQueueModal.tsx index bf35b9014..1bf59ca22 100644 --- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EditQueueModal.tsx +++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EditQueueModal.tsx @@ -979,7 +979,7 @@ const EditQueueModal: React.FC = ({ }, { key: '2', - label: 'Load Example Lab Config', + label: 'Load Example Task Lab Config', onClick: () => { const exampleLabConfigString = JSON.stringify( exampleLabConfig, diff --git a/packages/frontend/app/globals.css b/packages/frontend/app/globals.css index 2be35533d..a5308510b 100644 --- a/packages/frontend/app/globals.css +++ b/packages/frontend/app/globals.css @@ -234,7 +234,7 @@ h1, h2, h3, h4, h5, h6 { .queueCard, .asyncCentreCard { /* Tailwind shadows don't look great in this scenario so went with custom */ box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.15); - transition: box-shadow 0.3s ease; + transition: box-shadow 0.2s ease-out; } .queueCard:hover, .queueCard:focus, .asyncCentreCard:hover, .asyncCentreCard:focus { box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.45);