Improve focus style to make it more visible and accessible

13 files changed, 42 insertions, 24 deletions

diff --git a/client/menu/character_menu.tscn b/client/menu/character_menu.tscn
index cad0cb35..b958cf9d 100644
--- a/client/menu/character_menu.tscn
+++ b/client/menu/character_menu.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=7 format=3 uid="uid://1f7xpirm5d28"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_ak2pw"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_ak2pw"]
 [ext_resource type="Script" path="res://menu/character_menu.gd" id="1_brhd1"]
 [ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="3_odq7n"]
 [ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_c0ocf"]
diff --git a/client/menu/credits_menu.tscn b/client/menu/credits_menu.tscn
index 372664d4..74d5cbc9 100644
--- a/client/menu/credits_menu.tscn
+++ b/client/menu/credits_menu.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://7mqbxa054bjv"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_emk5o"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_emk5o"]
 [ext_resource type="Script" path="res://menu/credits_menu.gd" id="1_igs63"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_p2qmw"]
diff --git a/client/menu/error_menu.tscn b/client/menu/error_menu.tscn
index 0b86cceb..ea01ddc3 100644
--- a/client/menu/error_menu.tscn
+++ b/client/menu/error_menu.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=3 uid="uid://cimgn07lbcs4v"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_cabdu"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_cabdu"]
 [ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="2_5fxol"]
 [ext_resource type="Script" path="res://menu/error_menu.gd" id="2_dbe41"]
 [ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_1nbt3"]
diff --git a/client/menu/ingame_menu.tscn b/client/menu/ingame_menu.tscn
index 920c8724..cfd6ebba 100644
--- a/client/menu/ingame_menu.tscn
+++ b/client/menu/ingame_menu.tscn
@@ -2,8 +2,8 @@
 
 [ext_resource type="Script" path="res://menu/ingame_menu.gd" id="1_gd1i3"]
 [ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="1_o42mc"]
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_tm331"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/font-sansita-swashed.woff2" id="2_4u0ox"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_tm331"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="2_4u0ox"]
 
 [sub_resource type="Animation" id="Animation_8sedy"]
 length = 0.001
diff --git a/client/menu/main_menu.tscn b/client/menu/main_menu.tscn
index 7bd1ccc3..76b55a1a 100644
--- a/client/menu/main_menu.tscn
+++ b/client/menu/main_menu.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=8 format=3 uid="uid://dbj8508whxgwv"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_nlcpo"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_nlcpo"]
 [ext_resource type="Script" path="res://menu/main_menu.gd" id="2_qot2j"]
 [ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="4_050xu"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/font-sansita-swashed.woff2" id="4_mfs30"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="4_mfs30"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_irdo3"]
 shader = ExtResource("4_050xu")
diff --git a/client/menu/settings_menu.tscn b/client/menu/settings_menu.tscn
index e1fefa47..6ead9b8b 100644
--- a/client/menu/settings_menu.tscn
+++ b/client/menu/settings_menu.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://8ic77jmadadj"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme.tres" id="1_foq3a"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_foq3a"]
 [ext_resource type="Script" path="res://menu/settings_menu.gd" id="2_3hgm8"]
 
 [node name="SettingsMenu" type="Control"]
diff --git a/client/menu/theme/focus_style.tres b/client/menu/theme/focus_style.tres
new file mode 100644
index 00000000..a01843fe
--- /dev/null
+++ b/client/menu/theme/focus_style.tres
@@ -0,0 +1,17 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://b86kbd3pfkd5w"]
+
+[resource]
+content_margin_left = 10.0
+content_margin_top = 10.0
+content_margin_right = 10.0
+content_margin_bottom = 10.0
+bg_color = Color(1, 1, 1, 0.0627451)
+border_width_left = 2
+border_width_top = 2
+border_width_right = 2
+border_width_bottom = 2
+border_color = Color(0.818673, 0.926505, 1, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
diff --git a/client/menu/font-josefin-sans.woff2 b/client/menu/theme/font-josefin-sans.woff2
index dce2708f..dce2708f 100644
--- a/client/menu/font-josefin-sans.woff2
+++ b/client/menu/theme/font-josefin-sans.woff2
diff --git a/client/menu/font-josefin-sans.woff2.import b/client/menu/theme/font-josefin-sans.woff2.import
index 9bf40c47..5ecd872c 100644
--- a/client/menu/font-josefin-sans.woff2.import
+++ b/client/menu/theme/font-josefin-sans.woff2.import
@@ -3,12 +3,12 @@
 importer="font_data_dynamic"
 type="FontFile"
 uid="uid://5ixo6b3bd3km"
-path="res://.godot/imported/font-josefin-sans.woff2-8195d19f9e478a66f9d2ca31db663e15.fontdata"
+path="res://.godot/imported/font-josefin-sans.woff2-e2c3f263d98e1132cfe6af3f4f0a3454.fontdata"
 
 [deps]
 
-source_file="res://menu/font-josefin-sans.woff2"
-dest_files=["res://.godot/imported/font-josefin-sans.woff2-8195d19f9e478a66f9d2ca31db663e15.fontdata"]
+source_file="res://menu/theme/font-josefin-sans.woff2"
+dest_files=["res://.godot/imported/font-josefin-sans.woff2-e2c3f263d98e1132cfe6af3f4f0a3454.fontdata"]
 
 [params]
 
diff --git a/client/menu/font-sansita-swashed.woff2 b/client/menu/theme/font-sansita-swashed.woff2
index 5c665fb0..5c665fb0 100644
--- a/client/menu/font-sansita-swashed.woff2
+++ b/client/menu/theme/font-sansita-swashed.woff2
diff --git a/client/menu/font-sansita-swashed.woff2.import b/client/menu/theme/font-sansita-swashed.woff2.import
index 54056a3c..faf840fa 100644
--- a/client/menu/font-sansita-swashed.woff2.import
+++ b/client/menu/theme/font-sansita-swashed.woff2.import
@@ -3,12 +3,12 @@
 importer="font_data_dynamic"
 type="FontFile"
 uid="uid://bo4vh5xkpvrh1"
-path="res://.godot/imported/font-sansita-swashed.woff2-259623c6db3c7be991207ff769c643a5.fontdata"
+path="res://.godot/imported/font-sansita-swashed.woff2-323b4a2ee0671aba6e17a6f073f706f3.fontdata"
 
 [deps]
 
-source_file="res://menu/font-sansita-swashed.woff2"
-dest_files=["res://.godot/imported/font-sansita-swashed.woff2-259623c6db3c7be991207ff769c643a5.fontdata"]
+source_file="res://menu/theme/font-sansita-swashed.woff2"
+dest_files=["res://.godot/imported/font-sansita-swashed.woff2-323b4a2ee0671aba6e17a6f073f706f3.fontdata"]
 
 [params]
 
diff --git a/client/menu/theme.tres b/client/menu/theme/theme.tres
index c2ec3b12..96cdbb19 100644
--- a/client/menu/theme.tres
+++ b/client/menu/theme/theme.tres
@@ -1,10 +1,11 @@
-[gd_resource type="Theme" load_steps=8 format=3 uid="uid://b0qmvo504e457"]
+[gd_resource type="Theme" load_steps=9 format=3 uid="uid://b0qmvo504e457"]
 
-[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/font-josefin-sans.woff2" id="1_go7fi"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/font-sansita-swashed.woff2" id="1_tneco"]
+[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_f8qb0"]
+[ext_resource type="StyleBox" uid="uid://b86kbd3pfkd5w" path="res://menu/theme/focus_style.tres" id="2_brg2c"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="3_8u6ww"]
 
 [sub_resource type="FontVariation" id="FontVariation_lyo8w"]
-base_font = ExtResource("1_go7fi")
+base_font = ExtResource("1_f8qb0")
 variation_embolden = 1.25
 spacing_top = 5
 
@@ -39,25 +40,25 @@ grow_end = 0.0
 thickness = 3
 
 [sub_resource type="FontVariation" id="FontVariation_ff4nr"]
-base_font = ExtResource("1_tneco")
+base_font = ExtResource("3_8u6ww")
 variation_embolden = 0.7
 
 [resource]
 Button/font_sizes/font_size = 18
 Button/fonts/font = SubResource("FontVariation_lyo8w")
 Button/styles/disabled = SubResource("StyleBoxFlat_25x32")
-Button/styles/focus = SubResource("StyleBoxFlat_25x32")
+Button/styles/focus = ExtResource("2_brg2c")
 Button/styles/hover = SubResource("StyleBoxFlat_2fl8q")
 Button/styles/normal = SubResource("StyleBoxFlat_25x32")
 Button/styles/pressed = SubResource("StyleBoxFlat_25x32")
 HSeparator/styles/separator = SubResource("StyleBoxLine_emtvk")
 Label/font_sizes/font_size = 16
-Label/fonts/font = ExtResource("1_tneco")
-LineEdit/styles/focus = SubResource("StyleBoxFlat_25x32")
+Label/fonts/font = ExtResource("3_8u6ww")
+LineEdit/styles/focus = ExtResource("2_brg2c")
 LineEdit/styles/normal = SubResource("StyleBoxFlat_25x32")
 LineEdit/styles/read_only = SubResource("StyleBoxFlat_25x32")
 RichTextLabel/fonts/bold_font = SubResource("FontVariation_ff4nr")
 RichTextLabel/fonts/bold_italics_font = null
 RichTextLabel/fonts/italics_font = null
 RichTextLabel/fonts/mono_font = null
-RichTextLabel/fonts/normal_font = ExtResource("1_tneco")
+RichTextLabel/fonts/normal_font = ExtResource("3_8u6ww")
diff --git a/client/player/chat_message.tscn b/client/player/chat_message.tscn
index 1ac82368..816c9c4f 100644
--- a/client/player/chat_message.tscn
+++ b/client/player/chat_message.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://5rcfoyuiwuya"]
 
-[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/font-josefin-sans.woff2" id="1_3ximm"]
+[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_3ximm"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dpele"]
 bg_color = Color(1, 1, 1, 1)