Skip to content

Commit c63e3a3

Browse files
authored
fix: Fixed styling on "Commit selected" page (#1028)
1 parent 9a4634a commit c63e3a3

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

src/historyView/common.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ export function transform(
6868

6969
export function getIconObject(iconName: string): { light: Uri; dark: Uri } {
7070
// XXX Maybe use full path to extension?
71-
const iconsRootPath = path.join(__dirname, "..", "..", "icons");
71+
// Path needs to be relative from out/
72+
const iconsRootPath = path.join(__dirname, "..", "icons");
7273
const toUri = (theme: string) =>
7374
Uri.file(path.join(iconsRootPath, theme, `${iconName}.svg`));
7475
return {

src/resource.ts

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { PropStatus, Status } from "./common/types";
1010
import { memoize } from "./decorators";
1111
import { configuration } from "./helpers/configuration";
1212

13+
// Path needs to be relative from out/
1314
const iconsRootPath = path.join(__dirname, "..", "icons");
1415

1516
function getIconUri(iconName: string, theme: string): Uri {

src/uri.ts

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export function toSvnUri(
3030
}
3131

3232
export function getIconUri(iconName: string, theme: string): Uri {
33+
// Path needs to be relative from out/
3334
const iconsRootPath = path.join(__dirname, "..", "icons");
3435
return Uri.file(path.join(iconsRootPath, theme, `${iconName}.svg`));
3536
}

webpack.config.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ const IGNORED = ['jschardet', 'iconv-lite', 'iconv-lite-umd', './vscodeModules']
77
/**@type {import('webpack').Configuration}*/
88
const config = {
99
target: 'node', // vscode extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
10-
10+
node: {
11+
__dirname: false
12+
},
1113
entry: './src/extension.ts', // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
1214
output: {
1315
// the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/

0 commit comments

Comments
 (0)