diff --git a/assets/icons/file_icons/archive.svg b/assets/icons/file_icons/archive.svg
new file mode 100644
index 0000000000..f11115cdce
--- /dev/null
+++ b/assets/icons/file_icons/archive.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/file_icons/book.svg b/assets/icons/file_icons/book.svg
new file mode 100644
index 0000000000..890b8988a3
--- /dev/null
+++ b/assets/icons/file_icons/book.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/file_icons/camera.svg b/assets/icons/file_icons/camera.svg
new file mode 100644
index 0000000000..d8b9cf459c
--- /dev/null
+++ b/assets/icons/file_icons/camera.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/file_icons/code.svg b/assets/icons/file_icons/code.svg
new file mode 100644
index 0000000000..2733e4b535
--- /dev/null
+++ b/assets/icons/file_icons/code.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/file_icons/database.svg b/assets/icons/file_icons/database.svg
new file mode 100644
index 0000000000..9072e091b5
--- /dev/null
+++ b/assets/icons/file_icons/database.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/file_icons/eslint.svg b/assets/icons/file_icons/eslint.svg
new file mode 100644
index 0000000000..ec5051d447
--- /dev/null
+++ b/assets/icons/file_icons/eslint.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/file_icons/file.svg b/assets/icons/file_icons/file.svg
new file mode 100644
index 0000000000..cc422734e7
--- /dev/null
+++ b/assets/icons/file_icons/file.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index 401e6d1686..d1b604f05e 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -1,110 +1,134 @@
{
"suffixes": {
- "jpg": "image",
- "jpeg": "image",
- "tiff": "image",
- "svg": "image",
- "psd": "image",
- "png": "image",
- "gif": "image",
- "bmp": "image",
- "ico": "image",
- "mp4": "video",
- "webm": "video",
- "ogg": "video",
- "mp3": "audio",
- "wav": "audio",
- "flac": "audio",
"aac": "audio",
- "pdf": "document",
+ "bash": "terminal",
+ "bmp": "image",
+ "c": "code",
+ "conf": "settings",
+ "cpp": "code",
+ "css": "code",
"doc": "document",
"docx": "document",
- "xls": "document",
- "xlsx": "document",
- "ppt": "document",
- "pptx": "document",
- "odt": "document",
+ "eslintrc": "eslint",
+ "eslintrc.js": "eslint",
+ "eslintrc.json": "eslint",
+ "flac": "audio",
+ "fish": "terminal",
+ "gitattributes": "vcs",
+ "gitignore": "vcs",
+ "gif": "image",
+ "go": "code",
+ "h": "code",
+ "handlebars": "code",
+ "hbs": "template",
+ "htm": "template",
+ "html": "template",
+ "hpp": "code",
+ "ico": "image",
+ "ini": "settings",
+ "java": "code",
+ "jpeg": "image",
+ "jpg": "image",
+ "js": "code",
+ "json": "storage",
+ "lock": "lock",
+ "log": "log",
+ "md": "document",
+ "mp3": "audio",
+ "mp4": "video",
"ods": "document",
"odp": "document",
- "txt": "document",
- "rtf": "document",
- "md": "document",
- "html": "template",
- "htm": "template",
- "xml": "template",
- "hbs": "template",
- "handlebars": "template",
- "js": "code",
- "css": "code",
+ "odt": "document",
+ "ogg": "video",
+ "pdf": "document",
"php": "code",
- "c": "code",
- "cpp": "code",
- "h": "code",
- "hpp": "code",
- "java": "code",
+ "png": "image",
+ "ppt": "document",
+ "pptx": "document",
+ "prettierrc": "prettier",
+ "ps1": "terminal",
+ "psd": "image",
"py": "code",
- "swift": "code",
- "go": "code",
"rb": "code",
- "rs": "code",
"rkt": "code",
+ "rs": "rust",
+ "rtf": "document",
"scm": "code",
+ "sh": "terminal",
"sql": "code",
- "json": "settings",
- "ini": "settings",
+ "svg": "image",
+ "swift": "code",
+ "tiff": "image",
+ "toml": "settings",
+ "ts": "typescript",
+ "tsx": "code",
+ "txt": "document",
+ "wav": "audio",
+ "webm": "video",
+ "xls": "document",
+ "xlsx": "document",
+ "xml": "template",
"yaml": "settings",
"yml": "settings",
- "toml": "settings",
- "conf": "settings",
- "lock": "settings",
- "gitignore": "vcs",
- "gitattributes": "vcs",
- "ps1": "terminal",
- "sh": "terminal",
- "bash": "terminal",
- "zsh": "terminal",
- "fish": "terminal",
- "log": "log"
+ "zsh": "terminal"
},
"types": {
- "default": {
- "icon": "icons/file_icons/quill/file.svg"
- },
- "directory": {
- "icon": "icons/file_icons/quill/folder.svg"
- },
- "expanded_directory": {
- "icon": "icons/file_icons/quill/folder-open.svg"
- },
- "image": {
- "icon": "icons/file_icons/quill/image.svg"
- },
- "video": {
- "icon": "icons/file_icons/quill/file.svg"
- },
"audio": {
- "icon": "icons/file_icons/quill/file.svg"
- },
- "document": {
- "icon": "icons/file_icons/quill/book.svg"
- },
- "template": {
- "icon": "icons/file_icons/quill/html.svg"
+ "icon": "icons/file_icons/file.svg"
},
"code": {
- "icon": "icons/file_icons/quill/code.svg"
+ "icon": "icons/file_icons/code.svg"
},
- "settings": {
- "icon": "icons/file_icons/quill/settings.svg"
+ "default": {
+ "icon": "icons/file_icons/file.svg"
},
- "vcs": {
- "icon": "icons/file_icons/quill/git.svg"
+ "directory": {
+ "icon": "icons/file_icons/folder.svg"
},
- "terminal": {
- "icon": "icons/file_icons/quill/terminal.svg"
+ "document": {
+ "icon": "icons/file_icons/book.svg"
+ },
+ "eslint": {
+ "icon": "icons/file_icons/eslint.svg"
+ },
+ "expanded_directory": {
+ "icon": "icons/file_icons/folder-open.svg"
+ },
+ "image": {
+ "icon": "icons/file_icons/image.svg"
+ },
+ "lock": {
+ "icon": "icons/file_icons/lock.svg"
},
"log": {
- "icon": "icons/file_icons/quill/info.svg"
+ "icon": "icons/file_icons/info.svg"
+ },
+ "prettier": {
+ "icon": "icons/file_icons/prettier.svg"
+ },
+ "rust": {
+ "icon": "icons/file_icons/rust.svg"
+ },
+ "settings": {
+ "icon": "icons/file_icons/settings.svg"
+ },
+ "storage": {
+ "icon": "icons/file_icons/database.svg"
+ },
+ "template": {
+ "icon": "icons/file_icons/html.svg"
+ },
+ "terminal": {
+ "icon": "icons/file_icons/terminal.svg"
+ },
+ "typescript": {
+ "icon": "icons/file_icons/typescript.svg"
+ },
+ "vcs": {
+ "icon": "icons/file_icons/git.svg"
+ },
+ "video": {
+ "icon": "icons/file_icons/file.svg"
}
}
}
diff --git a/assets/icons/file_icons/folder-open.svg b/assets/icons/file_icons/folder-open.svg
new file mode 100644
index 0000000000..65c5744049
--- /dev/null
+++ b/assets/icons/file_icons/folder-open.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/file_icons/folder.svg b/assets/icons/file_icons/folder.svg
new file mode 100644
index 0000000000..5157bae839
--- /dev/null
+++ b/assets/icons/file_icons/folder.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/file_icons/git.svg b/assets/icons/file_icons/git.svg
new file mode 100644
index 0000000000..82d8c8f57c
--- /dev/null
+++ b/assets/icons/file_icons/git.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/file_icons/hash.svg b/assets/icons/file_icons/hash.svg
new file mode 100644
index 0000000000..edd0462678
--- /dev/null
+++ b/assets/icons/file_icons/hash.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/file_icons/html.svg b/assets/icons/file_icons/html.svg
new file mode 100644
index 0000000000..ba9ec14299
--- /dev/null
+++ b/assets/icons/file_icons/html.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/file_icons/image.svg b/assets/icons/file_icons/image.svg
new file mode 100644
index 0000000000..ee5e49f2d4
--- /dev/null
+++ b/assets/icons/file_icons/image.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/file_icons/info.svg b/assets/icons/file_icons/info.svg
new file mode 100644
index 0000000000..e84ae7c628
--- /dev/null
+++ b/assets/icons/file_icons/info.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/file_icons/lock.svg b/assets/icons/file_icons/lock.svg
new file mode 100644
index 0000000000..3051bbf801
--- /dev/null
+++ b/assets/icons/file_icons/lock.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/file_icons/notebook.svg b/assets/icons/file_icons/notebook.svg
new file mode 100644
index 0000000000..6eaec16d0a
--- /dev/null
+++ b/assets/icons/file_icons/notebook.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/file_icons/package.svg b/assets/icons/file_icons/package.svg
new file mode 100644
index 0000000000..2a692ba4b4
--- /dev/null
+++ b/assets/icons/file_icons/package.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/file_icons/prettier.svg b/assets/icons/file_icons/prettier.svg
new file mode 100644
index 0000000000..2d2c6ee719
--- /dev/null
+++ b/assets/icons/file_icons/prettier.svg
@@ -0,0 +1,12 @@
+
diff --git a/assets/icons/file_icons/quill/anchor.svg b/assets/icons/file_icons/quill/anchor.svg
deleted file mode 100644
index 4828578ee0..0000000000
--- a/assets/icons/file_icons/quill/anchor.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/archive.svg b/assets/icons/file_icons/quill/archive.svg
deleted file mode 100644
index c78ca0cff6..0000000000
--- a/assets/icons/file_icons/quill/archive.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/book.svg b/assets/icons/file_icons/quill/book.svg
deleted file mode 100644
index af918b5c61..0000000000
--- a/assets/icons/file_icons/quill/book.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/camera.svg b/assets/icons/file_icons/quill/camera.svg
deleted file mode 100644
index f861af607c..0000000000
--- a/assets/icons/file_icons/quill/camera.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/code.svg b/assets/icons/file_icons/quill/code.svg
deleted file mode 100644
index a844740f1a..0000000000
--- a/assets/icons/file_icons/quill/code.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/database.svg b/assets/icons/file_icons/quill/database.svg
deleted file mode 100644
index 8c98d5ac16..0000000000
--- a/assets/icons/file_icons/quill/database.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/eslint.svg b/assets/icons/file_icons/quill/eslint.svg
deleted file mode 100644
index 880689293a..0000000000
--- a/assets/icons/file_icons/quill/eslint.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/file.svg b/assets/icons/file_icons/quill/file.svg
deleted file mode 100644
index 492c383ab6..0000000000
--- a/assets/icons/file_icons/quill/file.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/folder-open.svg b/assets/icons/file_icons/quill/folder-open.svg
deleted file mode 100644
index 00a94c199f..0000000000
--- a/assets/icons/file_icons/quill/folder-open.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/folder.svg b/assets/icons/file_icons/quill/folder.svg
deleted file mode 100644
index 9cc5b4a8c9..0000000000
--- a/assets/icons/file_icons/quill/folder.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/git.svg b/assets/icons/file_icons/quill/git.svg
deleted file mode 100644
index 830a7f9565..0000000000
--- a/assets/icons/file_icons/quill/git.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/hash.svg b/assets/icons/file_icons/quill/hash.svg
deleted file mode 100644
index 36366625fe..0000000000
--- a/assets/icons/file_icons/quill/hash.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/html.svg b/assets/icons/file_icons/quill/html.svg
deleted file mode 100644
index 7704575f24..0000000000
--- a/assets/icons/file_icons/quill/html.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/image.svg b/assets/icons/file_icons/quill/image.svg
deleted file mode 100644
index 0ec9583edd..0000000000
--- a/assets/icons/file_icons/quill/image.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/info.svg b/assets/icons/file_icons/quill/info.svg
deleted file mode 100644
index af3fa9d39d..0000000000
--- a/assets/icons/file_icons/quill/info.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/lock.svg b/assets/icons/file_icons/quill/lock.svg
deleted file mode 100644
index a1e36e6c12..0000000000
--- a/assets/icons/file_icons/quill/lock.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/package.svg b/assets/icons/file_icons/quill/package.svg
deleted file mode 100644
index 9bda169cf5..0000000000
--- a/assets/icons/file_icons/quill/package.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/prettier.svg b/assets/icons/file_icons/quill/prettier.svg
deleted file mode 100644
index ba7b340654..0000000000
--- a/assets/icons/file_icons/quill/prettier.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/settings.svg b/assets/icons/file_icons/quill/settings.svg
deleted file mode 100644
index f0209bf3c2..0000000000
--- a/assets/icons/file_icons/quill/settings.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/quill/terminal.svg b/assets/icons/file_icons/quill/terminal.svg
deleted file mode 100644
index 964f44251f..0000000000
--- a/assets/icons/file_icons/quill/terminal.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/icons/file_icons/rust.svg b/assets/icons/file_icons/rust.svg
new file mode 100644
index 0000000000..1802f0e190
--- /dev/null
+++ b/assets/icons/file_icons/rust.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/file_icons/settings.svg b/assets/icons/file_icons/settings.svg
new file mode 100644
index 0000000000..e827055d19
--- /dev/null
+++ b/assets/icons/file_icons/settings.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/file_icons/terminal.svg b/assets/icons/file_icons/terminal.svg
new file mode 100644
index 0000000000..939587c53e
--- /dev/null
+++ b/assets/icons/file_icons/terminal.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/file_icons/typescript.svg b/assets/icons/file_icons/typescript.svg
new file mode 100644
index 0000000000..179b3d8572
--- /dev/null
+++ b/assets/icons/file_icons/typescript.svg
@@ -0,0 +1,5 @@
+
diff --git a/script/generate-licenses b/script/generate-licenses
index b08aa0b024..9a2fe8921a 100755
--- a/script/generate-licenses
+++ b/script/generate-licenses
@@ -6,13 +6,6 @@ OUTPUT_FILE=$(pwd)/assets/licenses.md
> $OUTPUT_FILE
-echo -e "# ###### ICON LICENSES ######\n" >> $OUTPUT_FILE
-
-echo "Generating icon licenses"
-
-cat script/licenses/willow_license.txt >> $OUTPUT_FILE
-echo -e "" >> $OUTPUT_FILE
-
echo -e "# ###### THEME LICENSES ######\n" >> $OUTPUT_FILE
echo "Generating theme licenses"
diff --git a/script/licenses/willow_license.txt b/script/licenses/willow_license.txt
deleted file mode 100644
index 56bbd45a45..0000000000
--- a/script/licenses/willow_license.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Chad Donohue
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/styles/src/style_tree/project_panel.ts b/styles/src/style_tree/project_panel.ts
index c3e82de8b0..4a252572d5 100644
--- a/styles/src/style_tree/project_panel.ts
+++ b/styles/src/style_tree/project_panel.ts
@@ -50,7 +50,7 @@ export default function project_panel(): any {
icon_color: foreground(theme.middle, "active"),
chevron_size: 7,
icon_size: 14,
- icon_spacing: 5,
+ icon_spacing: 6,
text: text(theme.middle, "sans", "variant", { size: "sm" }),
status: {
...git_status,
@@ -64,17 +64,17 @@ export default function project_panel(): any {
const unselected_default_style = merge(
base_properties,
unselected?.default ?? {},
- {}
+ {},
)
const unselected_hovered_style = merge(
base_properties,
{ background: background(theme.middle, "hovered") },
- unselected?.hovered ?? {}
+ unselected?.hovered ?? {},
)
const unselected_clicked_style = merge(
base_properties,
{ background: background(theme.middle, "pressed") },
- unselected?.clicked ?? {}
+ unselected?.clicked ?? {},
)
const selected_default_style = merge(
base_properties,
@@ -82,7 +82,7 @@ export default function project_panel(): any {
background: background(theme.lowest),
text: text(theme.lowest, "sans", { size: "sm" }),
},
- selected_style?.default ?? {}
+ selected_style?.default ?? {},
)
const selected_hovered_style = merge(
base_properties,
@@ -90,7 +90,7 @@ export default function project_panel(): any {
background: background(theme.lowest, "hovered"),
text: text(theme.lowest, "sans", { size: "sm" }),
},
- selected_style?.hovered ?? {}
+ selected_style?.hovered ?? {},
)
const selected_clicked_style = merge(
base_properties,
@@ -98,7 +98,7 @@ export default function project_panel(): any {
background: background(theme.lowest, "pressed"),
text: text(theme.lowest, "sans", { size: "sm" }),
},
- selected_style?.clicked ?? {}
+ selected_style?.clicked ?? {},
)
return toggleable({
@@ -157,7 +157,7 @@ export default function project_panel(): any {
}),
background: background(theme.middle),
padding: { left: 6, right: 6, top: 0, bottom: 6 },
- indent_width: 12,
+ indent_width: 20,
entry: default_entry,
dragged_entry: {
...default_entry.inactive.default,
@@ -175,7 +175,7 @@ export default function project_panel(): any {
default: {
icon_color: foreground(theme.middle, "variant"),
},
- }
+ },
),
cut_entry: entry(
{
@@ -190,7 +190,7 @@ export default function project_panel(): any {
size: "sm",
}),
},
- }
+ },
),
filename_editor: {
background: background(theme.middle, "on"),