diff --git a/.gitignore b/.gitignore index 8648b79..aadaad1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,5 @@ dist/ node_modules/ .DS_Store +themes/ icons/ -themes/ \ No newline at end of file diff --git a/README.md b/README.md index 01d3014..38a60b3 100644 --- a/README.md +++ b/README.md @@ -55,9 +55,9 @@ git clone https://github.com/equinusocio/vsc-material-theme.git Equinusocio.vsc- Launch *Quick Open*, - - Linux `Ctrl+P` - - macOS `Shift+⌘+P` - - Windows `Ctrl+P` + - Linux `Ctrl + Shift + P` + - macOS `⌘ + Shift + P` + - Windows `Ctrl + Shift + P` Type `theme` and choose `Preferences: Color Theme`, then select Material Theme from the list. @@ -67,9 +67,9 @@ This theme provides different color variants, to change the active theme variant Launch *Quick Open*, - - Linux `Ctrl+P` - - macOS `Shift+⌘+P` - - Windows `Ctrl+P` + - Linux `Ctrl + Shift + P` + - macOS `⌘ + Shift + P` + - Windows `Ctrl + Shift + P` type `icon theme` and select `Material Theme Icons` from the drop-down menu. @@ -77,9 +77,9 @@ type `icon theme` and select `Material Theme Icons` from the drop-down menu. Launch *Quick Open*, - - Linux `Ctrl+P` - - macOS `Shift+⌘+P` - - Windows `Ctrl+P` + - Linux `Ctrl + Shift + P` + - macOS `⌘ + Shift + P` + - Windows `Ctrl + Shift + P` Type `Material Theme` and choose `Material Theme: Settings`, then select `Change accent color` and pick one color from the list. diff --git a/package.json b/package.json index afaf19e..44eb7f4 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,11 @@ "themes": [ { "label": "Material Theme", +<<<<<<< HEAD "path": "./themes/Material-Theme-Palenight.json", +======= + "path": "./themes/Material-Theme-Default.json", +>>>>>>> 65fc2cae16345c34c34e2475d767d9f5ab18f50b "uiTheme": "vs-dark" } ], diff --git a/src/icons/svgs/folder_vscode.svg b/src/icons/svgs/folder_vscode.svg index c39d214..0922e9a 100644 --- a/src/icons/svgs/folder_vscode.svg +++ b/src/icons/svgs/folder_vscode.svg @@ -1 +1 @@ -folder_vscode \ No newline at end of file +folder_vscode \ No newline at end of file diff --git a/src/icons/svgs/folder_vscode_open.svg b/src/icons/svgs/folder_vscode_open.svg index 43e5b32..7b36012 100644 --- a/src/icons/svgs/folder_vscode_open.svg +++ b/src/icons/svgs/folder_vscode_open.svg @@ -1 +1 @@ -folder_vscode_open \ No newline at end of file +folder_vscode_open \ No newline at end of file