Skip to content

Commit 2888fdd

Browse files
committed
Move all ResultTablesHeader styles to styled-components
1 parent a5c675b commit 2888fdd

File tree

2 files changed

+47
-45
lines changed

2 files changed

+47
-45
lines changed

extensions/ql-vscode/src/view/results/ResultTablesHeader.tsx

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,43 @@ interface Props {
1818
selectedTable: string;
1919
}
2020

21+
const Container = styled.span`
22+
display: flex;
23+
padding: 0.5em 0;
24+
align-items: center;
25+
top: 0;
26+
background-color: var(--vscode-editorGutter-background);
27+
position: sticky;
28+
z-index: 1;
29+
`;
30+
31+
const PaginationButton = styled.button`
32+
padding: 0.3rem;
33+
margin: 0.2rem;
34+
border: 0;
35+
font-size: large;
36+
color: var(--vscode-editor-foreground);
37+
background-color: var(--vscode-editorGutter-background);
38+
cursor: pointer;
39+
opacity: 0.8;
40+
41+
&:hover {
42+
opacity: 1;
43+
}
44+
`;
45+
46+
const PageNumberInput = styled.input`
47+
border-radius: 0;
48+
padding: 0.3rem;
49+
margin: 0.2rem;
50+
width: 2rem;
51+
color: var(--vscode-editor-foreground);
52+
border: 0;
53+
border-bottom: 1px solid var(--vscode-editor-foreground);
54+
background-color: var(--vscode-editorGutter-background);
55+
outline: none;
56+
`;
57+
2158
const OpenQueryLink = styled(TextButton)`
2259
text-decoration: none;
2360
`;
@@ -110,9 +147,9 @@ export function ResultTablesHeader(props: Props) {
110147
}, [queryPath]);
111148

112149
return (
113-
<span className="vscode-codeql__table-selection-pagination">
114-
<button onClick={prevPageHandler}>&#xab;</button>
115-
<input
150+
<Container>
151+
<PaginationButton onClick={prevPageHandler}>&#xab;</PaginationButton>
152+
<PageNumberInput
116153
type="number"
117154
size={3}
118155
value={selectedPage}
@@ -123,16 +160,16 @@ export function ResultTablesHeader(props: Props) {
123160
onKeyDown={onKeyDownHandler}
124161
/>
125162
<span>/&nbsp;{numPages}</span>
126-
<button value=">" onClick={nextPageHandler}>
163+
<PaginationButton value=">" onClick={nextPageHandler}>
127164
&#xbb;
128-
</button>
165+
</PaginationButton>
129166
<div className={tableHeaderItemClassName}>{queryName}</div>
130167
<div className={tableHeaderItemClassName}>
131168
<OpenQueryLink onClick={openQueryHandler}>
132169
Open {basename(queryPath)}
133170
</OpenQueryLink>
134171
</div>
135-
</span>
172+
</Container>
136173
);
137174
}
138175

extensions/ql-vscode/src/view/results/resultsView.css

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@
1111
justify-content: space-between;
1212
}
1313

14-
.vscode-codeql__table-selection-pagination {
15-
display: flex;
16-
padding: 0.5em 0;
17-
align-items: center;
18-
top: 0;
19-
background-color: var(--vscode-editorGutter-background);
20-
position: sticky;
21-
z-index: 1;
22-
}
23-
2414
.vscode-codeql__table-selection-header-item {
2515
padding-left: 2em;
2616
}
@@ -29,35 +19,6 @@
2919
border: 0;
3020
}
3121

32-
.vscode-codeql__table-selection-pagination button {
33-
padding: 0.3rem;
34-
margin: 0.2rem;
35-
border: 0;
36-
font-size: large;
37-
color: var(--vscode-editor-foreground);
38-
background-color: var(--vscode-editorGutter-background);
39-
cursor: pointer;
40-
opacity: 0.8;
41-
}
42-
43-
.vscode-codeql__table-selection-pagination button:hover {
44-
opacity: 1;
45-
}
46-
47-
.vscode-codeql__table-selection-pagination input[type="number"] {
48-
border-radius: 0;
49-
padding: 0.3rem;
50-
margin: 0.2rem;
51-
width: 2rem;
52-
border-radius: 0;
53-
color: var(--vscode-editor-foreground);
54-
border: 0;
55-
border-bottom: 1px solid var(--vscode-editor-foreground);
56-
background-color: var(--vscode-editorGutter-background);
57-
border-radius: 0;
58-
outline: none;
59-
}
60-
6122
.vscode-codeql__result-table-alert-extras {
6223
display: inline-block;
6324
text-align: left;
@@ -244,3 +205,7 @@ td.vscode-codeql__path-index-cell {
244205
font-size: 14px;
245206
text-align: center;
246207
}
208+
209+
.vscode-codeql__result-table-location-link {
210+
text-decoration: none;
211+
}

0 commit comments

Comments
 (0)