Skip to content

Commit 2d65151

Browse files
committed
Merge branch 'master' into dl/ai-grounding
2 parents 6ea93c1 + bdf6bdc commit 2d65151

12 files changed

+247
-193
lines changed

ai/ai-react-app/src/components/Common/FileUploader.module.css

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
.uploadButton {
99
background-color: transparent;
10-
color: var(--fb-gray-70);
11-
border: 1px dashed var(--fb-gray-40);
10+
color: var(--color-text-secondary);
11+
border: 1px dashed var(--color-border-secondary);
1212
padding: 6px 12px;
1313
border-radius: 4px;
1414
cursor: pointer;
@@ -28,21 +28,21 @@
2828
}
2929

3030
.uploadButton:hover:not(:disabled) {
31-
background-color: var(--fb-gray-30);
32-
border-color: var(--fb-gray-50);
33-
color: var(--fb-gray-90);
31+
background-color: var(--color-surface-tertiary);
32+
border-color: var(--brand-gray-50);
33+
color: var(--color-text-primary);
3434
}
3535

3636
.uploadButton:disabled {
3737
opacity: 0.5;
3838
cursor: not-allowed;
39-
color: var(--fb-gray-50);
40-
border-color: var(--fb-gray-40);
39+
color: var(--color-text-disabled);
40+
border-color: var(--color-border-secondary);
4141
}
4242

4343
.clearButton {
4444
background-color: transparent;
45-
color: var(--fb-gray-60);
45+
color: var(--color-text-placeholder);
4646
border: none;
4747
padding: 0;
4848
width: 24px;
@@ -60,12 +60,12 @@
6060
}
6161

6262
.clearButton:hover:not(:disabled) {
63-
background-color: var(--fb-gray-40);
64-
color: var(--fb-gray-90);
63+
background-color: var(--color-surface-tertiary);
64+
color: var(--color-text-primary);
6565
}
6666

6767
.clearButton:disabled {
6868
opacity: 0.5;
6969
cursor: not-allowed;
70-
color: var(--fb-gray-50);
71-
}
70+
color: var(--color-text-disabled);
71+
}

ai/ai-react-app/src/components/Common/PromptInput.module.css

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
}
1515

1616
.suggestionButton {
17-
background-color: var(--fb-gray-30);
18-
color: var(--fb-gray-80);
19-
border: 1px solid var(--fb-gray-40);
17+
background-color: var(--color-surface-tertiary);
18+
color: var(--color-text-primary);
19+
border: 1px solid var(--color-border-secondary);
2020
padding: 4px 10px;
2121
border-radius: 16px;
2222
cursor: pointer;
@@ -27,9 +27,9 @@
2727
color 0.15s ease;
2828
}
2929
.suggestionButton:hover:not(:disabled) {
30-
background-color: var(--fb-gray-40);
31-
border-color: var(--fb-gray-50);
32-
color: var(--fb-gray-95);
30+
background-color: var(--brand-gray-40);
31+
border-color: var(--brand-gray-50);
32+
color: var(--color-text-primary);
3333
}
3434
.suggestionButton:disabled {
3535
opacity: 0.5;
@@ -39,22 +39,22 @@
3939
.inputArea {
4040
display: flex;
4141
align-items: flex-end;
42-
background-color: var(--fb-gray-10);
42+
background-color: var(--color-surface-primary);
4343
border-radius: 4px;
44-
border: 1px solid var(--fb-gray-40);
44+
border: 1px solid var(--color-border-secondary);
4545
padding: 4px 4px 4px 12px;
4646
transition: border-color 0.15s ease;
4747
box-sizing: border-box;
4848
}
4949
.inputArea:focus-within {
50-
border-color: var(--google-blue);
50+
border-color: var(--color-border-focus);
5151
}
5252

5353
.promptTextarea {
5454
flex-grow: 1;
5555
background-color: transparent;
5656
border: none;
57-
color: var(--fb-gray-90);
57+
color: var(--color-text-primary);
5858
resize: none;
5959
outline: none;
6060
font-size: 0.875rem;
@@ -66,12 +66,12 @@
6666
margin-right: 8px;
6767
}
6868
.promptTextarea::placeholder {
69-
color: var(--fb-gray-60);
69+
color: var(--color-text-placeholder);
7070
}
7171

7272
.runButton {
73-
background-color: var(--google-blue);
74-
color: var(--fb-gray-100);
73+
background-color: var(--color-surface-interactive);
74+
color: var(--color-text-on-interactive);
7575
border: none;
7676
padding: 0 16px;
7777
border-radius: 4px;
@@ -86,11 +86,11 @@
8686
flex-shrink: 0;
8787
}
8888
.runButton:hover:not(:disabled) {
89-
background-color: var(--google-blue-darker);
89+
background-color: var(--color-surface-interactive-hover);
9090
}
9191
.runButton:disabled {
92-
background-color: var(--fb-gray-30);
93-
color: var(--fb-gray-50);
92+
background-color: var(--color-surface-tertiary);
93+
color: var(--color-text-disabled);
9494
cursor: not-allowed;
9595
}
9696

@@ -103,9 +103,9 @@
103103
}
104104

105105
.countButton {
106-
background-color: var(--fb-gray-30);
107-
color: var(--fb-gray-80);
108-
border: 1px solid var(--fb-gray-40);
106+
background-color: var(--color-surface-tertiary);
107+
color: var(--color-text-primary);
108+
border: 1px solid var(--color-border-secondary);
109109
padding: 4px 10px;
110110
border-radius: 4px;
111111
cursor: pointer;
@@ -118,20 +118,20 @@
118118
flex-shrink: 0;
119119
}
120120
.countButton:hover:not(:disabled) {
121-
background-color: var(--fb-gray-40);
122-
border-color: var(--fb-gray-50);
123-
color: var(--fb-gray-95);
121+
background-color: var(--brand-gray-40);
122+
border-color: var(--brand-gray-50);
123+
color: var(--color-text-primary);
124124
}
125125
.countButton:disabled {
126126
opacity: 0.5;
127127
cursor: not-allowed;
128-
background-color: var(--fb-gray-20);
129-
border-color: var(--fb-gray-30);
128+
background-color: var(--color-surface-secondary);
129+
border-color: var(--color-border-primary);
130130
}
131131

132132
.tokenCountDisplay {
133133
font-size: 0.8125rem;
134-
color: var(--fb-gray-70);
134+
color: var(--color-text-secondary);
135135
flex-grow: 1;
136136
text-align: right;
137137
min-height: 1.2em;
@@ -141,10 +141,10 @@
141141
}
142142

143143
.tokenError {
144-
color: var(--fb-error-text);
144+
color: var(--color-error-text);
145145
font-style: italic;
146146
}
147147
.tokenPlaceholder {
148-
color: var(--fb-gray-60);
148+
color: var(--color-text-placeholder);
149149
font-style: italic;
150-
}
150+
}
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
.responseContainer {
22
margin: 20px 24px;
33
padding: 0;
4-
color: var(--fb-gray-90);
4+
color: var(--color-text-primary);
55
}
66

77
.responseTitle {
8-
color: var(--fb-gray-70);
8+
color: var(--color-text-secondary);
99
font-weight: 500;
1010
margin: 0 0 12px 0;
1111
padding-bottom: 0;
@@ -16,10 +16,10 @@
1616
}
1717

1818
.responseOutput {
19-
background-color: var(--fb-gray-10);
19+
background-color: var(--color-surface-secondary);
2020
padding: 16px;
2121
border-radius: 4px;
22-
border: 1px solid var(--fb-gray-30);
22+
border: 1px solid var(--color-border-primary);
2323
min-height: 100px;
2424
margin-bottom: 16px;
2525
position: relative;
@@ -28,15 +28,15 @@
2828
font-family: "Roboto Mono", monospace;
2929
font-size: 0.875rem;
3030
line-height: 1.6;
31-
color: var(--fb-gray-90);
31+
color: var(--color-text-primary);
3232
}
3333

3434
.responseText {
3535
margin: 0;
3636
}
3737

3838
.placeholder {
39-
color: var(--fb-gray-60);
39+
color: var(--color-text-placeholder);
4040
font-style: italic;
4141
}
4242

@@ -50,48 +50,48 @@
5050
display: flex;
5151
justify-content: center;
5252
align-items: center;
53-
color: var(--fb-gray-80);
53+
color: var(--brand-gray-80);
5454
font-style: italic;
5555
border-radius: 4px;
5656
z-index: 1;
5757
}
5858

5959
.jsonDetails {
6060
margin-top: 16px;
61-
border: 1px solid var(--fb-gray-40);
61+
border: 1px solid var(--color-border-secondary);
6262
border-radius: 4px;
63-
background-color: var(--fb-gray-10);
63+
background-color: var(--color-surface-secondary);
6464
}
6565

6666
.jsonSummary {
6767
padding: 8px 12px;
6868
cursor: pointer;
69-
background-color: var(--fb-gray-10);
69+
background-color: transparent;
7070
border-radius: 4px 4px 0 0;
71-
border-bottom: 1px solid var(--fb-gray-40);
71+
border-bottom: 1px solid var(--color-border-secondary);
7272
outline: none;
7373
font-size: 0.8125rem;
74-
color: var(--fb-gray-80);
74+
color: var(--color-text-secondary);
7575
font-weight: 500;
7676
list-style: none;
7777
}
7878
.jsonSummary::-webkit-details-marker {
7979
display: none;
8080
}
8181
.jsonSummary:hover {
82-
background-color: var(--fb-gray-30);
82+
background-color: var(--color-surface-tertiary);
8383
}
8484

8585
.jsonPre {
8686
padding: 12px 16px;
8787
margin: 0;
8888
font-family: "Roboto Mono", monospace;
8989
font-size: 0.8125rem;
90-
color: var(--fb-gray-90);
90+
color: var(--color-text-primary);
9191
white-space: pre-wrap;
9292
word-wrap: break-word;
93-
background-color: var(--fb-gray-10);
93+
background-color: transparent;
9494
border-radius: 0 0 4px 4px;
9595
max-height: 400px;
9696
overflow: auto;
97-
}
97+
}

ai/ai-react-app/src/components/Layout/LeftSidebar.module.css

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
.navButton {
1212
background-color: transparent;
1313
border: none;
14-
color: var(--fb-gray-70);
14+
color: var(--color-text-secondary);
1515
padding: 8px 12px;
1616
text-align: left;
1717
width: 100%;
@@ -25,29 +25,29 @@
2525
}
2626

2727
.navButton:hover {
28-
background-color: var(--fb-gray-30);
29-
color: var(--fb-gray-95);
28+
background-color: var(--color-surface-tertiary);
29+
color: var(--color-text-primary);
3030
}
3131

3232
.navButton.active {
33-
background-color: var(--fb-gray-30);
34-
color: var(--fb-yellow);
33+
background-color: var(--color-surface-tertiary);
34+
color: var(--color-text-accent);
3535
font-weight: 500;
3636
}
3737

3838
.navButton.active:hover {
39-
background-color: var(--fb-gray-40);
39+
background-color: var(--brand-gray-40);
4040
}
4141

4242
.backendSelector {
4343
margin-top: 24px;
4444
padding: 0 12px;
45-
border-top: 1px solid var(--fb-gray-30);
45+
border-top: 1px solid var(--color-border-primary);
4646
padding-top: 16px;
4747
}
4848

4949
.selectorTitle {
50-
color: var(--fb-gray-70);
50+
color: var(--color-text-secondary);
5151
font-size: 0.75rem;
5252
font-weight: 500;
5353
margin: 0 0 8px 0;
@@ -63,11 +63,11 @@
6363
display: flex;
6464
align-items: center;
6565
font-size: 0.875rem;
66-
color: var(--fb-gray-80);
66+
color: var(--color-text-primary);
6767
cursor: pointer;
6868
}
6969

7070
.radioGroup input[type="radio"] {
7171
margin-right: 8px;
72-
accent-color: var(--google-blue);
73-
}
72+
accent-color: var(--brand-google-blue);
73+
}

0 commit comments

Comments
 (0)