Skip to content

Commit 199d5a3

Browse files
authored
CSS tweaks follow to TTC UI (#8137)
* fmt * CSS tweaks to home tabs * CSS tweaks to prompt home cards * CSS tweaks to bare MLEphant conversation pane * CSS tweaks to prompt box
1 parent 730aa7e commit 199d5a3

File tree

4 files changed

+62
-11
lines changed

4 files changed

+62
-11
lines changed

src/components/MlEphantConversation.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const MlEphantConversationInput = (
7474
return (
7575
<div className="flex flex-col p-4 gap-2">
7676
<div className="text-sm text-chalkboard-60">Enter a prompt</div>
77-
<div className="p-2 border flex flex-col gap-2">
77+
<div className="p-2 border b-4 focus-within:b-default flex flex-col gap-2">
7878
{/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
7979
<div
8080
contentEditable={true}
@@ -104,7 +104,7 @@ export const MlEphantConversationInput = (
104104
data-testid="ml-ephant-conversation-input-button"
105105
disabled={props.disabled}
106106
onClick={onClick}
107-
className="w-10 m-0 bg-ml-green p-2 flex justify-center"
107+
className="w-10 m-0 bg-ml-green text-chalkboard-100 hover:text-default p-2 flex justify-center"
108108
>
109109
<CustomIcon name="arrowUp" className="w-5 h-5 animate-bounce" />
110110
</button>
@@ -206,7 +206,7 @@ export const MlEphantConversation = (props: MlEphantConversationProps) => {
206206
{promptCards}
207207
</div>
208208
</div>
209-
<div className="border-t">
209+
<div className="border-t b-4">
210210
<MlEphantConversationInput
211211
disabled={props.disabled || props.isLoading}
212212
onProcess={onProcess}

src/components/PromptCard.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export interface ConvoCardProps extends IResponseMlConversation {
1313
}
1414

1515
export const ConvoCard = (props: ConvoCardProps) => {
16-
const cssCard = `flex flex-col border rounded-md p-2 gap-2 justify-between`
16+
const cssCard = `flex flex-col border b-4 rounded-md p-2 gap-2 justify-between`
1717
return (
1818
<div className={cssCard}>
1919
<div className="flex flex-row justify-between gap-2">
@@ -97,7 +97,7 @@ export const PromptCardActionButton = (props: {
9797
}) => {
9898
return (
9999
<button
100-
className="rounded-full bg-gray-100"
100+
className="rounded-full bg-2 hover:bg-6 text-default hover:text-5"
101101
onClick={props.onClick}
102102
disabled={
103103
props.disabled ||
@@ -194,8 +194,8 @@ export const PromptCard = (props: PromptCardProps) => {
194194

195195
const cssPrompt =
196196
props.status !== 'failed'
197-
? 'break-all shadow-sm bg-chalkboard-20 text-chalkboard-100 border rounded-t-md rounded-bl-md pl-4 pr-4 pt-2 pb-2'
198-
: 'break-all shadow-sm bg-chalkboard-20 text-chalkboard-60 border rounded-t-md rounded-bl-md pl-4 pr-4 pt-2 pb-2'
197+
? 'break-all shadow-sm bg-2 text-default border b-4 rounded-t-md rounded-bl-md pl-4 pr-4 pt-2 pb-2'
198+
: 'break-all shadow-sm bg-2 text-2 border b-4 rounded-t-md rounded-bl-md pl-4 pr-4 pt-2 pb-2'
199199

200200
return (
201201
<div className={cssCard}>

src/index.css

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,58 @@ code,
363363
}
364364

365365
@layer utilities {
366+
/** "Foreground" utilities */
367+
.text-default {
368+
@apply text-chalkboard-100 dark:text-chalkboard-10;
369+
}
370+
.text-2 {
371+
@apply text-chalkboard-70 dark:text-chalkboard-30;
372+
}
373+
.text-3 {
374+
@apply text-chalkboard-50;
375+
}
376+
.text-4 {
377+
@apply text-chalkboard-30 dark:text-chalkboard-70;
378+
}
379+
.text-5 {
380+
@apply text-chalkboard-20 dark:text-chalkboard-90;
381+
}
382+
383+
.b-default {
384+
@apply border-chalkboard-100 dark:border-chalkboard-10;
385+
}
386+
.b-2 {
387+
@apply border-chalkboard-70 dark:border-chalkboard-30;
388+
}
389+
.b-3 {
390+
@apply border-chalkboard-50;
391+
}
392+
.b-4 {
393+
@apply border-chalkboard-30 dark:border-chalkboard-80;
394+
}
395+
.b-5 {
396+
@apply border-chalkboard-20 dark:border-chalkboard-90;
397+
}
398+
399+
.bg-default {
400+
@apply bg-chalkboard-10 dark:bg-chalkboard-100;
401+
}
402+
.bg-2 {
403+
@apply bg-chalkboard-20 dark:bg-chalkboard-90;
404+
}
405+
.bg-3 {
406+
@apply bg-chalkboard-30 dark:bg-chalkboard-70;
407+
}
408+
.bg-4 {
409+
@apply bg-chalkboard-70 dark:bg-chalkboard-30;
410+
}
411+
.bg-5 {
412+
@apply bg-chalkboard-90 dark:bg-chalkboard-20;
413+
}
414+
.bg-6 {
415+
@apply bg-chalkboard-100 dark:bg-chalkboard-10;
416+
}
417+
366418
/*
367419
This is where your own custom Tailwind utility classes can go,
368420
which lets you use them with @apply in your CSS, and get

src/routes/Home.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,9 @@ function HomeTab(props: HomeTabProps) {
463463
{ name: 'Prompts', key: HomeTabKeys.Prompts },
464464
]
465465

466-
const cssTab = 'cursor-pointer border rounded-t text-lg text-center'
467-
const cssActive = `${cssTab} p-2 border-chalkboard-70 border-b-transparent`
468-
const cssInactive = `${cssTab} pl-2 pr-2 pt-2 mt-1 border text-chalkboard-90 border-chalkboard-50 bg-chalkboard-20`
466+
const cssTab = 'cursor-pointer py-2 px-5 border rounded-t text-lg text-center'
467+
const cssActive = `${cssTab} border-chalkboard-50 border-b-transparent`
468+
const cssInactive = `${cssTab} text-chalkboard-50 border border-transparent border-b-chalkboard-50 hover:text-default hover:bg-primary/10`
469469

470470
const onClickTab = (key: HomeTabKeys) => () => {
471471
setSelected(key)
@@ -478,7 +478,6 @@ function HomeTab(props: HomeTabProps) {
478478
<div
479479
key={el.key}
480480
className={el.key === selected ? cssActive : cssInactive}
481-
style={{ width: '130px' }}
482481
onClick={onClickTab(el.key)}
483482
role="tab"
484483
tabIndex={0}

0 commit comments

Comments
 (0)