Merge widgets and scheme variables

bluelichen19 · May 29, 2016 · f48df5d · f48df5d
1 parent dcf0ebd
commit f48df5d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 57 deletions.
diff --git a/src/settings/specific/Material-Theme-Darker.json b/src/settings/specific/Material-Theme-Darker.json
@@ -33,19 +33,6 @@
       }
     }
   },
-  "widget": {
-    "background": "#212121",
-    "caret": "#FFCC00",
-    "foreground": "#616161",
-    "highlight": "#00000030",
-    "selection": "#61616140",
-    "invisibles": "#BFBFBF",
-    "comments": "#4A4A4A",
-    "keywords": "#cfd8dc",
-    "constant": "#80CBC4",
-    "string": "#F9355A",
-    "constantEscape": "#FFC400"
-  },
   "scheme": {
     "background": "#212121",
     "comments": "#4A4A4A",
@@ -60,6 +47,10 @@
     "highlight": "#00000030",
     "selection": "#61616140",
     "shadow": "#00000010",
+    "keywords": "#cfd8dc",
+    "constant": "#80CBC4",
+    "string": "#F9355A",
+    "constantEscape": "#FFC400",
     "base": {
       "white": "#ffffff",
       "black": "#000000",

diff --git a/src/settings/specific/Material-Theme-Lighter.json b/src/settings/specific/Material-Theme-Lighter.json
@@ -33,19 +33,6 @@
       }
     }
   },
-  "widget": {
-    "background": "#fafafa",
-    "caret": "#27272790",
-    "foreground": "#80CBC4",
-    "highlight": "#90A4AE20",
-    "selection": "#80CBC440",
-    "invisibles": "#E7EAEC",
-    "comments": "#CCD7DA",
-    "keywords": "#AAB3B5",
-    "constant": "#80CBC4",
-    "string": "#F9355A",
-    "constantEscape": "#FFC400"
-  },
   "scheme": {
     "background": "#fafafa",
     "comments": "#CCD7DA",
@@ -60,6 +47,10 @@
     "highlight": "#90A4AE20",
     "selection": "#80CBC440",
     "shadow": "#90A4AE50",
+    "keywords": "#AAB3B5",
+    "constant": "#80CBC4",
+    "string": "#F9355A",
+    "constantEscape": "#FFC400",
     "base": {
       "white": "#ffffff",
       "black": "#000000",

diff --git a/src/settings/specific/Material-Theme.json b/src/settings/specific/Material-Theme.json
@@ -29,19 +29,6 @@
       }
     }
   },
-  "widget": {
-    "background": "#263238",
-    "caret": "#B0BEC5",
-    "foreground": "#607D8B",
-    "highlight": "#00000012",
-    "selection": "#546E7A",
-    "invisibles": "#65737e",
-    "comments": "#546E7A",
-    "keywords": "#cfd8dc",
-    "constant": "#80CBC4",
-    "string": "#F9355A",
-    "constantEscape": "#FFC400"
-  },
   "scheme": {
     "background": "#263238",
     "comments": "#546E7A",
@@ -56,6 +43,10 @@
     "highlight": "#00000030",
     "selection": "#80CBC420",
     "shadow": "#00000010",
+    "keywords": "#cfd8dc",
+    "constant": "#80CBC4",
+    "string": "#F9355A",
+    "constantEscape": "#FFC400",
     "base": {
       "white": "#ffffff",
       "black": "#000000",

diff --git a/src/widgets/widget.stTheme b/src/widgets/widget.stTheme
@@ -18,17 +18,17 @@
 				<key>background</key>
 				<string><%= ui.background.primary.hex %></string>
 				<key>caret</key>
-				<string><%= widget.caret %></string>
+				<string><%= scheme.caret %></string>
 				<key>foreground</key>
-				<string><%= widget.foreground %></string>
+				<string><%= scheme.foreground %></string>
 				<key>invisibles</key>
-				<string><%= widget.invisibles %></string>
+				<string><%= scheme.invisibles %></string>
 				<key>lineHighlight</key>
-				<string><%= widget.highlight %></string>
+				<string><%= scheme.highlight %></string>
 				<key>selection</key>
-				<string><%= widget.selection %></string>
+				<string><%= scheme.selection %></string>
 				<key>selectionBorder</key>
-				<string><%= widget.selection %></string>
+				<string><%= scheme.selection %></string>
 			</dict>
 		</dict>
 		<dict>
@@ -41,7 +41,7 @@
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string><%= widget.comments %></string>
+				<string><%= scheme.comments %></string>
 			</dict>
 		</dict>
 		<dict>
@@ -52,7 +52,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string><%= widget.keyword %></string>
+				<string><%= scheme.keyword %></string>
 			</dict>
 		</dict>
 		<dict>
@@ -61,7 +61,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string><%= widget.constant %></string>
+				<string><%= scheme.constant %></string>
 			</dict>
 		</dict>
 		<dict>
@@ -70,7 +70,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string><%= widget.string %></string>
+				<string><%= scheme.string %></string>
 			</dict>
 		</dict>
 		<dict>
@@ -79,7 +79,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string><%= widget.constantEscape %></string>
+				<string><%= scheme.constantEscape %></string>
 			</dict>
 		</dict>
 	</array>

diff --git a/widgets/Widget - Material-Theme-Darker.stTheme b/widgets/Widget - Material-Theme-Darker.stTheme
@@ -20,9 +20,9 @@
 				<key>caret</key>
 				<string>#FFCC00</string>
 				<key>foreground</key>
-				<string>#616161</string>
+				<string>#eeffffff</string>
 				<key>invisibles</key>
-				<string>#BFBFBF</string>
+				<string>#65737e</string>
 				<key>lineHighlight</key>
 				<string>#00000030</string>
 				<key>selection</key>

diff --git a/widgets/Widget - Material-Theme.stTheme b/widgets/Widget - Material-Theme.stTheme
@@ -18,17 +18,17 @@
 				<key>background</key>
 				<string>#263238</string>
 				<key>caret</key>
-				<string>#B0BEC5</string>
+				<string>#FFCC00</string>
 				<key>foreground</key>
-				<string>#607D8B</string>
+				<string>#eeffff</string>
 				<key>invisibles</key>
 				<string>#65737e</string>
 				<key>lineHighlight</key>
-				<string>#00000012</string>
+				<string>#00000030</string>
 				<key>selection</key>
-				<string>#546E7A</string>
+				<string>#80CBC420</string>
 				<key>selectionBorder</key>
-				<string>#546E7A</string>
+				<string>#80CBC420</string>
 			</dict>
 		</dict>
 		<dict>