update

godot/addons/debug/Env.gd

@@ -1,20 +1,28 @@
 extends Node
 
-var log_level = Logger.Level.DEBUG
-var version = "dev" : set = _set_version
-var _logger = Logger.new("Env")
+var log_level := Logger.Level.DEBUG
+var version := "dev" : set = _set_version
+var _logger := Logger.new("Env")
+var _demo := false
 
 func _ready():
 	if is_prod():
 		log_level = Logger.Level.INFO
+
 	_logger.info("Running version %s on %s" % [version, OS.get_name()])
 
 func _set_version(v: String) -> void:
 	if v == "": return
 	version = v
 
+	if is_prod():
+		_demo = true # TODO: steam
+
 func is_prod() -> bool:
 	return version != "dev"
 
 func is_web() -> bool:
 	return OS.has_feature("web")
+
+func is_demo() -> bool:
+	return _demo

godot/addons/godot-css-theme/CSSParser.gd

@@ -72,9 +72,19 @@ func parse_text(content: String, path: String):
 			result[class_group][actual_tag] = value
 		else:
 			result[""][tag] = value
+
+	_copy_global_node_to_all_tags(result)
 
 	return Stylesheet.new(result, path)
 
+func _copy_global_node_to_all_tags(result):
+	if ThemeApplier.GLOBAL_NODE in result[""]:
+		var global = result[""][ThemeApplier.GLOBAL_NODE]
+		for tag in result:
+			if tag == "": continue
+
+			result[tag][ThemeApplier.GLOBAL_NODE] = global
+
 func _find_index_for_class_in_array(arr):
 	for i in range(0, arr.size()):
 		if "." in arr[i]:

godot/addons/godot-css-theme/LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 myin142
+Copyright (c) 2021-2023 myin142
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ 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.
+SOFTWARE.

godot/addons/godot-css-theme/ThemeApplier.gd

@@ -52,13 +52,21 @@ func _apply_to_theme(theme: Theme, stylesheet: Stylesheet, class_group: String)
 					print("Set const for %s: %s" % [type, _value])
 			elif property == FONT_SIZE_PROPERTY:
 				var _value = _create_value(stylesheet, value)
-				theme.default_font_size = _value
+				if node_type == GLOBAL_NODE:
+					theme.default_font_size = _value
+				else:
+					var type := _parse_type("--fonts-", property)
+					theme.set_font_size(type, node_type, _value)
 				if _debug:
 					print("Set font size: %s" % _value)
 			elif property == FONT_PROPERTY:
 				var url := stylesheet.resolve_url(value)
 				if url:
-					theme.default_font = load(url)
+					if node_type == GLOBAL_NODE:
+						theme.default_font = load(url)
+					else:
+						var type := _parse_type("--fonts-", property)
+						theme.set_font(type, node_type, load(url))
 				else:
 					print("Invalid url %s for class %s" % [value, node_type])
 			elif property.begins_with("--icons-"):

godot/addons/godot-css-theme/convert.gd

@@ -1,3 +1,4 @@
+class_name CSSConvert
 extends SceneTree
 
 
@@ -9,15 +10,22 @@ func _init():
 	var debug = options.exists("debug")
 	print("Debug: ", debug)
 
-	var parser = CSSParser.new()
+
 	var css_file = options.get_value("input")
+	var output = options.get_value("output")
+
+	convert_css(css_file, output, debug)
+
+	quit()
+
+static func convert_css(css_file, output, debug = false):
+	var parser = CSSParser.new()
 
 	if debug:
 		print("Parsing Stylesheet")
 
 	var stylesheet = parser.parse(css_file)
 	if not stylesheet:
-		quit(1)
 		return
 
 	if debug:
@@ -33,7 +41,7 @@ func _init():
 
 	if debug:
 		print("Creating theme")
-	var output = options.get_value("output")
+
 	if not output:
 		var last_slash = Options.find_last(css_file, "/")
 		var file_name = css_file.substr(last_slash + 1)
@@ -56,5 +64,3 @@ func _init():
 			print("Failed to save theme %s" % err)
 		else:
 			print("Saved theme %s to %s" % [theme_name, theme_output])
-
-	quit()

godot/addons/godot-css-theme/editor/EditorButton.gd

@@ -0,0 +1,9 @@
+@tool
+extends BaseButton
+
+var unfocus_color = Color("999999")
+
+func _ready():
+	modulate = unfocus_color
+	mouse_entered.connect(func(): modulate = Color.WHITE)
+	mouse_exited.connect(func(): modulate = unfocus_color)