diff --git a/extensions/ql-vscode/src/remote-queries/view/DownloadButton.tsx b/extensions/ql-vscode/src/remote-queries/view/DownloadButton.tsx index edbba030e..233860564 100644 --- a/extensions/ql-vscode/src/remote-queries/view/DownloadButton.tsx +++ b/extensions/ql-vscode/src/remote-queries/view/DownloadButton.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import * as octicons from '../../view/octicons'; import styled from 'styled-components'; +import { DownloadIcon } from '@primer/octicons-react'; const ButtonLink = styled.a` display: inline-block; @@ -16,7 +16,7 @@ const ButtonLink = styled.a` const DownloadButton = ({ text, onClick }: { text: string, onClick: () => void }) => ( - {octicons.download}{text} + {text} ); diff --git a/extensions/ql-vscode/src/remote-queries/view/RemoteQueries.tsx b/extensions/ql-vscode/src/remote-queries/view/RemoteQueries.tsx index 9fb0650bb..be22b814f 100644 --- a/extensions/ql-vscode/src/remote-queries/view/RemoteQueries.tsx +++ b/extensions/ql-vscode/src/remote-queries/view/RemoteQueries.tsx @@ -4,7 +4,6 @@ import * as Rdom from 'react-dom'; import { ThemeProvider } from '@primer/react'; import { ToRemoteQueriesMessage } from '../../pure/interface-types'; import { AnalysisSummary, RemoteQueryResult } from '../shared/remote-query-result'; -import * as octicons from '../../view/octicons'; import { vscode } from '../../view/vscode-api'; @@ -17,7 +16,7 @@ import DownloadButton from './DownloadButton'; import { AnalysisResults } from '../shared/analysis-result'; import DownloadSpinner from './DownloadSpinner'; import CollapsibleItem from './CollapsibleItem'; -import { FileSymlinkFileIcon } from '@primer/octicons-react'; +import { CodeSquareIcon, FileIcon, FileSymlinkFileIcon, RepoIcon } from '@primer/octicons-react'; const numOfReposInContractedMode = 10; @@ -78,12 +77,14 @@ const QueryInfo = (queryResult: RemoteQueryResult) => ( {queryResult.totalResultCount} results from running against {queryResult.totalRepositoryCount} repositories ({queryResult.executionDuration}), {queryResult.executionTimestamp} - {octicons.file} + + openQueryFile(queryResult)}> {queryResult.queryFileName} - {octicons.codeSquare} + + openQueryTextVirtualFile(queryResult)}> query @@ -155,7 +156,7 @@ const SummaryItem = ({ analysisResults: AnalysisResults | undefined }) => ( - {octicons.repo} + {analysisSummary.nwo} diff --git a/extensions/ql-vscode/src/remote-queries/view/remoteQueries.css b/extensions/ql-vscode/src/remote-queries/view/remoteQueries.css index 4b124d9b2..188f41f2a 100644 --- a/extensions/ql-vscode/src/remote-queries/view/remoteQueries.css +++ b/extensions/ql-vscode/src/remote-queries/view/remoteQueries.css @@ -1,15 +1,3 @@ -.octicon { - fill: var(--vscode-editor-foreground); - height: 1.2em; - width: 1.2em; - vertical-align: middle; - display: inline-block; -} - -.octicon-light { - opacity: 0.6; -} - .vscode-codeql__query-file { padding-right: 1em; } diff --git a/extensions/ql-vscode/src/view/octicons.tsx b/extensions/ql-vscode/src/view/octicons.tsx index bc24ca62c..b01ad3c53 100644 --- a/extensions/ql-vscode/src/view/octicons.tsx +++ b/extensions/ql-vscode/src/view/octicons.tsx @@ -20,23 +20,3 @@ export const listUnordered = ; - -/** - * The icons below come from https://primer.style/octicons/ - */ - -export const file = - -; - -export const codeSquare = - -; - -export const repo = - -; - -export const download = - -;