From 5645b2591e91d55c6d1b3bc520da2d7a7e8673e2 Mon Sep 17 00:00:00 2001 From: Erevos <58960464+Erevoid@users.noreply.github.com> Date: Wed, 6 May 2020 18:34:57 +0300 Subject: [PATCH] Some final theme fixes (#229) Co-authored-by: Erevoid --- assets/themes/blue/theme.tres | 6 ++- assets/themes/gold/theme.tres | 12 +++--- assets/themes/gray/theme.tres | 78 +++++++++++++++++----------------- assets/themes/light/theme.tres | 19 +++++++-- 4 files changed, 66 insertions(+), 49 deletions(-) diff --git a/assets/themes/blue/theme.tres b/assets/themes/blue/theme.tres index a6bd95bf5..f1a25779d 100644 --- a/assets/themes/blue/theme.tres +++ b/assets/themes/blue/theme.tres @@ -61,8 +61,12 @@ content_margin_left = 4.5 content_margin_right = 4.5 content_margin_top = 3.0 content_margin_bottom = 3.0 -bg_color = Color( 0.180392, 0.203922, 0.266667, 1 ) +bg_color = Color( 0.313726, 0.356863, 0.470588, 1 ) border_color = Color( 0.41, 0.61, 0.91, 1 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 [sub_resource type="Image" id=1439] data = { diff --git a/assets/themes/gold/theme.tres b/assets/themes/gold/theme.tres index cb2cb5945..49e8207e3 100644 --- a/assets/themes/gold/theme.tres +++ b/assets/themes/gold/theme.tres @@ -11,7 +11,7 @@ content_margin_left = 5.0 content_margin_right = 5.0 content_margin_top = 3.0 content_margin_bottom = 3.0 -bg_color = Color( 0.25098, 0.207843, 0.121569, 1 ) +bg_color = Color( 0.392157, 0.329412, 0.207843, 1 ) border_color = Color( 0.588235, 0.568627, 0.470588, 1 ) corner_radius_top_left = 4 corner_radius_top_right = 4 @@ -24,7 +24,7 @@ content_margin_left = 5.0 content_margin_right = 5.0 content_margin_top = 3.0 content_margin_bottom = 3.0 -bg_color = Color( 0.737255, 0.560784, 0.188235, 1 ) +bg_color = Color( 0.656738, 0.525779, 0.243711, 1 ) border_color = Color( 0.588235, 0.568627, 0.470588, 1 ) corner_radius_top_left = 4 corner_radius_top_right = 4 @@ -37,7 +37,7 @@ content_margin_left = 5.0 content_margin_right = 5.0 content_margin_top = 3.0 content_margin_bottom = 3.0 -bg_color = Color( 0.552941, 0.376471, 0, 1 ) +bg_color = Color( 0.501961, 0.4, 0.180392, 1 ) border_color = Color( 0.588235, 0.568627, 0.470588, 1 ) corner_radius_top_left = 4 corner_radius_top_right = 4 @@ -50,7 +50,7 @@ content_margin_left = 5.0 content_margin_right = 5.0 content_margin_top = 3.0 content_margin_bottom = 3.0 -bg_color = Color( 0.552941, 0.376471, 0, 1 ) +bg_color = Color( 0.576471, 0.478431, 0.27451, 1 ) border_color = Color( 0.588235, 0.568627, 0.470588, 1 ) corner_radius_top_left = 4 corner_radius_top_right = 4 @@ -510,8 +510,8 @@ TextEdit/styles/read_only = null Tree/colors/cursor_color = Color( 0, 0, 0, 1 ) Tree/colors/custom_button_font_highlight = Color( 0.941176, 0.941176, 0.941176, 1 ) Tree/colors/drop_position_color = Color( 1, 0.3, 0.2, 1 ) -Tree/colors/font_color = Color( 0.690196, 0.690196, 0.690196, 1 ) -Tree/colors/font_color_selected = Color( 1, 1, 1, 1 ) +Tree/colors/font_color = Color( 0, 0, 0, 1 ) +Tree/colors/font_color_selected = Color( 0, 0, 0, 1 ) Tree/colors/guide_color = Color( 0, 0, 0, 0.1 ) Tree/colors/relationship_line_color = Color( 0.27451, 0.27451, 0.27451, 1 ) Tree/colors/selection_color = Color( 0.1, 0.1, 1, 0.8 ) diff --git a/assets/themes/gray/theme.tres b/assets/themes/gray/theme.tres index 08e62873b..4dfd28df3 100644 --- a/assets/themes/gray/theme.tres +++ b/assets/themes/gray/theme.tres @@ -48,7 +48,7 @@ content_margin_left = 5.0 content_margin_right = 5.0 content_margin_top = 3.0 content_margin_bottom = 3.0 -bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) +bg_color = Color( 0.427451, 0.427451, 0.427451, 1 ) border_color = Color( 0.2, 0.2, 0.2, 1 ) corner_radius_top_left = 4 corner_radius_top_right = 4 @@ -147,7 +147,7 @@ border_width_top = 2 border_width_bottom = 2 border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) -[sub_resource type="StyleBoxFlat" id=18] +[sub_resource type="StyleBoxFlat" id=16] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) corner_radius_top_left = 4 corner_radius_top_right = 4 @@ -156,16 +156,16 @@ corner_radius_bottom_left = 4 expand_margin_top = 2.0 expand_margin_bottom = 2.0 -[sub_resource type="StyleBoxFlat" id=19] +[sub_resource type="StyleBoxFlat" id=17] bg_color = Color( 0.0941176, 0.0941176, 0.0941176, 1 ) border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) expand_margin_top = 2.0 expand_margin_bottom = 2.0 -[sub_resource type="StreamTexture" id=20] +[sub_resource type="StreamTexture" id=18] load_path = "res://.import/hsplit.png-982787a0fbb16ed868512e0fe24fb6d7.stex" -[sub_resource type="StyleBoxFlat" id=21] +[sub_resource type="StyleBoxFlat" id=19] bg_color = Color( 0.109804, 0.0862745, 0.0862745, 0 ) border_width_left = 1 border_width_top = 1 @@ -178,10 +178,10 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=22] +[sub_resource type="StyleBoxFlat" id=20] bg_color = Color( 0.180392, 0.180392, 0.180392, 1 ) -[sub_resource type="StyleBoxFlat" id=23] +[sub_resource type="StyleBoxFlat" id=21] content_margin_left = 4.5 content_margin_right = 4.5 content_margin_top = 3.0 @@ -192,7 +192,7 @@ corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id=24] +[sub_resource type="StyleBoxFlat" id=22] bg_color = Color( 0.2, 0.2, 0.2, 1 ) border_width_left = 6 border_width_top = 10 @@ -205,10 +205,10 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=25] +[sub_resource type="StyleBoxFlat" id=23] bg_color = Color( 0.2, 0.2, 0.2, 1 ) -[sub_resource type="StyleBoxFlat" id=26] +[sub_resource type="StyleBoxFlat" id=24] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_left = 5 border_width_top = 10 @@ -221,7 +221,7 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=27] +[sub_resource type="StyleBoxFlat" id=25] bg_color = Color( 0.2, 0.2, 0.2, 1 ) border_width_left = 10 border_width_top = 6 @@ -229,7 +229,7 @@ border_width_right = 10 border_width_bottom = 8 border_color = Color( 0.2, 0.2, 0.2, 1 ) -[sub_resource type="StyleBoxFlat" id=28] +[sub_resource type="StyleBoxFlat" id=26] bg_color = Color( 0.145098, 0.145098, 0.164706, 1 ) border_width_left = 10 border_width_top = 6 @@ -237,7 +237,7 @@ border_width_right = 10 border_width_bottom = 8 border_color = Color( 0.145098, 0.145098, 0.164706, 1 ) -[sub_resource type="StyleBoxFlat" id=29] +[sub_resource type="StyleBoxFlat" id=27] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_left = 10 border_width_top = 6 @@ -245,7 +245,7 @@ border_width_right = 10 border_width_bottom = 8 border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) -[sub_resource type="StyleBoxFlat" id=30] +[sub_resource type="StyleBoxFlat" id=28] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_left = 4 border_width_top = 4 @@ -258,7 +258,7 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=31] +[sub_resource type="StyleBoxFlat" id=29] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_left = 4 border_width_top = 4 @@ -270,16 +270,16 @@ corner_radius_top_right = 4 corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 -[sub_resource type="StyleBoxFlat" id=32] +[sub_resource type="StyleBoxFlat" id=30] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_left = 2 border_width_right = 2 border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) -[sub_resource type="StreamTexture" id=33] +[sub_resource type="StreamTexture" id=31] load_path = "res://.import/vsplit.png-e9d4a9d3ba3096e1627a4854187f6824.stex" -[sub_resource type="StyleBoxFlat" id=34] +[sub_resource type="StyleBoxFlat" id=32] bg_color = Color( 0.176471, 0.176471, 0.176471, 1 ) border_width_left = 2 border_width_top = 20 @@ -365,13 +365,13 @@ HSlider/icons/grabber_disabled = null HSlider/icons/grabber_highlight = ExtResource( 3 ) HSlider/icons/tick = null HSlider/styles/focus = null -HSlider/styles/grabber_area = SubResource( 18 ) +HSlider/styles/grabber_area = SubResource( 16 ) HSlider/styles/grabber_disabled = null HSlider/styles/grabber_highlight = null -HSlider/styles/slider = SubResource( 19 ) +HSlider/styles/slider = SubResource( 17 ) HSplitContainer/constants/autohide = 1 HSplitContainer/constants/separation = 6 -HSplitContainer/icons/grabber = SubResource( 20 ) +HSplitContainer/icons/grabber = SubResource( 18 ) HSplitContainer/styles/bg = null "Label/colors/Selected Color" = Color( 0.235294, 0.364706, 0.458824, 1 ) Label/colors/font_color = Color( 1, 1, 1, 1 ) @@ -393,7 +393,7 @@ LineEdit/constants/minimum_spaces = 12 LineEdit/fonts/font = null LineEdit/icons/clear = null LineEdit/styles/focus = null -LineEdit/styles/normal = SubResource( 21 ) +LineEdit/styles/normal = SubResource( 19 ) LineEdit/styles/read_only = null MenuButton/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) @@ -419,10 +419,10 @@ OptionButton/styles/focus = null OptionButton/styles/hover = null OptionButton/styles/normal = null OptionButton/styles/pressed = null -Panel/styles/panel = SubResource( 22 ) +Panel/styles/panel = SubResource( 20 ) Panel/styles/panelf = null Panel/styles/panelnc = null -PanelContainer/styles/panel = SubResource( 23 ) +PanelContainer/styles/panel = SubResource( 21 ) PopupMenu/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) PopupMenu/colors/font_color_accel = Color( 0.7, 0.7, 0.7, 0.8 ) PopupMenu/colors/font_color_disabled = Color( 0.4, 0.4, 0.4, 0.8 ) @@ -438,10 +438,10 @@ PopupMenu/icons/unchecked = null PopupMenu/styles/hover = null PopupMenu/styles/labeled_separator_left = null PopupMenu/styles/labeled_separator_right = null -PopupMenu/styles/panel = SubResource( 24 ) +PopupMenu/styles/panel = SubResource( 22 ) PopupMenu/styles/panel_disabled = null PopupMenu/styles/separator = null -PopupPanel/styles/panel = SubResource( 25 ) +PopupPanel/styles/panel = SubResource( 23 ) SpinBox/icons/updown = null TabContainer/colors/font_color_bg = Color( 0.690196, 0.690196, 0.690196, 1 ) TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) @@ -458,10 +458,10 @@ TabContainer/icons/increment = null TabContainer/icons/increment_highlight = null TabContainer/icons/menu = null TabContainer/icons/menu_highlight = null -TabContainer/styles/panel = SubResource( 26 ) -TabContainer/styles/tab_bg = SubResource( 27 ) -TabContainer/styles/tab_disabled = SubResource( 28 ) -TabContainer/styles/tab_fg = SubResource( 29 ) +TabContainer/styles/panel = SubResource( 24 ) +TabContainer/styles/tab_bg = SubResource( 25 ) +TabContainer/styles/tab_disabled = SubResource( 26 ) +TabContainer/styles/tab_fg = SubResource( 27 ) Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 ) Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 ) @@ -477,10 +477,10 @@ Tabs/icons/increment = null Tabs/icons/increment_highlight = null Tabs/styles/button = null Tabs/styles/button_pressed = null -Tabs/styles/panel = SubResource( 26 ) -Tabs/styles/tab_bg = SubResource( 27 ) -Tabs/styles/tab_disabled = SubResource( 28 ) -Tabs/styles/tab_fg = SubResource( 29 ) +Tabs/styles/panel = SubResource( 24 ) +Tabs/styles/tab_bg = SubResource( 25 ) +Tabs/styles/tab_disabled = SubResource( 26 ) +Tabs/styles/tab_fg = SubResource( 27 ) TextEdit/colors/background_color = Color( 0, 0, 0, 0 ) TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) @@ -512,7 +512,7 @@ TextEdit/fonts/font = null TextEdit/icons/tab = null TextEdit/styles/completion = null TextEdit/styles/focus = null -TextEdit/styles/normal = SubResource( 30 ) +TextEdit/styles/normal = SubResource( 28 ) TextEdit/styles/read_only = null Tree/colors/cursor_color = Color( 0, 0, 0, 1 ) Tree/colors/custom_button_font_highlight = Color( 0.941176, 0.941176, 0.941176, 1 ) @@ -540,7 +540,7 @@ Tree/icons/checked = null Tree/icons/select_arrow = null Tree/icons/unchecked = null Tree/icons/updown = null -Tree/styles/bg = SubResource( 31 ) +Tree/styles/bg = SubResource( 29 ) Tree/styles/bg_focus = null Tree/styles/button_pressed = null Tree/styles/cursor = null @@ -564,10 +564,10 @@ VScrollBar/styles/grabber_pressed = SubResource( 14 ) VScrollBar/styles/scroll = null VScrollBar/styles/scroll_focus = null VSeparator/constants/separation = 4 -VSeparator/styles/separator = SubResource( 32 ) +VSeparator/styles/separator = SubResource( 30 ) VSplitContainer/constants/autohide = 1 VSplitContainer/constants/separation = 6 -VSplitContainer/icons/grabber = SubResource( 33 ) +VSplitContainer/icons/grabber = SubResource( 31 ) VSplitContainer/styles/bg = null WindowDialog/colors/title_color = Color( 1, 1, 1, 1 ) WindowDialog/constants/close_h_ofs = 18 @@ -577,4 +577,4 @@ WindowDialog/constants/title_height = 20 WindowDialog/fonts/title_font = null WindowDialog/icons/close = null WindowDialog/icons/close_highlight = null -WindowDialog/styles/panel = SubResource( 34 ) +WindowDialog/styles/panel = SubResource( 32 ) diff --git a/assets/themes/light/theme.tres b/assets/themes/light/theme.tres index 0c378ec34..aa463671e 100644 --- a/assets/themes/light/theme.tres +++ b/assets/themes/light/theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=37 format=2] +[gd_resource type="Theme" load_steps=38 format=2] [ext_resource path="res://assets/themes/light/icons/hsplit.png" type="Texture" id=1] [ext_resource path="res://assets/themes/light/icons/grabber.png" type="Texture" id=2] @@ -45,6 +45,19 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false +[sub_resource type="StyleBoxFlat" id=32] +content_margin_left = 5.0 +content_margin_right = 5.0 +content_margin_top = 3.0 +content_margin_bottom = 3.0 +bg_color = Color( 0.705882, 0.705882, 0.705882, 1 ) +border_color = Color( 0.627451, 0.627451, 0.627451, 1 ) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 +anti_aliasing = false + [sub_resource type="StyleBoxFlat" id=4] bg_color = Color( 0.6, 0.6, 0.6, 0 ) @@ -175,7 +188,7 @@ corner_radius_bottom_left = 4 anti_aliasing = false [sub_resource type="StyleBoxFlat" id=19] -bg_color = Color( 1, 1, 1, 1 ) +bg_color = Color( 0.772549, 0.772549, 0.772549, 1 ) [sub_resource type="StyleBoxFlat" id=20] content_margin_left = 4.5 @@ -303,7 +316,7 @@ Button/styles/disabled = SubResource( 1 ) Button/styles/focus = null Button/styles/hover = SubResource( 2 ) Button/styles/normal = SubResource( 3 ) -Button/styles/pressed = SubResource( 3 ) +Button/styles/pressed = SubResource( 32 ) CheckBox/colors/font_color = Color( 0, 0, 0, 1 ) CheckBox/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) CheckBox/colors/font_color_hover = Color( 0, 0, 0, 1 )