diff --git a/.gitattributes b/.gitattributes index 968e847..e978847 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,4 @@ /img export-ignore -/status_icons/letters/status_added.png export-ignore -/status_icons/letters/status_added@2x.png export-ignore -/status_icons/letters/status_added@3x.png export-ignore *.svg export-ignore *.bat export-ignore *.bat -linguist-detectable diff --git a/Brackets.sublime-theme b/Brackets.sublime-theme index d88053b..da81013 100644 --- a/Brackets.sublime-theme +++ b/Brackets.sublime-theme @@ -425,7 +425,10 @@ "class": "vcs_status_badge", "parents": [{"class": "file_system_entry", "attributes": ["untracked"]}], "settings": {"git_status_icons": "letters"}, - "layer0.texture": "Theme - Brackets/status_icons/letters/status_untracked.png", + "layer0.texture": "Theme - Brackets/status_icons/letters/badge.png", + "layer1.texture": "Theme - Brackets/status_icons/letters/status_untracked.png", + "layer1.opacity": 1.0, + "layer1.tint": "var(label_dark)", "content_margin": [15, 15, 0, 0] }, { @@ -451,7 +454,10 @@ "class": "vcs_status_badge", "parents": [{"class": "file_system_entry", "attributes": ["added"]}], "settings": {"git_status_icons": "letters"}, - "layer0.texture": "Theme - Brackets/status_icons/letters/status_staged.png", + "layer0.texture": "Theme - Brackets/status_icons/letters/badge.png", + "layer1.texture": "Theme - Brackets/status_icons/letters/status_staged.png", + "layer1.opacity": 1.0, + "layer1.tint": "var(label_dark)", "content_margin": [15, 15, 0, 0] }, { @@ -477,7 +483,10 @@ "class": "vcs_status_badge", "parents": [{"class": "file_system_entry", "attributes": ["modified"]}], "settings": {"git_status_icons": "letters"}, - "layer0.texture": "Theme - Brackets/status_icons/letters/status_modified.png", + "layer0.texture": "Theme - Brackets/status_icons/letters/badge.png", + "layer1.texture": "Theme - Brackets/status_icons/letters/status_modified.png", + "layer1.opacity": 1.0, + "layer1.tint": "var(label_dark)", "content_margin": [15, 15, 0, 0] }, { @@ -503,7 +512,10 @@ "class": "vcs_status_badge", "parents": [{"class": "file_system_entry", "attributes": ["staged"]}], "settings": {"git_status_icons": "letters"}, - "layer0.texture": "Theme - Brackets/status_icons/letters/status_staged.png", + "layer0.texture": "Theme - Brackets/status_icons/letters/badge.png", + "layer1.texture": "Theme - Brackets/status_icons/letters/status_staged.png", + "layer1.opacity": 1.0, + "layer1.tint": "var(label_dark)", "content_margin": [15, 15, 0, 0] }, { @@ -529,7 +541,10 @@ "class": "vcs_status_badge", "parents": [{"class": "file_system_entry", "attributes": ["missing"]}], "settings": {"git_status_icons": "letters"}, - "layer0.texture": "Theme - Brackets/status_icons/letters/status_missing.png", + "layer0.texture": "Theme - Brackets/status_icons/letters/badge.png", + "layer1.texture": "Theme - Brackets/status_icons/letters/status_missing.png", + "layer1.opacity": 1.0, + "layer1.tint": "var(label_dark)", "content_margin": [15, 15, 0, 0] }, { @@ -555,7 +570,10 @@ "class": "vcs_status_badge", "parents": [{"class": "file_system_entry", "attributes": ["deleted"]}], "settings": {"git_status_icons": "letters"}, - "layer0.texture": "Theme - Brackets/status_icons/letters/status_staged.png", + "layer0.texture": "Theme - Brackets/status_icons/letters/badge.png", + "layer1.texture": "Theme - Brackets/status_icons/letters/status_staged.png", + "layer1.opacity": 1.0, + "layer1.tint": "var(label_dark)", "content_margin": [15, 15, 0, 0] }, { @@ -581,7 +599,10 @@ "class": "vcs_status_badge", "parents": [{"class": "file_system_entry", "attributes": ["unmerged"]}], "settings": {"git_status_icons": "letters"}, - "layer0.texture": "Theme - Brackets/status_icons/letters/status_unmerged.png", + "layer0.texture": "Theme - Brackets/status_icons/letters/badge.png", + "layer1.texture": "Theme - Brackets/status_icons/letters/status_unmerged.png", + "layer1.opacity": 1.0, + "layer1.tint": "var(label_dark)", "content_margin": [15, 15, 0, 0] }, ////////[ Tabs ]//////////////////////////////////////////////////////////////// diff --git a/status_icons/letters/badge.png b/status_icons/letters/badge.png new file mode 100644 index 0000000..de7792f Binary files /dev/null and b/status_icons/letters/badge.png differ diff --git a/status_icons/letters/badge.svg b/status_icons/letters/badge.svg new file mode 100644 index 0000000..fb0a54e --- /dev/null +++ b/status_icons/letters/badge.svg @@ -0,0 +1,3 @@ + + + diff --git a/status_icons/letters/badge@2x.png b/status_icons/letters/badge@2x.png new file mode 100644 index 0000000..8da42cd Binary files /dev/null and b/status_icons/letters/badge@2x.png differ diff --git a/status_icons/letters/badge@3x.png b/status_icons/letters/badge@3x.png new file mode 100644 index 0000000..d655e86 Binary files /dev/null and b/status_icons/letters/badge@3x.png differ diff --git a/status_icons/letters/convert.bat b/status_icons/letters/convert.bat index 77849d5..32bc012 100644 --- a/status_icons/letters/convert.bat +++ b/status_icons/letters/convert.bat @@ -1,9 +1,6 @@ -inkscape --export-type=png -w 15 -h 15 --export-filename=status_added.png status_added.svg -inkscape --export-type=png -w 30 -h 30 --export-filename=status_added@2x.png status_added.svg -inkscape --export-type=png -w 45 -h 45 --export-filename=status_added@3x.png status_added.svg -inkscape --export-type=png -w 15 -h 15 --export-filename=status_ignored.png status_ignored.svg -inkscape --export-type=png -w 30 -h 30 --export-filename=status_ignored@2x.png status_ignored.svg -inkscape --export-type=png -w 45 -h 45 --export-filename=status_ignored@3x.png status_ignored.svg +inkscape --export-type=png -w 15 -h 15 --export-filename=badge.png badge.svg +inkscape --export-type=png -w 30 -h 30 --export-filename=badge@2x.png badge.svg +inkscape --export-type=png -w 45 -h 45 --export-filename=badge@3x.png badge.svg inkscape --export-type=png -w 15 -h 15 --export-filename=status_missing.png status_missing.svg inkscape --export-type=png -w 30 -h 30 --export-filename=status_missing@2x.png status_missing.svg inkscape --export-type=png -w 45 -h 45 --export-filename=status_missing@3x.png status_missing.svg diff --git a/status_icons/letters/status_added.png b/status_icons/letters/status_added.png deleted file mode 100644 index 40dfc59..0000000 Binary files a/status_icons/letters/status_added.png and /dev/null differ diff --git a/status_icons/letters/status_added.svg b/status_icons/letters/status_added.svg deleted file mode 100644 index e9d6a66..0000000 --- a/status_icons/letters/status_added.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - A - diff --git a/status_icons/letters/status_added@2x.png b/status_icons/letters/status_added@2x.png deleted file mode 100644 index 433c64f..0000000 Binary files a/status_icons/letters/status_added@2x.png and /dev/null differ diff --git a/status_icons/letters/status_added@3x.png b/status_icons/letters/status_added@3x.png deleted file mode 100644 index 0472c37..0000000 Binary files a/status_icons/letters/status_added@3x.png and /dev/null differ diff --git a/status_icons/letters/status_ignored.png b/status_icons/letters/status_ignored.png index e71c4b4..b278a17 100644 Binary files a/status_icons/letters/status_ignored.png and b/status_icons/letters/status_ignored.png differ diff --git a/status_icons/letters/status_ignored.svg b/status_icons/letters/status_ignored.svg deleted file mode 100644 index 1392b43..0000000 --- a/status_icons/letters/status_ignored.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - I - diff --git a/status_icons/letters/status_ignored@2x.png b/status_icons/letters/status_ignored@2x.png index 8d93190..fd6b635 100644 Binary files a/status_icons/letters/status_ignored@2x.png and b/status_icons/letters/status_ignored@2x.png differ diff --git a/status_icons/letters/status_ignored@3x.png b/status_icons/letters/status_ignored@3x.png index 653b6f7..35c506e 100644 Binary files a/status_icons/letters/status_ignored@3x.png and b/status_icons/letters/status_ignored@3x.png differ diff --git a/status_icons/letters/status_missing.png b/status_icons/letters/status_missing.png index 054993c..25ae56d 100644 Binary files a/status_icons/letters/status_missing.png and b/status_icons/letters/status_missing.png differ diff --git a/status_icons/letters/status_missing.svg b/status_icons/letters/status_missing.svg index 44b7e51..7c4b1a4 100644 --- a/status_icons/letters/status_missing.svg +++ b/status_icons/letters/status_missing.svg @@ -1,4 +1,3 @@ - - D + D diff --git a/status_icons/letters/status_missing@2x.png b/status_icons/letters/status_missing@2x.png index 475a8b0..c3f5d55 100644 Binary files a/status_icons/letters/status_missing@2x.png and b/status_icons/letters/status_missing@2x.png differ diff --git a/status_icons/letters/status_missing@3x.png b/status_icons/letters/status_missing@3x.png index 2e09935..c844747 100644 Binary files a/status_icons/letters/status_missing@3x.png and b/status_icons/letters/status_missing@3x.png differ diff --git a/status_icons/letters/status_modified.png b/status_icons/letters/status_modified.png index 0b8f03a..9beb8e8 100644 Binary files a/status_icons/letters/status_modified.png and b/status_icons/letters/status_modified.png differ diff --git a/status_icons/letters/status_modified.svg b/status_icons/letters/status_modified.svg index 496be37..99b4c0c 100644 --- a/status_icons/letters/status_modified.svg +++ b/status_icons/letters/status_modified.svg @@ -1,4 +1,3 @@ - - M + M diff --git a/status_icons/letters/status_modified@2x.png b/status_icons/letters/status_modified@2x.png index be98784..cc706f0 100644 Binary files a/status_icons/letters/status_modified@2x.png and b/status_icons/letters/status_modified@2x.png differ diff --git a/status_icons/letters/status_modified@3x.png b/status_icons/letters/status_modified@3x.png index fcaaa18..f123dff 100644 Binary files a/status_icons/letters/status_modified@3x.png and b/status_icons/letters/status_modified@3x.png differ diff --git a/status_icons/letters/status_staged.png b/status_icons/letters/status_staged.png index ef20dd1..ffbe0f6 100644 Binary files a/status_icons/letters/status_staged.png and b/status_icons/letters/status_staged.png differ diff --git a/status_icons/letters/status_staged.svg b/status_icons/letters/status_staged.svg index 759bbaf..6c309d5 100644 --- a/status_icons/letters/status_staged.svg +++ b/status_icons/letters/status_staged.svg @@ -1,4 +1,3 @@ - ยป diff --git a/status_icons/letters/status_staged@2x.png b/status_icons/letters/status_staged@2x.png index b2f73a1..8b9d1b8 100644 Binary files a/status_icons/letters/status_staged@2x.png and b/status_icons/letters/status_staged@2x.png differ diff --git a/status_icons/letters/status_staged@3x.png b/status_icons/letters/status_staged@3x.png index e341507..40deb01 100644 Binary files a/status_icons/letters/status_staged@3x.png and b/status_icons/letters/status_staged@3x.png differ diff --git a/status_icons/letters/status_unmerged.png b/status_icons/letters/status_unmerged.png index 1326253..0ce9a4c 100644 Binary files a/status_icons/letters/status_unmerged.png and b/status_icons/letters/status_unmerged.png differ diff --git a/status_icons/letters/status_unmerged.svg b/status_icons/letters/status_unmerged.svg index 1f9f5eb..536c284 100644 --- a/status_icons/letters/status_unmerged.svg +++ b/status_icons/letters/status_unmerged.svg @@ -1,4 +1,3 @@ - - C + C diff --git a/status_icons/letters/status_unmerged@2x.png b/status_icons/letters/status_unmerged@2x.png index d8f314b..d235945 100644 Binary files a/status_icons/letters/status_unmerged@2x.png and b/status_icons/letters/status_unmerged@2x.png differ diff --git a/status_icons/letters/status_unmerged@3x.png b/status_icons/letters/status_unmerged@3x.png index 15b9d02..af6b131 100644 Binary files a/status_icons/letters/status_unmerged@3x.png and b/status_icons/letters/status_unmerged@3x.png differ diff --git a/status_icons/letters/status_untracked.png b/status_icons/letters/status_untracked.png index ca495d8..90a3f66 100644 Binary files a/status_icons/letters/status_untracked.png and b/status_icons/letters/status_untracked.png differ diff --git a/status_icons/letters/status_untracked.svg b/status_icons/letters/status_untracked.svg index 68537eb..f2fb9b7 100644 --- a/status_icons/letters/status_untracked.svg +++ b/status_icons/letters/status_untracked.svg @@ -1,4 +1,3 @@ - - U + U diff --git a/status_icons/letters/status_untracked@2x.png b/status_icons/letters/status_untracked@2x.png index 49ce4f4..4a6e5f1 100644 Binary files a/status_icons/letters/status_untracked@2x.png and b/status_icons/letters/status_untracked@2x.png differ diff --git a/status_icons/letters/status_untracked@3x.png b/status_icons/letters/status_untracked@3x.png index 3ad5f47..fedaaa5 100644 Binary files a/status_icons/letters/status_untracked@3x.png and b/status_icons/letters/status_untracked@3x.png differ