From 585950365f5e609224a3c0a470f3a1bea7b25e33 Mon Sep 17 00:00:00 2001 From: MacDugRPG <57243055+MacDugRPG@users.noreply.github.com> Date: Sun, 1 May 2022 14:21:46 -0400 Subject: [PATCH] Themes updates: The following updated on this commit: 1. styleboxflat .tres for white and black removed border. As mentioned in the chat, we probably want a different one of these for each (with and without borders) 2. set the baseline font for the TextEdit 3. selected increased font size for the label default --- .../Themes/assets/sbf_black.tres | 1 + .../Themes/assets/sbf_white.tres | 2 +- .../Themes/assets/ui_controlNode_dark_theme.tres | 9 +++++---- .../Themes/assets/ui_controlNode_light_theme.tres | 9 +++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Phase2/Godot ===(Game Code)===/Themes/assets/sbf_black.tres b/Phase2/Godot ===(Game Code)===/Themes/assets/sbf_black.tres index 293918c..859abe4 100644 --- a/Phase2/Godot ===(Game Code)===/Themes/assets/sbf_black.tres +++ b/Phase2/Godot ===(Game Code)===/Themes/assets/sbf_black.tres @@ -6,3 +6,4 @@ border_width_left = 1 border_width_top = 1 border_width_right = 1 border_width_bottom = 1 +border_color = Color( 0, 0, 0, 1 ) diff --git a/Phase2/Godot ===(Game Code)===/Themes/assets/sbf_white.tres b/Phase2/Godot ===(Game Code)===/Themes/assets/sbf_white.tres index 41e0cea..418e195 100644 --- a/Phase2/Godot ===(Game Code)===/Themes/assets/sbf_white.tres +++ b/Phase2/Godot ===(Game Code)===/Themes/assets/sbf_white.tres @@ -6,4 +6,4 @@ border_width_left = 1 border_width_top = 1 border_width_right = 1 border_width_bottom = 1 -border_color = Color( 0, 0, 0, 1 ) +border_color = Color( 1, 1, 1, 1 ) diff --git a/Phase2/Godot ===(Game Code)===/Themes/assets/ui_controlNode_dark_theme.tres b/Phase2/Godot ===(Game Code)===/Themes/assets/ui_controlNode_dark_theme.tres index c4541e3..df4ef91 100644 --- a/Phase2/Godot ===(Game Code)===/Themes/assets/ui_controlNode_dark_theme.tres +++ b/Phase2/Godot ===(Game Code)===/Themes/assets/ui_controlNode_dark_theme.tres @@ -1,8 +1,9 @@ -[gd_resource type="Theme" load_steps=4 format=2] +[gd_resource type="Theme" load_steps=5 format=2] [ext_resource path="res://assets/sbf_black.tres" type="StyleBox" id=1] [ext_resource path="res://assets/liberation_serif_30pt.tres" type="DynamicFont" id=2] [ext_resource path="res://assets/liberation_serif_20pt.tres" type="DynamicFont" id=3] +[ext_resource path="res://assets/liberation_serif.tres" type="DynamicFont" id=4] [resource] Button/colors/font_color = Color( 1, 1, 1, 1 ) @@ -37,7 +38,7 @@ Label/constants/line_spacing = 3 Label/constants/shadow_as_outline = 0 Label/constants/shadow_offset_x = 1 Label/constants/shadow_offset_y = 1 -Label/fonts/font = null +Label/fonts/font = ExtResource( 3 ) Label/styles/normal = ExtResource( 1 ) LineEdit/colors/clear_button_color = Color( 0.88, 0.88, 0.88, 1 ) LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 ) @@ -107,7 +108,7 @@ TextEdit/constants/completion_lines = 7 TextEdit/constants/completion_max_width = 50 TextEdit/constants/completion_scroll_width = 3 TextEdit/constants/line_spacing = 4 -TextEdit/fonts/font = ExtResource( 3 ) +TextEdit/fonts/font = ExtResource( 4 ) TextEdit/icons/fold = null TextEdit/icons/folded = null TextEdit/icons/space = null @@ -115,5 +116,5 @@ TextEdit/icons/tab = null TextEdit/styles/completion = null TextEdit/styles/focus = null TextEdit/styles/normal = ExtResource( 1 ) -TextEdit/styles/read_only = null +TextEdit/styles/read_only = ExtResource( 1 ) VBoxContainer/constants/separation = 4 diff --git a/Phase2/Godot ===(Game Code)===/Themes/assets/ui_controlNode_light_theme.tres b/Phase2/Godot ===(Game Code)===/Themes/assets/ui_controlNode_light_theme.tres index a2c76b7..49a1926 100644 --- a/Phase2/Godot ===(Game Code)===/Themes/assets/ui_controlNode_light_theme.tres +++ b/Phase2/Godot ===(Game Code)===/Themes/assets/ui_controlNode_light_theme.tres @@ -1,8 +1,9 @@ -[gd_resource type="Theme" load_steps=4 format=2] +[gd_resource type="Theme" load_steps=5 format=2] [ext_resource path="res://assets/sbf_white.tres" type="StyleBox" id=1] [ext_resource path="res://assets/liberation_serif_30pt.tres" type="DynamicFont" id=2] [ext_resource path="res://assets/liberation_serif_20pt.tres" type="DynamicFont" id=3] +[ext_resource path="res://assets/liberation_serif.tres" type="DynamicFont" id=4] [resource] Button/colors/font_color = Color( 0, 0, 0, 1 ) @@ -37,7 +38,7 @@ Label/constants/line_spacing = 3 Label/constants/shadow_as_outline = 0 Label/constants/shadow_offset_x = 1 Label/constants/shadow_offset_y = 1 -Label/fonts/font = null +Label/fonts/font = ExtResource( 3 ) Label/styles/normal = ExtResource( 1 ) LineEdit/colors/clear_button_color = Color( 0.88, 0.88, 0.88, 1 ) LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 ) @@ -107,7 +108,7 @@ TextEdit/constants/completion_lines = 7 TextEdit/constants/completion_max_width = 50 TextEdit/constants/completion_scroll_width = 3 TextEdit/constants/line_spacing = 4 -TextEdit/fonts/font = ExtResource( 3 ) +TextEdit/fonts/font = ExtResource( 4 ) TextEdit/icons/fold = null TextEdit/icons/folded = null TextEdit/icons/space = null @@ -115,5 +116,5 @@ TextEdit/icons/tab = null TextEdit/styles/completion = null TextEdit/styles/focus = null TextEdit/styles/normal = ExtResource( 1 ) -TextEdit/styles/read_only = null +TextEdit/styles/read_only = ExtResource( 1 ) VBoxContainer/constants/separation = 4