Fix sublime UI textfields.

humengcn · Feb 22, 2014 · aac4908 · aac4908
1 parent f1f24f8
commit aac4908
Show file tree

Hide file tree

Showing 265 changed files with 3,093 additions and 89 deletions.
diff --git a/build/resources/patterns/sublimeui/settings.pattern b/build/resources/patterns/sublimeui/settings.pattern
@@ -0,0 +1,4 @@
+{
+    "color_scheme": "Packages/sublimeui/{{ theme.slug }}/Widget - {{ theme.slug }}.stTheme",
+    "draw_shadows": false
+}
diff --git a/build/resources/patterns/sublimeui/sublimeui.json b/build/resources/patterns/sublimeui/sublimeui.json
@@ -8,6 +8,18 @@
             "name":         "",
             "directory":    "",
             "extension":    ".sublime-theme"
+        },
+        {
+            "file":         "widget.pattern",
+            "name":         "%theme.slug%/Widget - %theme.slug%",
+            "directory":    "",
+            "extension":    ".stTheme"
+        },
+        {
+            "file":         "settings.pattern",
+            "name":         "%theme.slug%/Widget - %theme.slug%",
+            "directory":    "",
+            "extension":    ".sublime-settings"
         }
     ]
 }
diff --git a/build/resources/patterns/sublimeui/sublimeui.pattern b/build/resources/patterns/sublimeui/sublimeui.pattern
@@ -688,7 +688,7 @@
     {
         "class": "text_line_control",
         // "layer0.texture": "",
-        "layer0.tint": [{{ colour.first('ui_bg', 'background').rgb(-40) }}], // -01
+        "layer0.tint": [{{ colour.first('ui_bg', 'background').rgb() }}], // -01
         "layer0.opacity": 1,
         "content_margin": 6
     },
@@ -1755,7 +1755,7 @@
     {
         "class": "text_line_control",
         // "layer0.texture": "",
-        "layer0.tint": [{{ colour.first('ui_bg', 'background').rgb(10) }}], // -01
+        "layer0.tint": [{{ colour.first('ui_bg', 'background').rgb() }}], // -01
         "layer0.opacity": 1,
         "content_margin": 6
     },

diff --git a/build/resources/patterns/sublimeui/widget.pattern b/build/resources/patterns/sublimeui/widget.pattern
@@ -0,0 +1,30 @@
+<?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>author</key>
+    <string>Dayle Rees</string>
+    <key>comment</key>
+    <string>{{ theme.name }}</string>
+    <key>name</key>
+    <string>{{ theme.name }}</string>
+    <key>settings</key>
+    <array>
+        <dict>
+            <key>settings</key>
+            <dict>
+                <key>background</key>
+                <string>{{ background }}</string>
+                <key>caret</key>
+                <string>{{ caret }}</string>
+                <key>foreground</key>
+                <string>{{ foreground }}</string>
+                <key>invisibles</key>
+                <string>#65737e</string>
+                <key>selection</key>
+                <string>{{ selection_background }}</string>
+            </dict>
+        </dict>
+    </array>
+</dict>
+</plist>
diff --git a/build/src/Raincolour/Core/Processor.php b/build/src/Raincolour/Core/Processor.php
@@ -271,7 +271,7 @@ protected function buildFileName($name, $theme)
         }
 
         // Find variable substitution matches...
-        preg_match('/%(.+)%/i', $name, $matches);
+        preg_match('/%(.*?)%/i', $name, $matches);
 
         // Iterate the matches...
         foreach ($matches as $match) {

diff --git a/sublimeui/arstotzka.sublime-theme b/sublimeui/arstotzka.sublime-theme
@@ -685,7 +685,7 @@
     {
         "class": "text_line_control",
         // "layer0.texture": "",
-        "layer0.tint": [43, 41, 40], // -01
+        "layer0.tint": [33, 31, 30], // -01
         "layer0.opacity": 1,
         "content_margin": 6
     },

diff --git a/sublimeui/arstotzka/Widget - arstotzka.stTheme b/sublimeui/arstotzka/Widget - arstotzka.stTheme
@@ -0,0 +1,30 @@
+<?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>author</key>
+    <string>Dayle Rees</string>
+    <key>comment</key>
+    <string>Arstotzka</string>
+    <key>name</key>
+    <string>Arstotzka</string>
+    <key>settings</key>
+    <array>
+        <dict>
+            <key>settings</key>
+            <dict>
+                <key>background</key>
+                <string>#211f1e</string>
+                <key>caret</key>
+                <string>#f8f8f0</string>
+                <key>foreground</key>
+                <string>#EDEBE6</string>
+                <key>invisibles</key>
+                <string>#65737e</string>
+                <key>selection</key>
+                <string>#516B6B</string>
+            </dict>
+        </dict>
+    </array>
+</dict>
+</plist>
diff --git a/sublimeui/arstotzka/Widget - arstotzka.sublime-settings b/sublimeui/arstotzka/Widget - arstotzka.sublime-settings
@@ -0,0 +1,4 @@
+{
+    "color_scheme": "Packages/sublimeui/arstotzka/Widget - arstotzka.stTheme",
+    "draw_shadows": false
+}
diff --git a/sublimeui/azure.sublime-theme b/sublimeui/azure.sublime-theme
@@ -685,7 +685,7 @@
     {
         "class": "text_line_control",
         // "layer0.texture": "",
-        "layer0.tint": [34, 39, 48], // -01
+        "layer0.tint": [24, 29, 38], // -01
         "layer0.opacity": 1,
         "content_margin": 6
     },

diff --git a/sublimeui/azure/Widget - azure.stTheme b/sublimeui/azure/Widget - azure.stTheme
@@ -0,0 +1,30 @@
+<?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>author</key>
+    <string>Dayle Rees</string>
+    <key>comment</key>
+    <string>Azure</string>
+    <key>name</key>
+    <string>Azure</string>
+    <key>settings</key>
+    <array>
+        <dict>
+            <key>settings</key>
+            <dict>
+                <key>background</key>
+                <string>#181D26</string>
+                <key>caret</key>
+                <string>#f8f8f0</string>
+                <key>foreground</key>
+                <string>#ffffff</string>
+                <key>invisibles</key>
+                <string>#65737e</string>
+                <key>selection</key>
+                <string>#47959a</string>
+            </dict>
+        </dict>
+    </array>
+</dict>
+</plist>
diff --git a/sublimeui/azure/Widget - azure.sublime-settings b/sublimeui/azure/Widget - azure.sublime-settings
@@ -0,0 +1,4 @@
+{
+    "color_scheme": "Packages/sublimeui/azure/Widget - azure.stTheme",
+    "draw_shadows": false
+}
diff --git a/sublimeui/bold.sublime-theme b/sublimeui/bold.sublime-theme
@@ -685,7 +685,7 @@
     {
         "class": "text_line_control",
         // "layer0.texture": "",
-        "layer0.tint": [52, 48, 48], // -01
+        "layer0.tint": [42, 38, 38], // -01
         "layer0.opacity": 1,
         "content_margin": 6
     },

diff --git a/sublimeui/bold/Widget - bold.stTheme b/sublimeui/bold/Widget - bold.stTheme
@@ -0,0 +1,30 @@
+<?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>author</key>
+    <string>Dayle Rees</string>
+    <key>comment</key>
+    <string>Bold</string>
+    <key>name</key>
+    <string>Bold</string>
+    <key>settings</key>
+    <array>
+        <dict>
+            <key>settings</key>
+            <dict>
+                <key>background</key>
+                <string>#2a2626</string>
+                <key>caret</key>
+                <string>#f8f8f0</string>
+                <key>foreground</key>
+                <string>#ffffff</string>
+                <key>invisibles</key>
+                <string>#65737e</string>
+                <key>selection</key>
+                <string>#3D8E91</string>
+            </dict>
+        </dict>
+    </array>
+</dict>
+</plist>
diff --git a/sublimeui/bold/Widget - bold.sublime-settings b/sublimeui/bold/Widget - bold.sublime-settings
@@ -0,0 +1,4 @@
+{
+    "color_scheme": "Packages/sublimeui/bold/Widget - bold.stTheme",
+    "draw_shadows": false
+}
diff --git a/sublimeui/boxuk/Widget - boxuk.stTheme b/sublimeui/boxuk/Widget - boxuk.stTheme
@@ -0,0 +1,30 @@
+<?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>author</key>
+    <string>Dayle Rees</string>
+    <key>comment</key>
+    <string>Box UK</string>
+    <key>name</key>
+    <string>Box UK</string>
+    <key>settings</key>
+    <array>
+        <dict>
+            <key>settings</key>
+            <dict>
+                <key>background</key>
+                <string>#ffffff</string>
+                <key>caret</key>
+                <string>#222222</string>
+                <key>foreground</key>
+                <string>#414f5c</string>
+                <key>invisibles</key>
+                <string>#65737e</string>
+                <key>selection</key>
+                <string>#017c9d</string>
+            </dict>
+        </dict>
+    </array>
+</dict>
+</plist>
diff --git a/sublimeui/boxuk/Widget - boxuk.sublime-settings b/sublimeui/boxuk/Widget - boxuk.sublime-settings
@@ -0,0 +1,4 @@
+{
+    "color_scheme": "Packages/sublimeui/boxuk/Widget - boxuk.stTheme",
+    "draw_shadows": false
+}
diff --git a/sublimeui/carbonight.sublime-theme b/sublimeui/carbonight.sublime-theme
@@ -685,7 +685,7 @@
     {
         "class": "text_line_control",
         // "layer0.texture": "",
-        "layer0.tint": [56, 54, 53], // -01
+        "layer0.tint": [46, 44, 43], // -01
         "layer0.opacity": 1,
         "content_margin": 6
     },

diff --git a/sublimeui/carbonight/Widget - carbonight.stTheme b/sublimeui/carbonight/Widget - carbonight.stTheme
@@ -0,0 +1,30 @@
+<?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>author</key>
+    <string>Dayle Rees</string>
+    <key>comment</key>
+    <string>Carbonight</string>
+    <key>name</key>
+    <string>Carbonight</string>
+    <key>settings</key>
+    <array>
+        <dict>
+            <key>settings</key>
+            <dict>
+                <key>background</key>
+                <string>#2E2C2B</string>
+                <key>caret</key>
+                <string>#f8f8f0</string>
+                <key>foreground</key>
+                <string>#B0B0B0</string>
+                <key>invisibles</key>
+                <string>#65737e</string>
+                <key>selection</key>
+                <string>#8C8C8C</string>
+            </dict>
+        </dict>
+    </array>
+</dict>
+</plist>
diff --git a/sublimeui/carbonight/Widget - carbonight.sublime-settings b/sublimeui/carbonight/Widget - carbonight.sublime-settings
@@ -0,0 +1,4 @@
+{
+    "color_scheme": "Packages/sublimeui/carbonight/Widget - carbonight.stTheme",
+    "draw_shadows": false
+}
diff --git a/sublimeui/chocolate.sublime-theme b/sublimeui/chocolate.sublime-theme
@@ -685,7 +685,7 @@
     {
         "class": "text_line_control",
         // "layer0.texture": "",
-        "layer0.tint": [31, 25, 18], // -01
+        "layer0.tint": [21, 15, 8], // -01
         "layer0.opacity": 1,
         "content_margin": 6
     },

diff --git a/sublimeui/chocolate/Widget - chocolate.stTheme b/sublimeui/chocolate/Widget - chocolate.stTheme
@@ -0,0 +1,30 @@
+<?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>author</key>
+    <string>Dayle Rees</string>
+    <key>comment</key>
+    <string>Chocolate</string>
+    <key>name</key>
+    <string>Chocolate</string>
+    <key>settings</key>
+    <array>
+        <dict>
+            <key>settings</key>
+            <dict>
+                <key>background</key>
+                <string>#150f08</string>
+                <key>caret</key>
+                <string>#f8f8f0</string>
+                <key>foreground</key>
+                <string>#ffffff</string>
+                <key>invisibles</key>
+                <string>#65737e</string>
+                <key>selection</key>
+                <string>#8B6E46</string>
+            </dict>
+        </dict>
+    </array>
+</dict>
+</plist>
diff --git a/sublimeui/chocolate/Widget - chocolate.sublime-settings b/sublimeui/chocolate/Widget - chocolate.sublime-settings
@@ -0,0 +1,4 @@
+{
+    "color_scheme": "Packages/sublimeui/chocolate/Widget - chocolate.stTheme",
+    "draw_shadows": false
+}
diff --git a/sublimeui/contrast/carbonight-contrast.sublime-theme b/sublimeui/contrast/carbonight-contrast.sublime-theme
@@ -685,7 +685,7 @@
     {
         "class": "text_line_control",
         // "layer0.texture": "",
-        "layer0.tint": [10, 10, 10], // -01
+        "layer0.tint": [0, 0, 0], // -01
         "layer0.opacity": 1,
         "content_margin": 6
     },

diff --git a/sublimeui/contrast/carbonight-contrast/Widget - carbonight-contrast.stTheme b/sublimeui/contrast/carbonight-contrast/Widget - carbonight-contrast.stTheme
@@ -0,0 +1,30 @@
+<?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>author</key>
+    <string>Dayle Rees</string>
+    <key>comment</key>
+    <string>Carbonight Contrast</string>
+    <key>name</key>
+    <string>Carbonight Contrast</string>
+    <key>settings</key>
+    <array>
+        <dict>
+            <key>settings</key>
+            <dict>
+                <key>background</key>
+                <string>#000000</string>
+                <key>caret</key>
+                <string>#f8f8f0</string>
+                <key>foreground</key>
+                <string>#ffffff</string>
+                <key>invisibles</key>
+                <string>#65737e</string>
+                <key>selection</key>
+                <string>#8C8C8C</string>
+            </dict>
+        </dict>
+    </array>
+</dict>
+</plist>
diff --git a/sublimeui/contrast/carbonight-contrast/Widget - carbonight-contrast.sublime-settings b/sublimeui/contrast/carbonight-contrast/Widget - carbonight-contrast.sublime-settings
@@ -0,0 +1,4 @@
+{
+    "color_scheme": "Packages/sublimeui/carbonight-contrast/Widget - carbonight-contrast.stTheme",
+    "draw_shadows": false
+}
diff --git a/sublimeui/contrast/darkside-contrast.sublime-theme b/sublimeui/contrast/darkside-contrast.sublime-theme
@@ -685,7 +685,7 @@
     {
         "class": "text_line_control",
         // "layer0.texture": "",
-        "layer0.tint": [10, 10, 10], // -01
+        "layer0.tint": [0, 0, 0], // -01
         "layer0.opacity": 1,
         "content_margin": 6
     },