Merge pull request #17 from wesbos/sidebar

major upgrades
wesbos · Oct 30, 2014 · 04551b0 · 04551b0
2 parents 6abb5ed + 31bcd14
commit 04551b0
Show file tree

Hide file tree

Showing 112 changed files with 440 additions and 34 deletions.
diff --git a/Cobalt2.sublime-theme b/Cobalt2.sublime-theme
@@ -12,9 +12,9 @@
         "layer0.opacity": 1.0,
         "content_margin": [-4, 0, -4, 3],
         "tab_overlap": 5,
-        "tab_width": 180,
+        "tab_width": 120,
         "tab_min_width": 45,
-        "tab_height": 25,
+        "tab_height": 35,
         "mouse_wheel_switch": false
     },
     {
@@ -25,7 +25,7 @@
     // Tab element
     {
         "class": "tab_control",
-        "content_margin": [12, 3, 12, 3],
+        "content_margin": [22, 30, 12, 3],
         "max_margin_trim": 0,
         "hit_test_level": 0.0,
         "layer0.texture": "Theme - Cobalt2/Cobalt2/tab-inactive.png",
@@ -224,7 +224,7 @@
     {
         "class": "fold_button_control",
         "attributes": ["hover"],
-        "layer0.texture": "Theme - Cobalt2/Cobalt2/fold-closed-hover.png"
+        "layer0.texture": "Theme - Cobalt2/Cobalt2/fold-closed.png" 
     },
     {
         "class": "fold_button_control",
@@ -470,7 +470,7 @@
     // Sidebar rows
     {
         "class": "tree_row",
-        "layer0.texture": "Theme - Cobalt2/Cobalt2/sidebar-row-selected.png",
+        "layer0.texture": "Theme - Cobalt2/Cobalt2/sidebar-row-selected.png", 
         "layer0.opacity": 0.0,
         "layer0.inner_margin": [1, 1]
     },
@@ -519,9 +519,10 @@
         "parents": [{"class": "tree_row", "attributes": ["selected"]}],
         "color": [210, 210, 210],
         "shadow_color": [0, 0, 0],
-        "shadow_offset": [0, 1]
+        "shadow_offset": [1, 1]
     },
 
+
 //
 // SIDEBAR - OPEN FILE ICONS
 //
@@ -611,6 +612,22 @@
         "layer0.texture": "Theme - Cobalt2/Cobalt2/group-open-selected.png"
     },
 
+    // Sidebar folder closed
+    {
+        "class": "icon_folder",
+        "layer0.texture": "Theme - Cobalt2/icons/folder.png",
+        "layer0.opacity": 1,
+        "layer0.inner_margin": 0,
+        "content_margin": [0,0] // hide for now until we get better icons
+    },
+    // Sidebar folder opened
+    {
+        "class": "icon_folder",
+        "parents": [{ "class": "tree_row", "attributes": ["expanded"]}],
+        "layer0.texture": "Theme - Cobalt2/icons/folder_open@2x.png",
+        "layer0.inner_margin": -5,
+        "content_margin": [0,0] // hide for now until we get better icons
+    },
 //
 // STANDARD TEXT BUTTONS
 //
@@ -701,17 +718,17 @@
     },
     {
         "class": "quick_panel_label",
-        "fg": [210, 210, 210, 255],
-        "match_fg": [126, 199, 239, 255],
-        "selected_fg": [255, 255, 255, 255],
-        "selected_match_fg": [166, 229, 255, 255]
+        "fg": [140, 140, 140],
+        "match_fg": [255, 198, 0],
+        "selected_fg": [180, 180, 180],
+        "selected_match_fg": [255, 198, 0]
     },
     {
         "class": "quick_panel_path_label",
-        "fg": [130, 130, 130, 255],
-        "match_fg": [220, 220, 220, 255],
-        "selected_fg": [175, 175, 175, 255],
-        "selected_match_fg": [220, 220, 220, 255]
+        "fg": [140, 140, 140],
+        "match_fg": [255, 198, 0],
+        "selected_fg": [180, 180, 180],
+        "selected_match_fg": [255, 198, 0]
     },
     {
         "class": "quick_panel_score_label",
@@ -742,19 +759,19 @@
     {
         "class": "popup_control",
         "content_margin": [2, 2],
-        "layer0.tint": [30, 30, 30],
+        "layer0.tint": [21, 35, 45],
         "layer0.opacity": 1.0
     },
     {
         "class": "auto_complete",
-        "row_padding": [4, 2]
+        "row_padding": [4, 5]
     },
     {
         "class": "auto_complete_label",
         "fg": [140, 140, 140],
-        "match_fg": [220, 220, 220],
+        "match_fg": [255, 198, 0],
         "selected_fg": [180, 180, 180],
-        "selected_match_fg": [245, 245, 245]
+        "selected_match_fg": [255, 198, 0]
     },
     {
         "class": "table_row",

diff --git a/Cobalt2/autocomplete-row-selected.png b/Cobalt2/autocomplete-row-selected.png
diff --git a/Cobalt2/autocomplete-row-selected@2x.png b/Cobalt2/autocomplete-row-selected@2x.png
diff --git a/Cobalt2/fold-closed-hover@2x.png b/Cobalt2/fold-closed-hover@2x.png
diff --git a/Cobalt2/fold-closed-new.png b/Cobalt2/fold-closed-new.png
diff --git a/Cobalt2/fold-closed-new.psd b/Cobalt2/fold-closed-new.psd
diff --git a/Cobalt2/fold-closed.png b/Cobalt2/fold-closed.png
diff --git a/Cobalt2/fold-closed@2x.png b/Cobalt2/fold-closed@2x.png
diff --git a/Cobalt2/fold.png b/Cobalt2/fold.png
diff --git a/Cobalt2/folder_open.png b/Cobalt2/folder_open.png
diff --git a/Cobalt2/folder_open@2x.png b/Cobalt2/folder_open@2x.png
diff --git a/Cobalt2/nothing.png b/Cobalt2/nothing.png
diff --git a/Cobalt2/nothing@2x.png b/Cobalt2/nothing@2x.png
diff --git a/Cobalt2/sidebar-row-selected.png b/Cobalt2/sidebar-row-selected.png
diff --git a/Cobalt2/sidebar-row-selected@2x.png b/Cobalt2/sidebar-row-selected@2x.png
diff --git a/Cobalt2/tab-active.png b/Cobalt2/tab-active.png
diff --git a/Cobalt2/tab-active@2x.png b/Cobalt2/tab-active@2x.png
diff --git a/Cobalt2/tab-highlight-inactive.png b/Cobalt2/tab-highlight-inactive.png
diff --git a/Cobalt2/tab-highlight-inactive@2x.png b/Cobalt2/tab-highlight-inactive@2x.png
diff --git a/Cobalt2/tab-highlight.png b/Cobalt2/tab-highlight.png
diff --git a/Cobalt2/tab-highlight@2x.png b/Cobalt2/tab-highlight@2x.png
diff --git a/Welcome to Cobalt2! b/Welcome to Cobalt2!
@@ -0,0 +1,6 @@
+Welcome to Cobalt2!
+
+This theme has undergone many tweaks over the past few months and I'm excited to finally have an update for you all.
+
+You can see all the refinements at <https://github.com/wesbos/cobalt2> as well as suggest any tweaks you may have.
+
diff --git a/cobalt2.tmTheme b/cobalt2.tmTheme
@@ -77,7 +77,7 @@
         <key>fontStyle</key>
         <string></string>
         <key>foreground</key>
-        <string>#FFDD00</string>
+        <string>#ffc600</string>
       </dict>
     </dict>
     <dict>
@@ -103,7 +103,7 @@
         <key>fontStyle</key>
         <string></string>
         <key>foreground</key>
-        <string>#FFDD00</string>
+        <string>#ffc600</string>
       </dict>
     </dict>
     <dict>

diff --git a/cobalt2.tmTheme.cache b/cobalt2.tmTheme.cache
diff --git a/icons/file_type_binary.png b/icons/file_type_binary.png
diff --git a/icons/file_type_binary@2x.png b/icons/file_type_binary@2x.png
diff --git a/icons/file_type_c#.png b/icons/file_type_c#.png
diff --git a/icons/file_type_c#@2x.png b/icons/file_type_c#@2x.png
diff --git a/icons/file_type_c++.png b/icons/file_type_c++.png
diff --git a/icons/file_type_c++@2x.png b/icons/file_type_c++@2x.png
diff --git a/icons/file_type_c.png b/icons/file_type_c.png
diff --git a/icons/file_type_c@2x.png b/icons/file_type_c@2x.png
diff --git a/icons/file_type_coffescript.png b/icons/file_type_coffescript.png
diff --git a/icons/file_type_coffescript@2x.png b/icons/file_type_coffescript@2x.png
diff --git a/icons/file_type_css.png b/icons/file_type_css.png
diff --git a/icons/file_type_css@2x.png b/icons/file_type_css@2x.png
diff --git a/icons/file_type_default.png b/icons/file_type_default.png
diff --git a/icons/file_type_default@2x.png b/icons/file_type_default@2x.png
diff --git a/icons/file_type_go.png b/icons/file_type_go.png
diff --git a/icons/file_type_go@2x.png b/icons/file_type_go@2x.png
diff --git a/icons/file_type_html.png b/icons/file_type_html.png
diff --git a/icons/file_type_html@2x.png b/icons/file_type_html@2x.png
diff --git a/icons/file_type_image.png b/icons/file_type_image.png
diff --git a/icons/file_type_image@2x.png b/icons/file_type_image@2x.png
diff --git a/icons/file_type_jade.png b/icons/file_type_jade.png
diff --git a/icons/file_type_jade@2x.png b/icons/file_type_jade@2x.png
diff --git a/icons/file_type_java.png b/icons/file_type_java.png
diff --git a/icons/file_type_java@2x.png b/icons/file_type_java@2x.png
diff --git a/icons/file_type_js.png b/icons/file_type_js.png
diff --git a/icons/file_type_js@2x.png b/icons/file_type_js@2x.png
diff --git a/icons/file_type_less.png b/icons/file_type_less.png
diff --git a/icons/file_type_less@2x.png b/icons/file_type_less@2x.png
diff --git a/icons/file_type_markdown.png b/icons/file_type_markdown.png
diff --git a/icons/file_type_markdown@2x.png b/icons/file_type_markdown@2x.png
diff --git a/icons/file_type_markup.png b/icons/file_type_markup.png
diff --git a/icons/file_type_markup@2x.png b/icons/file_type_markup@2x.png
diff --git a/icons/file_type_mustache.png b/icons/file_type_mustache.png
diff --git a/icons/file_type_mustache@2x.png b/icons/file_type_mustache@2x.png
diff --git a/icons/file_type_node.png b/icons/file_type_node.png
diff --git a/icons/file_type_node@2x.png b/icons/file_type_node@2x.png
diff --git a/icons/file_type_php.png b/icons/file_type_php.png
diff --git a/icons/file_type_php@2x.png b/icons/file_type_php@2x.png
diff --git a/icons/file_type_python.png b/icons/file_type_python.png
diff --git a/icons/file_type_python@2x.png b/icons/file_type_python@2x.png
diff --git a/icons/file_type_rails.png b/icons/file_type_rails.png
diff --git a/icons/file_type_rails@2x.png b/icons/file_type_rails@2x.png
diff --git a/icons/file_type_ruby.png b/icons/file_type_ruby.png
diff --git a/icons/file_type_ruby@2x.png b/icons/file_type_ruby@2x.png
diff --git a/icons/file_type_rust.png b/icons/file_type_rust.png
diff --git a/icons/file_type_rust@2x.png b/icons/file_type_rust@2x.png
diff --git a/icons/file_type_sass.png b/icons/file_type_sass.png
diff --git a/icons/file_type_sass@2x.png b/icons/file_type_sass@2x.png
diff --git a/icons/file_type_scss.png b/icons/file_type_scss.png
diff --git a/icons/file_type_scss@2x.png b/icons/file_type_scss@2x.png
diff --git a/icons/file_type_settings.png b/icons/file_type_settings.png
diff --git a/icons/file_type_settings@2x.png b/icons/file_type_settings@2x.png
diff --git a/icons/file_type_source.png b/icons/file_type_source.png
diff --git a/icons/file_type_source@2x.png b/icons/file_type_source@2x.png
diff --git a/icons/file_type_stylus.png b/icons/file_type_stylus.png
diff --git a/icons/file_type_stylus@2x.png b/icons/file_type_stylus@2x.png
diff --git a/icons/file_type_text.png b/icons/file_type_text.png
diff --git a/icons/file_type_text@2x.png b/icons/file_type_text@2x.png
diff --git a/icons/folder.png b/icons/folder.png
diff --git a/icons/folder@2x.png b/icons/folder@2x.png
diff --git a/icons/folder_open.png b/icons/folder_open.png
diff --git a/icons/folder_open@2x.png b/icons/folder_open@2x.png
diff --git a/messages.json b/messages.json
@@ -0,0 +1,4 @@
+{
+  "install": "messages/hello.txt",
+  "2.0.0": "messages/hello.txt"
+}
diff --git a/messages/hello.txt b/messages/hello.txt
@@ -0,0 +1,21 @@
+Welcome to Cobalt2! 💁
+
+This theme has undergone many tweaks over the past few months and I'm excited to finally have an update for you all. 👌
+
+You can see all the refinements at <https://github.com/wesbos/cobalt2> as well as suggest any tweaks you may have.
+
+Many new things have been added, including:
+
+- Sidebar Icons
+- Current file highlighting in sidebar
+- highlighted tab
+- new dirty state tab circle
+- small tab refinements
+- autocomplete, goto anything and command palette refinements
+
+📖 📖 📖 
+PS I wrote a book + video series on Sublime Text! Check it out - https://SublimeTextBook.com - Use the coupon code COBALT2 for $15 off 💰 💵
+
+📖 📖 📖
+
+@wesbos 
diff --git a/prefs/icon_c#.tmPreferences b/prefs/icon_c#.tmPreferences
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>source.cs</string>
+    <key>settings</key>
+    <dict>
+        <key>icon</key>
+        <string>file_type_c#</string>
+    </dict>
+</dict>
+</plist>
diff --git a/prefs/icon_c++.tmPreferences b/prefs/icon_c++.tmPreferences
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>source.c++,source.objc++</string>
+    <key>settings</key>
+    <dict>
+        <key>icon</key>
+        <string>file_type_c++</string>
+    </dict>
+</dict>
+</plist>
diff --git a/prefs/icon_c.tmPreferences b/prefs/icon_c.tmPreferences
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>source.c</string>
+    <key>settings</key>
+    <dict>
+        <key>icon</key>
+        <string>file_type_c</string>
+    </dict>
+</dict>
+</plist>
diff --git a/prefs/icon_coffee.tmPreferences b/prefs/icon_coffee.tmPreferences
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>source.coffee</string>
+    <key>settings</key>
+    <dict>
+        <key>icon</key>
+        <string>file_type_coffescript</string>
+    </dict>
+</dict>
+</plist>
diff --git a/prefs/icon_css.tmPreferences b/prefs/icon_css.tmPreferences
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>source.css</string>
+    <key>settings</key>
+    <dict>
+        <key>icon</key>
+        <string>file_type_css</string>
+    </dict>
+</dict>
+</plist>
diff --git a/prefs/icon_go.tmPreferences b/prefs/icon_go.tmPreferences
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist
+  PUBLIC '-//Apple//DTD PLIST 1.0//EN'
+  'http://www.apple.com/DTDs/PropertyList-1.0.dtd'>
+<plist version="1.0">
+    <dict>
+        <key>scope</key>
+        <string>source.go</string>
+        <key>settings</key>
+        <dict>
+            <key>icon</key>
+            <string>file_type_go</string>
+        </dict>
+    </dict>
+</plist>
diff --git a/prefs/icon_html.tmPreferences b/prefs/icon_html.tmPreferences
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist
+  PUBLIC '-//Apple//DTD PLIST 1.0//EN'
+  'http://www.apple.com/DTDs/PropertyList-1.0.dtd'>
+<plist version="1.0">
+    <dict>
+        <key>scope</key>
+        <string>text.html, text.slim</string>
+        <key>settings</key>
+        <dict>
+            <key>icon</key>
+            <string>file_type_html</string>
+        </dict>
+    </dict>
+</plist>
diff --git a/prefs/icon_img.tmPreferences b/prefs/icon_img.tmPreferences
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>text.xml.svg,source.svg,source.psd,source.ai</string>
+    <key>settings</key>
+    <dict>
+        <key>icon</key>
+        <string>file_type_image</string>
+    </dict>
+</dict>
+</plist>
diff --git a/prefs/icon_jade.tmPreferences b/prefs/icon_jade.tmPreferences
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist
+  PUBLIC '-//Apple//DTD PLIST 1.0//EN'
+  'http://www.apple.com/DTDs/PropertyList-1.0.dtd'>
+<plist version="1.0">
+    <dict>
+        <key>scope</key>
+        <string>source.jade</string>
+        <key>settings</key>
+        <dict>
+            <key>icon</key>
+            <string>file_type_jade</string>
+        </dict>
+    </dict>
+</plist>
diff --git a/prefs/icon_java.tmPreferences b/prefs/icon_java.tmPreferences
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>source.java</string>
+    <key>settings</key>
+    <dict>
+        <key>icon</key>
+        <string>file_type_java</string>
+    </dict>
+</dict>
+</plist>
diff --git a/prefs/icon_js.tmPreferences b/prefs/icon_js.tmPreferences
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>source.js</string>
+    <key>settings</key>
+    <dict>
+        <key>icon</key>
+        <string>file_type_js</string>
+    </dict>
+</dict>
+</plist>
diff --git a/prefs/icon_json.tmPreferences b/prefs/icon_json.tmPreferences
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>source.json</string>
+    <key>settings</key>
+    <dict>
+        <key>icon</key>
+        <string>file_type_settings</string>
+    </dict>
+</dict>
+</plist>
diff --git a/prefs/icon_less.tmPreferences b/prefs/icon_less.tmPreferences
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist
+  PUBLIC '-//Apple//DTD PLIST 1.0//EN'
+  'http://www.apple.com/DTDs/PropertyList-1.0.dtd'>
+<plist version="1.0">
+    <dict>
+        <key>scope</key>
+        <string>source.less, source.css.less</string>
+        <key>settings</key>
+        <dict>
+            <key>icon</key>
+            <string>file_type_less</string>
+        </dict>
+    </dict>
+</plist>
diff --git a/prefs/icon_md.tmPreferences b/prefs/icon_md.tmPreferences
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>text.html.markdown,text.html.markdown.multimarkdown</string>
+    <key>settings</key>
+    <dict>
+        <key>icon</key>
+        <string>file_type_markdown</string>
+    </dict>
+</dict>
+</plist>
diff --git a/prefs/icon_mustache.tmPreferences b/prefs/icon_mustache.tmPreferences
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>scope</key>
+    <string>text.html.mustache, text.html.hbs, text.html.hgn</string>
+    <key>settings</key>
+    <dict>
+        <key>icon</key>
+        <string>file_type_mustache</string>
+    </dict>
+</dict>
+</plist>